golf пре 3 година
родитељ
комит
b2f75d24ec

+ 10 - 25
src/app/home/home.page.html

@@ -1,11 +1,11 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="toolbar-bg-color">
3
+    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
3 4
     <ion-buttons slot="end">
4 5
       <ion-menu-button>
5
-        <ion-icon src="../assets/icon/menu-svgrepo-com.svg"></ion-icon>
6
+        <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
6 7
       </ion-menu-button>
7 8
     </ion-buttons>
8
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
9 9
   </ion-toolbar>
10 10
 </ion-header>
11 11
 <ion-content>
@@ -50,30 +50,15 @@
50 50
         <hr>
51 51
       </ion-col>
52 52
     </ion-row>
53
-    <ion-row>
54
-      <ion-col size="5">
55
-        <img src="../../assets/img-static/mqdefault-1.jpg">
56
-      </ion-col>
57
-      <ion-col class="ion-align-self-center">Morning Talk [26-10-2022 l 07:30 - 09:00 น. ]</ion-col>
58
-    </ion-row>
59
-    <ion-row>
60
-      <ion-col size="5">
61
-        <img src="../../assets/img-static/mqdefault-2.jpg">
62
-      </ion-col>
63
-      <ion-col class="ion-align-self-center">Golf Trick [26-10-2022 l 09:00 - 10:00 น.]</ion-col>
64
-    </ion-row>
65
-    <ion-row>
66
-      <ion-col size="5">
67
-        <img src="../../assets/img-static/mqdefault-3.jpg">
68
-      </ion-col>
69
-      <ion-col class="ion-align-self-center">เจาะสนามบอลไทย [ 20-10-2022 l 20:00 - 21:30 น. ]</ion-col>
70
-    </ion-row>
71
-  </ion-grid>
72
-  <div *ngIf="ytalldata">
73
-    <div *ngFor="let ytdata of ytalldata['items']">
74
-      <span>{{ytdata.snippet.title}}</span>
53
+    <div *ngIf="ytalldata">
54
+      <ion-row *ngFor="let ytdata of ytalldata['items']| slice:0:4">
55
+        <ion-col size="5">
56
+          <img [src]="ytdata.snippet.thumbnails.high.url" [style.width]="'100%'" />
57
+        </ion-col>
58
+        <ion-col class="ion-align-self-center"><a href="https://www.youtube.com/watch?v={{ytdata.id.videoId}}"><span [innerHTML]="ytdata.snippet.title"></span></a></ion-col>
59
+      </ion-row>
75 60
     </div>
76
-  </div>
61
+  </ion-grid>
77 62
   <ion-grid>
78 63
     <img src="../../../assets/img-static/banner-320x100.jpeg" alt="">
79 64
   </ion-grid>

+ 1 - 1
src/app/home/home.page.ts

@@ -13,7 +13,7 @@ SwiperCore.use([Pagination, Autoplay, Navigation, Keyboard]);
13 13
 })
14 14
 export class HomePage implements AfterContentChecked {
15 15
 
16
-  newsdata: any = [];
16
+  newsdata: any;
17 17
   ytalldata: any;
18 18
 
19 19
   @ViewChild('swiper') swiper: SwiperComponent;

+ 4 - 3
src/app/news-detail/news-detail.page.html

@@ -1,12 +1,13 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="toolbar-bg-color">
3
+    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
3 4
     <ion-buttons slot="end">
4
-      <ion-menu-button></ion-menu-button>
5
+      <ion-menu-button>
6
+        <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
7
+      </ion-menu-button>
5 8
     </ion-buttons>
6
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
7 9
   </ion-toolbar>
8 10
 </ion-header>
9
-
10 11
 <ion-content>
11 12
   <ion-grid>
12 13
     <ion-row>

+ 4 - 3
src/app/news/news.page.html

@@ -1,12 +1,13 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="toolbar-bg-color">
3
+    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
3 4
     <ion-buttons slot="end">
4
-      <ion-menu-button></ion-menu-button>
5
+      <ion-menu-button>
6
+        <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
7
+      </ion-menu-button>
5 8
     </ion-buttons>
6
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
7 9
   </ion-toolbar>
8 10
 </ion-header>
9
-
10 11
 <ion-content>
11 12
   <ion-grid>
12 13
     <ion-row>

+ 2 - 2
src/app/services/wpdata.service.ts

@@ -30,8 +30,8 @@ export class WpdataService {
30 30
 
31 31
   getAllYoutube() {
32 32
     return this.http.get(
33
-      "../assets/api/youtube-data.json"
34
-      // https://youtube.googleapis.com/youtube/v3/search?part=snippet&channelId=UCfZdHbI3pIN4uselPFzzbOg&maxResults=5&order=date&key=AIzaSyDsRrS_dUxT_3PFaMZIBBdrbl37p_fqrNY
33
+      // "../assets/api/youtube-data.json"
34
+      "https://youtube.googleapis.com/youtube/v3/search?part=snippet&channelId=UCfZdHbI3pIN4uselPFzzbOg&maxResults=5&order=date&key=AIzaSyDsRrS_dUxT_3PFaMZIBBdrbl37p_fqrNY"
35 35
     );
36 36
   }
37 37
 }

+ 4 - 3
src/app/youtube/youtube.page.html

@@ -1,12 +1,13 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="toolbar-bg-color">
3
+    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
3 4
     <ion-buttons slot="end">
4
-      <ion-menu-button></ion-menu-button>
5
+      <ion-menu-button>
6
+        <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
7
+      </ion-menu-button>
5 8
     </ion-buttons>
6
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
7 9
   </ion-toolbar>
8 10
 </ion-header>
9
-
10 11
 <ion-content>
11 12
   <img src="../../../assets/img-static/banner-320x50.jpeg" alt="">
12 13
   <ion-grid>