test

test pr

.github/workflows/firebase-hosting-mege.yml

@@ -1,20 +0,0 @@
-# This file was auto-generated by the Firebase CLI
-# https://github.com/firebase/firebase-tools
-name: Deploy to Firebase Hosting on merge
-'on':
-  push:
-    branches:
-      - main
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: oven-sh/setup-bun@v1
-      - run: bun install && bun run build && bun run lint
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}'
-          channelId: live
-          projectId: life-trinket

.github/workflows/firebase-release.yml

@@ -0,0 +1,58 @@
+name: Deploy to Firebase Hosting
+'on':
+  push:
+    tags:
+      - '*'
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    env:
+      REPO_READ_ACCESS_TOKEN: ${{ secrets.REPO_READ_ACCESS_TOKEN }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup bun
+        uses: oven-sh/setup-bun@v1
+
+      - name: Build, lint, and deploy
+        run: |
+          bun install
+          bun run build
+          bun run lint
+      - name: Deploy to Firebase Hosting
+        uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_LIFE_TRINKET }}'
+          channelId: live
+          projectId: life-trinket
+
+  release:
+    needs: build_and_deploy
+    runs-on: ubuntu-latest
+    env:
+      working-directory: ${{ github.workspace }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: get version
+        id: version
+        uses: notiz-dev/github-action-json-property@v0.2.0
+
+        with:
+          path: 'package.json'
+          prop_path: 'version'
+
+      - name: Create Release Note
+        id: create_release_note
+        run: echo "Release Note for version ${{ steps.version.outputs.prop }}" > release_note.txt
+
+      - name: Create Release
+        uses: ncipollo/release-action@v1.13.0
+        with:
+          bodyFile: release_note.txt
+          commit: ${{ github.sha }}
+          tag: '${{ steps.version.outputs.prop }}'
+          token: ${{ secrets.RELEASE_TOKEN }}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "life-trinket",
   "private": true,
-  "version": "0.5.0",
+  "version": "0.5.44",
   "type": "commonjs",
   "engines": {
     "node": ">=18",

src/Components/Misc/SettingsModal.tsx

@@ -4,6 +4,7 @@ import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
 import { ModalWrapper } from './InfoModal';
 import { Separator } from './Separator';
 import { Paragraph } from './TextComponents';
+import { useEffect, useState } from 'react';
 
 const SettingContainer = twc.div`w-full flex flex-col`;
 
@@ -20,6 +21,51 @@ type SettingsModalProps = {
 
 export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
   const { settings, setSettings, isPWA } = useGlobalSettings();
+  const [isLatestVersion, setIsLatestVersion] = useState(false);
+  const [newVersion, setNewVersion] = useState<string | undefined>(undefined);
+
+  useEffect(() => {
+    if (!isOpen) {
+      return;
+    }
+    async function checkIfLatestVersion() {
+      try {
+        const result = await fetch(
+          'https://api.github.com/repos/Vikeo/LifeTrinket/releases/latest',
+          {
+            headers: {
+              /* @ts-expect-error is defined in vite.config.ts*/
+              Authorization: `Bearer ${REPO_READ_ACCESS_TOKEN}`,
+              Accept: 'application/vnd.github+json',
+              'X-GitHub-Api-Version': '2022-11-28',
+            },
+          }
+        );
+        const data = await result.json();
+
+        console.info('liveVersion', data.name);
+
+        if (!data.name) {
+          setNewVersion(undefined);
+          setIsLatestVersion(false);
+          return;
+        }
+
+        setNewVersion(data.name);
+
+        /* @ts-expect-error is defined in vite.config.ts*/
+        if (data.name === APP_VERSION) {
+          setIsLatestVersion(true);
+          return;
+        }
+
+        setIsLatestVersion(false);
+      } catch (error) {
+        console.error('error getting latest version string', error);
+      }
+    }
+    checkIfLatestVersion();
+  }, [isOpen]);
 
   return (
     <Modal open={isOpen} onClose={closeModal}>
@@ -98,18 +144,36 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
           )}
           <Separator height="1px" />
           <SettingContainer>
-            {/* @ts-expect-error is defined in vite.config.ts*/}
-            <Paragraph>Version: {APP_VERSION}</Paragraph>
+            <Paragraph>
+              {/* @ts-expect-error is defined in vite.config.ts*/}
+              Current version: {APP_VERSION}{' '}
+              {isLatestVersion && (
+                <span className="text-sm text-text-secondary">(latest)</span>
+              )}
+            </Paragraph>
+            {!isLatestVersion && newVersion && (
+              <Paragraph className="text-text-secondary text-lg text-center">
+                New version ({newVersion}) is available!{' '}
+              </Paragraph>
+            )}
+          </SettingContainer>
+          {!isLatestVersion && newVersion && (
             <Button
               variant="contained"
+              style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }}
               onClick={() => window?.location?.reload()}
             >
-              Try to update version
+              <span>Update</span>
+              <span className="text-xs">&nbsp;(reload app)</span>
             </Button>
-          </SettingContainer>
+          )}
           <Separator height="1px" />
 
-          <Button variant="contained" onClick={closeModal}>
+          <Button
+            variant="contained"
+            onClick={closeModal}
+            style={{ marginTop: '0.25rem' }}
+          >
             Save and Close
           </Button>
         </Container>

vite.config.ts

@@ -12,5 +12,6 @@ export default defineConfig({
   },
   define: {
     APP_VERSION: JSON.stringify(process.env.npm_package_version),
+    REPO_READ_ACCESS_TOKEN: JSON.stringify(process.env.REPO_READ_ACCESS_TOKEN),
   },
 });