/span> 100 
+    <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
101 
+    <plugin name="cordova-plugin-ionic-webview" spec="^5.0.0" />
102 
+    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
103 
+</widget>

+ 4 - 1
ionic.config.json
Ver fichero 

@@ -1,7 +1,10 @@
1 1 
 {
2 2 
   "name": "farmr3",
3 3 
   "integrations": {
4 
-    "capacitor": {}
4 
+    "capacitor": {
5 
+      "enabled": false
6 
+    },
7 
+    "cordova": {}
5 8 
   },
6 9 
   "type": "angular"
7 10 
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1698 - 17353
package-lock.json


+ 97 - 2
package.json
Ver fichero 

@@ -19,13 +19,43 @@
19 19 
     "@angular/platform-browser": "~13.2.2",
20 20 
     "@angular/platform-browser-dynamic": "~13.2.2",
21 21 
     "@angular/router": "~13.2.2",
22 
+    "@awesome-cordova-plugins/barcode-scanner": "^5.37.1",
23 
+    "@awesome-cordova-plugins/core": "^5.37.1",
24 
+    "@awesome-cordova-plugins/file-transfer": "^5.37.1",
25 
+    "@awesome-cordova-plugins/native-geocoder": "^5.41.0",
26 
+    "@awesome-cordova-plugins/push": "^5.37.1",
27 
+    "@awesome-cordova-plugins/status-bar": "^5.37.2",
28 
+    "@awesome-cordova-plugins/stripe": "^5.37.1",
22 29 
     "@capacitor/app": "1.1.1",
23 30 
     "@capacitor/core": "3.5.0",
24 31 
     "@capacitor/haptics": "1.1.4",
32 
+    "@capacitor/ios": "3.5.0",
25 33 
     "@capacitor/keyboard": "1.2.2",
26 34 
     "@capacitor/status-bar": "1.0.8",
35 
+    "@fortawesome/angular-fontawesome": "^0.10.1",
36 
+    "@fortawesome/fontawesome-free": "^5.15.4",
37 
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
38 
+    "@fortawesome/free-brands-svg-icons": "^5.15.4",
39 
+    "@fortawesome/free-regular-svg-icons": "^5.15.4",
40 
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
41 
+    "@ionic-native/android-permissions": "^5.30.0",
42 
+    "@ionic-native/call-number": "^5.36.0",
43 
+    "@ionic-native/core": "^5.36.0",
44 
+    "@ionic-native/device": "^5.30.0",
45 
+    "@ionic-native/email-composer": "^5.36.0",
46 
+    "@ionic-native/facebook": "^5.36.0",
47 
+    "@ionic-native/geolocation": "^5.36.0",
48 
+    "@ionic-native/http": "^5.36.0",
49 
+    "@ionic-native/in-app-browser": "^5.36.0",
50 
+    "@ionic-native/native-geocoder": "^5.36.0",
51 
+    "@ionic-native/paypal": "^5.30.0",
52 
+    "@ionic-native/push": "^5.36.0",
53 
+    "@ionic-native/sign-in-with-apple": "^5.36.0",
54 
+    "@ionic-native/uid": "^5.30.0",
27 55 
     "@ionic/angular": "^6.0.0",
56 
+    "@ionic/cordova-builders": "^6.1.0",
28 57 
     "rxjs": "~6.6.0",
58 
+    "sharp": "^0.30.4",
29 59 
     "tslib": "^2.2.0",
30 60 
     "zone.js": "~0.11.4"
31 61 
   },
 
@@ -41,11 +71,36 @@
41 71 
     "@angular/language-service": "~13.2.2",
42 72 
     "@capacitor/cli": "3.5.0",
43 73 
     "@ionic/angular-toolkit": "^6.0.0",
74 
+    "@ionic/storage-angular": "^3.0.6",
44 75 
     "@types/jasmine": "~3.6.0",
45 76 
     "@types/jasminewd2": "~2.0.3",
46 77 
     "@types/node": "^12.11.1",
47 78 
     "@typescript-eslint/eslint-plugin": "5.3.0",
48 79 
     "@typescript-eslint/parser": "5.3.0",
80 
+    "cordova-ios": "^6.2.0",
81 
+    "cordova-plugin-add-swift-support": "^2.0.2",
82 
+    "cordova-plugin-advanced-http": "^3.2.2",
83 
+    "cordova-plugin-android-permissions": "^1.1.2",
84 
+    "cordova-plugin-androidx": "^3.0.0",
85 
+    "cordova-plugin-androidx-adapter": "^1.1.3",
86 
+    "cordova-plugin-device": "2.0.2",
87 
+    "cordova-plugin-email-composer": "^0.10.0",
88 
+    "cordova-plugin-facebook-connect": "^3.2.0",
89 
+    "cordova-plugin-file": "^6.0.2",
90 
+    "cordova-plugin-file-transfer": "^1.7.1",
91 
+    "cordova-plugin-geolocation": "^4.1.0",
92 
+    "cordova-plugin-googlemaps": "^2.7.1",
93 
+    "cordova-plugin-googlemaps-sdk": "github:mapsplugin/cordova-plugin-googlemaps-sdk",
94 
+    "cordova-plugin-inappbrowser": "^5.0.0",
95 
+    "cordova-plugin-ionic-keyboard": "^2.2.0",
96 
+    "cordova-plugin-ionic-webview": "^5.0.0",
97 
+    "cordova-plugin-nativegeocoder": "^3.4.1",
98 
+    "cordova-plugin-sign-in-with-apple": "^0.1.2",
99 
+    "cordova-plugin-splashscreen": "5.0.2",
100 
+    "cordova-plugin-statusbar": "2.4.2",
101 
+    "cordova-plugin-stripe": "^1.5.3",
102 
+    "cordova-plugin-uid": "^1.3.0",
103 
+    "cordova-support-google-services": "^1.4.1",
49 104 
     "eslint": "^7.6.0",
50 105 
     "eslint-plugin-import": "2.22.1",
51 106 
     "eslint-plugin-jsdoc": "30.7.6",
 
@@ -58,9 +113,49 @@
58 113 
     "karma-coverage-istanbul-reporter": "~3.0.2",
59 114 
     "karma-jasmine": "~4.0.0",
60 115 
     "karma-jasmine-html-reporter": "^1.5.0",
116 
+    "mx.ferreyra.callnumber": "0.0.2",
61 117 
     "protractor": "~7.0.0",
62 118 
     "ts-node": "~8.3.0",
63 119 
     "typescript": "~4.4.4"
64 120 
   },
65 
-  "description": "An Ionic project"
66 
-}
121 
+  "description": "An Ionic project",
122 
+  "cordova": {
123 
+    "plugins": {
124 
+      "cordova-plugin-statusbar": {},
125 
+      "cordova-plugin-device": {},
126 
+      "cordova-plugin-splashscreen": {},
127 
+      "cordova-plugin-ionic-webview": {},
128 
+      "cordova-plugin-ionic-keyboard": {},
129 
+      "cordova-plugin-geolocation": {},
130 
+      "cordova-plugin-nativegeocoder": {
131 
+        "LOCATION_WHEN_IN_USE_DESCRIPTION": "Use geocoder service"
132 
+      },
133 
+      "mx.ferreyra.callnumber": {},
134 
+      "cordova-plugin-email-composer": {},
135 
+      "call-number": {},
136 
+      "cordova-plugin-inappbrowser": {},
137 
+      "cordova-plugin-sign-in-with-apple": {},
138 
+      "cordova-plugin-androidx": {},
139 
+      "cordova-plugin-androidx-adapter": {},
140 
+      "phonegap-plugin-push": {},
141 
+      "cordova-plugin-file-transfer": {},
142 
+      "cordova-plugin-stripe": {},
143 
+      "com.paypal.cordova.mobilesdk": {},
144 
+      "cordova-plugin-facebook-connect": {
145 
+        "APP_ID": "4746807965342529",
146 
+        "APP_NAME": "FarmSter",
147 
+        "FACEBOOK_URL_SCHEME_SUFFIX": " ",
148 
+        "OTHER_APP_SCHEMES": " ",
149 
+        "FACEBOOK_AUTO_LOG_APP_EVENTS": "true",
150 
+        "FACEBOOK_HYBRID_APP_EVENTS": "false",
151 
+        "FACEBOOK_ADVERTISER_ID_COLLECTION": "true",
152 
+        "FACEBOOK_ANDROID_SDK_VERSION": "11.3.0",
153 
+        "FACEBOOK_IOS_SDK_VERSION": "11.1.0",
154 
+        "FACEBOOK_BROWSER_SDK_VERSION": "v11.0"
155 
+      }
156 
+    },
157 
+    "platforms": [
158 
+      "ios"
159 
+    ]
160 
+  }
161 
+}

+ 8 - 0
resources/README.md
Ver fichero 

@@ -0,0 +1,8 @@
1 
+These are Cordova resources. You can replace icon.png and splash.png and run
2 
+`ionic cordova resources` to generate custom icons and splash screens for your
3 
+app. See `ionic cordova resources --help` for details.
4 
+
5 
+Cordova reference documentation:
6 
+
7 
+- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html
8 
+- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/

BIN
resources/android/icon/drawable-hdpi-icon.png
Ver fichero


BIN
resources/android/icon/drawable-ldpi-icon.png
Ver fichero


BIN
resources/android/icon/drawable-mdpi-icon.png
Ver fichero


BIN
resources/android/icon/drawable-xhdpi-icon.png
Ver fichero


BIN
resources/android/icon/drawable-xxhdpi-icon.png
Ver fichero


BIN
resources/android/icon/drawable-xxxhdpi-icon.png
Ver fichero


BIN
resources/android/splash/drawable-land-hdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-land-ldpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-land-mdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-land-xhdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-land-xxhdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-land-xxxhdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-hdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-ldpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-mdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-xhdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-xxhdpi-screen.png
Ver fichero


BIN
resources/android/splash/drawable-port-xxxhdpi-screen.png
Ver fichero


+ 7 - 0
resources/android/xml/network_security_config.xml
Ver fichero 

@@ -0,0 +1,7 @@
1 
+<?xml version="1.0" encoding="utf-8"?>
2 
+<network-security-config>
3 
+    <domain-config cleartextTrafficPermitted="true">
4 
+        <domain includeSubdomains="true">localhost</domain>
5 
+        <domain includeSubdomains="true">tamtime.iamarray.xyz</domain>
6 
+    </domain-config>
7 
+</network-security-config>

BIN
resources/icon.png
Ver fichero


BIN
resources/ios/icon/icon-1024.png
Ver fichero


BIN
resources/ios/icon/icon-108@2x.png
Ver fichero


BIN
resources/ios/icon/icon-20.png
Ver fichero


BIN
resources/ios/icon/icon-20@2x.png
Ver fichero


BIN
resources/ios/icon/icon-20@3x.png
Ver fichero


BIN
resources/ios/icon/icon-24@2x.png
Ver fichero


BIN
resources/ios/icon/icon-27.5@2x.png
Ver fichero


BIN
resources/ios/icon/icon-29.png
Ver fichero


BIN
resources/ios/icon/icon-29@2x.png
Ver fichero


BIN
resources/ios/icon/icon-29@3x.png
Ver fichero


BIN
resources/ios/icon/icon-40.png
Ver fichero


BIN
resources/ios/icon/icon-40@2x.png
Ver fichero


BIN
resources/ios/icon/icon-40@3x.png
Ver fichero


BIN
resources/ios/icon/icon-44@2x.png
Ver fichero


BIN
resources/ios/icon/icon-50.png
Ver fichero


BIN
resources/ios/icon/icon-50@2x.png
Ver fichero


BIN
resources/ios/icon/icon-60.png
Ver fichero


BIN
resources/ios/icon/icon-60@2x.png
Ver fichero


BIN
resources/ios/icon/icon-60@3x.png
Ver fichero


BIN
resources/ios/icon/icon-72.png
Ver fichero


BIN
resources/ios/icon/icon-72@2x.png
Ver fichero


BIN
resources/ios/icon/icon-76.png
Ver fichero


BIN
resources/ios/icon/icon-76@2x.png
Ver fichero


BIN
resources/ios/icon/icon-83.5@2x.png
Ver fichero


BIN
resources/ios/icon/icon-86@2x.png
Ver fichero


BIN
resources/ios/icon/icon-98@2x.png
Ver fichero


BIN
resources/ios/icon/icon.png
Ver fichero


BIN
resources/ios/icon/icon@2x.png
Ver fichero


BIN
resources/ios/splash/Default-1792h~iphone.png
Ver fichero


BIN
resources/ios/splash/Default-2436h.png
Ver fichero


BIN
resources/ios/splash/Default-2688h~iphone.png
Ver fichero


BIN
resources/ios/splash/Default-568h@2x~iphone.png
Ver fichero


BIN
resources/ios/splash/Default-667h.png
Ver fichero


BIN
resources/ios/splash/Default-736h.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape-1792h~iphone.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape-2436h.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape-2688h~iphone.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape-736h.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape@2x~ipad.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape@~ipadpro.png
Ver fichero


BIN
resources/ios/splash/Default-Landscape~ipad.png
Ver fichero


BIN
resources/ios/splash/Default-Portrait@2x~ipad.png
Ver fichero


BIN
resources/ios/splash/Default-Portrait@~ipadpro.png
Ver fichero


BIN
resources/ios/splash/Default-Portrait~ipad.png
Ver fichero


BIN
resources/ios/splash/Default@2x~iphone.png
Ver fichero


BIN
resources/ios/splash/Default@2x~universal~anyany.png
Ver fichero


BIN
resources/ios/splash/Default~iphone.png
Ver fichero


BIN
resources/splash.png
Ver fichero


+ 76 - 0
src/app/app-routing.module.ts
Ver fichero 

@@ -5,6 +5,82 @@ const routes: Routes = [
5 5 
   {
6 6 
     path: '',
7 7 
     loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
8 
+  },
9 
+  {
10 
+    path: 'home',
11 
+    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
12 
+  },
13 
+  {
14 
+    path: 'register',
15 
+    loadChildren: () => import('./register/register.module').then( m => m.RegisterPageModule)
16 
+  },
17 
+  {
18 
+    path: 'login',
19 
+    loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
20 
+  },
21 
+  {
22 
+    path: 'forgot-password',
23 
+    loadChildren: () => import('./forgot-password/forgot-password.module').then( m => m.ForgotPasswordPageModule)
24 
+  },
25 
+  {
26 
+    path: 'register-form',
27 
+    loadChildren: () => import('./register-form/register-form.module').then( m => m.RegisterFormPageModule)
28 
+  },
29 
+  {
30 
+    path: 'profile',
31 
+    loadChildren: () => import('./profile/profile.module').then( m => m.ProfilePageModule)
32 
+  },
33 
+  {
34 
+    path: 'reset-password',
35 
+    loadChildren: () => import('./reset-password/reset-password.module').then( m => m.ResetPasswordPageModule)
36 
+  },
37 
+  {
38 
+    path: 'placedetail',
39 
+    loadChildren: () => import('./placedetail/placedetail.module').then( m => m.PlacedetailPageModule)
40 
+  },
41 
+  {
42 
+    path: 'place',
43 
+    loadChildren: () => import('./place/place.module').then( m => m.PlacePageModule)
44 
+  },
45 
+  {
46 
+    path: 'province',
47 
+    loadChildren: () => import('./province/province.module').then( m => m.ProvincePageModule)
48 
+  },
49 
+  {
50 
+    path: 'gmap',
51 
+    loadChildren: () => import('./gmap/gmap.module').then( m => m.GmapPageModule)
52 
+  },
53 
+  {
54 
+    path: 'nearme',
55 
+    loadChildren: () => import('./nearme/nearme.module').then( m => m.NearmePageModule)
56 
+  },
57 
+  {
58 
+    path: 'sample',
59 
+    loadChildren: () => import('./sample/sample.module').then( m => m.SamplePageModule)
60 
+  },
61 
+  {
62 
+    path: 'product',
63 
+    loadChildren: () => import('./product/product.module').then( m => m.ProductPageModule)
64 
+  },
65 
+  {
66 
+    path: 'product-detail',
67 
+    loadChildren: () => import('./product-detail/product-detail.module').then( m => m.ProductDetailPageModule)
68 
+  },
69 
+  {
70 
+    path: 'tracking',
71 
+    loadChildren: () => import('./tracking/tracking.module').then( m => m.TrackingPageModule)
72 
+  },
73 
+  {
74 
+    path: 'news',
75 
+    loadChildren: () => import('./news/news.module').then( m => m.NewsPageModule)
76 
+  },
77 
+  {
78 
+    path: 'checkout',
79 
+    loadChildren: () => import('./checkout/checkout.module').then( m => m.CheckoutPageModule)
80 
+  },
81 
+  {
82 
+    path: 'pay',
83 
+    loadChildren: () => import('./pay/pay.module').then( m => m.PayPageModule)
8 84 
   }
9 85 
 ];
10 86 
 @NgModule({

+ 4 - 0
src/app/app.component.scss
Ver fichero 

@@ -0,0 +1,4 @@
1 
+.product-title {
2 
+    font-weight:bold;
3 
+    font-size:20px;
4 
+}

+ 43 - 1
src/app/app.component.ts
Ver fichero 

@@ -1,4 +1,9 @@
1 1 
 import { Component } from '@angular/core';
2 
+import { Storage } from '@ionic/storage-angular';
3 
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
4 
+import { Uid } from '@ionic-native/uid/ngx';
5 
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
6 
+
2 7
3 8 
 @Component({
4 9 
   selector: 'app-root',
 
@@ -6,5 +11,42 @@ import { Component } from '@angular/core';
6 11 
   styleUrls: ['app.component.scss'],
7 12 
 })
8 13 
 export class AppComponent {
9 
-  constructor() {}
14 
+    constructor(private storage: Storage, private statusBar:StatusBar, private uid: Uid, private androidPermissions: AndroidPermissions) {
15 
+
16 
+        this.statusBar.overlaysWebView(true);
17 
+
18 
+
19 
+    }
20 
+    openQRCode() {
21 
+        console.log("open QR Code");
22 
+    }
23 
+    async ngOnInit() {
24 
+        // If using a custom driver:
25 
+        // await this.storage.defineDriver(MyCustomDriver)
26 
+        await this.storage.create();
27 
+        //await this.getImei();
28 
+    }
29 
+    async getImei() {
30 
+        const { hasPermission } = await this.androidPermissions.checkPermission(
31 
+            this.androidPermissions.PERMISSION.READ_PHONE_STATE
32 
+        );
33 
+        console.log(hasPermission);
34 
+
35 
+        if (!hasPermission) {
36 
+            const result = await this.androidPermissions.requestPermission(
37 
+                this.androidPermissions.PERMISSION.READ_PHONE_STATE
38 
+            );
39 
+
40 
+            if (!result.hasPermission) {
41 
+                throw new Error('Permissions required');
42 
+            }
43 
+
44 
+            // ok, a user gave us permission, we can get him identifiers after restart app
45 
+            return;
46 
+        }
47 
+        console.log("UUID");
48 
+        console.log(this.uid.UUID);
49 
+        await this.storage.set('uid', this.uid.UUID);
50 
+        return this.uid.IMEI
51 
+    }
10 52 
 }

+ 66 - 6
src/app/app.module.ts
Ver fichero 

@@ -7,11 +7,71 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
7 7 
 import { AppRoutingModule } from './app-routing.module';
8 8 
 import { AppComponent } from './app.component';
9 9
10 
+import { HttpClientModule, HttpClient} from '@angular/common/http';
11 
+
12 
+// import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
13 
+// import { library } from '@fortawesome/fontawesome-svg-core';
14 
+import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
15 
+import { fas } from '@fortawesome/free-solid-svg-icons';
16 
+import { far } from '@fortawesome/free-regular-svg-icons';
17 
+import { fab } from '@fortawesome/free-brands-svg-icons';
18 
+
19 
+import { Geolocation } from '@ionic-native/geolocation/ngx';
20 
+import { NativeGeocoder } from '@ionic-native/native-geocoder/ngx';
21 
+
22 
+import { CallNumber } from '@ionic-native/call-number/ngx';
23 
+import { EmailComposer } from '@ionic-native/email-composer/ngx';
24 
+import { HTTP } from '@ionic-native/http/ngx';
25 
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
26 
+
27 
+import { IonicStorageModule } from '@ionic/storage-angular';
28 
+import { SignInWithApple } from '@ionic-native/sign-in-with-apple/ngx';
29 
+
30 
+import { PipeModule } from './pipe/pipe.module';
31 
+import { Facebook } from '@ionic-native/facebook/ngx';
32 
+
33 
+import { BarcodeScanner } from '@awesome-cordova-plugins/barcode-scanner/ngx';
34 
+import { PayPal } from '@ionic-native/paypal/ngx';
35 
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
36 
+import { Uid } from '@ionic-native/uid/ngx';
37 
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
38 
+import { Device } from '@ionic-native/device/ngx';
39 
+
40 
+//import { Stripe } from '@awesome-cordova-plugins/stripe/ngx';
41 
+
42 
+
43 
+// import { IonicImageViewerModule } from 'ionic-img-viewer';
44 
+
45 
+
46 
+// library.add(fas,far,fab);
47 
+
10 48 
 @NgModule({
11 
-  declarations: [AppComponent],
12 
-  entryComponents: [],
13 
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
14 
-  providers: [{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
15 
-  bootstrap: [AppComponent],
49 
+    declarations: [AppComponent],
50 
+    entryComponents: [],
51 
+    imports: [HttpClientModule, BrowserModule, PipeModule,IonicModule.forRoot({_forceStatusbarPadding: true}), AppRoutingModule, FontAwesomeModule,   IonicStorageModule.forRoot()],
52 
+    providers: [
53 
+        Geolocation,
54 
+        NativeGeocoder,
55 
+        CallNumber,
56 
+        EmailComposer,
57 
+        InAppBrowser,
58 
+        HTTP,
59 
+        Facebook,
60 
+        StatusBar,
61 
+        BarcodeScanner,
62 
+        SignInWithApple,
63 
+        PayPal,
64 
+        AndroidPermissions,
65 
+        Uid,
66 
+        Device,
67 
+        //Stripe,
68 
+        { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
69 
+    ],
70 
+    bootstrap: [AppComponent],
16 71 
 })
17 
-export class AppModule {}
72 
+export class AppModule {
73 
+    constructor(library: FaIconLibrary) {
74 
+        library.addIconPacks(fas, fab, far);
75 
+    }
76 
+
77 
+}

+ 17 - 0
src/app/checkout/checkout-routing.module.ts
Ver fichero 

@@ -0,0 +1,17 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { Routes, RouterModule } from '@angular/router';
3 
+
4 
+import { CheckoutPage } from './checkout.page';
5 
+
6 
+const routes: Routes = [
7 
+  {
8 
+    path: '',
9 
+    component: CheckoutPage
10 
+  }
11 
+];
12 
+
13 
+@NgModule({
14 
+  imports: [RouterModule.forChild(routes)],
15 
+  exports: [RouterModule],
16 
+})
17 
+export class CheckoutPageRoutingModule {}

+ 20 - 0
src/app/checkout/checkout.module.ts
Ver fichero 

@@ -0,0 +1,20 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { CommonModule } from '@angular/common';
3 
+import { FormsModule } from '@angular/forms';
4 
+
5 
+import { IonicModule } from '@ionic/angular';
6 
+
7 
+import { CheckoutPageRoutingModule } from './checkout-routing.module';
8 
+
9 
+import { CheckoutPage } from './checkout.page';
10 
+
11 
+@NgModule({
12 
+  imports: [
13 
+    CommonModule,
14 
+    FormsModule,
15 
+    IonicModule,
16 
+    CheckoutPageRoutingModule
17 
+  ],
18 
+  declarations: [CheckoutPage]
19 
+})
20 
+export class CheckoutPageModule {}

+ 81 - 0
src/app/checkout/checkout.page.html
Ver fichero 

@@ -0,0 +1,81 @@
1 
+<ion-header>
2 
+  <ion-toolbar class='new-background-color'>
3 
+    <ion-title>Checkout</ion-title>
4 
+      <ion-buttons slot="end">
5 
+          <ion-button (click)="dismiss()" color="light">
6 
+            <ion-icon name="close-circle-outline"></ion-icon>
7 
+          </ion-button>
8 
+      </ion-buttons>
9 
+  </ion-toolbar>
10 
+</ion-header>
11 
+
12 
+<ion-content>
13 
+    <ion-list>
14 
+        <ion-list-header>
15 
+            Recent Items
16 
+        </ion-list-header>
17 
+
18 
+        <ion-item-sliding>
19 
+            <ion-item>
20 
+            <ion-avatar slot="start">
21 
+                <img src="assets/images/fresh-durian.jpeg">
22 
+            </ion-avatar>
23 
+            <ion-label>
24 
+                <h2>Durian</h2>
25 
+                <p>Size M</p>
26 
+            </ion-label>
27 
+            <ion-label slot='end'>
28 
+                3 * 100.00 =
29 
+            </ion-label>
30 
+            <ion-label slot='end'>
31 
+                300.00 THB
32 
+            </ion-label>
33 
+            </ion-item>
34 
+            <ion-item-options side="end">
35 
+                <ion-item-option (click)="unread(item)" color='danger'>Remove</ion-item-option>
36 
+            </ion-item-options>
37 
+        </ion-item-sliding>
38 
+        <ion-item>
39 
+            <ion-avatar slot="start">
40 
+                <img src="assets/images/fresh-durian.jpeg">
41 
+            </ion-avatar>
42 
+            <ion-label>
43 
+                <h2>Durian</h2>
44 
+                <p>Size M</p>
45 
+            </ion-label>
46 
+            <ion-label slot='end'>
47 
+                3 * 100 =
48 
+            </ion-label>
49 
+            <ion-label slot='end'>
50 
+                300.00 THB
51 
+            </ion-label>
52 
+        </ion-item>
53 
+        <ion-item>
54 
+            <ion-label slot="end">
55 
+                <h2>Sub Total = </h2>
56 
+            </ion-label>
57 
+            <ion-label slot='end'>
58 
+               600.00 THB
59 
+            </ion-label>
60 
+        </ion-item>
61 
+        <ion-item>
62 
+            <ion-label slot="end">
63 
+                <h2>Vat 7%  = </h2>
64 
+            </ion-label>
65 
+            <ion-label slot='end'>
66 
+               42.00 THB
67 
+            </ion-label>
68 
+        </ion-item>
69 
+        <ion-item>
70 
+            <ion-label slot="end">
71 
+                <h2>Total = </h2>
72 
+            </ion-label>
73 
+            <ion-label slot='end'>
74 
+               642.00 THB
75 
+            </ion-label>
76 
+        </ion-item>
77 
+    </ion-list>
78 
+    <ion-button expand="full" color="success" (click)="payWithPaypal()">Pay with PayPal</ion-button>
79 
+
80 
+
81 
+</ion-content>

+ 0 - 0
src/app/checkout/checkout.page.scss
Ver fichero


+ 24 - 0
src/app/checkout/checkout.page.spec.ts
Ver fichero 

@@ -0,0 +1,24 @@
1 
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2 
+import { IonicModule } from '@ionic/angular';
3 
+
4 
+import { CheckoutPage } from './checkout.page';
5 
+
6 
+describe('CheckoutPage', () => {
7 
+  let component: CheckoutPage;
8 
+  let fixture: ComponentFixture<CheckoutPage>;
9 
+
10 
+  beforeEach(waitForAsync(() => {
11 
+    TestBed.configureTestingModule({
12 
+      declarations: [ CheckoutPage ],
13 
+      imports: [IonicModule.forRoot()]
14 
+    }).compileComponents();
15 
+
16 
+    fixture = TestBed.createComponent(CheckoutPage);
17 
+    component = fixture.componentInstance;
18 
+    fixture.detectChanges();
19 
+  }));
20 
+
21 
+  it('should create', () => {
22 
+    expect(component).toBeTruthy();
23 
+  });
24 
+});

+ 56 - 0
src/app/checkout/checkout.page.ts
Ver fichero 

@@ -0,0 +1,56 @@
1 
+import { Component, OnInit } from '@angular/core';
2 
+import { ModalController, Platform } from '@ionic/angular';
3 
+import { PayPal, PayPalPayment, PayPalConfiguration } from '@ionic-native/paypal/ngx';
4 
+
5 
+@Component({
6 
+    selector: 'app-checkout',
7 
+    templateUrl: './checkout.page.html',
8 
+    styleUrls: ['./checkout.page.scss'],
9 
+})
10 
+export class CheckoutPage implements OnInit {
11 
+
12 
+    constructor(public modalController: ModalController, private payPal: PayPal) { }
13 
+
14 
+    ngOnInit() {
15 
+    }
16 
+
17 
+    dismiss() {
18 
+        // using the injected ModalController this page
19 
+        // can "dismiss" itself and optionally pass back data
20 
+        this.modalController.dismiss({
21 
+            'dismissed': true
22 
+        });
23 
+    }
24 
+
25 
+    paymentAmount: string = '640';
26 
+    currency: string = 'USD';
27 
+    currencyIcon: string = 'USD';
28 
+
29 
+    payWithPaypal() {
30 
+        this.payPal.init({
31 
+            PayPalEnvironmentProduction: 'YOUR_PRODUCTION_CLIENT_ID',
32 
+            PayPalEnvironmentSandbox: 'AVszPxWCuK3FGXKlgOCFu3gVXr8lFkKj9z1wUo9BYdestZbGRg5vDqWm_pqlLkhEu8KHsjP8NmfPhc_o'
33 
+        }).then(() => {
34 
+            // Environments: PayPalEnvironmentNoNetwork, PayPalEnvironmentSandbox, PayPalEnvironmentProduction
35 
+            this.payPal.prepareToRender('PayPalEnvironmentSandbox', new PayPalConfiguration({
36 
+                // Only needed if you get an "Internal Service Error" after PayPal login!
37 
+                //payPalShippingAddressOption: 2 // PayPalShippingAddressOptionPayPal
38 
+            })).then(() => {
39 
+                let payment = new PayPalPayment(this.paymentAmount, this.currency, 'Description', 'sale');
40 
+                this.payPal.renderSinglePaymentUI(payment).then((res) => {
41 
+                    console.log(res);
42 
+                    // Successfully paid
43 
+                }, (error) => {
44 
+                    console.log(error);
45 
+                    // Error or render dialog closed without being successful
46 
+                });
47 
+            }, (error) => {
48 
+                console.log(error);
49 
+                // Error in configuration
50 
+            });
51 
+        }, (error) => {
52 
+            console.log(error);
53 
+            // Error in initialization, maybe PayPal isn't supported or something else
54 
+        });
55 
+    }
56 
+}

+ 3 - 1
src/app/explore-container/explore-container.component.html
Ver fichero 

@@ -1,4 +1,6 @@
1 1 
 <div id="container">
2 2 
   <strong>{{ name }}</strong>
3 3 
   <p>Explore <a target="_blank" rel="noopener noreferrer" href="https://ionicframework.com/docs/components">UI Components</a></p>
4 
-</div>
4 
+</div>
5 
+<ion-title size="large">wellnessroute.info</ion-title>
6 
+  <ion-title size="large">แผนที่สุขภาพ</ion-title>

+ 17 - 0
src/app/forgot-password/forgot-password-routing.module.ts
Ver fichero 

@@ -0,0 +1,17 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { Routes, RouterModule } from '@angular/router';
3 
+
4 
+import { ForgotPasswordPage } from './forgot-password.page';
5 
+
6 
+const routes: Routes = [
7 
+  {
8 
+    path: '',
9 
+    component: ForgotPasswordPage
10 
+  }
11 
+];
12 
+
13 
+@NgModule({
14 
+  imports: [RouterModule.forChild(routes)],
15 
+  exports: [RouterModule],
16 
+})
17 
+export class ForgotPasswordPageRoutingModule {}

+ 20 - 0
src/app/forgot-password/forgot-password.module.ts
Ver fichero 

@@ -0,0 +1,20 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { CommonModule } from '@angular/common';
3 
+import { FormsModule } from '@angular/forms';
4 
+
5 
+import { IonicModule } from '@ionic/angular';
6 
+
7 
+import { ForgotPasswordPageRoutingModule } from './forgot-password-routing.module';
8 
+
9 
+import { ForgotPasswordPage } from './forgot-password.page';
10 
+
11 
+@NgModule({
12 
+  imports: [
13 
+    CommonModule,
14 
+    FormsModule,
15 
+    IonicModule,
16 
+    ForgotPasswordPageRoutingModule
17 
+  ],
18 
+  declarations: [ForgotPasswordPage]
19 
+})
20 
+export class ForgotPasswordPageModule {}

+ 37 - 0
src/app/forgot-password/forgot-password.page.html
Ver fichero 

@@ -0,0 +1,37 @@
1 
+<ion-header>
2 
+  <ion-toolbar class="new-background-color">
3 
+    <ion-buttons slot="end">
4 
+      <ion-button (click)="dismiss()" color="light">ปิด</ion-button>
5 
+    </ion-buttons>
6 
+    <div class="hcs">
7 
+      <img src="/assets/images/wellnessbar.svg" height="50" />
8 
+    </div>
9 
+  </ion-toolbar>
10 
+</ion-header>
11 
+<ion-content>
12 
+  <div><img src="/assets/images/image-006.jpg"></div>
13 
+  <ion-grid>
14 
+    <ion-row>
15 
+      <ion-col>
16 
+        <div class="ion-text-center">
17 
+          <h1>ลืมรหัสผ่าน</h1>
18 
+        </div>
19 
+      </ion-col>
20 
+    </ion-row>
21 
+    <form>
22 
+      <ion-row>
23 
+        <ion-col>
24 
+          <ion-item lines="full">
25 
+            <ion-label position="floating">อีเมล์</ion-label>
26 
+            <ion-input type="email" name="email" [(ngModel)]="email" inputmode="email"></ion-input>
27 
+          </ion-item>
28 
+        </ion-col>
29 
+      </ion-row>
30 
+      <ion-row>
31 
+        <ion-col>
32 
+          <ion-button type="submit" color="danger" expand="block" (click)="resetPassword()">ส่งรหัสผ่าน</ion-button>
33 
+        </ion-col>
34 
+      </ion-row>
35 
+    </form>
36 
+  </ion-grid>
37 
+</ion-content>

+ 0 - 0
src/app/forgot-password/forgot-password.page.scss
Ver fichero


+ 24 - 0
src/app/forgot-password/forgot-password.page.spec.ts
Ver fichero 

@@ -0,0 +1,24 @@
1 
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2 
+import { IonicModule } from '@ionic/angular';
3 
+
4 
+import { ForgotPasswordPage } from './forgot-password.page';
5 
+
6 
+describe('ForgotPasswordPage', () => {
7 
+  let component: ForgotPasswordPage;
8 
+  let fixture: ComponentFixture<ForgotPasswordPage>;
9 
+
10 
+  beforeEach(waitForAsync(() => {
11 
+    TestBed.configureTestingModule({
12 
+      declarations: [ ForgotPasswordPage ],
13 
+      imports: [IonicModule.forRoot()]
14 
+    }).compileComponents();
15 
+
16 
+    fixture = TestBed.createComponent(ForgotPasswordPage);
17 
+    component = fixture.componentInstance;
18 
+    fixture.detectChanges();
19 
+  }));
20 
+
21 
+  it('should create', () => {
22 
+    expect(component).toBeTruthy();
23 
+  });
24 
+});

+ 36 - 0
src/app/forgot-password/forgot-password.page.ts
Ver fichero 

@@ -0,0 +1,36 @@
1 
+import { Component, OnInit } from '@angular/core';
2 
+import { ModalController } from '@ionic/angular';
3 
+import { WpServiceService } from '../wp-service.service';
4 
+
5 
+@Component({
6 
+    selector: 'app-forgot-password',
7 
+    templateUrl: './forgot-password.page.html',
8 
+    styleUrls: ['./forgot-password.page.scss'],
9 
+})
10 
+export class ForgotPasswordPage implements OnInit {
11 
+
12 
+    email = "";
13 
+
14 
+    constructor(public modalController: ModalController, private wp:WpServiceService) { }
15 
+
16 
+    ngOnInit() {
17 
+    }
18 
+
19 
+    async resetPassword() {
20 
+        if( this.email == "" ) {
21 
+            alert("Please Enter Valid Email");
22 
+            return;
23 
+        }
24 
+        let r = await this.wp.resetPassword(this.email);
25 
+        alert(r.msg);
26 
+    }
27 
+
28 
+    dismiss() {
29 
+        // using the injected ModalController this page
30 
+        // can "dismiss" itself and optionally pass back data
31 
+        this.modalController.dismiss({
32 
+            'dismissed': true
33 
+        });
34 
+    }
35 
+
36 
+}

+ 17 - 0
src/app/gmap/gmap-routing.module.ts
Ver fichero 

@@ -0,0 +1,17 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { Routes, RouterModule } from '@angular/router';
3 
+
4 
+import { GmapPage } from './gmap.page';
5 
+
6 
+const routes: Routes = [
7 
+  {
8 
+    path: '',
9 
+    component: GmapPage
10 
+  }
11 
+];
12 
+
13 
+@NgModule({
14 
+  imports: [RouterModule.forChild(routes)],
15 
+  exports: [RouterModule],
16 
+})
17 
+export class GmapPageRoutingModule {}

+ 20 - 0
src/app/gmap/gmap.module.ts
Ver fichero 

@@ -0,0 +1,20 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { CommonModule } from '@angular/common';
3 
+import { FormsModule } from '@angular/forms';
4 
+
5 
+import { IonicModule } from '@ionic/angular';
6 
+
7 
+import { GmapPageRoutingModule } from './gmap-routing.module';
8 
+
9 
+import { GmapPage } from './gmap.page';
10 
+
11 
+@NgModule({
12 
+  imports: [
13 
+    CommonModule,
14 
+    FormsModule,
15 
+    IonicModule,
16 
+    GmapPageRoutingModule
17 
+  ],
18 
+  declarations: [GmapPage]
19 
+})
20 
+export class GmapPageModule {}

+ 9 - 0
src/app/gmap/gmap.page.html
Ver fichero 

@@ -0,0 +1,9 @@
1 
+<ion-header>
2 
+  <ion-toolbar>
3 
+    <ion-title>gmap</ion-title>
4 
+  </ion-toolbar>
5 
+</ion-header>
6 
+
7 
+<ion-content>..
8 
+<div #map id="map"></div>
9 
+</ion-content>

+ 3 - 0
src/app/gmap/gmap.page.scss
Ver fichero 

@@ -0,0 +1,3 @@
1 
+#map {
2 
+    height: 300px;
3 
+}

+ 24 - 0
src/app/gmap/gmap.page.spec.ts
Ver fichero 

@@ -0,0 +1,24 @@
1 
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2 
+import { IonicModule } from '@ionic/angular';
3 
+
4 
+import { GmapPage } from './gmap.page';
5 
+
6 
+describe('GmapPage', () => {
7 
+  let component: GmapPage;
8 
+  let fixture: ComponentFixture<GmapPage>;
9 
+
10 
+  beforeEach(waitForAsync(() => {
11 
+    TestBed.configureTestingModule({
12 
+      declarations: [ GmapPage ],
13 
+      imports: [IonicModule.forRoot()]
14 
+    }).compileComponents();
15 
+
16 
+    fixture = TestBed.createComponent(GmapPage);
17 
+    component = fixture.componentInstance;
18 
+    fixture.detectChanges();
19 
+  }));
20 
+
21 
+  it('should create', () => {
22 
+    expect(component).toBeTruthy();
23 
+  });
24 
+});

+ 72 - 0
src/app/gmap/gmap.page.ts
Ver fichero 

@@ -0,0 +1,72 @@
1 
+import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
2 
+import { ActivatedRoute, Router } from '@angular/router';
3 
+import { WpServiceService } from '../wp-service.service';
4 
+import { Geolocation } from '@ionic-native/geolocation/ngx';
5 
+import { NativeGeocoder, NativeGeocoderResult, NativeGeocoderOptions } from '@ionic-native/native-geocoder/ngx';
6 
+
7 
+declare var google: any;
8 
+
9 
+@Component({
10 
+  selector: 'app-gmap',
11 
+  templateUrl: './gmap.page.html',
12 
+  styleUrls: ['./gmap.page.scss'],
13 
+})
14 
+export class GmapPage implements OnInit {
15 
+  @Input() id: string;
16 
+  data: any;
17 
+  placelist: any;
18 
+  latdynamic: any;
19 
+  londynamic: any;
20 
+  xxx: any;
21 
+  yyy: any;
22 
+  placeL: any;
23 
+  map: any;
24 
+  // @ViewChild('map', { static: false }) mapElement: ElementRef;
25 
+  @ViewChild('map', { static: true }) mapRef: ElementRef;
26 
+  // @ViewChild('map', { static: false }) mapElement: ElementRef;
27 
+
28 
+
29 
+  constructor(private wpservice: WpServiceService, private route: ActivatedRoute, private router: Router, private geolocation: Geolocation) { }
30 
+
31 
+  ngOnInit() {
32 
+    this.showMap();
33 
+    // this.loadMap()
34 
+    let id = this.route.snapshot.paramMap.get('id') || this.id;
35 
+    this.wpservice.getPlaceDetail(173).subscribe((data) => {
36 
+      this.placelist = data;
37 
+      this.latdynamic = data['acf']['gmap']['lat'];
38 
+      this.londynamic = data['acf']['gmap']['lng'];
39 
+
40 
+      console.log("load Place Detail ...");
41 
+      console.log(this.latdynamic);
42 
+      console.log("load Lati ...");
43 
+      console.log(this.londynamic);
44 
+      console.log("load Lon ...");
45 
+      console.log(data);
46 
+      let xxx = this.londynamic;
47 
+      const yyy = this.latdynamic;
48 
+    }, error => {
49 
+      console.log("errror ", error);
50 
+    });
51 
+
52 
+    let watch = this.geolocation.watchPosition();
53 
+    watch.subscribe((data) => {
54 
+      // data can be a set of coordinates, or an error (if an error occurred).
55 
+      // data.coords.latitude
56 
+      // data.coords.longitude
57 
+      console.log(data);
58 
+    });
59 
+  }
60 
+
61 
+  showMap() {
62 
+    let location = new google.maps.LatLng(13.7643439, 100.6899729);
63 
+    let options = {
64 
+      center: location,
65 
+      zoom: 15,
66 
+      disableDefaultUI: true
67 
+    }
68 
+    this.map = new google.maps.Map(this.mapRef.nativeElement, options);
69 
+    //this.map = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
70 
+  }
71 
+
72 
+}

+ 17 - 0
src/app/home/home-routing.module.ts
Ver fichero 

@@ -0,0 +1,17 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { Routes, RouterModule } from '@angular/router';
3 
+
4 
+import { HomePage } from './home.page';
5 
+
6 
+const routes: Routes = [
7 
+  {
8 
+    path: '',
9 
+    component: HomePage
10 
+  }
11 
+];
12 
+
13 
+@NgModule({
14 
+  imports: [RouterModule.forChild(routes)],
15 
+  exports: [RouterModule],
16 
+})
17 
+export class HomePageRoutingModule {}

+ 26 - 0
src/app/home/home.module.ts
Ver fichero 

@@ -0,0 +1,26 @@
1 
+import { NgModule } from '@angular/core';
2 
+import { CommonModule } from '@angular/common';
3 
+import { FormsModule } from '@angular/forms';
4 
+
5 
+import { IonicModule } from '@ionic/angular';
6 
+
7 
+import { HomePageRoutingModule } from './home-routing.module';
8 
+
9 
+import { HomePage } from './home.page';
10 
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
11 
+import { IonSlides } from '@ionic/angular';
12 
+
13 
+import { PipeModule } from '../pipe/pipe.module';
14 
+
15 
+@NgModule({
16 
+  imports: [
17 
+    CommonModule,
18 
+    FormsModule,
19 
+    IonicModule,
20 
+      PipeModule,
21 
+    HomePageRoutingModule,
22 
+    FontAwesomeModule
23 
+  ],
24 
+  declarations: [HomePage]
25 
+})
26 
+export class HomePageModule {}

+ 0 - 0
src/app/home/home.page.290921.html
Ver fichero


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio

golf/tge - Gogs: Simplico Git Service
首頁 探索 說明
登入
golf
/
tge
關註 1
讚好 0
複刻 0
代碼 問題管理 0 合併請求 0 提交歷史 2 版本發佈 0 Wiki

暫無描述

分支: main
分支列表 標籤列表
tge
/
node_modules
/
fsevents
/
LICENSE

LICENSE 1.1KB
永久連結 文件歷史 原始文件

1234567891011121314151617181920212223 
  1. MIT License
    2. 

  2. -----------
    3. 

  3. 

  4. Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller
    5. 

  5. 

  6. Permission is hereby granted, free of charge, to any person obtaining a copy
    7. 

  7. of this software and associated documentation files (the "Software"), to deal
    8. 

  8. in the Software without restriction, including without limitation the rights
    9. 

  9. to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    10. 

  10. copies of the Software, and to permit persons to whom the Software is
    11. 

  11. furnished to do so, subject to the following conditions:
    12. 

  12. 

  13. The above copyright notice and this permission notice shall be included in
    14. 

  14. all copies or substantial portions of the Software.
    15. 

  15. 

  16. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    17. 

  17. IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    18. 

  18. FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    19. 

  19. AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    20. 

  20. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    21. 

  21. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    22. 

  22. THE SOFTWARE.
    23. 

  23.