edit hone + news-detail

src/app/app.component.html

@@ -8,18 +8,33 @@
     <ion-content>
       <ion-list>
         <ion-menu-toggle auto-hide="true">
-          <ion-item routerLink="/tabs/tab1" routerDirection="forward">
-            <ion-label>Tab 111</ion-label>
+          <ion-item (click)="aboutUs()">
+          <ion-icon name="information-circle" slot="start"></ion-icon>
+            <ion-label>fm99activeradio.mcot.net</ion-label>
           </ion-item>
           <ion-item routerLink="/tabs/tab2" routerDirection="forward">
-            <ion-label>Tab 2</ion-label>
+            <ion-label>Facebok : fm99activeradio</ion-label>
           </ion-item>
           <ion-item routerLink="/tabs/tab3" routerDirection="forward">
-            <ion-label>Tab 3</ion-label>
+            <ion-label>Youtube</ion-label>
+          </ion-item>
+          <ion-item routerLink="/tabs/tab3" routerDirection="forward">
+            <ion-label>line</ion-label>
+          </ion-item>
+          <ion-item routerLink="/tabs/tab3" routerDirection="forward">
+            <ion-label>Policy</ion-label>
           </ion-item>
         </ion-menu-toggle>
+        <div>
+          คลื่นเมืองไทยแข็งแรง F.M. 99 MHz
+          ที่อยู่: 63/1 ถ. พระราม 9 ห้วยขวาง กทม. 10310
+โทร: 02-248-5936-7
+ข้อความผ่านมือถือ (SMS): 4689899
+อีเมล์: fm99mcot@hotmail.com
+ส่วนขาย: 02-201-6736, 02-201-6550
+        </div>
       </ion-list>
     </ion-content>
   </ion-menu>
   <ion-router-outlet id="content"></ion-router-outlet>
-</ion-app>  
+</ion-app>

src/app/home/home.page.ts

@@ -38,8 +38,10 @@ export class HomePage implements AfterContentChecked {
   }
 
   ionViewWillEnter() {
-    this.wpgetdataService.getAllNews().subscribe((data) => {
-      this.newsdata = data;
+    // this.wpgetdataService.getAllNews().subscribe((data) => {
+      this.wpgetdataService.getAllNews().then((data) => {
+      // this.newsdata = data;
+      this.newsdata = JSON.parse(data.data);
       console.log('load News Data');
       console.log(this.newsdata);
     });

src/app/news-detail/news-detail.page.html

@@ -1,6 +1,9 @@
 <ion-header>
   <ion-toolbar class="toolbar-bg-color">
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
+    <!-- <img src="../../../assets/icon/fm99-logo-2021-3.svg" class="head-img"> -->
+    <ion-buttons slot="start">
+      <ion-back-button color="light"></ion-back-button>
+    </ion-buttons>
     <ion-buttons slot="end">
       <ion-menu-button>
         <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>

src/app/news-detail/news-detail.page.ts

@@ -25,11 +25,15 @@ export class NewsDetailPage implements OnInit {
     let id = this.route.snapshot.paramMap.get('id') || this.id;
     console.log("fetching ...");
     console.log(id);
-    // this.wpdataService.getNewsDetail(id).subscribe((data) => {
-    // console.log();
-    this.wpdataService.getNewsDetail(id).subscribe(res => {
-      this.data = res;
-      console.log(this.data);
+    this.wpdataService.getNewsDetail(id).then(res => {
+      // this.data = res;
+      // console.log(this.data);
+      let post = JSON.parse(res.data);
+      console.log(" get data ", post);
+      post['media_url'] = post['_embedded']['wp:featuredmedia'][0]['media_details'].sizes['medium'].source_url;
+      this.data = post;
+    }, error => {
+      console.log("errror ", error);
     });
   }
 

src/app/news/news.page.html

@@ -1,6 +1,6 @@
 <ion-header>
   <ion-toolbar class="toolbar-bg-color">
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
+    <img src="../../../assets/icon/fm99-logo-2021-3.svg" class="head-img">
     <ion-buttons slot="end">
       <ion-menu-button>
         <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>

src/app/news/news.page.ts

@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
 })
 export class NewsPage implements OnInit {
 
-  newsdata: any = [];
+  newsdata: any;
 
   constructor(private wpgetdataService: WpdataService) { }
 
@@ -20,8 +20,11 @@ export class NewsPage implements OnInit {
 
 
   ionViewWillEnter() {
-    this.wpgetdataService.getAllNews().subscribe((data) => {
-      this.newsdata = data;
+    // this.wpgetdataService.getAllNews().subscribe((data) => {
+      this.wpgetdataService.getAllNews().then((data) => {
+        // this.wpdataService.getNewsData().then(data => {
+      // this.newsdata = data;
+      this.newsdata = JSON.parse(data.data);
       console.log('load News Data');
       console.log(this.newsdata);
       });

src/app/services/wpdata.service.ts

@@ -33,15 +33,17 @@ export class WpdataService {
   //   );
   // }
   getAllNews() {
-    return this.httpc.get(
-      "https://fm99activeradio.mcot.net/wp-json/wp/v2/news?_embed"
+    // return this.httpc.get(
+        return this.http.get(
+      "https://fm99activeradio.mcot.net/wp-json/wp/v2/news?_embed", {}, {}
     );
   }
 
   getNewsDetail(id) {
     let url = 'https://fm99activeradio.mcot.net/'
     const route = url + 'wp-json/wp/v2/' + 'news/' + id + '?_embed';
-    return this.httpc.get(route);
+    return this.http.get(route ,{} ,{});
+    // return this.http.get(route, {}, {});
   }
 
   getAllYoutube() {

src/app/youtube/youtube.page.html

@@ -1,6 +1,6 @@
 <ion-header>
   <ion-toolbar class="toolbar-bg-color">
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
+    <img src="../../../assets/icon/fm99-logo-2021-3.svg" class="head-img">
     <ion-buttons slot="end">
       <ion-menu-button>
         <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
@@ -30,7 +30,8 @@
     <ion-card *ngFor="let yt of ytdata['items']" class="list-card-margin">
       <img [src]="yt.snippet.thumbnails.high.url" [style.width]="'100%'" />
       <ion-card-header>
-        <a [routerLink]="['' , ]">
+        <!-- <a [routerLink]="['' , ]"> -->
+          <a href="https://www.youtube.com/watch?v={{yt.id.videoId}}">
           <ion-card-title class="title-txt-1" [innerHTML]="yt.snippet.title"></ion-card-title>
         </a>
       </ion-card-header>

src/theme/variables.scss

@@ -82,155 +82,4 @@
    * -------------------------------------------
    */
 
-  body {
-    --ion-color-primary: #428cff;
-    --ion-color-primary-rgb: 66,140,255;
-    --ion-color-primary-contrast: #ffffff;
-    --ion-color-primary-contrast-rgb: 255,255,255;
-    --ion-color-primary-shade: #3a7be0;
-    --ion-color-primary-tint: #5598ff;
-
-    --ion-color-secondary: #50c8ff;
-    --ion-color-secondary-rgb: 80,200,255;
-    --ion-color-secondary-contrast: #ffffff;
-    --ion-color-secondary-contrast-rgb: 255,255,255;
-    --ion-color-secondary-shade: #46b0e0;
-    --ion-color-secondary-tint: #62ceff;
-
-    --ion-color-tertiary: #6a64ff;
-    --ion-color-tertiary-rgb: 106,100,255;
-    --ion-color-tertiary-contrast: #ffffff;
-    --ion-color-tertiary-contrast-rgb: 255,255,255;
-    --ion-color-tertiary-shade: #5d58e0;
-    --ion-color-tertiary-tint: #7974ff;
-
-    --ion-color-success: #2fdf75;
-    --ion-color-success-rgb: 47,223,117;
-    --ion-color-success-contrast: #000000;
-    --ion-color-success-contrast-rgb: 0,0,0;
-    --ion-color-success-shade: #29c467;
-    --ion-color-success-tint: #44e283;
-
-    --ion-color-warning: #ffd534;
-    --ion-color-warning-rgb: 255,213,52;
-    --ion-color-warning-contrast: #000000;
-    --ion-color-warning-contrast-rgb: 0,0,0;
-    --ion-color-warning-shade: #e0bb2e;
-    --ion-color-warning-tint: #ffd948;
-
-    --ion-color-danger: #ff4961;
-    --ion-color-danger-rgb: 255,73,97;
-    --ion-color-danger-contrast: #ffffff;
-    --ion-color-danger-contrast-rgb: 255,255,255;
-    --ion-color-danger-shade: #e04055;
-    --ion-color-danger-tint: #ff5b71;
-
-    --ion-color-dark: #f4f5f8;
-    --ion-color-dark-rgb: 244,245,248;
-    --ion-color-dark-contrast: #000000;
-    --ion-color-dark-contrast-rgb: 0,0,0;
-    --ion-color-dark-shade: #d7d8da;
-    --ion-color-dark-tint: #f5f6f9;
-
-    --ion-color-medium: #989aa2;
-    --ion-color-medium-rgb: 152,154,162;
-    --ion-color-medium-contrast: #000000;
-    --ion-color-medium-contrast-rgb: 0,0,0;
-    --ion-color-medium-shade: #86888f;
-    --ion-color-medium-tint: #a2a4ab;
-
-    --ion-color-light: #222428;
-    --ion-color-light-rgb: 34,36,40;
-    --ion-color-light-contrast: #ffffff;
-    --ion-color-light-contrast-rgb: 255,255,255;
-    --ion-color-light-shade: #1e2023;
-    --ion-color-light-tint: #383a3e;
-  }
-
-  /*
-   * iOS Dark Theme
-   * -------------------------------------------
-   */
-
-  .ios body {
-    --ion-background-color: #000000;
-    --ion-background-color-rgb: 0,0,0;
-
-    --ion-text-color: #ffffff;
-    --ion-text-color-rgb: 255,255,255;
-
-    --ion-color-step-50: #0d0d0d;
-    --ion-color-step-100: #1a1a1a;
-    --ion-color-step-150: #262626;
-    --ion-color-step-200: #333333;
-    --ion-color-step-250: #404040;
-    --ion-color-step-300: #4d4d4d;
-    --ion-color-step-350: #595959;
-    --ion-color-step-400: #666666;
-    --ion-color-step-450: #737373;
-    --ion-color-step-500: #808080;
-    --ion-color-step-550: #8c8c8c;
-    --ion-color-step-600: #999999;
-    --ion-color-step-650: #a6a6a6;
-    --ion-color-step-700: #b3b3b3;
-    --ion-color-step-750: #bfbfbf;
-    --ion-color-step-800: #cccccc;
-    --ion-color-step-850: #d9d9d9;
-    --ion-color-step-900: #e6e6e6;
-    --ion-color-step-950: #f2f2f2;
-
-    --ion-item-background: #000000;
-
-    --ion-card-background: #1c1c1d;
-  }
-
-  .ios ion-modal {
-    --ion-background-color: var(--ion-color-step-100);
-    --ion-toolbar-background: var(--ion-color-step-150);
-    --ion-toolbar-border-color: var(--ion-color-step-250);
-  }
-
-
-  /*
-   * Material Design Dark Theme
-   * -------------------------------------------
-   */
-
-  .md body {
-    --ion-background-color: #121212;
-    --ion-background-color-rgb: 18,18,18;
-
-    --ion-text-color: #ffffff;
-    --ion-text-color-rgb: 255,255,255;
-
-    --ion-border-color: #222222;
-
-    --ion-color-step-50: #1e1e1e;
-    --ion-color-step-100: #2a2a2a;
-    --ion-color-step-150: #363636;
-    --ion-color-step-200: #414141;
-    --ion-color-step-250: #4d4d4d;
-    --ion-color-step-300: #595959;
-    --ion-color-step-350: #656565;
-    --ion-color-step-400: #717171;
-    --ion-color-step-450: #7d7d7d;
-    --ion-color-step-500: #898989;
-    --ion-color-step-550: #949494;
-    --ion-color-step-600: #a0a0a0;
-    --ion-color-step-650: #acacac;
-    --ion-color-step-700: #b8b8b8;
-    --ion-color-step-750: #c4c4c4;
-    --ion-color-step-800: #d0d0d0;
-    --ion-color-step-850: #dbdbdb;
-    --ion-color-step-900: #e7e7e7;
-    --ion-color-step-950: #f3f3f3;
-
-    --ion-item-background: #1e1e1e;
-
-    --ion-toolbar-background: #1f1f1f;
-
-    --ion-tab-bar-background: #1f1f1f;
-
-    --ion-card-background: #1e1e1e;
-  }
 }