Merge branch 'overlayeddev:main' into me3di

apps/desktop/src-tauri/gen/schemas/capabilities.json

@@ -1,33 +1 @@
-{
-  "desktop-capability": {
-    "identifier": "desktop-capability",
-    "description": "",
-    "local": true,
-    "windows": ["main", "settings"],
-    "webviews": ["main", "settings"],
-    "permissions": [
-      "core:default",
-      "updater:default",
-      "fs:default",
-      { "identifier": "fs:allow-app-write", "allow": [{ "path": "$APPCONFIG/*" }] },
-      "core:window:allow-set-size",
-      "core:window:allow-start-dragging",
-      "process:default",
-      "core:tray:default",
-      "core:app:default",
-      "core:event:default",
-      "shell:default",
-      "websocket:default",
-      "window-state:default",
-      { "identifier": "http:default", "allow": [{ "url": "https://api.overlayed.dev" }] }
-    ],
-    "platforms": ["macOS", "windows", "linux"]
-  },
-  "migrated": {
-    "identifier": "migrated",
-    "description": "permissions that were migrated from v1",
-    "local": true,
-    "windows": ["main"],
-    "permissions": ["core:default"]
-  }
-}
+{"desktop-capability":{"identifier":"desktop-capability","description":"","local":true,"windows":["main","settings"],"webviews":["main","settings"],"permissions":["core:default","updater:default","fs:default",{"identifier":"fs:allow-app-write","allow":[{"path":"$APPCONFIG/*"}]},"core:window:allow-set-size","core:window:allow-start-dragging","process:default","core:tray:default","core:app:default","core:event:default","shell:default","websocket:default","window-state:default",{"identifier":"http:default","allow":[{"url":"https://api.overlayed.dev"}]}],"platforms":["macOS","windows","linux"]},"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default"]}}

apps/desktop/src-tauri/src/main.rs

@@ -168,14 +168,12 @@ fn main() {
   app
     .build(tauri::generate_context!())
     .expect("An error occured while running the app!")
-    .run(|app, event| {
+    .run(|_app, event| {
       if let tauri::RunEvent::WindowEvent {
-        label,
         event: tauri::WindowEvent::CloseRequested { api, .. },
         ..
       } = event
       {
-        let win = app.get_webview_window(label.as_str()).unwrap();
         api.prevent_close();
       }
     });

apps/desktop/src-tauri/tauri.conf.json

@@ -15,7 +15,12 @@
       "icons/stable/[email protected]",
       "icons/stable/icon.icns",
       "icons/stable/icon.ico"
-    ]
+    ],
+    "windows": {
+      "webviewInstallMode": {
+        "type": "offlineInstaller"
+      }
+    }
   },
   "productName": "Overlayed",
   "version": "0.5.0",

apps/desktop/src/views/settings/account.tsx

@@ -23,7 +23,6 @@ import { emit } from "@tauri-apps/api/event";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import type { VoiceUser } from "@/types";
 import { useConfigValue } from "@/hooks/use-config-value";
-import { Slider } from "@/components/ui/slider";
 import * as shell from "@tauri-apps/plugin-shell";
 
 export const Developer = () => {
@@ -126,7 +125,6 @@ export const Account = () => {
   const [showQuitDialog, setShowQuitDialog] = useState(false);
   const [user, setUser] = useState<VoiceUser | null>(null);
   const [tokenExpires, setTokenExpires] = useState(localStorage.getItem("discord_access_token_expiry"));
-  const [zoom, setZoom] = useState(1);
 
   // pull out the user data from localStorage
   useEffect(() => {
@@ -267,20 +265,6 @@ export const Account = () => {
           <Developer />
         </div>
         <AppInfo />
-        Zoom
-        <Slider
-          onValueChange={async ([val]) => {
-            setZoom(val as number);
-            console.log(val);
-            await invoke("zoom_window", { scaleFactor: zoom });
-          }}
-          defaultValue={[1.0]}
-          min={0.4}
-          max={1.5}
-          step={0.1}
-          className="w-[60%]"
-        />
-        {zoom}
       </div>
     </div>
   );

apps/web/src/components/react/download.tsx

@@ -17,7 +17,7 @@ export const Download = ({ canary = true }: { canary?: boolean }) => {
   const [platformDownloads, setPlatformDownloads] = useState<{
     downloads: PlatformDownload[];
     latestVersion: string;
-    updated?: string;
+    updatedAt?: string;
   }>({
     downloads: [],
     latestVersion: "",
@@ -38,14 +38,16 @@ export const Download = ({ canary = true }: { canary?: boolean }) => {
   useEffect(() => {
     const timerId = setInterval(() => {
       setFormattedTime(
-        getRelativeTime(platformDownloads.updated || new Date()),
+        getRelativeTime(platformDownloads.updatedAt || new Date()),
       );
     }, 1000);
 
-    setFormattedTime(getRelativeTime(platformDownloads.updated || new Date()));
+    setFormattedTime(
+      getRelativeTime(platformDownloads.updatedAt || new Date()),
+    );
 
     return () => clearInterval(timerId);
-  }, [platformDownloads.updated]);
+  }, [platformDownloads.updatedAt]);
 
   const commitSha = platformDownloads.latestVersion.substring(0, 7);
   const shortCommitSha = commitSha.substring(0, 7);