Make sure everything is cached using same service bump 0.18.0

rodekruis · Nov 11, 2024 · e99962d · e99962d
1 parent 911c0f6
commit e99962d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 25 deletions.
diff --git a/PWA/package.json b/PWA/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ReliefBox",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "A tool for managing the distribution of relief items during humanitarian emergencies.",
   "main": "index.js",
   "scripts": {

diff --git a/PWA/public/Services/CacheFilePathService.js b/PWA/public/Services/CacheFilePathService.js
@@ -38,6 +38,7 @@ import { DocumentationHandler } from "./FetchEventHandlers/DocumentationHandler.
 export class CacheFilePathService {
     pathsOfFilesToCache() {
         return [
+            this.miscellaneousPaths(),
             this.imagesPaths(),
             this.pagePaths(),
             this.modelPaths(),
@@ -50,6 +51,18 @@ export class CacheFilePathService {
             return previousArray.concat(currentValue);
         }, []);
     }
+    miscellaneousPaths() {
+        return [
+            "/",
+            "/favicon.ico",
+            "/manifest.json",
+            "/apple-touch-icon.png",
+            "/apple-touch-icon-precomposed.png",
+            "/images/icons/app-icon-192x192.png",
+            "/apple-touch-icon-120x120.png",
+            "/apple-touch-icon-120x120-precomposed.png",
+        ];
+    }
     pagePaths() {
         return [
             RouteEvents.template,

diff --git a/PWA/public/index.html b/PWA/public/index.html
@@ -39,7 +39,7 @@
       <!--    <a class="navbar-item">-->
       <img src="images/ReliefBox-horizontal-nobackground.png" width="220" height="30">
       <!--    </a>-->
-      <div class="navbar-item">Alpha 0.17.0</div>
+      <div class="navbar-item">Alpha 0.18.0</div>
       <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>

diff --git a/PWA/public/sw.js b/PWA/public/sw.js
@@ -11,17 +11,7 @@ self.addEventListener("install", function (event) {
     event.waitUntil(caches.open(CACHE_STATIC_NAME)
         .then(function (cache) {
         console.log("ℹ️ Precaching App Shell..");
-        cache.addAll([
-            "/",
-            "/favicon.ico",
-            "/manifest.json",
-            "/apple-touch-icon.png",
-            "/apple-touch-icon-precomposed.png",
-            "/images/icons/app-icon-192x192.png",
-            "/apple-touch-icon-120x120.png",
-            "/apple-touch-icon-120x120-precomposed.png",
-        ]
-            .concat(new CacheFilePathService().pathsOfFilesToCache()));
+        cache.addAll(new CacheFilePathService().pathsOfFilesToCache());
     })
         .then(() => {
         console.log("ℹ️ Serviceworker installed ✅");

diff --git a/PWA/src/Services/CacheFilePathService.ts b/PWA/src/Services/CacheFilePathService.ts
@@ -39,6 +39,7 @@ import { DocumentationHandler } from "./FetchEventHandlers/DocumentationHandler.
 export class CacheFilePathService {
   pathsOfFilesToCache(): string[] {
     return [
+      this.miscellaneousPaths(),
       this.imagesPaths(),
       this.pagePaths(),
       this.modelPaths(),
@@ -52,6 +53,19 @@ export class CacheFilePathService {
     }, []);
   }
 
+  private miscellaneousPaths(): string[] {
+    return [
+      "/",
+      "/favicon.ico",
+      "/manifest.json",
+      "/apple-touch-icon.png",
+      "/apple-touch-icon-precomposed.png",
+      "/images/icons/app-icon-192x192.png",
+      "/apple-touch-icon-120x120.png",
+      "/apple-touch-icon-120x120-precomposed.png",
+    ]
+  }
+
   private pagePaths(): string[] {
     return [
       RouteEvents.template,

diff --git a/PWA/src/sw.ts b/PWA/src/sw.ts
@@ -15,18 +15,7 @@ self.addEventListener("install", function (event: any) {
     caches.open(CACHE_STATIC_NAME)
     .then(function (cache) {
       console.log("ℹ️ Precaching App Shell..");
-      cache.addAll([
-        "/",
-        "/favicon.ico",
-        "/manifest.json",
-        "/apple-touch-icon.png",
-        "/apple-touch-icon-precomposed.png",
-        "/images/icons/app-icon-192x192.png",
-        "/apple-touch-icon-120x120.png",
-        "/apple-touch-icon-120x120-precomposed.png",
-      ]
-      .concat(new CacheFilePathService().pathsOfFilesToCache())
-      );
+      cache.addAll(new CacheFilePathService().pathsOfFilesToCache())
     })
     .then(() => {
       console.log("ℹ️ Serviceworker installed ✅")