Merge remote-tracking branch 'refs/remotes/origin/main'

basharovV · Feb 17, 2024 · d34b50c · d34b50c
2 parents 7a1ed3c + 7a81bc2
commit d34b50c
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "svelte-particles": "^2.12.0",
     "svelte-preprocess": "^5.1.3",
     "svelte-tippy": "^1.3.2",
+    "tauri-plugin-fs-watch-api": "github:tauri-apps/tauri-plugin-fs-watch#v1",
     "tippy.js": "^6.3.7",
     "tslib": "^2.4.0",
     "tsparticles-preset-stars": "^2.12.0",
@@ -50,9 +51,9 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^1.5.1",
+    "@tauri-apps/cli-win32-x64-msvc": "^1.5.9",
     "is-dark-color": "^1.2.0",
     "music-metadata-browser": "^2.5.8",
-    "svrollbar": "^0.12.0",
-    "tauri-plugin-fs-watch-api": "github:tauri-apps/tauri-plugin-fs-watch#v1"
+    "svrollbar": "^0.12.0"
   }
 }
diff --git a/src/App.svelte b/src/App.svelte
@@ -14,6 +14,7 @@
         isSettingsOpen,
         isTrackInfoPopupOpen,
         isWelcomeSeen,
+        os,
         uiView,
         userSettings
     } from "./data/store";
@@ -186,7 +187,7 @@
     <Dropzone />
 {/if}
 
-<main class:mini-player={$isMiniPlayer}>
+<main class:mini-player={$isMiniPlayer} class:transparent={$os === 'Darwin'}>
     <div class="sidebar">
         {#if $isWelcomeSeen}
             <Sidebar />
@@ -218,7 +219,11 @@
         height: 100vh;
         opacity: 1;
         position: relative;
-        background-color: #242026c2;
+            background-color: #242026;
+
+        &.transparent {
+            background-color: #242026c2;
+        }
 
         &.mini-player {
             border-radius: 5px;

diff --git a/src/data/store.ts b/src/data/store.ts
@@ -151,7 +151,7 @@ const defaultSettings: UserSettings = {
 
 export const userSettings: Writable<UserSettings> = writable(
     { ...defaultSettings, ...JSON.parse(localStorage.getItem("settings")) } ||
-        defaultSettings
+    defaultSettings
 );
 
 export const foldersToWatch = derived(
@@ -202,20 +202,9 @@ export const isLyricsHovered = writable(false);
 export const currentSongLyrics: Writable<CurrentSongLyrics> = writable(null);
 
 async function getOs() {
-    const os = await type();
-    let explorerName;
-    switch (os) {
-        case "Darwin":
-            explorerName = "Finder";
-            break;
-        case "Windows_NT":
-            explorerName = "Explorer";
-            break;
-        case "Linux":
-            explorerName = "File manager";
-            break;
-    }
-    return explorerName;
+    const osType = await type();
+
+    os.set(osType);
 }
 
 getOs();
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,6 +5,7 @@
         "useDefineForClassFields": true,
         "module": "ESNext",
         "resolveJsonModule": true,
+        "moduleResolution": "Node",
         "baseUrl": ".",
         /**
          * Typecheck JS in `.svelte` and `.js` files by default.