Merge branch 'develop' into Sergio_Ramirez

Caivan · Jun 4, 2020 · ace4569 · ace4569
2 parents dc8d5eb + 78bc5f0
commit ace4569
Show file tree

Hide file tree

Showing 32 changed files with 2,594 additions and 741 deletions.
diff --git a/Poliradio/angular.json b/Poliradio/angular.json
@@ -32,6 +32,7 @@
               }
             ],
             "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               {
                 "input": "src/theme/variables.scss"
               },
@@ -98,7 +99,9 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "styles": [],
+            "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
+            ],
             "scripts": [],
             "assets": [
               {
@@ -128,7 +131,9 @@
               "tsconfig.spec.json",
               "e2e/tsconfig.json"
             ],
-            "exclude": ["**/node_modules/**"]
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
         "e2e": {
@@ -184,4 +189,4 @@
       "styleext": "scss"
     }
   }
-}
+}
diff --git a/Poliradio/package-lock.json b/Poliradio/package-lock.json
diff --git a/Poliradio/package.json b/Poliradio/package.json
@@ -13,9 +13,12 @@
   },
   "private": true,
   "dependencies": {
+    "@angular/animations": "~8.2.14",
+    "@angular/cdk": "~8.2.3",
     "@angular/common": "~8.2.14",
     "@angular/core": "~8.2.14",
     "@angular/forms": "~8.2.14",
+    "@angular/material": "^8.2.3",
     "@angular/platform-browser": "~8.2.14",
     "@angular/platform-browser-dynamic": "~8.2.14",
     "@angular/router": "~8.2.14",
@@ -34,13 +37,14 @@
     "cordova-plugin-local-notification": "^0.9.0-beta.2",
     "cordova-plugin-streaming-media": "^2.2.0",
     "core-js": "^2.5.4",
+    "hammerjs": "^2.0.8",
     "rxjs": "~6.5.1",
     "tslib": "^1.9.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@babel/compat-data": "~7.8.0",
-    "@angular-devkit/build-angular": "~0.803.20",
+    "@angular-devkit/build-angular": "^0.803.24",
     "@angular/cli": "~8.3.23",
     "@angular/compiler": "~8.2.14",
     "@angular/compiler-cli": "~8.2.14",
@@ -87,4 +91,4 @@
       "android"
     ]
   }
-}
+}
diff --git a/Poliradio/src/app/Model/img.ts b/Poliradio/src/app/Model/img.ts
@@ -0,0 +1,7 @@
+export class img{
+    source_url : string;
+
+    constructor (source_url){
+        this.source_url = source_url;
+    }
+}
diff --git a/Poliradio/src/app/Model/news.ts b/Poliradio/src/app/Model/news.ts
@@ -0,0 +1,13 @@
+export class news{
+    title : string;
+    content : string;
+    excerpt : string;
+    featured_media : string;
+
+    constructor (title, content, excrept, featured_media){
+        this.content = content;
+        this.title = title;
+        this.excerpt = excrept;
+        this.featured_media = featured_media;
+    }
+}
diff --git a/Poliradio/src/app/Model/songInfo.ts b/Poliradio/src/app/Model/songInfo.ts
@@ -0,0 +1,3 @@
+export class songInfo{
+    current:string;
+}
diff --git a/Poliradio/src/app/app-routing.module.ts b/Poliradio/src/app/app-routing.module.ts
@@ -5,7 +5,12 @@ const routes: Routes = [
   {
     path: '',
     loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
+  },
+  {
+    path: 'news-modal',
+    loadChildren: () => import('./news-modal/news-modal.module').then( m => m.NewsModalPageModule)
   }
+
 ];
 @NgModule({
   imports: [

diff --git a/Poliradio/src/app/app.module.ts b/Poliradio/src/app/app.module.ts
@@ -1,33 +1,43 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';
+import { HttpClientModule } from "@angular/common/http";
 
 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
-import { HeaderComponent } from './header/header.component';
 import { SharedModule } from './shared/shared.module';
 import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
 
+/**
+ * SERVICES
+ */
+import { SonginfoService } from './services/songinfo.service';
+import { WordPressConnectionService } from './services/word-press-connection.service';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 
 @NgModule({
   declarations: [AppComponent],
   entryComponents: [],
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule,SharedModule],
-
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(),
+    AppRoutingModule,
+    SharedModule,
+    HttpClientModule,
+    BrowserAnimationsModule],
   providers: [
     StatusBar,
     SplashScreen,
-    StreamingMedia,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
-    LocalNotifications
-
-
+    LocalNotifications,
+    SonginfoService,
+    WordPressConnectionService,
+    { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
   ],
   bootstrap: [AppComponent]
 })

diff --git a/Poliradio/src/app/header/header.component.html b/Poliradio/src/app/header/header.component.html
@@ -1,38 +1,27 @@
-<ion-header [translucent]="true">
+<ion-header >
   <ion-toolbar>
     <div class="audio-player">
-      
+
       <div (click)="play()" *ngIf="!isPlaying" id="play-btn"></div>
       <div (click)="stop()" *ngIf="isPlaying" id="play-btn" class="pause"></div>
 
 
       <div class="audio-wrapper" id="player-container" href="javascript:;">
-        <audio  preload="metadata" (loadedmetadata)="control($event)" (timeupdate)="update()" name="media" #audioPlayer>
+        <audio preload="metadata" (loadedmetadata)="control($event)" (timeupdate)="update()" name="media" #audioPlayer>
           <source [src]="URL" type="audio/mpeg">
-          </audio>
+        </audio>
       </div>
 
-
-
       <div class="player-controls scrubber">
-        <!--Song Name-->
-        <p>Oslo</p>
-        <!--Artist Name-->
-        <small>Holy Esque</small>
-
-        <!--
-        <span id="seekObjContainer">
-          <progress id="seekObj" value="0" max="1"></progress>
-        </span>
-        <br>
-        <small style="float: left; position: relative; left: 15px;" class="start-time"></small>
-        <small style="float: right; position: relative; right: 20px;" class="end-time"></small>
-        -->
+        <p style="font-weight: 700;" [innerHTML]="songName"> </p>
+        <small [innerHTML]="artistName"></small>
+      </div>
+      <div class="album-image">
+        <img *ngIf="this.albumImage" [src]="this.albumImage" alt="">
       </div>
-      <div class="album-image" style="background-image: url('https://artwork-cdn.7static.com/static/img/sleeveart/00/051/614/0005161476_350.jpg')"></div>
     </div>
   </ion-toolbar>
+  <ion-progress-bar [value]="progress"> </ion-progress-bar>
 
-  <ion-progress-bar [value] ="progress"></ion-progress-bar>
 
 </ion-header>
diff --git a/Poliradio/src/app/header/header.component.scss b/Poliradio/src/app/header/header.component.scss
@@ -1,9 +1,19 @@
-ion-content ion-toolbar {
-    --background: translucent;
+ion-content {
+    --background: none;
+    background-image: url('../../assets/audioplayer/fondo.jpeg');
   }
+  .audio-player:hover{
+    background: light-gray;
+    color: #3498DB;
+  }  
   .audio-player {
-    background: white;
+    background-image: url('../../assets/audioplayer/fondo.jpeg');
+    background-position: center top;
+    background-repeat: no-repeat;
+    background-size: cover;
+    color: whitesmoke;
     border: 1px solid lighten(#acacac, 20%);
+    font: 150% sans-serif;
     width: 100%;
     text-align: center;
     display: flex;
@@ -12,16 +22,33 @@ ion-content ion-toolbar {
     max-height: 100px;
     //margin: 4rem 0 4rem 0;
     .album-image {
+      background-image: url(../../assets/audioplayer/null-image.png);
+      background-repeat: no-repeat;
+    background-position: 50%;
+    border-radius: 50%;
+    background-size: 100% auto;
       min-height: 5%;
       height: auto;
       max-height: 100%;
-      width: 50%;
+      width: 40%;
       max-width: 100px;
-      background-size: cover;
+      //background-size: cover;
+      //border-radius: 50%;
+      //z-index: 9999;
+      margin: 0.15%;
+
+      img{
+        border-radius: 50%;
+        padding: 0.5%;
+      }
     }
-    .player-controls {
+
+    .player-controls {      
       align-items: center;
       justify-content: center;
+      color: #fff;
+      margin-left: 2rem;
+      margin-right: auto;
       //margin-top: 2.5rem;
       flex: 3;
   /*    progress {
@@ -44,7 +71,7 @@ ion-content ion-toolbar {
         background-color: blue;
       }*/
       p {
-        font-size: 1.6rem;
+        font-size: 20px;
         text-align: center;
         margin: 1.5rem 0 0 0;
       }
@@ -55,9 +82,10 @@ ion-content ion-toolbar {
       background-size: cover;
       width: 50px;
       height: 50px;
-      margin: 1.5rem 0 2rem 2rem;
+      margin: 1.5rem 0 3rem 0.5rem;
       &.pause {
         background-image: url('http://www.lukeduncan.me/images/pause-button.png');
       }
     }
+
   }