fix: Attempt to fix Onboarding and Appearance pages

This commit is contained in:
LynithDev 2025-01-28 15:19:21 +01:00
parent 54e9b505dc
commit 6d358f501c
3 changed files with 15 additions and 12 deletions

View file

@ -1,5 +1,6 @@
import { getProgramInfo } from '@onelauncher/client';
import AnimatedRoutes from '~ui/components/AnimatedRoutes';
import ErrorBoundary from '~ui/components/ErrorBoundary';
import { NotificationProvider } from '~ui/hooks/useNotifications';
import { onMount, type ParentProps } from 'solid-js';
import { MultiProvider } from './ui/components/MultiProvider';
@ -18,18 +19,20 @@ function RootLayout(props: ParentProps) {
});
return (
<GlobalContexts>
<main class="h-screen max-h-screen min-h-screen w-full flex flex-col overflow-hidden bg-page text-fg-primary">
<WindowFrame />
<ErrorBoundary>
<GlobalContexts>
<main class="h-screen max-h-screen min-h-screen w-full flex flex-col overflow-hidden bg-page text-fg-primary">
<WindowFrame />
<AnimatedRoutes animation="fade" appear>
{props.children}
</AnimatedRoutes>
<AnimatedRoutes animation="fade" appear>
{props.children}
</AnimatedRoutes>
<NotificationOverlay />
<ModalRenderer />
</main>
</GlobalContexts>
<NotificationOverlay />
<ModalRenderer />
</main>
</GlobalContexts>
</ErrorBoundary>
);
}

View file

@ -93,7 +93,7 @@ function Onboarding(props: ParentProps) {
saveSettings({
...settings(),
onboarding_completed: true,
}).then(() => navigate('/'));
}).finally(() => navigate('/'));
else
navigate(basePath + OnboardingSteps[step() + 1]![0]);
};

View file

@ -52,7 +52,7 @@ function SettingsAppearance() {
<div class="grid grid-cols-3 h-full gap-4">
<For each={Object.keys(THEMES) as (keyof typeof THEMES)[]}>
{theme => (
<For each={THEMES[theme].variants}>
<For each={THEMES[theme ?? 'OneLauncher'].variants}>
{variant => (
<ThemeCard
setTheme={setTheme}