From ec25d5d2bb5bb566bc631ae47a915e89ed7dcac1 Mon Sep 17 00:00:00 2001 From: HorizonCode Date: Wed, 16 Jul 2025 22:35:39 +0200 Subject: [PATCH] chore: ignore esc key for update and launch dialog --- .prettierignore | 3 +++ .prettierrc | 2 +- .vscode/settings.json | 2 +- README.md | 8 ++++---- .../components/ui/titlebar/titlebar.svelte | 8 ++++++-- src/lib/global.ts | 4 ++-- src/lib/osuUtil.ts | 11 ++++------- src/routes/+layout.svelte | 2 +- src/screens/Launch.svelte | 19 +++++++++++++++---- 9 files changed, 37 insertions(+), 22 deletions(-) diff --git a/.prettierignore b/.prettierignore index 7d74fe2..18d88c6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,3 +7,6 @@ bun.lockb # Miscellaneous /static/ + +# Tauri +/src-tauri/ diff --git a/.prettierrc b/.prettierrc index badd21e..18dae0c 100644 --- a/.prettierrc +++ b/.prettierrc @@ -9,7 +9,7 @@ "tabWidth": 2, "useTabs": false, "bracketSpacing": true, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-rust"], + "plugins": ["prettier-plugin-svelte"], "overrides": [ { "files": "*.svelte", diff --git a/.vscode/settings.json b/.vscode/settings.json index 0949f69..3245f2c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ { "svelte.enable-ts-plugin": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - "[rust]":{ + "[rust]": { "editor.defaultFormatter": "rust-lang.rust-analyzer" } } diff --git a/README.md b/README.md index eaf90c7..11d6018 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ It enhances the osu! experience with quality-of-life features and integration sp ## 💻 Supported Platforms -| Platform | Status | -| -------- | ---------------- | -| Windows | ✅ Supported | -| macOS | ❌ Not supported | +| Platform | Status | +| -------- | ---------------------------------------- | +| Windows | ✅ Supported | +| macOS | ❌ Not supported | | Linux | 🕧 Partially supported (via osu-winello) | > Currently, only **Windows** is fully supported. Support for other platforms may be considered in the future. diff --git a/src/lib/components/ui/titlebar/titlebar.svelte b/src/lib/components/ui/titlebar/titlebar.svelte index d08e917..d12ac8e 100644 --- a/src/lib/components/ui/titlebar/titlebar.svelte +++ b/src/lib/components/ui/titlebar/titlebar.svelte @@ -20,10 +20,14 @@
-
+
EZPP Launcher Logo EZPPLauncher - {$launcherVersion} + {$launcherVersion}
diff --git a/src/lib/global.ts b/src/lib/global.ts index 217164a..888e219 100644 --- a/src/lib/global.ts +++ b/src/lib/global.ts @@ -1,12 +1,12 @@ import { writable } from 'svelte/store'; import { ezppfarm } from './api/ezpp'; import type { Component } from 'svelte'; -import Loading from '../pages/Loading.svelte'; +import Loading from '../screens/Loading.svelte'; import type { Release } from './types'; export const currentView = writable(Loading); -export const platform = writable(""); +export const platform = writable(''); export const launcherVersion = writable(''); export const newVersion = writable(undefined); diff --git a/src/lib/osuUtil.ts b/src/lib/osuUtil.ts index eabe9bc..043904c 100644 --- a/src/lib/osuUtil.ts +++ b/src/lib/osuUtil.ts @@ -133,11 +133,8 @@ export const exit = async () => await invoke('exit'); export const getPlatform = async () => await invoke('get_platform'); export const isOsuCorrupted = async (folder: string) => await invoke('check_for_corruption', { folder }); -export const hasWMCTRL = async () => - await invoke('has_wmctrl'); -export const hasOsuWinello = async () => - await invoke('has_osuwinello'); -export const hasNet8 = async () => - await invoke('has_net8'); +export const hasWMCTRL = async () => await invoke('has_wmctrl'); +export const hasOsuWinello = async () => await invoke('has_osuwinello'); +export const hasNet8 = async () => await invoke('has_net8'); export const encryptString = async (str: string, entropy: string) => - await invoke('encrypt_string', {string: str, entropy}); \ No newline at end of file + await invoke('encrypt_string', { string: str, entropy }); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 8fbf4e4..dbb4c53 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -92,7 +92,7 @@ setupValues(); launcherVersion.set(await getLauncherVersion()); platform.set(await getPlatform()); - if ($platform !== "windows" && $platform !== "linux") unsupported_platform = true; + if ($platform !== 'windows' && $platform !== 'linux') unsupported_platform = true; const isFirstStartup = await $userSettings.init(); $userAuth.init(); diff --git a/src/screens/Launch.svelte b/src/screens/Launch.svelte index dc8b60e..2f0685b 100644 --- a/src/screens/Launch.svelte +++ b/src/screens/Launch.svelte @@ -297,7 +297,10 @@ }, { key: 'Password', - value: $platform === "windows" ? await encryptString(password, "cu24180ncjeiu0ci1nwui") : password, + value: + $platform === 'windows' + ? await encryptString(password, 'cu24180ncjeiu0ci1nwui') + : password, }, { key: 'SaveUsername', @@ -531,8 +534,12 @@ - - + +
@@ -568,7 +575,11 @@ - +