new firebase and maps API created

Author: AndrewJBateman

.firebaserc

@@ -1,6 +1,6 @@
 {
   "projects": {
-    "default": "ionic-angular-pr-1565107344855",
-    "testing": "ionic-angular-pr-1565107344855"
+    "default": "ionic-maps-api-1565705298126",
+    "testing": "ionic-maps-api-1565705298126"
   }
 }

README.md

@@ -119,8 +119,8 @@ private getGoogleMaps(): Promise<any> {
 
 ## Status & To-do list
 
-* Status: issue with auth token means user is logged out immediately. New database used which is currently empty.
-* To-do: complete course
+* Status: working 95%. Bookings can be made and new places added to offers page. If a different user is logged in they cannot book their own places (the booking button does not show) - which is correct.
+* To-do: correct issues: Camera image does not display. Bookable place list is the same as the 'All Places' list - bookable places should not include the logged in users' places. 'My Offers' includes everyones places. 'Your Bookings' does not work - check path.
 
 ## Inspiration
 

angular.json

@@ -29,7 +29,8 @@
                 "glob": "**/*.svg",
                 "input": "node_modules/ionicons/dist/ionicons/svg",
                 "output": "./svg"
-              }
+              },
+              "src/manifest.webmanifest"
             ],
             "styles": [
               {
@@ -64,7 +65,9 @@
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
                 }
-              ]
+              ],
+              "serviceWorker": true,
+              "ngswConfigPath": "ngsw-config.json"
             },
             "ci": {
               "progress": false
@@ -110,7 +113,8 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "/assets"
-              }
+              },
+              "src/manifest.webmanifest"
             ]
           },
           "configurations": {

functions/index.js

@@ -9,7 +9,7 @@ const uuid = require('uuid/v4');
 const { Storage } = require('@google-cloud/storage');
 
 const storage = new Storage({
-  projectId: 'ionic-angular-pr-1565107344855'
+  projectId: 'ionic-maps-api-1565705298126'
 });
 
 exports.storeImage = functions.https.onRequest((req, res) => {
@@ -40,7 +40,7 @@ exports.storeImage = functions.https.onRequest((req, res) => {
 
       console.log(uploadData.type);
       return storage
-        .bucket('ionic-angular-pr-1565107344855.appspot.com')
+        .bucket('ionic-maps-api-1565705298126.appspot.com')
         .upload(uploadData.filePath, {
           uploadType: 'media',
           destination: imagePath,
@@ -56,7 +56,7 @@ exports.storeImage = functions.https.onRequest((req, res) => {
           return res.status(201).json({
             imageUrl:
               'https://firebasestorage.googleapis.com/v0/b/' +
-              storage.bucket('ionic-angular-pr-1565107344855.appspot.com').name +
+              storage.bucket('ionic-maps-api-1565705298126.appspot.com').name +
               '/o/' +
               encodeURIComponent(imagePath) +
               '?alt=media&token=' +

ngsw-config.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "./node_modules/@angular/service-worker/config/schema.json",
+  "index": "/index.html",
+  "assetGroups": [
+    {
+      "name": "app",
+      "installMode": "prefetch",
+      "resources": {
+        "files": [
+          "/favicon.ico",
+          "/index.html",
+          "/*.css",
+          "/*.js"
+        ]
+      }
+    }, {
+      "name": "assets",
+      "installMode": "lazy",
+      "updateMode": "prefetch",
+      "resources": {
+        "files": [
+          "/assets/**",
+          "/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
+        ]
+      }
+    }
+  ]
+}

package-lock.json

@@ -19,7 +19,9 @@
     "@angular/forms": "~8.1.2",
     "@angular/platform-browser": "~8.1.2",
     "@angular/platform-browser-dynamic": "~8.1.2",
+    "@angular/pwa": "^0.802.1",
     "@angular/router": "~8.1.2",
+    "@angular/service-worker": "~8.1.2",
     "@capacitor/android": "^1.1.1",
     "@capacitor/core": "1.1.1",
     "@ionic-native/core": "^5.0.0",

package.json

@@ -10,11 +10,13 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
+import { ServiceWorkerModule } from '@angular/service-worker';
+import { environment } from '../environments/environment';
 
 @NgModule({
 	declarations: [AppComponent],
 	entryComponents: [],
-	imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule],
+	imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })],
 	providers: [
 		StatusBar,
 		SplashScreen,

src/app/app.module.ts

@@ -18,8 +18,7 @@ export class User {
 		if (!this.token) {
 			return 0;
 		}
-		return 2000;
-		// return this.tokenExpirationDate.getTime() - new Date().getTime();
+		return this.tokenExpirationDate.getTime() - new Date().getTime();
 	}
 
 }

src/app/auth/user.model.ts

@@ -66,7 +66,7 @@ export class BookingService {
 				);
 				return this.http
 			.post<{ name: string }>(
-				`https://ionic-angular-pr-1565107344855.firebaseio.com/bookings.json?auth=${token}`,
+				`https://ionic-maps-api-1565705298126.firebaseio.com/bookings.json?auth=${token}`,
 				{ ...newBooking, id: null }
 			);
 			}),
@@ -88,7 +88,7 @@ export class BookingService {
 			switchMap(token => {
 				return this.http
 					.delete(
-						`https://ionic-angular-pr-1565107344855.firebaseio.com/bookings/${bookingId}.json?auth=${token}`
+						`https://ionic-maps-api-1565705298126.firebaseio.com/bookings/${bookingId}.json?auth=${token}`
 					);
 			}),
 			switchMap(() => {
@@ -115,7 +115,7 @@ export class BookingService {
 			take(1),
 			switchMap(token => {
 				return this.http.get<{ [key: string]: BookingData }>(
-					`https://ionic-angular-pr-1565107344855.firebaseio.com/bookings.json?orderBy="userId"&equalTo="${fetchedUserId}"&auth=${token}`
+					`https://ionic-maps-api-1565705298126.firebaseio.com/bookings.json?orderBy="userId"&equalTo="${fetchedUserId}"&auth=${token}`
 				);
 			}),