Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: onboarding errors and protections (#142)
Kyle Mendellbceb0ec49d4b
diff --git a/src/lib/stores/settings-store.ts b/src/lib/stores/settings-store.tsindex 34a6acd1f..352d61a73 100644--- a/src/lib/stores/settings-store.ts+++ b/src/lib/stores/settings-store.ts@@ -93,3 +93,18 @@ export async function saveSettingsToServer(): Promise<boolean> {throw error;}}++// Add this initialization if not already present+export function initializeSettingsStore() {+ updateSettingsStore({+ onboarding: {+ completed: false,+ completedAt: '',+ steps: {+ welcome: false,+ password: false,+ settings: false+ }+ }+ });+}diff --git a/src/lib/types/settings.type.ts b/src/lib/types/settings.type.tsindex 2d70a54b8..8d3778d26 100644--- a/src/lib/types/settings.type.ts+++ b/src/lib/types/settings.type.ts@@ -12,8 +12,13 @@ export interface RegistryCredential {}export interface Onboarding {- completed?: boolean;+ completed: boolean;completedAt?: string;+ steps?: {+ welcome?: boolean;+ password?: boolean;+ settings?: boolean;+ };}export interface Settings {diff --git a/src/routes/onboarding/password/+page.server.ts b/src/routes/onboarding/password/+page.server.tsnew file mode 100644index 000000000..42d30decc--- /dev/null+++ b/src/routes/onboarding/password/+page.server.ts@@ -0,0 +1,12 @@+import { redirect } from '@sveltejs/kit';+import { getSettings } from '$lib/services/settings-service';++export async function load() {+ const settings = await getSettings();++ if (settings.onboarding?.steps?.password) {+ throw redirect(302, '/onboarding/settings');+ }++ return { settings };+}diff --git a/src/routes/onboarding/password/+page.svelte b/src/routes/onboarding/password/+page.svelteindex 3aca10426..4f6e562bb 100644--- a/src/routes/onboarding/password/+page.svelte+++ b/src/routes/onboarding/password/+page.svelte@@ -5,11 +5,55 @@import * as Alert from '$lib/components/ui/alert/index.js';import { AlertCircle, ChevronRight } from '@lucide/svelte';import { preventDefault } from '$lib/utils/form.utils';+ import { settingsStore, updateSettingsStore, saveSettingsToServer } from '$lib/stores/settings-store';+ import { goto } from '$app/navigation';+ import { onMount } from 'svelte';+ import { browser } from '$app/environment';- let password = '';- let confirmPassword = '';- let error = '';- let loading = false;+ let password = $state('');+ let confirmPassword = $state('');+ let error = $state('');+ let loading = $state(false);+ let welcomeStepCompleted = $state(false);++ // Add default values for required settings+ const defaultDockerHost = 'unix:///var/run/docker.sock';+ const defaultStacksDirectory = 'data/stacks';++ // Check for completed steps on mount+ onMount(async () => {+ // If we've already completed the password step, go to settings+ if (browser && $settingsStore.onboarding?.steps?.password) {+ goto('/onboarding/settings');+ return;+ }++ // Ensure welcome step is set as completed - this fixes the issue+ // if someone has already visited the welcome page but the state wasn't persisted+ updateSettingsStore({+ onboarding: {+ ...$settingsStore.onboarding,+ steps: {+ ...$settingsStore.onboarding?.steps,+ welcome: true+ },+ completed: $settingsStore.onboarding?.completed ?? false,+ completedAt: $settingsStore.onboarding?.completedAt+ }+ });++ // Save to ensure persistence+ try {+ if (browser) {+ await saveSettingsToServer();+ }+ } catch (err) {+ console.error('Failed to save settings:', err);+ }++ // Update local state+ welcomeStepCompleted = true;+ });async function handleSubmit() {loading = true;@@ -46,8 +90,24 @@throw new Error(data.error || 'Failed to change password');}- // Redirect to next step- window.location.href = '/onboarding/settings';+ updateSettingsStore({+ dockerHost: $settingsStore.dockerHost || defaultDockerHost,+ stacksDirectory: $settingsStore.stacksDirectory || defaultStacksDirectory,+ onboarding: {+ ...$settingsStore.onboarding,+ steps: {+ ...$settingsStore.onboarding?.steps,+ welcome: true,+ password: true+ },+ completed: $settingsStore.onboarding?.completed ?? false,+ completedAt: $settingsStore.onboarding?.completedAt+ }+ });++ await saveSettingsToServer();++ goto('/onboarding/settings');} catch (err) {error = err instanceof Error ? err.message : 'An unexpected error occurred';} finally {@@ -60,10 +120,7 @@<h1 class="text-3xl font-bold mb-8 text-center">Change Admin Password</h1><div class="mb-8 space-y-2">- <p class="text-center text-lg">For security reasons, please change the default admin password.</p>- <p class="text-center text-muted-foreground">- Your account currently uses the default password: <code class="bg-muted/30 px-1.5 py-0.5 rounded">arcane-admin</code>- </p>+ <p class="text-center text-md">For security reasons, please change the default admin password.</p></div>{#if error}@@ -87,14 +144,13 @@</div></div>- <div class="flex justify-between pt-8">- <Button href="/onboarding/welcome" variant="outline" class="h-12 px-6">Back</Button>- <Button type="submit" disabled={loading} class="h-12 px-8 flex items-center gap-2">+ <div class="flex pt-8 justify-center">+ <Button type="submit" disabled={loading} class="h-12 w-[80%] px-8 flex items-center">{#if loading}<span class="inline-block w-4 h-4 border-2 border-t-transparent border-white rounded-full animate-spin"></span>{/if}Continue- <ChevronRight class="h-4 w-4 ml-1" />+ <ChevronRight class="h-4 w-4" /></Button></div></form>diff --git a/src/routes/onboarding/settings/+page.server.ts b/src/routes/onboarding/settings/+page.server.tsnew file mode 100644index 000000000..102b04ee8--- /dev/null+++ b/src/routes/onboarding/settings/+page.server.ts@@ -0,0 +1,12 @@+import { redirect } from '@sveltejs/kit';+import { getSettings } from '$lib/services/settings-service';++export async function load() {+ const settings = await getSettings();++ if (!settings.onboarding?.steps?.password) {+ throw redirect(302, '/onboarding/welcome');+ }++ return { settings };+}diff --git a/src/routes/onboarding/settings/+page.svelte b/src/routes/onboarding/settings/+page.svelteindex acc963285..9471dd65b 100644--- a/src/routes/onboarding/settings/+page.svelte+++ b/src/routes/onboarding/settings/+page.svelte@@ -10,10 +10,40 @@import { preventDefault } from '$lib/utils/form.utils';import { goto } from '$app/navigation';import { isDev } from '$lib/constants';+ import { onMount } from 'svelte';+ import { browser } from '$app/environment';let error = $state('');let loading = $state(false);+ // Add this to track if the user has passed the password step+ let passwordStepCompleted = $state(false);++ // Check for completed steps on mount+ onMount(() => {+ // If previous step not completed, redirect to start+ if (browser && !$settingsStore.onboarding?.steps?.password) {+ goto('/onboarding/welcome');+ return;+ }++ // Mark this step as viewed+ updateSettingsStore({+ onboarding: {+ ...$settingsStore.onboarding,+ completed: $settingsStore.onboarding?.completed ?? false,+ completedAt: $settingsStore.onboarding?.completedAt ?? '',+ steps: {+ ...$settingsStore.onboarding?.steps,+ password: true+ }+ }+ });++ // Update local state+ passwordStepCompleted = true;+ });+// Initialize settingslet dockerHost = $derived($settingsStore.dockerHost || 'unix:///var/run/docker.sock');let pollingEnabled = $derived($settingsStore.pollingEnabled !== undefined ? $settingsStore.pollingEnabled : true);@@ -21,7 +51,7 @@let autoUpdate = $derived($settingsStore.autoUpdate !== undefined ? $settingsStore.autoUpdate : false);// Get the appropriate stacks directory based on environment- const defaultStacksDirectory = isDev ? './.dev-data/stacks' : '/app/data/stacks';+ const defaultStacksDirectory = isDev ? './.dev-data/stacks' : 'data/stacks';async function handleSubmit() {loading = true;@@ -48,7 +78,13 @@},onboarding: {completed: true,- completedAt: new Date().toISOString()+ completedAt: new Date().toISOString(),+ steps: {+ ...(currentSettings.onboarding?.steps || {}),+ welcome: true,+ password: true,+ settings: true+ }}};@@ -130,9 +166,8 @@</Card.Content></Card.Root>- <div class="flex justify-between pt-4">- <Button href="/onboarding/password" variant="outline" class="h-12 px-6">Back</Button>- <Button type="submit" disabled={loading} class="h-12 px-8 flex items-center gap-2">+ <div class="flex justify-center pt-4">+ <Button type="submit" disabled={loading} class="h-12 px-8 w-[80%] flex items-center gap-2">{#if loading}<span class="inline-block w-4 h-4 border-2 border-t-transparent border-white rounded-full animate-spin"></span>{/if}diff --git a/src/routes/onboarding/welcome/+page.server.ts b/src/routes/onboarding/welcome/+page.server.tsnew file mode 100644index 000000000..44baa0ba7--- /dev/null+++ b/src/routes/onboarding/welcome/+page.server.ts@@ -0,0 +1,12 @@+import { redirect } from '@sveltejs/kit';+import { getSettings } from '$lib/services/settings-service';++export async function load() {+ const settings = await getSettings();++ if (settings.onboarding && settings.onboarding.completed) {+ throw redirect(302, '/');+ }++ return { settings };+}diff --git a/src/routes/onboarding/welcome/+page.svelte b/src/routes/onboarding/welcome/+page.svelteindex 75be5db66..9e3f54183 100644--- a/src/routes/onboarding/welcome/+page.svelte+++ b/src/routes/onboarding/welcome/+page.svelte@@ -1,6 +1,24 @@<script lang="ts">- import { Button } from '$lib/components/ui/button';+ import { Button } from '$lib/components/ui/button/index.js';import { CheckCircle2, ChevronRight } from '@lucide/svelte';+ import { settingsStore, updateSettingsStore } from '$lib/stores/settings-store';+ import { goto } from '$app/navigation';++ function handleContinue() {+ updateSettingsStore({+ onboarding: {+ ...$settingsStore.onboarding,+ completed: $settingsStore.onboarding?.completed ?? false,+ completedAt: $settingsStore.onboarding?.completedAt ?? '',+ steps: {+ ...$settingsStore.onboarding?.steps,+ welcome: true+ }+ }+ });++ goto('/onboarding/password');+ }</script><div class="max-w-3xl mx-auto">@@ -39,9 +57,9 @@</div></div>- <div class="flex justify-end mt-8">- <Button href="/onboarding/password" class="flex items-center gap-2">- Get Started+ <div class="flex justify-center pt-8">+ <Button type="button" onclick={handleContinue} class="h-12 w-[80%] px-8 flex items-center gap-2">+ Continue<ChevronRight class="h-4 w-4" /></Button></div>