From 6d0cb5333df5d085c2cb5731b8a465f487e49501 Mon Sep 17 00:00:00 2001
From: victor <vict3459@edu.sde.dk>
Date: Thu, 26 Nov 2020 12:44:53 +0100
Subject: [PATCH] v1.4.9b Service worker cache works now

---
 .../{js => }/serviceWorkerCachedWebpags.js       | 16 +++++++++-------
 .../public/{js => }/serviceWorkerRegistration.js |  2 +-
 .../resources/views/app/layout/base.blade.php    |  2 +-
 .../resources/views/user/layout/base.blade.php   |  1 +
 4 files changed, 12 insertions(+), 9 deletions(-)
 rename skolehjem/public/{js => }/serviceWorkerCachedWebpags.js (89%)
 rename skolehjem/public/{js => }/serviceWorkerRegistration.js (92%)

diff --git a/skolehjem/public/js/serviceWorkerCachedWebpags.js b/skolehjem/public/serviceWorkerCachedWebpags.js
similarity index 89%
rename from skolehjem/public/js/serviceWorkerCachedWebpags.js
rename to skolehjem/public/serviceWorkerCachedWebpags.js
index 11e18af..d8d86a2 100644
--- a/skolehjem/public/js/serviceWorkerCachedWebpags.js
+++ b/skolehjem/public/serviceWorkerCachedWebpags.js
@@ -7,7 +7,8 @@ const assets = [
     '/css/webapp.css',
     '/css/webappdark.css',
     '/home',
-    '/events'
+    '/events',
+    '/login'
 ];
 
 // install event
@@ -15,7 +16,7 @@ self.addEventListener('install', evt => {
     //console.log('service worker installed');
     evt.waitUntil(
         caches.open(staticCacheName).then((cache) => {
-            console.log('caching shell assets');
+            //console.log('caching shell assets');
             return cache.addAll(assets);
         })
     );
@@ -36,16 +37,16 @@ self.addEventListener('activate', evt => {
 });
 
 // fetch event
+
 self.addEventListener('fetch', evt => {
-    //console.log('fetch event', evt);
+    console.log('fetch event');
     evt.respondWith(
-        caches.match(evt.request).then(cacheRes => {
+        caches.match(evt.request).then( async function (cacheRes){
             return cacheRes || fetch(evt.request).then(fetchRes => {
                 return caches.open(dynamicCacheName).then(cache => {
                     cache.put(evt.request.url, fetchRes.clone()).then(r => {
                         return fetchRes;
                     });
-
                 })
             });
         })
@@ -53,7 +54,8 @@ self.addEventListener('fetch', evt => {
 });
 
 
-//Push notification, this is more of a demo you can test in the dev tool
+
+/*
 self.addEventListener('push', evt => {
     const title = "Test Notification";
     const body = "Det her et en demo på hvordan en notification kan se ud! ";
@@ -78,4 +80,4 @@ function displayNotification(){
             })
     }
 }
-
+*/
diff --git a/skolehjem/public/js/serviceWorkerRegistration.js b/skolehjem/public/serviceWorkerRegistration.js
similarity index 92%
rename from skolehjem/public/js/serviceWorkerRegistration.js
rename to skolehjem/public/serviceWorkerRegistration.js
index 23f5498..b9c8b65 100644
--- a/skolehjem/public/js/serviceWorkerRegistration.js
+++ b/skolehjem/public/serviceWorkerRegistration.js
@@ -7,7 +7,7 @@ Make sure that we support service worker :)
 if('serviceWorker' in navigator){
     window.addEventListener('load', () => {
         navigator.serviceWorker
-        .register('/js/serviceWorkerCachedWebpags.js')
+        .register('/serviceWorkerCachedWebpags.js')
             .then(reg => console.log("Service Worker has been: registered"))
             .catch(err => console.log(`Service Worker error: ${err}`))
     })
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 44b7d73..32aae87 100644
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@@ -121,7 +121,7 @@
 </style>
 @yield("content")
 <script src="{{ mix("/js/app.js") }}"></script>
-<script src="/js/serviceWorkerRegistration.js"></script>
+<script src="/serviceWorkerRegistration.js"></script>
 <!--We have a service worker on the login pages, dont know if he works on the rest of the website, it looks like he does :) -->
 @if(request()->cookie("mode") == "dark")
     <script type="text/javascript">
diff --git a/skolehjem/resources/views/user/layout/base.blade.php b/skolehjem/resources/views/user/layout/base.blade.php
index ab388e5..0c20034 100644
--- a/skolehjem/resources/views/user/layout/base.blade.php
+++ b/skolehjem/resources/views/user/layout/base.blade.php
@@ -30,6 +30,7 @@
     @yield("content")
 
     <script src="{{ mix("/js/app.js") }}"></script>
+    <script src="/serviceWorkerRegistration.js"></script>
     @yield("scripts")
 </body>
 </html>