hed table segment"> 
@@ -4,6 +4,8 @@ import { WpServiceService } from '../wp-service.service';
4 4
5 5 
 import { Geolocation } from '@ionic-native/geolocation/ngx';
6 6 
 import { NativeGeocoder, NativeGeocoderResult, NativeGeocoderOptions } from '@ionic-native/native-geocoder/ngx';
7 
+import { CallNumber } from '@ionic-native/call-number/ngx';
8 
+import { EmailComposer } from '@ionic-native/email-composer/ngx';
7 9
8 10 
 declare var google;
9 11 
 
@@ -17,6 +19,8 @@ export class PlacedetailPage implements OnInit {
17 19 
   data: any;
18 20 
   placelist: any;
19 21
22 
+  public segment: string = "list1";
23 
+
20 24 
   @ViewChild('map', { static: false }) mapElement: ElementRef;
21 25 
   map: any;
22 26 
   address: string;
 
@@ -24,9 +28,9 @@ export class PlacedetailPage implements OnInit {
24 28 
   longitude: number;
25 29 
   latdynamic: any;
26 30 
   londynamic: any;
27 
-
28 31
29 
-  constructor(private wpservice: WpServiceService, private route: ActivatedRoute, private router: Router, private geolocation: Geolocation, private nativeGeocoder: NativeGeocoder) { }
32 
+
33 
+  constructor(private wpservice: WpServiceService, private route: ActivatedRoute, private router: Router, private geolocation: Geolocation, private nativeGeocoder: NativeGeocoder,private callNumber: CallNumber, private emailComposer: EmailComposer) { }
30 34 
   @Input() id: string;
31 35 
   showDiss = false;
32 36 
 
@@ -121,21 +125,17 @@ export class PlacedetailPage implements OnInit {
121 125
122 126 
   }
123 127
124 
-  // getAddressFromCoords2(lattitude, longitude) {
125 
-  //   console.log("getAddressFromCoords2 " + lattitude + " " + longitude);
126 
-  //   let options: NativeGeocoderOptions = {
127 
-  //     useLocale: true,
128 
-  //     maxResults: 5
129 
-  //   };
130 
-  // }
131 
-
132 
-  // getGeoencoder(latitude, longitude) {
133 
-  //   this.nativeGeocoder.reverseGeocode(latitude, longitude, this.geoencoderOptions)
134 
-  //     .then((result: NativeGeocoderResult[]) => {
135 
-  //       this.address = this.generateAddress(result[0]);
136 
-  //     })
137 
-  //     .catch((error: any) => {
138 
-  //       alert('Error getting location' + JSON.stringify(error));
139 
-  //     });
140 
-  // }
128 
+  segmentChanged(ev: any) {
129 
+    this.segment = ev.detail.value;
130 
+  }
131 
+
132 
+  callNow(number) {
133 
+    this.callNumber.callNumber(number, true)
134 
+      .then(res => console.log('Launched dialer!', res))
135 
+      .catch(err => console.log('Error launching dialer', err));
136 
+  }
137 
+
138 
+  email2Place(mail) {
139 
+    this.emailComposer.open(mail)
140 
+  }
141 141 
 }

+ 18 - 11
src/app/profile/profile.page.html
查看文件 

@@ -1,10 +1,14 @@
1 1 
 <ion-header>
2 
-  <ion-toolbar>
2 
+  <ion-toolbar class="new-background-color">
3 
+    <ion-buttons slot="start" color="light">
4 
+      <ion-back-button></ion-back-button>
5 
+    </ion-buttons>
3 6 
     <ion-title>Wellness Route</ion-title>
4 7 
   </ion-toolbar>
5 8 
 </ion-header>
6 
-<ion-content fullscreen="true">
7 
-  <!-- <div *ngIf="(user2 | async) as user; else loading"> -->
9 
+<ion-content>
10 
+  <ion-grid>
11 
+    <!-- <div *ngIf="(user2 | async) as user; else loading"> -->
8 12 
     <ion-row>
9 13 
       <ion-col>
10 14 
         <div class="ion-text-center">
 
@@ -17,32 +21,35 @@
17 21 
         <div class="card">
18 22 
           <div class="header">
19 23 
             <div class="avatar">
20 
-              <img [src]="$any(user).picture_large.data.url" *ngIf="user['picture_large'] != undefined" />
21 
-              <img src="/assets/images/icon-user.png" *ngIf="user['picture_large'] == undefined" />
24 
+              <!-- <img [src]="$any(user).picture_large.data.url" *ngIf="user['picture_large'] != undefined" /> -->
25 
+              <!-- <img src="/assets/images/icon-user.png" *ngIf="user['picture_large'] == undefined" /> -->
26 
+              <img src="/assets/images/icon-user.png">
22 27 
             </div>
23 28 
           </div>
24 29 
         </div>
25 30 
         <div class="card-body">
26 31 
           <div class="user-meta ion-text-center">
27 
-            <h3 class="playername">{{ $any(user).name }}</h3>
32 
+            <!-- <h3 class="playername">{{ $any(user).name }}</h3> -->
28 33 
           </div>
29 34 
           <form>
30 35 
             <ion-item lines="full">
31 36 
               <ion-label>ชื่อ</ion-label>
32 
-              {{ $any(user).name }}
37 
+              <!-- {{ $any(user).name }} -->
33 38 
             </ion-item>
34 39 
             <ion-item lines="full">
35 
-              <ion-label>Email</ion-label>{{ $any(user).email }}
40 
+              <ion-label>อีเมล์</ion-label>
41 
+              <!-- {{ $any(user).email }} -->
36 42 
             </ion-item>
37 43 
             <div class="ion-padding-vertical">
38 
-              <ion-button type="submit" color="danger" expand="block" (click)="logout()">Log Out</ion-button>
44 
+              <!-- <ion-button type="submit" color="danger" expand="block" (click)="logout()">Log Out</ion-button> -->
39 45 
             </div>
40 46 
           </form>
41 47 
         </div>
42 48 
       </ion-col>
43 49 
     </ion-row>
44 
-  <!-- </div> -->
45 
-  <!-- <ng-template #loading>
50 
+    <!-- </div> -->
51 
+    <!-- <ng-template #loading>
46 52 
     Loading stuff...
47 53 
   </ng-template> -->
54 
+  </ion-grid>
48 55 
 </ion-content>

+ 1 - 0
src/app/profile/profile.page.ts
查看文件 

@@ -8,6 +8,7 @@ import { Component, OnInit } from '@angular/core';
8 8 
 export class ProfilePage implements OnInit {
9 9
10 10 
   user2: any;
11 
+  user: any;
11 12
12 13 
   constructor() { }
13 14

+ 28 - 29
src/app/province/province.page.html
查看文件 

@@ -6,34 +6,33 @@
6 6 
     <ion-title>Wellnewss Route</ion-title>
7 7 
   </ion-toolbar>
8 8 
 </ion-header>
9 
-
10 9 
 <ion-content>
11 
-  <img src="/assets/images/welcome_drone.jpeg" alt="">
12 
-  <div class="holidaycard">
13 
-    <ion-grid>
14 
-      <ion-row>
15 
-        <ion-col size="12">
16 
-          <div class="txt-place-title">Province Name</div>
17 
-        </ion-col>
18 
-      </ion-row>
19 
-      <ion-row>
20 
-        <ion-col>
21 
-          <ion-toolbar class="search">
22 
-            <ion-searchbar placeholder="ค้นหา"></ion-searchbar>
23 
-          </ion-toolbar>
24 
-        </ion-col>
25 
-      </ion-row>
26 
-      <ion-card *ngFor="let provlist of provicelist">
27 
-        <div *ngIf="$any(provlist).better_featured_image != null">
28 
-          <img src="{{$any(provlist).better_featured_image.source_url}}" alt="">
29 
-        </div>
30 
-        <div *ngIf="$any(provlist).better_featured_image == null">
31 
-          <img src="/assets/images/temp.png" />
32 
-        </div>
33 
-        <ion-card-header>
34 
-          <a [routerLink]="['/tabs/place/', provlist.id]"><ion-card-title [innerHTML]="provlist.title.rendered"></ion-card-title></a>
35 
-        </ion-card-header>
36 
-      </ion-card>
37 
-    </ion-grid>
38 
-  </div>
10 
+  <img src="/assets/images/image-004.jpg" alt="">
11 
+  <ion-grid>
12 
+    <ion-row>
13 
+      <ion-col size="12">
14 
+        <div class="txt-place-title">Province Name</div>
15 
+      </ion-col>
16 
+    </ion-row>
17 
+    <ion-row>
18 
+      <ion-col>
19 
+        <ion-toolbar class="search">
20 
+          <ion-searchbar placeholder="ค้นหา"></ion-searchbar>
21 
+        </ion-toolbar>
22 
+      </ion-col>
23 
+    </ion-row>
24 
+    <ion-card *ngFor="let provlist of provicelist">
25 
+      <div *ngIf="$any(provlist).better_featured_image != null">
26 
+        <img src="{{$any(provlist).better_featured_image.source_url}}" alt="">
27 
+      </div>
28 
+      <div *ngIf="$any(provlist).better_featured_image == null">
29 
+        <img src="/assets/images/temp.png" />
30 
+      </div>
31 
+      <ion-card-header>
32 
+        <a [routerLink]="['/tabs/place/', provlist.id]">
33 
+          <ion-card-title [innerHTML]="provlist.title.rendered"></ion-card-title>
34 
+        </a>
35 
+      </ion-card-header>
36 
+    </ion-card>
37 
+  </ion-grid>
39 38 
 </ion-content>

+ 12 - 12
src/app/province/province.page.scss
查看文件 

@@ -1,16 +1,16 @@
1 1
2 
-.holidaycard {
3 
-  position: absolute;
4 
-  left: 0px;
5 
-  // bottom: 0px;
6 
-  top:200px;
7 
-  min-height: 48%;
8 
-  width: 100%;
9 
-  padding: 5px;
10 
-  border-radius: 15px ;
11 
-  background: white;
12 
-  --background: white;
13 
-}
2 
+// .holidaycard {
3 
+//   position: absolute;
4 
+//   left: 0px;
5 
+//   // bottom: 0px;
6 
+//   top:200px;
7 
+//   min-height: 48%;
8 
+//   width: 100%;
9 
+//   padding: 5px;
10 
+//   border-radius: 15px ;
11 
+//   background: white;
12 
+//   --background: white;
13 
+// }
14 14
15 15 
 ion-card-title {
16 16 
   font-family: "IBM Plex Sans Thai", sans-serif !important;

+ 10 - 7
src/app/register-form/register-form.page.html
查看文件 

@@ -1,10 +1,13 @@
1 1 
 <ion-header>
2 
-  <ion-toolbar>
2 
+  <ion-toolbar class="new-background-color">
3 
+    <ion-buttons slot="start" color="light">
4 
+      <ion-back-button></ion-back-button>
5 
+    </ion-buttons>
3 6 
     <ion-title>Wellness Route</ion-title>
4 7 
   </ion-toolbar>
5 8 
 </ion-header>
6 
-
7 9 
 <ion-content>
10 
+  <div><img src="/assets/images/image-001.jpg"></div>
8 11 
   <ion-row>
9 12 
     <ion-col>
10 13 
       <div class="ion-text-center">
 
@@ -13,9 +16,9 @@
13 16 
     </ion-col>
14 17 
   </ion-row>
15 18 
   <ion-row>
16 
-    <ion-col>
19 
+    <ion-col>
17 20 
       <form>
18 
-        <ion-text *ngIf="errorText" color="primary" style='background-color:#fff'>
21 
+        <ion-text *ngIf="errorText" color="primary">
19 22 
           {{ errorText }}
20 23 
         </ion-text>
21 24 
         <ion-item lines="full">
 
@@ -45,9 +48,9 @@
45 48 
         </ion-item>
46 49
47 50 
         <div class="ion-padding-vertical">
48 
-          <ion-button type="submit" color="success" expand="block" (click)="register()">ลงทะเบียน</ion-button>
51 
+          <ion-button type="submit" color="success" expand="block">ลงทะเบียน</ion-button>
49 52 
         </div>
50 53 
       </form>
51 54 
     </ion-col>
52 
-  </ion-row>
53 
-</ion-content>
55 
+  </ion-row>
56 
+</ion-content>

+ 10 - 7
src/app/register/register.page.html
查看文件 

@@ -1,20 +1,23 @@
1 1 
 <ion-header>
2 
-  <ion-toolbar>
3 
-    <ion-title>ลงทะเบียน</ion-title>
2 
+  <ion-toolbar class="new-background-color">
3 
+    <ion-buttons slot="start" color="light">
4 
+      <ion-back-button></ion-back-button>
5 
+    </ion-buttons>
6 
+    <ion-title>Wellness Route</ion-title>
4 7 
   </ion-toolbar>
5 8 
 </ion-header>
6 
-
7 9 
 <ion-content class="auth-form">
10 
+  <div><img src="/assets/images/image-001.jpg"></div>
8 11 
   <ion-grid>
9 12 
     <ion-row>
10 13 
       <ion-col align-self-center>
11 
-        <ion-button [routerLink]="['/registration']" expand="block" color="primary">Register</ion-button>
14 
+        <ion-button [routerLink]="['/register-form']" expand="block" color="primary">ลงทะเบียนผู้ใช้งาน</ion-button>
12 15
13 
-        <span class="divider line one-line">or</span>
16 
+        <span class="divider line one-line">หรือ</span>
14 17
15 
-        <span class="already">Already a user?</span>
18 
+        <span class="already">มีชื่อผู้ใช้งานแล้ว</span>
16 19
17 
-        <ion-button [routerLink]="['/login']" expand="block" color="danger">Sign In</ion-button>
20 
+        <ion-button [routerLink]="['/login']" expand="block" color="danger">เข้าสู่ระบบ</ion-button>
18 21 
       </ion-col>
19 22 
     </ion-row>
20 23 
   </ion-grid>

+ 2 - 2
src/app/register/register.page.scss
查看文件 

@@ -12,7 +12,7 @@
12 12 
   .line {
13 13 
     align-items: center;
14 14 
     margin: 1em -1em;
15 
-    color: #cccccc;
15 
+    color: #5f5e5e;
16 16
17 17 
     &:before,
18 18 
     &:after {
 
@@ -24,7 +24,7 @@
24 24 
   .one-line {
25 25 
     &:before,
26 26 
     &:after {
27 
-       background: #cccccc;
27 
+       background: #5f5e5e;
28 28 
     }
29 29 
   }
30 30

+ 29 - 24
src/app/reset-password/reset-password.page.html
查看文件 

@@ -1,33 +1,38 @@
1 1 
 <ion-header>
2 
-  <ion-toolbar>
2 
+  <ion-toolbar class="new-background-color">
3 
+    <ion-buttons slot="start" color="light">
4 
+      <ion-back-button></ion-back-button>
5 
+    </ion-buttons>
3 6 
     <ion-title>Wellness Route</ion-title>
4 7 
   </ion-toolbar>
5 8 
 </ion-header>
6 
-
7 9 
 <ion-content>
8 
-  <ion-row>
9 
-    <ion-col class="ion-text-center">
10 
-      <h1>กรุณาใส่รหัสผ่านใหม่</h1>
11 
-    </ion-col>
12 
-  </ion-row>
13 
-  <form>
14 
-    <ion-row>
15 
-      <ion-col>
16 
-        <ion-item lines="full">
17 
-          <ion-label position="floating">รหัสผ่าน</ion-label>
18 
-          <ion-input type="password" required></ion-input>
19 
-        </ion-item>
20 
-
21 
-        <ion-item lines="full">
22 
-          <ion-label position="floating">ยืนยัน รหัสผ่าน</ion-label>
23 
-          <ion-input type="password" required></ion-input>
24 
-        </ion-item>
25 
-      </ion-col>
26 
-    </ion-row>
10 
+  <div><img src="/assets/images/image-007.jpg"></div>
11 
+  <ion-grid>
27 12 
     <ion-row>
28 
-      <ion-col>
29 
-        <ion-button type="submit" color="success" expand="block">ส่ง</ion-button>
13 
+      <ion-col class="ion-text-center">
14 
+        <h1>กรุณาใส่รหัสผ่านใหม่</h1>
30 15 
       </ion-col>
31 16 
     </ion-row>
32 
-  </form>
17 
+    <form>
18 
+      <ion-row>
19 
+        <ion-col>
20 
+          <ion-item lines="full">
21 
+            <ion-label position="floating">รหัสผ่าน</ion-label>
22 
+            <ion-input type="password" required></ion-input>
23 
+          </ion-item>
24 
+
25 
+          <ion-item lines="full">
26 
+            <ion-label position="floating">ยืนยัน รหัสผ่าน</ion-label>
27 
+            <ion-input type="password" required></ion-input>
28 
+          </ion-item>
29 
+        </ion-col>
30 
+      </ion-row>
31 
+      <ion-row>
32 
+        <ion-col>
33 
+          <ion-button type="submit" color="success" expand="block">ส่ง</ion-button>
34 
+        </ion-col>
35 
+      </ion-row>
36 
+    </form>
37 
+  </ion-grid>
33 38 
 </ion-content>

+ 2 - 2
src/app/tabs/tabs.page.html
查看文件 

@@ -1,9 +1,9 @@
1 1 
 <ion-tabs>
2 
-  <ion-fab vertical="bottom" horizontal="center" translucent="true">
2 
+  <!-- <ion-fab vertical="bottom" horizontal="center" translucent="true">
3 3 
     <ion-fab-button routerLink="nearme" routerDirection="forward">
4 4 
     <ion-icon name="navigate"></ion-icon>
5 5 
     </ion-fab-button>
6 
-  </ion-fab>
6 
+  </ion-fab> -->
7 7 
   <ion-tab-bar slot="bottom">
8 8 
     <ion-tab-button tab="home">
9 9 
       <ion-icon name="home"></ion-icon>

+ 2 - 1
src/app/wp-service.service.ts
查看文件 

@@ -31,7 +31,8 @@ export class WpServiceService {
31 31
32 32 
   getPlaceDetail(id) {
33 33 
     return this.http.get(
34 
-      "http://tamtime.iamarray.xyz/wp-json/wp/v2/place/"+id+"/?_embed"
34 
+      // "http://tamtime.iamarray.xyz/wp-json/wp/v2/place/"+id+"/?_embed"
35 
+      "/assets/json/place173.json"
35 36 
     );
36 37 
   }
37 38

二進制
src/assets/images/image-001.jpg
查看文件


二進制
src/assets/images/image-002.jpg
查看文件


二進制
src/assets/images/image-003.jpg
查看文件


二進制
src/assets/images/image-004.jpg
查看文件


二進制
src/assets/images/image-005.jpg
查看文件


二進制
src/assets/images/image-006.jpg
查看文件


二進制
src/assets/images/image-007.jpg
查看文件


二進制
src/assets/images/image-008.jpg
查看文件


二進制
src/assets/images/image-009.jpg
查看文件


二進制
src/assets/images/image-010.jpg
查看文件


二進制
src/assets/images/image-011.jpg
查看文件


二進制
src/assets/images/image-012.jpg
查看文件


File diff suppressed because it is too large
+ 1 - 0
src/assets/json/place173.json


+ 18 - 7
src/global.scss
查看文件 

@@ -116,6 +116,17 @@
116 116 
   --color: #ffffff;
117 117 
 }
118 118
119 
+// ion-content {
120 
+//   --background: linear-gradient(
121 
+//     to bottom,
122 
+//     #a7e9ff,
123 
+//     #8fd8fd,
124 
+//     #7ec7fb,
125 
+//     #78b4f6,
126 
+//     #7c9fee
127 
+//   );
128 
+// }
129 
+
119 130 
 ion-title {
120 131 
   font-family: "Kanit", sans-serif !important;
121 132 
   font-weight: 500;
 
@@ -160,12 +171,12 @@ ion-button {
160 171
161 172 
 a {
162 173 
   text-decoration: none;
163 
- }
164 
-
165 
-// ion-content {
166 
-//   --background: url(/assets/images/wnr-bg.jpg) no-repeat center/cover fixed;
167 
-// }
174 
+}
175 
+
176 
+.image-page-cover {
177 
+  height: 200px;
178 
+}
168 179 
 .ios ion-fab-button {
169 
-  position:absolute;
180 
+  position: absolute;
170 181 
   bottom: 25px;
171 
-}
182 
+}

tum/soc - Gogs: Simplico Git Service
Главная Обзор Помощь
Войти
tum
/
soc
Следить 1
В избранное 0
Ответвить 0
Код Обсуждения 0 Запросы на слияние 0 Коммиты 3 Релизы 0 Вики

Нет описания

Дерево: 9bd700d33c
Ветки Метки
soc
/
iris-web
/
ui
/
public
tum 9de2549954 first commit 1 месяц назад
..
assets 9de2549954 first commit 1 месяц назад