diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 176a81f46..67ec24876 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -29,7 +29,7 @@ "decorations": true, "titleBarStyle": "Overlay", "windowEffects": { - "effects": ["fullScreenUI", "mica", "blur", "acrylic"], + "effects": ["fullScreenUI", "mica", "tabbed", "blur", "acrylic"], "state": "active", "radius": 8 } @@ -50,9 +50,7 @@ "enable": true, "scope": { "requireLiteralLeadingDot": false, - "allow": [ - "**/*" - ] + "allow": ["**/*"] } } } @@ -74,13 +72,7 @@ }, "bundle": { "active": true, - "targets": [ - "nsis", - "app", - "dmg", - "deb", - "appimage" - ], + "targets": ["nsis", "app", "dmg", "deb", "appimage"], "createUpdaterArtifacts": false, "icon": [ "icons/32x32.png", @@ -117,4 +109,4 @@ "signCommand": "powershell -ExecutionPolicy Bypass -File ./sign.ps1 %1" } } -} \ No newline at end of file +} diff --git a/web-app/src/containers/LeftPanel.tsx b/web-app/src/containers/LeftPanel.tsx index d0b248900..a7aaba9b9 100644 --- a/web-app/src/containers/LeftPanel.tsx +++ b/web-app/src/containers/LeftPanel.tsx @@ -102,7 +102,7 @@ const LeftPanel = () => { : 'w-0 absolute -top-100 -left-100 visibility-hidden' )} > -
+
-
- -
-
-
+ {!IS_MACOS && ( +
{ )}
+ )} +
+ +
+
+ {IS_MACOS && ( +
+ + setSearchTerm(e.target.value)} + /> + {searchTerm && ( + + )} +
+ )}
{favoritedThreads.length > 0 && ( diff --git a/web-app/src/routes/settings/hardware.tsx b/web-app/src/routes/settings/hardware.tsx index ff899d3b4..e3014b280 100644 --- a/web-app/src/routes/settings/hardware.tsx +++ b/web-app/src/routes/settings/hardware.tsx @@ -268,8 +268,9 @@ function Hardware() { {hardwareData.cpu?.instructions.join(', ').length > 0 && ( 6} actions={ - + {hardwareData.cpu?.instructions?.join(', ')} } @@ -315,7 +316,8 @@ function Hardware() {
{( - ((hardwareData.ram?.total - hardwareData.ram?.available) / + ((hardwareData.ram?.total - + hardwareData.ram?.available) / hardwareData.ram?.total) * 100 ).toFixed(2)} diff --git a/web-app/src/routes/system-monitor.tsx b/web-app/src/routes/system-monitor.tsx index db4ed12ad..3ab35ee2e 100644 --- a/web-app/src/routes/system-monitor.tsx +++ b/web-app/src/routes/system-monitor.tsx @@ -206,7 +206,9 @@ function SystemMonitor() { {gpu.name} -
Active
+
+ Active +
@@ -238,18 +240,7 @@ function SystemMonitor() { ((gpu.total_vram - gpu.free_vram) / gpu.total_vram) * 100 } - className={`h-2 w-full ${ - ((gpu.total_vram - gpu.free_vram) / gpu.total_vram) * - 100 > - 80 - ? 'bg-red-500/30' - : ((gpu.total_vram - gpu.free_vram) / - gpu.total_vram) * - 100 > - 50 - ? 'bg-yellow-500/30' - : 'bg-green-500/30' - }`} + className="h-2 w-full" />