Kaynağa Gözat

edit hone + news-detail

golf 3 yıl önce
ebeveyn
işleme
8f40d05b3f

+ 20 - 5
src/app/app.component.html

8
     <ion-content>
8
     <ion-content>
9
       <ion-list>
9
       <ion-list>
10
         <ion-menu-toggle auto-hide="true">
10
         <ion-menu-toggle auto-hide="true">
11
-          <ion-item routerLink="/tabs/tab1" routerDirection="forward">
12
-            <ion-label>Tab 111</ion-label>
11
+          <ion-item (click)="aboutUs()">
12
+          <ion-icon name="information-circle" slot="start"></ion-icon>
13
+            <ion-label>fm99activeradio.mcot.net</ion-label>
13
           </ion-item>
14
           </ion-item>
14
           <ion-item routerLink="/tabs/tab2" routerDirection="forward">
15
           <ion-item routerLink="/tabs/tab2" routerDirection="forward">
15
-            <ion-label>Tab 2</ion-label>
16
+            <ion-label>Facebok : fm99activeradio</ion-label>
16
           </ion-item>
17
           </ion-item>
17
           <ion-item routerLink="/tabs/tab3" routerDirection="forward">
18
           <ion-item routerLink="/tabs/tab3" routerDirection="forward">
18
-            <ion-label>Tab 3</ion-label>
19
+            <ion-label>Youtube</ion-label>
20
+          </ion-item>
21
+          <ion-item routerLink="/tabs/tab3" routerDirection="forward">
22
+            <ion-label>line</ion-label>
23
+          </ion-item>
24
+          <ion-item routerLink="/tabs/tab3" routerDirection="forward">
25
+            <ion-label>Policy</ion-label>
19
           </ion-item>
26
           </ion-item>
20
         </ion-menu-toggle>
27
         </ion-menu-toggle>
28
+        <div>
29
+          คลื่นเมืองไทยแข็งแรง F.M. 99 MHz
30
+          ที่อยู่: 63/1 ถ. พระราม 9 ห้วยขวาง กทม. 10310
31
+โทร: 02-248-5936-7
32
+ข้อความผ่านมือถือ (SMS): 4689899
33
+อีเมล์: fm99mcot@hotmail.com
34
+ส่วนขาย: 02-201-6736, 02-201-6550
35
+        </div>
21
       </ion-list>
36
       </ion-list>
22
     </ion-content>
37
     </ion-content>
23
   </ion-menu>
38
   </ion-menu>
24
   <ion-router-outlet id="content"></ion-router-outlet>
39
   <ion-router-outlet id="content"></ion-router-outlet>
25
-</ion-app>  
40
+</ion-app>

+ 4 - 2
src/app/home/home.page.ts

38
   }
38
   }
39
 
39
 
40
   ionViewWillEnter() {
40
   ionViewWillEnter() {
41
-    this.wpgetdataService.getAllNews().subscribe((data) => {
42
-      this.newsdata = data;
41
+    // this.wpgetdataService.getAllNews().subscribe((data) => {
42
+      this.wpgetdataService.getAllNews().then((data) => {
43
+      // this.newsdata = data;
44
+      this.newsdata = JSON.parse(data.data);
43
       console.log('load News Data');
45
       console.log('load News Data');
44
       console.log(this.newsdata);
46
       console.log(this.newsdata);
45
     });
47
     });

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

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

+ 9 - 5
src/app/news-detail/news-detail.page.ts

25
     let id = this.route.snapshot.paramMap.get('id') || this.id;
25
     let id = this.route.snapshot.paramMap.get('id') || this.id;
26
     console.log("fetching ...");
26
     console.log("fetching ...");
27
     console.log(id);
27
     console.log(id);
28
-    // this.wpdataService.getNewsDetail(id).subscribe((data) => {
29
-    // console.log();
30
-    this.wpdataService.getNewsDetail(id).subscribe(res => {
31
-      this.data = res;
32
-      console.log(this.data);
28
+    this.wpdataService.getNewsDetail(id).then(res => {
29
+      // this.data = res;
30
+      // console.log(this.data);
31
+      let post = JSON.parse(res.data);
32
+      console.log(" get data ", post);
33
+      post['media_url'] = post['_embedded']['wp:featuredmedia'][0]['media_details'].sizes['medium'].source_url;
34
+      this.data = post;
35
+    }, error => {
36
+      console.log("errror ", error);
33
     });
37
     });
34
   }
38
   }
35
 
39
 

+ 1 - 1
src/app/news/news.page.html

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

+ 6 - 3
src/app/news/news.page.ts

10
 })
10
 })
11
 export class NewsPage implements OnInit {
11
 export class NewsPage implements OnInit {
12
 
12
 
13
-  newsdata: any = [];
13
+  newsdata: any;
14
 
14
 
15
   constructor(private wpgetdataService: WpdataService) { }
15
   constructor(private wpgetdataService: WpdataService) { }
16
 
16
 
20
 
20
 
21
 
21
 
22
   ionViewWillEnter() {
22
   ionViewWillEnter() {
23
-    this.wpgetdataService.getAllNews().subscribe((data) => {
24
-      this.newsdata = data;
23
+    // this.wpgetdataService.getAllNews().subscribe((data) => {
24
+      this.wpgetdataService.getAllNews().then((data) => {
25
+        // this.wpdataService.getNewsData().then(data => {
26
+      // this.newsdata = data;
27
+      this.newsdata = JSON.parse(data.data);
25
       console.log('load News Data');
28
       console.log('load News Data');
26
       console.log(this.newsdata);
29
       console.log(this.newsdata);
27
       });
30
       });

+ 5 - 3
src/app/services/wpdata.service.ts

33
   //   );
33
   //   );
34
   // }
34
   // }
35
   getAllNews() {
35
   getAllNews() {
36
-    return this.httpc.get(
37
-      "https://fm99activeradio.mcot.net/wp-json/wp/v2/news?_embed"
36
+    // return this.httpc.get(
37
+        return this.http.get(
38
+      "https://fm99activeradio.mcot.net/wp-json/wp/v2/news?_embed", {}, {}
38
     );
39
     );
39
   }
40
   }
40
 
41
 
41
   getNewsDetail(id) {
42
   getNewsDetail(id) {
42
     let url = 'https://fm99activeradio.mcot.net/'
43
     let url = 'https://fm99activeradio.mcot.net/'
43
     const route = url + 'wp-json/wp/v2/' + 'news/' + id + '?_embed';
44
     const route = url + 'wp-json/wp/v2/' + 'news/' + id + '?_embed';
44
-    return this.httpc.get(route);
45
+    return this.http.get(route ,{} ,{});
46
+    // return this.http.get(route, {}, {});
45
   }
47
   }
46
 
48
 
47
   getAllYoutube() {
49
   getAllYoutube() {

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

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

+ 0 - 151
src/theme/variables.scss

82
    * -------------------------------------------
82
    * -------------------------------------------
83
    */
83
    */
84
 
84
 
85
-  body {
86
-    --ion-color-primary: #428cff;
87
-    --ion-color-primary-rgb: 66,140,255;
88
-    --ion-color-primary-contrast: #ffffff;
89
-    --ion-color-primary-contrast-rgb: 255,255,255;
90
-    --ion-color-primary-shade: #3a7be0;
91
-    --ion-color-primary-tint: #5598ff;
92
-
93
-    --ion-color-secondary: #50c8ff;
94
-    --ion-color-secondary-rgb: 80,200,255;
95
-    --ion-color-secondary-contrast: #ffffff;
96
-    --ion-color-secondary-contrast-rgb: 255,255,255;
97
-    --ion-color-secondary-shade: #46b0e0;
98
-    --ion-color-secondary-tint: #62ceff;
99
-
100
-    --ion-color-tertiary: #6a64ff;
101
-    --ion-color-tertiary-rgb: 106,100,255;
102
-    --ion-color-tertiary-contrast: #ffffff;
103
-    --ion-color-tertiary-contrast-rgb: 255,255,255;
104
-    --ion-color-tertiary-shade: #5d58e0;
105
-    --ion-color-tertiary-tint: #7974ff;
106
-
107
-    --ion-color-success: #2fdf75;
108
-    --ion-color-success-rgb: 47,223,117;
109
-    --ion-color-success-contrast: #000000;
110
-    --ion-color-success-contrast-rgb: 0,0,0;
111
-    --ion-color-success-shade: #29c467;
112
-    --ion-color-success-tint: #44e283;
113
-
114
-    --ion-color-warning: #ffd534;
115
-    --ion-color-warning-rgb: 255,213,52;
116
-    --ion-color-warning-contrast: #000000;
117
-    --ion-color-warning-contrast-rgb: 0,0,0;
118
-    --ion-color-warning-shade: #e0bb2e;
119
-    --ion-color-warning-tint: #ffd948;
120
-
121
-    --ion-color-danger: #ff4961;
122
-    --ion-color-danger-rgb: 255,73,97;
123
-    --ion-color-danger-contrast: #ffffff;
124
-    --ion-color-danger-contrast-rgb: 255,255,255;
125
-    --ion-color-danger-shade: #e04055;
126
-    --ion-color-danger-tint: #ff5b71;
127
-
128
-    --ion-color-dark: #f4f5f8;
129
-    --ion-color-dark-rgb: 244,245,248;
130
-    --ion-color-dark-contrast: #000000;
131
-    --ion-color-dark-contrast-rgb: 0,0,0;
132
-    --ion-color-dark-shade: #d7d8da;
133
-    --ion-color-dark-tint: #f5f6f9;
134
-
135
-    --ion-color-medium: #989aa2;
136
-    --ion-color-medium-rgb: 152,154,162;
137
-    --ion-color-medium-contrast: #000000;
138
-    --ion-color-medium-contrast-rgb: 0,0,0;
139
-    --ion-color-medium-shade: #86888f;
140
-    --ion-color-medium-tint: #a2a4ab;
141
-
142
-    --ion-color-light: #222428;
143
-    --ion-color-light-rgb: 34,36,40;
144
-    --ion-color-light-contrast: #ffffff;
145
-    --ion-color-light-contrast-rgb: 255,255,255;
146
-    --ion-color-light-shade: #1e2023;
147
-    --ion-color-light-tint: #383a3e;
148
-  }
149
-
150
-  /*
151
-   * iOS Dark Theme
152
-   * -------------------------------------------
153
-   */
154
-
155
-  .ios body {
156
-    --ion-background-color: #000000;
157
-    --ion-background-color-rgb: 0,0,0;
158
-
159
-    --ion-text-color: #ffffff;
160
-    --ion-text-color-rgb: 255,255,255;
161
-
162
-    --ion-color-step-50: #0d0d0d;
163
-    --ion-color-step-100: #1a1a1a;
164
-    --ion-color-step-150: #262626;
165
-    --ion-color-step-200: #333333;
166
-    --ion-color-step-250: #404040;
167
-    --ion-color-step-300: #4d4d4d;
168
-    --ion-color-step-350: #595959;
169
-    --ion-color-step-400: #666666;
170
-    --ion-color-step-450: #737373;
171
-    --ion-color-step-500: #808080;
172
-    --ion-color-step-550: #8c8c8c;
173
-    --ion-color-step-600: #999999;
174
-    --ion-color-step-650: #a6a6a6;
175
-    --ion-color-step-700: #b3b3b3;
176
-    --ion-color-step-750: #bfbfbf;
177
-    --ion-color-step-800: #cccccc;
178
-    --ion-color-step-850: #d9d9d9;
179
-    --ion-color-step-900: #e6e6e6;
180
-    --ion-color-step-950: #f2f2f2;
181
-
182
-    --ion-item-background: #000000;
183
-
184
-    --ion-card-background: #1c1c1d;
185
-  }
186
-
187
-  .ios ion-modal {
188
-    --ion-background-color: var(--ion-color-step-100);
189
-    --ion-toolbar-background: var(--ion-color-step-150);
190
-    --ion-toolbar-border-color: var(--ion-color-step-250);
191
-  }
192
-
193
-
194
-  /*
195
-   * Material Design Dark Theme
196
-   * -------------------------------------------
197
-   */
198
-
199
-  .md body {
200
-    --ion-background-color: #121212;
201
-    --ion-background-color-rgb: 18,18,18;
202
-
203
-    --ion-text-color: #ffffff;
204
-    --ion-text-color-rgb: 255,255,255;
205
-
206
-    --ion-border-color: #222222;
207
-
208
-    --ion-color-step-50: #1e1e1e;
209
-    --ion-color-step-100: #2a2a2a;
210
-    --ion-color-step-150: #363636;
211
-    --ion-color-step-200: #414141;
212
-    --ion-color-step-250: #4d4d4d;
213
-    --ion-color-step-300: #595959;
214
-    --ion-color-step-350: #656565;
215
-    --ion-color-step-400: #717171;
216
-    --ion-color-step-450: #7d7d7d;
217
-    --ion-color-step-500: #898989;
218
-    --ion-color-step-550: #949494;
219
-    --ion-color-step-600: #a0a0a0;
220
-    --ion-color-step-650: #acacac;
221
-    --ion-color-step-700: #b8b8b8;
222
-    --ion-color-step-750: #c4c4c4;
223
-    --ion-color-step-800: #d0d0d0;
224
-    --ion-color-step-850: #dbdbdb;
225
-    --ion-color-step-900: #e7e7e7;
226
-    --ion-color-step-950: #f3f3f3;
227
-
228
-    --ion-item-background: #1e1e1e;
229
-
230
-    --ion-toolbar-background: #1f1f1f;
231
-
232
-    --ion-tab-bar-background: #1f1f1f;
233
-
234
-    --ion-card-background: #1e1e1e;
235
-  }
236
 }
85
 }