Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: configurable stack directory (#13)
Kyle Mendell021345f4752c
diff --git a/app-settings.json b/app-settings.jsonindex c9c46a89e..16865b410 100644--- a/app-settings.json+++ b/app-settings.json@@ -2,5 +2,6 @@"dockerHost": "unix:///var/run/docker.sock","autoRefresh": true,"refreshInterval": 10,- "darkMode": true-}\ No newline at end of file+ "darkMode": true,+ "stacksDirectory": ".arcane/stacks"+}diff --git a/package-lock.json b/package-lock.jsonindex 731f44a9a..b0069eea0 100644--- a/package-lock.json+++ b/package-lock.json@@ -12,7 +12,6 @@"dockerode": "^4.0.5","dockerode-compose": "^1.4.0","js-yaml": "^4.1.0",- "mode-watcher": "^1.0.2","nanoid": "^5.1.5"},"devDependencies": {@@ -32,8 +31,10 @@"eslint-plugin-svelte": "^3.0.0","formsnap": "^2.0.1","globals": "^16.0.0",+ "mode-watcher": "^1.0.2","svelte": "^5.0.0","svelte-check": "^4.0.0",+ "svelte-sonner": "^0.3.28","sveltekit-superforms": "^2.24.1","tailwind-merge": "^3.2.0","tailwind-variants": "^1.0.0",@@ -49,6 +50,7 @@"version": "2.3.0","resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz","integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",+ "dev": true,"license": "Apache-2.0","dependencies": {"@jridgewell/gen-mapping": "^0.3.5",@@ -883,6 +885,7 @@"version": "0.3.8","resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz","integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",+ "dev": true,"license": "MIT","dependencies": {"@jridgewell/set-array": "^1.2.1",@@ -897,6 +900,7 @@"version": "3.1.2","resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz","integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",+ "dev": true,"license": "MIT","engines": {"node": ">=6.0.0"@@ -906,6 +910,7 @@"version": "1.2.1","resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz","integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",+ "dev": true,"license": "MIT","engines": {"node": ">=6.0.0"@@ -915,12 +920,14 @@"version": "1.5.0","resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz","integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",+ "dev": true,"license": "MIT"},"node_modules/@jridgewell/trace-mapping": {"version": "0.3.25","resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz","integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",+ "dev": true,"license": "MIT","dependencies": {"@jridgewell/resolve-uri": "^3.1.0",@@ -1490,6 +1497,7 @@"version": "1.0.5","resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz","integrity": "sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==",+ "dev": true,"license": "MIT","peerDependencies": {"acorn": "^8.9.0"@@ -1918,6 +1926,7 @@"version": "1.0.7","resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz","integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",+ "dev": true,"license": "MIT"},"node_modules/@types/js-yaml": {@@ -2262,6 +2271,7 @@"version": "8.14.1","resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz","integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",+ "dev": true,"license": "MIT","bin": {"acorn": "bin/acorn"@@ -2331,6 +2341,7 @@"version": "5.3.2","resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz","integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",+ "dev": true,"license": "Apache-2.0","engines": {"node": ">= 0.4"@@ -2361,6 +2372,7 @@"version": "4.1.0","resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz","integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",+ "dev": true,"license": "Apache-2.0","engines": {"node": ">= 0.4"@@ -2614,6 +2626,7 @@"version": "2.1.1","resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz","integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",+ "dev": true,"license": "MIT","engines": {"node": ">=6"@@ -3072,6 +3085,7 @@"version": "1.2.2","resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz","integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",+ "dev": true,"license": "MIT"},"node_modules/espree": {@@ -3109,6 +3123,7 @@"version": "1.4.6","resolved": "https://registry.npmjs.org/esrap/-/esrap-1.4.6.tgz","integrity": "sha512-F/D2mADJ9SHY3IwksD4DAXjTt7qt7GWUf3/8RhCNWmC/67tyb55dpimHmy7EplakFaflV0R/PC+fdSPqrRHAQw==",+ "dev": true,"license": "MIT","dependencies": {"@jridgewell/sourcemap-codec": "^1.4.15"@@ -3540,6 +3555,7 @@"version": "0.2.4","resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.4.tgz","integrity": "sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==",+ "dev": true,"license": "MIT"},"node_modules/is-core-module": {@@ -3999,6 +4015,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz","integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",+ "dev": true,"license": "MIT"},"node_modules/locate-path": {@@ -4040,6 +4057,7 @@"version": "0.30.17","resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz","integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",+ "dev": true,"license": "MIT","dependencies": {"@jridgewell/sourcemap-codec": "^1.5.0"@@ -4112,6 +4130,7 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/mode-watcher/-/mode-watcher-1.0.2.tgz","integrity": "sha512-b3ghU4F4kZeRHHPlsVeCltBgYRHNr7HNyT9JTlvIIvuob7Vulu7iKCfaKNU4FGugBIFWyK5q4bDhqCeZy3Cuxw==",+ "dev": true,"license": "MIT","dependencies": {"runed": "^0.25.0",@@ -4724,6 +4743,7 @@"version": "0.25.0","resolved": "https://registry.npmjs.org/runed/-/runed-0.25.0.tgz","integrity": "sha512-7+ma4AG9FT2sWQEA0Egf6mb7PBT2vHyuHail1ie8ropfSjvZGtEAx8YTmUjv/APCsdRRxEVvArNjALk9zFSOrg==",+ "dev": true,"funding": ["https://github.com/sponsors/huntabyte","https://github.com/sponsors/tglide"@@ -4940,6 +4960,7 @@"version": "1.0.8","resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.8.tgz","integrity": "sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==",+ "dev": true,"license": "MIT","dependencies": {"inline-style-parser": "0.2.4"@@ -4986,6 +5007,7 @@"version": "5.28.1","resolved": "https://registry.npmjs.org/svelte/-/svelte-5.28.1.tgz","integrity": "sha512-iOa9WmfNG95lSOSJdMhdjJ4Afok7IRAQYXpbnxhd5EINnXseG0GVa9j6WPght4eX78XfFez45Fi+uRglGKPV/Q==",+ "dev": true,"license": "MIT","dependencies": {"@ampproject/remapping": "^2.3.0",@@ -5060,10 +5082,21 @@}}},+ "node_modules/svelte-sonner": {+ "version": "0.3.28",+ "resolved": "https://registry.npmjs.org/svelte-sonner/-/svelte-sonner-0.3.28.tgz",+ "integrity": "sha512-K3AmlySeFifF/cKgsYNv5uXqMVNln0NBAacOYgmkQStLa/UoU0LhfAACU6Gr+YYC8bOCHdVmFNoKuDbMEsppJg==",+ "dev": true,+ "license": "MIT",+ "peerDependencies": {+ "svelte": "^3.0.0 || ^4.0.0 || ^5.0.0-next.1"+ }+ },"node_modules/svelte-toolbelt": {"version": "0.7.1","resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.7.1.tgz","integrity": "sha512-HcBOcR17Vx9bjaOceUvxkY3nGmbBmCBBbuWLLEWO6jtmWH8f/QoWmbyUfQZrpDINH39en1b8mptfPQT9VKQ1xQ==",+ "dev": true,"funding": ["https://github.com/sponsors/huntabyte"],@@ -5084,6 +5117,7 @@"version": "0.23.4","resolved": "https://registry.npmjs.org/runed/-/runed-0.23.4.tgz","integrity": "sha512-9q8oUiBYeXIDLWNK5DfCWlkL0EW3oGbk845VdKlPeia28l751VpfesaB/+7pI6rnbx1I6rqoZ2fZxptOJLxILA==",+ "dev": true,"funding": ["https://github.com/sponsors/huntabyte","https://github.com/sponsors/tglide"@@ -5099,6 +5133,7 @@"version": "3.0.3","resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz","integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",+ "dev": true,"license": "MIT","dependencies": {"@types/estree": "^1.0.6"@@ -5753,6 +5788,7 @@"version": "1.1.2","resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.2.tgz","integrity": "sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==",+ "dev": true,"license": "MIT"},"node_modules/zod": {diff --git a/package.json b/package.jsonindex 5fabf6a95..e005000cd 100644--- a/package.json+++ b/package.json@@ -29,8 +29,10 @@"eslint-plugin-svelte": "^3.0.0","formsnap": "^2.0.1","globals": "^16.0.0",+ "mode-watcher": "^1.0.2","svelte": "^5.0.0","svelte-check": "^4.0.0",+ "svelte-sonner": "^0.3.28","sveltekit-superforms": "^2.24.1","tailwind-merge": "^3.2.0","tailwind-variants": "^1.0.0",@@ -46,7 +48,6 @@"dockerode": "^4.0.5","dockerode-compose": "^1.4.0","js-yaml": "^4.1.0",- "mode-watcher": "^1.0.2","nanoid": "^5.1.5"}}diff --git a/src/hooks.server.ts b/src/hooks.server.tsnew file mode 100644index 000000000..276af9686--- /dev/null+++ b/src/hooks.server.ts@@ -0,0 +1,10 @@+import { initComposeService } from "$lib/services/compose";++// Initialize needed services+initComposeService().catch((err) => {+ console.error("Failed to initialize compose service:", err);+});++export async function handle({ event, resolve }) {+ return await resolve(event);+}diff --git a/src/lib/components/ui/sonner/index.ts b/src/lib/components/ui/sonner/index.tsnew file mode 100644index 000000000..1ad9f4a2a--- /dev/null+++ b/src/lib/components/ui/sonner/index.ts@@ -0,0 +1 @@+export { default as Toaster } from "./sonner.svelte";diff --git a/src/lib/components/ui/sonner/sonner.svelte b/src/lib/components/ui/sonner/sonner.sveltenew file mode 100644index 000000000..0631191cb--- /dev/null+++ b/src/lib/components/ui/sonner/sonner.svelte@@ -0,0 +1,20 @@+<script lang="ts">+ import { Toaster as Sonner, type ToasterProps as SonnerProps } from "svelte-sonner";+ import { mode } from "mode-watcher";++ let { ...restProps }: SonnerProps = $props();+</script>++<Sonner+ theme={mode.current}+ class="toaster group"+ toastOptions={{+ classes: {+ toast: "group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",+ description: "group-[.toast]:text-muted-foreground",+ actionButton: "group-[.toast]:bg-primary group-[.toast]:text-primary-foreground",+ cancelButton: "group-[.toast]:bg-muted group-[.toast]:text-muted-foreground",+ },+ }}+ {...restProps}+/>diff --git a/src/lib/services/compose.ts b/src/lib/services/compose.tsindex fc1252f8c..abe90b3c0 100644--- a/src/lib/services/compose.ts+++ b/src/lib/services/compose.ts@@ -11,9 +11,22 @@ import type {} from "$lib/types/stack";import yaml from "js-yaml";-const STACKS_DIR =+let STACKS_DIR =process.env.STACKS_DIR || join(process.cwd(), ".arcane", "stacks");+/**+ * Update the stacks directory path+ * @param {string} directory New stacks directory path+ */+export function updateStacksDirectory(directory: string): void {+ if (directory) {+ STACKS_DIR = directory;+ console.log(`Stacks directory updated to: ${STACKS_DIR}`);+ // No need to re-initialize anything here since+ // each function call will use the updated STACKS_DIR+ }+}+/*** Ensure stacks directory exists*/@@ -26,6 +39,33 @@ async function ensureStacksDir(): Promise<void> {}}+/**+ * Initialize the compose service with settings+ * This should be called at app startup+ */+export async function initComposeService(): Promise<void> {+ try {+ // Try to load settings+ const settingsPath = join(process.cwd(), "app-settings.json");+ const settingsData = await fs+ .readFile(settingsPath, "utf8")+ .catch(() => "{}");+ const settings = JSON.parse(settingsData);++ if (settings.stacksDirectory) {+ STACKS_DIR = settings.stacksDirectory;+ console.log(`Stacks directory initialized from settings: ${STACKS_DIR}`);+ }++ // Ensure the directory exists+ await ensureStacksDir();+ } catch (err) {+ console.error("Error initializing compose service:", err);+ // Fall back to default directory and ensure it exists+ await ensureStacksDir();+ }+}+/*** Get stack directory path* @param {string} stackIddiff --git a/src/lib/services/docker-service.ts b/src/lib/services/docker-service.tsindex d9cef8226..11eb92747 100644--- a/src/lib/services/docker-service.ts+++ b/src/lib/services/docker-service.ts@@ -1,45 +1,8 @@import Docker from "dockerode";-import fs from "fs"; // Use synchronous fs for initial load-import path from "path";+import { getSettings } from "$lib/services/settings-service";import type { DockerConnectionOptions } from "$lib/types/docker";-// Define Settings Type (can be shared with +page.server.ts if moved to a types file)-type SettingsData = {- dockerHost: string;- autoRefresh: boolean;- refreshInterval: number;- darkMode: boolean;-};--// --- Load Initial Settings ----const SETTINGS_FILE = path.resolve("./app-settings.json");-const DEFAULT_SETTINGS: SettingsData = {- dockerHost: "unix:///var/run/docker.sock",- autoRefresh: true,- refreshInterval: 10,- darkMode: true,-};--function loadInitialSettings(): SettingsData {- try {- // Use synchronous read for initial module load simplicity- if (fs.existsSync(SETTINGS_FILE)) {- const data = fs.readFileSync(SETTINGS_FILE, "utf-8");- const settings = JSON.parse(data);- console.log("Docker Service: Loaded initial settings:", settings);- return { ...DEFAULT_SETTINGS, ...settings }; // Merge with defaults- } else {- console.log("Docker Service: Settings file not found, using defaults.");- return DEFAULT_SETTINGS;- }- } catch (error) {- console.error("Docker Service: Error loading initial settings:", error);- return DEFAULT_SETTINGS; // Fallback to defaults- }-}--const initialSettings = loadInitialSettings();-// --- End Load Initial Settings ---+const initialSettings = await getSettings();let dockerClient: Docker | null = null;diff --git a/src/lib/services/settings-service.ts b/src/lib/services/settings-service.tsnew file mode 100644index 000000000..5bbc09195--- /dev/null+++ b/src/lib/services/settings-service.ts@@ -0,0 +1,75 @@+import type { SettingsData } from "$lib/types/settings";+import { updateStacksDirectory } from "./compose";+import { updateDockerConnection } from "./docker-service";+import fs from "fs/promises";+import path from "path";++const SETTINGS_FILE = path.resolve("./app-settings.json");++// Default settings+const DEFAULT_SETTINGS: SettingsData = {+ dockerHost: "unix:///var/run/docker.sock",+ autoRefresh: true,+ refreshInterval: 10,+ darkMode: true,+ stacksDirectory: path.resolve(".arcane", "stacks"),+};++// Get settings+export async function getSettings(): Promise<SettingsData> {+ try {+ const data = await fs.readFile(SETTINGS_FILE, "utf-8");+ const parsed = JSON.parse(data);++ // Ensure all expected properties exist+ return {+ ...DEFAULT_SETTINGS,+ ...parsed,+ };+ } catch (error: any) {+ if (error.code === "ENOENT") {+ console.log("Settings file not found, using defaults.");+ // Automatically save defaults if file doesn't exist+ await saveSettings(DEFAULT_SETTINGS);+ return DEFAULT_SETTINGS;+ }+ console.error("Error loading settings:", error);+ return DEFAULT_SETTINGS;+ }+}++// Save settings+export async function saveSettings(settings: SettingsData): Promise<void> {+ try {+ // Ensure directory exists+ const settingsDir = path.dirname(SETTINGS_FILE);+ await fs.mkdir(settingsDir, { recursive: true });++ // Write the settings+ await fs.writeFile(+ SETTINGS_FILE,+ JSON.stringify(settings, null, 2),+ "utf-8"+ );++ console.log("Settings saved to:", SETTINGS_FILE);++ // Apply settings to runtime services+ updateDockerConnection(settings.dockerHost);+ updateStacksDirectory(settings.stacksDirectory);+ } catch (error) {+ console.error("Error saving settings:", error);+ throw new Error("Failed to save settings.");+ }+}++// Initialize settings on server start+export async function initializeSettings(): Promise<SettingsData> {+ const settings = await getSettings();++ // Apply settings to services+ updateDockerConnection(settings.dockerHost);+ updateStacksDirectory(settings.stacksDirectory);++ return settings;+}diff --git a/src/lib/types/settings.ts b/src/lib/types/settings.tsnew file mode 100644index 000000000..d8602bf2b--- /dev/null+++ b/src/lib/types/settings.ts@@ -0,0 +1,7 @@+export type SettingsData = {+ dockerHost: string;+ autoRefresh: boolean;+ refreshInterval: number;+ darkMode: boolean;+ stacksDirectory: string;+};diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelteindex 7c8f5dc41..05e191a48 100644--- a/src/routes/+layout.svelte+++ b/src/routes/+layout.svelte@@ -2,12 +2,14 @@import "../app.css";import { ModeWatcher } from "mode-watcher";import Nav from "$lib/components/navbar.svelte";+ import { Toaster } from "$lib/components/ui/sonner/index.js";let { children } = $props();</script><svelte:head><title>Arcane</title></svelte:head><ModeWatcher />+<Toaster /><div class="flex min-h-screen bg-background"><Nav />diff --git a/src/routes/settings/+page.server.ts b/src/routes/settings/+page.server.tsindex 48d4f15da..03206b90c 100644--- a/src/routes/settings/+page.server.ts+++ b/src/routes/settings/+page.server.ts@@ -1,62 +1,11 @@import type { PageServerLoad, Actions } from "./$types";import { fail } from "@sveltejs/kit";-import { updateDockerConnection } from "$lib/services/docker-service";--// Define a type for settings-type SettingsData = {- dockerHost: string;- autoRefresh: boolean;- refreshInterval: number;- darkMode: boolean;-};--// --- Persistence Layer (Example using simple file - replace with your actual storage) ----import fs from "fs/promises";-import path from "path";-const SETTINGS_FILE = path.resolve("./app-settings.json"); // Store settings in project root (adjust path as needed)--async function loadSettingsFromFile(): Promise<SettingsData> {- const defaults: SettingsData = {- dockerHost: "unix:///var/run/docker.sock", // Default Docker host- autoRefresh: true,- refreshInterval: 10,- darkMode: true,- };- try {- const data = await fs.readFile(SETTINGS_FILE, "utf-8");- return JSON.parse(data);- } catch (error: any) {- if (error.code === "ENOENT") {- console.log("Settings file not found, using defaults.");- // Optionally save defaults if file doesn't exist- // await saveSettingsToFile(defaults);- return defaults;- }- console.error("Error loading settings:", error);- return defaults; // Fallback to defaults on other errors- }-}--async function saveSettingsToFile(settings: SettingsData): Promise<void> {- try {- await fs.writeFile(- SETTINGS_FILE,- JSON.stringify(settings, null, 2),- "utf-8"- );- console.log("Settings saved to:", SETTINGS_FILE);- } catch (error) {- console.error("Error saving settings:", error);- throw new Error("Failed to save settings."); // Propagate error- }-}-// --- End Persistence Layer ---+import { getSettings, saveSettings } from "$lib/services/settings-service";+import type { SettingsData } from "$lib/types/settings";export const load: PageServerLoad = async () => {- // *** Load actual saved settings here ***- const currentSettings = await loadSettingsFromFile();- console.log("Loaded settings:", currentSettings);- return { settings: currentSettings };+ const settings = await getSettings();+ return { settings };};export const actions: Actions = {@@ -67,39 +16,40 @@ export const actions: Actions = {const autoRefresh = formData.get("autoRefresh") === "on";const refreshIntervalStr = formData.get("refreshInterval") as string;const darkMode = formData.get("darkMode") === "on";+ const stacksDirectory = (formData.get("stacksDirectory") as string) || "";if (!dockerHost) {return fail(400, {error: "Docker host cannot be empty.",- values: Object.fromEntries(formData), // Return submitted values on error+ values: Object.fromEntries(formData),});}let refreshInterval = parseInt(refreshIntervalStr, 10);if (isNaN(refreshInterval) || refreshInterval < 5 || refreshInterval > 60) {- // Return fail to show validation error in UIreturn fail(400, {error: "Refresh interval must be between 5 and 60 seconds.",values: Object.fromEntries(formData),});}+ if (!stacksDirectory) {+ return fail(400, {+ error: "Stacks directory cannot be empty.",+ values: Object.fromEntries(formData),+ });+ }+const updatedSettings: SettingsData = {dockerHost,autoRefresh,refreshInterval,darkMode,+ stacksDirectory,};try {- // *** Persist the updated settings ***- await saveSettingsToFile(updatedSettings);-- // *** Optional: Update the running server's Docker instance immediately ***- updateDockerConnection(updatedSettings.dockerHost);-- // Return success and the *updated* settings- // This updates the `form.settings` prop in the page component+ await saveSettings(updatedSettings);return { success: true, settings: updatedSettings };} catch (error: any) {return fail(500, {diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelteindex af61f546a..45e22eaf8 100644--- a/src/routes/settings/+page.svelte+++ b/src/routes/settings/+page.svelte@@ -1,70 +1,66 @@<script lang="ts">- import type { PageData, ActionData } from "./$types";+ import { run } from "svelte/legacy";++ import { enhance } from "$app/forms";+ import * as Form from "$lib/components/ui/form/index.js";import * as Card from "$lib/components/ui/card/index.js";import { Button } from "$lib/components/ui/button/index.js";import { Input } from "$lib/components/ui/input/index.js";- import { Label } from "$lib/components/ui/label/index.js";- import {- Settings,- Save,- RefreshCw,- CheckCircle,- XCircle,- ServerCog,- Sliders,- Palette,- } from "@lucide/svelte";- import * as Switch from "$lib/components/ui/switch/index.js";- import { enhance } from "$app/forms";+ import { Switch } from "$lib/components/ui/switch/index.js";+ import { Separator } from "$lib/components/ui/separator/index.js";+ import { Save, RefreshCw } from "@lucide/svelte";+ import type { ActionData, PageData } from "./$types";+ import { toast } from "svelte-sonner";import * as Alert from "$lib/components/ui/alert/index.js";+ import { AlertCircle } from "@lucide/svelte";+ import { onMount } from "svelte";- let { data, form }: { data: PageData; form: ActionData } = $props();+ interface Props {+ data: PageData;+ form: ActionData;+ }- // Initialize state variables *only* from the initial data load- let dockerHost = $state(data.settings.dockerHost);- let autoRefresh = $state(data.settings.autoRefresh);- let refreshInterval = $state(data.settings.refreshInterval);- let darkMode = $state(data.settings.darkMode);+ let { data, form }: Props = $props();- let isSubmitting = $state(false);- let testStatus: "idle" | "testing" | "success" | "error" = $state("idle");- let testMessage: string | null = $state(null);+ let settings = $derived(data.settings);- // Keep the effect for resetting test status when dockerHost input changes- $effect(() => {- const currentHost = dockerHost; // Create dependency on dockerHost- if (currentHost !== undefined) {- testStatus = "idle";- testMessage = null;- }- });+ let saving = $state(false);- async function testConnection() {- testStatus = "testing";- testMessage = null;- try {- const hostParam = encodeURIComponent(dockerHost);- const response = await fetch(- `/api/docker/test-connection?host=${hostParam}`- );- const result = await response.json();+ // Update form values from form.values if there was an error, otherwise from settings+ let dockerHost = $derived(+ form?.values?.dockerHost || settings?.dockerHost || ""+ );+ let autoRefresh = $derived(+ form?.values?.autoRefresh !== undefined+ ? form.values.autoRefresh === "on"+ : settings?.autoRefresh || false+ );+ let refreshInterval = $derived(+ form?.values?.refreshInterval !== undefined+ ? form.values.refreshInterval+ : settings?.refreshInterval || 10+ );+ let darkMode = $derived(+ form?.values?.darkMode !== undefined+ ? form.values.darkMode === "on"+ : settings?.darkMode || false+ );+ let stacksDirectory = $derived(+ form?.values?.stacksDirectory || settings?.stacksDirectory || ""+ );- if (response.ok && result.success) {- testStatus = "success";- testMessage = result.message || "Connection successful!";- } else {- testStatus = "error";- testMessage =- result.error ||- "Connection failed. Check Docker status and host setting.";- }- } catch (error: any) {- testStatus = "error";- testMessage =- "Failed to run connection test: " + (error.message || "Unknown error");- console.error("Error during connection test fetch:", error);+ // Handle form submission result+ run(() => {+ if (form?.success) {+ toast.success("Settings saved successfully");+ } else if (form?.error) {+ toast.error(form.error);}- }+ });++ onMount(() => {+ // Any initialization needed+ });</script><div class="space-y-6">@@ -76,21 +72,21 @@Configure Arcane's connection and behavior</p></div>- <Button- type="submit"- form="settings-form"- disabled={isSubmitting || testStatus === "testing"}- class="h-10"- >- <Save class="w-4 h-4 mr-2" />- {isSubmitting ? "Saving..." : "Save Settings"}+ <Button type="submit" form="settings-form" disabled={saving} class="h-10">+ {#if saving}+ <RefreshCw class="mr-2 h-4 w-4 animate-spin" />+ Saving...+ {:else}+ <Save class="mr-2 h-4 w-4" />+ Save Settings+ {/if}</Button></div><!-- Alerts -->{#if form?.error}<Alert.Root variant="destructive">- <XCircle class="h-4 w-4 mr-2" />+ <AlertCircle class="h-4 w-4 mr-2" /><Alert.Title>Error Saving Settings</Alert.Title><Alert.Description>{form.error}</Alert.Description></Alert.Root>@@ -101,7 +97,7 @@variant="default"class="bg-primary/10 text-primary border border-primary">- <CheckCircle class="h-4 w-4 mr-2" />+ <AlertCircle class="h-4 w-4 mr-2" /><Alert.Title>Settings Saved</Alert.Title><Alert.Description>Your settings have been updated successfully.</Alert.Description@@ -111,25 +107,14 @@<!-- Settings Form --><form- id="settings-form"method="POST"+ id="settings-form"+ class="space-y-6"use:enhance={() => {- isSubmitting = true;- testStatus = "idle";- testMessage = null;- return async ({ result, update }) => {- isSubmitting = false;-- // IMPORTANT: Update local state *before* calling update()- if (result.type === "success" && result.data?.settings) {- const newSettings = result.data.settings as typeof data.settings;- dockerHost = newSettings.dockerHost;- autoRefresh = newSettings.autoRefresh;- refreshInterval = newSettings.refreshInterval;- darkMode = newSettings.darkMode;- }-- await update({ reset: false });+ saving = true;+ return async ({ update }) => {+ saving = false;+ await update();};}}>@@ -139,67 +124,57 @@<Card.Header class="pb-3"><div class="flex items-center gap-2"><div class="bg-blue-500/10 p-2 rounded-full">- <ServerCog class="h-5 w-5 text-blue-500" />+ <Save class="h-5 w-5 text-blue-500" /></div><div>- <Card.Title>Docker Connection</Card.Title>+ <Card.Title>Docker Settings</Card.Title><Card.Description- >Configure Docker host connection</Card.Description+ >Configure your Docker connection</Card.Description></div></div></Card.Header>- <Card.Content class="space-y-6">- <div class="space-y-2">- <Label for="dockerHost" class="text-sm font-medium"- >Docker Host</Label- >- <Input- id="dockerHost"- name="dockerHost"- bind:value={dockerHost}- placeholder="unix:///var/run/docker.sock"- class="mt-1"- disabled={testStatus === "testing"}- />- <p class="text-xs text-muted-foreground">- Enter Docker host URL (e.g., unix:///var/run/docker.sock or- tcp://localhost:2375)- </p>- </div>-- <div>- <Button- variant="secondary"- class="w-full sm:w-auto"- onclick={testConnection}- type="button"- disabled={testStatus === "testing" || !dockerHost}- >- {#if testStatus === "testing"}- <RefreshCw class="w-4 h-4 mr-2 animate-spin" />- Testing...- {:else}- <RefreshCw class="w-4 h-4 mr-2" />- Test Connection- {/if}- </Button>-- {#if testStatus === "success"}- <div- class="flex items-center gap-2 text-sm text-green-600 mt-3 bg-green-50 p-3 rounded-md border border-green-200"+ <Card.Content>+ <div class="space-y-4">+ <!-- Fix Form.Field to use the correct component structure -->+ <div class="space-y-2">+ <label for="dockerHost" class="text-sm font-medium"+ >Docker Host</label>- <CheckCircle class="w-4 h-4 flex-shrink-0" />- <span>{testMessage || "Connection successful!"}</span>- </div>- {:else if testStatus === "error"}- <div- class="flex items-center gap-2 text-sm text-destructive mt-3 bg-destructive/10 p-3 rounded-md border border-destructive/20"+ <Input+ type="text"+ id="dockerHost"+ name="dockerHost"+ bind:value={dockerHost}+ placeholder="unix:///var/run/docker.sock"+ required+ />+ <p class="text-xs text-muted-foreground">+ For local Docker: unix:///var/run/docker.sock (Unix) or+ npipe:////./pipe/docker_engine (Windows)+ </p>+ </div>++ <!-- Add this block for stacks directory with correct structure -->+ <div class="space-y-2">+ <label for="stacksDirectory" class="text-sm font-medium"+ >Stacks Directory</label>- <XCircle class="w-4 h-4 flex-shrink-0" />- <span>{testMessage || "Connection failed."}</span>- </div>- {/if}+ <Input+ type="text"+ id="stacksDirectory"+ name="stacksDirectory"+ bind:value={stacksDirectory}+ placeholder=".arcane/stacks"+ required+ />+ <p class="text-xs text-muted-foreground">+ Directory where Docker Compose stacks will be stored+ </p>+ <p class="text-xs text-destructive">+ Changing this setting will not move existing stacks!+ </p>+ </div></div></Card.Content></Card.Root>@@ -211,7 +186,7 @@<Card.Header class="pb-3"><div class="flex items-center gap-2"><div class="bg-amber-500/10 p-2 rounded-full">- <Sliders class="h-5 w-5 text-amber-500" />+ <RefreshCw class="h-5 w-5 text-amber-500" /></div><div><Card.Title>Auto Refresh</Card.Title>@@ -226,14 +201,14 @@class="flex items-center justify-between rounded-lg border p-4 bg-muted/30"><div class="space-y-0.5">- <Label for="autoRefreshSwitch" class="text-base font-medium"- >Auto Refresh</Label+ <label for="autoRefreshSwitch" class="text-base font-medium"+ >Auto Refresh</label><p class="text-sm text-muted-foreground">Automatically refresh data periodically</p></div>- <Switch.Root+ <Switchid="autoRefreshSwitch"name="autoRefresh"bind:checked={autoRefresh}@@ -242,9 +217,9 @@{#if autoRefresh}<div class="space-y-2 px-1">- <Label for="refreshInterval" class="text-sm font-medium"- >Refresh Interval (seconds)</Label- >+ <label for="refreshInterval" class="text-sm font-medium">+ Refresh Interval (seconds)+ </label><Inputid="refreshInterval"name="refreshInterval"@@ -272,7 +247,7 @@<Card.Header class="pb-3"><div class="flex items-center gap-2"><div class="bg-purple-500/10 p-2 rounded-full">- <Palette class="h-5 w-5 text-purple-500" />+ <Save class="h-5 w-5 text-purple-500" /></div><div><Card.Title>UI Settings</Card.Title>@@ -285,14 +260,14 @@class="flex items-center justify-between rounded-lg border p-4 bg-muted/30"><div class="space-y-0.5">- <Label for="darkModeSwitch" class="text-base font-medium"- >Dark Mode</Label+ <label for="darkModeSwitch" class="text-base font-medium"+ >Dark Mode</label><p class="text-sm text-muted-foreground">Enable the dark color theme</p></div>- <Switch.Root+ <Switchid="darkModeSwitch"name="darkMode"bind:checked={darkMode}