From c0bf2da873f072f8c698476996b331977ff41d87 Mon Sep 17 00:00:00 2001 From: kj1352 Date: Fri, 25 Oct 2019 20:54:04 +0530 Subject: [PATCH] Partial commit - bug fixes --- package-lock.json | 31 ++- package.json | 8 +- src/app/app-routing.module.ts | 1 + src/app/app.component.html | 2 +- src/app/app.module.ts | 4 + src/app/cart/cart.page.html | 17 +- src/app/cart/cart.page.scss | 23 +- src/app/cart/cart.page.ts | 9 +- src/app/near/near.module.ts | 26 ++ src/app/near/near.page.html | 11 + src/app/near/near.page.scss | 55 ++++ src/app/near/near.page.spec.ts | 27 ++ src/app/near/near.page.ts | 39 +++ .../outlet-details/outlet-details.page.html | 260 ++++++++++-------- .../outlet-details/outlet-details.page.scss | 30 ++ src/app/outlet-details/outlet-details.page.ts | 7 +- src/index.d.ts | 1 + src/index.html | 1 + 18 files changed, 415 insertions(+), 137 deletions(-) create mode 100644 src/app/near/near.module.ts create mode 100644 src/app/near/near.page.html create mode 100644 src/app/near/near.page.scss create mode 100644 src/app/near/near.page.spec.ts create mode 100644 src/app/near/near.page.ts create mode 100644 src/index.d.ts diff --git a/package-lock.json b/package-lock.json index f5a5d1a..d707aa9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1310,6 +1310,21 @@ "@types/cordova": "^0.0.34" } }, + "@ionic-native/geolocation": { + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-5.15.1.tgz", + "integrity": "sha512-RzNyuYLN4h+owqv55b2V4KKvs+H3G4F/3C6gD2PU39gvaeoLcW0Pj6dKnnV9qOVSUmq/b5MjPFH950Y7OcTthQ==", + "requires": { + "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } + } + }, "@ionic-native/splash-screen": { "version": "5.11.0", "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-5.11.0.tgz", @@ -1457,6 +1472,11 @@ "@types/node": "*" } }, + "@types/googlemaps": { + "version": "3.38.0", + "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.38.0.tgz", + "integrity": "sha512-Rp7FnrwyYGnjoxM+/q/4DRqUzvV9JKK1SBRXx8APxU6NNMtYMsWmOMsQOV2U6z8aMFzlUbRv3EDixLcDep8t9w==" + }, "@types/jasmine": { "version": "3.3.16", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.16.tgz", @@ -3226,6 +3246,11 @@ "integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro=", "dev": true }, + "cordova-plugin-geolocation": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.2.tgz", + "integrity": "sha512-QGThnPKzPxESHkruZlpE0+5aFBVOet8al0vIJ7laSUOQHIC1dd/JY6peVIbtLboKi5Dap1wCKRubOqPqH8xcQA==" + }, "cordova-plugin-ionic-keyboard": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.1.3.tgz", @@ -4998,9 +5023,9 @@ "dev": true }, "https-proxy-agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", - "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz", + "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==", "dev": true, "requires": { "agent-base": "^4.3.0", diff --git a/package.json b/package.json index 8e7918b..1e3709b 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,14 @@ "@angular/router": "~8.1.2", "@angular/service-worker": "~8.1.2", "@ionic-native/core": "^5.0.0", + "@ionic-native/geolocation": "^5.15.1", "@ionic-native/splash-screen": "^5.0.0", "@ionic-native/status-bar": "^5.0.0", "@ionic/angular": "^4.7.1", "@ionic/storage": "^2.2.0", + "@types/googlemaps": "^3.38.0", "cordova-android": "8.0.0", + "cordova-plugin-geolocation": "^4.0.2", "cordova-sqlite-storage": "^3.4.0", "core-js": "^2.5.4", "moment": "^2.24.0", @@ -79,10 +82,11 @@ "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, "cordova-plugin-ionic-keyboard": {}, - "cordova-sqlite-storage": {} + "cordova-sqlite-storage": {}, + "cordova-plugin-geolocation": {} }, "platforms": [ "android" ] } -} \ No newline at end of file +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 65555e8..d9f2f75 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,6 +11,7 @@ const routes: Routes = [ { path: 'cart', loadChildren: './cart/cart.module#CartPageModule' }, { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, { path: 'bookmark', loadChildren: './bookmark/bookmark.module#BookmarkPageModule' }, + { path: 'near', loadChildren: './near/near.module#NearPageModule' }, ]; @NgModule({ diff --git a/src/app/app.component.html b/src/app/app.component.html index 52424c0..b9a8cc8 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -25,7 +25,7 @@ CART - diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d421a27..b764a32 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,6 +21,9 @@ import { AppRoutingModule } from './app-routing.module'; import { ServiceWorkerModule } from '@angular/service-worker'; import { environment } from '../environments/environment'; +// Native Plugins +import { Geolocation } from '@ionic-native/geolocation/ngx'; + @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -40,6 +43,7 @@ import { environment } from '../environments/environment'; CartItemService, UserDataService, OrderService, + Geolocation, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy } ], bootstrap: [AppComponent] diff --git a/src/app/cart/cart.page.html b/src/app/cart/cart.page.html index 7e77672..ea4da37 100644 --- a/src/app/cart/cart.page.html +++ b/src/app/cart/cart.page.html @@ -14,14 +14,21 @@ -