From 63bb1b989bea8228fc636f75495b13a0c44bf7d0 Mon Sep 17 00:00:00 2001 From: Richie McIlroy <33632126+richiemcilroy@users.noreply.github.com> Date: Sun, 24 Mar 2024 21:23:33 +0000 Subject: [PATCH] chore: Remove cap_test_build_version as no longer needed --- apps/desktop/package.json | 2 +- apps/desktop/src-tauri/tauri.conf.json | 2 +- apps/desktop/src/app/page.tsx | 48 +++----------------------- apps/web/package.json | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 42d186b..ed9db2f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "private": true, - "version": "0.1.5", + "version": "0.1.6", "scripts": { "dev": "tauri dev", "build": "tsc && next build", diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index 6141a2a..014b170 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Cap", - "version": "0.1.5" + "version": "0.1.6" }, "tauri": { "allowlist": { diff --git a/apps/desktop/src/app/page.tsx b/apps/desktop/src/app/page.tsx index 2d9f9bd..3458866 100644 --- a/apps/desktop/src/app/page.tsx +++ b/apps/desktop/src/app/page.tsx @@ -19,46 +19,6 @@ export default function CameraPage() { const [permissions, setPermissions] = useState(getPermissions()); const [permissionsLoaded, setPermissionsLoaded] = useState(false); - useEffect(() => { - const checkVersion = async () => { - const storedVersion = localStorage.getItem("cap_test_build_version"); - const appVersion = await getVersion(); - - if (!storedVersion) { - console.log("No version stored"); - localStorage.setItem("cap_test_build_version", appVersion); - - if (localStorage.getItem("permissions")) { - await invoke("reset_screen_permissions"); - const permissions = JSON.parse( - localStorage.getItem("permissions") || "{}" - ); - permissions.screen = false; - permissions.confirmed = false; - localStorage.setItem("permissions", JSON.stringify(permissions)); - toast.error( - "New version downloaded - screen permissions have been reset" - ); - } - } else if (storedVersion !== appVersion) { - console.log("New version downloaded"); - localStorage.setItem("cap_test_build_version", appVersion); - await invoke("reset_screen_permissions"); - const permissions = JSON.parse( - localStorage.getItem("permissions") || "{}" - ); - permissions.screen = false; - permissions.confirmed = false; - localStorage.setItem("permissions", JSON.stringify(permissions)); - toast.error( - "New version downloaded - screen permissions have been reset" - ); - } - }; - - checkVersion(); - }, []); - useEffect(() => { const checkPermissions = setInterval(() => { const updatedPermissions = getPermissions(); @@ -97,13 +57,13 @@ export default function CameraPage() { } }, [isSignedIn, cameraWindowOpen, permissions.confirmed]); - if(process.env.NEXT_PUBLIC_LOCAL_MODE === "true"){ - return( + if (process.env.NEXT_PUBLIC_LOCAL_MODE === "true") { + return ( <> - ) + ); } if (loading && !permissionsLoaded) { @@ -119,7 +79,7 @@ export default function CameraPage() { {isSignedIn ? ( <> - {(!permissions || permissions.confirmed === false)? ( + {!permissions || permissions.confirmed === false ? ( ) : ( diff --git a/apps/web/package.json b/apps/web/package.json index 738e199..2faeb27 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "web", - "version": "0.1.5", + "version": "0.1.6", "private": true, "scripts": { "dev": "next dev",