Skip to content

Modern Docker Management, Designed for Everyone

refactor: cleanup frontend with more universal components (#2459)

Kyle Mendell8768686da64f
diff --git a/frontend/knip.json b/frontend/knip.json
index 488a21693..92143c49c 100644
--- a/frontend/knip.json
+++ b/frontend/knip.json
@@ -3,16 +3,13 @@
"entry": [
"src/routes/**/*.{svelte,ts,js}",
"src/hooks.*.ts",
- "src/service-worker.ts",
- "svelte.config.js",
- "vite.config.ts",
"src/lib/paraglide/messages/_index.js",
"src/lib/index.ts",
"src/lib/components/**/index.ts"
],
"project": ["src/**/*.{svelte,ts,js}"],
"ignore": ["src/lib/paraglide/server.js", "src/lib/paraglide/runtime.js", "src/lib/paraglide/registry.js"],
- "ignoreDependencies": ["paneforge", "svelte-toolbelt", "isomorphic-dompurify", "tw-animate-css"],
+ "ignoreDependencies": ["@iconify/json", "paneforge", "svelte-toolbelt", "isomorphic-dompurify", "tw-animate-css"],
"ignoreExportsUsedInFile": {
"interface": true,
"type": true
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 4dd249000..8a9c41c33 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1569,6 +1569,9 @@
"timeouts_settings": "Timeouts",
"timeouts_settings_description": "Configure operation timeouts for slow networks or hardware. All values are in seconds.",
"timeouts_save": "Timeout settings updated successfully",
+ "timeouts_docker_operations": "Docker Operations",
+ "timeouts_git_operations": "Git Operations",
+ "timeouts_network_operations": "Network Operations",
"docker_api_timeout": "Docker API Timeout",
"docker_api_timeout_description": "Timeout for Docker list operations in seconds (default: 30)",
"docker_image_pull_timeout": "Docker Image Pull Timeout",
diff --git a/frontend/package.json b/frontend/package.json
index 215b89c02..fbbe4a6ff 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -7,15 +7,11 @@
"dev": "vite dev --port 3000 --host",
"build": "vite build",
"preview": "vite preview --port 3000",
- "lint-staged": "lint-staged",
"check": "svelte-kit sync && svelte-check-rs --tsconfig ./tsconfig.json",
"format": "prettier --write ./src",
"format:check": "prettier --check ./src",
"check:watch": "svelte-kit sync && svelte-check-rs --tsconfig ./tsconfig.json --watch",
- "knip": "knip",
- "i18n:unused": "i18n-unused display-unused",
- "i18n:remove": "i18n-unused remove-unused",
- "i18n:mark": "i18n-unused mark-unused"
+ "knip": "knip --no-config-hints"
},
"dependencies": {
"@codemirror/autocomplete": "^6.20.1",
@@ -39,7 +35,6 @@
"ansi-to-html": "^0.7.2",
"date-fns": "^4.1.0",
"embla-carousel-svelte": "^8.6.0",
- "js-yaml": "^4.1.1",
"ky": "^1.12.0",
"prettier": "^3.8.3",
"prettier-plugin-svelte": "^3.5.1",
@@ -55,9 +50,7 @@
"@prettier/plugin-oxc": "^0.1.3",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.2",
- "@tanstack/eslint-plugin-query": "^5.99.0",
"@tanstack/svelte-query-devtools": "^6.1.20",
- "@types/js-yaml": "^4.0.9",
"@types/node": "^25.5.0",
"@typescript/native-preview": "7.0.0-dev.20260322.1",
"bits-ui": "^2.17.3",
@@ -68,7 +61,6 @@
"mode-watcher": "^1.1.0",
"paneforge": "^1.0.2",
"runed": "^0.37.1",
- "svelte-check": "^4.4.6",
"svelte-check-rs": "^0.9.7",
"svelte-sonner": "^1.1.0",
"svelte-toolbelt": "^0.10.6",
diff --git a/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte b/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
index bbf5dce49..9b1d1c3f5 100644
--- a/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
+++ b/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
@@ -165,7 +165,7 @@
{#if resolvedBadges.length > 0}
<div class="flex flex-wrap items-center gap-1">
- {#each resolvedBadges as badge}
+ {#each resolvedBadges as badge (`${badge.variant}:${badge.text}`)}
<StatusBadge variant={badge.variant} text={badge.text} size="sm" />
{/each}
</div>
@@ -175,7 +175,7 @@
{#if visibleFields.length > 0}
{#if !compact}
<div class="flex flex-wrap gap-x-4 gap-y-2.5">
- {#each visibleFields as field}
+ {#each visibleFields as field (field.label)}
{@const value = field.getValue(item)}
{#if value !== null && value !== undefined}
<div class="flex min-w-0 flex-1 basis-[140px] items-center gap-2.5">
@@ -213,7 +213,7 @@
{/each}
</div>
{:else}
- {#each visibleFields as field}
+ {#each visibleFields as field (field.label)}
{@const value = field.getValue(item)}
{#if value !== null && value !== undefined}
<div class="flex items-baseline gap-2">
diff --git a/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts b/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
index 067fac02d..ee6e243a4 100644
--- a/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
+++ b/frontend/src/lib/components/code-editor/analysis/compose-analysis.ts
@@ -358,7 +358,7 @@ function buildOutline(doc: YamlDocLike): OutlineItem[] {
return outline;
}
-export function findVariableReferenceAtPosition(
+function findVariableReferenceAtPosition(
source: string,
position: number
): { name: string; source: 'env' | 'global' | 'missing' } | null {
diff --git a/frontend/src/lib/components/code-editor/analysis/compose-schema.ts b/frontend/src/lib/components/code-editor/analysis/compose-schema.ts
index 9d8c5492d..0282cd27a 100644
--- a/frontend/src/lib/components/code-editor/analysis/compose-schema.ts
+++ b/frontend/src/lib/components/code-editor/analysis/compose-schema.ts
@@ -3,7 +3,7 @@ import type { Completion } from '@codemirror/autocomplete';
import { browser } from '$app/environment';
import type { SchemaDoc, SchemaStatus } from './types';
-export const DOCKER_COMPOSE_SCHEMA_URL =
+const DOCKER_COMPOSE_SCHEMA_URL =
'https://raw.githubusercontent.com/compose-spec/compose-go/refs/heads/main/schema/compose-spec.json';
const SCHEMA_CACHE_KEY = 'arcane.compose.schema.v1';
diff --git a/frontend/src/lib/components/code-editor/analysis/vars-analysis.ts b/frontend/src/lib/components/code-editor/analysis/vars-analysis.ts
index 05476ee42..e72dc6ff5 100644
--- a/frontend/src/lib/components/code-editor/analysis/vars-analysis.ts
+++ b/frontend/src/lib/components/code-editor/analysis/vars-analysis.ts
@@ -1,29 +1,11 @@
import type { EditorContext } from './types';
import { isOpenQuote } from './parse-env-utils';
-const BRACED_VAR_REGEX = /\$\{([A-Za-z_][A-Za-z0-9_]*)(?:(?::[-?+])[^}]*)?\}/g;
-const SIMPLE_VAR_REGEX = /(^|[^$])\$([A-Za-z_][A-Za-z0-9_]*)/g;
const ENV_KEY_REGEX = /^[A-Za-z_][A-Za-z0-9_]*$/;
export type VariableSource = 'env' | 'global';
-export function extractComposeVariables(contents: string[]): Set<string> {
- const vars = new Set<string>();
-
- for (const content of contents) {
- for (const match of content.matchAll(BRACED_VAR_REGEX)) {
- if (match[1]) vars.add(match[1]);
- }
-
- for (const match of content.matchAll(SIMPLE_VAR_REGEX)) {
- if (match[2]) vars.add(match[2]);
- }
- }
-
- return vars;
-}
-
-export function parseEnvVariables(envContent: string): Map<string, string> {
+function parseEnvVariables(envContent: string): Map<string, string> {
const values = new Map<string, string>();
const lines = envContent.split(/\r?\n/);
@@ -76,7 +58,7 @@ export function parseEnvVariables(envContent: string): Map<string, string> {
return values;
}
-export function buildVariableSourceMap(context: EditorContext): Map<string, VariableSource> {
+function buildVariableSourceMap(context: EditorContext): Map<string, VariableSource> {
const source = new Map<string, VariableSource>();
const envValues = parseEnvVariables(context.envContent ?? '');
@@ -97,37 +79,3 @@ export function resolveVariableSource(variableName: string, context: EditorConte
const source = buildVariableSourceMap(context);
return source.get(variableName) ?? null;
}
-
-export function getMissingComposeVariables(context: EditorContext, activeComposeContent: string): string[] {
- const composeContents = [activeComposeContent, ...(context.composeContents ?? [])].filter((item) => item.length > 0);
- const referenced = extractComposeVariables(composeContents);
- const available = new Set<string>([
- ...parseEnvVariables(context.envContent ?? '').keys(),
- ...Object.keys(context.globalVariables ?? {})
- ]);
-
- const missing: string[] = [];
- for (const name of referenced) {
- if (!available.has(name)) {
- missing.push(name);
- }
- }
-
- return missing.sort((a, b) => a.localeCompare(b));
-}
-
-export function getUnusedEnvVariables(context: EditorContext): string[] {
- const envValues = parseEnvVariables(context.envContent ?? '');
- if (!envValues.size) return [];
-
- const referenced = extractComposeVariables(context.composeContents ?? []);
-
- const unused: string[] = [];
- for (const key of envValues.keys()) {
- if (!referenced.has(key)) {
- unused.push(key);
- }
- }
-
- return unused.sort((a, b) => a.localeCompare(b));
-}
diff --git a/frontend/src/lib/components/code-editor/theme.ts b/frontend/src/lib/components/code-editor/theme.ts
index ed1fbfea3..15e3d23c3 100644
--- a/frontend/src/lib/components/code-editor/theme.ts
+++ b/frontend/src/lib/components/code-editor/theme.ts
@@ -84,8 +84,6 @@ export const arcaneDarkInit = (options?: Partial<CreateThemeOptions>) => {
});
};
-export const arcaneDark = arcaneDarkInit();
-
export const arcaneLightInit = (options?: Partial<CreateThemeOptions>) => {
const { theme = 'light', settings = {}, styles = [] } = options || {};
diff --git a/frontend/src/lib/components/compose/compose-editor-split.svelte b/frontend/src/lib/components/compose/compose-editor-split.svelte
new file mode 100644
index 000000000..a6961be04
--- /dev/null
+++ b/frontend/src/lib/components/compose/compose-editor-split.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+ import type { Snippet } from 'svelte';
+
+ interface Props {
+ compose: Snippet;
+ env: Snippet;
+ class?: string;
+ composeClass?: string;
+ envClass?: string;
+ onsubmit?: (event: SubmitEvent) => void;
+ }
+
+ let {
+ compose,
+ env,
+ class: className = 'flex min-h-0 flex-1 flex-col gap-4 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch',
+ composeClass = 'flex min-h-0 flex-1 flex-col lg:col-span-3',
+ envClass = 'flex min-h-0 flex-1 flex-col lg:col-span-2',
+ onsubmit
+ }: Props = $props();
+</script>
+
+{#snippet content()}
+ <div class={composeClass}>
+ {@render compose()}
+ </div>
+
+ <div class={envClass}>
+ {@render env()}
+ </div>
+{/snippet}
+
+{#if onsubmit}
+ <form class={className} {onsubmit}>
+ {@render content()}
+ </form>
+{:else}
+ <div class={className}>
+ {@render content()}
+ </div>
+{/if}
diff --git a/frontend/src/lib/components/compose/index.ts b/frontend/src/lib/components/compose/index.ts
index edb803966..d18404978 100644
--- a/frontend/src/lib/components/compose/index.ts
+++ b/frontend/src/lib/components/compose/index.ts
@@ -1,3 +1,4 @@
import ComposeEditorWrapper from './ComposeEditorWrapper.svelte';
+import ComposeEditorSplit from './compose-editor-split.svelte';
-export { ComposeEditorWrapper };
+export { ComposeEditorWrapper, ComposeEditorSplit };
diff --git a/frontend/src/lib/components/disk-meter.svelte b/frontend/src/lib/components/disk-meter.svelte
deleted file mode 100644
index cc8d7b025..000000000
--- a/frontend/src/lib/components/disk-meter.svelte
+++ /dev/null
@@ -1,163 +0,0 @@
-<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import * as Popover from '$lib/components/ui/popover';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { Input } from '$lib/components/ui/input';
- import { Label } from '$lib/components/ui/label';
- import { Progress } from '$lib/components/ui/progress/index.js';
- import { m } from '$lib/paraglide/messages';
- import bytes from '$lib/utils/bytes';
- import settingsStore from '$lib/stores/config-store';
- import { queryKeys } from '$lib/query/query-keys';
- import { settingsService } from '$lib/services/settings-service';
- import { toast } from 'svelte-sonner';
- import { z } from 'zod/v4';
- import { VolumesIcon, SettingsIcon } from '$lib/icons';
- import { createMutation, useQueryClient } from '@tanstack/svelte-query';
-
- let {
- diskUsage,
- diskTotal,
- loading = false,
- class: className
- }: {
- diskUsage?: number;
- diskTotal?: number;
- loading?: boolean;
- class?: string;
- } = $props();
-
- const percentage = $derived(
- !loading && diskUsage !== undefined && diskTotal !== undefined && diskTotal > 0 ? (diskUsage / diskTotal) * 100 : 0
- );
-
- const diskFree = $derived(diskUsage !== undefined && diskTotal !== undefined ? diskTotal - diskUsage : 0);
-
- let diskUsagePath = $state($settingsStore.diskUsagePath || 'data/projects');
- let popoverOpen = $state(false);
- const queryClient = useQueryClient();
-
- const pathSchema = z
- .string()
- .min(1, 'Path cannot be empty')
- .refine((path) => !path.includes('..'), 'Path cannot contain ".."')
- .refine((path) => !/^[a-zA-Z]:/.test(path), 'Windows-style paths are not supported');
-
- const savePathMutation = createMutation(() => ({
- mutationFn: (path: string) => settingsService.updateSettings({ diskUsagePath: path }),
- onSuccess: async (_, path) => {
- settingsStore.set({ ...$settingsStore, diskUsagePath: path });
- await queryClient.invalidateQueries({ queryKey: queryKeys.settings.all });
- toast.success(m.disk_usage_save());
- popoverOpen = false;
- },
- onError: (error) => {
- console.error('Failed to update disk usage path:', error);
- toast.error(m.disk_usage_save_failed());
- }
- }));
-
- const isSaving = $derived(savePathMutation.isPending);
-
- function saveDiskUsagePath() {
- const trimmedPath = diskUsagePath.trim();
- const result = pathSchema.safeParse(trimmedPath);
-
- if (!result.success) {
- const firstError = result.error.issues[0];
- if (firstError) {
- toast.error(firstError.message);
- }
- return;
- }
-
- savePathMutation.mutate(trimmedPath);
- }
-
- function formatBytes(value: number): string {
- return bytes.format(value, { unitSeparator: ' ' }) ?? '-';
- }
-</script>
-
-<Card.Root class="flex h-full flex-col {className}">
- <Card.Header icon={VolumesIcon} iconVariant="primary" compact {loading}>
- <div class="min-w-0 flex-1">
- <div class="text-foreground text-sm font-semibold">{m.dashboard_meter_disk()}</div>
- <div class="text-muted-foreground text-xs">{m.dashboard_meter_disk_desc()}</div>
- <div class="text-muted-foreground/70 mt-0.5 font-mono text-[10px]">
- {m.dashboard_meter_disk_monitoring({ path: $settingsStore.diskUsagePath })}
- </div>
- </div>
- <Popover.Root bind:open={popoverOpen}>
- <Popover.Trigger>
- {#snippet child({ props })}
- <ArcaneButton
- {...props}
- action="base"
- tone="ghost"
- size="icon"
- icon={SettingsIcon}
- class="hover:bg-muted size-7 shrink-0"
- />
- {/snippet}
- </Popover.Trigger>
- <Popover.Content class="w-80">
- <div class="space-y-4">
- <div class="space-y-2">
- <h4 class="text-sm leading-none font-medium">{m.disk_usage_settings()}</h4>
- <p class="text-muted-foreground text-sm">{m.disk_usage_settings_description()}</p>
- </div>
- <div class="space-y-2">
- <Label for="disk-path">{m.directory_path()}</Label>
- <Input id="disk-path" placeholder="/app/data/projects" bind:value={diskUsagePath} disabled={isSaving} />
- </div>
- <div class="flex justify-end gap-2">
- <ArcaneButton
- action="cancel"
- size="sm"
- onclick={() => {
- diskUsagePath = $settingsStore.diskUsagePath || '/app/data/projects';
- popoverOpen = false;
- }}
- disabled={isSaving}
- />
- <ArcaneButton action="save" size="sm" onclick={saveDiskUsagePath} disabled={isSaving} loading={isSaving} />
- </div>
- </div>
- </Popover.Content>
- </Popover.Root>
- </Card.Header>
-
- <Card.Content class="flex flex-1 flex-col justify-end gap-3 p-3 sm:p-4">
- {#if loading}
- <div class="flex items-center gap-3">
- <div class="bg-muted h-2.5 flex-1 animate-pulse rounded-full"></div>
- <div class="bg-muted h-4 w-12 animate-pulse rounded"></div>
- </div>
- <div class="flex justify-between gap-4">
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- </div>
- {:else}
- <div class="flex items-center gap-3">
- <Progress value={percentage} max={100} class="h-2.5 flex-1" />
- <span class="text-foreground min-w-12 text-right text-sm font-bold tabular-nums">
- {percentage.toFixed(1)}%
- </span>
- </div>
-
- <div class="flex flex-wrap items-center justify-between gap-x-4 gap-y-1">
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_used()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskUsage ?? 0)}</span>
- </div>
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary/20 size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_free()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(diskFree)}</span>
- </div>
- </div>
- {/if}
- </Card.Content>
-</Card.Root>
diff --git a/frontend/src/lib/components/docker-overview.svelte b/frontend/src/lib/components/docker-overview.svelte
deleted file mode 100644
index 75d32ef75..000000000
--- a/frontend/src/lib/components/docker-overview.svelte
+++ /dev/null
@@ -1,83 +0,0 @@
-<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import { Badge } from '$lib/components/ui/badge';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import { Skeleton } from '$lib/components/ui/skeleton';
- import DockerInfoDialog from '$lib/components/dialogs/docker-info-dialog.svelte';
- import type { DockerInfo } from '$lib/types/docker-info.type';
- import { m } from '$lib/paraglide/messages';
- import { DockerBrandIcon, ImagesIcon, ContainersIcon, InfoIcon } from '$lib/icons';
-
- let {
- dockerInfo,
- containersRunning,
- totalContainers,
- totalImages,
- loading = false,
- class: className
- }: {
- dockerInfo: DockerInfo | null;
- containersRunning: number;
- totalContainers: number;
- totalImages: number;
- loading?: boolean;
- class?: string;
- } = $props();
-
- let dockerInfoDialogOpen = $state(false);
-</script>
-
-<Card.Root class={className}>
- {#snippet children()}
- <Card.Header icon={DockerBrandIcon} iconVariant="primary" class="items-center" {loading}>
- {#snippet children()}
- {#if loading}
- <div class="flex flex-1 flex-col gap-2">
- <Skeleton class="h-4 w-32" />
- <Skeleton class="h-3 w-48" />
- </div>
- {:else}
- <div class="flex flex-1 flex-col gap-1.5">
- <div class="flex items-center gap-2">
- <span class="text-foreground text-sm font-semibold"
- >{m.docker_engine_title({ engine: dockerInfo?.Name ?? 'Docker Engine' })}</span
- >
- <Badge variant="outline" class="text-xs">{dockerInfo?.ServerVersion ?? '-'}</Badge>
- </div>
- <div class="text-muted-foreground flex flex-wrap items-center gap-3 text-xs">
- <span class="flex items-center gap-1.5">
- <ContainersIcon class="size-3" />
- <span class="font-medium text-emerald-600">{containersRunning}</span>
- <span class="text-muted-foreground/70">/</span>
- <span>{totalContainers}</span>
- </span>
- <span class="text-muted-foreground/50">•</span>
- <span class="flex items-center gap-1.5">
- <ImagesIcon class="size-3" />
- <span>{totalImages}</span>
- <span class="text-muted-foreground/70">{m.images_title().toLowerCase()}</span>
- </span>
- <span class="text-muted-foreground/50">•</span>
- <span class="font-mono">
- {dockerInfo?.OperatingSystem ?? '-'} / {dockerInfo?.Architecture ?? '-'}
- </span>
- </div>
- </div>
-
- {#if dockerInfo}
- <ArcaneButton
- action="base"
- tone="ghost"
- size="icon"
- icon={InfoIcon}
- class="text-muted-foreground hover:text-foreground size-8 shrink-0"
- onclick={() => (dockerInfoDialogOpen = true)}
- />
- {/if}
- {/if}
- {/snippet}
- </Card.Header>
- {/snippet}
-</Card.Root>
-
-<DockerInfoDialog bind:open={dockerInfoDialogOpen} {dockerInfo} />
diff --git a/frontend/src/lib/components/gpu-meter.svelte b/frontend/src/lib/components/gpu-meter.svelte
deleted file mode 100644
index f59685965..000000000
--- a/frontend/src/lib/components/gpu-meter.svelte
+++ /dev/null
@@ -1,101 +0,0 @@
-<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import { Progress } from '$lib/components/ui/progress/index.js';
- import { m } from '$lib/paraglide/messages';
- import bytes from '$lib/utils/bytes';
- import type { GPUStats } from '$lib/types/system-stats.type';
- import { GpuIcon } from '$lib/icons';
-
- interface Props {
- gpus?: GPUStats[];
- loading?: boolean;
- }
-
- let { gpus, loading = false }: Props = $props();
-
- function formatBytes(bytesValue: number): string {
- return bytes.format(bytesValue, { unitSeparator: ' ' }) ?? '-';
- }
-
- function getPercentage(used: number, total: number): number {
- if (total === 0) return 0;
- return Math.min(100, (used / total) * 100);
- }
-</script>
-
-<Card.Root class="flex h-full flex-col">
- {#snippet children()}
- <Card.Header icon={GpuIcon} iconVariant="primary" compact {loading}>
- {#snippet children()}
- <div class="min-w-0 flex-1">
- <div class="text-foreground text-sm font-semibold">{m.dashboard_meter_gpu()}</div>
- {#if gpus && gpus.length > 0}
- <div class="text-muted-foreground text-xs">
- {gpus.length}
- {gpus.length === 1 ? m.dashboard_meter_gpu_device() : m.dashboard_meter_gpu_devices()}
- </div>
- {/if}
- </div>
- {/snippet}
- </Card.Header>
-
- <Card.Content class="flex flex-1 flex-col justify-center gap-3 p-3 sm:p-4">
- {#if loading}
- <div class="space-y-3">
- <div class="flex items-center gap-3">
- <div class="bg-muted h-2.5 flex-1 animate-pulse rounded-full"></div>
- <div class="bg-muted h-4 w-12 animate-pulse rounded"></div>
- </div>
- <div class="flex justify-between gap-4">
- <div class="bg-muted h-4 w-16 animate-pulse rounded"></div>
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- </div>
- </div>
- {:else if !gpus || gpus.length === 0}
- <div class="text-muted-foreground text-center text-xs">
- {m.common_na()}
- </div>
- {:else}
- <div class="space-y-4">
- {#each gpus as gpu, i}
- {@const percentage = getPercentage(gpu.memoryUsed, gpu.memoryTotal)}
- <div class="space-y-2">
- {#if gpus.length > 1}
- <div class="flex items-center justify-between">
- <span class="text-foreground truncate text-xs font-medium">{gpu.name}</span>
- <span class="text-muted-foreground shrink-0 font-mono text-[10px]">GPU {gpu.index}</span>
- </div>
- {/if}
-
- <div class="flex items-center gap-3">
- <Progress value={percentage} max={100} class="h-2.5 flex-1 bg-emerald-500/20 [&>div]:bg-emerald-500" />
- <span class="text-foreground min-w-12 text-right text-sm font-bold tabular-nums">
- {percentage.toFixed(1)}%
- </span>
- </div>
-
- <div class="flex flex-wrap items-center justify-between gap-x-4 gap-y-1">
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="size-2 shrink-0 rounded-full bg-emerald-500"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_used()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{formatBytes(gpu.memoryUsed)}</span>
- </div>
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="size-2 shrink-0 rounded-full bg-emerald-500/20"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_disk_free()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums"
- >{formatBytes(gpu.memoryTotal - gpu.memoryUsed)}</span
- >
- </div>
- </div>
- </div>
-
- {#if i < gpus.length - 1}
- <div class="border-border/50 border-t"></div>
- {/if}
- {/each}
- </div>
- {/if}
- </Card.Content>
- {/snippet}
-</Card.Root>
diff --git a/frontend/src/lib/components/meter-metric.svelte b/frontend/src/lib/components/meter-metric.svelte
deleted file mode 100644
index 692196b0b..000000000
--- a/frontend/src/lib/components/meter-metric.svelte
+++ /dev/null
@@ -1,92 +0,0 @@
-<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import { Progress } from '$lib/components/ui/progress/index.js';
- import { m } from '$lib/paraglide/messages';
-
- interface Props {
- title: string;
- description?: string;
- currentValue?: number;
- unit?: string;
- formatValue?: (value: number) => string;
- maxValue?: number;
- icon: any;
- loading?: boolean;
- showAbsoluteValues?: boolean;
- formatAbsoluteValue?: (value: number) => string;
- formatUsageValue?: (value: number) => string;
- }
-
- let {
- title,
- description,
- currentValue,
- unit = '',
- formatValue = (v) => `${v.toFixed(1)}${unit}`,
- maxValue = 100,
- icon,
- loading = false,
- showAbsoluteValues = false,
- formatAbsoluteValue = (v) => v.toString(),
- formatUsageValue
- }: Props = $props();
-
- const percentage = $derived(currentValue !== undefined && !loading && maxValue > 0 ? (currentValue / maxValue) * 100 : 0);
- const usageValueText = $derived.by(() => {
- if (currentValue === undefined) return m.common_na();
- if (formatUsageValue) return formatUsageValue(currentValue);
- return `${percentage.toFixed(1)}%`;
- });
-</script>
-
-<Card.Root class="flex h-full flex-col">
- {#snippet children()}
- <Card.Header {icon} iconVariant="primary" compact {loading}>
- {#snippet children()}
- <div class="min-w-0 flex-1">
- <div class="text-foreground text-sm font-semibold">{title}</div>
- {#if description}
- <div class="text-muted-foreground text-xs">{description}</div>
- {/if}
- </div>
- {/snippet}
- </Card.Header>
-
- <Card.Content class="flex flex-1 flex-col justify-end gap-3 p-3 sm:p-4">
- {#if loading}
- <div class="flex items-center gap-3">
- <div class="bg-muted h-2.5 flex-1 animate-pulse rounded-full"></div>
- <div class="bg-muted h-4 w-12 animate-pulse rounded"></div>
- </div>
- <div class="flex justify-between gap-4">
- <div class="bg-muted h-4 w-16 animate-pulse rounded"></div>
- <div class="bg-muted h-4 w-20 animate-pulse rounded"></div>
- </div>
- {:else}
- <div class="flex items-center gap-3">
- <Progress value={percentage} max={100} class="h-2.5 flex-1" />
- <span class="text-foreground min-w-12 text-right text-sm font-bold tabular-nums">
- {currentValue !== undefined ? `${formatValue(currentValue)}${unit}` : m.common_na()}
- </span>
- </div>
-
- <div class="flex flex-wrap items-center justify-between gap-x-4 gap-y-1">
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_usage()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">{usageValueText}</span>
- </div>
- {#if showAbsoluteValues && currentValue !== undefined && maxValue !== undefined && formatAbsoluteValue}
- <div class="flex items-center gap-2 whitespace-nowrap">
- <div class="bg-primary/20 size-2 shrink-0 rounded-full"></div>
- <span class="text-muted-foreground text-xs">{m.dashboard_meter_capacity()}</span>
- <span class="text-foreground text-sm font-semibold tabular-nums">
- {maxValue === 100 ? formatAbsoluteValue(0) : formatAbsoluteValue(maxValue)}
- </span>
- </div>
- {/if}
- </div>
- {/if}
- </Card.Content>
- {/snippet}
-</Card.Root>
diff --git a/frontend/src/lib/components/mobile-nav/styles.css b/frontend/src/lib/components/mobile-nav/styles.css
index 42a1a2d9e..df6b702a3 100644
--- a/frontend/src/lib/components/mobile-nav/styles.css
+++ b/frontend/src/lib/components/mobile-nav/styles.css
@@ -44,8 +44,8 @@
}
/* Shared button/link styles */
-.mobile-nav-base :global(button),
-.mobile-nav-base :global(a) {
+.mobile-nav-base button,
+.mobile-nav-base a {
pointer-events: auto;
touch-action: manipulation; /* Allow taps and prevent interfering gestures */
position: relative;
@@ -65,8 +65,8 @@
border-color: var(--muted);
}
- .mobile-nav-base :global(button),
- .mobile-nav-base :global(a) {
+ .mobile-nav-base button,
+ .mobile-nav-base a {
cursor: pointer;
}
}
@@ -78,14 +78,14 @@
}
/* Disable scale and complex animations for reduced motion */
- .mobile-nav-base :global(button) {
+ .mobile-nav-base button {
transition: none;
transform: none !important;
}
- .mobile-nav-base :global(button:hover),
- .mobile-nav-base :global(button:focus-visible),
- .mobile-nav-base :global(button:active) {
+ .mobile-nav-base button:hover,
+ .mobile-nav-base button:focus-visible,
+ .mobile-nav-base button:active {
transform: none !important;
}
}
diff --git a/frontend/src/lib/components/resource-detail/index.ts b/frontend/src/lib/components/resource-detail/index.ts
new file mode 100644
index 000000000..52de625df
--- /dev/null
+++ b/frontend/src/lib/components/resource-detail/index.ts
@@ -0,0 +1,2 @@
+export { default as KeyValueCard } from './key-value-card.svelte';
+export { default as KeyValueGrid } from './key-value-grid.svelte';
diff --git a/frontend/src/lib/components/resource-detail/key-value-card.svelte b/frontend/src/lib/components/resource-detail/key-value-card.svelte
new file mode 100644
index 000000000..828d6f82d
--- /dev/null
+++ b/frontend/src/lib/components/resource-detail/key-value-card.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+ import * as Card from '$lib/components/ui/card';
+ import type { Snippet } from 'svelte';
+
+ interface Props {
+ label: string;
+ children: Snippet;
+ labelClass?: string;
+ valueClass?: string;
+ valueTitle?: string;
+ cardClass?: string;
+ }
+
+ let {
+ label,
+ children,
+ labelClass = 'text-muted-foreground text-xs font-semibold tracking-wide break-all uppercase',
+ valueClass = 'text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all',
+ valueTitle,
+ cardClass
+ }: Props = $props();
+</script>
+
+{#snippet content()}
+ <Card.Content class="flex flex-col gap-2 p-4">
+ <div class={labelClass}>{label}</div>
+ <div class={valueClass} title={valueTitle}>
+ {@render children()}
+ </div>
+ </Card.Content>
+{/snippet}
+
+<Card.Root variant="subtle" class={cardClass}>
+ {@render content()}
+</Card.Root>
diff --git a/frontend/src/lib/components/resource-detail/key-value-grid.svelte b/frontend/src/lib/components/resource-detail/key-value-grid.svelte
new file mode 100644
index 000000000..c1673d978
--- /dev/null
+++ b/frontend/src/lib/components/resource-detail/key-value-grid.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+ import type { Snippet } from 'svelte';
+
+ interface Props {
+ children: Snippet;
+ }
+
+ let { children }: Props = $props();
+</script>
+
+<div class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
+ {@render children()}
+</div>
diff --git a/frontend/src/lib/components/settings/settings-row.svelte b/frontend/src/lib/components/settings/settings-row.svelte
new file mode 100644
index 000000000..39e5fb1d0
--- /dev/null
+++ b/frontend/src/lib/components/settings/settings-row.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+ import { Label } from '$lib/components/ui/label';
+ import type { Snippet } from 'svelte';
+
+ interface Props {
+ label: string;
+ description?: string;
+ helpText?: string | Snippet;
+ labelExtra?: Snippet;
+ children: Snippet;
+ contentClass?: string;
+ }
+
+ let { label, description, helpText, labelExtra, children, contentClass }: Props = $props();
+</script>
+
+<div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{label}</Label>
+ {#if description}
+ <p class="text-muted-foreground mt-1 text-sm">{description}</p>
+ {/if}
+ {#if typeof helpText === 'function'}
+ {@render helpText()}
+ {:else if helpText}
+ <p class="text-muted-foreground mt-2 text-xs">{helpText}</p>
+ {/if}
+ {#if labelExtra}
+ {@render labelExtra()}
+ {/if}
+ </div>
+ <div class={contentClass}>
+ {@render children()}
+ </div>
+</div>
diff --git a/frontend/src/lib/components/settings/trivy-security-settings.svelte b/frontend/src/lib/components/settings/trivy-security-settings.svelte
index 5df24505f..33dca3ba8 100644
--- a/frontend/src/lib/components/settings/trivy-security-settings.svelte
+++ b/frontend/src/lib/components/settings/trivy-security-settings.svelte
@@ -6,6 +6,7 @@
import * as Alert from '$lib/components/ui/alert';
import SearchableSelect from '$lib/components/form/searchable-select.svelte';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { SecurityIcon, InfoIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
import { toast } from 'svelte-sonner';
@@ -84,38 +85,33 @@
return options;
});
- async function loadTrivyNetworkOptions() {
- try {
- const request: SearchPaginationSortRequest = {
- pagination: {
- page: 1,
- limit: 1000
- },
- sort: {
- column: 'name',
- direction: 'asc'
- }
- };
- const response = environmentId
- ? await networkService.getNetworksForEnvironment(environmentId, request)
- : await networkService.getNetworks(request);
+ async function fetchTrivyNetworkOptions(targetEnvironmentId: string | undefined): Promise<TrivyNetworkOption[]> {
+ const request: SearchPaginationSortRequest = {
+ pagination: {
+ page: 1,
+ limit: 1000
+ },
+ sort: {
+ column: 'name',
+ direction: 'asc'
+ }
+ };
+ const response = targetEnvironmentId
+ ? await networkService.getNetworksForEnvironment(targetEnvironmentId, request)
+ : await networkService.getNetworks(request);
- const networkNames = [
- ...new Set(
- response.data
- .map((network) => network.name)
- .filter((name) => !!name && !baseTrivyNetworkOptions.some((option) => option.value === name))
- )
- ].sort((a, b) => a.localeCompare(b));
+ const networkNames = [
+ ...new Set(
+ response.data
+ .map((network) => network.name)
+ .filter((name) => !!name && !baseTrivyNetworkOptions.some((option) => option.value === name))
+ )
+ ].sort((a, b) => a.localeCompare(b));
- customTrivyNetworkOptions = networkNames.map((name) => ({
- value: name,
- label: name
- }));
- } catch (error) {
- console.warn('Failed to load Trivy network options:', error);
- toast.info(m.security_trivy_network_fetch_failed());
- }
+ return networkNames.map((name) => ({
+ value: name,
+ label: name
+ }));
}
function handleTrivyResourceLimitsChange(checked: boolean) {
@@ -127,7 +123,25 @@
}
$effect(() => {
- void loadTrivyNetworkOptions();
+ const targetEnvironmentId = environmentId;
+ let cancelled = false;
+
+ void fetchTrivyNetworkOptions(targetEnvironmentId)
+ .then((options) => {
+ if (!cancelled) {
+ customTrivyNetworkOptions = options;
+ }
+ })
+ .catch((error) => {
+ if (!cancelled) {
+ console.warn('Failed to load Trivy network options:', error);
+ toast.info(m.security_trivy_network_fetch_failed());
+ }
+ });
+
+ return () => {
+ cancelled = true;
+ };
});
</script>
@@ -140,154 +154,142 @@
</div>
</Card.Header>
<Card.Content class="space-y-6 lg:p-6 lg:pt-0">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_image_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_image_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_image_note()}</p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.trivyImage.value}
- error={$formInputs.trivyImage.error}
- disabled={true}
- label={m.security_trivy_image_label()}
- placeholder="ghcr.io/getarcaneapp/tools:latest"
- type="text"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.security_trivy_image_label()}
+ description={m.security_trivy_image_description()}
+ helpText={m.security_trivy_image_note()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyImage.value}
+ error={$formInputs.trivyImage.error}
+ disabled={true}
+ label={m.security_trivy_image_label()}
+ placeholder="ghcr.io/getarcaneapp/tools:latest"
+ type="text"
+ />
+ </SettingsRow>
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_network_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_network_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_network_help()}</p>
- </div>
- <div class="max-w-xs">
- <SearchableSelect
- triggerId="trivyNetwork"
- items={trivyNetworkOptions.map((option) => ({
- value: option.value,
- label: option.label,
- hint: option.description
- }))}
- bind:value={$formInputs.trivyNetwork.value}
- onSelect={(value) => ($formInputs.trivyNetwork.value = value)}
- placeholder={false}
- class="w-full justify-between"
- />
- {#if $formInputs.trivyNetwork.error}
- <p class="text-destructive mt-2 text-sm">{$formInputs.trivyNetwork.error}</p>
- {/if}
- </div>
- </div>
+ <SettingsRow
+ label={m.security_trivy_network_label()}
+ description={m.security_trivy_network_description()}
+ helpText={m.security_trivy_network_help()}
+ contentClass="max-w-xs"
+ >
+ <SearchableSelect
+ triggerId="trivyNetwork"
+ items={trivyNetworkOptions.map((option) => ({
+ value: option.value,
+ label: option.label,
+ hint: option.description
+ }))}
+ bind:value={$formInputs.trivyNetwork.value}
+ onSelect={(value) => ($formInputs.trivyNetwork.value = value)}
+ placeholder={false}
+ class="w-full justify-between"
+ />
+ {#if $formInputs.trivyNetwork.error}
+ <p class="text-destructive mt-2 text-sm">{$formInputs.trivyNetwork.error}</p>
+ {/if}
+ </SettingsRow>
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_security_opts_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_security_opts_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_security_opts_help()}</p>
- </div>
- <div class="space-y-2">
- <Textarea
- bind:value={$formInputs.trivySecurityOpts.value}
- aria-label={m.security_trivy_security_opts_label()}
- class="min-h-28 font-mono text-sm"
- placeholder={m.security_trivy_security_opts_placeholder()}
- rows={4}
- />
- {#if $formInputs.trivySecurityOpts.error}
- <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>
- {/if}
- </div>
- </div>
+ <SettingsRow
+ label={m.security_trivy_security_opts_label()}
+ description={m.security_trivy_security_opts_description()}
+ helpText={m.security_trivy_security_opts_help()}
+ contentClass="space-y-2"
+ >
+ <Textarea
+ bind:value={$formInputs.trivySecurityOpts.value}
+ aria-label={m.security_trivy_security_opts_label()}
+ class="min-h-28 font-mono text-sm"
+ placeholder={m.security_trivy_security_opts_placeholder()}
+ rows={4}
+ />
+ {#if $formInputs.trivySecurityOpts.error}
+ <p class="text-destructive text-sm">{$formInputs.trivySecurityOpts.error}</p>
+ {/if}
+ </SettingsRow>
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_privileged_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_privileged_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_privileged_note()}</p>
- </div>
- <div class="space-y-3">
- <div class="flex items-center gap-2">
- <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />
- <Label for="trivyPrivilegedSwitch" class="font-normal">
- {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- {#if $formInputs.trivyPrivileged.value}
- <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
- <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />
- <Alert.Description class="text-amber-800 dark:text-amber-200">
- {m.security_trivy_privileged_note()}
- </Alert.Description>
- </Alert.Root>
- {/if}
+ <SettingsRow
+ label={m.security_trivy_privileged_label()}
+ description={m.security_trivy_privileged_description()}
+ helpText={m.security_trivy_privileged_note()}
+ contentClass="space-y-3"
+ >
+ <div class="flex items-center gap-2">
+ <Switch id="trivyPrivilegedSwitch" bind:checked={$formInputs.trivyPrivileged.value} />
+ <Label for="trivyPrivilegedSwitch" class="font-normal">
+ {$formInputs.trivyPrivileged.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
</div>
- </div>
+ {#if $formInputs.trivyPrivileged.value}
+ <Alert.Root variant="default" class="border-amber-200 bg-amber-50 dark:border-amber-800 dark:bg-amber-950">
+ <InfoIcon class="h-4 w-4 text-amber-900 dark:text-amber-100" />
+ <Alert.Description class="text-amber-800 dark:text-amber-200">
+ {m.security_trivy_privileged_note()}
+ </Alert.Description>
+ </Alert.Root>
+ {/if}
+ </SettingsRow>
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_preserve_cache_on_volume_prune_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_preserve_cache_on_volume_prune_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_preserve_cache_on_volume_prune_note()}</p>
- </div>
- <div class="space-y-3">
- <div class="flex items-center gap-2">
- <Switch id="trivyPreserveCacheOnVolumePruneSwitch" bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value} />
- <Label for="trivyPreserveCacheOnVolumePruneSwitch" class="font-normal">
- {$formInputs.trivyPreserveCacheOnVolumePrune.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
+ <SettingsRow
+ label={m.security_trivy_preserve_cache_on_volume_prune_label()}
+ description={m.security_trivy_preserve_cache_on_volume_prune_description()}
+ helpText={m.security_trivy_preserve_cache_on_volume_prune_note()}
+ contentClass="space-y-3"
+ >
+ <div class="flex items-center gap-2">
+ <Switch id="trivyPreserveCacheOnVolumePruneSwitch" bind:checked={$formInputs.trivyPreserveCacheOnVolumePrune.value} />
+ <Label for="trivyPreserveCacheOnVolumePruneSwitch" class="font-normal">
+ {$formInputs.trivyPreserveCacheOnVolumePrune.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
</div>
- </div>
+ </SettingsRow>
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_trivy_resource_limits_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_trivy_resource_limits_description()}</p>
- <p class="text-muted-foreground mt-2 text-xs">{m.security_trivy_resource_limits_note()}</p>
+ <SettingsRow
+ label={m.security_trivy_resource_limits_label()}
+ description={m.security_trivy_resource_limits_description()}
+ helpText={m.security_trivy_resource_limits_note()}
+ contentClass="space-y-4"
+ >
+ <div class="flex items-center gap-2">
+ <Switch
+ id="trivyResourceLimitsEnabledSwitch"
+ bind:checked={$formInputs.trivyResourceLimitsEnabled.value}
+ onCheckedChange={handleTrivyResourceLimitsChange}
+ />
+ <Label for="trivyResourceLimitsEnabledSwitch" class="font-normal">
+ {$formInputs.trivyResourceLimitsEnabled.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
</div>
- <div class="space-y-4">
- <div class="flex items-center gap-2">
- <Switch
- id="trivyResourceLimitsEnabledSwitch"
- bind:checked={$formInputs.trivyResourceLimitsEnabled.value}
- onCheckedChange={handleTrivyResourceLimitsChange}
- />
- <Label for="trivyResourceLimitsEnabledSwitch" class="font-normal">
- {$formInputs.trivyResourceLimitsEnabled.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- <div class="grid gap-4 sm:grid-cols-2">
- <TextInputWithLabel
- bind:value={$formInputs.trivyCpuLimit.value}
- error={$formInputs.trivyCpuLimit.error}
- disabled={!$formInputs.trivyResourceLimitsEnabled.value}
- label={m.security_trivy_cpu_limit_label()}
- helpText={m.security_trivy_cpu_limit_help()}
- type="number"
- />
- <TextInputWithLabel
- bind:value={$formInputs.trivyMemoryLimitMb.value}
- error={$formInputs.trivyMemoryLimitMb.error}
- disabled={!$formInputs.trivyResourceLimitsEnabled.value}
- label={m.security_trivy_memory_limit_label()}
- reserveHelpTextSpace={true}
- type="number"
- />
- </div>
- <div class="max-w-xs pt-2">
- <TextInputWithLabel
- bind:value={$formInputs.trivyConcurrentScanContainers.value}
- error={$formInputs.trivyConcurrentScanContainers.error}
- label={m.security_trivy_concurrent_scan_containers_label()}
- helpText={m.security_trivy_concurrent_scan_containers_help()}
- type="number"
- />
- </div>
+ <div class="grid gap-4 sm:grid-cols-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyCpuLimit.value}
+ error={$formInputs.trivyCpuLimit.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_cpu_limit_label()}
+ helpText={m.security_trivy_cpu_limit_help()}
+ type="number"
+ />
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyMemoryLimitMb.value}
+ error={$formInputs.trivyMemoryLimitMb.error}
+ disabled={!$formInputs.trivyResourceLimitsEnabled.value}
+ label={m.security_trivy_memory_limit_label()}
+ reserveHelpTextSpace={true}
+ type="number"
+ />
</div>
- </div>
+ <div class="max-w-xs pt-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyConcurrentScanContainers.value}
+ error={$formInputs.trivyConcurrentScanContainers.error}
+ label={m.security_trivy_concurrent_scan_containers_label()}
+ helpText={m.security_trivy_concurrent_scan_containers_help()}
+ type="number"
+ />
+ </div>
+ </SettingsRow>
</Card.Content>
</Card.Root>
diff --git a/frontend/src/lib/components/ui/data-table/data-table.svelte.ts b/frontend/src/lib/components/ui/data-table/data-table.svelte.ts
index e2ed26bd2..5a5479b32 100644
--- a/frontend/src/lib/components/ui/data-table/data-table.svelte.ts
+++ b/frontend/src/lib/components/ui/data-table/data-table.svelte.ts
@@ -77,7 +77,7 @@ type Intersection<T extends readonly unknown[]> = (T extends [infer H, ...infer
* Proxy-based to avoid known WebKit recursion issue.
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function mergeObjects<Sources extends readonly MaybeThunk<any>[]>(
+function mergeObjects<Sources extends readonly MaybeThunk<any>[]>(
...sources: Sources
): Intersection<{ [K in keyof Sources]: Sources[K] }> {
const resolve = <T extends object>(src: MaybeThunk<T>): T | undefined =>
diff --git a/frontend/src/lib/components/ui/sidebar/constants.ts b/frontend/src/lib/components/ui/sidebar/constants.ts
index 8911acb70..7fa383a26 100644
--- a/frontend/src/lib/components/ui/sidebar/constants.ts
+++ b/frontend/src/lib/components/ui/sidebar/constants.ts
@@ -1,6 +1,5 @@
export const SIDEBAR_COOKIE_NAME = 'sidebar:state';
export const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
export const SIDEBAR_WIDTH = '17rem';
-export const SIDEBAR_WIDTH_MOBILE = '18rem';
export const SIDEBAR_WIDTH_ICON = '3rem';
export const SIDEBAR_KEYBOARD_SHORTCUT = 'b';
diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.ts
index 5a3efca8f..2f1963bd1 100644
--- a/frontend/src/lib/icons/index.ts
+++ b/frontend/src/lib/icons/index.ts
@@ -26,17 +26,15 @@ export { default as ArrowDownIcon } from 'virtual:icons/ic/baseline-keyboard-arr
export { default as ArrowUpIcon } from 'virtual:icons/ic/baseline-keyboard-arrow-up';
export { default as ArrowLeftIcon } from 'virtual:icons/ic/baseline-keyboard-arrow-left';
export { default as ArrowRightIcon } from 'virtual:icons/ic/baseline-keyboard-arrow-right';
-export { default as DoubleArrowDownIcon } from 'virtual:icons/ic/baseline-keyboard-double-arrow-down';
-export { default as DoubleArrowUpIcon } from 'virtual:icons/ic/baseline-keyboard-double-arrow-up';
export { default as DoubleArrowLeftIcon } from 'virtual:icons/ic/baseline-keyboard-double-arrow-left';
export { default as DoubleArrowRightIcon } from 'virtual:icons/ic/baseline-keyboard-double-arrow-right';
export { default as ArrowsUpDownIcon } from 'virtual:icons/flowbite/chevron-sort-outline';
export { default as EyeOffIcon } from 'virtual:icons/fluent/eye-hide-20-filled';
export { default as EyeOnIcon } from 'virtual:icons/fluent/eye-20-filled';
export { default as FolderXIcon } from 'virtual:icons/solar/folder-error-linear';
-export { default as ViewOptionsIcon } from 'virtual:icons/tabler/filter-2-cog';
export { default as ResetIcon } from 'virtual:icons/fluent/arrow-reset-32-filled';
export { default as CheckIcon } from 'virtual:icons/material-symbols/fitbit-check-small';
+/** @lintignore Knip misses this Svelte component import. */
export { default as FilterIcon } from 'virtual:icons/fluent/filter-32-filled';
export { default as LoadingSpinnerIcon } from 'virtual:icons/svg-spinners/ring-resize';
export { default as AddIcon } from 'virtual:icons/ic/outline-add-circle';
@@ -74,7 +72,6 @@ export { default as CircleArrowUpIcon } from 'virtual:icons/solar/round-alt-arro
export { default as BoxIcon } from 'virtual:icons/solar/box-minimalistic-linear';
export { default as StartIcon } from 'virtual:icons/solar/play-linear';
export { default as StopIcon } from 'virtual:icons/solar/stop-bold';
-export { default as SmartphoneIcon } from 'virtual:icons/solar/smartphone-linear';
export { default as MonitorSpeakerIcon } from 'virtual:icons/lucide/monitor-speaker';
export { default as DockIcon } from 'virtual:icons/lucide/dock';
export { default as EditIcon } from 'virtual:icons/solar/pen-linear';
@@ -100,11 +97,10 @@ export { default as LocalFolderComputerIcon } from 'virtual:icons/streamline/loc
export { default as MinusIcon } from 'virtual:icons/solar/minus-circle-linear';
export { default as SendEmailIcon } from 'virtual:icons/solar/plain-2-linear';
export { default as VolumeUnusedIcon } from 'virtual:icons/clarity/hard-disk-solid-alerted';
-export { default as VolumeUsedIcon } from 'virtual:icons/clarity/hard-disk-solid-badged';
export { default as OpenIdIcon } from 'virtual:icons/simple-icons/openid';
+/** @lintignore Knip misses this Svelte component import. */
export { default as LoginIcon } from 'virtual:icons/solar/login-3-linear';
export { default as GitBranchIcon } from 'virtual:icons/tabler/git-branch';
-export { default as AutomationIcon } from 'virtual:icons/tabler/automation';
export { default as JobsIcon } from 'virtual:icons/solar/alarm-linear';
export { default as UploadIcon } from 'virtual:icons/solar/upload-minimalistic-linear';
export { default as RedeployIcon } from 'virtual:icons/solar/refresh-circle-linear';
diff --git a/frontend/src/lib/services/env-mgmt-service.ts b/frontend/src/lib/services/env-mgmt-service.ts
index ad64ed192..701e38d0d 100644
--- a/frontend/src/lib/services/env-mgmt-service.ts
+++ b/frontend/src/lib/services/env-mgmt-service.ts
@@ -1,5 +1,5 @@
import BaseAPIService from './api-service';
-import type { Environment } from '$lib/types/environment.type';
+import type { DeploymentSnippets, Environment } from '$lib/types/environment.type';
import type { CreateEnvironmentDTO, UpdateEnvironmentDTO } from '$lib/types/environment.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { AppVersionInformation } from '$lib/types/application-configuration';
@@ -40,9 +40,9 @@ export default class EnvironmentManagementService extends BaseAPIService {
await this.api.post(`/environments/${environmentId}/sync`);
}
- async getDeploymentSnippets(environmentId: string): Promise<{ dockerRun: string; dockerCompose: string }> {
+ async getDeploymentSnippets(environmentId: string): Promise<DeploymentSnippets> {
const res = await this.api.get(`/environments/${environmentId}/deployment`);
- return res.data.data as { dockerRun: string; dockerCompose: string };
+ return res.data.data as DeploymentSnippets;
}
async getVersion(environmentId: string): Promise<AppVersionInformation> {
diff --git a/frontend/src/lib/services/vulnerability-service.ts b/frontend/src/lib/services/vulnerability-service.ts
index 7eeedef80..bc690ddcb 100644
--- a/frontend/src/lib/services/vulnerability-service.ts
+++ b/frontend/src/lib/services/vulnerability-service.ts
@@ -3,6 +3,7 @@ import { environmentStore } from '$lib/stores/environment.store.svelte';
import type {
VulnerabilityScanResult,
VulnerabilityScanSummary,
+ ScanSummariesRequest,
ScanSummariesResponse,
ScannerStatus,
Vulnerability,
@@ -58,11 +59,8 @@ export class VulnerabilityService extends BaseAPIService {
*/
async getScanSummaries(imageIds: string[]): Promise<ScanSummariesResponse> {
const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(
- this.api.post(`/environments/${envId}/images/vulnerabilities/summaries`, {
- imageIds
- })
- );
+ const payload: ScanSummariesRequest = { imageIds };
+ return this.handleResponse(this.api.post(`/environments/${envId}/images/vulnerabilities/summaries`, payload));
}
/**
diff --git a/frontend/src/lib/types/notification-providers.ts b/frontend/src/lib/types/notification-providers.ts
index 6847bed2a..974f2b7f8 100644
--- a/frontend/src/lib/types/notification-providers.ts
+++ b/frontend/src/lib/types/notification-providers.ts
@@ -130,19 +130,6 @@ export interface AppriseFormValues {
containerUpdateTag: string;
}
-// Union type for all provider form values
-export type ProviderFormValues =
- | DiscordFormValues
- | EmailFormValues
- | TelegramFormValues
- | SignalFormValues
- | SlackFormValues
- | NtfyFormValues
- | PushoverFormValues
- | GotifyFormValues
- | MatrixFormValues
- | GenericFormValues;
-
// Map provider keys to their form value types
export type ProviderFormValuesMap = {
discord: DiscordFormValues;
@@ -157,15 +144,6 @@ export type ProviderFormValuesMap = {
generic: GenericFormValues;
};
-// Provider state with current values and saved baseline
-export interface ProviderState<T> {
- current: T;
- baseline: T;
- hasChanges: boolean;
- isValid: boolean;
- errors: Partial<Record<keyof T, string>>;
-}
-
type ProviderConfig = Record<string, unknown>;
type ProviderEvents = Partial<
Record<'image_update' | 'container_update' | 'vulnerability_found' | 'prune_report' | 'auto_heal', boolean>
diff --git a/frontend/src/lib/types/project.type.ts b/frontend/src/lib/types/project.type.ts
index 24685b2af..ef53c1a02 100644
--- a/frontend/src/lib/types/project.type.ts
+++ b/frontend/src/lib/types/project.type.ts
@@ -1,14 +1,3 @@
-export interface NetworkSettings {
- Networks: Record<
- string,
- {
- IPAddress?: string;
- Driver?: string;
- [key: string]: any;
- }
- >;
-}
-
export interface ServicePort {
mode?: string;
target: number;
diff --git a/frontend/src/lib/utils/settings-form.util.ts b/frontend/src/lib/utils/settings-form.util.ts
index 336910ee5..9cf9dd902 100644
--- a/frontend/src/lib/utils/settings-form.util.ts
+++ b/frontend/src/lib/utils/settings-form.util.ts
@@ -4,8 +4,6 @@ import { UseSettingsForm } from '$lib/hooks/use-settings-form.svelte';
import { toast } from 'svelte-sonner';
import type { Settings } from '$lib/types/settings.type';
-export type FormInput<T> = { value: T; error: string | null };
-export type FormInputs<T> = { [K in keyof T]: FormInput<T[K]> };
type SettingsPayload = Partial<Settings> & Record<string, unknown>;
export interface SettingsFormConfig<T extends z.ZodType<SettingsPayload, any>> {
diff --git a/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte b/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
index 4feb83880..b70b4cd59 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
@@ -3,6 +3,7 @@
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/container.type';
import { SettingsIcon, TagIcon } from '$lib/icons';
+ import { KeyValueCard, KeyValueGrid } from '$lib/components/resource-detail';
interface Props {
container: ContainerDetailsDto;
@@ -28,37 +29,23 @@
</Card.Header>
<Card.Content class="p-4">
{#if container.config?.env && container.config.env.length > 0}
- <div class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
+ <KeyValueGrid>
{#each container.config.env as env, index (index)}
{#if env.includes('=')}
{@const [key, ...valueParts] = env.split('=')}
{@const value = valueParts.join('=')}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide break-all uppercase">{key}</div>
- <div
- class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all"
- title="Click to select"
- >
- {value}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard label={key} valueTitle={m.common_click_to_select()}>{value}</KeyValueCard>
{:else}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">ENV_VAR</div>
- <div
- class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all"
- title="Click to select"
- >
- {env}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard
+ label={m.swarm_service_env_var()}
+ labelClass="text-muted-foreground text-xs font-semibold tracking-wide uppercase"
+ valueTitle={m.common_click_to_select()}
+ >
+ {env}
+ </KeyValueCard>
{/if}
{/each}
- </div>
+ </KeyValueGrid>
{:else}
<div class="text-muted-foreground rounded-lg border border-dashed py-8 text-center">
<div class="text-sm">{m.containers_no_env_vars()}</div>
@@ -82,21 +69,11 @@
</Card.Header>
<Card.Content class="p-4">
{#if container.labels && Object.keys(container.labels).length > 0}
- <div class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
+ <KeyValueGrid>
{#each Object.entries(container.labels) as [key, value] (key)}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide break-all uppercase">{key}</div>
- <div
- class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all"
- title="Click to select"
- >
- {value?.toString() || ''}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard label={key} valueTitle={m.common_click_to_select()}>{value?.toString() || ''}</KeyValueCard>
{/each}
- </div>
+ </KeyValueGrid>
{:else}
<div class="text-muted-foreground rounded-lg border border-dashed py-8 text-center">
<div class="text-sm">{m.containers_no_labels_defined()}</div>
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
index 2b6063bf8..869cf6037 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
@@ -14,6 +14,7 @@
import { createForm } from '$lib/utils/form.utils';
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
+ import { ComposeEditorSplit } from '$lib/components/compose';
import { z } from 'zod/v4';
import {
TrashIcon,
@@ -301,79 +302,87 @@
{#if !template.isRemote}
<!-- Edit layout: compose editor + env editor side by side -->
- <div class="flex min-h-0 flex-1 flex-col gap-6 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch">
- <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-3">
- <Card.Header icon={CodeIcon} class="shrink-0">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>
- <h2>{m.templates_compose_template_label()}</h2>
- </Card.Title>
- <Card.Description>{m.templates_service_definitions()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
- <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
- <CodeEditor
- bind:value={$inputs.composeContent.value}
- language="yaml"
- readOnly={saving}
- fontSize="13px"
- bind:hasErrors={composeHasErrors}
- bind:validationReady={composeValidationReady}
- fileId="templates:custom:{template.id}:compose"
- originalValue={originalCompose}
- enableDiff={true}
- editorContext={{
- envContent: $inputs.envContent.value,
- composeContents: [$inputs.composeContent.value],
- globalVariables: globalVariableMap
- }}
- />
- </div>
- </Card.Content>
- {#if $inputs.composeContent.error}
- <Card.Footer class="pt-0">
- <p class="text-destructive text-xs font-medium">{$inputs.composeContent.error}</p>
- </Card.Footer>
- {/if}
- </Card.Root>
+ <ComposeEditorSplit
+ class="flex min-h-0 flex-1 flex-col gap-6 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch"
+ composeClass="contents"
+ envClass="contents"
+ >
+ {#snippet compose()}
+ <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-3">
+ <Card.Header icon={CodeIcon} class="shrink-0">
+ <div class="flex flex-col space-y-1.5">
+ <Card.Title>
+ <h2>{m.templates_compose_template_label()}</h2>
+ </Card.Title>
+ <Card.Description>{m.templates_service_definitions()}</Card.Description>
+ </div>
+ </Card.Header>
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.composeContent.value}
+ language="yaml"
+ readOnly={saving}
+ fontSize="13px"
+ bind:hasErrors={composeHasErrors}
+ bind:validationReady={composeValidationReady}
+ fileId="templates:custom:{template.id}:compose"
+ originalValue={originalCompose}
+ enableDiff={true}
+ editorContext={{
+ envContent: $inputs.envContent.value,
+ composeContents: [$inputs.composeContent.value],
+ globalVariables: globalVariableMap
+ }}
+ />
+ </div>
+ </Card.Content>
+ {#if $inputs.composeContent.error}
+ <Card.Footer class="pt-0">
+ <p class="text-destructive text-xs font-medium">{$inputs.composeContent.error}</p>
+ </Card.Footer>
+ {/if}
+ </Card.Root>
+ {/snippet}
- <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-2">
- <Card.Header icon={VariableIcon} class="shrink-0">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>
- <h2>{m.templates_env_template_label()}</h2>
- </Card.Title>
- <Card.Description>{m.templates_default_config_values()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
- <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
- <CodeEditor
- bind:value={$inputs.envContent.value}
- language="env"
- readOnly={saving}
- fontSize="13px"
- bind:hasErrors={envHasErrors}
- bind:validationReady={envValidationReady}
- fileId="templates:custom:{template.id}:env"
- originalValue={originalEnv}
- enableDiff={true}
- editorContext={{
- envContent: $inputs.envContent.value,
- composeContents: [$inputs.composeContent.value],
- globalVariables: globalVariableMap
- }}
- />
- </div>
- </Card.Content>
- {#if $inputs.envContent.error}
- <Card.Footer class="pt-0">
- <p class="text-destructive text-xs font-medium">{$inputs.envContent.error}</p>
- </Card.Footer>
- {/if}
- </Card.Root>
- </div>
+ {#snippet env()}
+ <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-2">
+ <Card.Header icon={VariableIcon} class="shrink-0">
+ <div class="flex flex-col space-y-1.5">
+ <Card.Title>
+ <h2>{m.templates_env_template_label()}</h2>
+ </Card.Title>
+ <Card.Description>{m.templates_default_config_values()}</Card.Description>
+ </div>
+ </Card.Header>
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.envContent.value}
+ language="env"
+ readOnly={saving}
+ fontSize="13px"
+ bind:hasErrors={envHasErrors}
+ bind:validationReady={envValidationReady}
+ fileId="templates:custom:{template.id}:env"
+ originalValue={originalEnv}
+ enableDiff={true}
+ editorContext={{
+ envContent: $inputs.envContent.value,
+ composeContents: [$inputs.composeContent.value],
+ globalVariables: globalVariableMap
+ }}
+ />
+ </div>
+ </Card.Content>
+ {#if $inputs.envContent.error}
+ <Card.Footer class="pt-0">
+ <p class="text-destructive text-xs font-medium">{$inputs.envContent.error}</p>
+ </Card.Footer>
+ {/if}
+ </Card.Root>
+ {/snippet}
+ </ComposeEditorSplit>
{:else}
<!-- Read-only view for remote templates -->
<div class="grid flex-shrink-0 gap-4 sm:grid-cols-2">
diff --git a/frontend/src/routes/(app)/customize/templates/create/+page.svelte b/frontend/src/routes/(app)/customize/templates/create/+page.svelte
index 9d8e4a7e4..69f44a74f 100644
--- a/frontend/src/routes/(app)/customize/templates/create/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/create/+page.svelte
@@ -12,6 +12,7 @@
import { z } from 'zod/v4';
import CodePanel from '../../../projects/components/CodePanel.svelte';
import EditableName from '../../../projects/components/EditableName.svelte';
+ import { ComposeEditorSplit } from '$lib/components/compose';
let { data } = $props();
@@ -144,8 +145,8 @@
</div>
</div>
- <div class="flex min-h-0 flex-1 flex-col gap-4 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch">
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-3">
+ <ComposeEditorSplit>
+ {#snippet compose()}
<CodePanel
title="compose.yaml"
language="yaml"
@@ -161,9 +162,9 @@
globalVariables: globalVariableMap
}}
/>
- </div>
+ {/snippet}
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-2">
+ {#snippet env()}
<CodePanel
title=".env"
language="env"
@@ -179,8 +180,8 @@
globalVariables: globalVariableMap
}}
/>
- </div>
- </div>
+ {/snippet}
+ </ComposeEditorSplit>
</form>
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.svelte b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
index d4493657c..88c96598f 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
@@ -11,6 +11,7 @@
import { z } from 'zod/v4';
import { goto } from '$app/navigation';
import TemplateSelectionDialog from '$lib/components/dialogs/template-selection-dialog.svelte';
+ import { ComposeEditorSplit } from '$lib/components/compose';
import { untrack } from 'svelte';
import type { Template } from '$lib/types/template.type';
import { ArrowLeftIcon, CodeIcon, VariableIcon, SaveIcon } from '$lib/icons';
@@ -137,83 +138,91 @@
</div>
</div>
- <div class="flex min-h-0 flex-1 flex-col gap-6 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch">
- <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-3">
- <Card.Header icon={CodeIcon} class="shrink-0">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>
- <h2>{m.templates_compose_template_label()}</h2>
- </Card.Title>
- <Card.Description>{m.templates_service_definitions()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
- <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
- <CodeEditor
- bind:value={$inputs.composeContent.value}
- language="yaml"
- readOnly={saving || isLoadingTemplate}
- fontSize="13px"
- bind:hasErrors={composeHasErrors}
- bind:validationReady={composeValidationReady}
- fileId="templates:defaults:compose"
- originalValue={originalComposeContent}
- enableDiff={true}
- editorContext={{
- envContent: $inputs.envContent.value,
- composeContents: [$inputs.composeContent.value],
- globalVariables: globalVariableMap
- }}
- />
- </div>
- </Card.Content>
- {#if $inputs.composeContent.error}
- <Card.Footer class="pt-0">
- <p class="text-destructive text-xs font-medium">
- {$inputs.composeContent.error}
- </p>
- </Card.Footer>
- {/if}
- </Card.Root>
-
- <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-2">
- <Card.Header icon={VariableIcon} class="shrink-0">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>
- <h2>{m.templates_env_template_label()}</h2>
- </Card.Title>
- <Card.Description>{m.templates_default_config_values()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
- <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
- <CodeEditor
- bind:value={$inputs.envContent.value}
- language="env"
- readOnly={saving || isLoadingTemplate}
- fontSize="13px"
- bind:hasErrors={envHasErrors}
- bind:validationReady={envValidationReady}
- fileId="templates:defaults:env"
- originalValue={originalEnvContent}
- enableDiff={true}
- editorContext={{
- envContent: $inputs.envContent.value,
- composeContents: [$inputs.composeContent.value],
- globalVariables: globalVariableMap
- }}
- />
- </div>
- </Card.Content>
- {#if $inputs.envContent.error}
- <Card.Footer class="pt-0">
- <p class="text-destructive text-xs font-medium">
- {$inputs.envContent.error}
- </p>
- </Card.Footer>
- {/if}
- </Card.Root>
- </div>
+ <ComposeEditorSplit
+ class="flex min-h-0 flex-1 flex-col gap-6 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch"
+ composeClass="contents"
+ envClass="contents"
+ >
+ {#snippet compose()}
+ <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-3">
+ <Card.Header icon={CodeIcon} class="shrink-0">
+ <div class="flex flex-col space-y-1.5">
+ <Card.Title>
+ <h2>{m.templates_compose_template_label()}</h2>
+ </Card.Title>
+ <Card.Description>{m.templates_service_definitions()}</Card.Description>
+ </div>
+ </Card.Header>
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.composeContent.value}
+ language="yaml"
+ readOnly={saving || isLoadingTemplate}
+ fontSize="13px"
+ bind:hasErrors={composeHasErrors}
+ bind:validationReady={composeValidationReady}
+ fileId="templates:defaults:compose"
+ originalValue={originalComposeContent}
+ enableDiff={true}
+ editorContext={{
+ envContent: $inputs.envContent.value,
+ composeContents: [$inputs.composeContent.value],
+ globalVariables: globalVariableMap
+ }}
+ />
+ </div>
+ </Card.Content>
+ {#if $inputs.composeContent.error}
+ <Card.Footer class="pt-0">
+ <p class="text-destructive text-xs font-medium">
+ {$inputs.composeContent.error}
+ </p>
+ </Card.Footer>
+ {/if}
+ </Card.Root>
+ {/snippet}
+
+ {#snippet env()}
+ <Card.Root class="flex min-h-0 min-w-0 flex-1 flex-col lg:col-span-2">
+ <Card.Header icon={VariableIcon} class="shrink-0">
+ <div class="flex flex-col space-y-1.5">
+ <Card.Title>
+ <h2>{m.templates_env_template_label()}</h2>
+ </Card.Title>
+ <Card.Description>{m.templates_default_config_values()}</Card.Description>
+ </div>
+ </Card.Header>
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.envContent.value}
+ language="env"
+ readOnly={saving || isLoadingTemplate}
+ fontSize="13px"
+ bind:hasErrors={envHasErrors}
+ bind:validationReady={envValidationReady}
+ fileId="templates:defaults:env"
+ originalValue={originalEnvContent}
+ enableDiff={true}
+ editorContext={{
+ envContent: $inputs.envContent.value,
+ composeContents: [$inputs.composeContent.value],
+ globalVariables: globalVariableMap
+ }}
+ />
+ </div>
+ </Card.Content>
+ {#if $inputs.envContent.error}
+ <Card.Footer class="pt-0">
+ <p class="text-destructive text-xs font-medium">
+ {$inputs.envContent.error}
+ </p>
+ </Card.Footer>
+ {/if}
+ </Card.Root>
+ {/snippet}
+ </ComposeEditorSplit>
</div>
<TemplateSelectionDialog bind:open={showTemplateDialog} templates={data.templates || []} onSelect={handleTemplateSelect} />
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index 93335a71a..00a3bf4db 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -25,6 +25,7 @@
import CodePanel from '../components/CodePanel.svelte';
import EditableName from '../components/EditableName.svelte';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { ComposeEditorSplit } from '$lib/components/compose';
let { data } = $props();
@@ -323,11 +324,8 @@
/>
</div>
- <form
- class="flex min-h-0 flex-1 flex-col gap-4 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch"
- onsubmit={preventDefault(handleSubmit)}
- >
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-3">
+ <ComposeEditorSplit onsubmit={preventDefault(handleSubmit)}>
+ {#snippet compose()}
<CodePanel
bind:open={composeOpen}
title={m.compose_compose_file_title()}
@@ -343,9 +341,9 @@
globalVariables: globalVariableMap
}}
/>
- </div>
+ {/snippet}
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-2">
+ {#snippet env()}
<CodePanel
bind:open={envOpen}
title={m.compose_env_title()}
@@ -361,8 +359,8 @@
globalVariables: globalVariableMap
}}
/>
- </div>
- </form>
+ {/snippet}
+ </ComposeEditorSplit>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelte
index 1abb14797..de52fd468 100644
--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte
+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte
@@ -11,6 +11,7 @@
import { createSettingsForm } from '$lib/utils/settings-form.util';
import { Separator } from '$lib/components/ui/separator';
import { Label } from '$lib/components/ui/label';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import LocalePicker from '$lib/components/locale-picker.svelte';
import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
import ApplicationThemePicker from '$lib/components/application-theme/application-theme-picker.svelte';
@@ -147,124 +148,98 @@
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
<!-- Application Theme -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.application_theme()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.application_theme_description()}</p>
- </div>
- <div>
- <ApplicationThemePicker
- bind:selectedTheme={$formInputs.applicationTheme.value}
- accentColor={$formInputs.accentColor.value}
- disabled={isReadOnly}
- />
- </div>
- </div>
+ <SettingsRow label={m.application_theme()} description={m.application_theme_description()}>
+ <ApplicationThemePicker
+ bind:selectedTheme={$formInputs.applicationTheme.value}
+ accentColor={$formInputs.accentColor.value}
+ disabled={isReadOnly}
+ />
+ </SettingsRow>
<Separator />
<!-- Accent Color -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.accent_color()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.accent_color_description()}</p>
- </div>
- <div>
- <AccentColorPicker
- previousColor={currentSettings.accentColor}
- bind:selectedColor={$formInputs.accentColor.value}
- disabled={isReadOnly}
- />
- </div>
- </div>
+ <SettingsRow label={m.accent_color()} description={m.accent_color_description()}>
+ <AccentColorPicker
+ previousColor={currentSettings.accentColor}
+ bind:selectedColor={$formInputs.accentColor.value}
+ disabled={isReadOnly}
+ />
+ </SettingsRow>
<!-- User Avatars -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.general_user_avatars_heading()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.general_user_avatars_description()}</p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="enableGravatar"
- bind:checked={$formInputs.enableGravatar.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.enableGravatar.value = checked;
- }}
- />
- <Label for="enableGravatar" class="font-normal">
- {m.general_enable_gravatar_label()}
- </Label>
- </div>
- </div>
+ <SettingsRow
+ label={m.general_user_avatars_heading()}
+ description={m.general_user_avatars_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <Switch
+ id="enableGravatar"
+ bind:checked={$formInputs.enableGravatar.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.enableGravatar.value = checked;
+ }}
+ />
+ <Label for="enableGravatar" class="font-normal">
+ {m.general_enable_gravatar_label()}
+ </Label>
+ </SettingsRow>
<Separator />
<!-- Language -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.language()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.appearance_language_current_user_description()}
- </p>
- </div>
- <div class="flex items-center gap-2">
- <LocalePicker
- inline={true}
- id="appearanceLocalePicker"
- class="border-border/30 text-foreground h-9 w-32 text-sm font-medium"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.language()}
+ description={m.appearance_language_current_user_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <LocalePicker
+ inline={true}
+ id="appearanceLocalePicker"
+ class="border-border/30 text-foreground h-9 w-32 text-sm font-medium"
+ />
+ </SettingsRow>
<Separator />
<!-- Theme -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.common_toggle_theme()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.appearance_theme_current_user_description()}
- </p>
- </div>
- <div class="flex items-center gap-2">
- <ArcaneButton action="base" tone="outline" class="h-9 min-w-40 justify-start gap-2" onclick={toggleMode}>
- {#if isDarkMode}
- <SunIcon class="size-4" />
- {:else}
- <MoonIcon class="size-4" />
- {/if}
- <span>{isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}</span>
- </ArcaneButton>
- </div>
- </div>
+ <SettingsRow
+ label={m.common_toggle_theme()}
+ description={m.appearance_theme_current_user_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <ArcaneButton action="base" tone="outline" class="h-9 min-w-40 justify-start gap-2" onclick={toggleMode}>
+ {#if isDarkMode}
+ <SunIcon class="size-4" />
+ {:else}
+ <MoonIcon class="size-4" />
+ {/if}
+ <span>{isDarkMode ? m.sidebar_dark_mode() : m.sidebar_light_mode()}</span>
+ </ArcaneButton>
+ </SettingsRow>
<Separator />
<!-- OLED Mode -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.oled_mode()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.oled_mode_description()}</p>
+ <SettingsRow label={m.oled_mode()} description={m.oled_mode_description()} contentClass="flex items-center gap-2">
+ {#snippet helpText()}
{#if !isDefaultApplicationTheme}
<p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_default_theme()}</p>
{:else if !isDarkMode}
<p class="text-muted-foreground/70 mt-1 text-xs italic">{m.oled_mode_requires_dark()}</p>
{/if}
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="oledMode"
- checked={$formInputs.oledMode.value}
- disabled={isReadOnly || !isDefaultApplicationTheme}
- onCheckedChange={handleOledModeChange}
- />
- <Label for="oledMode" class="font-normal">
- {$formInputs.oledMode.value ? m.oled_mode_enabled() : m.oled_mode_disabled()}
- </Label>
- </div>
- </div>
+ {/snippet}
+ <Switch
+ id="oledMode"
+ checked={$formInputs.oledMode.value}
+ disabled={isReadOnly || !isDefaultApplicationTheme}
+ onCheckedChange={handleOledModeChange}
+ />
+ <Label for="oledMode" class="font-normal">
+ {$formInputs.oledMode.value ? m.oled_mode_enabled() : m.oled_mode_disabled()}
+ </Label>
+ </SettingsRow>
</div>
</div>
</div>
@@ -274,55 +249,51 @@
<h3 class="text-lg font-medium">{m.navigation_desktop_sidebar_title()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.navigation_sidebar_hover_expansion_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.navigation_sidebar_hover_expansion_description()}</p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="sidebarHoverExpansion"
- checked={$formInputs.sidebarHoverExpansion.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.sidebarHoverExpansion.value = checked;
- if (sidebar) {
- sidebar.setHoverExpansion(checked);
- }
- }}
- />
- <Label for="sidebarHoverExpansion" class="font-normal">
- {$formInputs.sidebarHoverExpansion.value
- ? m.navigation_sidebar_hover_expansion_enabled()
- : m.navigation_sidebar_hover_expansion_disabled()}
- </Label>
- </div>
- </div>
+ <SettingsRow
+ label={m.navigation_sidebar_hover_expansion_label()}
+ description={m.navigation_sidebar_hover_expansion_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <Switch
+ id="sidebarHoverExpansion"
+ checked={$formInputs.sidebarHoverExpansion.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.sidebarHoverExpansion.value = checked;
+ if (sidebar) {
+ sidebar.setHoverExpansion(checked);
+ }
+ }}
+ />
+ <Label for="sidebarHoverExpansion" class="font-normal">
+ {$formInputs.sidebarHoverExpansion.value
+ ? m.navigation_sidebar_hover_expansion_enabled()
+ : m.navigation_sidebar_hover_expansion_disabled()}
+ </Label>
+ </SettingsRow>
<Separator />
<!-- Keyboard Shortcuts -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.navigation_keyboard_shortcuts_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.navigation_keyboard_shortcuts_description()}</p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="keyboardShortcutsEnabled"
- checked={$formInputs.keyboardShortcutsEnabled.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.keyboardShortcutsEnabled.value = checked;
- }}
- />
- <Label for="keyboardShortcutsEnabled" class="font-normal">
- {$formInputs.keyboardShortcutsEnabled.value
- ? m.navigation_keyboard_shortcuts_enabled()
- : m.navigation_keyboard_shortcuts_disabled()}
- </Label>
- </div>
- </div>
+ <SettingsRow
+ label={m.navigation_keyboard_shortcuts_label()}
+ description={m.navigation_keyboard_shortcuts_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <Switch
+ id="keyboardShortcutsEnabled"
+ checked={$formInputs.keyboardShortcutsEnabled.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.keyboardShortcutsEnabled.value = checked;
+ }}
+ />
+ <Label for="keyboardShortcutsEnabled" class="font-normal">
+ {$formInputs.keyboardShortcutsEnabled.value
+ ? m.navigation_keyboard_shortcuts_enabled()
+ : m.navigation_keyboard_shortcuts_disabled()}
+ </Label>
+ </SettingsRow>
</div>
</div>
</div>
@@ -333,66 +304,58 @@
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
<!-- Navigation Mode -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.navigation_mode_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.navigation_mode_description()}</p>
- </div>
- <div class="space-y-3">
- <SwitchWithLabel
- id="mode-scope-toggle"
- checked={modeIsLocal}
- label={modeIsLocal ? m.this_device() : m.server_default()}
- onCheckedChange={handleModeScopeChange}
- disabled={isReadOnly && !modeIsLocal}
+ <SettingsRow label={m.navigation_mode_label()} description={m.navigation_mode_description()} contentClass="space-y-3">
+ <SwitchWithLabel
+ id="mode-scope-toggle"
+ checked={modeIsLocal}
+ label={modeIsLocal ? m.this_device() : m.server_default()}
+ onCheckedChange={handleModeScopeChange}
+ disabled={isReadOnly && !modeIsLocal}
+ />
+
+ <div class="grid grid-cols-2 gap-2">
+ <ArcaneButton
+ action="base"
+ tone={modeDisplayValue === 'floating' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full"
+ onclick={() => handleModeSelect('floating')}
+ icon={MonitorSpeakerIcon}
+ customLabel={m.navigation_mode_floating()}
+ />
+ <ArcaneButton
+ action="base"
+ tone={modeDisplayValue === 'docked' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full"
+ onclick={() => handleModeSelect('docked')}
+ icon={DockIcon}
+ customLabel={m.navigation_mode_docked()}
/>
-
- <div class="grid grid-cols-2 gap-2">
- <ArcaneButton
- action="base"
- tone={modeDisplayValue === 'floating' ? 'outline-primary' : 'outline'}
- class="h-12 w-full"
- onclick={() => handleModeSelect('floating')}
- icon={MonitorSpeakerIcon}
- customLabel={m.navigation_mode_floating()}
- />
- <ArcaneButton
- action="base"
- tone={modeDisplayValue === 'docked' ? 'outline-primary' : 'outline'}
- class="h-12 w-full"
- onclick={() => handleModeSelect('docked')}
- icon={DockIcon}
- customLabel={m.navigation_mode_docked()}
- />
- </div>
</div>
- </div>
+ </SettingsRow>
<Separator />
<!-- Show Labels -->
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.navigation_show_labels_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.navigation_show_labels_description()}</p>
- </div>
- <div class="space-y-3">
- <SwitchWithLabel
- id="labels-scope-toggle"
- checked={labelsIsLocal}
- label={labelsIsLocal ? m.this_device() : m.server_default()}
- onCheckedChange={handleLabelsScopeChange}
- disabled={isReadOnly && !labelsIsLocal}
- />
-
- <div class="flex items-center gap-3">
- <Switch id="mobileNavigationShowLabels" checked={labelsDisplayValue} onCheckedChange={handleLabelsChange} />
- <span class="text-sm font-medium">
- {labelsDisplayValue ? m.on() : m.off()}
- </span>
- </div>
+ <SettingsRow
+ label={m.navigation_show_labels_label()}
+ description={m.navigation_show_labels_description()}
+ contentClass="space-y-3"
+ >
+ <SwitchWithLabel
+ id="labels-scope-toggle"
+ checked={labelsIsLocal}
+ label={labelsIsLocal ? m.this_device() : m.server_default()}
+ onCheckedChange={handleLabelsScopeChange}
+ disabled={isReadOnly && !labelsIsLocal}
+ />
+
+ <div class="flex items-center gap-3">
+ <Switch id="mobileNavigationShowLabels" checked={labelsDisplayValue} onCheckedChange={handleLabelsChange} />
+ <span class="text-sm font-medium">
+ {labelsDisplayValue ? m.on() : m.off()}
+ </span>
</div>
- </div>
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/authentication/+page.svelte b/frontend/src/routes/(app)/settings/authentication/+page.svelte
index 83bd49c9b..02fec932a 100644
--- a/frontend/src/routes/(app)/settings/authentication/+page.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/+page.svelte
@@ -18,6 +18,7 @@
import { CopyButton } from '$lib/components/ui/copy-button';
import { createSettingsForm } from '$lib/utils/settings-form.util';
import * as Alert from '$lib/components/ui/alert';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
let { data }: { data: PageData } = $props();
const currentSettings = $derived<Settings>($settingsStore || data.settings!);
@@ -246,29 +247,29 @@
{:else}
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_local_auth_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_local_auth_description()}</p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="localAuthSwitch"
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
- <Label for="localAuthSwitch" class="font-normal">
- {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
- </Label>
- </div>
- </div>
+ <SettingsRow
+ label={m.security_local_auth_label()}
+ description={m.security_local_auth_description()}
+ contentClass="flex items-center gap-2"
+ >
+ <Switch
+ id="localAuthSwitch"
+ bind:checked={$formInputs.authLocalEnabled.value}
+ onCheckedChange={handleLocalSwitchChange}
+ />
+ <Label for="localAuthSwitch" class="font-normal">
+ {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
+ </SettingsRow>
<Separator />
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_oidc_auth_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_oidc_auth_description()}</p>
+ <SettingsRow
+ label={m.security_oidc_auth_label()}
+ description={m.security_oidc_auth_description()}
+ contentClass="space-y-4"
+ >
+ {#snippet labelExtra()}
{#if isOidcEnvForced}
<div class="mt-2">
<ArcaneTooltip.Root>
@@ -293,222 +294,220 @@
</ArcaneTooltip.Root>
</div>
{/if}
+ {/snippet}
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcEnabledSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcEnabled.value}
+ onCheckedChange={handleOidcEnabledChange}
+ />
+ <Label for="oidcEnabledSwitch" class="font-normal">
+ {m.security_oidc_enabled_label()}
+ </Label>
</div>
- <div class="space-y-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcEnabledSwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcEnabled.value}
- onCheckedChange={handleOidcEnabledChange}
- />
- <Label for="oidcEnabledSwitch" class="font-normal">
- {m.security_oidc_enabled_label()}
- </Label>
- </div>
-
- {#if showOidcDetails}
- <div class="space-y-4 pt-2">
- <div class="space-y-2">
- <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
- <Input
- id="oidcClientId"
- type="text"
- placeholder={m.oidc_client_id_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcClientId.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcClientId.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientId.error}</p>
- {/if}
- </div>
- <div class="space-y-2">
- <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
- <Input
- id="oidcClientSecret"
- type="password"
- placeholder={m.oidc_client_secret_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcClientSecret.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
- {#if $formInputs.oidcClientSecret.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientSecret.error}</p>
- {/if}
- </div>
+ {#if showOidcDetails}
+ <div class="space-y-4 pt-2">
+ <div class="space-y-2">
+ <Label for="oidcClientId" class="text-sm font-medium">{m.oidc_client_id_label()}</Label>
+ <Input
+ id="oidcClientId"
+ type="text"
+ placeholder={m.oidc_client_id_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientId.value}
+ class="font-mono text-sm"
+ />
+ {#if $formInputs.oidcClientId.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientId.error}</p>
+ {/if}
+ </div>
- <div class="space-y-2">
- <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
- <Input
- id="oidcIssuerUrl"
- type="text"
- placeholder={m.oidc_issuer_url_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcIssuerUrl.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
- {#if $formInputs.oidcIssuerUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcIssuerUrl.error}</p>
- {/if}
- </div>
+ <div class="space-y-2">
+ <Label for="oidcClientSecret" class="text-sm font-medium">{m.oidc_client_secret_label()}</Label>
+ <Input
+ id="oidcClientSecret"
+ type="password"
+ placeholder={m.oidc_client_secret_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcClientSecret.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.security_oidc_client_secret_help()}</p>
+ {#if $formInputs.oidcClientSecret.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcClientSecret.error}</p>
+ {/if}
+ </div>
- <div class="space-y-2">
- <Label for="oidcProviderName" class="text-sm font-medium">{m.oidc_provider_name_label()}</Label>
- <Input
- id="oidcProviderName"
- type="text"
- placeholder={m.oidc_provider_name_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcProviderName.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_provider_name_description()}</p>
- {#if $formInputs.oidcProviderName.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderName.error}</p>
- {/if}
- </div>
+ <div class="space-y-2">
+ <Label for="oidcIssuerUrl" class="text-sm font-medium">{m.oidc_issuer_url_label()}</Label>
+ <Input
+ id="oidcIssuerUrl"
+ type="text"
+ placeholder={m.oidc_issuer_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcIssuerUrl.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
+ {#if $formInputs.oidcIssuerUrl.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcIssuerUrl.error}</p>
+ {/if}
+ </div>
- <div class="space-y-2">
- <Label for="oidcProviderLogoUrl" class="text-sm font-medium">{m.oidc_provider_logo_url_label()}</Label>
- <Input
- id="oidcProviderLogoUrl"
- type="text"
- placeholder={m.oidc_provider_logo_url_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcProviderLogoUrl.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-xs">{m.oidc_provider_logo_url_description()}</p>
- {#if $formInputs.oidcProviderLogoUrl.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderLogoUrl.error}</p>
- {/if}
- </div>
+ <div class="space-y-2">
+ <Label for="oidcProviderName" class="text-sm font-medium">{m.oidc_provider_name_label()}</Label>
+ <Input
+ id="oidcProviderName"
+ type="text"
+ placeholder={m.oidc_provider_name_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcProviderName.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_provider_name_description()}</p>
+ {#if $formInputs.oidcProviderName.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderName.error}</p>
+ {/if}
+ </div>
- <div class="space-y-2">
- <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
- <Input
- id="oidcScopes"
- type="text"
- placeholder={m.oidc_scopes_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcScopes.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcScopes.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcScopes.error}</p>
- {/if}
- </div>
+ <div class="space-y-2">
+ <Label for="oidcProviderLogoUrl" class="text-sm font-medium">{m.oidc_provider_logo_url_label()}</Label>
+ <Input
+ id="oidcProviderLogoUrl"
+ type="text"
+ placeholder={m.oidc_provider_logo_url_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcProviderLogoUrl.value}
+ class="font-mono text-sm"
+ />
+ <p class="text-muted-foreground text-xs">{m.oidc_provider_logo_url_description()}</p>
+ {#if $formInputs.oidcProviderLogoUrl.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcProviderLogoUrl.error}</p>
+ {/if}
+ </div>
- <div class="border-t pt-4">
- <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
- <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
- <div class="grid gap-3 sm:grid-cols-2">
- <div class="space-y-2">
- <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
- <Input
- id="oidcAdminClaim"
- type="text"
- placeholder={m.oidc_admin_claim_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminClaim.value}
- class="font-mono text-sm"
- />
- {#if $formInputs.oidcAdminClaim.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminClaim.error}</p>
- {/if}
- </div>
- <div class="space-y-2">
- <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
- <Input
- id="oidcAdminValue"
- type="text"
- placeholder={m.oidc_admin_value_placeholder()}
- disabled={isOidcEnvForced}
- bind:value={$formInputs.oidcAdminValue.value}
- class="font-mono text-sm"
- />
- <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
- {#if $formInputs.oidcAdminValue.error}
- <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminValue.error}</p>
- {/if}
- </div>
- </div>
- </div>
+ <div class="space-y-2">
+ <Label for="oidcScopes" class="text-sm font-medium">{m.oidc_scopes_label()}</Label>
+ <Input
+ id="oidcScopes"
+ type="text"
+ placeholder={m.oidc_scopes_placeholder()}
+ disabled={isOidcEnvForced}
+ bind:value={$formInputs.oidcScopes.value}
+ class="font-mono text-sm"
+ />
+ {#if $formInputs.oidcScopes.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcScopes.error}</p>
+ {/if}
+ </div>
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcMergeAccountsSwitch"
+ <div class="border-t pt-4">
+ <h4 class="text-sm font-semibold">{m.oidc_admin_role_mapping_title()}</h4>
+ <p class="text-muted-foreground mb-3 text-xs">{m.oidc_admin_role_mapping_description()}</p>
+ <div class="grid gap-3 sm:grid-cols-2">
+ <div class="space-y-2">
+ <Label for="oidcAdminClaim" class="text-sm font-medium">{m.oidc_admin_claim_label()}</Label>
+ <Input
+ id="oidcAdminClaim"
+ type="text"
+ placeholder={m.oidc_admin_claim_placeholder()}
disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcMergeAccounts.value}
- onCheckedChange={handleMergeAccountsChange}
+ bind:value={$formInputs.oidcAdminClaim.value}
+ class="font-mono text-sm"
/>
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcMergeAccountsSwitch" class="font-normal">
- {m.security_oidc_merge_accounts_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.security_oidc_merge_accounts_description()}
- </p>
- </div>
+ {#if $formInputs.oidcAdminClaim.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminClaim.error}</p>
+ {/if}
</div>
- </div>
-
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcSkipTlsVerifySwitch"
+ <div class="space-y-2">
+ <Label for="oidcAdminValue" class="text-sm font-medium">{m.oidc_admin_value_label()}</Label>
+ <Input
+ id="oidcAdminValue"
+ type="text"
+ placeholder={m.oidc_admin_value_placeholder()}
disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcSkipTlsVerify.value}
+ bind:value={$formInputs.oidcAdminValue.value}
+ class="font-mono text-sm"
/>
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcSkipTlsVerifySwitch" class="font-normal">
- {m.oidc_skip_tls_verify_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_skip_tls_verify_description()}
- </p>
- </div>
+ <p class="text-muted-foreground text-[11px]">{m.oidc_admin_value_help()}</p>
+ {#if $formInputs.oidcAdminValue.error}
+ <p class="text-destructive text-[0.8rem] font-medium">{$formInputs.oidcAdminValue.error}</p>
+ {/if}
</div>
</div>
+ </div>
- <div class="border-t pt-4">
- <div class="flex items-center gap-2">
- <Switch
- id="oidcAutoRedirectSwitch"
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcAutoRedirectToProvider.value}
- />
- <div class="grid gap-1.5 leading-none">
- <Label for="oidcAutoRedirectSwitch" class="font-normal">
- {m.oidc_auto_redirect_label()}
- </Label>
- <p class="text-muted-foreground text-xs">
- {m.oidc_auto_redirect_description()}
- </p>
- </div>
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcMergeAccountsSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcMergeAccounts.value}
+ onCheckedChange={handleMergeAccountsChange}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcMergeAccountsSwitch" class="font-normal">
+ {m.security_oidc_merge_accounts_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.security_oidc_merge_accounts_description()}
+ </p>
</div>
</div>
+ </div>
- <div class="bg-muted/30 rounded-lg border p-4">
- <div class="mb-2 flex items-center gap-2">
- <InfoIcon class="size-4 text-blue-600" />
- <span class="text-sm font-medium">{m.oidc_redirect_uri_title()}</span>
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcSkipTlsVerifySwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcSkipTlsVerify.value}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcSkipTlsVerifySwitch" class="font-normal">
+ {m.oidc_skip_tls_verify_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.oidc_skip_tls_verify_description()}
+ </p>
</div>
- <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
- <div class="flex items-center gap-2">
- <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
- <CopyButton text={redirectUri} size="sm" variant="outline" class="shrink-0" title={m.common_copy()} />
+ </div>
+ </div>
+
+ <div class="border-t pt-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="oidcAutoRedirectSwitch"
+ disabled={isOidcEnvForced}
+ bind:checked={$formInputs.oidcAutoRedirectToProvider.value}
+ />
+ <div class="grid gap-1.5 leading-none">
+ <Label for="oidcAutoRedirectSwitch" class="font-normal">
+ {m.oidc_auto_redirect_label()}
+ </Label>
+ <p class="text-muted-foreground text-xs">
+ {m.oidc_auto_redirect_description()}
+ </p>
</div>
</div>
</div>
- {/if}
- </div>
- </div>
+
+ <div class="bg-muted/30 rounded-lg border p-4">
+ <div class="mb-2 flex items-center gap-2">
+ <InfoIcon class="size-4 text-blue-600" />
+ <span class="text-sm font-medium">{m.oidc_redirect_uri_title()}</span>
+ </div>
+ <p class="text-muted-foreground mb-3 text-sm">{m.oidc_redirect_uri_description()}</p>
+ <div class="flex items-center gap-2">
+ <code class="bg-muted flex-1 rounded p-2 font-mono text-xs break-all">{redirectUri}</code>
+ <CopyButton text={redirectUri} size="sm" variant="outline" class="shrink-0" title={m.common_copy()} />
+ </div>
+ </div>
+ </div>
+ {/if}
+ </SettingsRow>
</div>
</div>
{/if}
@@ -518,23 +517,21 @@
<h3 class="text-lg font-medium">{m.security_session_heading()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_session_timeout_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_session_timeout_description()}</p>
- </div>
- <div class="max-w-xs">
- <Input
- id="authSessionTimeout"
- type="number"
- bind:value={$formInputs.authSessionTimeout.value}
- aria-label={m.security_session_timeout_label()}
- />
- {#if $formInputs.authSessionTimeout.error}
- <p class="text-destructive mt-2 text-sm">{$formInputs.authSessionTimeout.error}</p>
- {/if}
- </div>
- </div>
+ <SettingsRow
+ label={m.security_session_timeout_label()}
+ description={m.security_session_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <Input
+ id="authSessionTimeout"
+ type="number"
+ bind:value={$formInputs.authSessionTimeout.value}
+ aria-label={m.security_session_timeout_label()}
+ />
+ {#if $formInputs.authSessionTimeout.error}
+ <p class="text-destructive mt-2 text-sm">{$formInputs.authSessionTimeout.error}</p>
+ {/if}
+ </SettingsRow>
</div>
</div>
</div>
@@ -543,60 +540,54 @@
<h3 class="text-lg font-medium">{m.security_password_policy_label()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.security_password_policy_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.security_password_policy_description()}</p>
- </div>
- <div>
- <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- customLabel={m.common_basic()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_basic_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- customLabel={m.security_password_policy_standard()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_standard_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- <ArcaneButton
- action="base"
- tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
- class="h-12 w-full text-xs sm:text-sm"
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- customLabel={m.security_password_policy_strong()}
- />
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content side="top">
- {m.security_password_policy_strong_tooltip()}
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
- </div>
+ <SettingsRow label={m.security_password_policy_label()} description={m.security_password_policy_description()}>
+ <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
+ customLabel={m.common_basic()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_basic_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
+ customLabel={m.security_password_policy_standard()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_standard_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
+ customLabel={m.security_password_policy_strong()}
+ />
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content side="top">
+ {m.security_password_policy_strong_tooltip()}
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
</div>
- </div>
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/builds/+page.svelte b/frontend/src/routes/(app)/settings/builds/+page.svelte
index a372155d3..f872d2f2e 100644
--- a/frontend/src/routes/(app)/settings/builds/+page.svelte
+++ b/frontend/src/routes/(app)/settings/builds/+page.svelte
@@ -3,7 +3,7 @@
import { z } from 'zod/v4';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
- import { Label } from '$lib/components/ui/label';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { CodeIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
@@ -95,21 +95,19 @@
<h3 class="text-lg font-medium">{m.build_settings_workspace_section_title()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.build_settings_directory_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_directory_description()}</p>
- </div>
- <div class="max-w-xl">
- <TextInputWithLabel
- bind:value={$formInputs.buildsDirectory.value}
- error={$formInputs.buildsDirectory.error}
- label={m.build_settings_directory_label()}
- placeholder={m.build_settings_directory_placeholder()}
- helpText={m.build_settings_directory_help()}
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.build_settings_directory_label()}
+ description={m.build_settings_directory_description()}
+ contentClass="max-w-xl"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.buildsDirectory.value}
+ error={$formInputs.buildsDirectory.error}
+ label={m.build_settings_directory_label()}
+ placeholder={m.build_settings_directory_placeholder()}
+ helpText={m.build_settings_directory_help()}
+ />
+ </SettingsRow>
</div>
</div>
</div>
@@ -118,43 +116,39 @@
<h3 class="text-lg font-medium">{m.build_settings_provider_section_title()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.build_settings_default_provider_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_default_provider_description()}</p>
- </div>
- <div class="max-w-xs">
- <SelectWithLabel
- id="build-provider"
- name="buildProvider"
- bind:value={$formInputs.buildProvider.value}
- error={$formInputs.buildProvider.error}
- label={m.build_settings_provider_section_title()}
- options={providerOptions}
- />
- {#if !depotCredentialsPresent && !depotConfigured}
- <p class="text-muted-foreground mt-2 text-xs">{m.build_settings_depot_enable_hint()}</p>
- {/if}
- </div>
- </div>
+ <SettingsRow
+ label={m.build_settings_default_provider_label()}
+ description={m.build_settings_default_provider_description()}
+ contentClass="max-w-xs"
+ >
+ <SelectWithLabel
+ id="build-provider"
+ name="buildProvider"
+ bind:value={$formInputs.buildProvider.value}
+ error={$formInputs.buildProvider.error}
+ label={m.build_settings_provider_section_title()}
+ options={providerOptions}
+ />
+ {#if !depotCredentialsPresent && !depotConfigured}
+ <p class="text-muted-foreground mt-2 text-xs">{m.build_settings_depot_enable_hint()}</p>
+ {/if}
+ </SettingsRow>
<div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.build_settings_timeout_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_timeout_description()}</p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.buildTimeout.value}
- error={$formInputs.buildTimeout.error}
- label={m.build_settings_timeout_label()}
- placeholder={m.build_settings_timeout_placeholder()}
- helpText={m.build_settings_timeout_help()}
- type="number"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.build_settings_timeout_label()}
+ description={m.build_settings_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.buildTimeout.value}
+ error={$formInputs.buildTimeout.error}
+ label={m.build_settings_timeout_label()}
+ placeholder={m.build_settings_timeout_placeholder()}
+ helpText={m.build_settings_timeout_help()}
+ type="number"
+ />
+ </SettingsRow>
</div>
</div>
</div>
@@ -164,38 +158,34 @@
<h3 class="text-lg font-medium">{m.build_settings_depot_section_title()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.build_settings_depot_project_id_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_depot_project_id_description()}</p>
- </div>
- <div class="max-w-xl">
- <TextInputWithLabel
- bind:value={$formInputs.depotProjectId.value}
- error={$formInputs.depotProjectId.error}
- label={m.build_settings_depot_project_id_label()}
- placeholder={m.build_settings_depot_project_id_placeholder()}
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.build_settings_depot_project_id_label()}
+ description={m.build_settings_depot_project_id_description()}
+ contentClass="max-w-xl"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.depotProjectId.value}
+ error={$formInputs.depotProjectId.error}
+ label={m.build_settings_depot_project_id_label()}
+ placeholder={m.build_settings_depot_project_id_placeholder()}
+ />
+ </SettingsRow>
<div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.build_settings_depot_token_label()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.build_settings_depot_token_description()}</p>
- </div>
- <div class="max-w-xl">
- <TextInputWithLabel
- bind:value={$formInputs.depotToken.value}
- error={$formInputs.depotToken.error}
- label={m.build_settings_depot_token_label()}
- placeholder={m.build_settings_depot_token_placeholder()}
- type="password"
- helpText={m.build_settings_depot_token_help()}
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.build_settings_depot_token_label()}
+ description={m.build_settings_depot_token_description()}
+ contentClass="max-w-xl"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.depotToken.value}
+ error={$formInputs.depotToken.error}
+ label={m.build_settings_depot_token_label()}
+ placeholder={m.build_settings_depot_token_placeholder()}
+ type="password"
+ helpText={m.build_settings_depot_token_help()}
+ />
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
index 39d89a1cd..4b15f84b1 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { Label } from '$lib/components/ui/label';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { Switch } from '$lib/components/ui/switch/index.js';
interface Props {
@@ -19,26 +20,20 @@
<h3 class="text-lg font-medium">{title}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{title}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{description}</p>
+ <SettingsRow label={title} {description} contentClass="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch id="{id}-enabled" bind:checked={enabled} {disabled} />
+ <Label for="{id}-enabled" class="font-normal">
+ {enabledLabel}
+ </Label>
</div>
- <div class="space-y-4">
- <div class="flex items-center gap-2">
- <Switch id="{id}-enabled" bind:checked={enabled} {disabled} />
- <Label for="{id}-enabled" class="font-normal">
- {enabledLabel}
- </Label>
- </div>
- {#if enabled && children}
- <div class="space-y-4 pt-2">
- {@render children()}
- </div>
- {/if}
- </div>
- </div>
+ {#if enabled && children}
+ <div class="space-y-4 pt-2">
+ {@render children()}
+ </div>
+ {/if}
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/timeouts/+page.svelte b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
index eda8a9878..bc278a908 100644
--- a/frontend/src/routes/(app)/settings/timeouts/+page.svelte
+++ b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
@@ -4,7 +4,7 @@
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import { SettingsPageLayout } from '$lib/layouts';
- import { Label } from '$lib/components/ui/label';
+ import SettingsRow from '$lib/components/settings/settings-row.svelte';
import { ClockIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import { createSettingsForm } from '$lib/utils/settings-form.util';
@@ -58,66 +58,52 @@
<fieldset disabled={isReadOnly} class="relative space-y-8">
<!-- Docker Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">Docker Operations</h3>
+ <h3 class="text-lg font-medium">{m.timeouts_docker_operations()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.docker_api_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.docker_api_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
+ <SettingsRow label={m.docker_api_timeout()} description={m.docker_api_timeout_description()} contentClass="max-w-xs">
+ <TextInputWithLabel
+ bind:value={$formInputs.dockerApiTimeout.value}
+ error={$formInputs.dockerApiTimeout.error}
+ label={m.docker_api_timeout()}
+ placeholder="30"
+ helpText="Timeout in seconds (1-3600)"
+ type="number"
+ />
+ </SettingsRow>
+
+ <div class="border-t pt-6">
+ <SettingsRow
+ label={m.docker_image_pull_timeout()}
+ description={m.docker_image_pull_timeout_description()}
+ contentClass="max-w-xs"
+ >
<TextInputWithLabel
- bind:value={$formInputs.dockerApiTimeout.value}
- error={$formInputs.dockerApiTimeout.error}
- label={m.docker_api_timeout()}
- placeholder="30"
- helpText="Timeout in seconds (1-3600)"
+ bind:value={$formInputs.dockerImagePullTimeout.value}
+ error={$formInputs.dockerImagePullTimeout.error}
+ label={m.docker_image_pull_timeout()}
+ placeholder="600"
+ helpText="Timeout in seconds (30-7200)"
type="number"
/>
- </div>
- </div>
-
- <div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.docker_image_pull_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.docker_image_pull_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.dockerImagePullTimeout.value}
- error={$formInputs.dockerImagePullTimeout.error}
- label={m.docker_image_pull_timeout()}
- placeholder="600"
- helpText="Timeout in seconds (30-7200)"
- type="number"
- />
- </div>
- </div>
+ </SettingsRow>
</div>
<div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.trivy_scan_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">{m.trivy_scan_timeout_description()}</p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.trivyScanTimeout.value}
- error={$formInputs.trivyScanTimeout.error}
- label={m.trivy_scan_timeout()}
- placeholder="900"
- helpText="Timeout in seconds (60-14400)"
- type="number"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.trivy_scan_timeout()}
+ description={m.trivy_scan_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyScanTimeout.value}
+ error={$formInputs.trivyScanTimeout.error}
+ label={m.trivy_scan_timeout()}
+ placeholder="900"
+ helpText="Timeout in seconds (60-14400)"
+ type="number"
+ />
+ </SettingsRow>
</div>
</div>
</div>
@@ -125,95 +111,75 @@
<!-- Git Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">Git Operations</h3>
+ <h3 class="text-lg font-medium">{m.timeouts_git_operations()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.git_operation_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.git_operation_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.gitOperationTimeout.value}
- error={$formInputs.gitOperationTimeout.error}
- label={m.git_operation_timeout()}
- placeholder="300"
- helpText="Timeout in seconds (30-3600)"
- type="number"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.git_operation_timeout()}
+ description={m.git_operation_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.gitOperationTimeout.value}
+ error={$formInputs.gitOperationTimeout.error}
+ label={m.git_operation_timeout()}
+ placeholder="300"
+ helpText="Timeout in seconds (30-3600)"
+ type="number"
+ />
+ </SettingsRow>
</div>
</div>
</div>
<!-- Network Operations -->
<div class="space-y-4">
- <h3 class="text-lg font-medium">Network Operations</h3>
+ <h3 class="text-lg font-medium">{m.timeouts_network_operations()}</h3>
<div class="bg-card rounded-lg border shadow-sm">
<div class="space-y-6 p-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.http_client_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.http_client_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
+ <SettingsRow
+ label={m.http_client_timeout()}
+ description={m.http_client_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.httpClientTimeout.value}
+ error={$formInputs.httpClientTimeout.error}
+ label={m.http_client_timeout()}
+ placeholder="30"
+ helpText="Timeout in seconds (5-300)"
+ type="number"
+ />
+ </SettingsRow>
+
+ <div class="border-t pt-6">
+ <SettingsRow label={m.registry_timeout()} description={m.registry_timeout_description()} contentClass="max-w-xs">
<TextInputWithLabel
- bind:value={$formInputs.httpClientTimeout.value}
- error={$formInputs.httpClientTimeout.error}
- label={m.http_client_timeout()}
+ bind:value={$formInputs.registryTimeout.value}
+ error={$formInputs.registryTimeout.error}
+ label={m.registry_timeout()}
placeholder="30"
helpText="Timeout in seconds (5-300)"
type="number"
/>
- </div>
- </div>
-
- <div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.registry_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.registry_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.registryTimeout.value}
- error={$formInputs.registryTimeout.error}
- label={m.registry_timeout()}
- placeholder="30"
- helpText="Timeout in seconds (5-300)"
- type="number"
- />
- </div>
- </div>
+ </SettingsRow>
</div>
<div class="border-t pt-6">
- <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
- <div>
- <Label class="text-base">{m.proxy_request_timeout()}</Label>
- <p class="text-muted-foreground mt-1 text-sm">
- {m.proxy_request_timeout_description()}
- </p>
- </div>
- <div class="max-w-xs">
- <TextInputWithLabel
- bind:value={$formInputs.proxyRequestTimeout.value}
- error={$formInputs.proxyRequestTimeout.error}
- label={m.proxy_request_timeout()}
- placeholder="60"
- helpText="Timeout in seconds (10-600)"
- type="number"
- />
- </div>
- </div>
+ <SettingsRow
+ label={m.proxy_request_timeout()}
+ description={m.proxy_request_timeout_description()}
+ contentClass="max-w-xs"
+ >
+ <TextInputWithLabel
+ bind:value={$formInputs.proxyRequestTimeout.value}
+ error={$formInputs.proxyRequestTimeout.error}
+ label={m.proxy_request_timeout()}
+ placeholder="60"
+ helpText="Timeout in seconds (10-600)"
+ type="number"
+ />
+ </SettingsRow>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceConfiguration.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceConfiguration.svelte
index b7a761ef1..d34eca2ef 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceConfiguration.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceConfiguration.svelte
@@ -2,6 +2,7 @@
import * as Card from '$lib/components/ui/card';
import { m } from '$lib/paraglide/messages';
import { SettingsIcon, TagIcon } from '$lib/icons';
+ import { KeyValueCard, KeyValueGrid } from '$lib/components/resource-detail';
interface Props {
envVars: string[];
@@ -30,33 +31,22 @@
</div>
</Card.Header>
<Card.Content class="p-4">
- <div class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
+ <KeyValueGrid>
{#each envVars as env, index (index)}
{#if env.includes('=')}
{@const [key, ...valueParts] = env.split('=')}
{@const value = valueParts.join('=')}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide break-all uppercase">
- {key}
- </div>
- <div class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all">
- {value}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard label={key}>{value}</KeyValueCard>
{:else}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_name()}</div>
- <div class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all">
- {env}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard
+ label={m.common_name()}
+ labelClass="text-muted-foreground text-xs font-semibold tracking-wide uppercase"
+ >
+ {env}
+ </KeyValueCard>
{/if}
{/each}
- </div>
+ </KeyValueGrid>
</Card.Content>
</Card.Root>
{/if}
@@ -72,20 +62,11 @@
</div>
</Card.Header>
<Card.Content class="p-4">
- <div class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
+ <KeyValueGrid>
{#each Object.entries(labels) as [key, value] (key)}
- <Card.Root variant="subtle">
- <Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide break-all uppercase">
- {key}
- </div>
- <div class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all">
- {value?.toString() || ''}
- </div>
- </Card.Content>
- </Card.Root>
+ <KeyValueCard label={key}>{value?.toString() || ''}</KeyValueCard>
{/each}
- </div>
+ </KeyValueGrid>
</Card.Content>
</Card.Root>
{/if}
diff --git a/frontend/src/routes/(app)/swarm/stacks/new/+page.svelte b/frontend/src/routes/(app)/swarm/stacks/new/+page.svelte
index 25ad8e6b5..f141655db 100644
--- a/frontend/src/routes/(app)/swarm/stacks/new/+page.svelte
+++ b/frontend/src/routes/(app)/swarm/stacks/new/+page.svelte
@@ -32,6 +32,7 @@
import CodePanel from '../../../projects/components/CodePanel.svelte';
import EditableName from '../../../projects/components/EditableName.svelte';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import { ComposeEditorSplit } from '$lib/components/compose';
let { data } = $props();
@@ -52,24 +53,30 @@
envContent: z.string().optional().default('')
});
- const initialName = $derived(
- data.sourceStackName
- ? data.sourceStackName
- : data.selectedTemplate
- ? data.selectedTemplate.name.toLowerCase().replace(/[^a-z0-9-_]/g, '-')
- : ''
- );
+ function getInitialName() {
+ if (data.sourceStackName) {
+ return data.sourceStackName;
+ }
+ if (data.selectedTemplate) {
+ return data.selectedTemplate.name.toLowerCase().replace(/[^a-z0-9-_]/g, '-');
+ }
+ return '';
+ }
+
+ function getInitialFormData() {
+ return {
+ name: getInitialName(),
+ composeContent: data.defaultTemplate || '',
+ envContent: data.envTemplate || ''
+ };
+ }
+
+ const initialName = $derived(getInitialName());
const backHref = $derived(isEditMode ? `/swarm/stacks/${encodeURIComponent(initialName)}` : '/swarm/stacks');
const submitLabel = $derived(isEditMode ? m.common_save() : m.common_create_button({ resource: m.swarm_stack() }));
const submitLoadingLabel = $derived(isEditMode ? m.common_saving() : m.common_action_creating());
- let formData = $derived({
- name: initialName,
- composeContent: data.defaultTemplate || '',
- envContent: data.envTemplate || ''
- });
-
- let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
+ const { inputs, ...form } = createForm<typeof formSchema>(formSchema, getInitialFormData());
let dockerRunCommand = $state('');
let composeOpen = $state(true);
@@ -335,11 +342,11 @@
/>
</div>
- <form
+ <ComposeEditorSplit
class="flex h-full min-h-0 flex-1 flex-col gap-4 px-2 sm:px-6 lg:grid lg:grid-cols-5 lg:grid-rows-1 lg:items-stretch"
onsubmit={preventDefault(handleSubmit)}
>
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-3">
+ {#snippet compose()}
<CodePanel
bind:open={composeOpen}
title="compose.yaml"
@@ -353,9 +360,9 @@
globalVariables: globalVariableMap
}}
/>
- </div>
+ {/snippet}
- <div class="flex min-h-0 flex-1 flex-col lg:col-span-2">
+ {#snippet env()}
<CodePanel
bind:open={envOpen}
title=".env"
@@ -369,8 +376,8 @@
globalVariables: globalVariableMap
}}
/>
- </div>
- </form>
+ {/snippet}
+ </ComposeEditorSplit>
</div>
</div>
</div>
@@ -399,7 +406,7 @@
<div class="space-y-2">
<Label class="text-muted-foreground text-xs">{m.compose_example_commands_label()}</Label>
<div class="space-y-1">
- {#each exampleCommands as command}
+ {#each exampleCommands as command (command)}
<ArcaneButton
action="base"
tone="ghost"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 13f7d0448..1753d6a98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -131,9 +131,6 @@ importers:
embla-carousel-svelte:
specifier: ^8.6.0
version: 8.6.0([email protected](@typescript-eslint/[email protected]))
- js-yaml:
- specifier: ^4.1.1
- version: 4.1.1
ky:
specifier: ^1.12.0
version: 1.14.3
@@ -174,15 +171,9 @@ importers:
'@tailwindcss/vite':
specifier: ^4.2.2
- '@tanstack/eslint-plugin-query':
- specifier: ^5.99.0
'@tanstack/svelte-query-devtools':
specifier: ^6.1.20
version: 6.1.20(@tanstack/[email protected]([email protected](@typescript-eslint/[email protected])))([email protected](@typescript-eslint/[email protected]))
- '@types/js-yaml':
- specifier: ^4.0.9
- version: 4.0.9
'@types/node':
specifier: ^25.5.0
version: 25.5.0
@@ -213,9 +204,6 @@ importers:
runed:
specifier: ^0.37.1
- svelte-check:
- specifier: ^4.4.6
svelte-check-rs:
specifier: ^0.9.7
version: 0.9.7(@typescript/[email protected])
@@ -897,44 +885,6 @@ packages:
cpu: [x64]
os: [win32]
- '@eslint-community/[email protected]':
- resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-
- '@eslint-community/[email protected]':
- resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
- engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@eslint/[email protected]':
- resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
'@exodus/[email protected]':
resolution: {integrity: sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==}
engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -962,26 +912,6 @@ packages:
resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
- '@humanfs/[email protected]':
- resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
- engines: {node: '>=18.18.0'}
-
- '@humanfs/[email protected]':
- resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}
- engines: {node: '>=18.18.0'}
-
- '@humanfs/[email protected]':
- resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}
- engines: {node: '>=18.18.0'}
-
- '@humanwhocodes/[email protected]':
- resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
- engines: {node: '>=12.22'}
-
- '@humanwhocodes/[email protected]':
- resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
- engines: {node: '>=18.18'}
-
'@iconify/[email protected]':
resolution: {integrity: sha512-G3QMdSco16FF5hGeu4CSHUxkh5RvFMMoq5LCcTDR43/+8croHMYHRPpvb58NDDLRyet+eQ2qln/QCcxlTFs83A==}
@@ -2057,15 +1987,6 @@ packages:
peerDependencies:
vite: ^8.0.0-beta.15
- '@tanstack/[email protected]':
- resolution: {integrity: sha512-jVp1AEL7S7BeuQvH5SN1F5UdrNW/AbryKDeWUUMeAKNzh9C+Ik/bRSa/HeuJLlmaN+WOUkdDFbtCK0go7BxnUQ==}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: ^5.4.0 || ^6.0.0
- peerDependenciesMeta:
- typescript:
- optional: true
-
'@tanstack/[email protected]':
resolution: {integrity: sha512-QdpLP5VzVMgo4VtaPppRA2W04UFjIqX+bxke/ZJhE5cfd5UPkRzqIAJQt9uXkQJjqE8LBOMbKv7f8HCsZltXlg==}
@@ -2117,9 +2038,6 @@ packages:
resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
- '@types/[email protected]':
- resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
-
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
@@ -2159,43 +2077,10 @@ packages:
'@types/json-schema':
optional: true
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-gfQ8fk6cxhtptek+/8ZIqw8YrRW5048Gug8Ts5IYcMLCw18iUgrZAEY/D7s4hkI0FxEfGakKuPK/XUMPzPxi5g==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- typescript: '>=4.8.4 <6.1.0'
-
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-TPYUEqJK6avLcEjumWsIuTpuYODTTDAtoMdt8ZZa93uWMTX13Nb8L5leSje1NluammvU+oI3QRr5lLXPgihX3w==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-JAr2hOIct2Q+qk3G+8YFfqkqi7sC86uNryT+2i5HzMa2MPjw4qNFvtjnw1IiA1rP7QhNKVe21mSSLaSjwA1Olw==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- typescript: '>=4.8.4 <6.1.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-w4w7WR7GHOjqqPnvAYbazq+Y5oS68b9CzasGtnd6jIeOIeKUzYzupGTB2T4LTPSv4d+WPeccbxuneTFHYgAAWg==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- typescript: '>=4.8.4 <6.1.0'
-
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-Ln8R0tmWC7pTtLOzgJzYTXSCjJ9rDNHAqTaVONF4FEi2qwce8mD9iSOxOpLFFvWp/wBFlew0mjM1L1ihYWfBdQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
- typescript: '>=4.8.4 <6.1.0'
-
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-y+vH7QE8ycjoa0bWciFg7OpFcipUuem1ujhrdLtq1gByKwfbC7bPeKsiny9e0urg93DqwGcHey+bGRKCnF1nZQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
'@typescript/[email protected]':
resolution: {integrity: sha512-5wSilxwLGX5fMKJgsUkCBwOfW9GMG3WF5j77CVBOdFI7miFaR3JQaPzTA+uyHDMNIIeSDo1KtV77GT48Y/d0Xg==}
cpu: [arm64]
@@ -2273,11 +2158,6 @@ packages:
resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
engines: {node: '>= 0.6'}
- resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
- peerDependencies:
- acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-
resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
engines: {node: '>=0.4.0'}
@@ -2298,9 +2178,6 @@ packages:
resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
- resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
-
resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==}
engines: {node: '>=18'}
@@ -2309,10 +2186,6 @@ packages:
resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
engines: {node: '>=12'}
@@ -2322,9 +2195,6 @@ packages:
engines: {node: '>=8.0.0'}
hasBin: true
- resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-
resolution: {integrity: sha512-Z/ZeOgVl7bcSYZ/u/rh0fOpvEpq//LZmdbkXyc7syVzjPAhfOa9ebsdTSjEBDU4vs5nC98Kfduj1uFo0qyET3g==}
engines: {node: '>= 0.4'}
@@ -2379,10 +2249,6 @@ packages:
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
- resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
- engines: {node: '>=6'}
-
resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==}
engines: {node: '>=16'}
@@ -2390,10 +2256,6 @@ packages:
resolution: {integrity: sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==}
- resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
- engines: {node: '>=10'}
-
resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
@@ -2430,13 +2292,6 @@ packages:
resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
- resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
- engines: {node: '>=7.0.0'}
-
- resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-
resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
@@ -2484,10 +2339,6 @@ packages:
resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
- resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
- engines: {node: '>= 8'}
-
resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
@@ -2575,9 +2426,6 @@ packages:
babel-plugin-macros:
optional: true
- resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
engines: {node: '>=0.10.0'}
@@ -2684,52 +2532,14 @@ packages:
engines: {node: '>=18'}
hasBin: true
- resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
- engines: {node: '>=10'}
-
- resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
- resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
- resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
- engines: {node: ^20.19.0 || ^22.13.0 || >=24}
-
- resolution: {integrity: sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- hasBin: true
- peerDependencies:
- jiti: '*'
- peerDependenciesMeta:
- jiti:
- optional: true
-
resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==}
- resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
engines: {node: '>=4'}
hasBin: true
- resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
- engines: {node: '>=0.10'}
-
resolution: {integrity: sha512-/yLB1538mag+dn0wsePTe8C0rDIjUOaJpMs2McodSzmM2msWcZsBSdRtg6HOBt0A/r82BN+Md3pgwSc/uWt2Ig==}
peerDependencies:
@@ -2738,18 +2548,6 @@ packages:
'@typescript-eslint/types':
optional: true
- resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
- engines: {node: '>=4.0'}
-
- resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
- engines: {node: '>=4.0'}
-
- resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
- engines: {node: '>=0.10.0'}
-
resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
@@ -2767,9 +2565,6 @@ packages:
resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
engines: {node: '>=8.6.0'}
- resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-
resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
@@ -2788,25 +2583,10 @@ packages:
picomatch:
optional: true
- resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
- engines: {node: '>=16.0.0'}
-
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
- engines: {node: '>=10'}
-
- resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
- engines: {node: '>=16'}
-
- resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
-
resolution: {integrity: sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==}
engines: {node: '>=18.3.0'}
@@ -2847,10 +2627,6 @@ packages:
resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
engines: {node: '>= 6'}
- resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
- engines: {node: '>=10.13.0'}
-
resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}
engines: {node: 18 || 20 || >=22}
@@ -2859,17 +2635,9 @@ packages:
resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
engines: {node: '>=4'}
- resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
- engines: {node: '>=18'}
-
resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
- resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -2898,18 +2666,6 @@ packages:
engines: {node: '>=18'}
hasBin: true
- resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
- engines: {node: '>= 4'}
-
- resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
- engines: {node: '>=6'}
-
- resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
- engines: {node: '>=0.8.19'}
-
resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
@@ -2947,9 +2703,6 @@ packages:
resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
engines: {node: '>=18'}
- resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-
resolution: {integrity: sha512-Xx3GlNZNAXIISX49OMpfNgxrRU49KVQ5hqnK2zbkqkPucdWnCZXquTMK/COnb8pmIOJlfiaNYav9qyHX3gRDMA==}
engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -2971,10 +2724,6 @@ packages:
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
- resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
- hasBin: true
-
resolution: {integrity: sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==}
engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -2989,9 +2738,6 @@ packages:
engines: {node: '>=6'}
hasBin: true
- resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-
resolution: {integrity: sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==}
engines: {node: '>=16'}
@@ -3002,17 +2748,11 @@ packages:
resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
- resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-
resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
engines: {node: '>=6'}
hasBin: true
- resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
-
resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
engines: {node: '>=6'}
@@ -3037,10 +2777,6 @@ packages:
resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
- resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
- engines: {node: '>= 0.8.0'}
-
resolution: {integrity: sha512-lsmMmGXBxXIK/VMLEj0kL6MtUs1kBGj1nTCzi6zgQoG1DEwqwt2DQyHxcLykceIxAnfE3hya7NuIh6PpC6S3fA==}
@@ -3134,13 +2870,6 @@ packages:
resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
- resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
- engines: {node: '>=10'}
-
- resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-
resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
engines: {node: '>=18'}
@@ -3226,10 +2955,6 @@ packages:
peerDependencies:
svelte: ^5.27.0
- resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
- engines: {node: '>=4'}
-
resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
engines: {node: '>=10'}
@@ -3242,9 +2967,6 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
- resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'}
@@ -3294,10 +3016,6 @@ packages:
resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
engines: {node: '>=18'}
- resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
- engines: {node: '>= 0.8.0'}
-
resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}
engines: {node: '>=18'}
@@ -3318,14 +3036,6 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0}
hasBin: true
- resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
- engines: {node: '>=10'}
-
- resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
- engines: {node: '>=10'}
-
resolution: {integrity: sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==}
@@ -3334,24 +3044,12 @@ packages:
peerDependencies:
svelte: ^5.29.0
- resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
- engines: {node: '>=6'}
-
resolution: {integrity: sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==}
resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
- resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
- engines: {node: '>=8'}
-
- resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
engines: {node: 18 || 20 || >=22}
@@ -3393,10 +3091,6 @@ packages:
resolution: {integrity: sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==}
engines: {node: ^10 || ^12 || >=14}
- resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
- engines: {node: '>= 0.8.0'}
-
resolution: {integrity: sha512-65+fr5+cgIKWKiqM1Doum4uX6bY8iFCdztvvp2RcF+AJoieaw9kJOFMNcJo/bkmKYsxFaM9OsVZK/gWauG/5mg==}
peerDependencies:
@@ -3509,10 +3203,6 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
- resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
- engines: {node: '>=4'}
-
resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
@@ -3576,10 +3266,6 @@ packages:
zod:
optional: true
- resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
- engines: {node: '>=6'}
-
resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
engines: {node: '>=v12.22.7'}
@@ -3602,14 +3288,6 @@ packages:
resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
- resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
- engines: {node: '>=8'}
-
- resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
engines: {node: '>=14'}
@@ -3688,10 +3366,6 @@ packages:
resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
engines: {node: '>=4'}
- resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==}
engines: {node: '>=14.16'}
@@ -3725,24 +3399,12 @@ packages:
resolution: {integrity: sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A==}
engines: {node: '>=14.0.0'}
- resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-70Iihg8/5JICDYVEcWp4NtLz5cXGgHXUQf66xy4H//CelAtvkjK9+ptfrYNeOLrTzrrkawRelOzsBWpNS0TPLQ==}
hasBin: true
peerDependencies:
'@typescript/native-preview': '>=7.0.0-dev.0'
- resolution: {integrity: sha512-kP1zG81EWaFe9ZyTv4ZXv44Csi6Pkdpb7S3oj6m+K2ec/IcDg/a8LsFsnVLqm2nxtkSwsd5xPj/qFkTBgXHXjg==}
- engines: {node: '>= 18.0.0'}
- hasBin: true
- peerDependencies:
- svelte: ^4.0.0 || ^5.0.0-next.0
- typescript: '>=5.0.0'
-
resolution: {integrity: sha512-WGkSsIYNpVcOVxaQPkmdBQhaGyKLmg6pgaS/b+7guRb4eikrbXYtvNFuW2AzKJi8ZbLhSngrf3SRiZOuwuskrQ==}
peerDependencies:
@@ -3874,12 +3536,6 @@ packages:
resolution: {integrity: sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==}
- resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
- engines: {node: '>=18.12'}
- peerDependencies:
- typescript: '>=4.8.4'
-
resolution: {integrity: sha512-Du/ZW2RfwV/D4cmA5rXafYjBQVuvu4qGiEEla4EmEHVHgRdx68Gftx7i66jn2bzHPwSVZY36Ae6OuDn9el4ZKA==}
engines: {node: '>=14.13.1'}
@@ -3899,10 +3555,6 @@ packages:
resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
- resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
- engines: {node: '>= 0.8.0'}
-
resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
engines: {node: '>=12.20'}
@@ -4080,15 +3732,6 @@ packages:
resolution: {integrity: sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==}
- resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
- engines: {node: '>= 8'}
- hasBin: true
-
- resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
- engines: {node: '>=0.10.0'}
-
resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==}
engines: {node: '>=18'}
@@ -4117,10 +3760,6 @@ packages:
engines: {node: '>= 14.6'}
hasBin: true
- resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
- engines: {node: '>=10'}
-
resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
engines: {node: '>=18'}
@@ -4598,52 +4237,6 @@ snapshots:
'@esbuild/[email protected]':
optional: true
- dependencies:
- eslint: 9.39.2([email protected])
- eslint-visitor-keys: 3.4.3
-
- '@eslint-community/[email protected]': {}
-
- '@eslint/[email protected]':
- dependencies:
- '@eslint/object-schema': 2.1.7
- debug: 4.4.3
- minimatch: 10.2.5
- transitivePeerDependencies:
- - supports-color
-
- '@eslint/[email protected]':
- dependencies:
- '@eslint/core': 0.17.0
-
- '@eslint/[email protected]':
- dependencies:
- '@types/json-schema': 7.0.15
-
- '@eslint/[email protected]':
- dependencies:
- ajv: 8.20.0
- debug: 4.4.3
- espree: 10.4.0
- globals: 14.0.0
- ignore: 5.3.2
- import-fresh: 3.3.1
- js-yaml: 4.1.1
- minimatch: 10.2.5
- strip-json-comments: 3.1.1
- transitivePeerDependencies:
- - supports-color
-
- '@eslint/[email protected]': {}
-
- '@eslint/[email protected]': {}
-
- '@eslint/[email protected]':
- dependencies:
- '@eslint/core': 0.17.0
- levn: 0.4.1
-
'@exodus/[email protected]': {}
'@exodus/[email protected]':
@@ -4668,22 +4261,6 @@ snapshots:
'@hapi/hoek': 9.3.0
optional: true
- '@humanfs/[email protected]':
- dependencies:
- '@humanfs/types': 0.15.0
-
- '@humanfs/[email protected]':
- dependencies:
- '@humanfs/core': 0.19.2
- '@humanfs/types': 0.15.0
- '@humanwhocodes/retry': 0.4.3
-
- '@humanfs/[email protected]': {}
-
- '@humanwhocodes/[email protected]': {}
-
- '@humanwhocodes/[email protected]': {}
-
'@iconify/[email protected]':
dependencies:
'@iconify/types': 2.0.0
@@ -5423,15 +5000,6 @@ snapshots:
tailwindcss: 4.2.2
- dependencies:
- '@typescript-eslint/utils': 8.58.1([email protected]([email protected]))([email protected])
- eslint: 9.39.2([email protected])
- optionalDependencies:
- typescript: 6.0.2
- transitivePeerDependencies:
- - supports-color
-
'@tanstack/[email protected]': {}
'@tanstack/[email protected]': {}
@@ -5484,9 +5052,8 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]': {}
-
- '@types/[email protected]': {}
+ '@types/[email protected]':
+ optional: true
dependencies:
@@ -5523,56 +5090,8 @@ snapshots:
'@types/json-schema': 7.0.15
optional: true
- '@typescript-eslint/[email protected]([email protected])':
- dependencies:
- '@typescript-eslint/tsconfig-utils': 8.58.1([email protected])
- '@typescript-eslint/types': 8.58.1
- debug: 4.4.3
- typescript: 6.0.2
- transitivePeerDependencies:
- - supports-color
-
- '@typescript-eslint/[email protected]':
- dependencies:
- '@typescript-eslint/types': 8.58.1
- '@typescript-eslint/visitor-keys': 8.58.1
-
- '@typescript-eslint/[email protected]([email protected])':
- dependencies:
- typescript: 6.0.2
-
- '@typescript-eslint/[email protected]': {}
-
- '@typescript-eslint/[email protected]([email protected])':
- dependencies:
- '@typescript-eslint/project-service': 8.58.1([email protected])
- '@typescript-eslint/tsconfig-utils': 8.58.1([email protected])
- '@typescript-eslint/types': 8.58.1
- '@typescript-eslint/visitor-keys': 8.58.1
- debug: 4.4.3
- minimatch: 10.2.5
- semver: 7.7.4
- tinyglobby: 0.2.16
- ts-api-utils: 2.5.0([email protected])
- typescript: 6.0.2
- transitivePeerDependencies:
- - supports-color
-
- dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
- '@typescript-eslint/scope-manager': 8.58.1
- '@typescript-eslint/types': 8.58.1
- '@typescript-eslint/typescript-estree': 8.58.1([email protected])
- eslint: 9.39.2([email protected])
- typescript: 6.0.2
- transitivePeerDependencies:
- - supports-color
-
- '@typescript-eslint/[email protected]':
- dependencies:
- '@typescript-eslint/types': 8.58.1
- eslint-visitor-keys: 5.0.1
+ '@typescript-eslint/[email protected]':
+ optional: true
'@typescript/[email protected]':
optional: true
@@ -5658,10 +5177,6 @@ snapshots:
mime-types: 2.1.35
negotiator: 0.6.3
- dependencies:
- acorn: 8.16.0
-
@@ -5677,31 +5192,18 @@ snapshots:
json-schema-traverse: 1.0.0
require-from-string: 2.0.2
- dependencies:
- fast-deep-equal: 3.1.3
- fast-uri: 3.1.0
- json-schema-traverse: 1.0.0
- require-from-string: 2.0.2
-
dependencies:
environment: 1.1.0
- dependencies:
- color-convert: 2.0.1
-
dependencies:
entities: 2.2.0
-
@@ -5759,18 +5261,11 @@ snapshots:
optional: true
-
optional: true
- dependencies:
- ansi-styles: 4.3.0
- supports-color: 7.2.0
-
@@ -5811,12 +5306,6 @@ snapshots:
'@codemirror/state': 6.6.0
'@codemirror/view': 6.41.1
- dependencies:
- color-name: 1.1.4
-
-
@@ -5860,12 +5349,6 @@ snapshots:
- dependencies:
- path-key: 3.1.1
- shebang-command: 2.0.0
- which: 2.0.2
-
dependencies:
mdn-data: 2.27.1
@@ -5942,8 +5425,6 @@ snapshots:
-
@@ -6124,88 +5605,16 @@ snapshots:
'@esbuild/win32-ia32': 0.27.5
'@esbuild/win32-x64': 0.27.5
-
- dependencies:
- esrecurse: 4.3.0
- estraverse: 5.3.0
-
-
-
-
- dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
- '@eslint-community/regexpp': 4.12.2
- '@eslint/config-array': 0.21.2
- '@eslint/config-helpers': 0.4.2
- '@eslint/core': 0.17.0
- '@eslint/eslintrc': 3.3.5
- '@eslint/js': 9.39.2
- '@eslint/plugin-kit': 0.4.1
- '@humanfs/node': 0.16.8
- '@humanwhocodes/module-importer': 1.0.1
- '@humanwhocodes/retry': 0.4.3
- '@types/estree': 1.0.8
- ajv: 8.20.0
- chalk: 4.1.2
- cross-spawn: 7.0.6
- debug: 4.4.3
- escape-string-regexp: 4.0.0
- eslint-scope: 8.4.0
- eslint-visitor-keys: 4.2.1
- espree: 10.4.0
- esquery: 1.7.0
- esutils: 2.0.3
- fast-deep-equal: 3.1.3
- file-entry-cache: 8.0.0
- find-up: 5.0.0
- glob-parent: 6.0.2
- ignore: 5.3.2
- imurmurhash: 0.1.4
- is-glob: 4.0.3
- json-stable-stringify-without-jsonify: 1.0.1
- lodash.merge: 4.6.2
- minimatch: 10.2.5
- natural-compare: 1.4.0
- optionator: 0.9.4
- optionalDependencies:
- jiti: 2.6.1
- transitivePeerDependencies:
- - supports-color
-
- dependencies:
- acorn: 8.16.0
- acorn-jsx: 5.3.2([email protected])
- eslint-visitor-keys: 4.2.1
-
- dependencies:
- estraverse: 5.3.0
-
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
optionalDependencies:
'@typescript-eslint/types': 8.58.1
- dependencies:
- estraverse: 5.3.0
-
-
-
@@ -6225,8 +5634,6 @@ snapshots:
merge2: 1.4.1
micromatch: 4.0.8
-
@@ -6241,26 +5648,10 @@ snapshots:
optionalDependencies:
picomatch: 4.0.4
- dependencies:
- flat-cache: 4.0.1
-
dependencies:
to-regex-range: 5.0.1
- dependencies:
- locate-path: 6.0.0
- path-exists: 4.0.0
-
- dependencies:
- flatted: 3.4.2
- keyv: 4.5.4
-
-
dependencies:
fd-package-json: 2.0.0
@@ -6293,10 +5684,6 @@ snapshots:
dependencies:
is-glob: 4.0.3
- dependencies:
- is-glob: 4.0.3
-
dependencies:
minimatch: 10.2.5
@@ -6305,12 +5692,8 @@ snapshots:
-
-
dependencies:
'@exodus/bytes': 1.15.0
@@ -6350,15 +5733,6 @@ snapshots:
-
- dependencies:
- parent-module: 1.0.1
- resolve-from: 4.0.0
-
-
@@ -6385,8 +5759,6 @@ snapshots:
-
dependencies:
dompurify: 3.3.3
@@ -6413,10 +5785,6 @@ snapshots:
- dependencies:
- argparse: 2.0.1
-
dependencies:
'@acemir/cssom': 0.9.31
@@ -6446,8 +5814,6 @@ snapshots:
-
dependencies:
'@babel/runtime': 7.29.2
@@ -6458,14 +5824,8 @@ snapshots:
-
- dependencies:
- json-buffer: 3.0.1
-
@@ -6497,11 +5857,6 @@ snapshots:
- dependencies:
- prelude-ls: 1.2.1
- type-check: 0.4.0
-
optional: true
@@ -6580,12 +5935,6 @@ snapshots:
- dependencies:
- p-locate: 5.0.0
-
-
dependencies:
chalk: 5.6.2
@@ -6662,16 +6011,12 @@ snapshots:
svelte: 5.55.3(@typescript-eslint/[email protected])
svelte-toolbelt: 0.7.1([email protected](@typescript-eslint/[email protected]))
-
-
@@ -6718,15 +6063,6 @@ snapshots:
dependencies:
mimic-function: 5.0.1
- dependencies:
- deep-is: 0.1.4
- fast-levenshtein: 2.0.6
- levn: 0.4.1
- prelude-ls: 1.2.1
- type-check: 0.4.0
- word-wrap: 1.2.5
-
dependencies:
chalk: 5.6.2
@@ -6837,14 +6173,6 @@ snapshots:
'@oxfmt/binding-win32-ia32-msvc': 0.46.0
'@oxfmt/binding-win32-x64-msvc': 0.46.0
- dependencies:
- yocto-queue: 0.1.0
-
- dependencies:
- p-limit: 3.1.0
-
@@ -6853,10 +6181,6 @@ snapshots:
svelte: 5.55.3(@typescript-eslint/[email protected])
svelte-toolbelt: 0.9.3([email protected](@typescript-eslint/[email protected]))
- dependencies:
- callsites: 3.1.0
-
dependencies:
entities: 6.0.1
@@ -6866,10 +6190,6 @@ snapshots:
leac: 0.6.0
peberminta: 0.9.0
-
-
dependencies:
lru-cache: 11.3.5
@@ -6915,8 +6235,6 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
-
dependencies:
prettier: 3.8.3
@@ -6992,8 +6310,6 @@ snapshots:
-
@@ -7069,10 +6385,6 @@ snapshots:
zod: 4.3.6
- dependencies:
- mri: 1.2.0
-
dependencies:
xmlchars: 2.2.0
@@ -7119,12 +6431,6 @@ snapshots:
'@img/sharp-win32-x64': 0.34.5
optional: true
- dependencies:
- shebang-regex: 3.0.0
-
-
@@ -7218,8 +6524,6 @@ snapshots:
-
@@ -7242,10 +6546,6 @@ snapshots:
optional: true
- dependencies:
- has-flag: 4.0.0
-
dependencies:
'@typescript/native-preview': 7.0.0-dev.20260322.1
@@ -7256,18 +6556,6 @@ snapshots:
'@svelte-check-rs/linux-x64': 0.9.7
'@svelte-check-rs/win32-x64': 0.9.7
- dependencies:
- '@jridgewell/trace-mapping': 0.3.31
- chokidar: 4.0.3
- fdir: 6.5.0([email protected])
- picocolors: 1.1.1
- sade: 1.8.1
- svelte: 5.55.3(@typescript-eslint/[email protected])
- typescript: 6.0.2
- transitivePeerDependencies:
- - picomatch
-
dependencies:
codemirror: 6.0.2
@@ -7424,10 +6712,6 @@ snapshots:
optional: true
- dependencies:
- typescript: 6.0.2
-
@@ -7447,10 +6731,6 @@ snapshots:
- dependencies:
- prelude-ls: 1.2.1
-
optional: true
@@ -7563,12 +6843,6 @@ snapshots:
- dependencies:
- isexe: 2.0.0
-
-
dependencies:
ansi-styles: 6.2.3
@@ -7583,8 +6857,6 @@ snapshots:
-