Fixed google map errors with caching and added some changed to environment variables to hide api key

Author: M4ttoF

app/app/Http/Controllers/HomeController.php

@@ -37,7 +37,13 @@ public function index(Request $request)
             'default_location' => BaseUser::getDefaultLocation(),
             'google_map_api_key' => config('app.google_map_api_key'),
             'turn_off_maps'      => config('app.turn_off_maps'),
-            'location_search_options' => $location_search_options
+            'location_search_options' => $location_search_options,
+            'firebase_api_key' => config('app.firebase_api_key'),
+            'firebase_auth_domain' => config('app.firebase_auth_domain'),
+            'firebase_database_url' => config('app.firebase_database_url'),
+            'firebase_project_id' => config('app.firebase_project_id'),
+            'firebase_storage_bucket' => config('app.firebase_storage_bucket'),
+            'firebase_messaging_sender_id' => config('firebase_messaging_sender_id')
             ]);
     }
 

app/config/app.php

@@ -118,6 +118,16 @@
 
     'cipher' => 'AES-256-CBC',
 
+    /* Firebase keys
+    | Will be used for push notifications
+    */
+    'firebase_api_key' => env('FIREBASE_API_KEY', ''),
+    'firebase_auth_domain'=> env('FIREBASE_AUTH_DOMAIN', ''),
+    'firebase_database_url' => env('FIREBASE_DATABASE_URL, '),
+    'firebase_project_id' => env('FIREBASE_PROJECT_ID', ''),
+    'firebase_storage_bucket' => env('FIREBASE_STOREAGE_BUCKET', ''),
+    'firebase_messaging_sender_id' => env('FIREBASE_MESSAGING_SENDER_ID', ''),
+
     /*
     |--------------------------------------------------------------------------
     | Logging Configuration

app/public/service-worker.js

@@ -40,37 +40,39 @@ self.addEventListener('activate', function(e) {
 })
 
 self.addEventListener('fetch',function(e) {
-    e.respondWith(
-
-        caches.match(e.request)
-
-
-            .then(function(response) {
-
-                if (response) {
-                    return response;
-                }
-
-                var requestClone = e.request.clone();
-                return fetch(requestClone)
-                    .then(function(response) {
-
-                        if (!response) {
-                            return response;
-                        }
-
-                        var responseClone = response.clone();
-                        caches.open(cacheName).then(function(cache) {
-                            cache.put(e.request, responseClone);
-                            return response;
+   
+    if (e.request.url.indexOf('https://maps.googleapi.com') !== 0 ||
+     e.request.url.indexOf('http://maps.googleapis.com') !== 0) {
+        e.respondWith(
+            caches.match(e.request)
+                .then(function(response) {
+
+                    if (response) {
+                        return response;
+                    }
+
+                    var requestClone = e.request.clone();
+                    return fetch(requestClone)
+                        .then(function(response) {
+
+                            if (!response) {
+                                return response;
+                            }
+
+                            var responseClone = response.clone();
+                            caches.open(cacheName).then(function(cache) {
+                                cache.put(e.request, responseClone)
+                                .catch(function(err) {
+                                    console.log('Post Request Made', err);
+                                });     
+                                return response;
+                            });
+
+                        })
+                        .catch(function(err) {
+                            console.log('[ServiceWorker] Error Fetching & Caching New Data', err);
                         });
-
-                    })
-                    .catch(function(err) {
-                        console.log('[ServiceWorker] Error Fetching & Caching New Data', err);
-                    });
-
-
-            })
-    );
+                })
+        );
+  }
 })