more settings

ellite · Feb 22, 2024 · 92327ef · 92327ef
1 parent c8f2b57
commit 92327ef
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 16 deletions.
diff --git a/includes/header.php b/includes/header.php
@@ -37,6 +37,7 @@
   <link rel="stylesheet" href="styles/dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>
   <link rel="stylesheet" href="styles/font.css">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
+  <script type="text/javascript" src="scripts/all.js?<?= $version ?>"></script>
   <script type="text/javascript" src="scripts/common.js?<?= $version ?>"></script>
   <script type="text/javascript">
     window.theme = "<?= $theme ?>";

diff --git a/includes/version.php b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-    $version = "v1.8.0a";
+    $version = "v1.8.0b";
 ?>
diff --git a/login.php b/login.php
@@ -82,6 +82,7 @@
     <link rel="stylesheet" href="styles/login.css?<?= $version ?>">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Barlow:300,400,500,600,700">
     <link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>
+    <script type="text/javascript" src="scripts/all.js?<?= $version ?>"></script>
 </head>
 <body>
     <div class="content">

diff --git a/manifest.json b/manifest.json
@@ -3,19 +3,35 @@
     "name": "Wallos - Personal Subscription Tracker",
     "icons": [
         {
-            "src": "images/icon/android-chrome-192x192",
+            "src": "images/icon/android-chrome-192x192.png",
             "type": "image/png",
             "sizes": "192x192"
         },
         {
-            "src": "/images/icon/android-chrome-512x512",
+            "src": "/images/icon/android-chrome-512x512.png",
             "type": "image/png",
             "sizes": "512x512"
+        },
+        {
+            "src": "images/icon/android-chrome-192x192.png",
+            "type": "image/png",
+            "sizes": "192x192",
+            "purpose": "maskable"
+        },
+        {
+            "src": "/images/icon/android-chrome-512x512.png",
+            "type": "image/png",
+            "sizes": "512x512",
+            "purpose": "maskable"
         }
     ],
-    "start_url": "/",
+    "start_url": "/",   
+    "id": "com.wallos.app",
     "background_color": "#FFFFFF",
     "display": "standalone",
     "scope": "/",
-    "theme_color": "#007bff"
+    "theme_color": "#FFFFFF",
+    "description": "Wallos is a personal subscription tracker that helps you keep track of your subscriptions and save money.",
+    "orientation": "portrait-primary",
+    "display_override": ["window-controls-overlay"]
 }
diff --git a/registration.php b/registration.php
@@ -97,6 +97,7 @@ function validate($value) {
         <link rel="stylesheet" href="styles/login.css?<?= $version ?>">
         <link rel="stylesheet" href="styles/login-dark-theme.css?<?= $version ?>" id="dark-theme" <?= $theme == "light" ? "disabled" : "" ?>>
         <script type="text/javascript" src="scripts/registration.js?<?= $version ?>"></script>
+        <script type="text/javascript" src="scripts/all.js?<?= $version ?>"></script>
     </head>
     <body>
         <div class="content">

diff --git a/scripts/all.js b/scripts/all.js
@@ -0,0 +1,9 @@
+if ('serviceWorker' in navigator) {
+    window.addEventListener('load', function() {
+      navigator.serviceWorker.register('scripts/service-worker.js').then(function(registration) {
+        console.log('ServiceWorker registration successful with scope: ', registration.scope);
+      }, function(err) {
+        console.log('ServiceWorker registration failed: ', err);
+      });
+    });
+  }
diff --git a/scripts/dashboard.js b/scripts/dashboard.js
@@ -316,14 +316,4 @@ document.addEventListener('DOMContentLoaded', function() {
     document.querySelector('#sort-options').addEventListener('focus', function() {
         isSortOptionsOpen = true;
     });
-});
-
-if ('serviceWorker' in navigator) {
-  window.addEventListener('load', function() {
-    navigator.serviceWorker.register('scripts/service-worker.js').then(function(registration) {
-      console.log('ServiceWorker registration successful with scope: ', registration.scope);
-    }, function(err) {
-      console.log('ServiceWorker registration failed: ', err);
-    });
-  });
-}
+});
diff --git a/scripts/service-worker.js b/scripts/service-worker.js
@@ -7,6 +7,7 @@ self.addEventListener('install', function(event) {
                 '/stats.php',
                 '/settings.php',
                 '/about.php',
+                '/endpoints/subscriptions/get.php',
                 '/styles/styles.css',
                 '/styles/dark-theme.css',
                 '/styles/font.css',
@@ -28,6 +29,7 @@ self.addEventListener('install', function(event) {
                 '/scripts/i18n/zh_cn.js',
                 '/scripts/i18n/zh_tw.js',
                 '/scripts/i18n/getlang.js',
+                '/images/*',
             ]);
         })
     );