diff --git a/bun.lock b/bun.lock index 1a3f44e..8538cb9 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,6 @@ "name": "ezpplauncher", "dependencies": { "@better-fetch/fetch": "^1.1.18", - "@elron/svelte-audio-store": "1.0.0", "@fontsource/sora": "^5.2.6", "@fontsource/space-mono": "^5.2.8", "@iarna/toml": "^2.2.5", @@ -72,8 +71,6 @@ "@bufbuild/protobuf": ["@bufbuild/protobuf@2.5.2", "", {}, "sha512-foZ7qr0IsUBjzWIq+SuBLfdQCpJ1j8cTuNNT4owngTHoN5KsJb8L9t65fzz7SCeSWzescoOil/0ldqiL041ABg=="], - "@elron/svelte-audio-store": ["@elron/svelte-audio-store@1.0.0", "", { "peerDependencies": { "svelte": "^4.0.0" } }, "sha512-ksBF88rG4cbIt+ZLrxMKDdr1CxWxxEiyyZfHfNHCF/G9O2eDflSnCytSpid0Y43R4DwK+AukUlFfc0j5evqqEw=="], - "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.5", "", { "os": "aix", "cpu": "ppc64" }, "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA=="], "@esbuild/android-arm": ["@esbuild/android-arm@0.25.5", "", { "os": "android", "cpu": "arm" }, "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA=="], diff --git a/package.json b/package.json index 674a465..f0036b5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "license": "MIT", "dependencies": { "@better-fetch/fetch": "^1.1.18", - "@elron/svelte-audio-store": "1.0.0", "@fontsource/sora": "^5.2.6", "@fontsource/space-mono": "^5.2.8", "@iarna/toml": "^2.2.5", diff --git a/src/assets/background.gif b/src/assets/background.gif deleted file mode 100644 index 31a8f19..0000000 Binary files a/src/assets/background.gif and /dev/null differ diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 74d9892..e24ea61 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,16 +1,7 @@ -import { createAudioStore } from '@elron/svelte-audio-store'; import { invoke } from '@tauri-apps/api/core'; import { type ClassValue, clsx } from 'clsx'; import { twMerge } from 'tailwind-merge'; -const sounds = { - menuHeartbeat: '/audio/menuHeartbeat.mp3', - menuBack: '/audio/menuBack.wav', - menuHit: '/audio/menuHit.wav', -}; - -export const gameSounds = createAudioStore(sounds); - export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); } diff --git a/src/pages/Launch.svelte b/src/pages/Launch.svelte index 3270139..52e555b 100644 --- a/src/pages/Launch.svelte +++ b/src/pages/Launch.svelte @@ -8,7 +8,9 @@ beatmapSets, currentSkin, currentView, + launcherVersion, launching, + newVersion, osuBuild, osuStream, serverConnectionFails, @@ -32,6 +34,7 @@ LogIn, Brush, Heart, + ArrowRight, } from 'lucide-svelte'; import NumberFlow from '@number-flow/svelte'; import * as AlertDialog from '@/components/ui/alert-dialog'; @@ -74,6 +77,7 @@ import { osuapi } from '@/api/osuapi'; import { downloadEZPPLauncherUpdateFiles, + exit, getBeatmapSetsCount, getEZPPLauncherUpdateFiles, getReleaseStream, @@ -337,6 +341,42 @@ }; + + +
+ logo + Update available! +
+
+
+ Current Version + {$launcherVersion} +
+
+ +
+
+ New Version + {$newVersion?.tag_name} +
+
+
+ +
+
+
+
import '../app.css'; - import Logo from '$assets/logo.png'; import Titlebar from '@/components/ui/titlebar/titlebar.svelte'; - import { - currentLoadingInfo, - firstStartup, - launcherVersion, - newVersion, - setupValues, - } from '@/global'; + import { currentLoadingInfo, firstStartup, launcherVersion, setupValues } from '@/global'; import { onMount } from 'svelte'; import OsuCursor from '@/components/ui/osu-cursor/OsuCursor.svelte'; import { @@ -23,14 +16,10 @@ import { Buffer } from 'buffer'; import { Toaster } from '@/components/ui/sonner'; import { userAuth } from '@/userAuthentication'; - import * as AlertDialog from '@/components/ui/alert-dialog'; - import { exit, getLauncherVersion } from '@/osuUtil'; + import { getLauncherVersion } from '@/osuUtil'; import '@fontsource/sora'; import '@fontsource/space-mono'; - import { ArrowRight } from 'lucide-svelte'; - import Button from '@/components/ui/button/button.svelte'; - import { openURL } from '@/utils'; let { children } = $props(); @@ -121,42 +110,6 @@ - - -
- logo - Update available! -
-
-
- Current Version - {$launcherVersion} -
-
- -
-
- New Version - {$newVersion?.tag_name} -
-
-
- -
-
-
-
{@render children()}
diff --git a/static/audio/menuBack.wav b/static/audio/menuBack.wav deleted file mode 100644 index 4467dfa..0000000 Binary files a/static/audio/menuBack.wav and /dev/null differ diff --git a/static/audio/menuHeartbeat.mp3 b/static/audio/menuHeartbeat.mp3 deleted file mode 100644 index 5b7c14e..0000000 Binary files a/static/audio/menuHeartbeat.mp3 and /dev/null differ diff --git a/static/audio/menuHit.wav b/static/audio/menuHit.wav deleted file mode 100644 index 7e8843d..0000000 Binary files a/static/audio/menuHit.wav and /dev/null differ