Merge branch 'firebase-prod' into remove-supabase

slidr-app · Jul 6, 2023 · 5850522 · 5850522
2 parents 128fb56 + d4a4077
commit 5850522
Show file tree

Hide file tree

Showing 22 changed files with 2,182 additions and 158 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,9 @@ dist-ssr
 src/presentations/thumbs
 TODO.md
 *.serviceaccount.json
+
+# Don't commit auto generated icons
+public/apple-touch-icon-*.png
+public/favicon.ico
+public/maskable-icon-*.png
+public/pwa-*.png
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v20
+v18
diff --git a/firebase.json b/firebase.json
@@ -25,6 +25,15 @@
       }
     ],
     "headers": [
+      {
+        "source": "/**",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=0, s-maxage=3600"
+          }
+        ]
+      },
       {
         "source": "**/assets/*",
         "headers": [
@@ -33,6 +42,24 @@
             "value": "max-age=604800, immutable"
           }
         ]
+      },
+      {
+        "source": "/workbox-*.js",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=604800, immutable"
+          }
+        ]
+      },
+      {
+        "source": "/*.@(png|ico|svg)",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=3600"
+          }
+        ]
       }
     ]
   },

diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -38,7 +38,7 @@ export const renderForBot = onRequest(async (request, response) => {
     return;
   }
 
-  logger.info('bot', {userAgent: request.get('user-agent')});
+  // Logger.info('bot', {userAgent: request.get('user-agent')});
 
   const presentationId = request.path.split('/')[2];
 

diff --git a/functions/src/presentation.d.ts b/functions/src/presentation.d.ts
@@ -1,13 +1,17 @@
 export type Doc = {
   id: string;
 };
+
+// TODO: use this when uploading
 export type PresentationData = {
   title: string;
   thumb: string;
   pages: string[];
   notes: Note[];
   uid: string;
   username: string;
+  // TODO: use this in function metadata
+  twitterHandle: string;
   thumbIndex?: number;
 };
 export type PresentationDoc = Doc & PresentationData;

diff --git a/index.html b/index.html
@@ -3,13 +3,23 @@
 
 <head>
   <meta charset="UTF-8" />
+
+  <!-- Make fonts work offline: https://vite-pwa-org.netlify.app/workbox/generate-sw.html -->
+  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+  <link rel="preconnect" crossorigin="anonymous" href="https://fonts.gstatic.com">
+
   <!-- Favicons inspired from: https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs -->
   <link rel="icon" href="/favicon.ico" sizes="any" />
   <link rel="icon" type="image/svg+xml" href="/icon.svg" />
   <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+  <link rel="mask-icon" href="/mask-icon.svg" color="#000000">
   <link rel="manifest" href="/manifest.webmanifest" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+  <!-- PWA minimum: https://vite-pwa-org.netlify.app/guide/pwa-minimal-requirements.html -->
+  <meta property="description" content="Interactive presentations, for free.">
+  <meta name="theme-color" content="#000000">
+
   <!-- Inspired from: https://css-tricks.com/essential-meta-tags-social-media/#aa-final-markup -->
   <!--  Essential META Tags -->
   <meta property="og:title" content="Slidr.app">

diff --git a/package.json b/package.json
@@ -11,8 +11,9 @@
     "prepare": "husky install",
     "prepush": "pnpm run lint && pnpm run build:all",
     "build:functions": "pnpm --dir functions build",
-    "build:all": "pnpm run build && pnpm run build:functions",
-    "deploy": "firebase deploy"
+    "build:all": "pwa-assets-generator && pnpm run build && pnpm run build:functions",
+    "deploy": "firebase deploy",
+    "generate-pwa-assets": "pwa-assets-generator"
   },
   "dependencies": {
     "@unocss/reset": "^0.53.3",
@@ -46,6 +47,7 @@
     "@unocss/preset-web-fonts": "^0.53.3",
     "@unocss/transformer-directives": "^0.53.3",
     "@unocss/transformer-variant-group": "^0.53.3",
+    "@vite-pwa/assets-generator": "^0.0.3",
     "@vitejs/plugin-react": "^4.0.0",
     "eslint": "^8.41.0",
     "eslint-config-xo-react": "^0.27.0",
@@ -61,7 +63,9 @@
     "unocss": "^0.53.3",
     "vite": "^4.3.9",
     "vite-imagetools": "^5.0.4",
+    "vite-plugin-pwa": "^0.16.4",
     "vite-plugin-run": "^0.4.1",
+    "workbox-window": "^7.0.0",
     "xo": "^0.54.2"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         return;
       }
-      logger.info('bot', {userAgent: request.get('user-agent')});
+      // Logger.info('bot', {userAgent: request.get('user-agent')});
       const presentationId = request.path.split('/')[2];
@@ Expand Down @@