clean up

beyondessential · Nov 7, 2024 · 29ab916 · 29ab916
1 parent 068a72f
commit 29ab916
Show file tree

Hide file tree

Showing 47 changed files with 27 additions and 94 deletions.
diff --git a/packages/datatrak-web/index.html b/packages/datatrak-web/index.html
@@ -65,6 +65,13 @@
     <!-- End of bes-support Zendesk Widget script -->
     <% } %>
 
+    <!-- Temporarily disable PWA on production environments -->
+    <% if (process.env.REACT_APP_DEPLOYMENT_NAME !== 'master' &&
+    process.env.REACT_APP_DEPLOYMENT_NAME === 'main' && process.env.REACT_APP_DEPLOYMENT_NAME !==
+    'production') { %>
+      <link rel="manifest" id="manifest" href="/manifest.json"/>
+    <% } %>
+
     <link rel="icon" type="image/png" href="/favicon.ico" />
     <!-- Add media='print' and onload="this.media='all'" to stop the resource being render-blocking on load: see https://pagespeedchecklist.com/asynchronous-google-fonts -->
     <link
@@ -96,11 +103,6 @@
         crossorigin=""
       />
     </noscript>
-
-
-
-    <link rel="manifest" id="manifest" href="/manifest.json"/>
-
   </head>
   <body>
     <noscript>

diff --git a/packages/datatrak-web/package.json b/packages/datatrak-web/package.json
@@ -16,7 +16,6 @@
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@material-ui/pickers": "^3.2.10",
     "@material-ui/styles": "^4.9.10",
-    "@sqlite.org/sqlite-wasm": "^3.46.1-build3",
     "@tanstack/react-query": "4.36.1",
     "@testing-library/react-hooks": "^8.0.1",
     "@tupaia/expression-parser": "workspace:*",
@@ -60,14 +59,11 @@
     "msw": "^1.3.1",
     "npm-run-all": "^4.1.5",
     "vite": "^4.5.3",
-    "workbox-cli": "^7.1.0",
-    "workbox-recipes": "^7.1.0",
-    "workbox-routing": "^7.1.0",
-    "workbox-strategies": "^7.1.0"
+    "workbox-cli": "^7.1.0"
   },
   "scripts": {
     "build:worker": "esbuild --outfile=dist/sw.js --bundle service-worker.ts && workbox injectManifest workbox-config.js",
-    "build": "yarn package:build:types && yarn package:build:vite",
+    "build": "yarn package:build:types && yarn package:build:vite && yarn build:worker",
     "lint": "yarn package:lint",
     "lint:fix": "yarn lint --fix",
     "preview": "vite preview",

diff --git a/packages/datatrak-web/public/icons/apple-icon-180.png b/packages/datatrak-web/public/icons/apple-icon-180.png
diff --git a/packages/datatrak-web/public/icons/apple-splash-1125-2436.jpg b/packages/datatrak-web/public/icons/apple-splash-1125-2436.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1136-640.jpg b/packages/datatrak-web/public/icons/apple-splash-1136-640.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1170-2532.jpg b/packages/datatrak-web/public/icons/apple-splash-1170-2532.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1179-2556.jpg b/packages/datatrak-web/public/icons/apple-splash-1179-2556.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1242-2208.jpg b/packages/datatrak-web/public/icons/apple-splash-1242-2208.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1242-2688.jpg b/packages/datatrak-web/public/icons/apple-splash-1242-2688.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1284-2778.jpg b/packages/datatrak-web/public/icons/apple-splash-1284-2778.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1290-2796.jpg b/packages/datatrak-web/public/icons/apple-splash-1290-2796.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1334-750.jpg b/packages/datatrak-web/public/icons/apple-splash-1334-750.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1488-2266.jpg b/packages/datatrak-web/public/icons/apple-splash-1488-2266.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1536-2048.jpg b/packages/datatrak-web/public/icons/apple-splash-1536-2048.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1620-2160.jpg b/packages/datatrak-web/public/icons/apple-splash-1620-2160.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1640-2360.jpg b/packages/datatrak-web/public/icons/apple-splash-1640-2360.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1668-2224.jpg b/packages/datatrak-web/public/icons/apple-splash-1668-2224.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1668-2388.jpg b/packages/datatrak-web/public/icons/apple-splash-1668-2388.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-1792-828.jpg b/packages/datatrak-web/public/icons/apple-splash-1792-828.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2048-1536.jpg b/packages/datatrak-web/public/icons/apple-splash-2048-1536.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2048-2732.jpg b/packages/datatrak-web/public/icons/apple-splash-2048-2732.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2160-1620.jpg b/packages/datatrak-web/public/icons/apple-splash-2160-1620.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2208-1242.jpg b/packages/datatrak-web/public/icons/apple-splash-2208-1242.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2224-1668.jpg b/packages/datatrak-web/public/icons/apple-splash-2224-1668.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2266-1488.jpg b/packages/datatrak-web/public/icons/apple-splash-2266-1488.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2360-1640.jpg b/packages/datatrak-web/public/icons/apple-splash-2360-1640.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2388-1668.jpg b/packages/datatrak-web/public/icons/apple-splash-2388-1668.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2436-1125.jpg b/packages/datatrak-web/public/icons/apple-splash-2436-1125.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2532-1170.jpg b/packages/datatrak-web/public/icons/apple-splash-2532-1170.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2556-1179.jpg b/packages/datatrak-web/public/icons/apple-splash-2556-1179.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2688-1242.jpg b/packages/datatrak-web/public/icons/apple-splash-2688-1242.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2732-2048.jpg b/packages/datatrak-web/public/icons/apple-splash-2732-2048.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2778-1284.jpg b/packages/datatrak-web/public/icons/apple-splash-2778-1284.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-2796-1290.jpg b/packages/datatrak-web/public/icons/apple-splash-2796-1290.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-640-1136.jpg b/packages/datatrak-web/public/icons/apple-splash-640-1136.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-750-1334.jpg b/packages/datatrak-web/public/icons/apple-splash-750-1334.jpg
diff --git a/packages/datatrak-web/public/icons/apple-splash-828-1792.jpg b/packages/datatrak-web/public/icons/apple-splash-828-1792.jpg
diff --git a/packages/datatrak-web/public/manifest.json b/packages/datatrak-web/public/manifest.json
@@ -1,19 +1,20 @@
 {
-  "name": "Tupaia",
-  "short_name": "Tupaia",
-  "theme_color": "#ffcbe4",
-  "background_color": "#fa99ca",
+  "id": "datatrak",
+  "name": "Tupaia DataTrak",
+  "short_name": "Tupaia DataTrak",
+  "theme_color": "#000000",
+  "background_color": "#ffffff",
   "display": "standalone",
   "scope": "/",
   "start_url": "/",
-  "description": "Pacific Health Information System",
+  "description": "Data collection and visualisation for the most remote settings in the world",
   "screenshots": [
     {
       "src": "screenshots/login.png",
       "sizes": "2000x1000",
       "type": "image/png",
       "form_factor": "wide",
-      "label": "Login"
+      "label": "Login screen"
     },
     {
       "src": "screenshots/dashboard.png",
@@ -27,7 +28,7 @@
       "sizes": "381x667",
       "type": "image/png",
       "form_factor": "narrow",
-      "label": "Login Mobile"
+      "label": "Mobile login screen"
     }
   ],
   "icons": [
@@ -55,5 +56,11 @@
       "type": "image/png",
       "purpose": "maskable"
     }
+  ],
+  "shortcuts": [
+    {
+      "name": "Tasks",
+      "url": "/tasks"
+    }
   ]
 }
diff --git a/packages/datatrak-web/public/screenshots/dashboard.png b/packages/datatrak-web/public/screenshots/dashboard.png
diff --git a/packages/datatrak-web/public/screenshots/login-mobile.png b/packages/datatrak-web/public/screenshots/login-mobile.png
diff --git a/packages/datatrak-web/public/screenshots/login.png b/packages/datatrak-web/public/screenshots/login.png
diff --git a/packages/datatrak-web/service-worker.ts b/packages/datatrak-web/service-worker.ts
@@ -2,18 +2,8 @@
  * Tupaia
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { offlineFallback } from 'workbox-recipes';
 import { precacheAndRoute } from 'workbox-precaching';
-import { registerRoute } from 'workbox-routing';
-import { CacheFirst } from 'workbox-strategies';
 
 declare const self: ServiceWorkerGlobalScope;
 
 precacheAndRoute(self.__WB_MANIFEST);
-
-registerRoute(
-  ({ url }) => url.pathname.startsWith('/v1/'),
-  new CacheFirst({ cacheName: 'apiResponses' }),
-);
-
-offlineFallback();
diff --git a/packages/datatrak-web/src/main.tsx b/packages/datatrak-web/src/main.tsx
@@ -5,12 +5,9 @@
 import React from 'react';
 import { render as renderReactApp } from 'react-dom';
 import { App } from './App';
-import { initializeSQLite } from './sqlite';
 
 renderReactApp(<App />, document.getElementById('root'));
 
-await initializeSQLite();
-
 window.addEventListener('load', () => {
   if ('serviceWorker' in navigator) {
     navigator.serviceWorker.register('/sw.js');

diff --git a/packages/datatrak-web/src/sqlite.js b/packages/datatrak-web/src/sqlite.js
diff --git a/packages/datatrak-web/workbox-config.js b/packages/datatrak-web/workbox-config.js
@@ -3,5 +3,5 @@ module.exports = {
   globPatterns: ['**/*.{svg,png,ico,jpg,json,js,txt,html}'],
   swSrc: 'dist/sw.js',
   swDest: 'dist/sw.js',
-  maximumFileSizeToCacheInBytes: 5 * 1024 * 1024,
+  maximumFileSizeToCacheInBytes: 5 * 1024 * 1024, // 5MB
 };
diff --git a/vite.config.js b/vite.config.js
@@ -37,11 +37,6 @@ export default defineConfig(({ command, mode }) => {
         },
       },
     },
-
-    optimizeDeps: {
-      exclude: ['@sqlite.org/sqlite-wasm'],
-    },
-
     plugins: [
       ViteEjsPlugin(), // Enables use of EJS templates in the index.html file, for analytics scripts etc
       viteCompression(),

diff --git a/yarn.lock b/yarn.lock