Skip to content

Modern Docker Management, Designed for Everyone

refactor: fix the layout of some pages

Kyle Mendell8c95616e526c
diff --git a/frontend/src/lib/components/ui/badge/badge.svelte b/frontend/src/lib/components/ui/badge/badge.svelte
index 0488589a7..500045702 100644
--- a/frontend/src/lib/components/ui/badge/badge.svelte
+++ b/frontend/src/lib/components/ui/badge/badge.svelte
@@ -1,34 +1,36 @@
<script lang="ts" module>
- import { type VariantProps, tv } from 'tailwind-variants';
+ import { type VariantProps, tv } from "tailwind-variants";
export const badgeVariants = tv({
- base: 'focus:ring-ring inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-offset-2',
+ base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden whitespace-nowrap rounded-md border px-2 py-0.5 text-xs font-medium transition-[color,box-shadow] focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3",
variants: {
variant: {
- default: 'bg-primary text-primary-foreground hover:bg-primary/80 border-transparent',
- secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80 border-transparent',
- destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/80 border-transparent',
- outline: 'text-foreground'
- }
+ default:
+ "bg-primary text-primary-foreground [a&]:hover:bg-primary/90 border-transparent",
+ secondary:
+ "bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90 border-transparent",
+ destructive:
+ "bg-destructive [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white",
+ outline: "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground",
+ },
},
defaultVariants: {
- variant: 'default'
- }
+ variant: "default",
+ },
});
- export type BadgeVariant = VariantProps<typeof badgeVariants>['variant'];
+ export type BadgeVariant = VariantProps<typeof badgeVariants>["variant"];
</script>
<script lang="ts">
- import type { WithElementRef } from '$lib/utils.js';
- import type { HTMLAnchorAttributes } from 'svelte/elements';
- import { cn } from '$lib/utils.js';
+ import type { HTMLAnchorAttributes } from "svelte/elements";
+ import { cn, type WithElementRef } from "$lib/utils.js";
let {
ref = $bindable(null),
href,
class: className,
- variant = 'default',
+ variant = "default",
children,
...restProps
}: WithElementRef<HTMLAnchorAttributes> & {
@@ -36,6 +38,13 @@
} = $props();
</script>
-<svelte:element this={href ? 'a' : 'span'} bind:this={ref} {href} class={cn(badgeVariants({ variant }), className)} {...restProps}>
+<svelte:element
+ this={href ? "a" : "span"}
+ bind:this={ref}
+ data-slot="badge"
+ {href}
+ class={cn(badgeVariants({ variant }), className)}
+ {...restProps}
+>
{@render children?.()}
</svelte:element>
diff --git a/frontend/src/lib/components/ui/badge/index.ts b/frontend/src/lib/components/ui/badge/index.ts
index f05fb87fa..64e0aa9b0 100644
--- a/frontend/src/lib/components/ui/badge/index.ts
+++ b/frontend/src/lib/components/ui/badge/index.ts
@@ -1,2 +1,2 @@
-export { default as Badge } from './badge.svelte';
-export { badgeVariants, type BadgeVariant } from './badge.svelte';
+export { default as Badge } from "./badge.svelte";
+export { badgeVariants, type BadgeVariant } from "./badge.svelte";
diff --git a/frontend/src/routes/containers/[containerId]/+page.svelte b/frontend/src/routes/containers/[containerId]/+page.svelte
index 5cf9ebc01..82ff8680d 100644
--- a/frontend/src/routes/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/containers/[containerId]/+page.svelte
@@ -26,6 +26,8 @@
import { onDestroy } from 'svelte';
import LogViewer from '$lib/components/LogViewer.svelte';
import Meter from '$lib/components/ui/meter/meter.svelte';
+ import { browser } from '$app/environment';
+ import Separator from '$lib/components/ui/separator/separator.svelte';
interface NetworkConfig {
IPAddress?: string;
@@ -57,6 +59,7 @@
let logViewer = $state<LogViewer>();
let statsEventSource: EventSource | null = $state(null);
+ let showFloatingHeader = $state(false);
// Helper function to clean container name
const cleanContainerName = (name: string | undefined): string => {
@@ -224,12 +227,27 @@
element.scrollIntoView({ behavior: 'smooth', block: 'start' });
}
}
+
+ $effect(() => {
+ if (browser) {
+ const onScroll = () => {
+ showFloatingHeader = window.scrollY > 100;
+ };
+ window.addEventListener('scroll', onScroll);
+ return () => window.removeEventListener('scroll', onScroll);
+ }
+ });
</script>
<div class="bg-background min-h-screen">
{#if container}
- <!-- Fixed Header -->
- <div class="bg-background/95 sticky top-0 z-10 border-b backdrop-blur">
+ <!-- Fixed Header (matches compose) -->
+ <div
+ class="bg-background/95 sticky top-0 z-20 border-b backdrop-blur transition-all duration-300"
+ style="opacity: {showFloatingHeader ? 0 : 1}; pointer-events: {showFloatingHeader
+ ? 'none'
+ : 'auto'};"
+ >
<div class="max-w-full px-4 py-3">
<div class="flex items-center justify-between">
<div class="flex items-center gap-3">
@@ -265,12 +283,7 @@
id={container.Id}
type="container"
itemState={container.State?.Running ? 'running' : 'stopped'}
- loading={{
- start: starting,
- stop: stopping,
- restart: restarting,
- remove: removing
- }}
+ loading={{ start: starting, stop: stopping, restart: restarting, remove: removing }}
/>
{/if}
</div>
@@ -278,196 +291,222 @@
</div>
</div>
- <div class="flex h-[calc(100vh-64px)]">
- <!-- Fixed Sidebar Navigation - Narrower -->
- <div class="bg-background/50 w-48 shrink-0 border-r">
- <div class="sticky top-16 p-3">
+ {#if showFloatingHeader}
+ <!-- Floating mini header (like compose) -->
+ <div
+ class="fixed left-1/2 top-4 z-30 -translate-x-1/2 transition-all duration-300 ease-in-out"
+ >
+ <div
+ class="bg-background/90 rounded-lg border border-border/50 px-4 py-3 shadow-xl backdrop-blur-xl"
+ >
+ <div class="flex items-center gap-4">
+ <div class="flex items-center gap-2">
+ <h2 class="max-w-[150px] truncate text-sm font-medium" title={containerDisplayName}>
+ {containerDisplayName}
+ </h2>
+ {#if container?.State}
+ <StatusBadge
+ variant={container.State.Status === 'running'
+ ? 'green'
+ : container.State.Status === 'exited'
+ ? 'red'
+ : 'amber'}
+ text={container.State.Status}
+ class="text-xs"
+ />
+ {/if}
+ </div>
+ <div class="bg-border h-4 w-px"></div>
+ <ActionButtons
+ id={container.Id}
+ type="container"
+ itemState={container.State?.Running ? 'running' : 'stopped'}
+ loading={{ start: starting, stop: stopping, restart: restarting, remove: removing }}
+ />
+ </div>
+ </div>
+ </div>
+ {/if}
+
+ <div class="flex min-h-0 overflow-hidden">
+ <!-- Left rail (align to compose proportions) -->
+ <div class="bg-background/50 w-16 shrink-0 border-r">
+ <div class="sticky top-16 p-2">
<nav class="space-y-1">
{#each navigationSections as section}
{@const IconComponent = section.icon}
<button
onclick={() => scrollToSection(section.id)}
- class="flex w-full items-center gap-2 rounded-md px-3 py-2 text-sm font-medium transition-colors
+ class="relative flex w-full items-center justify-center rounded-md p-3 text-sm font-medium transition-colors
{activeSection === section.id
? 'bg-primary/10 text-primary border-primary/20 border'
: 'text-muted-foreground hover:text-foreground hover:bg-muted/50'}"
+ title={section.label}
>
- <IconComponent class="size-4 shrink-0" />
- <span class="truncate">{section.label}</span>
+ <IconComponent class="size-4" />
</button>
{/each}
</nav>
</div>
</div>
- <!-- Main Content - Full width usage -->
- <div class="flex-1 overflow-y-auto">
+ <!-- Main content -->
+ <div class="min-w-0 flex-1 overflow-hidden">
<div class="max-w-none p-6">
<div class="space-y-8">
- <!-- Overview Section -->
+ <!-- Overview -->
<section id="overview" class="scroll-mt-20">
<h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
<HardDrive class="size-5" />
Overview
</h2>
- <div class="mb-6 grid grid-cols-1 gap-6 lg:grid-cols-2">
- <!-- Basic Info Card -->
- <Card.Root class="border">
+ <!-- Single card that spans full width on mobile, stays in grid on lg+ -->
+ <div class="mb-6">
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Header class="pb-4">
<Card.Title>Container Details</Card.Title>
+ <Card.Description class="text-sm text-muted-foreground">
+ Identity, runtime, and system metadata
+ </Card.Description>
</Card.Header>
- <Card.Content class="space-y-4">
- <div class="flex items-center gap-3">
- <div class="rounded bg-blue-50 p-2 dark:bg-blue-950/20">
- <HardDrive class="size-4 text-blue-600" />
- </div>
- <div class="min-w-0 flex-1">
- <div class="text-muted-foreground text-sm">Image</div>
- <div class="truncate font-medium" title={container.Config?.Image}>
- {container.Config?.Image || 'N/A'}
+
+ <Card.Content class="space-y-6">
+ <!-- Identity -->
+ <div class="space-y-4">
+ <!-- Image -->
+ <div class="flex items-center gap-3">
+ <div class="rounded bg-blue-50 p-2 dark:bg-blue-950/20">
+ <HardDrive class="size-4 text-blue-600" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <div class="text-sm text-muted-foreground">Image</div>
+ <div class="truncate font-medium" title={container.Config?.Image}>
+ {container.Config?.Image || 'N/A'}
+ </div>
</div>
</div>
- </div>
- <div class="flex items-center gap-3">
- <div class="rounded bg-green-50 p-2 dark:bg-green-950/20">
- <Clock class="size-4 text-green-600" />
- </div>
- <div class="min-w-0 flex-1">
- <div class="text-muted-foreground text-sm">Created</div>
- <div class="font-medium" title={formatDate(container.Created)}>
- {formatDate(container.Created)}
+ <!-- Created -->
+ <div class="flex items-center gap-3">
+ <div class="rounded bg-green-50 p-2 dark:bg-green-950/20">
+ <Clock class="size-4 text-green-600" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <div class="text-sm text-muted-foreground">Created</div>
+ <div class="font-medium" title={formatDate(container.Created)}>
+ {formatDate(container.Created)}
+ </div>
</div>
</div>
- </div>
- <div class="flex items-center gap-3">
- <div class="rounded bg-purple-50 p-2 dark:bg-purple-950/20">
- <Network class="size-4 text-purple-600" />
- </div>
- <div class="min-w-0 flex-1">
- <div class="text-muted-foreground text-sm">IP Address</div>
- <div class="font-medium">{primaryIpAddress}</div>
+ <!-- IP -->
+ <div class="flex items-center gap-3">
+ <div class="rounded bg-purple-50 p-2 dark:bg-purple-950/20">
+ <Network class="size-4 text-purple-600" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <div class="text-sm text-muted-foreground">IP Address</div>
+ <div class="font-medium">{primaryIpAddress}</div>
+ </div>
</div>
- </div>
- <div class="flex items-center gap-3">
- <div class="rounded bg-amber-50 p-2 dark:bg-amber-950/20">
- <Terminal class="size-4 text-amber-600" />
- </div>
- <div class="min-w-0 flex-1">
- <div class="text-muted-foreground text-sm">Command</div>
- <div class="truncate font-medium" title={container.Config?.Cmd?.join(' ')}>
- {container.Config?.Cmd?.join(' ') || 'N/A'}
+ <!-- Command -->
+ <div class="flex items-center gap-3">
+ <div class="rounded bg-amber-50 p-2 dark:bg-amber-950/20">
+ <Terminal class="size-4 text-amber-600" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <div class="text-sm text-muted-foreground">Command</div>
+ <div
+ class="truncate font-medium"
+ title={container.Config?.Cmd?.join(' ')}
+ >
+ {container.Config?.Cmd?.join(' ') || 'N/A'}
+ </div>
</div>
</div>
</div>
- </Card.Content>
- </Card.Root>
- <!-- Quick Stats Card -->
- <Card.Root class="border">
- <Card.Header class="pb-4">
- <Card.Title>Quick Stats</Card.Title>
- </Card.Header>
- <Card.Content class="space-y-6">
- {#if stats && container.State?.Running}
- <Meter
- label="CPU Usage"
- valueLabel="{cpuUsagePercent.toFixed(1)}%"
- value={cpuUsagePercent}
- max={100}
- variant={cpuUsagePercent > 80
- ? 'destructive'
- : cpuUsagePercent > 60
- ? 'warning'
- : 'default'}
- />
-
- <Meter
- label="Memory Usage"
- valueLabel="{memoryUsageFormatted} / {memoryLimitFormatted}"
- value={memoryUsagePercent}
- max={100}
- variant={memoryUsagePercent > 80
- ? 'destructive'
- : memoryUsagePercent > 60
- ? 'warning'
- : 'default'}
- />
- {:else}
- <div class="text-muted-foreground py-8 text-center">
- {container.State?.Running ? 'Loading stats...' : 'Container not running'}
- </div>
- {/if}
- </Card.Content>
- </Card.Root>
- </div>
+ <Separator />
- <!-- Container ID and Health -->
- <Card.Root class="border">
- <Card.Header class="pb-4">
- <Card.Title>System Information</Card.Title>
- </Card.Header>
- <Card.Content class="space-y-4">
- <div>
- <div class="text-muted-foreground mb-2 text-sm">Container ID</div>
- <div class="bg-muted/50 rounded p-3 font-mono text-sm break-all">
- {container.Id}
- </div>
- </div>
+ <!-- System -->
+ <div class="space-y-3">
+ <h4 class="text-sm font-semibold tracking-tight">System</h4>
- {#if container.Config?.WorkingDir}
- <div>
- <div class="text-muted-foreground mb-2 text-sm">Working Directory</div>
- <div class="bg-muted/50 rounded p-3 font-mono break-all">
- {container.Config.WorkingDir}
- </div>
- </div>
- {/if}
+ <div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
+ <!-- Container ID -->
+ <div class="space-y-1">
+ <div class="text-xs text-muted-foreground">Container ID</div>
+ <div
+ class="bg-muted/50 max-w-full truncate rounded px-2 py-1.5 font-mono text-xs"
+ >
+ {container.Id}
+ </div>
+ </div>
- {#if container.Config?.User}
- <div>
- <div class="text-muted-foreground mb-2 text-sm">User</div>
- <div class="bg-muted/50 rounded p-3 font-mono">{container.Config.User}</div>
- </div>
- {/if}
+ <!-- Working Dir -->
+ {#if container.Config?.WorkingDir}
+ <div class="space-y-1">
+ <div class="text-xs text-muted-foreground">Working Directory</div>
+ <div
+ class="bg-muted/50 max-w-full truncate rounded px-2 py-1.5 font-mono text-xs"
+ >
+ {container.Config.WorkingDir}
+ </div>
+ </div>
+ {/if}
- {#if container.State?.Health}
- <div>
- <div class="text-muted-foreground mb-2 text-sm">Health Status</div>
- <div class="flex items-center gap-3">
- <StatusBadge
- variant={container.State.Health.Status === 'healthy'
- ? 'green'
- : container.State.Health.Status === 'unhealthy'
- ? 'red'
- : 'amber'}
- text={container.State.Health.Status}
- />
- {#if container.State.Health.Log && container.State.Health.Log.length > 0}
- <span class="text-muted-foreground text-sm">
- Last check: {new Date(
- container.State.Health.Log[0].Start
- ).toLocaleString()}
- </span>
+ <!-- User -->
+ {#if container.Config?.User}
+ <div class="space-y-1">
+ <div class="text-xs text-muted-foreground">User</div>
+ <div
+ class="bg-muted/50 inline-flex rounded px-2 py-1.5 font-mono text-xs"
+ >
+ {container.Config.User}
+ </div>
+ </div>
+ {/if}
+
+ <!-- Health -->
+ {#if container.State?.Health}
+ <div class="space-y-1 sm:col-span-2">
+ <div class="text-xs text-muted-foreground">Health</div>
+ <div class="flex flex-wrap items-center gap-3">
+ <StatusBadge
+ variant={container.State.Health.Status === 'healthy'
+ ? 'green'
+ : container.State.Health.Status === 'unhealthy'
+ ? 'red'
+ : 'amber'}
+ text={container.State.Health.Status}
+ />
+ {#if container.State.Health.Log && container.State.Health.Log.length > 0}
+ <span class="text-xs text-muted-foreground">
+ Last check: {new Date(
+ container.State.Health.Log[0].Start
+ ).toLocaleString()}
+ </span>
+ {/if}
+ </div>
+ </div>
{/if}
</div>
</div>
- {/if}
- </Card.Content>
- </Card.Root>
+ </Card.Content>
+ </Card.Root>
+ </div>
</section>
- <!-- Stats Section -->
+ <!-- Stats -->
<section id="stats" class="scroll-mt-20">
<h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
<Activity class="size-5" />
Resource Metrics
</h2>
- <Card.Root class="border">
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-6">
{#if stats && container.State?.Running}
<div class="grid grid-cols-1 gap-8 lg:grid-cols-2">
@@ -563,17 +602,17 @@
</div>
{/if}
{:else if !container.State?.Running}
- <div class="text-muted-foreground py-12 text-center">
+ <div class="py-12 text-center text-muted-foreground">
Container is not running. Stats unavailable.
</div>
{:else}
- <div class="text-muted-foreground py-12 text-center">Loading stats...</div>
+ <div class="py-12 text-center text-muted-foreground">Loading stats...</div>
{/if}
</Card.Content>
</Card.Root>
</section>
- <!-- Logs Section -->
+ <!-- Logs -->
<section id="logs" class="scroll-mt-20">
<div class="mb-6 flex items-center justify-between">
<h2 class="flex items-center gap-2 text-xl font-semibold">
@@ -601,13 +640,15 @@
variant="outline"
size="sm"
onclick={() => logViewer?.startLogStream()}
- disabled={!container?.Id}>Start</Button
+ disabled={!container?.Id}
>
+ Start
+ </Button>
{/if}
</div>
</div>
- <Card.Root class="border">
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-0">
<LogViewer
bind:this={logViewer}
@@ -626,111 +667,133 @@
</Card.Root>
</section>
- <!-- Configuration Section -->
+ <!-- Configuration -->
<section id="config" class="scroll-mt-20">
<h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
<Settings class="size-5" />
Configuration
</h2>
- <div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
- <!-- Environment Variables -->
- <Card.Root class="border">
- <Card.Header class="pb-4">
- <Card.Title>Environment Variables</Card.Title>
- </Card.Header>
- <Card.Content class="max-h-80 overflow-y-auto">
+ <!-- Single Configuration card with Env, Ports, and Labels inside -->
+ <Card.Root class="rounded-lg border shadow-sm">
+ <Card.Header class="pb-4">
+ <Card.Title>Environment, Ports & Labels</Card.Title>
+ <Card.Description class="text-sm text-muted-foreground">
+ Runtime configuration and metadata for this container
+ </Card.Description>
+ </Card.Header>
+
+ <Card.Content class="space-y-8">
+ <!-- Environment Variables -->
+ <div>
+ <h3 class="mb-3 text-sm font-semibold tracking-tight">Environment Variables</h3>
+
{#if container.Config?.Env && container.Config.Env.length > 0}
- <div class="space-y-2">
+ <ul class="divide-border/60 divide-y">
{#each container.Config.Env as env, index (index)}
{#if env.includes('=')}
{@const [key, ...valueParts] = env.split('=')}
{@const value = valueParts.join('=')}
- <div class="border-muted/30 flex border-b py-2">
- <span class="w-1/3 truncate pr-3 font-medium" title={key}>{key}</span>
- <span class="text-muted-foreground w-2/3 truncate" title={value}
- >{value}</span
- >
- </div>
+ <li class="px-4 py-2.5">
+ <div class="flex min-w-0 items-center gap-3">
+ <Badge variant="secondary">
+ {key}:
+ </Badge>
+ <span class="truncate font-semibold" title={value}>{value}</span>
+ </div>
+ </li>
{:else}
- <div class="border-muted/30 border-b py-2">{env}</div>
+ <li class="px-4 py-2.5">
+ <div class="flex min-w-0 items-center gap-3">
+ <Badge variant="secondary">ENV:</Badge>
+ <span class="truncate font-semibold" title={env}>{env}</span>
+ </div>
+ </li>
{/if}
{/each}
- </div>
+ </ul>
{:else}
<div class="text-muted-foreground py-8 text-center">
No environment variables
</div>
{/if}
- </Card.Content>
- </Card.Root>
+ </div>
+
+ <Separator />
+
+ <!-- Port Mappings -->
+ <div>
+ <h3 class="mb-3 text-sm font-semibold tracking-tight">Port Mappings</h3>
- <!-- Ports -->
- <Card.Root class="border">
- <Card.Header class="pb-4">
- <Card.Title>Port Mappings</Card.Title>
- </Card.Header>
- <Card.Content>
{#if container.NetworkSettings?.Ports && Object.keys(container.NetworkSettings.Ports).length > 0}
- <div class="space-y-3">
+ <ul class="divide-border/60 divide-y">
{#each Object.entries(container.NetworkSettings.Ports) as [containerPort, hostBindings] (containerPort)}
- <div class="bg-muted/20 flex items-center justify-between rounded p-3">
- <span class="font-mono">{containerPort}</span>
- <div class="flex items-center gap-2">
- <span class="text-muted-foreground">→</span>
+ <li class="px-4 py-2.5">
+ <div class="flex min-w-0 items-center gap-3">
+ <Badge variant="secondary">
+ {containerPort}:
+ </Badge>
+
{#if Array.isArray(hostBindings) && hostBindings.length > 0}
- {#each hostBindings as binding (binding.HostIp + ':' + binding.HostPort)}
- <Badge variant="outline" class="font-mono">
- {binding.HostIp || '0.0.0.0'}:{binding.HostPort}
- </Badge>
- {/each}
+ <span class="truncate font-semibold">
+ {hostBindings
+ .map(
+ (binding) =>
+ `${binding.HostIp || '0.0.0.0'}:${binding.HostPort}`
+ )
+ .join(', ')}
+ </span>
{:else}
- <span class="text-muted-foreground">Not published</span>
+ <span class="text-muted-foreground font-semibold"
+ >Not published</span
+ >
{/if}
</div>
- </div>
+ </li>
{/each}
- </div>
+ </ul>
{:else}
<div class="text-muted-foreground py-8 text-center">No ports exposed</div>
{/if}
- </Card.Content>
- </Card.Root>
- </div>
+ </div>
- <!-- Labels -->
- <Card.Root class="mt-6 border">
- <Card.Header class="pb-4">
- <Card.Title>Labels</Card.Title>
- </Card.Header>
- <Card.Content class="max-h-60 overflow-y-auto">
- {#if container.Config?.Labels && Object.keys(container.Config.Labels).length > 0}
- <div class="space-y-2">
- {#each Object.entries(container.Config.Labels) as [key, value] (key)}
- <div class="border-muted/30 flex border-b py-2">
- <span class="w-1/3 truncate pr-3 font-medium" title={key}>{key}</span>
- <span
- class="text-muted-foreground w-2/3 truncate"
- title={value?.toString()}>{value?.toString() || ''}</span
- >
- </div>
- {/each}
- </div>
- {:else}
- <div class="text-muted-foreground py-8 text-center">No labels defined</div>
- {/if}
+ <Separator />
+
+ <!-- Labels -->
+ <div>
+ <h3 class="mb-3 text-sm font-semibold tracking-tight">Labels</h3>
+
+ {#if container.Config?.Labels && Object.keys(container.Config.Labels).length > 0}
+ <ul class="divide-border/60 divide-y">
+ {#each Object.entries(container.Config.Labels) as [key, value] (key)}
+ <li class="px-4 py-2.5">
+ <div class="flex min-w-0 items-center gap-3">
+ <Badge variant="secondary">
+ {key}:
+ </Badge>
+ <span class="truncate font-semibold" title={value?.toString()}>
+ {value?.toString() || ''}
+ </span>
+ </div>
+ </li>
+ {/each}
+ </ul>
+ {:else}
+ <div class="text-muted-foreground py-8 text-center">No labels defined</div>
+ {/if}
+ </div>
</Card.Content>
</Card.Root>
</section>
- <!-- Network Section -->
+ <!-- Network -->
<section id="network" class="scroll-mt-20">
<h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
<Network class="size-5" />
Networks
</h2>
- <Card.Root class="border">
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-6">
{#if container.NetworkSettings?.Networks && Object.keys(container.NetworkSettings.Networks).length > 0}
<div class="space-y-6">
@@ -770,20 +833,20 @@
{/each}
</div>
{:else}
- <div class="text-muted-foreground py-12 text-center">No networks connected</div>
+ <div class="py-12 text-center text-muted-foreground">No networks connected</div>
{/if}
</Card.Content>
</Card.Root>
</section>
- <!-- Storage Section -->
+ <!-- Storage -->
<section id="storage" class="scroll-mt-20">
<h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
<Database class="size-5" />
Storage & Mounts
</h2>
- <Card.Root class="border">
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-6">
{#if container.Mounts && container.Mounts.length > 0}
<div class="space-y-4">
diff --git a/frontend/src/routes/dashboard/+page.svelte b/frontend/src/routes/dashboard/+page.svelte
index d671b4f20..e3d671eaa 100644
--- a/frontend/src/routes/dashboard/+page.svelte
+++ b/frontend/src/routes/dashboard/+page.svelte
@@ -364,10 +364,11 @@
</script>
<div class="space-y-8">
- <div class="flex items-center justify-between">
- <div>
+ <!-- Header -->
+ <div class="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+ <div class="space-y-1">
<h1 class="text-3xl font-bold tracking-tight">Dashboard</h1>
- <p class="text-muted-foreground mt-1 text-sm">Overview of your Container Environment</p>
+ <p class="text-muted-foreground max-w-2xl text-sm">Overview of your Container Environment</p>
</div>
<Button
variant="outline"
@@ -399,15 +400,16 @@
</Alert.Root>
{/if}
+ <!-- Quick Actions -->
<section>
- <h2 class="mb-4 text-lg font-semibold tracking-tight">Quick Actions</h2>
+ <h2 class="mb-3 text-lg font-semibold tracking-tight">Quick Actions</h2>
{#if isLoading.loadingDockerInfo}
<div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
{#each Array(3) as _}
<div class="bg-card flex items-center rounded-lg border p-3">
<div class="bg-muted mr-3 size-6 animate-pulse rounded-full"></div>
<div class="flex-1">
- <div class="bg-muted h-3 w-16 animate-pulse rounded mb-1"></div>
+ <div class="bg-muted mb-1 h-3 w-16 animate-pulse rounded"></div>
<div class="bg-muted h-2 w-12 animate-pulse rounded"></div>
</div>
</div>
@@ -416,7 +418,7 @@
{:else}
<div class="grid grid-cols-1 gap-3 sm:grid-cols-3">
<button
- class="group bg-card flex items-center rounded-lg border p-3 shadow-sm transition-all hover:shadow-md disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:shadow-sm"
+ class="group bg-card flex items-center rounded-lg border p-3 shadow-sm ring-offset-background transition-all hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60"
disabled={!dashboardStates.dockerInfo ||
stoppedContainers === 0 ||
isLoading.starting ||
@@ -440,7 +442,7 @@
</button>
<button
- class="group bg-card flex items-center rounded-lg border p-3 shadow-sm transition-all hover:shadow-md disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:shadow-sm"
+ class="group bg-card flex items-center rounded-lg border p-3 shadow-sm ring-offset-background transition-all hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60"
disabled={!dashboardStates.dockerInfo ||
runningContainers === 0 ||
isLoading.starting ||
@@ -464,7 +466,7 @@
</button>
<button
- class="group bg-card hover:border-destructive/50 disabled:hover:border-border flex items-center rounded-lg border p-3 shadow-sm transition-all hover:shadow-md disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:shadow-sm"
+ class="group bg-card hover:border-destructive/50 disabled:hover:border-border flex items-center rounded-lg border p-3 shadow-sm ring-offset-background transition-all hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-60"
disabled={!dashboardStates.dockerInfo ||
isLoading.starting ||
isLoading.stopping ||
@@ -489,6 +491,7 @@
{/if}
</section>
+ <!-- System Overview -->
<section>
<DropdownCard
id="system-overview"
@@ -554,7 +557,7 @@
<!-- Always show these cards but with loading states -->
<div class="mt-6 grid grid-cols-1 gap-4 md:grid-cols-3">
- <Card.Root>
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-4">
<div class="flex items-center gap-3">
<div class="rounded-lg bg-blue-500/10 p-2">
@@ -582,7 +585,7 @@
</Card.Content>
</Card.Root>
- <Card.Root>
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-4">
<div class="flex items-center gap-3">
<div class="rounded-lg bg-green-500/10 p-2">
@@ -610,7 +613,7 @@
</Card.Content>
</Card.Root>
- <Card.Root>
+ <Card.Root class="rounded-lg border shadow-sm">
<Card.Content class="p-4">
<div class="flex items-center gap-3">
<div class="rounded-lg bg-purple-500/10 p-2">
@@ -641,6 +644,7 @@
</DropdownCard>
</section>
+ <!-- Resources -->
<section>
<h2 class="mb-4 text-lg font-semibold tracking-tight">Resources</h2>
<div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
diff --git a/frontend/src/routes/dashboard/dash-container-table.svelte b/frontend/src/routes/dashboard/dash-container-table.svelte
index b0211dfd7..444cb58c1 100644
--- a/frontend/src/routes/dashboard/dash-container-table.svelte
+++ b/frontend/src/routes/dashboard/dash-container-table.svelte
@@ -44,14 +44,14 @@
});
</script>
-<Card.Root class="relative flex flex-col border shadow-sm">
- <Card.Header class="px-6">
+<Card.Root class="relative flex flex-col rounded-lg border shadow-sm">
+ <Card.Header class="px-6 pb-3 pt-5">
<div class="flex items-center justify-between">
<div>
<Card.Title>
<a class="font-medium hover:underline" href="/containers">Containers</a>
</Card.Title>
- <Card.Description class="pb-3">Recent containers</Card.Description>
+ <Card.Description class="pb-2">Recent containers</Card.Description>
</div>
<Button variant="ghost" size="sm" href="/containers" disabled={isLoading}>
View All
@@ -86,19 +86,19 @@
noResultsMessage="No containers found"
>
{#snippet rows({ item })}
- {@const stateVariant = statusVariantMap[item.State?.toLowerCase()] || 'red'}
- <Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">
<a class="font-medium hover:underline" href="/containers/{item.Id}/">
{getContainerDisplayName(item)}
</a>
</Table.Cell>
- <Table.Cell title={item.Image}>
+ <Table.Cell class="py-3 md:py-3.5" title={item.Image}>
{truncateString(item.Image, 40)}
</Table.Cell>
- <Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">
+ {@const stateVariant = statusVariantMap[item.State?.toLowerCase()] || 'red'}
<StatusBadge variant={stateVariant} text={capitalizeFirstLetter(item.State)} />
</Table.Cell>
- <Table.Cell>{item.Status}</Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">{item.Status}</Table.Cell>
{/snippet}
</ArcaneTable>
{#if containers.length > 5}
diff --git a/frontend/src/routes/dashboard/dash-image-table.svelte b/frontend/src/routes/dashboard/dash-image-table.svelte
index edd7f00aa..2af137df3 100644
--- a/frontend/src/routes/dashboard/dash-image-table.svelte
+++ b/frontend/src/routes/dashboard/dash-image-table.svelte
@@ -48,14 +48,14 @@
});
</script>
-<Card.Root class="relative flex flex-col border shadow-sm">
- <Card.Header class="px-6">
+<Card.Root class="relative flex flex-col rounded-lg border shadow-sm">
+ <Card.Header class="px-6 pb-3 pt-5">
<div class="flex items-center justify-between">
<div>
<Card.Title>
<a class="font-medium hover:underline" href="/images">Images</a>
</Card.Title>
- <Card.Description class="pb-3">Top 5 Largest Images</Card.Description>
+ <Card.Description class="pb-2">Top 5 Largest Images</Card.Description>
</div>
<Button variant="ghost" size="sm" href="/images" disabled={isLoading}>
View All
@@ -90,7 +90,7 @@
noResultsMessage="No images found"
>
{#snippet rows({ item })}
- <Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">
<div class="flex items-center gap-2">
<div class="flex flex-1 items-center">
<a class="shrink truncate font-medium hover:underline" href="/images/{item.Id}/">
@@ -103,21 +103,21 @@
</div>
</div>
</Table.Cell>
- <Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">
{#if item.InUse}
<StatusBadge text="In Use" variant="green" />
{:else}
<StatusBadge text="Unused" variant="amber" />
{/if}
</Table.Cell>
- <Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">
{#if item.RepoTags && item.RepoTags.length > 0 && item.RepoTags[0] !== '<none>:<none>'}
{item.RepoTags[0].split(':')[1] || 'latest'}
{:else}
<span class="text-muted-foreground italic">&lt;none&gt;</span>
{/if}
</Table.Cell>
- <Table.Cell>{formatBytes(item.Size || 0)}</Table.Cell>
+ <Table.Cell class="py-3 md:py-3.5">{formatBytes(item.Size || 0)}</Table.Cell>
{/snippet}
</ArcaneTable>
{#if images.length > 5}
diff --git a/frontend/src/routes/settings/+layout.svelte b/frontend/src/routes/settings/+layout.svelte
index e7afe2372..6550d0b97 100644
--- a/frontend/src/routes/settings/+layout.svelte
+++ b/frontend/src/routes/settings/+layout.svelte
@@ -11,7 +11,7 @@
</script>
<div class="settings-container">
- <div class="settings-content">
+ <div class="settings-content mx-auto w-full max-w-6xl px-4 sm:px-6 lg:px-8">
{@render children()}
</div>
</div>
diff --git a/frontend/src/routes/settings/docker/+page.svelte b/frontend/src/routes/settings/docker/+page.svelte
index 209ab8bd1..18168b926 100644
--- a/frontend/src/routes/settings/docker/+page.svelte
+++ b/frontend/src/routes/settings/docker/+page.svelte
@@ -97,203 +97,210 @@
</script>
<div class="settings-page">
- <!-- Header Section -->
- <div class="settings-header">
- <div class="settings-header-content">
- <h1 class="settings-title">Docker Settings</h1>
- <p class="settings-description">
- Configure Docker automation behavior and container management settings
- </p>
- </div>
-
- <div class="settings-actions">
- <Button
- onclick={() => handleDockerSettingUpdates()}
- disabled={isLoading.saving || !canSave}
- class="arcane-button-save"
- >
- {#if isLoading.saving}
- <RefreshCw class="size-4 animate-spin" />
- Saving...
- {:else}
- <Save class="size-4" />
- Save Settings
- {/if}
- </Button>
- </div>
- </div>
+ <div class="space-y-8">
+ <!-- Header Section -->
+ <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+ <div class="space-y-1">
+ <h1 class="settings-title text-3xl font-bold tracking-tight">Docker Settings</h1>
+ <p class="settings-description text-muted-foreground max-w-2xl text-sm">
+ Configure Docker automation behavior and container management settings
+ </p>
+ </div>
- <!-- Alert Section -->
- {#if currentSettings.autoUpdateEnabled && currentSettings.pollingEnabled}
- <div class="settings-alert">
- <Alert.Root variant="warning">
- <Zap class="size-4" />
- <Alert.Title>Auto-update Enabled</Alert.Title>
- <Alert.Description
- >Automatic container updates are active with polling enabled</Alert.Description
+ <div class="settings-actions">
+ <Button
+ onclick={() => handleDockerSettingUpdates()}
+ disabled={isLoading.saving || !canSave}
+ class="arcane-button-save h-10 min-w-[140px]"
>
- </Alert.Root>
+ {#if isLoading.saving}
+ <RefreshCw class="size-4 animate-spin" />
+ Saving...
+ {:else}
+ <Save class="size-4" />
+ Save Settings
+ {/if}
+ </Button>
+ </div>
</div>
- {/if}
- <!-- Settings Grid -->
- <div class="settings-grid settings-grid-single">
- <div class="grid grid-cols-1 gap-6">
- <Card.Root class="border shadow-sm">
- <Card.Header class="pb-4">
- <div class="flex items-center gap-3">
- <div class="rounded-lg bg-emerald-500/10 p-2.5">
- <Clock class="size-5 text-emerald-600" />
- </div>
- <div>
- <Card.Title class="text-lg">Image Automation</Card.Title>
- <Card.Description>Control automatic image polling and updates</Card.Description>
+ <!-- Alert Section -->
+ {#if currentSettings.autoUpdateEnabled && currentSettings.pollingEnabled}
+ <div class="settings-alert">
+ <Alert.Root variant="warning">
+ <Zap class="size-4" />
+ <Alert.Title>Auto-update Enabled</Alert.Title>
+ <Alert.Description
+ >Automatic container updates are active with polling enabled</Alert.Description
+ >
+ </Alert.Root>
+ </div>
+ {/if}
+
+ <!-- Settings Grid -->
+ <div class="settings-grid grid gap-6 md:grid-cols-1">
+ <div class="grid grid-cols-1 gap-6">
+ <Card.Root class="border shadow-sm rounded-lg">
+ <Card.Header class="pb-2">
+ <div class="flex items-center gap-3">
+ <div class="rounded-md bg-emerald-500/10 p-2.5">
+ <Clock class="size-5 text-emerald-600" />
+ </div>
+ <div>
+ <Card.Title class="text-lg">Image Automation</Card.Title>
+ <Card.Description class="text-sm"
+ >Control automatic image polling and updates</Card.Description
+ >
+ </div>
</div>
- </div>
- </Card.Header>
- <Card.Content class="space-y-6">
- <FormInput
- bind:input={pollingEnabledSwitch}
- type="switch"
- id="pollingEnabled"
- label="Enable Image Polling"
- description="Periodically check registries for newer image versions"
- />
+ </Card.Header>
+ <Card.Content class="space-y-6 pt-0">
+ <FormInput
+ bind:input={pollingEnabledSwitch}
+ type="switch"
+ id="pollingEnabled"
+ label="Enable Image Polling"
+ description="Periodically check registries for newer image versions"
+ />
- {#if currentSettings.pollingEnabled}
- <div class="space-y-4 pl-4">
- <FormInput
- bind:input={pollingIntervalInput}
- type="number"
- id="pollingInterval"
- label="Polling Interval (minutes)"
- placeholder="60"
- description="How often to check for new images (5-1440 minutes)"
- />
+ {#if currentSettings.pollingEnabled}
+ <div class="space-y-4 pl-4">
+ <FormInput
+ bind:input={pollingIntervalInput}
+ type="number"
+ id="pollingInterval"
+ label="Polling Interval (minutes)"
+ placeholder="60"
+ description="How often to check for new images (5-1440 minutes)"
+ />
- {#if pollingIntervalInput.value < 30}
- <Alert.Root variant="warning">
- <Zap class="size-4" />
- <Alert.Title>Rate Limiting Warning</Alert.Title>
- <Alert.Description
- >Polling intervals below 30 minutes may trigger rate limits on Docker
- registries, potentially blocking your account temporarily. Consider using longer
- intervals for production environments.</Alert.Description
- >
- </Alert.Root>
- {/if}
+ {#if pollingIntervalInput.value < 30}
+ <Alert.Root variant="warning">
+ <Zap class="size-4" />
+ <Alert.Title>Rate Limiting Warning</Alert.Title>
+ <Alert.Description
+ >Polling intervals below 30 minutes may trigger rate limits on Docker
+ registries, potentially blocking your account temporarily. Consider using
+ longer intervals for production environments.</Alert.Description
+ >
+ </Alert.Root>
+ {/if}
- <FormInput
- bind:input={autoUpdateSwitch}
- type="switch"
- id="autoUpdateSwitch"
- label="Auto-update Containers"
- description="Automatically update containers when newer images are found"
- />
+ <FormInput
+ bind:input={autoUpdateSwitch}
+ type="switch"
+ id="autoUpdateSwitch"
+ label="Auto-update Containers"
+ description="Automatically update containers when newer images are found"
+ />
- {#if currentSettings.autoUpdateEnabled}
- <div class="pl-4">
- <FormInput
- bind:input={autoUpdateIntervalInput}
- type="number"
- id="autoUpdateInterval"
- label="Auto-update Interval (minutes)"
- placeholder="60"
- description="How often to perform automatic updates (5-1440 minutes)"
- />
- </div>
- {/if}
- </div>
+ {#if currentSettings.autoUpdateEnabled}
+ <div class="pl-4">
+ <FormInput
+ bind:input={autoUpdateIntervalInput}
+ type="number"
+ id="autoUpdateInterval"
+ label="Auto-update Interval (minutes)"
+ placeholder="60"
+ description="How often to perform automatic updates (5-1440 minutes)"
+ />
+ </div>
+ {/if}
+ </div>
- <Alert.Root>
- <InfoIcon />
- <Alert.Title>Automation Summary</Alert.Title>
- <Alert.Description>
- <ul class="list-inside list-disc text-sm">
- {#if currentSettings.autoUpdateEnabled}
- <li>Images checked every {pollingIntervalInput.value || 60} minutes</li>
- {:else}
- <li>Manual updates only (auto-update disabled)</li>
- {/if}
- </ul>
- </Alert.Description>
- </Alert.Root>
- {/if}
- </Card.Content>
- </Card.Root>
- </div>
+ <Alert.Root>
+ <InfoIcon />
+ <Alert.Title>Automation Summary</Alert.Title>
+ <Alert.Description>
+ <ul class="list-inside list-disc text-sm">
+ {#if currentSettings.autoUpdateEnabled}
+ <li>Images checked every {pollingIntervalInput.value || 60} minutes</li>
+ {:else}
+ <li>Manual updates only (auto-update disabled)</li>
+ {/if}
+ </ul>
+ </Alert.Description>
+ </Alert.Root>
+ {/if}
+ </Card.Content>
+ </Card.Root>
+ </div>
- <Card.Root>
- <Card.Header class="pb-4">
- <div class="flex items-center gap-3">
- <div class="rounded-lg bg-purple-500/10 p-2.5">
- <ImageMinus class="size-5 text-purple-600" />
- </div>
- <div>
- <Card.Title class="text-lg">Image Pruning</Card.Title>
- <Card.Description>Configure cleanup behavior for unused Docker images</Card.Description>
+ <Card.Root class="border shadow-sm rounded-lg">
+ <Card.Header class="pb-2">
+ <div class="flex items-center gap-3">
+ <div class="rounded-md bg-purple-500/10 p-2.5">
+ <ImageMinus class="size-5 text-purple-600" />
+ </div>
+ <div>
+ <Card.Title class="text-lg">Image Pruning</Card.Title>
+ <Card.Description class="text-sm"
+ >Configure cleanup behavior for unused Docker images</Card.Description
+ >
+ </div>
</div>
- </div>
- </Card.Header>
- <Card.Content>
- <div class="space-y-4">
- <Label for="pruneMode" class="text-base font-medium">Prune Action Behavior</Label>
+ </Card.Header>
+ <Card.Content class="pt-0">
+ <div class="space-y-4">
+ <Label for="pruneMode" class="text-base font-medium">Prune Action Behavior</Label>
- <RadioGroup.Root
- value={currentSettings.dockerPruneMode || 'all'}
- onValueChange={(val) => {
- updateSettingsConfig({
- dockerPruneMode: val as 'all' | 'dangling'
- }).catch((error) => {
- toast.error('Failed to update prune mode');
- console.error('Error updating prune mode:', error);
- });
- }}
- class="space-y-3"
- id="pruneMode"
- >
- <div
- class="hover:bg-muted/50 flex items-start space-x-3 rounded-lg border p-3 transition-colors"
+ <RadioGroup.Root
+ value={currentSettings.dockerPruneMode || 'all'}
+ onValueChange={(val) => {
+ updateSettingsConfig({
+ dockerPruneMode: val as 'all' | 'dangling'
+ }).catch((error) => {
+ toast.error('Failed to update prune mode');
+ console.error('Error updating prune mode:', error);
+ });
+ }}
+ class="space-y-3"
+ id="pruneMode"
>
- <RadioGroup.Item value="all" id="prune-all" class="mt-0.5" />
- <div class="space-y-1">
- <Label for="prune-all" class="cursor-pointer font-medium">All Unused Images</Label>
- <p class="text-muted-foreground text-sm">
- Remove all images not referenced by containers (equivalent to <code
- class="bg-background rounded px-1 py-0.5 text-xs">docker image prune -a</code
- >)
- </p>
+ <div
+ class="hover:bg-muted/50 flex items-start space-x-3 rounded-lg border p-3 transition-colors"
+ >
+ <RadioGroup.Item value="all" id="prune-all" class="mt-0.5" />
+ <div class="space-y-1">
+ <Label for="prune-all" class="cursor-pointer font-medium">All Unused Images</Label
+ >
+ <p class="text-muted-foreground text-sm">
+ Remove all images not referenced by containers (equivalent to <code
+ class="bg-background rounded px-1 py-0.5 text-xs">docker image prune -a</code
+ >)
+ </p>
+ </div>
</div>
- </div>
- <div
- class="hover:bg-muted/50 flex items-start space-x-3 rounded-lg border p-3 transition-colors"
- >
- <RadioGroup.Item value="dangling" id="prune-dangling" class="mt-0.5" />
- <div class="space-y-1">
- <Label for="prune-dangling" class="cursor-pointer font-medium"
- >Dangling Images Only</Label
- >
- <p class="text-muted-foreground text-sm">
- Remove only untagged images (equivalent to <code
- class="bg-background rounded px-1 py-0.5 text-xs">docker image prune</code
- >)
- </p>
+ <div
+ class="hover:bg-muted/50 flex items-start space-x-3 rounded-lg border p-3 transition-colors"
+ >
+ <RadioGroup.Item value="dangling" id="prune-dangling" class="mt-0.5" />
+ <div class="space-y-1">
+ <Label for="prune-dangling" class="cursor-pointer font-medium"
+ >Dangling Images Only</Label
+ >
+ <p class="text-muted-foreground text-sm">
+ Remove only untagged images (equivalent to <code
+ class="bg-background rounded px-1 py-0.5 text-xs">docker image prune</code
+ >)
+ </p>
+ </div>
</div>
- </div>
- </RadioGroup.Root>
+ </RadioGroup.Root>
- <div class="bg-muted/50 rounded-lg p-3">
- <p class="text-muted-foreground text-sm">
- <strong>Note:</strong> This setting affects the "Prune Unused Images" action on the
- Images page.
- {(currentSettings.dockerPruneMode || 'all') === 'all'
- ? 'All unused images will be removed, which frees up more space but may require re-downloading images later.'
- : 'Only dangling images will be removed, which is safer but may leave some unused images behind.'}
- </p>
+ <div class="bg-muted/50 rounded-lg p-3">
+ <p class="text-muted-foreground text-sm">
+ <strong>Note:</strong> This setting affects the "Prune Unused Images" action on the
+ Images page.
+ {(currentSettings.dockerPruneMode || 'all') === 'all'
+ ? 'All unused images will be removed, which frees up more space but may require re-downloading images later.'
+ : 'Only dangling images will be removed, which is safer but may leave some unused images behind.'}
+ </p>
+ </div>
</div>
- </div>
- </Card.Content>
- </Card.Root>
+ </Card.Content>
+ </Card.Root>
+ </div>
</div>
</div>
diff --git a/frontend/src/routes/settings/general/+page.svelte b/frontend/src/routes/settings/general/+page.svelte
index a7d787a02..e366a3471 100644
--- a/frontend/src/routes/settings/general/+page.svelte
+++ b/frontend/src/routes/settings/general/+page.svelte
@@ -65,20 +65,20 @@
});
</script>
-<div class="space-y-6">
+<div class="space-y-8">
<!-- Header -->
- <div class="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
- <div>
+ <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+ <div class="space-y-1">
<h1 class="text-3xl font-bold tracking-tight">General Settings</h1>
- <p class="text-muted-foreground mt-1 text-sm">
- Core configuration for how Arcane operates and manages your containers
+ <p class="text-muted-foreground max-w-2xl text-sm">
+ Core configuration for how Arcane operates and manages your containers.
</p>
</div>
<Button
onclick={() => handleGeneralSettingUpdates()}
disabled={isLoading.saving}
- class="h-10 min-w-[120px]"
+ class="h-10 min-w-[140px]"
>
{#if isLoading.saving}
<RefreshCw class="size-4 animate-spin" />
@@ -91,21 +91,23 @@
</div>
<!-- Settings Cards -->
- <div class="grid gap-6">
+ <div class="grid gap-6 md:grid-cols-2">
<!-- Storage Configuration -->
- <Card.Root>
- <Card.Header>
+ <Card.Root class="border shadow-sm rounded-lg">
+ <Card.Header class="pb-2">
<div class="flex items-center gap-3">
- <div class="rounded-lg bg-blue-500/10 p-2">
+ <div class="rounded-md bg-blue-500/10 p-2">
<Folder class="size-5 text-blue-600" />
</div>
<div>
- <Card.Title>Storage Configuration</Card.Title>
- <Card.Description>Configure where Arcane stores stack files and data</Card.Description>
+ <Card.Title class="text-lg">Storage Configuration</Card.Title>
+ <Card.Description class="text-sm"
+ >Configure where Arcane stores stack files and data</Card.Description
+ >
</div>
</div>
</Card.Header>
- <Card.Content>
+ <Card.Content class="pt-0">
<FormInput
label="Stacks Directory"
placeholder="data/projects"
@@ -116,19 +118,21 @@
</Card.Root>
<!-- Network Configuration -->
- <Card.Root>
- <Card.Header>
+ <Card.Root class="border shadow-sm rounded-lg">
+ <Card.Header class="pb-2">
<div class="flex items-center gap-3">
- <div class="rounded-lg bg-green-500/10 p-2">
+ <div class="rounded-md bg-green-500/10 p-2">
<Globe class="size-5 text-green-600" />
</div>
<div>
- <Card.Title>Network Configuration</Card.Title>
- <Card.Description>Configure base server URL and network settings</Card.Description>
+ <Card.Title class="text-lg">Network Configuration</Card.Title>
+ <Card.Description class="text-sm"
+ >Configure base server URL and network settings</Card.Description
+ >
</div>
</div>
</Card.Header>
- <Card.Content>
+ <Card.Content class="pt-0">
<FormInput
label="Base Server URL"
placeholder="localhost"
diff --git a/frontend/src/routes/settings/security/+page.svelte b/frontend/src/routes/settings/security/+page.svelte
index 177bfa688..897a3e77c 100644
--- a/frontend/src/routes/settings/security/+page.svelte
+++ b/frontend/src/routes/settings/security/+page.svelte
@@ -162,214 +162,224 @@
</script>
<div class="settings-page">
- <div class="settings-header">
- <div class="settings-header-content">
- <h1 class="settings-title">Security Settings</h1>
- <p class="settings-description">
- Configure authentication methods, session policies, and security settings
- </p>
- </div>
+ <div class="space-y-8">
+ <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+ <div class="space-y-1">
+ <h1 class="text-3xl font-bold tracking-tight">Security Settings</h1>
+ <p class="text-muted-foreground max-w-2xl text-sm">
+ Configure authentication methods, session policies, and security settings.
+ </p>
+ </div>
- <div class="settings-actions">
- <Button
- onclick={() => handleSecuritySettingUpdates()}
- disabled={isLoading.saving}
- class="arcane-button-save"
- >
- {#if isLoading.saving}
- <RefreshCw class="size-4 animate-spin" />
- Saving...
- {:else}
- <Save class="size-4" />
- Save Settings
- {/if}
- </Button>
+ <div>
+ <Button
+ onclick={() => handleSecuritySettingUpdates()}
+ disabled={isLoading.saving}
+ class="h-10 min-w-[140px]"
+ >
+ {#if isLoading.saving}
+ <RefreshCw class="size-4 animate-spin" />
+ Saving...
+ {:else}
+ <Save class="size-4" />
+ Save Settings
+ {/if}
+ </Button>
+ </div>
</div>
- </div>
- <div class="settings-grid settings-grid-double">
- <Card.Root class="settings-card">
- <Card.Header class="settings-card-header">
- <div class="settings-card-title-wrapper">
- <div class="settings-card-icon bg-indigo-500/10">
- <Lock class="size-5 text-indigo-600" />
- </div>
- <div>
- <Card.Title class="settings-card-title">Authentication Methods</Card.Title>
- <Card.Description class="settings-card-description"
- >Configure how users sign in to Arcane</Card.Description
- >
- </div>
- </div>
- </Card.Header>
- <Card.Content>
- <div class="space-y-4">
- <div class="bg-muted/30 flex items-center justify-between rounded-lg border p-4">
- <div class="space-y-0.5">
- <label for="localAuthSwitch" class="text-base font-medium">Local Authentication</label
- >
- <p class="text-muted-foreground text-sm">
- Username and password stored in the system
- </p>
- <p class="text-muted-foreground mt-1 text-xs">
- This is recommended to be enabled as a fallback option if OIDC authentication is
- unavailable.
- </p>
+ <div class="grid gap-6 md:grid-cols-2">
+ <Card.Root class="settings-card border shadow-sm rounded-lg">
+ <Card.Header class="settings-card-header pb-2">
+ <div class="settings-card-title-wrapper flex items-center gap-3">
+ <div class="settings-card-icon rounded-md bg-indigo-500/10 p-2">
+ <Lock class="size-5 text-indigo-600" />
+ </div>
+ <div>
+ <Card.Title class="settings-card-title text-lg">Authentication Methods</Card.Title>
+ <Card.Description class="settings-card-description text-sm">
+ Configure how users sign in to Arcane
+ </Card.Description>
</div>
- <Switch
- id="localAuthSwitch"
- checked={localAuthEnabled}
- onCheckedChange={(checked) => {
- localAuthEnabled = checked;
- }}
- />
</div>
- <div class="bg-muted/30 flex items-center justify-between rounded-lg border p-4">
- <div class="space-y-0.5">
- <label for="oidcAuthSwitch" class="text-base font-medium">OIDC Authentication</label>
- <p class="text-muted-foreground text-sm">
- Use an External OIDC Provider
- {#if data.oidcStatus.envForced}
- <span class="text-muted-foreground text-xs"
- >(Forced ON by server environment)</span
- >
- {/if}
- </p>
- {#if data.oidcStatus.effectivelyEnabled || data.oidcStatus.envForced}
- {#if data.oidcStatus.envForced && !data.oidcStatus.envConfigured}
- <Button
- variant="link"
- class="text-destructive h-auto p-0 text-xs hover:underline"
- onclick={openOidcDialog}
- >
- <AlertTriangle class="mr-1 size-3" />
- Server forces OIDC, but env vars missing. Configure app settings or fix server env.
- </Button>
- {:else if data.oidcStatus.envForced && data.oidcStatus.envConfigured}
- <Button
- variant="link"
- class="h-auto p-0 text-xs text-sky-600 hover:underline"
- onclick={openOidcDialog}
- >
- <Info class="mr-1 size-3" />
- OIDC configured & forced by server. View Status.
- </Button>
- {:else if !data.oidcStatus.envForced && data.oidcStatus.effectivelyEnabled && data.oidcStatus.dbConfigured}
- <Button
- variant="link"
- class="h-auto p-0 text-xs text-sky-600 hover:underline"
- onclick={openOidcDialog}
- >
- <Info class="mr-1 size-3" />
- OIDC configured via application settings. Manage.
- </Button>
- {:else if !data.oidcStatus.envForced && data.oidcStatus.effectivelyEnabled && !data.oidcStatus.dbConfigured}
- <Button
- variant="link"
- class="text-destructive h-auto p-0 text-xs hover:underline"
- onclick={openOidcDialog}
- >
- <AlertTriangle class="mr-1 size-3" />
- OIDC enabled, but app settings incomplete. Configure.
- </Button>
+ </Card.Header>
+ <Card.Content class="pt-0">
+ <div class="space-y-4">
+ <div class="bg-muted/30 flex items-start justify-between rounded-lg border p-4">
+ <div class="space-y-1 pr-4">
+ <label for="localAuthSwitch" class="text-sm font-medium">Local Authentication</label
+ >
+ <p class="text-muted-foreground text-xs">
+ Username and password stored in the system. Recommended as a fallback if OIDC is
+ unavailable.
+ </p>
+ </div>
+ <Switch
+ id="localAuthSwitch"
+ checked={localAuthEnabled}
+ onCheckedChange={(checked) => {
+ localAuthEnabled = checked;
+ }}
+ />
+ </div>
+
+ <div class="bg-muted/30 flex items-start justify-between rounded-lg border p-4">
+ <div class="space-y-1 pr-4">
+ <label for="oidcAuthSwitch" class="text-sm font-medium">OIDC Authentication</label>
+ <p class="text-muted-foreground text-xs">
+ Use an external OIDC provider
+ {#if data.oidcStatus.envForced}
+ <span class="text-muted-foreground text-[11px]"
+ >(Forced ON by server environment)
+ </span>
+ {/if}
+ </p>
+
+ {#if data.oidcStatus.effectivelyEnabled || data.oidcStatus.envForced}
+ <div class="mt-1">
+ {#if data.oidcStatus.envForced && !data.oidcStatus.envConfigured}
+ <Button
+ variant="link"
+ class="text-destructive h-auto p-0 text-xs hover:underline"
+ onclick={openOidcDialog}
+ >
+ <AlertTriangle class="mr-1 size-3" />
+ Server forces OIDC, but env vars missing. Configure app settings or fix server
+ env.
+ </Button>
+ {:else if data.oidcStatus.envForced && data.oidcStatus.envConfigured}
+ <Button
+ variant="link"
+ class="h-auto p-0 text-xs text-sky-600 hover:underline"
+ onclick={openOidcDialog}
+ >
+ <Info class="mr-1 size-3" />
+ OIDC configured & forced by server. View Status.
+ </Button>
+ {:else if !data.oidcStatus.envForced && data.oidcStatus.effectivelyEnabled && data.oidcStatus.dbConfigured}
+ <Button
+ variant="link"
+ class="h-auto p-0 text-xs text-sky-600 hover:underline"
+ onclick={openOidcDialog}
+ >
+ <Info class="mr-1 size-3" />
+ OIDC configured via application settings. Manage.
+ </Button>
+ {:else if !data.oidcStatus.envForced && data.oidcStatus.effectivelyEnabled && !data.oidcStatus.dbConfigured}
+ <Button
+ variant="link"
+ class="text-destructive h-auto p-0 text-xs hover:underline"
+ onclick={openOidcDialog}
+ >
+ <AlertTriangle class="mr-1 size-3" />
+ OIDC enabled, but app settings incomplete. Configure.
+ </Button>
+ {/if}
+ </div>
{/if}
- {/if}
+ </div>
+ <Switch
+ id="oidcAuthSwitch"
+ checked={oidcEnabled}
+ disabled={data.oidcStatus.envForced}
+ onCheckedChange={handleOidcSwitchChange}
+ />
</div>
- <Switch
- id="oidcAuthSwitch"
- checked={oidcEnabled}
- disabled={data.oidcStatus.envForced}
- onCheckedChange={handleOidcSwitchChange}
- />
</div>
- </div>
- </Card.Content>
- </Card.Root>
+ </Card.Content>
+ </Card.Root>
- <OidcConfigDialog
- bind:open={showOidcConfigDialog}
- {currentSettings}
- oidcStatus={data.oidcStatus}
- bind:oidcForm={oidcConfigForm}
- onSave={handleSaveOidcConfig}
- />
+ <OidcConfigDialog
+ bind:open={showOidcConfigDialog}
+ {currentSettings}
+ oidcStatus={data.oidcStatus}
+ bind:oidcForm={oidcConfigForm}
+ onSave={handleSaveOidcConfig}
+ />
- <Card.Root class="settings-card">
- <Card.Header class="settings-card-header">
- <div class="settings-card-title-wrapper">
- <div class="settings-card-icon bg-cyan-500/10">
- <Key class="size-5 text-cyan-600" />
- </div>
- <div>
- <Card.Title class="settings-card-title">Session Settings</Card.Title>
- <Card.Description class="settings-card-description"
- >Configure session behavior and password policies</Card.Description
- >
- </div>
- </div>
- </Card.Header>
- <Card.Content>
- <div class="space-y-4">
- <div class="space-y-2">
- <label for="sessionTimeout" class="text-sm font-medium">Session Timeout (minutes)</label
- >
- <Input
- type="number"
- id="sessionTimeout"
- name="sessionTimeout"
- bind:value={sessionTimeout}
- min="15"
- max="1440"
- />
- <p class="text-muted-foreground text-xs">
- Time until inactive sessions are automatically logged out (15-1440 minutes)
- </p>
+ <Card.Root class="settings-card border shadow-sm rounded-lg">
+ <Card.Header class="settings-card-header pb-2">
+ <div class="settings-card-title-wrapper flex items-center gap-3">
+ <div class="settings-card-icon rounded-md bg-cyan-500/10 p-2">
+ <Key class="size-5 text-cyan-600" />
+ </div>
+ <div>
+ <Card.Title class="settings-card-title text-lg">Session Settings</Card.Title>
+ <Card.Description class="settings-card-description text-sm">
+ Configure session behavior and password policies
+ </Card.Description>
+ </div>
</div>
-
- <div class="space-y-2">
- <label for="passwordPolicy" class="text-sm font-medium">Password Policy</label>
- <div class="grid grid-cols-3 gap-2">
- <Button
- variant={passwordPolicy === 'basic' ? 'default' : 'outline'}
- class={passwordPolicy === 'basic'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => {
- passwordPolicy = 'basic';
- }}>Basic</Button
- >
- <Button
- variant={passwordPolicy === 'standard' ? 'default' : 'outline'}
- class={passwordPolicy === 'standard'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => {
- passwordPolicy = 'standard';
- }}>Standard</Button
- >
- <Button
- variant={passwordPolicy === 'strong' ? 'default' : 'outline'}
- class={passwordPolicy === 'strong'
- ? 'arcane-button-create w-full'
- : 'arcane-button-restart w-full'}
- onclick={() => {
- passwordPolicy = 'strong';
- }}>Strong</Button
+ </Card.Header>
+ <Card.Content class="pt-0">
+ <div class="space-y-5">
+ <div class="space-y-2">
+ <label for="sessionTimeout" class="text-sm font-medium"
+ >Session Timeout (minutes)</label
>
+ <Input
+ type="number"
+ id="sessionTimeout"
+ name="sessionTimeout"
+ bind:value={sessionTimeout}
+ min="15"
+ max="1440"
+ />
+ <p class="text-muted-foreground text-xs">
+ Inactive sessions will be logged out automatically (15–1440 minutes).
+ </p>
+ </div>
+
+ <div class="space-y-2">
+ <label for="passwordPolicy" class="text-sm font-medium">Password Policy</label>
+ <div class="grid grid-cols-3 gap-2">
+ <Button
+ variant={passwordPolicy === 'basic' ? 'default' : 'outline'}
+ class={passwordPolicy === 'basic'
+ ? 'arcane-button-create w-full'
+ : 'arcane-button-restart w-full'}
+ onclick={() => {
+ passwordPolicy = 'basic';
+ }}>Basic</Button
+ >
+ <Button
+ variant={passwordPolicy === 'standard' ? 'default' : 'outline'}
+ class={passwordPolicy === 'standard'
+ ? 'arcane-button-create w-full'
+ : 'arcane-button-restart w-full'}
+ onclick={() => {
+ passwordPolicy = 'standard';
+ }}>Standard</Button
+ >
+ <Button
+ variant={passwordPolicy === 'strong' ? 'default' : 'outline'}
+ class={passwordPolicy === 'strong'
+ ? 'arcane-button-create w-full'
+ : 'arcane-button-restart w-full'}
+ onclick={() => {
+ passwordPolicy = 'strong';
+ }}>Strong</Button
+ >
+ </div>
+ <input
+ type="hidden"
+ id="passwordPolicy"
+ name="passwordPolicy"
+ value={passwordPolicy}
+ />
+ <p class="text-muted-foreground mt-1 text-xs">
+ {#if passwordPolicy === 'basic'}
+ Basic: Minimum 8 characters
+ {:else if passwordPolicy === 'standard'}
+ Standard: Minimum 10 characters, requires mixed case and numbers
+ {:else}
+ Strong: Minimum 12 characters, requires mixed case, numbers and special characters
+ {/if}
+ </p>
</div>
- <input type="hidden" id="passwordPolicy" name="passwordPolicy" value={passwordPolicy} />
- <p class="text-muted-foreground mt-1 text-xs">
- {#if passwordPolicy === 'basic'}
- Basic: Minimum 8 characters
- {:else if passwordPolicy === 'standard'}
- Standard: Minimum 10 characters, requires mixed case and numbers
- {:else}
- Strong: Minimum 12 characters, requires mixed case, numbers and special characters
- {/if}
- </p>
</div>
- </div>
- </Card.Content>
- </Card.Root>
+ </Card.Content>
+ </Card.Root>
+ </div>
</div>
</div>