Skip to content

Modern Docker Management, Designed for Everyone

refactor: ui layout improvements and polish (#1102)

Kyle Mendell35ac6d1052d5
diff --git a/backend/internal/api/ws_handler.go b/backend/internal/api/ws_handler.go
index d031e21a4..912a88020 100644
--- a/backend/internal/api/ws_handler.go
+++ b/backend/internal/api/ws_handler.go
@@ -130,15 +130,10 @@ func NewWebSocketHandler(
wsGroup := group.Group("/environments/:id/ws")
wsGroup.Use(authMiddleware.WithAdminNotRequired().Add())
{
- // Project endpoints (pull moved to Huma handler)
wsGroup.GET("/projects/:projectId/logs", handler.ProjectLogs)
-
- // Container endpoints
wsGroup.GET("/containers/:containerId/logs", handler.ContainerLogs)
wsGroup.GET("/containers/:containerId/stats", handler.ContainerStats)
wsGroup.GET("/containers/:containerId/exec", handler.ContainerExec)
-
- // System endpoints
wsGroup.GET("/system/stats", handler.SystemStats)
}
}
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 7304cabca..3407fd241 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -85,11 +85,11 @@ type Settings struct {
OidcAdminValue SettingVariable `key:"oidcAdminValue,public" meta:"label=OIDC Admin Value;type=text;keywords=oidc,admin,value,role,group;category=security;description=Claim value that grants admin access"`
OidcMergeAccounts SettingVariable `key:"oidcMergeAccounts,public" meta:"label=OIDC Account Merging;type=boolean;keywords=oidc,merge,link,accounts,email,match,existing,users,combine;category=security;description=Allow OIDC logins to merge with existing accounts by email"`
- // Navigation category
- MobileNavigationMode SettingVariable `key:"mobileNavigationMode,public,local" meta:"label=Mobile Navigation Mode;type=select;keywords=mode,style,type,floating,docked,position,layout,design,appearance,bottom;category=navigation;description=Choose between floating or docked navigation on mobile" catmeta:"id=navigation;title=Navigation;icon=navigation;url=/settings/navigation;description=Customize navigation and interface behavior"`
- MobileNavigationShowLabels SettingVariable `key:"mobileNavigationShowLabels,public,local" meta:"label=Show Navigation Labels;type=boolean;keywords=labels,text,icons,display,show,hide,names,captions,titles,visible,toggle;category=navigation;description=Display text labels alongside navigation icons"`
- SidebarHoverExpansion SettingVariable `key:"sidebarHoverExpansion,public,local" meta:"label=Sidebar Hover Expansion;type=boolean;keywords=sidebar,hover,expansion,expand,desktop,mouse,over,collapsed,collapsible,icon,labels,text,preview,peek,tooltip,overlay,temporary,quick,access,navigation,menu,items,submenu,nested;category=navigation;description=Expand sidebar on hover in desktop mode"`
- GlassEffectEnabled SettingVariable `key:"glassEffectEnabled,public,local" meta:"label=Glass Effect;type=boolean;keywords=glass,glassmorphism,blur,backdrop,frosted,effect,gradient,ambient,design,ui,appearance,modern,visual,style,theme,transparency,translucent;category=navigation;description=Enable modern glassmorphism design with blur, gradients, and ambient effects"`
+ // Appearance category
+ MobileNavigationMode SettingVariable `key:"mobileNavigationMode,public,local" meta:"label=Mobile Navigation Mode;type=select;keywords=mode,style,type,floating,docked,position,layout,design,appearance,bottom;category=appearance;description=Choose between floating or docked navigation on mobile" catmeta:"id=appearance;title=Appearance;icon=appearance;url=/settings/appearance;description=Customize navigation, theme, and interface behavior"`
+ MobileNavigationShowLabels SettingVariable `key:"mobileNavigationShowLabels,public,local" meta:"label=Show Navigation Labels;type=boolean;keywords=labels,text,icons,display,show,hide,names,captions,titles,visible,toggle;category=appearance;description=Display text labels alongside navigation icons"`
+ SidebarHoverExpansion SettingVariable `key:"sidebarHoverExpansion,public,local" meta:"label=Sidebar Hover Expansion;type=boolean;keywords=sidebar,hover,expansion,expand,desktop,mouse,over,collapsed,collapsible,icon,labels,text,preview,peek,tooltip,overlay,temporary,quick,access,navigation,menu,items,submenu,nested;category=appearance;description=Expand sidebar on hover in desktop mode"`
+ GlassEffectEnabled SettingVariable `key:"glassEffectEnabled,public,local" meta:"label=Glass Effect;type=boolean;keywords=glass,glassmorphism,blur,backdrop,frosted,effect,gradient,ambient,design,ui,appearance,modern,visual,style,theme,transparency,translucent;category=appearance;description=Enable modern glassmorphism design with blur, gradients, and ambient effects"`
// Notifications category (placeholder for category metadata only - actual settings managed via notification service)
NotificationsCategoryPlaceholder SettingVariable `key:"notificationsCategory,internal" meta:"label=Notifications;type=internal;keywords=notifications,alerts,email,discord,webhooks,events,messages;category=notifications;description=Configure notification providers and alerts" catmeta:"id=notifications;title=Notifications;icon=bell;url=/settings/notifications;description=Configure email and Discord notifications for container and image updates"`
@@ -101,7 +101,7 @@ type Settings struct {
UsersCategoryPlaceholder SettingVariable `key:"usersCategory,internal" meta:"label=Users;type=internal;keywords=users,accounts,management,admin,access,permissions,roles;category=users;description=Manage user accounts and permissions" catmeta:"id=users;title=Users;icon=user;url=/settings/users;description=Manage user accounts and access control"`
// API Keys category (admin management page - no actual settings)
- ApiKeysCategoryPlaceholder SettingVariable `key:"apiKeysCategory,internal" meta:"label=API Keys;type=internal;keywords=api,keys,tokens,authentication,access,programmatic,integration;category=apikeys;description=Manage API keys for programmatic access" catmeta:"id=apikeys;title=API Keys;icon=key;url=/settings/api-keys;description=Create and manage API keys for programmatic access to Arcane"`
+ ApiKeysCategoryPlaceholder SettingVariable `key:"apiKeysCategory,internal" meta:"label=API Keys;type=internal;keywords=api,keys,tokens,authentication,access,programmatic,integration;category=apikeys;description=Manage API keys for programmatic access" catmeta:"id=apikeys;title=API Keys;icon=apikey;url=/settings/api-keys;description=Create and manage API keys for programmatic access to Arcane"`
}
func (SettingVariable) TableName() string {
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 3aaecbf81..5bac1bced 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -16,6 +16,7 @@
"common_refresh": "Refresh",
"common_unknown": "Unknown",
"common_remove": "Remove",
+ "common_update": "Update",
"common_id": "ID",
"common_name": "Name",
"common_status": "Status",
@@ -104,6 +105,7 @@
"common_disabled": "Disabled",
"common_enable": "Enable",
"common_disable": "Disable",
+ "common_current": "Current",
"common_online": "Online",
"common_offline": "Offline",
"common_copy": "Copy",
@@ -733,6 +735,16 @@
"_comment_settings": "=== SETTINGS ===",
"settings_title": "Settings",
"settings_description": "Configure the application settings",
+ "settings_subtitle": "Configure and customize your Arcane experience",
+ "settings_search_placeholder": "Search settings...",
+ "settings_search_results": "Search Results for {query} - {count} results",
+ "settings_searching": "Searching...",
+ "settings_no_results": "No settings found",
+ "settings_no_results_description": "Try adjusting your search terms or browse categories above.",
+ "settings_go_to_page": "Go to Page",
+ "settings_matching_settings": "Matching Settings:",
+ "settings_more_keywords": "+{count} more",
+ "settings_clear_search": "Clear search",
"_comment_settings_general": "=== SETTINGS - GENERAL ===",
"general_title": "General",
"general_description": "Core configuration settings for the application",
@@ -839,6 +851,8 @@
"navigation_description": "Customize navigation behavior and appearance",
"navigation_mobile_appearance_title": "Mobile Appearance",
"navigation_mobile_appearance_description": "Configure the visual style and presentation of mobile interface",
+ "appearance_title": "Appearance",
+ "appearance_description": "Customize the look and feel of Arcane",
"navigation_mode_label": "Navigation Mode",
"navigation_mode_description": "Choose between floating navigation that overlays content or docked navigation that takes up screen space",
"navigation_mode_floating": "Floating",
@@ -1042,7 +1056,7 @@
"docker_info_dialog_description": "Detailed information about your container installation",
"docker_info_version_section": "Version Information",
"docker_info_system_section": "System Information",
- "docker_info_stats_section": "Container Statistics",
+ "docker_info_stats_section": "Resource Statistics",
"docker_info_api_version_label": "API Version",
"docker_info_server_version_label": "Server Version",
"docker_info_git_commit_label": "Git Commit",
@@ -1099,6 +1113,7 @@
"version_info_digest": "Image Digest",
"version_info_view_release": "View Release",
"sidebar_management": "Management",
+ "sidebar_resources": "Resources",
"sidebar_customization": "Customization",
"sidebar_environments": "Environments",
"sidebar_administration": "Administration",
@@ -1429,5 +1444,17 @@
"common_done": "Done",
"common_important": "Important",
"select_a_date": "Select a date",
- "api_reference": "API Reference"
+ "api_reference": "API Reference",
+ "common_uptime": "Uptime",
+ "common_health_status": "Health Status",
+ "common_started": "Started",
+ "common_finished": "Finished",
+ "common_restart_policy": "Restart Policy",
+ "containers_ports_published_exposed": "{published} published, {exposed} exposed",
+ "containers_ports_published": "{published} published",
+ "containers_ports_exposed": "{exposed} exposed",
+ "common_mount": "mount",
+ "common_mounts": "mounts",
+ "common_image_id": "Image ID",
+ "common_entrypoint": "Entrypoint"
}
diff --git a/frontend/package.json b/frontend/package.json
index 8f579d893..779b425f8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -44,9 +44,9 @@
"svelte-codemirror-editor": "^2.1.0"
},
"devDependencies": {
+ "@iconify/json": "^2.2.416",
"@inlang/paraglide-js": "2.6.0",
"@internationalized/date": "^3.10.0",
- "@lucide/svelte": "^0.556.0",
"@sveltejs/kit": "^2.49.1",
"@sveltejs/vite-plugin-svelte": "^6.2.1",
"@tailwindcss/vite": "^4.1.16",
@@ -74,6 +74,7 @@
"tsx": "^4.21.0",
"tw-animate-css": "^1.4.0",
"typescript": "^5.9.3",
+ "unplugin-icons": "^22.5.0",
"vaul-svelte": "1.0.0-next.7",
"vite": "^7.2.7",
"vite-plugin-devtools-json": "^1.0.0",
diff --git a/frontend/src/app.d.ts b/frontend/src/app.d.ts
index 423343b2f..262131f92 100644
--- a/frontend/src/app.d.ts
+++ b/frontend/src/app.d.ts
@@ -1,4 +1,4 @@
-import type { User } from '$lib/types/user.type';
+import 'unplugin-icons/types/svelte';
declare global {
namespace App {
diff --git a/frontend/src/lib/components/accent-color/accent-color-picker.svelte b/frontend/src/lib/components/accent-color/accent-color-picker.svelte
index cc2475f51..5d3fbd96c 100644
--- a/frontend/src/lib/components/accent-color/accent-color-picker.svelte
+++ b/frontend/src/lib/components/accent-color/accent-color-picker.svelte
@@ -2,9 +2,8 @@
import { Label } from '$lib/components/ui/label/index.js';
import * as RadioGroup from '$lib/components/ui/radio-group/index.js';
import { applyAccentColor } from '$lib/utils/accent-color-util';
- import PlusIcon from '@lucide/svelte/icons/plus';
- import CheckIcon from '@lucide/svelte/icons/check';
import CustomColorDialog from './custom-color.svelte';
+ import { CheckIcon, AddIcon } from '$lib/icons';
let {
selectedColor = $bindable(),
@@ -81,11 +80,11 @@
<div
class="bg-muted absolute inset-0 flex items-center justify-center rounded-full border-2 border-dashed border-gray-300"
>
- <PlusIcon class="text-muted-foreground size-4" />
+ <AddIcon class="text-muted-foreground size-4" />
</div>
{:else if isSelected}
<div class="absolute inset-0 flex items-center justify-center">
- <CheckIcon class="size-4 text-white drop-shadow-sm" />
+ <CheckIcon class="size-6 text-white drop-shadow-sm" />
</div>
{/if}
</div>
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index fa6843735..028a8820e 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -6,8 +6,6 @@
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import ProgressPopover from '$lib/components/progress-popover.svelte';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { m } from '$lib/paraglide/messages';
import { containerService } from '$lib/services/container-service';
@@ -18,6 +16,7 @@
calculateOverallProgress,
areAllLayersComplete
} from '$lib/utils/pull-progress';
+ import { EllipsisIcon, DownloadIcon } from '$lib/icons';
type TargetType = 'container' | 'project';
type LoadingStates = {
diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.ts
index cbad50652..4485f7e56 100644
--- a/frontend/src/lib/components/arcane-button/variants.ts
+++ b/frontend/src/lib/components/arcane-button/variants.ts
@@ -1,21 +1,24 @@
import { tv, type VariantProps } from 'tailwind-variants';
-import CircleStopIcon from '@lucide/svelte/icons/circle-stop';
-import PlayIcon from '@lucide/svelte/icons/play';
-import RotateCcwIcon from '@lucide/svelte/icons/rotate-ccw';
-import DownloadIcon from '@lucide/svelte/icons/download';
-import Trash2Icon from '@lucide/svelte/icons/trash-2';
-import RefreshCcwDotIcon from '@lucide/svelte/icons/refresh-ccw-dot';
-import RefreshCcwIcon from '@lucide/svelte/icons/refresh-ccw';
-import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
-import FileTextIcon from '@lucide/svelte/icons/file-text';
-import EditIcon from '@lucide/svelte/icons/edit';
-import CheckIcon from '@lucide/svelte/icons/check';
-import XIcon from '@lucide/svelte/icons/x';
-import SaveIcon from '@lucide/svelte/icons/save';
-import PlusCircleIcon from '@lucide/svelte/icons/plus-circle';
-import LayoutTemplateIcon from '@lucide/svelte/icons/layout-template';
import { m } from '$lib/paraglide/messages';
+import {
+ StopIcon,
+ StartIcon,
+ RefreshIcon,
+ DownloadIcon,
+ TrashIcon,
+ UpdateIcon,
+ EditIcon,
+ CheckIcon,
+ AddIcon,
+ CloseIcon,
+ SaveIcon,
+ RestartIcon,
+ InspectIcon,
+ FileTextIcon,
+ TemplateIcon,
+ type IconType
+} from '$lib/icons';
export const arcaneButtonVariants = tv({
base:
@@ -68,13 +71,12 @@ export type Action =
| 'cancel'
| 'save'
| 'create'
- | 'template';
-
-export type IconCtor = typeof PlayIcon;
+ | 'template'
+ | 'update';
export type ActionConfig = {
defaultLabel: string;
- IconComponent: IconCtor;
+ IconComponent: IconType;
tone: ArcaneButtonTone;
loadingLabel?: string;
};
@@ -82,31 +84,31 @@ export type ActionConfig = {
export const actionConfigs: Record<Action, ActionConfig> = {
start: {
defaultLabel: m.common_start(),
- IconComponent: PlayIcon,
+ IconComponent: StartIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_starting()
},
deploy: {
defaultLabel: m.common_up(),
- IconComponent: PlayIcon,
+ IconComponent: StartIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_deploying()
},
stop: {
defaultLabel: m.common_stop(),
- IconComponent: CircleStopIcon,
+ IconComponent: StopIcon,
tone: 'outline-destructive',
loadingLabel: m.common_action_stopping()
},
remove: {
defaultLabel: m.common_remove(),
- IconComponent: Trash2Icon,
+ IconComponent: TrashIcon,
tone: 'outline-destructive',
loadingLabel: m.common_action_removing()
},
restart: {
defaultLabel: m.common_restart(),
- IconComponent: RotateCcwIcon,
+ IconComponent: RestartIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_restarting()
},
@@ -118,19 +120,19 @@ export const actionConfigs: Record<Action, ActionConfig> = {
},
redeploy: {
defaultLabel: m.common_redeploy(),
- IconComponent: RefreshCcwDotIcon,
+ IconComponent: RestartIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_redeploying()
},
refresh: {
defaultLabel: m.common_refresh(),
- IconComponent: RefreshCcwIcon,
+ IconComponent: RefreshIcon,
tone: 'outline-primary',
loadingLabel: m.common_refresh()
},
inspect: {
defaultLabel: m.common_inspect(),
- IconComponent: ScanSearchIcon,
+ IconComponent: InspectIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_inspecting()
},
@@ -144,13 +146,13 @@ export const actionConfigs: Record<Action, ActionConfig> = {
save: { defaultLabel: m.common_save(), IconComponent: SaveIcon, tone: 'outline-primary', loadingLabel: m.common_saving() },
create: {
defaultLabel: m.common_create(),
- IconComponent: PlusCircleIcon,
+ IconComponent: AddIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_creating()
},
template: {
defaultLabel: m.common_use_template(),
- IconComponent: LayoutTemplateIcon,
+ IconComponent: TemplateIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_creating()
},
@@ -160,5 +162,16 @@ export const actionConfigs: Record<Action, ActionConfig> = {
tone: 'ghost',
loadingLabel: m.common_action_fetching_logs()
},
- cancel: { defaultLabel: m.common_cancel(), IconComponent: XIcon, tone: 'ghost', loadingLabel: m.common_action_cancelling() }
+ cancel: {
+ defaultLabel: m.common_cancel(),
+ IconComponent: CloseIcon,
+ tone: 'ghost',
+ loadingLabel: m.common_action_cancelling()
+ },
+ update: {
+ defaultLabel: m.common_update(),
+ IconComponent: UpdateIcon,
+ tone: 'outline-primary',
+ loadingLabel: m.common_action_updating()
+ }
};
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
index a340d2ba0..62f50ff69 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
@@ -1,6 +1,4 @@
<script lang="ts" generics="TData, TValue">
- import ListFilterIcon from '@lucide/svelte/icons/list-filter';
- import CheckIcon from '@lucide/svelte/icons/check';
import type { Column } from '@tanstack/table-core';
import { SvelteSet } from 'svelte/reactivity';
import * as Command from '$lib/components/ui/command/index.js';
@@ -11,6 +9,7 @@
import { Badge } from '$lib/components/ui/badge/index.js';
import type { Component } from 'svelte';
import { m } from '$lib/paraglide/messages';
+ import { CheckIcon, FilterIcon } from '$lib/icons';
let {
column,
@@ -41,7 +40,7 @@
class="h-8 border-dashed"
data-testid={`facet-${title.toLowerCase()}-trigger`}
>
- <ListFilterIcon />
+ <FilterIcon />
{title}
{#if selectedValues.size > 0}
<Separator orientation="vertical" class="mx-2 h-4" />
@@ -65,7 +64,7 @@
</Button>
{/snippet}
</Popover.Trigger>
- <Popover.Content class="w-[200px] p-0" align="start" data-testid={`facet-${title.toLowerCase()}-content`}>
+ <Popover.Content class="w-[240px] p-0" align="start" data-testid={`facet-${title.toLowerCase()}-content`}>
<Command.Root>
<Command.Input placeholder={title} />
<Command.List>
@@ -81,23 +80,24 @@
const filterValues = Array.from(selectedValues);
column?.setFilterValue(filterValues.length ? filterValues : undefined);
}}
+ class="gap-2"
>
{#if showCheckboxes}
<div
class={cn(
- 'border-primary mr-2 flex size-4 items-center justify-center rounded-sm border',
+ 'border-primary flex size-4 shrink-0 items-center justify-center rounded-sm border',
isSelected ? 'bg-primary text-primary-foreground' : 'opacity-50 [&_svg]:invisible'
)}
>
- <CheckIcon class="size-4" />
+ <CheckIcon class="text-foreground size-6" />
</div>
{/if}
{#if option.icon}
{@const Icon = option.icon}
- <Icon class="text-muted-foreground" />
+ <Icon class="text-muted-foreground shrink-0" />
{/if}
- <span>{option.label}</span>
+ <span class="truncate">{option.label}</span>
</Command.Item>
{/each}
</Command.Group>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
index 11f7d9be3..3119a1582 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
@@ -1,5 +1,4 @@
<script lang="ts" generics="TData">
- import XIcon from '@lucide/svelte/icons/x';
import type { Table } from '@tanstack/table-core';
import { DataTableFacetedFilter, DataTableViewOptions } from './index.js';
import Button from '$lib/components/ui/button/button.svelte';
@@ -9,6 +8,8 @@
import { ArcaneButton } from '$lib/components/arcane-button';
import { m } from '$lib/paraglide/messages';
import type { Snippet } from 'svelte';
+ import { cn } from '$lib/utils';
+ import { ResetIcon } from '$lib/icons';
let {
table,
@@ -17,7 +18,8 @@
onRemoveSelected,
mobileFields = [],
onToggleMobileField,
- customViewOptions
+ customViewOptions,
+ class: className
}: {
table: Table<TData>;
selectedIds?: string[];
@@ -26,6 +28,7 @@
mobileFields?: { id: string; label: string; visible: boolean }[];
onToggleMobileField?: (fieldId: string) => void;
customViewOptions?: Snippet;
+ class?: string;
} = $props();
const isFiltered = $derived(table.getState().columnFilters.length > 0 || !!table.getState().globalFilter);
@@ -42,7 +45,7 @@
const hasSelection = $derived(!selectionDisabled && (selectedIds?.length ?? 0) > 0);
</script>
-<div class="flex flex-col gap-2 px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
+<div class={cn('flex flex-col gap-2 px-6 py-4 sm:flex-row sm:items-center sm:justify-between', className)}>
<div class="flex flex-col gap-2 sm:flex-1 sm:flex-row sm:items-center sm:justify-between">
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:space-x-2">
<div class="flex items-center gap-2">
@@ -90,7 +93,7 @@
class="h-8 px-2 lg:px-3"
>
{m.common_reset()}
- <XIcon />
+ <ResetIcon />
</Button>
{/if}
</div>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte b/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
index da07d0e2b..ec27e2818 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
@@ -1,10 +1,10 @@
<script lang="ts" generics="TData">
- import Settings2Icon from '@lucide/svelte/icons/settings-2';
import type { Table } from '@tanstack/table-core';
import { buttonVariants } from '$lib/components/ui/button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { m } from '$lib/paraglide/messages';
import type { Snippet } from 'svelte';
+ import { ViewOptionsIcon } from '$lib/icons';
let {
table,
@@ -27,7 +27,7 @@
class: 'h-8'
})}
>
- <Settings2Icon />
+ <ViewOptionsIcon />
{m.common_view()}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/lib/components/arcane-table/arcane-table.svelte b/frontend/src/lib/components/arcane-table/arcane-table.svelte
index 357f3f1a3..2ba074091 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table.svelte
@@ -18,14 +18,6 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { renderComponent, renderSnippet } from '$lib/components/ui/data-table/render-helpers.js';
import { Button } from '$lib/components/ui/button/index.js';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
- import ChevronsLeftIcon from '@lucide/svelte/icons/chevrons-left';
- import ChevronsRightIcon from '@lucide/svelte/icons/chevrons-right';
- import ArrowUpIcon from '@lucide/svelte/icons/arrow-up';
- import ArrowDownIcon from '@lucide/svelte/icons/arrow-down';
- import ChevronsUpDownIcon from '@lucide/svelte/icons/chevrons-up-down';
- import EyeOffIcon from '@lucide/svelte/icons/eye-off';
import * as Select from '$lib/components/ui/select/index.js';
import type { SvelteHTMLElements } from 'svelte/elements';
import { cn } from '$lib/utils.js';
@@ -52,7 +44,17 @@
} from './arcane-table.types.svelte';
import { buildInitialMobileVisibility, extractPersistedPreferences, filterMapsEqual, toFilterMap } from './arcane-table.utils';
import * as Empty from '$lib/components/ui/empty/index.js';
- import FolderXIcon from '@lucide/svelte/icons/folder-x';
+ import {
+ ArrowRightIcon,
+ ArrowLeftIcon,
+ DoubleArrowRightIcon,
+ DoubleArrowLeftIcon,
+ ArrowUpIcon,
+ ArrowDownIcon,
+ ArrowsUpDownIcon,
+ EyeOffIcon,
+ FolderXIcon
+ } from '$lib/icons';
let {
items,
@@ -541,19 +543,19 @@
<div class="flex items-center space-x-1 sm:space-x-2">
<Button variant="outline" class="hidden size-8 p-0 lg:flex" onclick={() => setPage(1)} disabled={!canPrev}>
<span class="sr-only">{m.common_go_first_page()}</span>
- <ChevronsLeftIcon />
+ <DoubleArrowLeftIcon />
</Button>
<Button variant="outline" class="size-8 p-0" onclick={() => setPage(currentPage - 1)} disabled={!canPrev}>
<span class="sr-only">{m.common_go_prev_page()}</span>
- <ChevronLeftIcon />
+ <ArrowLeftIcon />
</Button>
<Button variant="outline" class="size-8 p-0" onclick={() => setPage(currentPage + 1)} disabled={!canNext}>
<span class="sr-only">{m.common_go_next_page()}</span>
- <ChevronRightIcon />
+ <ArrowRightIcon />
</Button>
<Button variant="outline" class="hidden size-8 p-0 lg:flex" onclick={() => setPage(totalPages)} disabled={!canNext}>
<span class="sr-only">{m.common_go_last_page()}</span>
- <ChevronsRightIcon />
+ <DoubleArrowRightIcon />
</Button>
</div>
</div>
@@ -588,23 +590,23 @@
{:else if column.getIsSorted() === 'asc'}
<ArrowUpIcon />
{:else}
- <ChevronsUpDownIcon />
+ <ArrowsUpDownIcon />
{/if}
</Button>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="start">
<DropdownMenu.Item onclick={() => column.toggleSorting(false)}>
- <ArrowUpIcon class="text-muted-foreground/70 mr-2 size-3.5" />
+ <ArrowUpIcon class="text-muted-foreground/70 mr-2 size-4" />
{m.common_sort_asc()}
</DropdownMenu.Item>
<DropdownMenu.Item onclick={() => column.toggleSorting(true)}>
- <ArrowDownIcon class="text-muted-foreground/70 mr-2 size-3.5" />
+ <ArrowDownIcon class="text-muted-foreground/70 mr-2 size-4" />
{m.common_sort_desc()}
</DropdownMenu.Item>
<DropdownMenu.Separator />
<DropdownMenu.Item onclick={() => column.toggleVisibility(false)}>
- <EyeOffIcon class="text-muted-foreground/70 mr-2 size-3.5" />
+ <EyeOffIcon class="text-muted-foreground/70 mr-2 size-4" />
{m.common_hide()}
</DropdownMenu.Item>
</DropdownMenu.Content>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts b/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts
index 451f215e5..5dd58d188 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts
+++ b/frontend/src/lib/components/arcane-table/arcane-table.types.svelte.ts
@@ -7,6 +7,8 @@ export type FieldSpec = {
defaultVisible?: boolean;
};
+export type MobileFieldVisibility = Record<string, boolean>;
+
export type ColumnSpec<T> = {
accessorKey?: keyof T & string;
accessorFn?: (row: T) => any;
diff --git a/frontend/src/lib/components/arcane-table/arcane-table.utils.ts b/frontend/src/lib/components/arcane-table/arcane-table.utils.ts
index 361fae0f0..f689d325e 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table.utils.ts
+++ b/frontend/src/lib/components/arcane-table/arcane-table.utils.ts
@@ -1,6 +1,6 @@
import type { ColumnFiltersState } from '@tanstack/table-core';
import type { FilterMap } from '$lib/types/pagination.type';
-import type { CompactTablePrefs, FieldSpec } from './arcane-table.types.svelte';
+import type { CompactTablePrefs, FieldSpec, MobileFieldVisibility } from './arcane-table.types.svelte';
import { decodeFilters, applyMobileHiddenPatch } from './arcane-table.types.svelte';
export type PersistedPreferencesSnapshot = {
@@ -80,11 +80,11 @@ export function extractPersistedPreferences(
export function buildInitialMobileVisibility(
fields: FieldSpec[],
- mobileFieldVisibility: Record<string, boolean>,
+ mobileFieldVisibility: MobileFieldVisibility,
persistedHidden?: string[]
-): Record<string, boolean> | null {
+): MobileFieldVisibility | null {
if (!fields.length || Object.keys(mobileFieldVisibility).length) return null;
- const initial: Record<string, boolean> = {};
+ const initial: MobileFieldVisibility = {};
for (const field of fields) {
initial[field.id] = field.defaultVisible ?? true;
}
diff --git a/frontend/src/lib/components/arcane-table/data.ts b/frontend/src/lib/components/arcane-table/data.ts
index 7b26a8430..9a063ee42 100644
--- a/frontend/src/lib/components/arcane-table/data.ts
+++ b/frontend/src/lib/components/arcane-table/data.ts
@@ -1,25 +1,16 @@
-import BadgeCheckIcon from '@lucide/svelte/icons/badge-check';
-import BadgeXIcon from '@lucide/svelte/icons/badge-x';
-import CircleFadingArrowUp from '@lucide/svelte/icons/circle-fading-arrow-up';
-import CircleCheck from '@lucide/svelte/icons/circle-check';
-import InfoIcon from '@lucide/svelte/icons/info';
-import TriangleAlertIcon from '@lucide/svelte/icons/triangle-alert';
-import CircleXIcon from '@lucide/svelte/icons/circle-x';
-import CircleCheckIcon from '@lucide/svelte/icons/circle-check';
-import FolderOpenIcon from '@lucide/svelte/icons/folder-open';
-import GlobeIcon from '@lucide/svelte/icons/globe';
import { m } from '$lib/paraglide/messages';
+import { GlobeIcon, FolderOpenIcon, VerifiedCheckIcon, AlertIcon, InfoIcon, CloseIcon, CheckIcon, UpdateIcon } from '$lib/icons';
export const usageFilters = [
{
value: true,
label: m.common_in_use(),
- icon: BadgeCheckIcon
+ icon: VerifiedCheckIcon
},
{
value: false,
label: m.common_unused(),
- icon: CircleCheck
+ icon: AlertIcon
}
];
@@ -27,12 +18,12 @@ export const imageUpdateFilters = [
{
value: true,
label: m.images_has_updates(),
- icon: CircleFadingArrowUp
+ icon: UpdateIcon
},
{
value: false,
label: m.images_no_updates(),
- icon: BadgeXIcon
+ icon: VerifiedCheckIcon
}
];
@@ -45,17 +36,17 @@ export const severityFilters = [
{
value: 'success',
label: m.events_success(),
- icon: CircleCheckIcon
+ icon: CheckIcon
},
{
value: 'warning',
label: m.events_warning(),
- icon: TriangleAlertIcon
+ icon: AlertIcon
},
{
value: 'error',
label: m.events_error(),
- icon: CircleXIcon
+ icon: CloseIcon
}
];
diff --git a/frontend/src/lib/components/arcane-table/index.ts b/frontend/src/lib/components/arcane-table/index.ts
index 50bb8a3e9..56c9f1a3b 100644
--- a/frontend/src/lib/components/arcane-table/index.ts
+++ b/frontend/src/lib/components/arcane-table/index.ts
@@ -1,6 +1,6 @@
export { default as DataTableToolbar } from './arcane-table-toolbar.svelte';
export { default as DataTableViewOptions } from './arcane-table-view-options.svelte';
export { default as DataTableFacetedFilter } from './arcane-table-filter.svelte';
-export type { ColumnSpec, FieldSpec } from './arcane-table.types.svelte';
+export type { ColumnSpec, FieldSpec, MobileFieldVisibility } from './arcane-table.types.svelte';
export { default as UniversalMobileCard } from './cards/universal-mobile-card.svelte';
export { usageFilters, imageUpdateFilters, severityFilters } from './data.js';
diff --git a/frontend/src/lib/components/badges/port-badge.svelte b/frontend/src/lib/components/badges/port-badge.svelte
index c100a516c..7642d30f8 100644
--- a/frontend/src/lib/components/badges/port-badge.svelte
+++ b/frontend/src/lib/components/badges/port-badge.svelte
@@ -2,12 +2,14 @@
import type { ContainerPorts } from '$lib/types/container.type';
import { m } from '$lib/paraglide/messages';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import settingsStore from '$lib/stores/config-store';
- let { ports = [] as ContainerPorts[], baseServerUrl = '' } = $props<{
+ let { ports = [] as ContainerPorts[] } = $props<{
ports?: ContainerPorts[];
- baseServerUrl?: string;
}>();
+ const baseServerUrl = $derived($settingsStore?.baseServerUrl ?? 'http://localhost');
+
type NormalizedPort = {
hostPort: string | null;
containerPort: string;
diff --git a/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte b/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
index a7cdd939a..f69ef6b18 100644
--- a/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
+++ b/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
- import LockIcon from '@lucide/svelte/icons/lock';
+ import { LockIcon } from '$lib/icons';
import * as Tooltip from '$lib/components/ui/tooltip';
const active = $derived.by(() => $settingsStore.uiConfigDisabled);
diff --git a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
index 45410886e..49efec847 100644
--- a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
+++ b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Dialog from '$lib/components/ui/dialog';
- import TriangleAlert from '@lucide/svelte/icons/triangle-alert';
+ import { AlertIcon } from '$lib/icons';
import { confirmDialogStore } from '.';
import Button from '../ui/button/button.svelte';
import { Label } from '$lib/components/ui/label';
@@ -30,7 +30,7 @@
<Dialog.Content class="w-full max-w-md sm:max-w-lg">
<Dialog.Header class="space-y-3">
<Dialog.Title class="flex items-start gap-3 text-lg leading-tight font-semibold">
- <TriangleAlert class="text-destructive mt-0.5 size-5 shrink-0" />
+ <AlertIcon class="text-destructive mt-0.5 size-5 shrink-0" />
<span class="min-w-0 break-words">
{$confirmDialogStore.title}
</span>
diff --git a/frontend/src/lib/components/dialogs/create-container-dialog.svelte b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
index 6e1a1ab2d..b68f8dd2a 100644
--- a/frontend/src/lib/components/dialogs/create-container-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
@@ -9,47 +9,38 @@
import { Input } from '$lib/components/ui/input/index.js';
import { Textarea } from '$lib/components/ui/textarea/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import ContainerIcon from '@lucide/svelte/icons/container';
- import XIcon from '@lucide/svelte/icons/x';
- import PlusIcon from '@lucide/svelte/icons/plus';
- import BoxIcon from '@lucide/svelte/icons/box';
- import VariableIcon from '@lucide/svelte/icons/variable';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import ShieldIcon from '@lucide/svelte/icons/shield';
- import SettingsIcon from '@lucide/svelte/icons/settings';
import type { ContainerCreateRequest } from '$lib/types/container.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import SelectWithLabel from '../form/select-with-label.svelte';
import { m } from '$lib/paraglide/messages';
+ import {
+ SettingsIcon,
+ SecurityIcon,
+ AddIcon,
+ NetworksIcon,
+ VolumesIcon,
+ CloseIcon,
+ VariableIcon,
+ ContainersIcon
+ } from '$lib/icons';
type CreateContainerFormProps = {
open: boolean;
onSubmit: (data: ContainerCreateRequest) => void;
isLoading: boolean;
- availableImages?: string[];
- availableNetworks?: string[];
- availableVolumes?: string[];
};
- let {
- open = $bindable(false),
- onSubmit,
- isLoading,
- availableImages = [],
- availableNetworks = [],
- availableVolumes = []
- }: CreateContainerFormProps = $props();
+ let { open = $bindable(false), onSubmit, isLoading }: CreateContainerFormProps = $props();
let selectedTab = $state('basic');
const tabItems: TabItem[] = [
- { value: 'basic', label: m.common_basic(), icon: BoxIcon },
+ { value: 'basic', label: m.common_basic(), icon: ContainersIcon },
{ value: 'environment', label: m.tabs_environment(), icon: VariableIcon },
- { value: 'ports', label: m.common_ports(), icon: NetworkIcon },
- { value: 'volumes', label: m.tabs_volumes(), icon: DatabaseIcon },
- { value: 'network', label: m.tabs_network_security(), icon: ShieldIcon },
+ { value: 'ports', label: m.common_ports(), icon: NetworksIcon },
+ { value: 'volumes', label: m.tabs_volumes(), icon: VolumesIcon },
+ { value: 'network', label: m.tabs_network_security(), icon: SecurityIcon },
{ value: 'advanced', label: m.tabs_advanced(), icon: SettingsIcon }
];
@@ -446,12 +437,12 @@
disabled={isLoading || envVars.length <= 1}
class="text-destructive hover:text-destructive shrink-0"
>
- <XIcon class="size-4" />
+ <CloseIcon class="size-4" />
</Button>
</div>
{/each}
<Button type="button" variant="outline" size="sm" onclick={addEnvVar} disabled={isLoading} class="w-full">
- <PlusIcon class="mr-2 size-4" />
+ <AddIcon class="mr-2 size-4" />
{m.add_env_var_button()}
</Button>
</div>
@@ -525,7 +516,7 @@
disabled={isLoading || portMappings.length <= 1}
class="text-destructive hover:text-destructive shrink-0"
>
- <XIcon class="size-4" />
+ <CloseIcon class="size-4" />
</Button>
</div>
</div>
@@ -539,7 +530,7 @@
disabled={isLoading}
class="w-full"
>
- <PlusIcon class="mr-2 size-4" />
+ <AddIcon class="mr-2 size-4" />
{m.add_port_mapping_button()}
</Button>
</div>
@@ -602,7 +593,7 @@
disabled={isLoading || volumeMounts.length <= 1}
class="text-destructive hover:text-destructive shrink-0 self-end sm:self-auto"
>
- <XIcon class="size-4" />
+ <CloseIcon class="size-4" />
</Button>
</div>
<div class="flex items-center space-x-2 pl-0 sm:pl-3">
@@ -619,7 +610,7 @@
disabled={isLoading}
class="w-full"
>
- <PlusIcon class="mr-2 size-4" />
+ <AddIcon class="mr-2 size-4" />
{m.add_volume_mount_button()}
</Button>
</div>
@@ -754,10 +745,10 @@
</Button>
<Button type="submit" form="create-container-form" disabled={isLoading} class="w-full sm:w-auto">
{#if isLoading}
- <Spinner class="mr-2 size-4" />
+ <Spinner class="size-4" />
{m.common_action_creating()}
{:else}
- <ContainerIcon class="mr-2 size-4" />
+ <AddIcon class="size-4" />
{m.common_create_button({ resource: m.resource_container_cap() })}
{/if}
</Button>
diff --git a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
index 46fe19a15..30ccdc513 100644
--- a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
@@ -3,14 +3,6 @@
import { Button } from '$lib/components/ui/button/index.js';
import { Badge } from '$lib/components/ui/badge';
import { CopyButton } from '$lib/components/ui/copy-button';
- import { Separator } from '$lib/components/ui/separator';
- import ServerIcon from '@lucide/svelte/icons/server';
- import CpuIcon from '@lucide/svelte/icons/cpu';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import ShieldIcon from '@lucide/svelte/icons/shield';
- import ActivityIcon from '@lucide/svelte/icons/activity';
- import LayersIcon from '@lucide/svelte/icons/layers';
import type { DockerInfo } from '$lib/types/docker-info.type';
import { m } from '$lib/paraglide/messages';
import bytes from 'bytes';
@@ -46,17 +38,17 @@
contentClass="sm:max-w-[800px]"
>
{#snippet children()}
- <div class="space-y-6 pt-4">
+ <div class="space-y-4 pt-4">
{@render statsSection()}
- <div class="grid gap-6 sm:grid-cols-2">
+ <div class="grid gap-4 sm:grid-cols-2">
{@render systemSection()}
{@render versionSection()}
</div>
{@render resourcesSection()}
- <div class="grid gap-6 sm:grid-cols-2">
+ <div class="grid gap-4 sm:grid-cols-2">
{@render configurationSection()}
{@render networkSection()}
</div>
@@ -75,28 +67,24 @@
{#snippet statsSection()}
<div>
- <h3 class="mb-3 flex items-center gap-2 text-sm font-semibold">
- <ActivityIcon class="size-4" />
+ <h3 class="mb-3 text-sm font-semibold">
{m.docker_info_stats_section()}
</h3>
- <div class="space-y-3">
- <div class="grid gap-3 sm:grid-cols-4">
- {@render statCard(m.common_running(), dockerInfo?.ContainersRunning ?? 0, 'emerald')}
- {@render statCard(m.docker_info_paused_label(), dockerInfo?.ContainersPaused ?? 0, 'amber')}
- {@render statCard(m.common_stopped(), dockerInfo?.ContainersStopped ?? 0, 'red')}
- {@render statCard(m.docker_info_images_label(), dockerInfo?.Images ?? 0, 'neutral', true)}
- </div>
+ <div class="grid gap-4 sm:grid-cols-4">
+ {@render statCard(m.common_running(), dockerInfo?.ContainersRunning ?? 0, 'emerald', true)}
+ {@render statCard(m.docker_info_paused_label(), dockerInfo?.ContainersPaused ?? 0, 'amber', true)}
+ {@render statCard(m.common_stopped(), dockerInfo?.ContainersStopped ?? 0, 'red', true)}
+ {@render statCard(m.docker_info_images_label(), dockerInfo?.Images ?? 0, 'blue', true)}
</div>
</div>
{/snippet}
{#snippet systemSection()}
<div class="space-y-3">
- <h3 class="flex items-center gap-2 text-sm font-semibold">
- <ServerIcon class="size-4" />
+ <h3 class="text-sm font-semibold">
{m.docker_info_system_section()}
</h3>
- <div class="space-y-2 rounded-lg border p-3">
+ <div class="space-y-2 rounded-lg border p-4">
{@render infoRow(m.common_name(), dockerInfo?.Name)}
{@render infoRow(m.common_id(), dockerInfo?.ID, true, true)}
{@render infoRow(m.docker_info_os_label(), dockerInfo?.OperatingSystem)}
@@ -111,11 +99,10 @@
{#snippet versionSection()}
<div class="space-y-3">
- <h3 class="flex items-center gap-2 text-sm font-semibold">
- <LayersIcon class="size-4" />
+ <h3 class="text-sm font-semibold">
{m.docker_info_version_section()}
</h3>
- <div class="space-y-2 rounded-lg border p-3">
+ <div class="space-y-2 rounded-lg border p-4">
{@render infoRow(m.docker_info_server_version_label(), dockerInfo?.ServerVersion)}
{@render infoRow(m.docker_info_api_version_label(), dockerInfo?.apiVersion)}
{@render infoRow(m.docker_info_go_version_label(), dockerInfo?.goVersion)}
@@ -136,27 +123,26 @@
{#snippet resourcesSection()}
<div>
- <h3 class="mb-3 flex items-center gap-2 text-sm font-semibold">
- <CpuIcon class="size-4" />
+ <h3 class="mb-3 text-sm font-semibold">
{m.docker_info_resources_section()}
</h3>
- <div class="grid gap-3 sm:grid-cols-4">
- <div class="rounded-lg border p-3">
+ <div class="grid gap-4 sm:grid-cols-4">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.common_cpus()}</div>
<div class="flex items-center gap-2">
<Badge variant="secondary" class="text-base">{dockerInfo?.NCPU ?? 0}</Badge>
<span class="text-muted-foreground text-xs">cores</span>
</div>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_memory_label()}</div>
<Badge variant="secondary" class="text-base">{formattedMemory}</Badge>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_goroutines()}</div>
<Badge variant="secondary" class="text-base">{dockerInfo?.NGoroutines ?? 0}</Badge>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_file_descriptors()}</div>
<Badge variant="secondary" class="text-base">{dockerInfo?.NFd ?? 0}</Badge>
</div>
@@ -166,11 +152,10 @@
{#snippet configurationSection()}
<div class="space-y-3">
- <h3 class="flex items-center gap-2 text-sm font-semibold">
- <HardDriveIcon class="size-4" />
+ <h3 class="text-sm font-semibold">
{m.common_configuration()}
</h3>
- <div class="space-y-2 rounded-lg border p-3">
+ <div class="space-y-2 rounded-lg border p-4">
{@render infoRow(m.docker_info_storage_driver_label(), dockerInfo?.Driver)}
{@render infoRow(m.docker_info_logging_driver_label(), dockerInfo?.LoggingDriver)}
{@render infoRow(m.docker_info_cgroup_driver_label(), dockerInfo?.CgroupDriver)}
@@ -184,11 +169,10 @@
{#snippet networkSection()}
<div class="space-y-3">
- <h3 class="flex items-center gap-2 text-sm font-semibold">
- <NetworkIcon class="size-4" />
+ <h3 class="text-sm font-semibold">
{m.resource_networks_cap()} & {m.docker_info_proxy_label()}
</h3>
- <div class="space-y-2 rounded-lg border p-3">
+ <div class="space-y-2 rounded-lg border p-4">
{@render infoRow(
m.docker_info_ipv4_forwarding(),
dockerInfo?.IPv4Forwarding ? m.common_enabled() : m.common_disabled(),
@@ -204,12 +188,11 @@
{#snippet pluginsSection()}
<div>
- <h3 class="mb-3 flex items-center gap-2 text-sm font-semibold">
- <LayersIcon class="size-4" />
+ <h3 class="mb-3 text-sm font-semibold">
{m.docker_info_plugins_section()}
</h3>
- <div class="grid gap-3 sm:grid-cols-3">
- <div class="rounded-lg border p-3">
+ <div class="grid gap-4 sm:grid-cols-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.resource_volumes_cap()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Volume ?? [] as plugin}
@@ -219,7 +202,7 @@
{/each}
</div>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.resource_networks_cap()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Network ?? [] as plugin}
@@ -229,7 +212,7 @@
{/each}
</div>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_logs_plugin()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Log ?? [] as plugin}
@@ -245,12 +228,11 @@
{#snippet securitySection()}
<div>
- <h3 class="mb-3 flex items-center gap-2 text-sm font-semibold">
- <ShieldIcon class="size-4" />
+ <h3 class="mb-3 text-sm font-semibold">
{m.security_title()} & {m.docker_info_runtimes()}
</h3>
- <div class="grid gap-3 sm:grid-cols-2">
- <div class="rounded-lg border p-3">
+ <div class="grid gap-4 sm:grid-cols-2">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_security_options()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.SecurityOptions ?? [] as opt}
@@ -260,7 +242,7 @@
{/each}
</div>
</div>
- <div class="rounded-lg border p-3">
+ <div class="rounded-lg border p-4">
<div class="text-muted-foreground mb-2 text-xs">{m.docker_info_runtimes()}</div>
<div class="flex flex-wrap gap-1">
{#each Object.keys(dockerInfo?.Runtimes ?? {}) as runtime}
@@ -274,7 +256,12 @@
</div>
{/snippet}
-{#snippet statCard(label: string, value: number, color: 'emerald' | 'amber' | 'red' | 'neutral', outline: boolean = false)}
+{#snippet statCard(
+ label: string,
+ value: number,
+ color: 'emerald' | 'amber' | 'red' | 'blue' | 'neutral',
+ outline: boolean = false
+)}
{@const colors = {
emerald: {
bg: 'bg-emerald-500/5',
@@ -288,17 +275,23 @@
bg: 'bg-red-500/5',
badge: 'border-red-500/30 bg-red-500/15 text-red-600 dark:text-red-300'
},
+ blue: {
+ bg: 'bg-blue-500/5',
+ badge: 'border-blue-500/30 bg-blue-500/15 text-blue-600 dark:text-blue-300'
+ },
neutral: {
bg: '',
badge: ''
}
}}
- <div class="rounded-lg border p-3 {colors[color].bg}">
+ <div class="rounded-lg border p-4 {colors[color].bg}">
<div class="text-muted-foreground mb-2 text-xs">{label}</div>
{#if color === 'neutral'}
- <div class="text-2xl font-semibold tabular-nums">{value}</div>
+ <Badge variant="secondary" class="rounded-md text-2xl font-semibold tabular-nums">
+ {value}
+ </Badge>
{:else}
- <Badge variant={outline ? 'outline' : undefined} class="{colors[color].badge} text-lg">
+ <Badge variant={outline ? 'outline' : undefined} class="{colors[color].badge} rounded-md text-lg">
{value}
</Badge>
{/if}
diff --git a/frontend/src/lib/components/dialogs/event-details-dialog.svelte b/frontend/src/lib/components/dialogs/event-details-dialog.svelte
index a3801219a..719b3b5aa 100644
--- a/frontend/src/lib/components/dialogs/event-details-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/event-details-dialog.svelte
@@ -2,18 +2,10 @@
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import { Badge } from '$lib/components/ui/badge';
- import CopyIcon from '@lucide/svelte/icons/copy';
- import InfoIcon from '@lucide/svelte/icons/info';
- import TriangleAlertIcon from '@lucide/svelte/icons/triangle-alert';
- import CheckCircle2Icon from '@lucide/svelte/icons/check-circle-2';
- import XCircleIcon from '@lucide/svelte/icons/x-circle';
- import UserIcon from '@lucide/svelte/icons/user';
- import ClockIcon from '@lucide/svelte/icons/clock';
- import ServerIcon from '@lucide/svelte/icons/server';
- import TagIcon from '@lucide/svelte/icons/tag';
+ import { CopyButton } from '$lib/components/ui/copy-button';
import type { Event } from '$lib/types/event.type';
- import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
import { m } from '$lib/paraglide/messages';
+ import { AlertIcon, InfoIcon, EnvironmentsIcon, UserIcon, ClockIcon } from '$lib/icons';
type Severity = 'success' | 'warning' | 'error' | 'info';
@@ -24,8 +16,6 @@
let { open = $bindable(), event }: Props = $props();
- const clipboard = new UseClipboard();
-
const hasMetadata = $derived(!!event?.metadata && Object.keys(event.metadata ?? {}).length > 0);
const eventJson = $derived.by(() => JSON.stringify(event ?? {}, null, 2));
const metadataJson = $derived.by(() => JSON.stringify(event?.metadata ?? {}, null, 2));
@@ -60,11 +50,6 @@
return baseClasses[sev];
}
- function handleCopy(text?: string) {
- if (!text) return;
- clipboard.copy(text);
- }
-
function handleClose() {
open = false;
}
@@ -91,11 +76,11 @@
<div class="flex items-start gap-3 border-b pb-4">
<div class="mt-0.5">
{#if severity === 'success'}
- <CheckCircle2Icon class={getSeverityIconClass(severity) + ' size-6'} />
+ <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
{:else if severity === 'warning'}
- <TriangleAlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
+ <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
{:else if severity === 'error'}
- <XCircleIcon class={getSeverityIconClass(severity) + ' size-6'} />
+ <AlertIcon class={getSeverityIconClass(severity) + ' size-6'} />
{:else}
<InfoIcon class={getSeverityIconClass(severity) + ' size-6'} />
{/if}
@@ -110,16 +95,12 @@
</p>
{/if}
<div class="mt-3 flex flex-wrap items-center gap-2">
- <Badge class={`border ${getSeverityBadgeClass(severity)}`}>
- {event?.severity ?? m.common_unknown()}
- </Badge>
<Badge variant="outline" class="gap-1">
- <TagIcon class="size-3" />
{event?.type ?? m.common_unknown()}
</Badge>
{#if event?.environmentId}
<Badge variant="outline" class="gap-1">
- <ServerIcon class="size-3" />
+ <EnvironmentsIcon class="size-3" />
{m.events_environment_label()}: {event.environmentId}
</Badge>
{/if}
@@ -154,9 +135,7 @@
<div class="text-muted-foreground text-xs">{label}</div>
<div class="mt-1 flex items-center justify-between gap-2">
<div class="text-sm break-all">{value || '-'}</div>
- <Button variant="ghost" size="icon" class="size-7" onclick={() => handleCopy(value)} title={copyTitle}>
- <CopyIcon class="size-4" />
- </Button>
+ <CopyButton text={value ?? ''} size="icon" class="size-7" title={copyTitle} />
</div>
</div>
{/snippet}
@@ -165,16 +144,9 @@
<div class="rounded-lg border">
<div class="flex items-center justify-between border-b px-3 py-2">
<h3 class="text-sm font-medium">{m.events_metadata_title()}</h3>
- <Button
- variant="outline"
- size="sm"
- onclick={() => handleCopy(metadataJson)}
- disabled={!hasMetadata}
- title="Copy metadata JSON"
- >
- <CopyIcon class="mr-2 size-3" />
+ <CopyButton text={metadataJson} variant="outline" size="sm" title="Copy metadata JSON">
{m.common_copy_json()}
- </Button>
+ </CopyButton>
</div>
{#if hasMetadata}
<pre class="bg-muted/40 max-h-[40vh] overflow-auto p-3 text-xs leading-relaxed"><code class="font-mono">{metadataJson}</code
@@ -189,10 +161,9 @@
<div class="rounded-lg border">
<div class="flex items-center justify-between border-b px-3 py-2">
<h3 class="text-sm font-medium">{m.events_raw_event_title()}</h3>
- <Button variant="outline" size="sm" onclick={() => handleCopy(eventJson)} title={m.events_copy_full_event_json_title()}>
- <CopyIcon class="mr-2 size-3" />
+ <CopyButton text={eventJson} variant="outline" size="sm" title={m.events_copy_full_event_json_title()}>
{m.common_copy_json()}
- </Button>
+ </CopyButton>
</div>
<pre class="bg-muted/40 max-h-[40vh] overflow-auto p-3 text-xs leading-relaxed"><code class="font-mono">{eventJson}</code
></pre>
diff --git a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
index 033192315..874955195 100644
--- a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
@@ -1,15 +1,13 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
import * as Alert from '$lib/components/ui/alert';
+ import * as InputGroup from '$lib/components/ui/input-group/index.js';
import { Button } from '$lib/components/ui/button';
- import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { authService } from '$lib/services/auth-service';
import { toast } from 'svelte-sonner';
- import CircleAlert from '@lucide/svelte/icons/circle-alert';
- import Eye from '@lucide/svelte/icons/eye';
- import EyeOff from '@lucide/svelte/icons/eye-off';
+ import { EyeOnIcon, EyeOffIcon, AlertIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
let {
@@ -78,16 +76,16 @@
>
{#if error}
<Alert.Root variant="destructive">
- <CircleAlert class="h-4 w-4" />
- <Alert.Title>Error</Alert.Title>
+ <AlertIcon class="size-4" />
+ <Alert.Title>{m.error_generic()}</Alert.Title>
<Alert.Description>{error}</Alert.Description>
</Alert.Root>
{/if}
<div class="space-y-2">
<Label for="current-password">{m.first_login_current_password()}</Label>
- <div class="relative">
- <Input
+ <InputGroup.Root>
+ <InputGroup.Input
id="current-password"
type={showCurrentPassword ? 'text' : 'password'}
bind:value={currentPassword}
@@ -95,27 +93,28 @@
required
disabled={isLoading}
/>
- <Button
- type="button"
- variant="ghost"
- size="sm"
- class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
- onclick={() => (showCurrentPassword = !showCurrentPassword)}
- disabled={isLoading}
- >
- {#if showCurrentPassword}
- <EyeOff class="h-4 w-4" />
- {:else}
- <Eye class="h-4 w-4" />
- {/if}
- </Button>
- </div>
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showCurrentPassword = !showCurrentPassword)}
+ disabled={isLoading}
+ aria-label={showCurrentPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showCurrentPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
<div class="space-y-2">
<Label for="new-password">{m.first_login_new_password()}</Label>
- <div class="relative">
- <Input
+ <InputGroup.Root>
+ <InputGroup.Input
id="new-password"
type={showNewPassword ? 'text' : 'password'}
bind:value={newPassword}
@@ -123,27 +122,28 @@
required
disabled={isLoading}
/>
- <Button
- type="button"
- variant="ghost"
- size="sm"
- class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
- onclick={() => (showNewPassword = !showNewPassword)}
- disabled={isLoading}
- >
- {#if showNewPassword}
- <EyeOff class="h-4 w-4" />
- {:else}
- <Eye class="h-4 w-4" />
- {/if}
- </Button>
- </div>
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showNewPassword = !showNewPassword)}
+ disabled={isLoading}
+ aria-label={showNewPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showNewPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
<div class="space-y-2">
<Label for="confirm-password">{m.first_login_confirm_password()}</Label>
- <div class="relative">
- <Input
+ <InputGroup.Root>
+ <InputGroup.Input
id="confirm-password"
type={showConfirmPassword ? 'text' : 'password'}
bind:value={confirmPassword}
@@ -151,21 +151,22 @@
required
disabled={isLoading}
/>
- <Button
- type="button"
- variant="ghost"
- size="sm"
- class="absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent"
- onclick={() => (showConfirmPassword = !showConfirmPassword)}
- disabled={isLoading}
- >
- {#if showConfirmPassword}
- <EyeOff class="h-4 w-4" />
- {:else}
- <Eye class="h-4 w-4" />
- {/if}
- </Button>
- </div>
+ <InputGroup.Addon align="inline-end">
+ <InputGroup.Button
+ type="button"
+ size="icon-xs"
+ onclick={() => (showConfirmPassword = !showConfirmPassword)}
+ disabled={isLoading}
+ aria-label={showConfirmPassword ? 'Hide password' : 'Show password'}
+ >
+ {#if showConfirmPassword}
+ <EyeOffIcon />
+ {:else}
+ <EyeOnIcon />
+ {/if}
+ </InputGroup.Button>
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
</form>
{/snippet}
@@ -173,7 +174,7 @@
{#snippet footer()}
<Button type="submit" onclick={handleSubmit} disabled={!isValid || isLoading}>
{#if isLoading}
- <Spinner class="mr-2 h-4 w-4" />
+ <Spinner class="size-4" />
{m.first_login_submitting()}
{:else}
{m.first_login_submit()}
diff --git a/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte b/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
index 654914389..8a69d69ea 100644
--- a/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
@@ -3,11 +3,10 @@
import { Button } from '$lib/components/ui/button/index.js';
import * as Checkbox from '$lib/components/ui/checkbox/index.js';
import { Label } from '$lib/components/ui/label/index.js';
- import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import * as Alert from '$lib/components/ui/alert/index.js';
import { m } from '$lib/paraglide/messages';
+ import { TrashIcon, AlertIcon } from '$lib/icons';
type PruneType = 'containers' | 'images' | 'networks' | 'volumes' | 'buildCache';
@@ -117,7 +116,7 @@
{#if pruneVolumes}
<Alert.Root variant="destructive" class="mt-2">
- <AlertCircleIcon class="size-4" />
+ <AlertIcon class="size-4" />
<Alert.Title>{m.prune_volumes_warning_title()}</Alert.Title>
<Alert.Description>{m.prune_volumes_warning_description()}</Alert.Description>
</Alert.Root>
@@ -136,9 +135,9 @@
disabled={selectedTypes.length === 0 || isPruning}
>
{#if isPruning}
- <Spinner class="mr-2 size-4" /> {m.common_action_pruning()}
+ <Spinner class="size-4" /> {m.common_action_pruning()}
{:else}
- <Trash2Icon class="mr-2 size-4" /> {m.prune_button({ count: selectedTypes.length })}
+ <TrashIcon class="size-4" /> {m.prune_button({ count: selectedTypes.length })}
{/if}
</Button>
{/snippet}
diff --git a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
index 9b5a0d8d9..d18bf57a2 100644
--- a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
@@ -3,20 +3,22 @@
import { Button } from '$lib/components/ui/button/index.js';
import { Card } from '$lib/components/ui/card/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import FolderOpenIcon from '@lucide/svelte/icons/folder-open';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import DownloadIcon from '@lucide/svelte/icons/download';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
import { ScrollArea } from '$lib/components/ui/scroll-area/index.js';
import type { Template } from '$lib/types/template.type';
import { Label } from '$lib/components/ui/label/index.js';
import * as Select from '$lib/components/ui/select/index.js';
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
+ import {
+ ArrowDownIcon,
+ ArrowRightIcon,
+ RegistryIcon,
+ ProjectsIcon,
+ DownloadIcon,
+ SettingsIcon,
+ FileTextIcon
+ } from '$lib/icons';
import { toast } from 'svelte-sonner';
import { m } from '$lib/paraglide/messages';
@@ -166,9 +168,9 @@
<div class="mb-2">
<Badge variant="secondary" class="text-xs">
{#if template.isRemote}
- <GlobeIcon class="mr-1 size-3" />
+ <RegistryIcon class="size-3" />
{:else}
- <FolderOpenIcon class="mr-1 size-3" />
+ <ProjectsIcon class="size-3" />
{/if}
{template.registry?.name ?? (template.isRemote ? m.templates_remote() : m.templates_local())}
</Badge>
@@ -200,17 +202,17 @@
disabled={loadingStates.has(`download-${template.id}`)}
>
{#if loadingStates.has(`download-${template.id}`)}
- <Spinner class="mr-1 size-3" />
+ <Spinner class="size-3" />
{m.common_action_downloading()}
{:else}
- <DownloadIcon class="mr-1 size-3" />
+ <DownloadIcon class="size-3" />
{m.templates_download()}
{/if}
</Button>
{/if}
<Button size="sm" onclick={() => handleSelect(template)} disabled={loadingStates.has(template.id)}>
{#if loadingStates.has(template.id)}
- <Spinner class="mr-1 size-3" />
+ <Spinner class="size-3" />
{m.common_loading()}
{:else}
{m.templates_use_now()}
@@ -272,8 +274,8 @@
<Card class="border-2">
<Collapsible.Trigger class="flex w-full items-center justify-between px-4 py-3 text-left">
<div class="flex items-center gap-2">
- <ChevronDownIcon class="hidden size-4 data-[state=open]:block" />
- <ChevronRightIcon class="block size-4 data-[state=open]:hidden" />
+ <ArrowDownIcon class="hidden size-4 data-[state=open]:block" />
+ <ArrowRightIcon class="block size-4 data-[state=open]:hidden" />
<span class="font-semibold">{group.name}</span>
<Badge variant="secondary" class="ml-2">{group.items.length}</Badge>
</div>
diff --git a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
index 9a221eaeb..3006c3fea 100644
--- a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
@@ -1,14 +1,12 @@
<script lang="ts">
import * as Dialog from '$lib/components/ui/dialog';
import { Button } from '$lib/components/ui/button';
- import AlertTriangleIcon from '@lucide/svelte/icons/alert-triangle';
- import InfoIcon from '@lucide/svelte/icons/info';
- import CheckCircle2Icon from '@lucide/svelte/icons/check-circle-2';
import Spinner from '$lib/components/ui/spinner/spinner.svelte';
import * as m from '$lib/paraglide/messages';
import { onDestroy } from 'svelte';
import systemUpgradeService from '$lib/services/api/system-upgrade-service';
import { cn } from '$lib/utils';
+ import { AlertIcon, InfoIcon, SuccessIcon } from '$lib/icons';
let {
open = $bindable(false),
@@ -153,10 +151,10 @@
<div class="space-y-4 py-4">
<div class="flex items-center justify-center gap-2 text-sm">
{#if upgradeStatus === 'countdown'}
- <CheckCircle2Icon class="size-5 text-green-500" />
+ <SuccessIcon class="size-5 text-green-500" />
<span class="font-medium text-green-600 dark:text-green-400">{m.upgrade_status_complete()}</span>
{:else if upgradeStatus === 'ready'}
- <CheckCircle2Icon class="size-5 animate-pulse text-green-500" />
+ <SuccessIcon class="size-5 animate-pulse text-green-500" />
<span class="font-medium text-green-600 dark:text-green-400">{m.upgrade_status_detected()}</span>
{:else}
<Spinner class="text-primary size-5" />
@@ -210,7 +208,7 @@
<div class="rounded-lg border border-orange-200 bg-orange-50 p-3 dark:border-orange-800 dark:bg-orange-950/20">
<p class="flex items-center gap-2 text-sm font-medium text-orange-800 dark:text-orange-200">
- <AlertTriangleIcon class="size-4" />
+ <AlertIcon class="size-4" />
{m.upgrade_warning_interruption()}
</p>
</div>
diff --git a/frontend/src/lib/components/dialogs/version-info-dialog.svelte b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
index 990807c84..c890a7b40 100644
--- a/frontend/src/lib/components/dialogs/version-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
@@ -4,11 +4,9 @@
import { Badge } from '$lib/components/ui/badge';
import type { AppVersionInformation } from '$lib/types/application-configuration';
import { m } from '$lib/paraglide/messages';
- import ExternalLinkIcon from '@lucide/svelte/icons/external-link';
- import BookOpenIcon from '@lucide/svelte/icons/book-open';
import { CopyButton } from '$lib/components/ui/copy-button';
import { getApplicationLogo } from '$lib/utils/image.util';
- import GithubIcon from '$lib/icons/github-icon.svelte';
+ import { ExternalLinkIcon, GithubIcon, BookOpenIcon } from '$lib/icons';
interface Props {
open: boolean;
diff --git a/frontend/src/lib/components/disk-meter.svelte b/frontend/src/lib/components/disk-meter.svelte
index 44e8deb52..8ca85b6a7 100644
--- a/frontend/src/lib/components/disk-meter.svelte
+++ b/frontend/src/lib/components/disk-meter.svelte
@@ -5,14 +5,13 @@
import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
import { Progress } from '$lib/components/ui/progress/index.js';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import SettingsIcon from '@lucide/svelte/icons/settings';
import { m } from '$lib/paraglide/messages';
import bytes from 'bytes';
import settingsStore from '$lib/stores/config-store';
import { settingsService } from '$lib/services/settings-service';
import { toast } from 'svelte-sonner';
import { z } from 'zod/v4';
+ import { VolumesIcon, SettingsIcon } from '$lib/icons';
let {
diskUsage,
@@ -74,7 +73,7 @@
<Card.Root class={className}>
{#snippet children()}
- <Card.Header icon={HardDriveIcon} iconVariant="primary" compact {loading}>
+ <Card.Header icon={VolumesIcon} iconVariant="primary" compact {loading}>
{#snippet children()}
<div class="min-w-0 flex-1">
<div class="text-foreground text-sm font-semibold">{m.dashboard_meter_disk()}</div>
diff --git a/frontend/src/lib/components/docker-overview.svelte b/frontend/src/lib/components/docker-overview.svelte
index a8a9e511d..ec6bda28d 100644
--- a/frontend/src/lib/components/docker-overview.svelte
+++ b/frontend/src/lib/components/docker-overview.svelte
@@ -3,13 +3,10 @@
import { Badge } from '$lib/components/ui/badge';
import { Button } from '$lib/components/ui/button';
import { Skeleton } from '$lib/components/ui/skeleton';
- import InfoIcon from '@lucide/svelte/icons/info';
- import DockerIcon from '$lib/icons/docker-icon.svelte';
- import BoxIcon from '@lucide/svelte/icons/box';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
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,
@@ -34,7 +31,7 @@
<Card.Root class={className}>
{#snippet children()}
- <Card.Header icon={DockerIcon} iconVariant="primary" class="items-center" {loading}>
+ <Card.Header icon={DockerBrandIcon} iconVariant="primary" class="items-center" {loading}>
{#snippet children()}
{#if loading}
<div class="flex flex-1 flex-col gap-2">
@@ -51,14 +48,14 @@
</div>
<div class="text-muted-foreground flex flex-wrap items-center gap-3 text-xs">
<span class="flex items-center gap-1.5">
- <BoxIcon class="size-3" />
+ <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">
- <HardDriveIcon class="size-3" />
+ <ImagesIcon class="size-3" />
<span>{totalImages}</span>
<span class="text-muted-foreground/70">{m.images_title().toLowerCase()}</span>
</span>
diff --git a/frontend/src/lib/components/dropdown-card.svelte b/frontend/src/lib/components/dropdown-card.svelte
index 23a9a2471..e86b4edfe 100644
--- a/frontend/src/lib/components/dropdown-card.svelte
+++ b/frontend/src/lib/components/dropdown-card.svelte
@@ -1,11 +1,10 @@
<script lang="ts">
import { cn } from '$lib/utils';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
- import type { Icon as IconType } from '@lucide/svelte';
import { onMount, type Snippet } from 'svelte';
import { slide } from 'svelte/transition';
import { Button } from './ui/button';
import * as Card from './ui/card';
+ import { ArrowDownIcon } from '$lib/icons';
let {
id,
@@ -20,7 +19,7 @@
title: string;
description?: string;
defaultExpanded?: boolean;
- icon?: typeof IconType;
+ icon?: typeof ArrowDownIcon;
badge?: Snippet;
children: Snippet;
} = $props();
@@ -46,7 +45,8 @@
function onHeaderClick(e: MouseEvent) {
const target = e.target as HTMLElement;
- if (target.closest('button, a, [onclick], [role="button"]')) return;
+ const interactive = target.closest('button, a, [onclick], [role="button"]');
+ if (interactive && interactive !== e.currentTarget) return;
toggleExpanded();
}
@@ -90,7 +90,7 @@
<Card.Description class="mt-1">{description}</Card.Description>
{/if}
</div>
- <Card.Action>
+ <Card.Action class="ml-auto">
<Button
variant="ghost"
size="icon"
@@ -98,7 +98,7 @@
aria-label={expanded ? 'Collapse section' : 'Expand section'}
onclick={() => toggleExpanded()}
>
- <ChevronDownIcon class={cn('size-5 transition-transform duration-200', expanded && 'rotate-180')} />
+ <ArrowDownIcon class={cn('size-5 transition-transform duration-200', expanded && 'rotate-180')} />
</Button>
</Card.Action>
</Card.Header>
diff --git a/frontend/src/lib/components/error.svelte b/frontend/src/lib/components/error.svelte
index 6a5e809a4..b15bab5cf 100644
--- a/frontend/src/lib/components/error.svelte
+++ b/frontend/src/lib/components/error.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
import * as Empty from '$lib/components/ui/empty/index.js';
import { Button } from '$lib/components/ui/button';
- import CircleXIcon from '@lucide/svelte/icons/circle-x';
import { m } from '$lib/paraglide/messages';
+ import { ErrorNotFoundIcon } from '$lib/icons';
let {
message,
@@ -25,7 +25,7 @@
<Empty.Root>
<Empty.Header>
<Empty.Media variant="icon">
- <CircleXIcon class="text-destructive size-7" aria-hidden="true" />
+ <ErrorNotFoundIcon class="text-destructive size-20" aria-hidden="true" />
</Empty.Media>
<Empty.Title>{title}</Empty.Title>
<Empty.Description>{message} - {status}</Empty.Description>
diff --git a/frontend/src/lib/components/form/date-picker.svelte b/frontend/src/lib/components/form/date-picker.svelte
index eac049f9a..dfd03af6f 100644
--- a/frontend/src/lib/components/form/date-picker.svelte
+++ b/frontend/src/lib/components/form/date-picker.svelte
@@ -5,14 +5,9 @@
import { m } from '$lib/paraglide/messages';
import { getLocale } from '$lib/paraglide/runtime';
import { cn } from '$lib/utils';
- import {
- CalendarDate,
- DateFormatter,
- getLocalTimeZone,
- type DateValue
- } from '@internationalized/date';
- import CalendarIcon from '@lucide/svelte/icons/calendar';
+ import { CalendarDate, DateFormatter, getLocalTimeZone, type DateValue } from '@internationalized/date';
import type { HTMLAttributes } from 'svelte/elements';
+ import { CalendarIcon } from '$lib/icons';
type Props = {
value?: Date;
@@ -21,9 +16,7 @@
let { value = $bindable(undefined), id, ...restProps }: Props = $props();
- let calendarDisplayDate: CalendarDate | undefined = $state(
- value ? dateToCalendarDate(value) : undefined
- );
+ let calendarDisplayDate: CalendarDate | undefined = $state(value ? dateToCalendarDate(value) : undefined);
let open = $state(false);
@@ -73,26 +66,16 @@
<Button
{...props}
variant="outline"
- class={cn(
- 'w-full justify-start text-left font-normal',
- !value && 'text-muted-foreground'
- )}
+ class={cn('w-full justify-start text-left font-normal', !value && 'text-muted-foreground')}
aria-label={m.select_a_date()}
>
<CalendarIcon class="mr-2 size-4" />
- {calendarDisplayDate
- ? df.format(calendarDisplayDate.toDate(getLocalTimeZone()))
- : m.select_a_date()}
+ {calendarDisplayDate ? df.format(calendarDisplayDate.toDate(getLocalTimeZone())) : m.select_a_date()}
</Button>
{/snippet}
</Popover.Trigger>
<Popover.Content class="w-auto p-0" align="start">
- <Calendar
- type="single"
- bind:value={calendarDisplayDate}
- onValueChange={handleCalendarInteraction}
- initialFocus
- />
+ <Calendar type="single" bind:value={calendarDisplayDate} onValueChange={handleCalendarInteraction} initialFocus />
</Popover.Content>
</Popover.Root>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/lib/components/form/url-input.svelte b/frontend/src/lib/components/form/url-input.svelte
index 50844b95e..812c4ed6b 100644
--- a/frontend/src/lib/components/form/url-input.svelte
+++ b/frontend/src/lib/components/form/url-input.svelte
@@ -4,7 +4,7 @@
import * as InputGroup from '$lib/components/ui/input-group/index.js';
import { Label } from '$lib/components/ui/label/index.js';
import { Button } from '$lib/components/ui/button/index.js';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
+ import { ArrowDownIcon } from '$lib/icons';
type Props = {
id?: string;
@@ -46,7 +46,7 @@
{#snippet child({ props })}
<Button {...props} variant="secondary" class="w-[5.5rem] shrink-0 justify-between gap-1 text-sm" {disabled}>
{protocol}://
- <ChevronDownIcon class="size-3 opacity-50" />
+ <ArrowDownIcon class="size-3 opacity-50" />
</Button>
{/snippet}
</DropdownMenu.Trigger>
diff --git a/frontend/src/lib/components/gpu-meter.svelte b/frontend/src/lib/components/gpu-meter.svelte
index 4fa1a40a1..4214f4b5d 100644
--- a/frontend/src/lib/components/gpu-meter.svelte
+++ b/frontend/src/lib/components/gpu-meter.svelte
@@ -1,10 +1,10 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import { Progress } from '$lib/components/ui/progress/index.js';
- import GpuIcon from '@lucide/svelte/icons/gpu';
import { m } from '$lib/paraglide/messages';
import bytes from 'bytes';
import type { GPUStats } from '$lib/types/system-stats.type';
+ import { GpuIcon } from '$lib/icons';
interface Props {
gpus?: GPUStats[];
@@ -31,7 +31,8 @@
<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()}
+ {gpus.length}
+ {gpus.length === 1 ? m.dashboard_meter_gpu_device() : m.dashboard_meter_gpu_devices()}
</div>
{/if}
</div>
@@ -53,7 +54,7 @@
<div class="space-y-1.5">
<div class="flex items-center justify-between">
<span class="text-foreground text-xs font-medium">{gpu.name}</span>
- <span class="text-muted-foreground text-[10px] font-mono">
+ <span class="text-muted-foreground font-mono text-[10px]">
GPU {gpu.index}
</span>
</div>
diff --git a/frontend/src/lib/components/image-update-item.svelte b/frontend/src/lib/components/image-update-item.svelte
index 2dba3dc69..85713cef9 100644
--- a/frontend/src/lib/components/image-update-item.svelte
+++ b/frontend/src/lib/components/image-update-item.svelte
@@ -1,21 +1,12 @@
<script lang="ts">
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
- import CircleCheckIcon from '@lucide/svelte/icons/circle-check';
- import CircleFadingArrowUpIcon from '@lucide/svelte/icons/circle-fading-arrow-up';
- import CircleArrowUpIcon from '@lucide/svelte/icons/circle-arrow-up';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import TriangleAlertIcon from '@lucide/svelte/icons/triangle-alert';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
- import PackageIcon from '@lucide/svelte/icons/package';
- import KeyRoundIcon from '@lucide/svelte/icons/key-round';
- import ArrowUpCircleIcon from '@lucide/svelte/icons/arrow-up-circle';
import { toast } from 'svelte-sonner';
import type { ImageUpdateData } from '$lib/types/image.type';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
- import type { Snippet } from 'svelte';
import type { Component } from 'svelte';
+ import { ArrowRightIcon, RefreshIcon, AlertIcon, VerifiedCheckIcon, ApiKeyIcon, CircleArrowUpIcon, BoxIcon } from '$lib/icons';
interface Props {
updateInfo?: ImageUpdateData;
@@ -181,7 +172,7 @@
<div
class="inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[10px] font-medium whitespace-nowrap {authBadge.classes}"
>
- <KeyRoundIcon class="size-3 opacity-80" />
+ <ApiKeyIcon class="size-3 opacity-80" />
<span>{m.image_update_auth({ label: authBadge.label })}</span>
</div>
</div>
@@ -192,7 +183,7 @@
<div class="flex items-center justify-between">
<div class="flex items-center gap-1.5 text-gray-500 dark:text-gray-400">
{#if label === m.image_update_current_label()}
- <PackageIcon class="size-3" />
+ <BoxIcon class="size-3" />
{:else}
<ArrowRightIcon class="size-3" />
{/if}
@@ -212,7 +203,7 @@
onclick={handleUpdateContainer}
class="group flex w-full items-center justify-center gap-2 rounded-lg bg-blue-500 px-3 py-2 text-xs font-medium text-white shadow-sm transition-all hover:bg-blue-600 hover:shadow-md"
>
- <ArrowUpCircleIcon class="size-3" />
+ <CircleArrowUpIcon class="size-3" />
{m.containers_update_container()}
</button>
{:else}
@@ -225,7 +216,7 @@
<Spinner class="size-3" />
{m.common_action_checking()}
{:else}
- <RefreshCwIcon class="size-3 transition-transform group-hover:rotate-45" />
+ <RefreshIcon class="size-3 transition-transform group-hover:rotate-45" />
{m.image_update_recheck_button()}
{/if}
</button>
@@ -237,7 +228,7 @@
{#snippet errorState()}
<div class="bg-linear-to-br from-rose-50 to-red-50/40 p-4 dark:from-rose-950/20 dark:to-red-950/10">
<div class="flex items-start gap-3">
- {@render iconCircle(TriangleAlertIcon, 'from-rose-500', 'to-red-500', 'shadow-red-500/25')}
+ {@render iconCircle(AlertIcon, 'from-rose-500', 'to-red-500', 'shadow-red-500/25')}
<div class="flex-1">
<div class="text-sm font-semibold text-red-900 dark:text-red-100">{m.image_update_check_failed_title()}</div>
<div class="text-xs text-red-700/80 dark:text-red-300/80">{m.image_update_could_not_query_registry()}</div>
@@ -264,7 +255,7 @@
{#snippet successState()}
<div class="bg-linear-to-br from-emerald-50 to-green-50/30 p-4 dark:from-emerald-950/20 dark:to-green-950/10">
<div class="flex items-start gap-3">
- {@render iconCircle(CircleCheckIcon, 'from-emerald-500', 'to-green-500', 'shadow-emerald-500/25')}
+ {@render iconCircle(VerifiedCheckIcon, 'from-emerald-500', 'to-green-500', 'shadow-emerald-500/25')}
<div class="flex-1">
<div class="text-sm font-semibold text-emerald-900 dark:text-emerald-100">
{m.image_update_up_to_date_title()}
@@ -327,7 +318,7 @@
{#snippet versionUpdateState()}
<div class="bg-linear-to-br from-amber-50 to-yellow-50/30 p-4 dark:from-amber-950/20 dark:to-yellow-950/10">
<div class="flex items-start gap-3">
- {@render iconCircle(CircleFadingArrowUpIcon, 'from-amber-500', 'to-yellow-500', 'shadow-amber-500/25')}
+ {@render iconCircle(CircleArrowUpIcon, 'from-amber-500', 'to-yellow-500', 'shadow-amber-500/25')}
<div class="flex-1">
<div class="text-sm font-semibold text-amber-900 dark:text-amber-100">{m.image_update_version_title()}</div>
<div class="text-xs text-amber-700/80 dark:text-amber-300/80">{m.image_update_version_desc()}</div>
@@ -375,7 +366,7 @@
{#snippet unknownState()}
<div class="bg-linear-to-br from-gray-50 to-slate-50/30 p-4 dark:from-gray-900/20 dark:to-slate-900/10">
<div class="flex items-center gap-3">
- {@render iconCircle(TriangleAlertIcon, 'from-gray-400', 'to-slate-500', 'shadow-gray-400/25')}
+ {@render iconCircle(AlertIcon, 'from-gray-400', 'to-slate-500', 'shadow-gray-400/25')}
<div>
<div class="text-sm font-semibold text-gray-900 dark:text-gray-100">{m.image_update_status_unknown()}</div>
<div class="text-xs text-gray-700/80 dark:text-gray-300/80">
@@ -396,13 +387,13 @@
<Tooltip.Trigger>
<span class="mr-2 inline-flex size-4 items-center justify-center align-middle">
{#if hasError}
- <TriangleAlertIcon class="size-4 text-red-500" />
+ <AlertIcon class="size-4 text-red-500" />
{:else if !effectiveUpdateInfo.hasUpdate}
- <CircleCheckIcon class="size-4 text-green-500" />
+ <VerifiedCheckIcon class="size-4 text-green-500" />
{:else if effectiveUpdateInfo.updateType === 'digest'}
<CircleArrowUpIcon class="size-4 text-blue-500" />
{:else}
- <CircleFadingArrowUpIcon class="size-4 text-yellow-500" />
+ <CircleArrowUpIcon class="size-4 text-yellow-500" />
{/if}
</span>
</Tooltip.Trigger>
diff --git a/frontend/src/lib/components/loading-indicator.svelte b/frontend/src/lib/components/loading-indicator.svelte
index 4f6cb65d4..54d237840 100644
--- a/frontend/src/lib/components/loading-indicator.svelte
+++ b/frontend/src/lib/components/loading-indicator.svelte
@@ -47,9 +47,13 @@
<div class="relative h-full w-full overflow-hidden">
<div class="bg-primary/25 absolute inset-0"></div>
- <span class="bar absolute inset-y-0 w-1/3"></span>
+ <div class="bar absolute inset-y-0 left-0 w-1/3">
+ <div class="peg absolute top-0 right-0 h-full w-3"></div>
+ </div>
- <span class="peg absolute top-0 right-0 h-full w-3"></span>
+ <div class="bar absolute inset-y-0 left-0 w-1/3" style="animation-delay: -1s;">
+ <div class="peg absolute top-0 right-0 h-full w-3"></div>
+ </div>
<span class="sr-only">{m.common_loading()}</span>
</div>
@@ -63,7 +67,7 @@
.bar {
background: var(--arcane-primary);
- animation: arcane-slide 0.9s cubic-bezier(0.4, 0, 0.2, 1) infinite;
+ animation: arcane-slide 2s linear infinite;
box-shadow:
0 0 12px var(--arcane-primary),
0 0 2px var(--arcane-primary);
@@ -81,16 +85,16 @@
@keyframes arcane-slide {
0% {
- transform: translateX(-120%);
+ transform: translateX(-100%);
}
100% {
- transform: translateX(520%);
+ transform: translateX(300%);
}
}
@media (prefers-reduced-motion: reduce) {
.bar {
- animation-duration: 2s;
+ animation-duration: 4s;
}
}
</style>
diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelte
index 50c65fb5a..9ddb9f1a3 100644
--- a/frontend/src/lib/components/logs/log-controls.svelte
+++ b/frontend/src/lib/components/logs/log-controls.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
import * as Select from '$lib/components/ui/select';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
import { m } from '$lib/paraglide/messages';
import { PersistedState } from 'runed';
+ import { RefreshIcon } from '$lib/icons';
let {
autoScroll = $bindable(),
@@ -104,7 +104,7 @@
aria-label={m.log_refresh_aria_label()}
title={m.common_refresh()}
>
- <RefreshCwIcon class="size-4" />
+ <RefreshIcon class="size-4" />
</Button>
</div>
</div>
diff --git a/frontend/src/lib/components/meter-metric.svelte b/frontend/src/lib/components/meter-metric.svelte
index f75da856c..d137d01d8 100644
--- a/frontend/src/lib/components/meter-metric.svelte
+++ b/frontend/src/lib/components/meter-metric.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import { Progress } from '$lib/components/ui/progress/index.js';
- import type { Icon as IconType } from '@lucide/svelte';
import { m } from '$lib/paraglide/messages';
interface Props {
@@ -11,7 +10,7 @@
unit?: string;
formatValue?: (value: number) => string;
maxValue?: number;
- icon: typeof IconType;
+ icon: any;
loading?: boolean;
showAbsoluteValues?: boolean;
formatAbsoluteValue?: (value: number) => string;
diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-menu-button.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-menu-button.svelte
index 818de791b..1324cc94c 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-nav-menu-button.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-menu-button.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
- import Grid3x3Icon from '@lucide/svelte/icons/grid-3x3';
+ import { MobileNavDrawerIcon } from '$lib/icons';
let {
showLabels = true,
@@ -24,6 +24,6 @@
{onclick}
data-testid="mobile-nav-open"
>
- <Grid3x3Icon size={28} aria-hidden="true" />
+ <MobileNavDrawerIcon class="size-8.5" aria-hidden="true" />
<span class="sr-only">{m.mobile_navigation()}</span>
</button>
diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
index 2e97cb3b5..988170f97 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte
@@ -83,96 +83,31 @@
<section>
<h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
- {m.sidebar_customization()}
+ {m.sidebar_resources()}
</h4>
<div class="space-y-2">
- {#each navigationItems.customizationItems as item}
- {#if item.items}
- {@const IconComponent = item.icon}
- <div class="space-y-2">
- <a
- href={item.url}
- onclick={() => handleItemClick(item)}
- class={cn(
- 'flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',
- isActiveItem(item)
- ? 'bg-muted text-foreground hover:bg-muted/70 shadow-sm'
- : 'text-foreground hover:bg-muted/50'
- )}
- >
- <IconComponent size={20} />
- <span>{item.title}</span>
- </a>
- <div class="ml-6 space-y-1">
- {#each item.items as subItem}
- {@const SubIconComponent = subItem.icon}
- <a
- href={subItem.url}
- onclick={() => handleItemClick(subItem)}
- class={cn(
- 'flex items-center gap-3 rounded-xl px-4 py-2 text-sm transition-all duration-200 ease-out',
- 'focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',
- isActiveItem(subItem)
- ? 'bg-muted/70 text-foreground shadow-sm'
- : 'text-muted-foreground hover:text-foreground hover:bg-muted/40'
- )}
- aria-current={isActiveItem(subItem) ? 'page' : undefined}
- >
- <SubIconComponent size={16} />
- <span>{subItem.title}</span>
- </a>
- {/each}
- </div>
- </div>
- {:else}
- {@const IconComponent = item.icon}
- <a
- href={item.url}
- onclick={() => handleItemClick(item)}
- class={cn(
- 'flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',
- 'focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',
- isActiveItem(item)
- ? 'bg-muted text-foreground hover:bg-muted/70 shadow-sm'
- : 'text-foreground hover:bg-muted/50'
- )}
- aria-current={isActiveItem(item) ? 'page' : undefined}
- >
- <IconComponent size={20} />
- <span>{item.title}</span>
- </a>
- {/if}
+ {#each navigationItems.resourceItems as item}
+ {@const IconComponent = item.icon}
+ <a
+ href={item.url}
+ onclick={() => handleItemClick(item)}
+ class={cn(
+ 'flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',
+ 'focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',
+ isActiveItem(item)
+ ? 'bg-muted text-foreground hover:bg-muted/70 shadow-sm'
+ : 'text-foreground hover:bg-muted/50'
+ )}
+ aria-current={isActiveItem(item) ? 'page' : undefined}
+ >
+ <IconComponent size={20} />
+ <span>{item.title}</span>
+ </a>
{/each}
</div>
</section>
{#if memoizedIsAdmin}
- {#if navigationItems.environmentItems}
- <section>
- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
- {m.sidebar_environments()}
- </h4>
- <div class="space-y-2">
- {#each navigationItems.environmentItems as item}
- {@const IconComponent = item.icon}
- <a
- href={item.url}
- onclick={() => handleItemClick(item)}
- class={cn(
- 'flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',
- isActiveItem(item)
- ? 'bg-muted text-foreground hover:bg-muted/70 shadow-sm'
- : 'text-foreground hover:bg-muted/50'
- )}
- >
- <IconComponent size={20} />
- <span>{item.title}</span>
- </a>
- {/each}
- </div>
- </section>
- {/if}
-
{#if navigationItems.settingsItems}
<section>
<h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">
diff --git a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
index 4418ad413..d5bc43061 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
@@ -2,12 +2,6 @@
import * as Button from '$lib/components/ui/button/index.js';
import * as Select from '$lib/components/ui/select/index.js';
import { cn } from '$lib/utils';
- import LogOutIcon from '@lucide/svelte/icons/log-out';
- import RouterIcon from '@lucide/svelte/icons/router';
- import ServerIcon from '@lucide/svelte/icons/server';
- import LanguagesIcon from '@lucide/svelte/icons/languages';
- import Sun from '@lucide/svelte/icons/sun';
- import Moon from '@lucide/svelte/icons/moon';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import type { Environment } from '$lib/types/environment.type';
import { mode, toggleMode } from 'mode-watcher';
@@ -15,8 +9,16 @@
import { m } from '$lib/paraglide/messages';
import type { User } from '$lib/types/user.type';
import LocalePicker from '$lib/components/locale-picker.svelte';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
import settingsStore from '$lib/stores/config-store';
+ import {
+ ArrowDownIcon,
+ MoonIcon,
+ SunIcon,
+ LogoutIcon,
+ EnvironmentsIcon,
+ RemoteEnvironmentIcon,
+ LanguageIcon
+ } from '$lib/icons';
type Props = {
user: User;
@@ -75,7 +77,7 @@
aria-label="Expand user card"
class={cn('text-muted-foreground/60 transition-transform duration-200', userCardExpanded && 'rotate-180 transform')}
>
- <ChevronDownIcon class="size-4" />
+ <ArrowDownIcon class="size-8" />
</div>
<form action="/logout" method="POST">
<Button.Root
@@ -86,7 +88,7 @@
class="text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-10 w-10 rounded-xl transition-all duration-200 hover:scale-105"
onclick={(e) => e.stopPropagation()}
>
- <LogOutIcon size={16} />
+ <LogoutIcon class="size-5" />
</Button.Root>
</form>
</div>
@@ -100,9 +102,9 @@
<div class="flex items-start gap-3">
<div class="bg-primary/10 text-primary flex aspect-square size-8 shrink-0 items-center justify-center rounded-lg">
{#if environmentStore.selected?.id === '0'}
- <ServerIcon class="size-4" />
+ <EnvironmentsIcon class="size-4" />
{:else}
- <RouterIcon class="size-4" />
+ <RemoteEnvironmentIcon class="size-4" />
{/if}
</div>
<div class="min-w-0 flex-1">
@@ -141,7 +143,7 @@
<div class="bg-background/50 border-border/20 rounded-2xl border p-4">
<div class="flex h-full items-center gap-3">
<div class="bg-primary/10 text-primary flex aspect-square size-8 items-center justify-center rounded-lg">
- <LanguagesIcon class="size-4" />
+ <LanguageIcon class="size-4" />
</div>
<div class="min-w-0 flex-1">
<div class="text-muted-foreground/70 mb-1 text-xs font-medium tracking-widest uppercase">
@@ -161,9 +163,9 @@
<button class="flex h-full w-full items-center gap-3 text-left" onclick={toggleMode}>
<div class="bg-primary/10 text-primary flex aspect-square size-8 items-center justify-center rounded-lg">
{#if isDarkMode}
- <Sun class="size-4" />
+ <SunIcon class="size-4" />
{:else}
- <Moon class="size-4" />
+ <MoonIcon class="size-4" />
{/if}
</div>
<div class="flex min-w-0 flex-1 flex-col justify-center">
diff --git a/frontend/src/lib/components/navigation-mode-setting-control.svelte b/frontend/src/lib/components/navigation-mode-setting-control.svelte
index 88dd644fb..92147f7ab 100644
--- a/frontend/src/lib/components/navigation-mode-setting-control.svelte
+++ b/frontend/src/lib/components/navigation-mode-setting-control.svelte
@@ -1,17 +1,11 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button';
- import ServerIcon from '@lucide/svelte/icons/server';
- import SmartphoneIcon from '@lucide/svelte/icons/smartphone';
- import XIcon from '@lucide/svelte/icons/x';
- import MonitorSpeakerIcon from '@lucide/svelte/icons/monitor-speaker';
- import DockIcon from '@lucide/svelte/icons/dock';
import { m } from '$lib/paraglide/messages';
+ import { CloseIcon, EnvironmentsIcon, SmartphoneIcon, MonitorSpeakerIcon, DockIcon, type IconType } from '$lib/icons';
let {
id,
- label,
description,
- icon: Icon,
serverValue,
localOverride,
onServerChange,
@@ -20,9 +14,7 @@
serverDisabled = false
}: {
id: string;
- label: string;
description: string;
- icon: any;
serverValue: 'floating' | 'docked';
localOverride?: 'floating' | 'docked';
onServerChange: (value: 'floating' | 'docked') => void;
@@ -40,18 +32,8 @@
>
<div class="flex h-full flex-col space-y-3">
<div class="flex items-start gap-3">
- <div
- class={`flex size-7 flex-shrink-0 items-center justify-center rounded-lg ring-1 sm:size-8 ${hasOverride ? 'bg-orange-500/10 text-orange-600 ring-orange-500/20 dark:text-orange-400' : 'bg-primary/10 text-primary ring-primary/20'}`}
- >
- <Icon class="size-3 sm:size-4" />
- </div>
-
<div class="min-w-0 flex-1">
<div class="mb-1 flex items-start justify-between gap-2">
- <div class="min-w-0 flex-1">
- <h4 class="text-sm leading-tight font-medium">{label}</h4>
- </div>
-
{#if hasOverride}
<Button
variant="ghost"
@@ -60,7 +42,7 @@
class="h-6 w-6 flex-shrink-0 p-0 text-orange-600 hover:text-orange-700 dark:text-orange-400 dark:hover:text-orange-300"
title={m.clear_local_override()}
>
- <XIcon class="size-3" />
+ <CloseIcon class="size-3" />
</Button>
{/if}
</div>
@@ -72,7 +54,7 @@
<div class="bg-background/50 rounded-md border">
<div class="flex items-center justify-between p-2 sm:p-3">
<div class="flex min-w-0 flex-1 items-center gap-2">
- <ServerIcon class="text-muted-foreground size-3 flex-shrink-0 sm:size-4" />
+ <EnvironmentsIcon class="text-muted-foreground size-3 flex-shrink-0 sm:size-4" />
<div class="min-w-0 flex-1">
<p class="text-xs leading-tight font-medium">{m.server_default()}</p>
<p class="text-muted-foreground hidden text-xs leading-tight sm:block">{m.applies_to_all_users()}</p>
diff --git a/frontend/src/lib/components/navigation-setting-control.svelte b/frontend/src/lib/components/navigation-setting-control.svelte
index 618391625..6adc445d8 100644
--- a/frontend/src/lib/components/navigation-setting-control.svelte
+++ b/frontend/src/lib/components/navigation-setting-control.svelte
@@ -2,15 +2,11 @@
import { Button } from '$lib/components/ui/button';
import { Switch } from '$lib/components/ui/switch/index.js';
import { m } from '$lib/paraglide/messages';
- import ServerIcon from '@lucide/svelte/icons/server';
- import SmartphoneIcon from '@lucide/svelte/icons/smartphone';
- import XIcon from '@lucide/svelte/icons/x';
+ import { CloseIcon, EnvironmentsIcon, SmartphoneIcon, type IconType } from '$lib/icons';
let {
id,
- label,
description,
- icon: Icon,
serverValue,
localOverride,
onServerChange,
@@ -19,9 +15,7 @@
serverDisabled = false
}: {
id: string;
- label: string;
description: string;
- icon: any;
serverValue: boolean;
localOverride?: boolean;
onServerChange: (value: boolean) => void;
@@ -39,18 +33,8 @@
>
<div class="flex h-full flex-col space-y-3">
<div class="flex items-start gap-3">
- <div
- class={`flex size-7 flex-shrink-0 items-center justify-center rounded-lg ring-1 sm:size-8 ${hasOverride ? 'bg-orange-500/10 text-orange-600 ring-orange-500/20 dark:text-orange-400' : 'bg-primary/10 text-primary ring-primary/20'}`}
- >
- <Icon class="size-3 sm:size-4" />
- </div>
-
<div class="min-w-0 flex-1">
<div class="mb-1 flex items-start justify-between gap-2">
- <div class="min-w-0 flex-1">
- <h4 class="text-sm leading-tight font-medium">{label}</h4>
- </div>
-
{#if hasOverride}
<Button
variant="ghost"
@@ -59,7 +43,7 @@
class="h-6 w-6 flex-shrink-0 p-0 text-orange-600 hover:text-orange-700 dark:text-orange-400 dark:hover:text-orange-300"
title={m.clear_local_override()}
>
- <XIcon class="size-3" />
+ <CloseIcon class="size-3" />
</Button>
{/if}
</div>
@@ -71,7 +55,7 @@
<div class="bg-background/50 rounded-md border">
<div class="flex items-center justify-between p-2 sm:p-3">
<div class="flex min-w-0 flex-1 items-center gap-2">
- <ServerIcon class="text-muted-foreground size-3 flex-shrink-0 sm:size-4" />
+ <EnvironmentsIcon class="text-muted-foreground size-3 flex-shrink-0 sm:size-4" />
<div class="min-w-0 flex-1">
<p class="text-xs leading-tight font-medium">{m.server_default()}</p>
<p class="text-muted-foreground hidden text-xs leading-tight sm:block">{m.applies_to_all_users()}</p>
diff --git a/frontend/src/lib/components/progress-popover.svelte b/frontend/src/lib/components/progress-popover.svelte
index 14371dda6..f306adb71 100644
--- a/frontend/src/lib/components/progress-popover.svelte
+++ b/frontend/src/lib/components/progress-popover.svelte
@@ -6,12 +6,6 @@
import * as Item from '$lib/components/ui/item/index.js';
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
import { Button } from '$lib/components/ui/button/index.js';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import CheckCircleIcon from '@lucide/svelte/icons/check-circle';
- import XCircleIcon from '@lucide/svelte/icons/x-circle';
- import PackageIcon from '@lucide/svelte/icons/package';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
- import type { Icon as IconType } from '@lucide/svelte';
import type { Snippet } from 'svelte';
import { m } from '$lib/paraglide/messages';
import {
@@ -22,6 +16,7 @@
showImageLayersState,
isIndeterminatePhase
} from '$lib/utils/pull-progress';
+ import { DownloadIcon, BoxIcon, ArrowDownIcon, VerifiedCheckIcon, CloseIcon } from '$lib/icons';
interface Props {
open?: boolean;
@@ -34,7 +29,7 @@
align?: 'start' | 'center' | 'end';
sideOffset?: number;
class?: string;
- icon?: typeof IconType;
+ icon?: typeof DownloadIcon;
iconClass?: string;
preventCloseWhileLoading?: boolean;
onCancel?: () => void;
@@ -111,7 +106,7 @@
// Get the appropriate icon based on phase
const PhaseIcon = $derived.by(() => {
- if (currentPhase === 'extracting') return PackageIcon;
+ if (currentPhase === 'extracting') return BoxIcon;
return icon ?? DownloadIcon;
});
@@ -143,9 +138,9 @@
)}
>
{#if error}
- <XCircleIcon class={iconClass} />
+ <CloseIcon class={iconClass} />
{:else if isComplete && !loading}
- <CheckCircleIcon class={iconClass} />
+ <VerifiedCheckIcon class={iconClass} />
{:else}
<PhaseIcon class={cn(iconClass, loading && 'animate-pulse')} />
{/if}
@@ -187,7 +182,7 @@
class="text-muted-foreground hover:text-foreground hover:bg-accent flex w-full items-center justify-between rounded-md px-2 py-1.5 text-xs transition-colors"
>
{m.progress_show_layers()}
- <ChevronDownIcon class={cn('size-3 transition-transform', showImageLayersState.current && 'rotate-180')} />
+ <ArrowDownIcon class={cn('size-3 transition-transform', showImageLayersState.current && 'rotate-180')} />
</Collapsible.Trigger>
<Collapsible.Content>
<div class="mt-2 max-h-48 space-y-1.5 overflow-y-auto">
diff --git a/frontend/src/lib/components/quick-actions.svelte b/frontend/src/lib/components/quick-actions.svelte
index 6015b7185..a8f2753a5 100644
--- a/frontend/src/lib/components/quick-actions.svelte
+++ b/frontend/src/lib/components/quick-actions.svelte
@@ -1,13 +1,9 @@
<script lang="ts">
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import CirclePlayIcon from '@lucide/svelte/icons/circle-play';
- import CircleStopIcon from '@lucide/svelte/icons/circle-stop';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { m } from '$lib/paraglide/messages';
import type { DockerInfo } from '$lib/types/docker-info.type';
+ import { RefreshIcon, StartIcon, StopIcon, TrashIcon, EllipsisIcon } from '$lib/icons';
type IsLoadingFlags = {
starting: boolean;
@@ -64,7 +60,7 @@
{#if isLoading.starting}
<Spinner class="size-3.5 text-emerald-500" />
{:else}
- <CirclePlayIcon class="size-4 text-emerald-500" />
+ <StartIcon class="size-4 text-emerald-500" />
{/if}
<span class="font-medium">{m.quick_actions_start_all()}</span>
<span class="text-muted-foreground rounded-full border px-1 py-0.5 text-[10px]"
@@ -85,7 +81,7 @@
{#if isLoading.stopping}
<Spinner class="size-3.5 text-sky-500" />
{:else}
- <CircleStopIcon class="size-4 text-sky-500" />
+ <StopIcon class="size-4 text-sky-500" />
{/if}
<span class="font-medium">{m.quick_actions_stop_all()}</span>
<span class="text-muted-foreground rounded-full border px-1 py-0.5 text-[10px]"
@@ -102,7 +98,7 @@
{#if isLoading.pruning}
<Spinner class="size-3.5 text-red-500" />
{:else}
- <Trash2Icon class="size-4 text-red-500" />
+ <TrashIcon class="size-4 text-red-500" />
{/if}
<span class="font-medium">{m.quick_actions_prune_system()}</span>
</button>
@@ -116,7 +112,7 @@
{#if refreshing}
<Spinner class="text-primary size-3.5" />
{:else}
- <RefreshCwIcon class="text-primary size-4" />
+ <RefreshIcon class="text-primary size-4" />
{/if}
<span class="font-medium">{m.common_refresh()}</span>
</button>
@@ -196,7 +192,7 @@
{#if isLoading.starting}
<Spinner class="size-4 text-emerald-400" />
{:else}
- <CirclePlayIcon class="size-5 text-emerald-400" />
+ <StartIcon class="size-5 text-emerald-400" />
{/if}
</div>
<div
@@ -228,7 +224,7 @@
{#if isLoading.stopping}
<Spinner class="size-4 text-sky-400" />
{:else}
- <CircleStopIcon class="size-5 text-sky-400" />
+ <StopIcon class="size-5 text-sky-400" />
{/if}
</div>
<div
@@ -256,7 +252,7 @@
{#if isLoading.pruning}
<Spinner class="size-4 text-red-400" />
{:else}
- <Trash2Icon class="size-5 text-red-400" />
+ <TrashIcon class="size-5 text-red-400" />
{/if}
</div>
<div
diff --git a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
index 63497d69d..ff3bfc4f0 100644
--- a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
@@ -1,16 +1,15 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import * as Alert from '$lib/components/ui/alert/index.js';
import { m } from '$lib/paraglide/messages';
import { templateService } from '$lib/services/template-service';
+ import { AlertIcon } from '$lib/icons';
type TemplateRegistryFormProps = {
open: boolean;
@@ -50,6 +49,7 @@
const registryPayload = {
name: registryData.name,
url: data.url,
+ description: registryData.description || '',
enabled: data.enabled
};
@@ -67,22 +67,16 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <GlobeIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">{m.templates_add_registry_title()}</Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">
- {m.templates_add_registry_description()}
- </Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
- <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={m.templates_add_registry_title()}
+ description={m.templates_add_registry_description()}
+ contentClass="sm:max-w-[500px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.templates_registry_url_label()}
type="text"
@@ -100,29 +94,31 @@
{#if submitError}
<Alert.Root class="border-red-200 bg-red-50 dark:border-red-800 dark:bg-red-950">
- <AlertCircleIcon class="size-4" />
+ <AlertIcon class="size-4" />
<Alert.Title>{m.templates_registry_validation_error_title()}</Alert.Title>
<Alert.Description class="text-sm">{submitError}</Alert.Description>
</Alert.Root>
{/if}
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button
- type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
- onclick={() => (open = false)}
- disabled={isLoading}
- >
- {m.common_cancel()}
- </Button>
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- {m.templates_add_registry_button()}
- </Button>
- </Sheet.Footer>
</form>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}
+ >
+ {m.common_cancel()}
+ </Button>
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="size-4" />
+ {/if}
+ {m.templates_add_registry_button()}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/api-key-form-sheet.svelte b/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
index 217ecfa7f..e61b26233 100644
--- a/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
@@ -1,14 +1,13 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import KeyIcon from '@lucide/svelte/icons/key';
- import SaveIcon from '@lucide/svelte/icons/save';
import type { ApiKey } from '$lib/types/api-key.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import * as m from '$lib/paraglide/messages.js';
+ import { ApiKeyIcon, SaveIcon } from '$lib/icons';
type ApiKeyFormProps = {
open: boolean;
@@ -24,7 +23,7 @@
let { open = $bindable(false), apiKeyToEdit = $bindable(), onSubmit, isLoading }: ApiKeyFormProps = $props();
let isEditMode = $derived(!!apiKeyToEdit);
- let SubmitIcon = $derived(isEditMode ? SaveIcon : KeyIcon);
+ let SubmitIcon = $derived(isEditMode ? SaveIcon : ApiKeyIcon);
const formSchema = z.object({
name: z.string().min(1, m.common_field_required({ field: m.api_key_name() })),
@@ -61,28 +60,17 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <SubmitIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">
- {isEditMode ? m.api_key_edit_title() : m.api_key_create_title()}
- </Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">
- {#if isEditMode}
- {m.api_key_edit_description({ name: apiKeyToEdit?.name ?? m.common_unknown() })}
- {:else}
- {m.api_key_create_description()}
- {/if}
- </Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={isEditMode ? m.api_key_edit_title() : m.api_key_create_title()}
+ description={isEditMode
+ ? m.api_key_edit_description({ name: apiKeyToEdit?.name ?? m.common_unknown() })
+ : m.api_key_create_description()}
+ contentClass="sm:max-w-[500px]"
+>
+ {#snippet children()}
<form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.api_key_name()}
@@ -104,19 +92,25 @@
description={m.api_key_expires_at_description()}
bind:input={$inputs.expiresAt}
/>
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button type="button" class="arcane-button-cancel flex-1" variant="outline" onclick={() => (open = false)} disabled={isLoading}
- >{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- <SubmitIcon class="mr-2 size-4" />
- {isEditMode ? m.api_key_save_changes() : m.api_key_create_button()}
- </Button>
- </Sheet.Footer>
</form>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}>{m.common_cancel()}</Button
+ >
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="mr-2 size-4" />
+ {/if}
+ <SubmitIcon class="mr-2 size-4" />
+ {isEditMode ? m.api_key_save_changes() : m.api_key_create_button()}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/container-registry-sheet.svelte b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
index 3d71a33d6..f015fcf10 100644
--- a/frontend/src/lib/components/sheets/container-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
@@ -1,15 +1,15 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import PackagePlusIcon from '@lucide/svelte/icons/package-plus';
import type { ContainerRegistry } from '$lib/types/container-registry.type';
import type { ContainerRegistryCreateDto, ContainerRegistryUpdateDto } from '$lib/types/container-registry.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import { m } from '$lib/paraglide/messages';
+ import { RegistryIcon } from '$lib/icons';
type ContainerRegistryFormProps = {
open: boolean;
@@ -47,26 +47,25 @@
if (!data) return;
onSubmit({ registry: data, isEditMode });
}
+
+ function handleOpenChange(newOpenState: boolean) {
+ open = newOpenState;
+ if (!newOpenState) {
+ registryToEdit = null;
+ }
+ }
</script>
-<Sheet.Root bind:open>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <PackagePlusIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">
- {isEditMode ? m.registries_edit_title() : m.common_add_button({ resource: m.resource_registry_cap() })}
- </Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">
- {isEditMode ? m.registries_edit_description() : m.registries_add_description()}
- </Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
- <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={isEditMode ? m.registries_edit_title() : m.common_add_button({ resource: m.resource_registry_cap() })}
+ description={isEditMode ? m.registries_edit_description() : m.registries_add_description()}
+ contentClass="sm:max-w-[500px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.registries_url()}
type="text"
@@ -105,25 +104,27 @@
description={m.registries_allow_insecure_description()}
bind:checked={$inputs.insecure.value}
/>
+ </form>
+ {/snippet}
- <Sheet.Footer class="flex flex-row gap-2">
- <Button
- type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
- onclick={() => (open = false)}
- disabled={isLoading}
- >
- {m.common_cancel()}
- </Button>
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}
+ >
+ {m.common_cancel()}
+ </Button>
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- {isEditMode ? m.registries_save_changes() : m.common_add_button({ resource: m.resource_registry_cap() })}
- </Button>
- </Sheet.Footer>
- </form>
- </Sheet.Content>
-</Sheet.Root>
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="mr-2 size-4" />
+ {/if}
+ {isEditMode ? m.registries_save_changes() : m.common_add_button({ resource: m.resource_registry_cap() })}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/create-network-sheet.svelte b/frontend/src/lib/components/sheets/create-network-sheet.svelte
index 8e4f45783..4b7429eee 100644
--- a/frontend/src/lib/components/sheets/create-network-sheet.svelte
+++ b/frontend/src/lib/components/sheets/create-network-sheet.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import * as Accordion from '$lib/components/ui/accordion/index.js';
import { Checkbox } from '$lib/components/ui/checkbox/index.js';
@@ -7,13 +7,12 @@
import { Input } from '$lib/components/ui/input/index.js';
import { Textarea } from '$lib/components/ui/textarea/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import XIcon from '@lucide/svelte/icons/x';
import type { NetworkCreateOptions } from '$lib/types/network.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import SelectWithLabel from '../form/select-with-label.svelte';
import { m } from '$lib/paraglide/messages';
+ import { AddIcon, CloseIcon, NetworksIcon } from '$lib/icons';
type CreateNetworkFormProps = {
open: boolean;
@@ -156,21 +155,16 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header data-testid="create-network-dialog-header" class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <NetworkIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">{m.create_network_title()}</Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">{m.create_network_description()}</Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
- <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={m.create_network_title()}
+ description={m.create_network_description()}
+ contentClass="sm:max-w-[600px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<div class="space-y-2">
<Label for="network-name" class="text-sm font-medium">{m.network_name_label()}</Label>
<Input
@@ -229,7 +223,7 @@
class="text-destructive hover:text-destructive"
title={m.common_remove()}
>
- <XIcon class="size-4" />
+ <CloseIcon class="size-4" />
</Button>
</div>
{/each}
@@ -326,25 +320,26 @@
</Accordion.Content>
</Accordion.Item>
</Accordion.Root>
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button
- type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
- onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {m.common_action_creating()}
- {:else}
- <NetworkIcon class="mr-2 size-4" />
- {m.common_create_button({ resource: m.resource_network_cap() })}
- {/if}
- </Button>
- </Sheet.Footer>
</form>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}>{m.common_cancel()}</Button
+ >
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="mr-2 size-4" />
+ {:else}
+ <AddIcon class="mr-2 size-4" />
+ {/if}
+ {isLoading ? m.common_action_creating() : m.common_create_button({ resource: m.resource_network_cap() })}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/create-volume-sheet.svelte b/frontend/src/lib/components/sheets/create-volume-sheet.svelte
index 397d520f9..8ec6c4afb 100644
--- a/frontend/src/lib/components/sheets/create-volume-sheet.svelte
+++ b/frontend/src/lib/components/sheets/create-volume-sheet.svelte
@@ -1,15 +1,15 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import * as Accordion from '$lib/components/ui/accordion/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
import type { VolumeCreateRequest } from '$lib/types/volume.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import SelectWithLabel from '../form/select-with-label.svelte';
import { m } from '$lib/paraglide/messages';
+ import { AddIcon, VolumesIcon } from '$lib/icons';
type CreateVolumeFormProps = {
open: boolean;
@@ -92,21 +92,16 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <HardDriveIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title data-testid="create-volume-header" class="text-xl font-semibold">{m.create_volume_title()}</Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">{m.create_volume_description()}</Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
- <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={m.create_volume_title()}
+ description={m.create_volume_description()}
+ contentClass="sm:max-w-[600px]"
+>
+ {#snippet children()}
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.volume_name_label()}
id="volume-name"
@@ -154,25 +149,25 @@
</Accordion.Content>
</Accordion.Item>
</Accordion.Root>
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button
- type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
- onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {m.common_action_creating()}
- {:else}
- <HardDriveIcon class="mr-2 size-4" />
- {m.common_create_button({ resource: m.resource_volume_cap() })}
- {/if}
- </Button>
- </Sheet.Footer>
</form>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}>{m.common_cancel()}</Button
+ >
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="mr-2 size-4" />
+ {/if}
+ <AddIcon class="mr-2 size-4" />
+ {isLoading ? m.common_action_creating() : m.common_create_button({ resource: m.resource_volume_cap() })}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/image-pull-sheet.svelte b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
index a7c982f93..63faebcd3 100644
--- a/frontend/src/lib/components/sheets/image-pull-sheet.svelte
+++ b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
@@ -1,12 +1,9 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { Progress } from '$lib/components/ui/progress/index.js';
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import CheckCircleIcon from '@lucide/svelte/icons/check-circle';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import { toast } from 'svelte-sonner';
@@ -25,6 +22,7 @@
showImageLayersState,
isIndeterminatePhase
} from '$lib/utils/pull-progress';
+ import { ArrowDownIcon, SuccessIcon, DownloadIcon } from '$lib/icons';
type ImagePullFormProps = {
open: boolean;
@@ -226,38 +224,15 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div
- class={cn(
- 'flex size-10 shrink-0 items-center justify-center rounded-lg',
- pullError && 'bg-destructive/10 text-destructive',
- hasReachedComplete && !pullError && 'bg-green-500/10 text-green-500',
- !showPullUI && 'bg-primary/10 text-primary',
- isPulling && !pullError && !hasReachedComplete && 'bg-primary/10 text-primary'
- )}
- >
- {#if hasReachedComplete && !pullError}
- <CheckCircleIcon class="size-5" />
- {:else}
- <DownloadIcon class={cn('size-5', isPulling && 'animate-pulse')} />
- {/if}
- </div>
- <div class="min-w-0 flex-1">
- <Sheet.Title class="text-xl font-semibold">{m.images_pull_image()}</Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">
- {#if showPullUI && currentImageName}
- <span class="block truncate" title={currentImageName}>{currentImageName}</span>
- {:else}
- {m.images_pull_description()}
- {/if}
- </Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={m.images_pull_image()}
+ description={showPullUI && currentImageName ? currentImageName : m.images_pull_description()}
+ contentClass="sm:max-w-[600px]"
+>
+ {#snippet children()}
{#if showPullUI}
<!-- Pull progress UI -->
<div class="space-y-4 py-6">
@@ -297,7 +272,7 @@
class="text-muted-foreground hover:text-foreground hover:bg-accent flex w-full items-center justify-between rounded-md px-2 py-1.5 text-xs transition-colors"
>
{m.progress_show_layers()}
- <ChevronDownIcon class={cn('size-3 transition-transform', showImageLayersState.current && 'rotate-180')} />
+ <ArrowDownIcon class={cn('size-4 transition-transform', showImageLayersState.current && 'rotate-180')} />
</Collapsible.Trigger>
<Collapsible.Content>
<div class="mt-2 space-y-1.5">
@@ -338,19 +313,8 @@
{/if}
{/if}
</div>
-
- {#if pullError}
- <Sheet.Footer class="flex flex-row gap-2">
- <Button type="button" class="flex-1" variant="outline" onclick={() => resetState()}>
- {m.common_retry()}
- </Button>
- <Button type="button" class="flex-1" onclick={() => (open = false)}>
- {m.common_close()}
- </Button>
- </Sheet.Footer>
- {/if}
{:else}
- <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-4">
+ <form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.images_image_name_label()}
type="text"
@@ -365,17 +329,30 @@
description={m.images_tag_description()}
bind:input={$inputs.tag}
/>
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button type="button" class="arcane-button-cancel flex-1" variant="outline" onclick={() => (open = false)}>
- {m.common_cancel()}
- </Button>
- <Button type="submit" class="arcane-button-create flex-1">
- <DownloadIcon class="mr-2 size-4" />
- {m.images_pull_image()}
- </Button>
- </Sheet.Footer>
</form>
{/if}
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ {#if pullError}
+ <div class="flex w-full flex-row gap-2">
+ <Button type="button" class="flex-1" variant="outline" onclick={() => resetState()}>
+ {m.common_retry()}
+ </Button>
+ <Button type="button" class="flex-1" onclick={() => (open = false)}>
+ {m.common_close()}
+ </Button>
+ </div>
+ {:else if !showPullUI}
+ <div class="flex w-full flex-row gap-2">
+ <Button type="button" class="arcane-button-cancel flex-1" variant="outline" onclick={() => (open = false)}>
+ {m.common_cancel()}
+ </Button>
+ <Button type="submit" class="arcane-button-create flex-1" onclick={handleSubmit}>
+ <DownloadIcon class="mr-2 size-4" />
+ {m.images_pull_image()}
+ </Button>
+ </div>
+ {/if}
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/new-environment-sheet.svelte b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
index 214ca5994..457377a1f 100644
--- a/frontend/src/lib/components/sheets/new-environment-sheet.svelte
+++ b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
@@ -1,11 +1,10 @@
<script lang="ts">
import { toast } from 'svelte-sonner';
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import UrlInput from '$lib/components/form/url-input.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import ServerIcon from '@lucide/svelte/icons/server';
import * as Card from '$lib/components/ui/card';
import type { CreateEnvironmentDTO } from '$lib/types/environment.type';
import { z } from 'zod/v4';
@@ -96,20 +95,14 @@
}
</script>
-<Sheet.Root bind:open>
- <Sheet.Content class="w-full p-6 sm:max-w-lg">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <ServerIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">{m.environments_title()}</Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">{m.environments_manage_description()}</Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
+<ResponsiveDialog.Root
+ bind:open
+ variant="sheet"
+ title={m.environments_title()}
+ description={m.environments_manage_description()}
+ contentClass="sm:max-w-lg"
+>
+ {#snippet children()}
<div class="space-y-6 py-6">
<Card.Root class="flex flex-col gap-6 py-3">
<Card.Header
@@ -141,7 +134,7 @@
bind:input={$inputs.bootstrapToken}
/>
- <Button type="submit" class="w-full" disabled={isSubmitting}>
+ <Button type="submit" class="w-full" disabled={isSubmitting} onclick={handleSubmit}>
{#if isSubmitting}
<Spinner class="mr-2 size-4" />
{/if}
@@ -151,5 +144,5 @@
</Card.Content>
</Card.Root>
</div>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/user-form-sheet.svelte b/frontend/src/lib/components/sheets/user-form-sheet.svelte
index 2eb05b625..2a345d751 100644
--- a/frontend/src/lib/components/sheets/user-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/user-form-sheet.svelte
@@ -1,15 +1,14 @@
<script lang="ts">
- import * as Sheet from '$lib/components/ui/sheet/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import UserPlusIcon from '@lucide/svelte/icons/user-plus';
- import SaveIcon from '@lucide/svelte/icons/save';
import type { User } from '$lib/types/user.type';
import { z } from 'zod/v4';
import { createForm, preventDefault } from '$lib/utils/form.utils';
import { m } from '$lib/paraglide/messages';
+ import { AddIcon, SaveIcon } from '$lib/icons';
type UserFormProps = {
open: boolean;
@@ -31,7 +30,7 @@
let isEditMode = $derived(!!userToEdit);
let canEditUsername = $derived(!isEditMode || allowUsernameEdit);
- let SubmitIcon = $derived(isEditMode ? SaveIcon : UserPlusIcon);
+ let SubmitIcon = $derived(isEditMode ? SaveIcon : AddIcon);
let isOidcUser = $derived(!!userToEdit?.oidcSubjectId);
@@ -90,28 +89,17 @@
}
</script>
-<Sheet.Root bind:open onOpenChange={handleOpenChange}>
- <Sheet.Content class="p-6">
- <Sheet.Header class="space-y-3 border-b pb-6">
- <div class="flex items-center gap-3">
- <div class="bg-primary/10 flex size-10 shrink-0 items-center justify-center rounded-lg">
- <SubmitIcon class="text-primary size-5" />
- </div>
- <div>
- <Sheet.Title class="text-xl font-semibold">
- {isEditMode ? m.users_edit_title() : m.users_create_new_title()}
- </Sheet.Title>
- <Sheet.Description class="text-muted-foreground mt-1 text-sm">
- {#if isEditMode}
- {m.users_edit_description({ username: userToEdit?.username ?? m.common_unknown() })}
- {:else}
- {m.users_create_description()}
- {/if}
- </Sheet.Description>
- </div>
- </div>
- </Sheet.Header>
-
+<ResponsiveDialog.Root
+ bind:open
+ onOpenChange={handleOpenChange}
+ variant="sheet"
+ title={isEditMode ? m.users_edit_title() : m.users_create_new_title()}
+ description={isEditMode
+ ? m.users_edit_description({ username: userToEdit?.username ?? m.common_unknown() })
+ : m.users_create_description()}
+ contentClass="sm:max-w-[500px]"
+>
+ {#snippet children()}
<form onsubmit={preventDefault(handleSubmit)} class="grid gap-4 py-6">
<FormInput
label={m.common_username()}
@@ -158,23 +146,25 @@
description={m.users_administrator_description()}
bind:checked={$inputs.isAdmin.value}
/>
-
- <Sheet.Footer class="flex flex-row gap-2">
- <Button
- type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
- onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- <SubmitIcon class="mr-2 size-4" />
- {isEditMode ? m.users_save_changes() : m.common_create_button({ resource: m.resource_user_cap() })}
- </Button>
- </Sheet.Footer>
</form>
- </Sheet.Content>
-</Sheet.Root>
+ {/snippet}
+
+ {#snippet footer()}
+ <div class="flex w-full flex-row gap-2">
+ <Button
+ type="button"
+ class="arcane-button-cancel flex-1"
+ variant="outline"
+ onclick={() => (open = false)}
+ disabled={isLoading}>{m.common_cancel()}</Button
+ >
+ <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
+ {#if isLoading}
+ <Spinner class="mr-2 size-4" />
+ {/if}
+ <SubmitIcon class="mr-2 size-4" />
+ {isEditMode ? m.users_save_changes() : m.common_create_button({ resource: m.resource_user_cap() })}
+ </Button>
+ </div>
+ {/snippet}
+</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
index 774143b8f..4ea726530 100644
--- a/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-env-switcher.svelte
@@ -1,12 +1,7 @@
<script lang="ts">
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import * as Sidebar from '$lib/components/ui/sidebar/index.js';
- import { Label } from '$lib/components/ui/label/index.js';
import { useSidebar } from '$lib/components/ui/sidebar/index.js';
- import ChevronsUpDownIcon from '@lucide/svelte/icons/chevrons-up-down';
- import PlusIcon from '@lucide/svelte/icons/plus';
- import RouterIcon from '@lucide/svelte/icons/router';
- import ServerIcon from '@lucide/svelte/icons/server';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import type { Environment } from '$lib/types/environment.type';
import { goto } from '$app/navigation';
@@ -14,6 +9,7 @@
import { m } from '$lib/paraglide/messages';
import { cn } from '$lib/utils';
import settingsStore from '$lib/stores/config-store';
+ import { EnvironmentsIcon, RemoteEnvironmentIcon, AddIcon, ArrowsUpDownIcon } from '$lib/icons';
type Props = {
isAdmin?: boolean;
@@ -64,9 +60,9 @@
{#if environmentStore.selected}
<div class="bg-primary text-primary-foreground flex aspect-square size-8 items-center justify-center rounded-lg">
{#if environmentStore.selected.id === '0'}
- <ServerIcon class="size-4" />
+ <EnvironmentsIcon class="size-4" />
{:else}
- <RouterIcon class="size-4" />
+ <RemoteEnvironmentIcon class="size-4" />
{/if}
</div>
<div class="grid flex-1 text-left text-sm leading-tight">
@@ -79,14 +75,14 @@
</div>
{:else}
<div class="bg-primary text-primary-foreground flex aspect-square size-8 items-center justify-center rounded-lg">
- <ServerIcon class="size-4" />
+ <EnvironmentsIcon class="size-4" />
</div>
<div class="grid flex-1 text-left text-sm leading-tight">
<span class="truncate font-medium">{m.sidebar_no_environment()}</span>
<span class="truncate text-xs">{m.sidebar_select_one()}</span>
</div>
{/if}
- <ChevronsUpDownIcon class="ml-auto" />
+ <ArrowsUpDownIcon class="ml-auto" />
</Sidebar.MenuButton>
{/snippet}
</DropdownMenu.Trigger>
@@ -113,7 +109,7 @@
{#if environmentStore.available.length === 0}
<DropdownMenu.Item disabled class="gap-2 p-2">
<div class="flex size-6 items-center justify-center rounded-md border">
- <ServerIcon class="size-3.5 shrink-0" />
+ <EnvironmentsIcon class="size-3.5 shrink-0" />
</div>
<span>{m.sidebar_no_environments()}</span>
</DropdownMenu.Item>
@@ -137,9 +133,9 @@
)}
>
{#if env.id === '0'}
- <ServerIcon class={cn('size-3.5 shrink-0', isActive && 'text-primary-foreground')} />
+ <EnvironmentsIcon class={cn('size-3.5 shrink-0', isActive && 'text-primary-foreground')} />
{:else}
- <RouterIcon class={cn('size-3.5 shrink-0', isActive && 'text-primary-foreground')} />
+ <RemoteEnvironmentIcon class={cn('size-3.5 shrink-0', isActive && 'text-primary-foreground')} />
{/if}
</div>
<div class="flex flex-col">
@@ -154,7 +150,7 @@
<DropdownMenu.Separator />
<DropdownMenu.Item class="text-muted-foreground gap-2 p-2" onSelect={() => goto('/environments')}>
<div class="flex size-6 items-center justify-center rounded-md border bg-transparent">
- <PlusIcon class="size-4" />
+ <AddIcon class="size-4" />
</div>
<div class="font-medium">View all {environmentStore.available.length} environments</div>
</DropdownMenu.Item>
@@ -164,7 +160,7 @@
<DropdownMenu.Separator />
<DropdownMenu.Item class="gap-2 p-2" onSelect={() => goto('/environments')}>
<div class="flex size-6 items-center justify-center rounded-md border bg-transparent">
- <PlusIcon class="size-4" />
+ <AddIcon class="size-4" />
</div>
<div class="text-muted-foreground font-medium">{m.sidebar_manage_environments()}</div>
</DropdownMenu.Item>
diff --git a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte
index 8e2e682dd..46512da8c 100644
--- a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte
@@ -1,10 +1,9 @@
<script lang="ts">
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
import * as Sidebar from '$lib/components/ui/sidebar/index.js';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import type { Icon as IconType } from '@lucide/svelte';
import { page } from '$app/state';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
+ import { ArrowRightIcon } from '$lib/icons';
let {
items,
@@ -14,11 +13,11 @@
items: {
title: string;
url: string;
- icon?: typeof IconType;
+ icon?: typeof ArrowRightIcon;
items?: {
title: string;
url: string;
- icon?: typeof IconType;
+ icon?: typeof ArrowRightIcon;
}[];
}[];
} = $props();
@@ -130,7 +129,7 @@
<Icon />
{/if}
<span>{item.title}</span>
- <ChevronRightIcon
+ <ArrowRightIcon
class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
/>
</a>
diff --git a/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
index 96a14a076..20ec503d1 100644
--- a/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
@@ -1,9 +1,8 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
- import PinIcon from '@lucide/svelte/icons/pin';
- import PinOffIcon from '@lucide/svelte/icons/pin-off';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
+ import { PinOnIcon, PinOffIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -44,10 +43,10 @@
{...restProps}
>
{#if isPinned}
- <PinOffIcon size={16} />
+ <PinOnIcon />
<span class="sr-only">Unpin sidebar</span>
{:else}
- <PinIcon size={16} />
+ <PinOffIcon />
<span class="sr-only">Pin sidebar</span>
{/if}
</Button>
diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
index f2a46aaf9..9f08d914c 100644
--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
@@ -2,8 +2,6 @@
import { cn } from '$lib/utils';
import * as Separator from '$lib/components/ui/separator/index.js';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
- import ExternalLink from '@lucide/svelte/icons/external-link';
- import DownloadIcon from '@lucide/svelte/icons/download';
import { useSidebar } from '$lib/components/ui/sidebar/index.js';
import type { AppVersionInformation } from '$lib/types/application-configuration';
import type { User } from '$lib/types/user.type';
@@ -13,6 +11,7 @@
import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';
import { toast } from 'svelte-sonner';
import { onMount } from 'svelte';
+ import { DownloadIcon, ExternalLinkIcon } from '$lib/icons';
let {
isCollapsed,
@@ -37,7 +36,7 @@
const isAdmin = $derived(!!user?.roles?.includes('admin'));
const shouldShowUpgrade = $derived((canUpgrade && isAdmin) || debug);
-
+
// Determine update type and display text
const updateType = $derived.by(() => {
if (!versionInformation) return 'none';
@@ -45,7 +44,7 @@
if (versionInformation.currentTag && versionInformation.newestDigest) return 'digest';
return 'none';
});
-
+
const updateDisplayText = $derived.by(() => {
if (!versionInformation) return '';
if (updateType === 'semver') {
@@ -58,7 +57,7 @@
}
return '';
});
-
+
const upgradeButtonText = $derived.by(() => {
if (upgrading) return m.upgrade_in_progress();
if (checkingUpgrade) return m.upgrade_checking();
@@ -171,7 +170,7 @@
class="group flex items-center justify-between text-blue-600 transition-colors duration-200 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
>
{@render updateInfo()}
- <ExternalLink size={16} class="transition-transform duration-200 group-hover:scale-110" />
+ <ExternalLinkIcon class="size-4 transition-transform duration-200 group-hover:scale-110" />
</a>
{#if shouldShowUpgrade}
@@ -194,7 +193,7 @@
rel="noopener noreferrer"
class="flex h-full w-full items-center justify-center text-blue-600 transition-all duration-200 hover:scale-110 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300"
>
- <ExternalLink size={14} />
+ <ExternalLinkIcon />
</a>
</div>
{/snippet}
@@ -216,7 +215,7 @@
class="border-primary/20 bg-primary/15 text-primary hover:bg-primary/25 focus-visible:ring-primary/40 dark:text-primary flex size-8 items-center justify-center rounded-lg border transition-all hover:scale-[1.02] hover:shadow-md focus-visible:ring-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
{...props}
>
- <DownloadIcon size={14} />
+ <DownloadIcon class="size-3.5" />
</button>
{/snippet}
</Tooltip.Trigger>
diff --git a/frontend/src/lib/components/sidebar/sidebar-user.svelte b/frontend/src/lib/components/sidebar/sidebar-user.svelte
index 19ae1f8b3..9c8734bd1 100644
--- a/frontend/src/lib/components/sidebar/sidebar-user.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-user.svelte
@@ -5,14 +5,13 @@
import * as Button from '$lib/components/ui/button/index.js';
import { useSidebar } from '$lib/components/ui/sidebar/index.js';
import type { User } from '$lib/types/user.type';
- import Sun from '@lucide/svelte/icons/sun';
- import Moon from '@lucide/svelte/icons/moon';
import { mode, toggleMode } from 'mode-watcher';
import { cn } from '$lib/utils';
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import LocalePicker from '$lib/components/locale-picker.svelte';
import { getDefaultProfilePicture } from '$lib/utils/image.util';
+ import { SunIcon, MoonIcon } from '$lib/icons';
let { user, isCollapsed }: { user: User; isCollapsed: boolean } = $props();
const sidebar = useSidebar();
@@ -148,9 +147,9 @@
>
<div class="group-hover:bg-muted-foreground/10 rounded-lg bg-transparent p-1 transition-colors duration-200">
{#if mode.current === 'dark'}
- <Sun size={16} class="transition-transform duration-200" />
+ <SunIcon class="size-4 transition-transform duration-200" />
{:else}
- <Moon size={16} class="transition-transform duration-200" />
+ <MoonIcon class="size-4 transition-transform duration-200" />
{/if}
</div>
<span class="font-medium">{m.common_toggle_theme()}</span>
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index 3500fd936..9a77b5d47 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -17,8 +17,8 @@
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
import * as Button from '$lib/components/ui/button/index.js';
- import LogOutIcon from '@lucide/svelte/icons/log-out';
import VersionInfoDialog from '$lib/components/dialogs/version-info-dialog.svelte';
+ import { LogoutIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -45,6 +45,16 @@
const isCollapsed = $derived(sidebar.state === 'collapsed' && !(sidebar.hoverExpansionEnabled && sidebar.isHovered));
const isAdmin = $derived(!!effectiveUser?.roles?.includes('admin'));
+
+ // Filter out sub-items for settings on desktop since we have a dedicated settings sidebar
+ const desktopSettingsItems =
+ navigationItems.settingsItems?.map((item) => {
+ if (item.url === '/settings') {
+ const { items, ...rest } = item;
+ return rest;
+ }
+ return item;
+ }) ?? [];
</script>
<VersionInfoDialog
@@ -78,10 +88,9 @@
</Sidebar.Header>
<Sidebar.Content class={!isCollapsed ? '-mt-2' : ''}>
<SidebarItemGroup label={m.sidebar_management()} items={navigationItems.managementItems} />
- <SidebarItemGroup label={m.sidebar_customization()} items={navigationItems.customizationItems} />
+ <SidebarItemGroup label={m.sidebar_resources()} items={navigationItems.resourceItems} />
{#if isAdmin}
- <SidebarItemGroup label={m.sidebar_environments()} items={navigationItems.environmentItems} />
- <SidebarItemGroup label={m.sidebar_administration()} items={navigationItems.settingsItems} />
+ <SidebarItemGroup label={m.sidebar_administration()} items={desktopSettingsItems} />
{/if}
</Sidebar.Content>
<Sidebar.Footer>
@@ -110,7 +119,7 @@
type="submit"
class="text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-9 w-9 rounded-xl p-0"
>
- <LogOutIcon size={16} />
+ <LogoutIcon class="size-5" />
</Button.Root>
</form>
</div>
diff --git a/frontend/src/lib/components/stat-card.svelte b/frontend/src/lib/components/stat-card.svelte
index e28b798a9..ac3fdc7ba 100644
--- a/frontend/src/lib/components/stat-card.svelte
+++ b/frontend/src/lib/components/stat-card.svelte
@@ -1,12 +1,12 @@
<script lang="ts">
import { cn } from '$lib/utils.js';
- import type { Icon as IconType } from '@lucide/svelte';
import type { ClassValue } from 'svelte/elements';
+ import { type IconType } from '$lib/icons';
interface Props {
title: string;
value: string | number;
- icon: typeof IconType;
+ icon: IconType;
iconColor?: string;
bgColor?: string;
subtitle?: string;
@@ -26,42 +26,36 @@
<div
class={cn(
- 'bg-card/90 group hover-lift relative overflow-hidden rounded-xl border p-5 shadow-sm backdrop-blur-sm transition-all duration-300',
+ 'bg-card group relative overflow-hidden rounded-2xl border p-6 transition-all duration-300 hover:-translate-y-1 hover:shadow-lg',
iconColor,
className
)}
style="--stat-hover-tint: currentColor;"
>
<div
- class="pointer-events-none absolute inset-0 rounded-xl bg-gradient-to-br from-[var(--stat-hover-tint)]/10 to-transparent opacity-0 transition-opacity duration-300 group-hover:opacity-100"
+ class="pointer-events-none absolute inset-0 bg-gradient-to-br from-[var(--stat-hover-tint)]/5 via-transparent to-transparent opacity-0 transition-opacity duration-500 group-hover:opacity-100"
></div>
- <div
- class="pointer-events-none absolute -top-8 -right-8 size-24 rounded-full bg-[var(--stat-hover-tint)]/20 opacity-0 blur-2xl transition-opacity duration-500 group-hover:opacity-100"
- ></div>
-
- <div class="relative flex items-center justify-between gap-4">
- <div class="flex-1 space-y-1.5">
- <p class="text-muted-foreground text-xs font-medium tracking-wider uppercase opacity-80">
+ <div class="relative flex items-start justify-between">
+ <div class="space-y-2">
+ <p class="text-muted-foreground text-sm font-medium tracking-wide">
{title}
</p>
- <p class="text-foreground text-2xl font-bold tabular-nums transition-transform duration-300">
+ <h3 class="text-3xl font-bold tracking-tight tabular-nums">
{value}
- </p>
+ </h3>
{#if subtitle}
- <p class="text-muted-foreground text-xs opacity-70">{subtitle}</p>
+ <p class="text-muted-foreground text-xs">{subtitle}</p>
{/if}
</div>
<div
class={cn(
- 'bg-card/80 relative shrink-0 rounded-xl border border-white/10 p-3 shadow-lg backdrop-blur-sm transition-all duration-300 group-hover:bg-[var(--stat-hover-tint)]/10',
- 'group-hover:-translate-y-0.5 group-hover:shadow-xl',
- bgColor
+ 'flex size-10 items-center justify-center rounded-full transition-colors duration-300',
+ 'bg-transparent group-hover:bg-[var(--stat-hover-tint)]/10'
)}
>
- <div class="pointer-events-none absolute inset-0 rounded-xl bg-linear-to-br from-white/20 to-transparent opacity-50"></div>
- <Icon class={cn('relative size-5 transition-transform duration-300', iconColor)} />
+ <Icon class={cn('size-6 transition-transform duration-300 group-hover:scale-110', iconColor)} />
</div>
</div>
</div>
diff --git a/frontend/src/lib/components/tab-bar/types.ts b/frontend/src/lib/components/tab-bar/types.ts
index de934c59f..e0a0b0d83 100644
--- a/frontend/src/lib/components/tab-bar/types.ts
+++ b/frontend/src/lib/components/tab-bar/types.ts
@@ -1,9 +1,7 @@
-import type { Icon as IconType } from '@lucide/svelte';
-
export interface TabItem {
value: string;
label: string;
- icon?: typeof IconType;
+ icon?: any;
badge?: string | number;
disabled?: boolean;
class?: string;
diff --git a/frontend/src/lib/components/terminal/terminal-controls.svelte b/frontend/src/lib/components/terminal/terminal-controls.svelte
index b6e8a0705..ba7346358 100644
--- a/frontend/src/lib/components/terminal/terminal-controls.svelte
+++ b/frontend/src/lib/components/terminal/terminal-controls.svelte
@@ -2,8 +2,8 @@
import * as Select from '$lib/components/ui/select/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import { Input } from '$lib/components/ui/input/index.js';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
import { m } from '$lib/paraglide/messages';
+ import { RefreshIcon } from '$lib/icons';
let {
selectedShell = $bindable(),
@@ -109,6 +109,6 @@
{/if}
<Button size="icon" variant="ghost" onclick={onReconnect} class="size-8" title="Reconnect shell">
- <RefreshCwIcon class="size-4" />
+ <RefreshIcon class="size-4" />
</Button>
</div>
diff --git a/frontend/src/lib/components/ui/accordion/accordion-trigger.svelte b/frontend/src/lib/components/ui/accordion/accordion-trigger.svelte
index df2a61944..8f50cf012 100644
--- a/frontend/src/lib/components/ui/accordion/accordion-trigger.svelte
+++ b/frontend/src/lib/components/ui/accordion/accordion-trigger.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { Accordion as AccordionPrimitive, type WithoutChild } from 'bits-ui';
- import ChevronDown from '@lucide/svelte/icons/chevron-down';
import { cn } from '$lib/utils.js';
+ import { ArrowDownIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -24,6 +24,6 @@
{...restProps}
>
{@render children?.()}
- <ChevronDown class="size-4 shrink-0 transition-transform duration-200" />
+ <ArrowDownIcon class="size-4 shrink-0 transition-transform duration-200" />
</AccordionPrimitive.Trigger>
</AccordionPrimitive.Header>
diff --git a/frontend/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte b/frontend/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
index f40df5be1..3a8d82850 100644
--- a/frontend/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
+++ b/frontend/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
- import Ellipsis from '@lucide/svelte/icons/ellipsis';
import type { WithElementRef, WithoutChildren } from 'bits-ui';
import type { HTMLAttributes } from 'svelte/elements';
import { cn } from '$lib/utils.js';
+ import { EllipsisIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -18,6 +18,6 @@
class={cn('flex size-9 items-center justify-center', className)}
{...restProps}
>
- <Ellipsis class="size-4" />
+ <EllipsisIcon class="size-4" />
<span class="sr-only">More</span>
</span>
diff --git a/frontend/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte b/frontend/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
index b5ce55402..327c29621 100644
--- a/frontend/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
+++ b/frontend/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
- import ChevronRight from '@lucide/svelte/icons/chevron-right';
import type { WithElementRef } from '$lib/utils.js';
import type { HTMLLiAttributes } from 'svelte/elements';
import { cn } from '$lib/utils.js';
+ import { ArrowRightIcon } from '$lib/icons';
let { ref = $bindable(null), class: className, children, ...restProps }: WithElementRef<HTMLLiAttributes> = $props();
</script>
@@ -11,6 +11,6 @@
{#if children}
{@render children?.()}
{:else}
- <ChevronRight />
+ <ArrowRightIcon />
{/if}
</li>
diff --git a/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte b/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte
index c17c59d1f..8c6ca52e0 100644
--- a/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte
+++ b/frontend/src/lib/components/ui/calendar/calendar-month-select.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
- import { Calendar as CalendarPrimitive } from "bits-ui";
- import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
- import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
+ import { Calendar as CalendarPrimitive } from 'bits-ui';
+ import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+ import { ArrowDownIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -14,7 +14,7 @@
<span
class={cn(
- "has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+ 'has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]',
className
)}
>
@@ -24,20 +24,18 @@
{#each monthItems as monthItem (monthItem.value)}
<option
value={monthItem.value}
- selected={value !== undefined
- ? monthItem.value === value
- : monthItem.value === selectedMonthItem.value}
+ selected={value !== undefined ? monthItem.value === value : monthItem.value === selectedMonthItem.value}
>
{monthItem.label}
</option>
{/each}
</select>
<span
- class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pe-1 ps-2 text-sm font-medium [&>svg]:size-3.5"
+ class="[&>svg]:text-muted-foreground flex h-8 items-center gap-1 rounded-md ps-2 pe-1 text-sm font-medium select-none [&>svg]:size-3.5"
aria-hidden="true"
>
{monthItems.find((item) => item.value === value)?.label || selectedMonthItem.label}
- <ChevronDownIcon class="size-4" />
+ <ArrowDownIcon class="size-4" />
</span>
{/snippet}
</CalendarPrimitive.MonthSelect>
diff --git a/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte b/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte
index d8eb4efa0..1e5f4f32a 100644
--- a/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte
+++ b/frontend/src/lib/components/ui/calendar/calendar-next-button.svelte
@@ -1,14 +1,14 @@
<script lang="ts">
- import { Calendar as CalendarPrimitive } from "bits-ui";
- import ChevronRightIcon from "@lucide/svelte/icons/chevron-right";
- import { buttonVariants, type ButtonVariant } from "$lib/components/ui/button/index.js";
- import { cn } from "$lib/utils.js";
+ import { Calendar as CalendarPrimitive } from 'bits-ui';
+ import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
+ import { cn } from '$lib/utils.js';
+ import { ArrowRightIcon } from '$lib/icons';
let {
ref = $bindable(null),
class: className,
children,
- variant = "ghost",
+ variant = 'ghost',
...restProps
}: CalendarPrimitive.NextButtonProps & {
variant?: ButtonVariant;
@@ -16,14 +16,14 @@
</script>
{#snippet Fallback()}
- <ChevronRightIcon class="size-4" />
+ <ArrowRightIcon class="size-4" />
{/snippet}
<CalendarPrimitive.NextButton
bind:ref
class={cn(
buttonVariants({ variant }),
- "size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+ 'size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180',
className
)}
children={children || Fallback}
diff --git a/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte b/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte
index 3e4471a20..666608355 100644
--- a/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte
+++ b/frontend/src/lib/components/ui/calendar/calendar-prev-button.svelte
@@ -1,14 +1,14 @@
<script lang="ts">
- import { Calendar as CalendarPrimitive } from "bits-ui";
- import ChevronLeftIcon from "@lucide/svelte/icons/chevron-left";
- import { buttonVariants, type ButtonVariant } from "$lib/components/ui/button/index.js";
- import { cn } from "$lib/utils.js";
+ import { Calendar as CalendarPrimitive } from 'bits-ui';
+ import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
+ import { cn } from '$lib/utils.js';
+ import { ArrowLeftIcon } from '$lib/icons';
let {
ref = $bindable(null),
class: className,
children,
- variant = "ghost",
+ variant = 'ghost',
...restProps
}: CalendarPrimitive.PrevButtonProps & {
variant?: ButtonVariant;
@@ -16,14 +16,14 @@
</script>
{#snippet Fallback()}
- <ChevronLeftIcon class="size-4" />
+ <ArrowLeftIcon class="size-4" />
{/snippet}
<CalendarPrimitive.PrevButton
bind:ref
class={cn(
buttonVariants({ variant }),
- "size-(--cell-size) select-none bg-transparent p-0 disabled:opacity-50 rtl:rotate-180",
+ 'size-(--cell-size) bg-transparent p-0 select-none disabled:opacity-50 rtl:rotate-180',
className
)}
children={children || Fallback}
diff --git a/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte b/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte
index 3ac691edc..d8b120c88 100644
--- a/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte
+++ b/frontend/src/lib/components/ui/calendar/calendar-year-select.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
- import { Calendar as CalendarPrimitive } from "bits-ui";
- import { cn, type WithoutChildrenOrChild } from "$lib/utils.js";
- import ChevronDownIcon from "@lucide/svelte/icons/chevron-down";
+ import { Calendar as CalendarPrimitive } from 'bits-ui';
+ import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+ import { ArrowDownIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -13,7 +13,7 @@
<span
class={cn(
- "has-focus:border-ring border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] relative flex rounded-md border",
+ 'has-focus:border-ring border-input has-focus:ring-ring/50 relative flex rounded-md border shadow-xs has-focus:ring-[3px]',
className
)}
>
@@ -23,20 +23,18 @@
{#each yearItems as yearItem (yearItem.value)}
<option
value={yearItem.value}
- selected={value !== undefined
- ? yearItem.value === value
- : yearItem.value === selectedYearItem.value}
+ selected={value !== undefined ? yearItem.value === value : yearItem.value === selectedYearItem.value}
>
{yearItem.label}
</option>
{/each}
</select>
<span
- class="[&>svg]:text-muted-foreground flex h-8 select-none items-center gap-1 rounded-md pe-1 ps-2 text-sm font-medium [&>svg]:size-3.5"
+ class="[&>svg]:text-muted-foreground flex h-8 items-center gap-1 rounded-md ps-2 pe-1 text-sm font-medium select-none [&>svg]:size-3.5"
aria-hidden="true"
>
{yearItems.find((item) => item.value === value)?.label || selectedYearItem.label}
- <ChevronDownIcon class="size-4" />
+ <ArrowDownIcon class="size-4" />
</span>
{/snippet}
</CalendarPrimitive.YearSelect>
diff --git a/frontend/src/lib/components/ui/card/card-header.svelte b/frontend/src/lib/components/ui/card/card-header.svelte
index 34a6b04b4..5b7fd41a7 100644
--- a/frontend/src/lib/components/ui/card/card-header.svelte
+++ b/frontend/src/lib/components/ui/card/card-header.svelte
@@ -50,7 +50,7 @@
bind:this={ref}
data-slot="card-header"
class={cn(
- '@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto]',
+ '@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-[[data-slot=card-action]]:grid-cols-[1fr_auto]',
icon && 'from-primary/3 flex flex-row items-start space-y-0 bg-linear-to-br to-transparent',
icon && compact ? 'gap-2 p-2' : icon ? 'gap-3 p-3.5' : '',
icon && enableHover && `transition-colors ${headerHoverClass}`,
diff --git a/frontend/src/lib/components/ui/checkbox/checkbox.svelte b/frontend/src/lib/components/ui/checkbox/checkbox.svelte
index fc8614a74..bebacc70f 100644
--- a/frontend/src/lib/components/ui/checkbox/checkbox.svelte
+++ b/frontend/src/lib/components/ui/checkbox/checkbox.svelte
@@ -1,8 +1,7 @@
<script lang="ts">
import { Checkbox as CheckboxPrimitive } from 'bits-ui';
- import CheckIcon from '@lucide/svelte/icons/check';
- import MinusIcon from '@lucide/svelte/icons/minus';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+ import { CheckIcon, MinusIcon } from '$lib/icons';
let {
ref = $bindable(null),
diff --git a/frontend/src/lib/components/ui/command/command-input.svelte b/frontend/src/lib/components/ui/command/command-input.svelte
index d6aeb24c5..593e8bf70 100644
--- a/frontend/src/lib/components/ui/command/command-input.svelte
+++ b/frontend/src/lib/components/ui/command/command-input.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Command as CommandPrimitive } from 'bits-ui';
- import SearchIcon from '@lucide/svelte/icons/search';
+ import { SearchIcon } from '$lib/icons';
import { cn } from '$lib/utils.js';
let { ref = $bindable(null), class: className, value = $bindable(''), ...restProps }: CommandPrimitive.InputProps = $props();
diff --git a/frontend/src/lib/components/ui/copy-button/copy-button.svelte b/frontend/src/lib/components/ui/copy-button/copy-button.svelte
index 94d169686..3685fd2c4 100644
--- a/frontend/src/lib/components/ui/copy-button/copy-button.svelte
+++ b/frontend/src/lib/components/ui/copy-button/copy-button.svelte
@@ -6,11 +6,9 @@
import { Button } from '$lib/components/ui/button';
import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
import { cn } from '$lib/utils';
- import CheckIcon from '@lucide/svelte/icons/check';
- import CopyIcon from '@lucide/svelte/icons/copy';
- import XIcon from '@lucide/svelte/icons/x';
import { scale } from 'svelte/transition';
import type { CopyButtonProps } from './types';
+ import { CopyIcon, CloseIcon, CheckIcon } from '$lib/icons';
let {
ref = $bindable(null),
@@ -51,7 +49,7 @@
</div>
{:else if clipboard.status === 'failure'}
<div in:scale={{ duration: animationDuration, start: 0.85 }}>
- <XIcon tabindex={-1} />
+ <CloseIcon tabindex={-1} />
<span class="sr-only">Failed to copy</span>
</div>
{:else}
diff --git a/frontend/src/lib/components/ui/dialog/dialog-content.svelte b/frontend/src/lib/components/ui/dialog/dialog-content.svelte
index ed13817d0..0b8f45415 100644
--- a/frontend/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/frontend/src/lib/components/ui/dialog/dialog-content.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Dialog as DialogPrimitive } from 'bits-ui';
- import XIcon from '@lucide/svelte/icons/x';
+ import { CloseIcon } from '$lib/icons';
import type { Snippet } from 'svelte';
import * as Dialog from './index.js';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
@@ -32,7 +32,7 @@
<DialogPrimitive.Close
class="ring-offset-background focus:ring-ring absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
>
- <XIcon />
+ <CloseIcon />
<span class="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
index 609857d53..93b785120 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
@@ -11,7 +11,7 @@
</script>
<script lang="ts">
- import ChevronDown from '@lucide/svelte/icons/chevron-down';
+ import { ArrowDownIcon } from '$lib/icons';
import { tryUseDropdownButtonRoot } from './dropdown-button.svelte.js';
const root = tryUseDropdownButtonRoot();
@@ -40,6 +40,6 @@
{#if children}
{@render children()}
{:else}
- <ChevronDown class="size-4" />
+ <ArrowDownIcon class="size-4" />
{/if}
</button>
diff --git a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
index e94c6372e..3352672a4 100644
--- a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
+++ b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
- import CheckIcon from '@lucide/svelte/icons/check';
- import MinusIcon from '@lucide/svelte/icons/minus';
+ import { CheckIcon } from '$lib/icons';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
import type { Snippet } from 'svelte';
@@ -31,7 +30,7 @@
{#snippet children({ checked, indeterminate })}
<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
{#if indeterminate}
- <MinusIcon class="size-4" />
+ <span class="h-0.5 w-3 bg-current"></span>
{:else}
<CheckIcon class={cn('size-4', !checked && 'text-transparent')} />
{/if}
diff --git a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
index 3c6330a21..23647270a 100644
--- a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
+++ b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
- import CircleIcon from '@lucide/svelte/icons/circle';
+ import { CheckIcon } from '$lib/icons';
import { cn, type WithoutChild } from '$lib/utils.js';
let {
@@ -23,7 +23,7 @@
{#snippet children({ checked })}
<span class="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
{#if checked}
- <CircleIcon class="size-2 fill-current" />
+ <span class="size-2 rounded-full bg-current"></span>
{/if}
</span>
{@render childrenProp?.({ checked })}
diff --git a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
index e37ac1ad0..9efb0b4c2 100644
--- a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
+++ b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
+ import { ArrowRightIcon } from '$lib/icons';
import { cn } from '$lib/utils.js';
let {
@@ -25,5 +25,5 @@
{...restProps}
>
{@render children?.()}
- <ChevronRightIcon class="ml-auto size-4" />
+ <ArrowRightIcon class="ml-auto size-4" />
</DropdownMenuPrimitive.SubTrigger>
diff --git a/frontend/src/lib/components/ui/empty/empty-media.svelte b/frontend/src/lib/components/ui/empty/empty-media.svelte
index 98a17ea7b..68a771323 100644
--- a/frontend/src/lib/components/ui/empty/empty-media.svelte
+++ b/frontend/src/lib/components/ui/empty/empty-media.svelte
@@ -6,7 +6,7 @@
variants: {
variant: {
default: 'bg-transparent',
- icon: "bg-muted text-foreground flex size-10 shrink-0 items-center justify-center rounded-lg [&_svg:not([class*='size-'])]:size-6"
+ icon: "bg-muted text-foreground flex size-25 shrink-0 items-center justify-center rounded-lg [&_svg:not([class*='size-'])]:size-6"
}
},
defaultVariants: {
diff --git a/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte b/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte
index 5b1ca2c7e..b37929f96 100644
--- a/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte
+++ b/frontend/src/lib/components/ui/file-drop-zone/file-drop-zone.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { cn } from '$lib/utils';
- import UploadIcon from '@lucide/svelte/icons/upload';
+ import { UpdateIcon } from '$lib/icons';
import { displaySize } from '.';
import { useId } from 'bits-ui';
import type { FileDropZoneProps, FileRejectedReason } from './types';
@@ -136,7 +136,7 @@
<div
class="border-border text-muted-foreground flex size-14 place-items-center justify-center rounded-full border border-dashed"
>
- <UploadIcon class="size-7" />
+ <UpdateIcon class="size-7" />
</div>
<div class="flex flex-col gap-0.5 text-center">
<span class="text-muted-foreground font-medium">{m.file_drop_zone_drag_drop()}</span>
diff --git a/frontend/src/lib/components/ui/pagination/pagination-ellipsis.svelte b/frontend/src/lib/components/ui/pagination/pagination-ellipsis.svelte
index 99663b85a..2c9a20cd8 100644
--- a/frontend/src/lib/components/ui/pagination/pagination-ellipsis.svelte
+++ b/frontend/src/lib/components/ui/pagination/pagination-ellipsis.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import Ellipsis from '@lucide/svelte/icons/ellipsis';
+ import { EllipsisIcon } from '$lib/icons';
import type { WithElementRef, WithoutChildren } from 'bits-ui';
import type { HTMLAttributes } from 'svelte/elements';
import { cn } from '$lib/utils.js';
@@ -12,6 +12,6 @@
</script>
<span bind:this={ref} aria-hidden="true" class={cn('flex size-9 items-center justify-center', className)} {...restProps}>
- <Ellipsis class="size-4" />
+ <EllipsisIcon class="size-4" />
<span class="sr-only">More pages</span>
</span>
diff --git a/frontend/src/lib/components/ui/pagination/pagination-next-button.svelte b/frontend/src/lib/components/ui/pagination/pagination-next-button.svelte
index 2dfb2f966..76c21474e 100644
--- a/frontend/src/lib/components/ui/pagination/pagination-next-button.svelte
+++ b/frontend/src/lib/components/ui/pagination/pagination-next-button.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Pagination as PaginationPrimitive } from 'bits-ui';
- import ChevronRight from '@lucide/svelte/icons/chevron-right';
+ import { ArrowRightIcon } from '$lib/icons';
import { buttonVariants } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
@@ -8,7 +8,7 @@
</script>
{#snippet Fallback()}
- <ChevronRight class="size-4" />
+ <ArrowRightIcon class="size-4" />
{/snippet}
<PaginationPrimitive.NextButton
diff --git a/frontend/src/lib/components/ui/pagination/pagination-prev-button.svelte b/frontend/src/lib/components/ui/pagination/pagination-prev-button.svelte
index ffa8c6fc3..4a08e3da3 100644
--- a/frontend/src/lib/components/ui/pagination/pagination-prev-button.svelte
+++ b/frontend/src/lib/components/ui/pagination/pagination-prev-button.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Pagination as PaginationPrimitive } from 'bits-ui';
- import ChevronLeft from '@lucide/svelte/icons/chevron-left';
+ import { ArrowLeftIcon } from '$lib/icons';
import { buttonVariants } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
@@ -8,7 +8,7 @@
</script>
{#snippet Fallback()}
- <ChevronLeft class="size-4" />
+ <ArrowLeftIcon class="size-4" />
{/snippet}
<PaginationPrimitive.PrevButton
diff --git a/frontend/src/lib/components/ui/radio-group/radio-group-item.svelte b/frontend/src/lib/components/ui/radio-group/radio-group-item.svelte
index 5368f0dbc..5e14b1e2d 100644
--- a/frontend/src/lib/components/ui/radio-group/radio-group-item.svelte
+++ b/frontend/src/lib/components/ui/radio-group/radio-group-item.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { RadioGroup as RadioGroupPrimitive } from 'bits-ui';
- import CircleIcon from '@lucide/svelte/icons/circle';
+ import { CheckIcon } from '$lib/icons';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
let { ref = $bindable(null), class: className, ...restProps }: WithoutChildrenOrChild<RadioGroupPrimitive.ItemProps> = $props();
@@ -18,7 +18,8 @@
{#snippet children({ checked })}
<div data-slot="radio-group-indicator" class="relative flex items-center justify-center">
{#if checked}
- <CircleIcon class="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2" />
+ <span class="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full bg-current"
+ ></span>
{/if}
</div>
{/snippet}
diff --git a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
index 443cb8b38..6d9e76f4e 100644
--- a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
+++ b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.svelte
@@ -2,6 +2,7 @@
import { MediaQuery } from 'svelte/reactivity';
import * as Dialog from '$lib/components/ui/dialog/index.js';
import * as Drawer from '$lib/components/ui/drawer/index.js';
+ import * as Sheet from '$lib/components/ui/sheet/index.js';
import type { ResponsiveDialogProps } from './responsive-dialog.type.js';
import { cn } from '$lib/utils.js';
@@ -14,7 +15,8 @@
children,
footer,
class: className,
- contentClass
+ contentClass,
+ variant = 'dialog'
}: ResponsiveDialogProps = $props();
const isDesktop = new MediaQuery('(min-width: 768px)');
@@ -26,38 +28,68 @@
</script>
{#if isDesktop.current}
- <Dialog.Root bind:open onOpenChange={handleOpenChange}>
- {#if trigger}
- <Dialog.Trigger>
- {@render trigger()}
- </Dialog.Trigger>
- {/if}
- <Dialog.Content
- class={cn(
- 'max-h-[calc(100vh-2rem)] grid-rows-[auto_minmax(0,1fr)_auto]! overflow-hidden p-0!',
- contentClass ?? 'sm:max-w-[425px]'
- )}
- >
- {#if title || description}
- <Dialog.Header class="shrink-0 px-6 pt-6">
- {#if title}
- <Dialog.Title>{title}</Dialog.Title>
- {/if}
- {#if description}
- <Dialog.Description>{description}</Dialog.Description>
- {/if}
- </Dialog.Header>
+ {#if variant === 'sheet'}
+ <Sheet.Root bind:open onOpenChange={handleOpenChange}>
+ {#if trigger}
+ <Sheet.Trigger>
+ {@render trigger()}
+ </Sheet.Trigger>
{/if}
- <div class={cn('min-h-0 overflow-y-auto px-6', className)}>
- {@render children()}
- </div>
- {#if footer}
- <Dialog.Footer class="shrink-0 px-6 pb-6">
- {@render footer()}
- </Dialog.Footer>
+ <Sheet.Content class={cn('flex flex-col overflow-hidden p-0', contentClass)}>
+ {#if title || description}
+ <Sheet.Header class="shrink-0 px-6 pt-6">
+ {#if title}
+ <Sheet.Title>{title}</Sheet.Title>
+ {/if}
+ {#if description}
+ <Sheet.Description>{description}</Sheet.Description>
+ {/if}
+ </Sheet.Header>
+ {/if}
+ <div class={cn('min-h-0 flex-1 overflow-y-auto px-6', className)}>
+ {@render children()}
+ </div>
+ {#if footer}
+ <Sheet.Footer class="shrink-0 px-6 pb-6">
+ {@render footer()}
+ </Sheet.Footer>
+ {/if}
+ </Sheet.Content>
+ </Sheet.Root>
+ {:else}
+ <Dialog.Root bind:open onOpenChange={handleOpenChange}>
+ {#if trigger}
+ <Dialog.Trigger>
+ {@render trigger()}
+ </Dialog.Trigger>
{/if}
- </Dialog.Content>
- </Dialog.Root>
+ <Dialog.Content
+ class={cn(
+ 'max-h-[calc(100vh-2rem)] grid-rows-[auto_minmax(0,1fr)_auto]! overflow-hidden p-0!',
+ contentClass ?? 'sm:max-w-[425px]'
+ )}
+ >
+ {#if title || description}
+ <Dialog.Header class="shrink-0 px-6 pt-6">
+ {#if title}
+ <Dialog.Title>{title}</Dialog.Title>
+ {/if}
+ {#if description}
+ <Dialog.Description>{description}</Dialog.Description>
+ {/if}
+ </Dialog.Header>
+ {/if}
+ <div class={cn('min-h-0 overflow-y-auto px-6', className)}>
+ {@render children()}
+ </div>
+ {#if footer}
+ <Dialog.Footer class="shrink-0 px-6 pb-6">
+ {@render footer()}
+ </Dialog.Footer>
+ {/if}
+ </Dialog.Content>
+ </Dialog.Root>
+ {/if}
{:else}
<Drawer.Root bind:open onOpenChange={handleOpenChange}>
{#if trigger}
diff --git a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
index 21710b81b..0002c37ed 100644
--- a/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
+++ b/frontend/src/lib/components/ui/responsive-dialog/responsive-dialog.type.ts
@@ -51,4 +51,10 @@ export interface ResponsiveDialogProps {
* @default 'sm:max-w-[425px]'
*/
contentClass?: string;
+
+ /**
+ * The variant of the dialog on desktop
+ * @default 'dialog'
+ */
+ variant?: 'dialog' | 'sheet';
}
diff --git a/frontend/src/lib/components/ui/select/select-item.svelte b/frontend/src/lib/components/ui/select/select-item.svelte
index 06e48be38..da8947b0a 100644
--- a/frontend/src/lib/components/ui/select/select-item.svelte
+++ b/frontend/src/lib/components/ui/select/select-item.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import CheckIcon from '@lucide/svelte/icons/check';
+ import { CheckIcon } from '$lib/icons';
import { Select as SelectPrimitive } from 'bits-ui';
import { cn, type WithoutChild } from '$lib/utils.js';
diff --git a/frontend/src/lib/components/ui/select/select-scroll-down-button.svelte b/frontend/src/lib/components/ui/select/select-scroll-down-button.svelte
index 350214839..1825b43df 100644
--- a/frontend/src/lib/components/ui/select/select-scroll-down-button.svelte
+++ b/frontend/src/lib/components/ui/select/select-scroll-down-button.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
+ import { ArrowDownIcon } from '$lib/icons';
import { Select as SelectPrimitive } from 'bits-ui';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
@@ -16,5 +16,5 @@
class={cn('flex cursor-default items-center justify-center py-1', className)}
{...restProps}
>
- <ChevronDownIcon class="size-4" />
+ <ArrowDownIcon class="size-4" />
</SelectPrimitive.ScrollDownButton>
diff --git a/frontend/src/lib/components/ui/select/select-scroll-up-button.svelte b/frontend/src/lib/components/ui/select/select-scroll-up-button.svelte
index 3d35e04c3..0542dd21c 100644
--- a/frontend/src/lib/components/ui/select/select-scroll-up-button.svelte
+++ b/frontend/src/lib/components/ui/select/select-scroll-up-button.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
+ import { ArrowUpIcon } from '$lib/icons';
import { Select as SelectPrimitive } from 'bits-ui';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
@@ -16,5 +16,5 @@
class={cn('flex cursor-default items-center justify-center py-1', className)}
{...restProps}
>
- <ChevronUpIcon class="size-4" />
+ <ArrowUpIcon class="size-4" />
</SelectPrimitive.ScrollUpButton>
diff --git a/frontend/src/lib/components/ui/select/select-trigger.svelte b/frontend/src/lib/components/ui/select/select-trigger.svelte
index 1b20f5bb6..063bfbf91 100644
--- a/frontend/src/lib/components/ui/select/select-trigger.svelte
+++ b/frontend/src/lib/components/ui/select/select-trigger.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Select as SelectPrimitive } from 'bits-ui';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
+ import { ArrowDownIcon } from '$lib/icons';
import { cn, type WithoutChild } from '$lib/utils.js';
let {
@@ -25,5 +25,5 @@
{...restProps}
>
{@render children?.()}
- <ChevronDownIcon class="size-4 opacity-50" />
+ <ArrowDownIcon class="size-4 opacity-50" />
</SelectPrimitive.Trigger>
diff --git a/frontend/src/lib/components/ui/sheet/sheet-content.svelte b/frontend/src/lib/components/ui/sheet/sheet-content.svelte
index 4b3098516..362020cfb 100644
--- a/frontend/src/lib/components/ui/sheet/sheet-content.svelte
+++ b/frontend/src/lib/components/ui/sheet/sheet-content.svelte
@@ -22,7 +22,7 @@
<script lang="ts">
import { Dialog as SheetPrimitive } from 'bits-ui';
- import XIcon from '@lucide/svelte/icons/x';
+ import { CloseIcon } from '$lib/icons';
import type { Snippet } from 'svelte';
import SheetOverlay from './sheet-overlay.svelte';
import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
@@ -48,7 +48,7 @@
<SheetPrimitive.Close
class="ring-offset-background focus-visible:ring-ring absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-hidden disabled:pointer-events-none"
>
- <XIcon class="size-4" />
+ <CloseIcon class="size-4" />
<span class="sr-only">Close</span>
</SheetPrimitive.Close>
</SheetPrimitive.Content>
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
index 3318d2c51..8d18e4e0b 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
import { cn } from '$lib/utils.js';
- import PanelLeftIcon from '@lucide/svelte/icons/panel-left';
+ import { ArrowLeftIcon } from '$lib/icons';
import { useSidebar } from './context.svelte.js';
let {
@@ -38,6 +38,6 @@
}}
{...restProps}
>
- <PanelLeftIcon />
+ <ArrowLeftIcon />
<span class="sr-only">Toggle Sidebar</span>
</Button>
diff --git a/frontend/src/lib/components/ui/spinner/spinner.svelte b/frontend/src/lib/components/ui/spinner/spinner.svelte
index 092debc60..a6df513a1 100644
--- a/frontend/src/lib/components/ui/spinner/spinner.svelte
+++ b/frontend/src/lib/components/ui/spinner/spinner.svelte
@@ -1,11 +1,11 @@
<script lang="ts">
import { cn } from '$lib/utils.js';
- import Loader2Icon from '@lucide/svelte/icons/loader-2';
+ import { LoadingSpinnerIcon } from '$lib/icons';
import type { ComponentProps } from 'svelte';
- type Props = ComponentProps<typeof Loader2Icon>;
+ type Props = ComponentProps<typeof LoadingSpinnerIcon>;
let { class: className, ...restProps }: Props = $props();
</script>
-<Loader2Icon role="status" aria-label="Loading" class={cn('size-4 animate-spin', className)} {...restProps} />
+<LoadingSpinnerIcon role="status" aria-label="Loading" class={cn('size-4', className)} {...restProps} />
diff --git a/frontend/src/lib/components/ui/tree-view/tree-view-file.svelte b/frontend/src/lib/components/ui/tree-view/tree-view-file.svelte
index e7f7957cf..aab84f553 100644
--- a/frontend/src/lib/components/ui/tree-view/tree-view-file.svelte
+++ b/frontend/src/lib/components/ui/tree-view/tree-view-file.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import FileIcon from '@lucide/svelte/icons/file';
+ import { FileTextIcon } from '$lib/icons';
import { cn } from '$lib/utils';
import type { TreeViewFileProps } from './types';
@@ -10,7 +10,7 @@
{#if icon}
{@render icon({ name })}
{:else}
- <FileIcon class="size-4" />
+ <FileTextIcon class="size-4" />
{/if}
<span>{name}</span>
</button>
diff --git a/frontend/src/lib/components/ui/tree-view/tree-view-folder.svelte b/frontend/src/lib/components/ui/tree-view/tree-view-folder.svelte
index f01b2d5d3..ec6d8c0e4 100644
--- a/frontend/src/lib/components/ui/tree-view/tree-view-folder.svelte
+++ b/frontend/src/lib/components/ui/tree-view/tree-view-folder.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
- import FolderIcon from '@lucide/svelte/icons/folder';
- import FolderOpenIcon from '@lucide/svelte/icons/folder-open';
+ import { FolderOpenIcon } from '$lib/icons';
import { cn } from '$lib/utils';
import type { TreeViewFolderProps } from './types';
@@ -12,10 +11,8 @@
<Collapsible.Trigger class={cn('flex place-items-center gap-1', className)}>
{#if icon}
{@render icon({ name, open })}
- {:else if open}
- <FolderOpenIcon class="size-4" />
{:else}
- <FolderIcon class="size-4" />
+ <FolderOpenIcon class="size-4" />
{/if}
<span>{name}</span>
</Collapsible.Trigger>
diff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.ts
index 68cf0d767..de1863ed8 100644
--- a/frontend/src/lib/config/navigation-config.ts
+++ b/frontend/src/lib/config/navigation-config.ts
@@ -1,64 +1,49 @@
-import { KeyIcon, type Icon as IconType } from '@lucide/svelte';
-import PaletteIcon from '@lucide/svelte/icons/palette';
-import FileStackIcon from '@lucide/svelte/icons/file-stack';
-import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
-import HouseIcon from '@lucide/svelte/icons/home';
-import NetworkIcon from '@lucide/svelte/icons/network';
-import ContainerIcon from '@lucide/svelte/icons/container';
-import ImageIcon from '@lucide/svelte/icons/image';
-import SettingsIcon from '@lucide/svelte/icons/settings';
-import DatabaseIcon from '@lucide/svelte/icons/database';
-import LayoutTemplateIcon from '@lucide/svelte/icons/layout-template';
-import UserIcon from '@lucide/svelte/icons/user';
-import ShieldIcon from '@lucide/svelte/icons/shield';
-import ComputerIcon from '@lucide/svelte/icons/computer';
-import LockKeyholeIcon from '@lucide/svelte/icons/lock-keyhole';
-import AlarmClockIcon from '@lucide/svelte/icons/alarm-clock';
-import NavigationIcon from '@lucide/svelte/icons/navigation';
-import FileTextIcon from '@lucide/svelte/icons/file-text';
-import BellIcon from '@lucide/svelte/icons/bell';
+import {
+ ApiKeyIcon,
+ ApperanceIcon,
+ DockerBrandIcon,
+ UsersIcon,
+ SecurityIcon,
+ NotificationsIcon,
+ DashboardIcon,
+ ProjectsIcon,
+ EnvironmentsIcon,
+ CustomizeIcon,
+ ContainersIcon,
+ ImagesIcon,
+ NetworksIcon,
+ VolumesIcon,
+ EventsIcon,
+ SettingsIcon
+} from '$lib/icons';
+
import { m } from '$lib/paraglide/messages';
export type NavigationItem = {
title: string;
url: string;
- icon: typeof IconType;
+ icon: any;
items?: NavigationItem[];
};
export const navigationItems: Record<string, NavigationItem[]> = {
managementItems: [
- { title: m.dashboard_title(), url: '/dashboard', icon: HouseIcon },
- { title: m.containers_title(), url: '/containers', icon: ContainerIcon },
- { title: m.projects_title(), url: '/projects', icon: FileStackIcon },
- { title: m.images_title(), url: '/images', icon: ImageIcon },
- { title: m.networks_title(), url: '/networks', icon: NetworkIcon },
- { title: m.volumes_title(), url: '/volumes', icon: HardDriveIcon }
- ],
- customizationItems: [
- {
- title: m.customize_title(),
- url: '/customize',
- icon: PaletteIcon,
- items: [
- { title: m.templates_title(), url: '/customize/templates', icon: LayoutTemplateIcon },
- { title: m.registries_title(), url: '/customize/registries', icon: LockKeyholeIcon },
- { title: m.variables_title(), url: '/customize/variables', icon: FileTextIcon }
- ]
- }
+ { title: m.dashboard_title(), url: '/dashboard', icon: DashboardIcon },
+ { title: m.projects_title(), url: '/projects', icon: ProjectsIcon },
+ { title: m.environments_title(), url: '/environments', icon: EnvironmentsIcon },
+ { title: m.customize_title(), url: '/customize', icon: CustomizeIcon }
],
- environmentItems: [
- {
- title: m.environments_title(),
- url: '/environments',
- icon: ComputerIcon
- }
+ resourceItems: [
+ { title: m.containers_title(), url: '/containers', icon: ContainersIcon },
+ { title: m.images_title(), url: '/images', icon: ImagesIcon },
+ { title: m.networks_title(), url: '/networks', icon: NetworksIcon },
+ { title: m.volumes_title(), url: '/volumes', icon: VolumesIcon }
],
settingsItems: [
{
title: m.events_title(),
url: '/events',
- icon: AlarmClockIcon
+ icon: EventsIcon
},
{
title: m.settings_title(),
@@ -66,12 +51,12 @@ export const navigationItems: Record<string, NavigationItem[]> = {
icon: SettingsIcon,
items: [
{ title: m.general_title(), url: '/settings/general', icon: SettingsIcon },
- { title: m.docker_title(), url: '/settings/docker', icon: DatabaseIcon },
- { title: m.security_title(), url: '/settings/security', icon: ShieldIcon },
- { title: m.navigation_title(), url: '/settings/navigation', icon: NavigationIcon },
- { title: m.users_title(), url: '/settings/users', icon: UserIcon },
- { title: m.notifications_title(), url: '/settings/notifications', icon: BellIcon },
- { title: m.api_key_page_title(), url: '/settings/api-keys', icon: KeyIcon },
+ { title: m.appearance_title(), url: '/settings/appearance', icon: ApperanceIcon },
+ { title: m.docker_title(), url: '/settings/docker', icon: DockerBrandIcon },
+ { title: m.security_title(), url: '/settings/security', icon: SecurityIcon },
+ { title: m.users_title(), url: '/settings/users', icon: UsersIcon },
+ { title: m.notifications_title(), url: '/settings/notifications', icon: NotificationsIcon },
+ { title: m.api_key_page_title(), url: '/settings/api-keys', icon: ApiKeyIcon }
]
}
]
@@ -80,8 +65,8 @@ export const navigationItems: Record<string, NavigationItem[]> = {
export const defaultMobilePinnedItems: NavigationItem[] = [
navigationItems.managementItems[0],
navigationItems.managementItems[1],
- navigationItems.managementItems[3],
- navigationItems.managementItems[5]
+ navigationItems.resourceItems[0],
+ navigationItems.resourceItems[1]
];
export type MobileNavigationSettings = {
@@ -94,21 +79,23 @@ export type MobileNavigationSettings = {
export function getAvailableMobileNavItems(): NavigationItem[] {
const flatItems: NavigationItem[] = [];
- flatItems.push(...navigationItems.managementItems);
- for (const item of navigationItems.customizationItems) {
- if (item.items && item.items.length > 0) {
- flatItems.push(...item.items);
- } else {
- flatItems.push(item);
- }
+ if (navigationItems.managementItems) {
+ flatItems.push(...navigationItems.managementItems);
}
- if (navigationItems.environmentItems) {
- flatItems.push(...navigationItems.environmentItems);
+ if (navigationItems.resourceItems) {
+ flatItems.push(...navigationItems.resourceItems);
}
+
if (navigationItems.settingsItems) {
const settingsTopLevel = navigationItems.settingsItems.filter((item) => !item.items);
flatItems.push(...settingsTopLevel);
+
+ // Also add the main settings item itself if it has children, as it's a valid navigation target
+ const settingsMain = navigationItems.settingsItems.find((item) => item.items);
+ if (settingsMain) {
+ flatItems.push(settingsMain);
+ }
}
return flatItems;
diff --git a/frontend/src/lib/icons/docker-icon.svelte b/frontend/src/lib/icons/docker-icon.svelte
deleted file mode 100644
index 41602463b..000000000
--- a/frontend/src/lib/icons/docker-icon.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script lang="ts">
- let {
- class: className
- }: {
- class?: string;
- } = $props();
-</script>
-
-<svg
- fill="currentColor"
- width="24"
- height="24"
- viewBox="0 0 24 24"
- role="img"
- xmlns="http://www.w3.org/2000/svg"
- class={className}
->
- <title>Docker icon</title>
- <path
- d="M13.983 11.078h2.119a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.119a.185.185 0 00-.185.185v1.888c0 .102.083.185.185.185m-2.954-5.43h2.118a.186.186 0 00.186-.186V3.574a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m0 2.716h2.118a.187.187 0 00.186-.186V6.29a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.887c0 .102.082.185.185.186m-2.93 0h2.12a.186.186 0 00.184-.186V6.29a.185.185 0 00-.185-.185H8.1a.185.185 0 00-.185.185v1.887c0 .102.083.185.185.186m-2.964 0h2.119a.186.186 0 00.185-.186V6.29a.185.185 0 00-.185-.185H5.136a.186.186 0 00-.186.185v1.887c0 .102.084.185.186.186m5.893 2.715h2.118a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m-2.93 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.083.185.185.185m-2.964 0h2.119a.185.185 0 00.185-.185V9.006a.185.185 0 00-.184-.186h-2.12a.186.186 0 00-.186.186v1.887c0 .102.084.185.186.185m-2.92 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.082.185.185.185M23.763 9.89c-.065-.051-.672-.51-1.954-.51-.338.001-.676.03-1.01.087-.248-1.7-1.653-2.53-1.716-2.566l-.344-.199-.226.327c-.284.438-.49.922-.612 1.43-.23.97-.09 1.882.403 2.661-.595.332-1.55.413-1.744.42H.751a.751.751 0 00-.75.748 11.376 11.376 0 00.692 4.062c.545 1.428 1.355 2.48 2.41 3.124 1.18.723 3.1 1.137 5.275 1.137.983.003 1.963-.086 2.93-.266a12.248 12.248 0 003.823-1.389c.98-.567 1.86-1.288 2.61-2.136 1.252-1.418 1.998-2.997 2.553-4.4h.221c1.372 0 2.215-.549 2.68-1.009.309-.293.55-.65.707-1.046l.098-.288Z"
- />
-</svg>
diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.ts
new file mode 100644
index 000000000..c48f62457
--- /dev/null
+++ b/frontend/src/lib/icons/index.ts
@@ -0,0 +1,105 @@
+import type { Component } from 'svelte';
+import type { SVGAttributes } from 'svelte/elements';
+
+export type IconType = Component<SVGAttributes<SVGSVGElement>>;
+
+export { default as DashboardIcon } from 'virtual:icons/tabler/home-filled';
+export { default as ProjectsIcon } from 'virtual:icons/solar/folder-with-files-bold';
+export { default as EnvironmentsIcon } from 'virtual:icons/solar/server-minimalistic-linear';
+export { default as CustomizeIcon } from 'virtual:icons/material-symbols/inbox-customize-outline-rounded';
+export { default as ContainersIcon } from 'virtual:icons/carbon/web-services-container';
+export { default as ImagesIcon } from 'virtual:icons/solar/gallery-linear';
+export { default as NetworksIcon } from 'virtual:icons/fluent/virtual-network-16-filled';
+export { default as VolumesIcon } from 'virtual:icons/fluent/hard-drive-20-filled';
+export { default as EventsIcon } from 'virtual:icons/material-symbols/event-list';
+export { default as SettingsIcon } from 'virtual:icons/solar/settings-outline';
+export { default as ApperanceIcon } from 'virtual:icons/f7/paintbrush';
+export { default as DockerBrandIcon } from 'virtual:icons/cib/docker';
+export { default as SecurityIcon } from 'virtual:icons/ic/round-security';
+export { default as ApiKeyIcon } from 'virtual:icons/hugeicons/lock-key';
+export { default as UsersIcon } from 'virtual:icons/material-symbols/person-text';
+export { default as NotificationsIcon } from 'virtual:icons/ic/round-notifications-active';
+export { default as InfoIcon } from 'virtual:icons/pepicons-pop/info-circle';
+export { default as CpuIcon } from 'virtual:icons/solar/cpu-outline';
+export { default as MemoryStickIcon } from 'virtual:icons/fluent/memory-16-regular';
+export { default as ArrowDownIcon } from 'virtual:icons/ic/baseline-keyboard-arrow-down';
+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';
+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';
+export { default as TrashIcon } from 'virtual:icons/solar/trash-bin-trash-bold';
+export { default as LockIcon } from 'virtual:icons/solar/lock-linear';
+export { default as AlertIcon } from 'virtual:icons/mdi/alert-decagram';
+export { default as CloseIcon } from 'virtual:icons/majesticons/close';
+export { default as VariableIcon } from 'virtual:icons/hugeicons/variable';
+export { default as CopyIcon } from 'virtual:icons/ci/copy';
+export { default as UserIcon } from 'virtual:icons/solar/user-circle-bold';
+export { default as ClockIcon } from 'virtual:icons/solar/clock-circle-linear';
+export { default as RegistryIcon } from 'virtual:icons/pajamas/infrastructure-registry';
+export { default as DownloadIcon } from 'virtual:icons/solar/download-linear';
+export { default as SuccessIcon } from 'virtual:icons/qlementine-icons/success-12';
+export { default as ExternalLinkIcon } from 'virtual:icons/majesticons/external-link-line';
+export { default as GithubIcon } from 'virtual:icons/garden/github-stroke-16';
+export { default as BookOpenIcon } from 'virtual:icons/solar/notebook-minimalistic-bold';
+export { default as CalendarIcon } from 'virtual:icons/solar/calendar-outline';
+export { default as RefreshIcon } from 'virtual:icons/fluent/arrow-sync-24-filled';
+export { default as PinOnIcon } from 'virtual:icons/solar/pin-bold';
+export { default as PinOffIcon } from 'virtual:icons/solar/pin-linear';
+export { default as CodeIcon } from 'virtual:icons/solar/code-bold';
+export { default as MobileNavDrawerIcon } from 'virtual:icons/solar/widget-linear';
+export { default as MoonIcon } from 'virtual:icons/solar/moon-bold';
+export { default as SunIcon } from 'virtual:icons/solar/sun-bold';
+export { default as LogoutIcon } from 'virtual:icons/solar/logout-3-linear';
+export { default as RemoteEnvironmentIcon } from 'virtual:icons/solar/wi-fi-router-minimalistic-linear';
+export { default as LanguageIcon } from 'virtual:icons/fluent/local-language-zi-24-filled';
+export { default as SaveIcon } from 'virtual:icons/lets-icons/save';
+export { default as EllipsisIcon } from 'virtual:icons/pajamas/ellipsis-h';
+export { default as ErrorNotFoundIcon } from 'virtual:icons/solar/expressionless-circle-line-duotone';
+export { default as GpuIcon } from 'virtual:icons/gravity-ui/gpu';
+export { default as VerifiedCheckIcon } from 'virtual:icons/solar/verified-check-bold';
+export { default as CircleArrowUpIcon } from 'virtual:icons/solar/round-alt-arrow-up-linear';
+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';
+export { default as SearchIcon } from 'virtual:icons/solar/minimalistic-magnifer-linear';
+export { default as InspectIcon } from 'virtual:icons/solar/card-search-linear';
+export { default as UpdateIcon } from 'virtual:icons/solar/upload-square-linear';
+export { default as RestartIcon } from 'virtual:icons/solar/restart-linear';
+export { default as FileTextIcon } from 'virtual:icons/solar/file-text-linear';
+export { default as TemplateIcon } from 'virtual:icons/tabler/template';
+export { default as TerminalIcon } from 'virtual:icons/solar/programming-linear';
+export { default as StatsIcon } from 'virtual:icons/solar/station-minimalistic-linear';
+export { default as TagIcon } from 'virtual:icons/solar/tag-linear';
+export { default as HealthIcon } from 'virtual:icons/solar/heart-pulse-linear';
+export { default as TestIcon } from 'virtual:icons/solar/test-tube-linear';
+export { default as GlobeIcon } from 'virtual:icons/solar/global-linear';
+export { default as MoveToFolderIcon } from 'virtual:icons/solar/add-folder-linear';
+export { default as CommunityIcon } from 'virtual:icons/solar/users-group-two-rounded-linear';
+export { default as FolderOpenIcon } from 'virtual:icons/solar/folder-open-linear';
+export { default as ConnectionIcon } from 'virtual:icons/gravity-ui/plug-connection';
+export { default as LayersIcon } from 'virtual:icons/solar/layers-minimalistic-linear';
+export { default as HashIcon } from 'virtual:icons/gravity-ui/hashtag';
+export { default as LocalFolderComputerIcon } from 'virtual:icons/streamline/local-storage-folder-remix';
+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';
+export { default as LoginIcon } from 'virtual:icons/solar/login-3-linear';
diff --git a/frontend/src/lib/layouts/resource-page-layout.svelte b/frontend/src/lib/layouts/resource-page-layout.svelte
index 4eccd495e..06bd4a35b 100644
--- a/frontend/src/lib/layouts/resource-page-layout.svelte
+++ b/frontend/src/lib/layouts/resource-page-layout.svelte
@@ -1,11 +1,10 @@
<script lang="ts">
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import StatCard from '$lib/components/stat-card.svelte';
import type { Snippet } from 'svelte';
- import type { Icon as IconType } from '@lucide/svelte';
import type { Action } from '$lib/components/arcane-button/index.js';
+ import { EllipsisIcon, type IconType } from '$lib/icons';
export interface ActionButton {
id: string;
@@ -22,7 +21,7 @@
title: string;
value: string | number;
subtitle?: string;
- icon: typeof IconType;
+ icon: IconType;
iconColor?: string;
bgColor?: string;
class?: string;
diff --git a/frontend/src/lib/layouts/settings-page-layout.svelte b/frontend/src/lib/layouts/settings-page-layout.svelte
index dc810ec81..d4b8b83dd 100644
--- a/frontend/src/lib/layouts/settings-page-layout.svelte
+++ b/frontend/src/lib/layouts/settings-page-layout.svelte
@@ -1,12 +1,14 @@
<script lang="ts">
import type { Snippet } from 'svelte';
- import type { Icon as IconType } from '@lucide/svelte';
import { UiConfigDisabledTag } from '$lib/components/badges/index.js';
import StatCard from '$lib/components/stat-card.svelte';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import type { Action } from '$lib/components/arcane-button/index.js';
+ import { getContext } from 'svelte';
+ import { Button } from '$lib/components/ui/button';
+ import { m } from '$lib/paraglide/messages';
+ import { EllipsisIcon, ResetIcon, SaveIcon, type IconType } from '$lib/icons';
export interface SettingsActionButton {
id: string;
@@ -23,7 +25,7 @@
title: string;
value: string | number;
subtitle?: string;
- icon: typeof IconType;
+ icon: IconType;
iconColor?: string;
bgColor?: string;
class?: string;
@@ -35,7 +37,7 @@
interface Props {
title: string;
description?: string;
- icon: typeof IconType;
+ icon: IconType;
pageType?: SettingsPageType;
showReadOnlyTag?: boolean;
actionButtons?: SettingsActionButton[];
@@ -63,6 +65,14 @@
const mobileVisibleButtons = $derived(actionButtons.filter((btn) => btn.showOnMobile));
const mobileDropdownButtons = $derived(actionButtons.filter((btn) => !btn.showOnMobile));
+ // Get form state from context if available
+ const formState = getContext<{
+ hasChanges: boolean;
+ isLoading: boolean;
+ saveFunction: (() => Promise<void>) | null;
+ resetFunction: (() => void) | null;
+ }>('settingsFormState');
+
const getStatCardsGridClass = (columns: typeof statCardsColumns) => {
switch (columns) {
case 1:
@@ -106,6 +116,48 @@
<UiConfigDisabledTag />
{/if}
+ {#if pageType === 'form' && formState && !showReadOnlyTag}
+ <div class="hidden items-center gap-2 sm:flex">
+ {#if formState.hasChanges}
+ <span class="mr-2 text-xs text-orange-600 dark:text-orange-400"> Unsaved changes </span>
+ {:else if !formState.hasChanges && formState.saveFunction}
+ <span class="mr-2 text-xs text-green-600 dark:text-green-400"> All changes saved </span>
+ {/if}
+
+ {#if formState.hasChanges && formState.resetFunction}
+ <Button
+ variant="outline"
+ size="sm"
+ onclick={() => formState.resetFunction && formState.resetFunction()}
+ disabled={formState.isLoading}
+ class="gap-2"
+ >
+ <ResetIcon class="size-4" />
+ <span class="hidden sm:inline">{m.common_reset()}</span>
+ </Button>
+ {/if}
+
+ <Button
+ onclick={async () => {
+ if (formState.saveFunction) {
+ await formState.saveFunction();
+ }
+ }}
+ disabled={formState.isLoading || !formState.hasChanges || !formState.saveFunction}
+ size="sm"
+ class="min-w-[80px] gap-2"
+ >
+ {#if formState.isLoading}
+ <div class="border-background size-4 animate-spin rounded-full border-2 border-t-transparent"></div>
+ <span class="hidden sm:inline">{m.common_saving()}</span>
+ {:else}
+ <SaveIcon class="size-4" />
+ <span class="hidden sm:inline">{m.common_save()}</span>
+ {/if}
+ </Button>
+ </div>
+ {/if}
+
{#if pageType === 'management' && actionButtons.length > 0}
<div class="hidden items-center gap-2 sm:flex">
{#each actionButtons as button}
diff --git a/frontend/src/lib/layouts/tabbed-page-layout.svelte b/frontend/src/lib/layouts/tabbed-page-layout.svelte
index b702abd48..d03476b1c 100644
--- a/frontend/src/lib/layouts/tabbed-page-layout.svelte
+++ b/frontend/src/lib/layouts/tabbed-page-layout.svelte
@@ -2,10 +2,10 @@
import { Button } from '$lib/components/ui/button/index.js';
import * as Tabs from '$lib/components/ui/tabs/index.js';
import { TabBar, type TabItem } from '$lib/components/tab-bar/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
import type { Snippet } from 'svelte';
import { browser } from '$app/environment';
import { cn } from '$lib/utils';
+ import { ArrowLeftIcon } from '$lib/icons';
interface Props {
backUrl: string;
diff --git a/frontend/src/routes/(app)/containers/+page.svelte b/frontend/src/routes/(app)/containers/+page.svelte
index 2e5b7d8b6..5f68fd7e3 100644
--- a/frontend/src/routes/(app)/containers/+page.svelte
+++ b/frontend/src/routes/(app)/containers/+page.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import BoxIcon from '@lucide/svelte/icons/box';
import CreateContainerDialog from '$lib/components/dialogs/create-container-dialog.svelte';
import { toast } from 'svelte-sonner';
import { tryCatch } from '$lib/utils/try-catch';
@@ -12,6 +11,7 @@
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { BoxIcon } from '$lib/icons';
let { data } = $props();
@@ -22,10 +22,6 @@
let isCreateDialogOpen = $state(false);
let isLoading = $state({ checking: false, create: false, refreshing: false });
- const baseServerUrl = $derived(
- (data.settings as any)?.serverBaseUrl ?? (data.settings as any)?.baseServerUrl ?? (data.settings as any)?.baseUrl ?? ''
- );
-
async function refresh() {
await parallelRefresh(
{
@@ -68,7 +64,7 @@
},
{
id: 'check-updates',
- action: 'inspect',
+ action: 'update',
label: m.containers_check_updates(),
onclick: handleCheckForUpdates,
loading: isLoading.checking,
@@ -117,15 +113,12 @@
statCardsColumns={3}
>
{#snippet mainContent()}
- <ContainerTable bind:containers bind:selectedIds bind:requestOptions {baseServerUrl} />
+ <ContainerTable bind:containers bind:selectedIds bind:requestOptions />
{/snippet}
{#snippet additionalContent()}
<CreateContainerDialog
bind:open={isCreateDialogOpen}
- availableVolumes={[]}
- availableNetworks={[]}
- availableImages={[]}
isLoading={isLoading.create}
onSubmit={async (options) => {
isLoading.create = true;
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index af527f376..4b90e1a12 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -1,15 +1,5 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import CircleAlertIcon from '@lucide/svelte/icons/alert-circle';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ActivityIcon from '@lucide/svelte/icons/activity';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
import { invalidateAll } from '$app/navigation';
import ActionButtons from '$lib/components/action-buttons.svelte';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
@@ -35,6 +25,18 @@
import ContainerShell from '../components/ContainerShell.svelte';
import { createContainerStatsWebSocket, type ReconnectingWebSocket } from '$lib/utils/ws';
import { environmentStore } from '$lib/stores/environment.store.svelte';
+ import {
+ ArrowLeftIcon,
+ AlertIcon,
+ RefreshIcon,
+ VolumesIcon,
+ FileTextIcon,
+ SettingsIcon,
+ NetworksIcon,
+ TerminalIcon,
+ ContainersIcon,
+ StatsIcon
+ } from '$lib/icons';
let { data } = $props();
let container = $derived(data?.container as ContainerDetailsDto);
@@ -219,13 +221,13 @@
const showShell = $derived(!!container?.state?.running);
const tabItems = $derived<TabItem[]>([
- { value: 'overview', label: m.common_overview(), icon: HardDriveIcon },
- ...(showStats ? [{ value: 'stats', label: m.containers_nav_metrics(), icon: ActivityIcon }] : []),
+ { value: 'overview', label: m.common_overview(), icon: ContainersIcon },
+ ...(showStats ? [{ value: 'stats', label: m.containers_nav_metrics(), icon: StatsIcon }] : []),
{ value: 'logs', label: m.containers_nav_logs(), icon: FileTextIcon },
...(showShell ? [{ value: 'shell', label: m.common_shell(), icon: TerminalIcon }] : []),
...(showConfiguration ? [{ value: 'config', label: m.common_configuration(), icon: SettingsIcon }] : []),
- ...(hasNetworks ? [{ value: 'network', label: m.containers_nav_networks(), icon: NetworkIcon }] : []),
- ...(hasMounts ? [{ value: 'storage', label: m.containers_nav_storage(), icon: DatabaseIcon }] : [])
+ ...(hasNetworks ? [{ value: 'network', label: m.containers_nav_networks(), icon: NetworksIcon }] : []),
+ ...(hasMounts ? [{ value: 'storage', label: m.containers_nav_storage(), icon: VolumesIcon }] : [])
]);
$effect(() => {
@@ -263,10 +265,6 @@
return d ? format(d, fmt) : 'N/A';
}
- const baseServerUrl = $derived(
- (data?.settings as any)?.serverBaseUrl ?? (data?.settings as any)?.baseServerUrl ?? (data?.settings as any)?.baseUrl ?? ''
- );
-
const backUrl = $derived.by(() => {
const from = page.url.searchParams.get('from');
const projectId = page.url.searchParams.get('projectId');
@@ -307,7 +305,7 @@
{#snippet tabContent(activeTab)}
<Tabs.Content value="overview" class="h-full">
- <ContainerOverview {container} {primaryIpAddress} {baseServerUrl} />
+ <ContainerOverview {container} {primaryIpAddress} />
</Tabs.Content>
{#if showStats}
@@ -371,7 +369,7 @@
<div class="flex min-h-screen items-center justify-center">
<div class="text-center">
<div class="bg-muted/50 mb-6 inline-flex rounded-full p-6">
- <CircleAlertIcon class="text-muted-foreground size-10" />
+ <AlertIcon class="text-muted-foreground size-10" />
</div>
<h2 class="mb-3 text-2xl font-medium">{m.common_not_found_title({ resource: m.container() })}</h2>
<p class="text-muted-foreground mb-8 max-w-md text-center">
@@ -379,11 +377,11 @@
</p>
<div class="flex justify-center gap-4">
<Button variant="outline" href="/containers">
- <ArrowLeftIcon class="mr-2 size-4" />
+ <ArrowLeftIcon class="size-4" />
{m.common_back_to({ resource: m.containers_title() })}
</Button>
<Button variant="default" onclick={refreshData}>
- <RefreshCwIcon class="mr-2 size-4" />
+ <RefreshIcon class="size-4" />
{m.common_retry()}
</Button>
</div>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte b/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
index cb8157760..4feb83880 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerConfiguration.svelte
@@ -1,9 +1,8 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import TagIcon from '@lucide/svelte/icons/tag';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/container.type';
+ import { SettingsIcon, TagIcon } from '$lib/icons';
interface Props {
container: ContainerDetailsDto;
diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
index 1692f40e8..0c4d56be4 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
import LogViewer from '$lib/components/logs/log-viewer.svelte';
import LogControls from '$lib/components/logs/log-controls.svelte';
import { m } from '$lib/paraglide/messages';
+ import { FileTextIcon } from '$lib/icons';
let {
containerId,
@@ -90,16 +90,16 @@
</div>
<Card.Description>{m.containers_logs_description()}</Card.Description>
</div>
- <LogControls
- bind:autoScroll
- bind:autoStartLogs
- {isStreaming}
- disabled={!containerId}
- onStart={handleStart}
- onStop={handleStop}
- onClear={handleClear}
- onRefresh={handleRefresh}
- />
+ <LogControls
+ bind:autoScroll
+ bind:autoStartLogs
+ {isStreaming}
+ disabled={!containerId}
+ onStart={handleStart}
+ onStop={handleStop}
+ onClear={handleClear}
+ onRefresh={handleRefresh}
+ />
</div>
</Card.Header>
<Card.Content class="p-0">
diff --git a/frontend/src/routes/(app)/containers/components/ContainerNetwork.svelte b/frontend/src/routes/(app)/containers/components/ContainerNetwork.svelte
index 2c9500f2d..f2dfed11c 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerNetwork.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerNetwork.svelte
@@ -1,8 +1,8 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import NetworkIcon from '@lucide/svelte/icons/network';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/container.type';
+ import { NetworksIcon } from '$lib/icons';
interface NetworkConfig {
IPAddress?: string;
@@ -23,7 +23,7 @@
<div class="space-y-6">
<Card.Root>
- <Card.Header icon={NetworkIcon}>
+ <Card.Header icon={NetworksIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>
@@ -41,7 +41,7 @@
<Card.Content class="p-4">
<div class="border-border mb-4 flex items-center gap-3 border-b pb-4">
<div class="rounded-lg bg-blue-500/10 p-2">
- <NetworkIcon class="size-5 text-blue-500" />
+ <NetworksIcon class="size-5 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<div class="text-foreground text-base font-semibold break-all">
diff --git a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
index 9226f54fc..132c34fa0 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
@@ -1,24 +1,18 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import InfoIcon from '@lucide/svelte/icons/info';
- import PlayIcon from '@lucide/svelte/icons/play';
- import StopCircleIcon from '@lucide/svelte/icons/stop-circle';
- import HeartPulseIcon from '@lucide/svelte/icons/heart-pulse';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { PortBadge } from '$lib/components/badges';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/container.type';
import { format, formatDistanceToNow } from 'date-fns';
+ import { InfoIcon, StartIcon, StopIcon, NetworksIcon, VolumesIcon, HealthIcon } from '$lib/icons';
interface Props {
container: ContainerDetailsDto;
primaryIpAddress: string;
- baseServerUrl: string;
}
- let { container, primaryIpAddress, baseServerUrl }: Props = $props();
+ let { container, primaryIpAddress }: Props = $props();
function parseDockerDate(input: string | Date | undefined | null): Date | null {
if (!input) return null;
@@ -118,7 +112,7 @@
</div>
<div class="flex items-center gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-blue-500/10">
- <HardDriveIcon class="size-5 text-blue-500" />
+ <VolumesIcon class="size-5 text-blue-500" />
</div>
<div class="text-foreground cursor-pointer text-base font-semibold break-all select-all" title="Click to select">
{container.image || m.common_na()}
@@ -128,10 +122,10 @@
{#if container.state?.running}
<div>
- <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">Uptime</div>
+ <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">{m.common_uptime()}</div>
<div class="flex items-center gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-green-500/10">
- <PlayIcon class="size-5 text-green-500" />
+ <StartIcon class="size-5 text-green-500" />
</div>
<div class="text-foreground text-base font-semibold">
{getUptime(container.state.startedAt)}
@@ -140,13 +134,13 @@
</div>
{:else}
<div>
- <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">Status</div>
+ <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">{m.common_status()}</div>
<div class="flex items-center gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-gray-500/10">
- <StopCircleIcon class="size-5 text-gray-500" />
+ <StopIcon class="size-5 text-gray-500" />
</div>
<div class="text-foreground text-base font-semibold">
- {container.state?.status || 'Stopped'}
+ {container.state?.status || m.common_stopped()}
</div>
</div>
</div>
@@ -158,7 +152,7 @@
</div>
<div class="flex items-center gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-purple-500/10">
- <NetworkIcon class="size-5 text-purple-500" />
+ <NetworksIcon class="size-5 text-purple-500" />
</div>
<div class="text-foreground cursor-pointer font-mono text-base font-semibold select-all" title="Click to select">
{primaryIpAddress}
@@ -168,10 +162,10 @@
{#if container.state?.health}
<div>
- <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">Health Status</div>
+ <div class="text-muted-foreground mb-2 text-xs font-semibold tracking-wide uppercase">{m.common_health_status()}</div>
<div class="flex items-center gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-pink-500/10">
- <HeartPulseIcon class="size-5 text-pink-500" />
+ <HealthIcon class="size-5 text-pink-500" />
</div>
<StatusBadge
variant={container.state.health.status === 'healthy'
@@ -216,7 +210,7 @@
{#if container.state?.running}
<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">Started</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_started()}</div>
<div class="text-foreground text-sm font-medium">
{formatRelativeDate(container.state.startedAt)}
</div>
@@ -228,7 +222,7 @@
{:else if container.state?.finishedAt && !container.state.finishedAt.startsWith('0001')}
<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">Finished</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_finished()}</div>
<div class="text-foreground text-sm font-medium">
{formatRelativeDate(container.state.finishedAt)}
</div>
@@ -241,7 +235,7 @@
<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">Restart Policy</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_restart_policy()}</div>
<div class="text-foreground text-sm font-medium capitalize">
{restartPolicy}
</div>
@@ -250,16 +244,16 @@
<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">Ports</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_ports()}</div>
<div class="text-foreground text-sm font-medium">
{#if uniquePorts.total === 0}
- No ports
+ {m.containers_no_ports()}
{:else if uniquePorts.published > 0 && uniquePorts.exposed > 0}
- {uniquePorts.published} published, {uniquePorts.exposed} exposed
+ {m.containers_ports_published_exposed({ published: uniquePorts.published, exposed: uniquePorts.exposed })}
{:else if uniquePorts.published > 0}
- {uniquePorts.published} published
+ {m.containers_ports_published({ published: uniquePorts.published })}
{:else}
- {uniquePorts.exposed} exposed
+ {m.containers_ports_exposed({ exposed: uniquePorts.exposed })}
{/if}
</div>
</Card.Content>
@@ -267,27 +261,27 @@
<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">Volumes</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.resource_volumes_cap()}</div>
<div class="text-foreground text-sm font-medium">
{mountCount}
- {mountCount === 1 ? 'mount' : 'mounts'}
+ {mountCount === 1 ? m.common_mount() : m.common_mounts()}
</div>
</Card.Content>
</Card.Root>
<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">Networks</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.resource_networks_cap()}</div>
<div class="text-foreground text-sm font-medium">
{networkCount}
- {networkCount === 1 ? 'network' : 'networks'}
+ {networkCount === 1 ? m.resource_network() : m.resource_networks()}
</div>
</Card.Content>
</Card.Root>
<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">Image ID</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_image_id()}</div>
<div class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all" title="Click to select">
{container.imageId}
</div>
@@ -313,7 +307,7 @@
{#if container.config?.user}
<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">User</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.resource_user_cap()}</div>
<div class="text-foreground cursor-pointer font-mono text-sm font-medium select-all" title="Click to select">
{container.config.user}
</div>
@@ -324,7 +318,7 @@
{#if container.config?.entrypoint && container.config.entrypoint.length > 0}
<Card.Root variant="subtle" class="sm:col-span-2">
<Card.Content class="flex flex-col gap-2 p-4">
- <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">Entrypoint</div>
+ <div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_entrypoint()}</div>
<div
class="text-foreground cursor-pointer font-mono text-sm font-medium break-all select-all"
title="Click to select"
@@ -357,7 +351,7 @@
<div class="text-muted-foreground mb-3 text-xs font-semibold tracking-wide uppercase">
{m.common_port_mappings()}
</div>
- <PortBadge ports={container.ports} {baseServerUrl} />
+ <PortBadge ports={container.ports} />
</div>
{/if}
</Card.Content>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerShell.svelte b/frontend/src/routes/(app)/containers/components/ContainerShell.svelte
index 6792af58f..6e9dc07b5 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerShell.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerShell.svelte
@@ -2,10 +2,10 @@
import * as Card from '$lib/components/ui/card';
import Terminal from '$lib/components/terminal/terminal.svelte';
import TerminalControls from '$lib/components/terminal/terminal-controls.svelte';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
import { m } from '$lib/paraglide/messages';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import settingsStore from '$lib/stores/config-store';
+ import { TerminalIcon } from '$lib/icons';
let {
containerId
diff --git a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
index bac572c29..a18ce31dd 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerStats.svelte
@@ -1,11 +1,11 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import ActivityIcon from '@lucide/svelte/icons/activity';
import { Progress } from '$lib/components/ui/progress';
import { Skeleton } from '$lib/components/ui/skeleton';
import { m } from '$lib/paraglide/messages';
import bytes from 'bytes';
import type { ContainerDetailsDto, ContainerStats as ContainerStatsType } from '$lib/types/container.type';
+ import { StatsIcon } from '$lib/icons';
interface Props {
container: ContainerDetailsDto;
@@ -161,7 +161,7 @@
{/snippet}
<Card.Root>
- <Card.Header icon={ActivityIcon}>
+ <Card.Header icon={StatsIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerStorage.svelte b/frontend/src/routes/(app)/containers/components/ContainerStorage.svelte
index 493a45b1c..7ecfe389d 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerStorage.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerStorage.svelte
@@ -1,11 +1,9 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/container.type';
+ import { VolumesIcon, TerminalIcon } from '$lib/icons';
interface Props {
container: ContainerDetailsDto;
@@ -16,7 +14,7 @@
<div class="space-y-6">
<Card.Root>
- <Card.Header icon={DatabaseIcon}>
+ <Card.Header icon={VolumesIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>
@@ -42,9 +40,9 @@
: 'bg-amber-500/10'}"
>
{#if mount.type === 'volume'}
- <DatabaseIcon class="size-5 text-purple-500" />
+ <VolumesIcon class="size-5 text-purple-500" />
{:else if mount.type === 'bind'}
- <HardDriveIcon class="size-5 text-blue-500" />
+ <VolumesIcon class="size-5 text-blue-500" />
{:else}
<TerminalIcon class="size-5 text-amber-500" />
{/if}
@@ -129,7 +127,7 @@
{:else}
<div class="rounded-lg border border-dashed py-12 text-center">
<div class="bg-muted/30 mx-auto mb-4 flex size-16 items-center justify-center rounded-full">
- <DatabaseIcon class="text-muted-foreground size-6" />
+ <VolumesIcon class="text-muted-foreground size-6" />
</div>
<div class="text-muted-foreground text-sm">{m.containers_no_mounts_configured()}</div>
</div>
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index 629161991..c4e445dec 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -1,14 +1,7 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
- import PlayIcon from '@lucide/svelte/icons/play';
- import RotateCcwIcon from '@lucide/svelte/icons/rotate-ccw';
- import StopCircleIcon from '@lucide/svelte/icons/stop-circle';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import ArrowUpCircleIcon from '@lucide/svelte/icons/arrow-up-circle';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -24,32 +17,43 @@
import { m } from '$lib/paraglide/messages';
import { PortBadge } from '$lib/components/badges/index.js';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
- import BoxIcon from '@lucide/svelte/icons/box';
- import ImageIcon from '@lucide/svelte/icons/image';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import ClockIcon from '@lucide/svelte/icons/clock';
import { containerService } from '$lib/services/container-service';
import DropdownCard from '$lib/components/dropdown-card.svelte';
- import FolderIcon from '@lucide/svelte/icons/folder';
import type { Table as TableType } from '@tanstack/table-core';
import * as Table from '$lib/components/ui/table/index.js';
import FlexRender from '$lib/components/ui/data-table/flex-render.svelte';
- import { DataTableViewOptions } from '$lib/components/arcane-table/index.js';
+ import DataTableToolbar from '$lib/components/arcane-table/arcane-table-toolbar.svelte';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
+ import { PersistedState } from 'runed';
+ import { onMount } from 'svelte';
+ import {
+ StartIcon,
+ StopIcon,
+ RefreshIcon,
+ TrashIcon,
+ EllipsisIcon,
+ ArrowDownIcon,
+ ArrowRightIcon,
+ BoxIcon,
+ ClockIcon,
+ ImagesIcon,
+ NetworksIcon,
+ ProjectsIcon,
+ InspectIcon,
+ UpdateIcon
+ } from '$lib/icons';
type FieldVisibility = Record<string, boolean>;
let {
containers = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable(),
- baseServerUrl = $bindable()
+ requestOptions = $bindable()
}: {
containers: Paginated<ContainerSummaryDto>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
- baseServerUrl: string;
} = $props();
// Track action status per container ID (e.g., "starting", "stopping", "updating", "")
@@ -226,16 +230,41 @@
const isAnyLoading = $derived(Object.values(actionStatus).some((status) => status !== ''));
- const columns = [
- { accessorKey: 'names', id: 'name', title: m.common_name(), sortable: true, cell: NameCell },
+ let mobileFieldVisibility = $state<Record<string, boolean>>({});
+ let customSettings = $state<Record<string, unknown>>({});
+ let collapsedGroupsState = $state<PersistedState<Record<string, boolean>> | null>(null);
+ let collapsedGroups = $derived(collapsedGroupsState?.current ?? {});
+
+ onMount(() => {
+ collapsedGroupsState = new PersistedState<Record<string, boolean>>('container-groups-collapsed', {});
+ });
+
+ let groupByProject = $derived.by(() => {
+ return (customSettings.groupByProject as boolean) ?? false;
+ });
+
+ function setGroupByProject(value: boolean) {
+ customSettings = { ...customSettings, groupByProject: value };
+ }
+
+ function toggleGroup(groupName: string) {
+ if (!collapsedGroupsState) return;
+ collapsedGroupsState.current = {
+ ...collapsedGroupsState.current,
+ [groupName]: !collapsedGroupsState.current[groupName]
+ };
+ }
+
+ const columns = $derived([
+ { accessorKey: 'names', id: 'name', title: m.common_name(), sortable: !groupByProject, cell: NameCell },
{ accessorKey: 'id', title: m.common_id(), cell: IdCell },
- { accessorKey: 'state', title: m.common_state(), sortable: true, cell: StateCell },
- { accessorKey: 'image', title: m.common_image(), sortable: true, cell: ImageCell },
+ { accessorKey: 'state', title: m.common_state(), sortable: !groupByProject, cell: StateCell },
+ { accessorKey: 'image', title: m.common_image(), sortable: !groupByProject, cell: ImageCell },
{ accessorKey: 'imageId', id: 'update', title: m.containers_update_column(), cell: UpdateCell },
{ accessorKey: 'status', title: m.common_status() },
{ accessorKey: 'ports', title: m.common_ports(), cell: PortsCell },
- { accessorKey: 'created', title: m.common_created(), sortable: true, cell: CreatedCell }
- ] satisfies ColumnSpec<ContainerSummaryDto>[];
+ { accessorKey: 'created', title: m.common_created(), sortable: !groupByProject, cell: CreatedCell }
+ ] satisfies ColumnSpec<ContainerSummaryDto>[]);
const mobileFields = [
{ id: 'id', label: m.common_id(), defaultVisible: true },
@@ -246,16 +275,21 @@
{ id: 'created', label: m.common_created(), defaultVisible: true }
];
- let mobileFieldVisibility = $state<Record<string, boolean>>({});
- let customSettings = $state<Record<string, unknown>>({});
- let groupByProject = $derived.by(() => {
- return (customSettings.groupByProject as boolean) ?? false;
- });
-
- function setGroupByProject(value: boolean) {
- customSettings = { ...customSettings, groupByProject: value };
+ function onToggleMobileField(fieldId: string) {
+ mobileFieldVisibility = {
+ ...mobileFieldVisibility,
+ [fieldId]: !mobileFieldVisibility[fieldId]
+ };
}
+ const mobileFieldsForOptions = $derived(
+ mobileFields.map((field) => ({
+ id: field.id,
+ label: field.label,
+ visible: mobileFieldVisibility[field.id] ?? true
+ }))
+ );
+
function getProjectName(container: ContainerSummaryDto): string {
const projectLabel = container.labels?.['com.docker.compose.project'];
return projectLabel || 'No Project';
@@ -285,7 +319,7 @@
</script>
{#snippet PortsCell({ item }: { item: ContainerSummaryDto })}
- <PortBadge ports={item.ports ?? []} {baseServerUrl} />
+ <PortBadge ports={item.ports ?? []} />
{/snippet}
{#snippet NameCell({ item }: { item: ContainerSummaryDto })}
@@ -325,7 +359,7 @@
disabled={isAnyLoading}
title={m.common_start()}
>
- <PlayIcon class="size-3.5" />
+ <StartIcon class="size-3.5" />
</Button>
{:else if !status && item.state === 'running'}
<Button
@@ -336,7 +370,7 @@
disabled={isAnyLoading}
title={m.common_stop()}
>
- <StopCircleIcon class="size-3.5" />
+ <StopIcon class="size-3.5" />
</Button>
{/if}
{#if !status && item.updateInfo?.hasUpdate}
@@ -348,7 +382,7 @@
disabled={isAnyLoading}
title={m.containers_update_container()}
>
- <ArrowUpCircleIcon class="size-3.5" />
+ <UpdateIcon class="size-3.5" />
</Button>
{/if}
</div>
@@ -422,7 +456,7 @@
{
label: m.common_image(),
getValue: (item: ContainerSummaryDto) => item.image,
- icon: ImageIcon,
+ icon: ImagesIcon,
iconVariant: 'blue' as const,
show: mobileFieldVisibility.image ?? true
},
@@ -448,14 +482,14 @@
{#if (mobileFieldVisibility.ports ?? true) && item.ports && item.ports.length > 0}
<div class="flex items-start gap-2.5 border-t pt-3">
<div class="flex size-7 shrink-0 items-center justify-center rounded-lg bg-sky-500/10">
- <NetworkIcon class="size-3.5 text-sky-500" />
+ <NetworksIcon class="size-3.5 text-sky-500" />
</div>
<div class="min-w-0 flex-1">
<div class="text-muted-foreground text-[10px] font-medium tracking-wide uppercase">
{m.common_ports()}
</div>
<div class="mt-1">
- <PortBadge ports={item.ports} {baseServerUrl} />
+ <PortBadge ports={item.ports} />
</div>
</div>
</div>
@@ -478,7 +512,7 @@
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
<DropdownMenu.Item onclick={() => goto(`/containers/${item.id}`)} disabled={isAnyLoading}>
- <ScanSearchIcon class="size-4" />
+ <InspectIcon class="size-4" />
{m.common_inspect()}
</DropdownMenu.Item>
@@ -487,7 +521,7 @@
{#if status === 'updating'}
<Spinner class="size-4" />
{:else}
- <ArrowUpCircleIcon class="size-4" />
+ <UpdateIcon class="size-4" />
{/if}
{m.containers_update_container()}
</DropdownMenu.Item>
@@ -501,7 +535,7 @@
{#if status === 'starting'}
<Spinner class="size-4" />
{:else}
- <PlayIcon class="size-4" />
+ <StartIcon class="size-4" />
{/if}
{m.common_start()}
</DropdownMenu.Item>
@@ -513,7 +547,7 @@
{#if status === 'restarting'}
<Spinner class="size-4" />
{:else}
- <RotateCcwIcon class="size-4" />
+ <RefreshIcon class="size-4" />
{/if}
{m.common_restart()}
</DropdownMenu.Item>
@@ -525,7 +559,7 @@
{#if status === 'stopping'}
<Spinner class="size-4" />
{:else}
- <StopCircleIcon class="size-4" />
+ <StopIcon class="size-4" />
{/if}
{m.common_stop()}
</DropdownMenu.Item>
@@ -541,7 +575,7 @@
{#if status === 'removing'}
<Spinner class="size-4" />
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{/if}
{m.common_remove()}
</DropdownMenu.Item>
@@ -574,73 +608,107 @@
{/snippet}
{#snippet GroupedTableView({ table, renderPagination }: { table: TableType<ContainerSummaryDto>; renderPagination: import('svelte').Snippet })}
- <div class="flex items-center justify-end border-b px-6 py-2">
- <DataTableViewOptions {table} customViewOptions={CustomViewOptions} />
- </div>
- <div class=" space-y-4 px-6 py-2">
- {#each groupedContainers() ?? [] as [projectName, projectContainers] (projectName)}
- {@const projectContainerIds = new Set(projectContainers.map((c) => c.id))}
- {@const projectRows = table
- .getRowModel()
- .rows.filter((row) => projectContainerIds.has((row.original as ContainerSummaryDto).id))}
-
- <DropdownCard
- id={`container-project-${projectName}`}
- title={projectName}
- description={`${projectContainers.length} ${projectContainers.length === 1 ? 'container' : 'containers'}`}
- icon={FolderIcon}
- >
- <div class="hidden md:block">
- <Table.Root
- class="**:data-[slot='table-container']:rounded-none **:data-[slot='table-container']:border-0 **:data-[slot='table-container']:bg-transparent **:data-[slot='table-container']:shadow-none **:data-[slot='table-container']:backdrop-filter-none"
- >
- <Table.Header class="border-border/40 border-t">
- {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
- <Table.Row>
- {#each headerGroup.headers as header (header.id)}
- <Table.Head colspan={header.colSpan}>
- {#if !header.isPlaceholder}
- <FlexRender content={header.column.columnDef.header} context={header.getContext()} />
- {/if}
- </Table.Head>
- {/each}
- </Table.Row>
- {/each}
- </Table.Header>
- <Table.Body>
- {#each projectRows as row (row.id)}
- <Table.Row data-state={(selectedIds ?? []).includes((row.original as ContainerSummaryDto).id) && 'selected'}>
- {#each row.getVisibleCells() as cell (cell.id)}
- <Table.Cell>
- <FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
- </Table.Cell>
- {/each}
- </Table.Row>
- {:else}
- <Table.Row>
- <Table.Cell colspan={table.getAllColumns().length} class="h-24 text-center"
- >{m.common_no_results_found()}</Table.Cell
+ <div class="flex h-full flex-col">
+ <div class="shrink-0 border-b">
+ <DataTableToolbar
+ {table}
+ {selectedIds}
+ selectionDisabled={true}
+ mobileFields={mobileFieldsForOptions}
+ {onToggleMobileField}
+ customViewOptions={CustomViewOptions}
+ />
+ </div>
+
+ <div class="hidden flex-1 overflow-auto px-6 py-8 md:block">
+ <div class="overflow-x-auto rounded-md border">
+ <Table.Root>
+ <Table.Header>
+ {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
+ <Table.Row>
+ {#each headerGroup.headers as header (header.id)}
+ <Table.Head colspan={header.colSpan}>
+ {#if !header.isPlaceholder}
+ <FlexRender content={header.column.columnDef.header} context={header.getContext()} />
+ {/if}
+ </Table.Head>
+ {/each}
+ </Table.Row>
+ {/each}
+ </Table.Header>
+ <Table.Body>
+ {#each groupedContainers() ?? [] as [projectName, projectContainers] (projectName)}
+ <Table.Row
+ class="bg-muted/50 hover:bg-muted/60 cursor-pointer transition-colors"
+ onclick={() => toggleGroup(projectName)}
+ >
+ <Table.Cell colspan={table.getAllColumns().length} class="py-3 font-medium">
+ <div class="flex items-center gap-2">
+ {#if collapsedGroups[projectName]}
+ <ArrowRightIcon class="text-muted-foreground size-4" />
+ {:else}
+ <ArrowDownIcon class="text-muted-foreground size-4" />
+ {/if}
+ <ProjectsIcon class="text-muted-foreground size-4" />
+ <span>{projectName}</span>
+ <span class="text-muted-foreground text-xs font-normal">({projectContainers.length})</span>
+ </div>
+ </Table.Cell>
+ </Table.Row>
+
+ {#if !collapsedGroups[projectName]}
+ {@const projectContainerIds = new Set(projectContainers.map((c) => c.id))}
+ {@const projectRows = table
+ .getRowModel()
+ .rows.filter((row) => projectContainerIds.has((row.original as ContainerSummaryDto).id))}
+
+ {#each projectRows as row (row.id)}
+ <Table.Row
+ data-state={(selectedIds ?? []).includes((row.original as ContainerSummaryDto).id) && 'selected'}
+ class="hover:bg-primary/5 transition-colors"
>
- </Table.Row>
- {/each}
- </Table.Body>
- </Table.Root>
- </div>
+ {#each row.getVisibleCells() as cell, i (cell.id)}
+ <Table.Cell class={i === 0 ? 'pl-12' : ''}>
+ <FlexRender content={cell.column.columnDef.cell} context={cell.getContext()} />
+ </Table.Cell>
+ {/each}
+ </Table.Row>
+ {/each}
+ {/if}
+ {/each}
+ </Table.Body>
+ </Table.Root>
+ </div>
+ </div>
- <div class="space-y-3 md:hidden">
- {#each projectRows as row (row.id)}
- {@render ContainerMobileCardSnippet({ item: row.original as ContainerSummaryDto, mobileFieldVisibility })}
- {:else}
- <div class="h-24 flex items-center justify-center text-center text-muted-foreground">
- {m.common_no_results_found()}
- </div>
- {/each}
- </div>
- </DropdownCard>
- {/each}
- </div>
+ <div class="space-y-4 px-6 py-2 md:hidden">
+ {#each groupedContainers() ?? [] as [projectName, projectContainers] (projectName)}
+ {@const projectContainerIds = new Set(projectContainers.map((c) => c.id))}
+ {@const projectRows = table
+ .getRowModel()
+ .rows.filter((row) => projectContainerIds.has((row.original as ContainerSummaryDto).id))}
+
+ <DropdownCard
+ id={`container-project-${projectName}`}
+ title={projectName}
+ description={`${projectContainers.length} ${projectContainers.length === 1 ? 'container' : 'containers'}`}
+ icon={ProjectsIcon}
+ >
+ <div class="space-y-3">
+ {#each projectRows as row (row.id)}
+ {@render ContainerMobileCardSnippet({ item: row.original as ContainerSummaryDto, mobileFieldVisibility })}
+ {:else}
+ <div class="h-24 flex items-center justify-center text-center text-muted-foreground">
+ {m.common_no_results_found()}
+ </div>
+ {/each}
+ </div>
+ </DropdownCard>
+ {/each}
+ </div>
- <div class="shrink-0 border-t px-2 py-4">
- {@render renderPagination()}
+ <div class="shrink-0 border-t px-2 py-4">
+ {@render renderPagination()}
+ </div>
</div>
{/snippet}
diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelte
index 443fbdff3..36f422c35 100644
--- a/frontend/src/routes/(app)/customize/+page.svelte
+++ b/frontend/src/routes/(app)/customize/+page.svelte
@@ -1,13 +1,6 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { onMount } from 'svelte';
- import SearchIcon from '@lucide/svelte/icons/search';
- import PaletteIcon from '@lucide/svelte/icons/palette';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import PackageIcon from '@lucide/svelte/icons/package';
- import CodeIcon from '@lucide/svelte/icons/code';
import { Button } from '$lib/components/ui/button';
import { Card } from '$lib/components/ui/card';
import { m } from '$lib/paraglide/messages';
@@ -15,6 +8,8 @@
import { customizeSearchService } from '$lib/services/customize-search';
import type { CustomizeCategory } from '$lib/types/customize-search.type';
import { debounced } from '$lib/utils/utils';
+ import * as InputGroup from '$lib/components/ui/input-group/index.js';
+ import { SearchIcon, TemplateIcon, ArrowRightIcon, FileTextIcon, RegistryIcon, VariableIcon, CustomizeIcon } from '$lib/icons';
let { data } = $props();
let searchQuery = $state('');
@@ -26,9 +21,9 @@
const iconMap: Record<string, any> = {
'file-text': FileTextIcon,
- layers: LayersIcon,
- package: PackageIcon,
- code: CodeIcon
+ layers: TemplateIcon,
+ package: RegistryIcon,
+ code: VariableIcon
};
onMount(async () => {
@@ -87,7 +82,7 @@
}
function getIconComponent(iconName: string) {
- return iconMap[iconName] || PaletteIcon;
+ return iconMap[iconName] || CustomizeIcon;
}
</script>
@@ -104,7 +99,7 @@
<div
class="bg-primary/10 text-primary ring-primary/20 flex size-8 shrink-0 items-center justify-center rounded-lg ring-1 sm:size-10"
>
- <PaletteIcon class="size-4 sm:size-5" />
+ <TemplateIcon class="size-4 sm:size-5" />
</div>
<div class="min-w-0 flex-1">
<div class="flex items-start justify-between gap-3">
@@ -119,27 +114,28 @@
</div>
<div class="relative mt-4 w-full sm:mt-6 sm:max-w-md">
- <SearchIcon class="text-muted-foreground absolute top-1/2 left-3 size-4 -translate-y-1/2" />
- <input
- type="text"
- placeholder={m.customize_search_placeholder()}
- value={searchQuery}
- oninput={(e) => {
- searchQuery = e.currentTarget.value;
- debouncedSearch(e.currentTarget.value);
- }}
- onkeydown={(e) => {
- if (e.key === 'Enter') {
- performSearch((e.currentTarget as HTMLInputElement).value, true);
- }
- }}
- class="bg-background/50 border-input ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 pl-10 text-sm backdrop-blur-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
- />
- {#if showSearchResults}
- <Button variant="ghost" size="sm" onclick={clearSearch} class="absolute top-1/2 right-2 size-6 -translate-y-1/2 p-0">
- ×
- </Button>
- {/if}
+ <InputGroup.Root>
+ <InputGroup.Input
+ placeholder={m.customize_search_placeholder()}
+ value={searchQuery}
+ oninput={(e) => {
+ searchQuery = e.currentTarget.value;
+ debouncedSearch(e.currentTarget.value);
+ }}
+ onkeydown={(e) => {
+ if (e.key === 'Enter') {
+ performSearch((e.currentTarget as HTMLInputElement).value, true);
+ }
+ }}
+ />
+ <InputGroup.Addon>
+ {#if showSearchResults}
+ <Button variant="ghost" size="icon" onclick={clearSearch} class="size-6 p-0">×</Button>
+ {:else}
+ <SearchIcon class="size-4" />
+ {/if}
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
</div>
</div>
@@ -163,9 +159,7 @@
<p class="text-muted-foreground mt-1 text-xs leading-relaxed sm:text-sm">{category.description}</p>
</div>
</div>
- <ChevronRightIcon
- class="text-muted-foreground group-hover:text-foreground mt-1 size-4 shrink-0 transition-colors"
- />
+ <ArrowRightIcon class="text-muted-foreground group-hover:text-foreground mt-1 size-4 shrink-0 transition-colors" />
</div>
</button>
</Card>
diff --git a/frontend/src/routes/(app)/customize/registries/+page.svelte b/frontend/src/routes/(app)/customize/registries/+page.svelte
index c14f8d581..f835617c4 100644
--- a/frontend/src/routes/(app)/customize/registries/+page.svelte
+++ b/frontend/src/routes/(app)/customize/registries/+page.svelte
@@ -1,6 +1,7 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import KeyIcon from '@lucide/svelte/icons/key';
+ import * as Dialog from '$lib/components/ui/dialog/index.js';
+ import { InfoIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
import type { ContainerRegistry } from '$lib/types/container-registry.type';
import type { ContainerRegistryCreateDto, ContainerRegistryUpdateDto } from '$lib/types/container-registry.type';
@@ -18,6 +19,7 @@
let registries = $state(untrack(() => data.registries));
let selectedIds = $state<string[]>([]);
let isRegistryDialogOpen = $state(false);
+ let isInfoDialogOpen = $state(false);
let registryToEdit = $state<ContainerRegistry | null>(null);
let requestOptions = $state(untrack(() => data.registryRequestOptions));
@@ -78,6 +80,12 @@
}
const actionButtons: ActionButton[] = [
+ {
+ id: 'info',
+ action: 'inspect',
+ label: m.registries_info_title(),
+ onclick: () => (isInfoDialogOpen = true)
+ },
{
id: 'create',
action: 'create',
@@ -97,71 +105,7 @@
<ResourcePageLayout title={m.registries_title()} subtitle={m.registries_subtitle()} {actionButtons}>
{#snippet mainContent()}
- <div class="space-y-6">
- <Card.Root class="flex flex-col gap-6 border py-3 shadow-sm">
- <Card.Header
- class="@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 pb-4 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6"
- >
- <div class="flex items-center gap-3">
- <div class="rounded-full bg-green-500/10 p-2">
- <KeyIcon class="size-5 text-green-500" />
- </div>
- <div>
- <Card.Title>{m.registries_credentials_title()}</Card.Title>
- <Card.Description>
- {m.registries_credentials_description()}
- </Card.Description>
- </div>
- </div>
- </Card.Header>
- <Card.Content class="px-6">
- <RegistryTable bind:registries bind:selectedIds bind:requestOptions onEditRegistry={openEditRegistryDialog} />
- </Card.Content>
- </Card.Root>
-
- <Card.Root class="flex flex-col gap-6 border py-3 shadow-sm">
- <Card.Header
- class="@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6"
- >
- <Card.Title class="text-lg">{m.registries_info_title()}</Card.Title>
- <Card.Description>{m.registries_info_description()}</Card.Description>
- </Card.Header>
- <Card.Content class="px-6">
- <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
- <div class="space-y-3">
- <h4 class="text-sm font-medium">{m.registries_popular_public_title()}</h4>
- <div class="space-y-2 text-sm">
- <div class="flex justify-between">
- <span class="text-muted-foreground">{m.registry_docker_hub()}</span>
- <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_docker_hub_url()}</code>
- </div>
- <div class="flex justify-between">
- <span class="text-muted-foreground">{m.registry_github_container_registry()}</span>
- <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_github_url()}</code>
- </div>
- <div class="flex justify-between">
- <span class="text-muted-foreground">{m.registry_google_container_registry()}</span>
- <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_google_url()}</code>
- </div>
- <div class="flex justify-between">
- <span class="text-muted-foreground">{m.registry_quay_io()}</span>
- <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_quay_url()}</code>
- </div>
- </div>
- </div>
- <div class="space-y-3">
- <h4 class="text-sm font-medium">{m.registries_auth_notes_title()}</h4>
- <div class="text-muted-foreground space-y-1 text-sm">
- <p>• {m.registries_auth_notes_bullet_docker_hub()}</p>
- <p>• {m.registries_auth_notes_bullet_github()}</p>
- <p>• {m.registries_auth_notes_bullet_anonymous()}</p>
- <p>• {m.registries_auth_notes_bullet_encrypted()}</p>
- </div>
- </div>
- </div>
- </Card.Content>
- </Card.Root>
- </div>
+ <RegistryTable bind:registries bind:selectedIds bind:requestOptions onEditRegistry={openEditRegistryDialog} />
{/snippet}
{#snippet additionalContent()}
@@ -171,5 +115,46 @@
onSubmit={handleRegistryDialogSubmit}
isLoading={isLoading.create || isLoading.edit}
/>
+
+ <Dialog.Root bind:open={isInfoDialogOpen}>
+ <Dialog.Content class="max-w-2xl">
+ <Dialog.Header>
+ <Dialog.Title>{m.registries_info_title()}</Dialog.Title>
+ <Dialog.Description>{m.registries_info_description()}</Dialog.Description>
+ </Dialog.Header>
+ <div class="grid grid-cols-1 gap-6 py-4 md:grid-cols-2">
+ <div class="space-y-3">
+ <h4 class="text-sm font-medium">{m.registries_popular_public_title()}</h4>
+ <div class="space-y-2 text-sm">
+ <div class="flex justify-between">
+ <span class="text-muted-foreground">{m.registry_docker_hub()}</span>
+ <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_docker_hub_url()}</code>
+ </div>
+ <div class="flex justify-between">
+ <span class="text-muted-foreground">{m.registry_github_container_registry()}</span>
+ <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_github_url()}</code>
+ </div>
+ <div class="flex justify-between">
+ <span class="text-muted-foreground">{m.registry_google_container_registry()}</span>
+ <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_google_url()}</code>
+ </div>
+ <div class="flex justify-between">
+ <span class="text-muted-foreground">{m.registry_quay_io()}</span>
+ <code class="bg-muted rounded px-2 py-1 text-xs">{m.registry_quay_url()}</code>
+ </div>
+ </div>
+ </div>
+ <div class="space-y-3">
+ <h4 class="text-sm font-medium">{m.registries_auth_notes_title()}</h4>
+ <div class="text-muted-foreground space-y-1 text-sm">
+ <p>• {m.registries_auth_notes_bullet_docker_hub()}</p>
+ <p>• {m.registries_auth_notes_bullet_github()}</p>
+ <p>• {m.registries_auth_notes_bullet_anonymous()}</p>
+ <p>• {m.registries_auth_notes_bullet_encrypted()}</p>
+ </div>
+ </div>
+ </div>
+ </Dialog.Content>
+ </Dialog.Root>
{/snippet}
</ResourcePageLayout>
diff --git a/frontend/src/routes/(app)/customize/registries/registry-table.svelte b/frontend/src/routes/(app)/customize/registries/registry-table.svelte
index 51e94a92c..783dc87ac 100644
--- a/frontend/src/routes/(app)/customize/registries/registry-table.svelte
+++ b/frontend/src/routes/(app)/customize/registries/registry-table.svelte
@@ -2,25 +2,20 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { Button } from '$lib/components/ui/button/index.js';
+ import { Spinner } from '$lib/components/ui/spinner/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import PencilIcon from '@lucide/svelte/icons/pencil';
- import TestTubeIcon from '@lucide/svelte/icons/test-tube';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { toast } from 'svelte-sonner';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { ContainerRegistry } from '$lib/types/container-registry.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
- import PackageIcon from '@lucide/svelte/icons/package';
- import UserIcon from '@lucide/svelte/icons/user';
- import LinkIcon from '@lucide/svelte/icons/link';
import { format } from 'date-fns';
import { m } from '$lib/paraglide/messages';
import { containerRegistryService } from '$lib/services/container-registry-service';
+ import { RegistryIcon, UserIcon, ExternalLinkIcon, EllipsisIcon, EditIcon, TrashIcon, TestIcon } from '$lib/icons';
let {
registries = $bindable(),
@@ -34,10 +29,8 @@
onEditRegistry: (registry: ContainerRegistry) => void;
} = $props();
- let isLoading = $state({
- removing: false,
- testing: false
- });
+ let removingId = $state<string | null>(null);
+ let testingId = $state<string | null>(null);
function getRegistryDisplayName(url: string) {
if (!url || url === 'docker.io') return m.registry_docker_hub();
@@ -57,11 +50,10 @@
label: m.common_remove(),
destructive: true,
action: async () => {
- isLoading.removing = true;
-
let successCount = 0;
let failureCount = 0;
for (const id of ids) {
+ removingId = id;
const reg = registries.data.find((r) => r.id === id);
const result = await tryCatch(containerRegistryService.deleteRegistry(id));
if (result.error) {
@@ -79,7 +71,7 @@
if (failureCount > 0) toast.error(m.registries_bulk_remove_failed({ count: failureCount }));
selectedIds = [];
- isLoading.removing = false;
+ removingId = null;
}
}
});
@@ -94,39 +86,38 @@
label: m.common_remove(),
destructive: true,
action: async () => {
- isLoading.removing = true;
+ removingId = id;
const result = await tryCatch(containerRegistryService.deleteRegistry(id));
handleApiResultWithCallbacks({
result,
message: m.registries_delete_failed({ url: safeUrl }),
- setLoadingState: () => {},
+ setLoadingState: (value) => (value ? null : (removingId = null)),
onSuccess: async () => {
toast.success(m.common_delete_success({ resource: `${m.resource_registry()} "${safeUrl}"` }));
registries = await containerRegistryService.getRegistries(requestOptions);
+ removingId = null;
}
});
-
- isLoading.removing = false;
}
}
});
}
async function handleTest(id: string, url: string) {
- isLoading.testing = true;
+ testingId = id;
const safeUrl = url ?? m.common_unknown();
const result = await tryCatch(containerRegistryService.testRegistry(id));
handleApiResultWithCallbacks({
result,
message: m.registries_test_failed({ url: safeUrl }),
- setLoadingState: () => {},
+ setLoadingState: (value) => (value ? null : (testingId = null)),
onSuccess: (resp) => {
const msg = (resp as any)?.message ?? m.common_unknown();
toast.success(m.registries_test_success({ url: safeUrl, message: msg }));
+ testingId = null;
}
});
- isLoading.testing = false;
}
const columns = [
@@ -197,17 +188,15 @@
{/snippet}
{#snippet RegistryMobileCardSnippet({
- row,
item,
mobileFieldVisibility
}: {
- row: any;
item: ContainerRegistry;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
- icon={{ component: PackageIcon, variant: 'purple' as const }}
+ icon={{ component: RegistryIcon, variant: 'purple' as const }}
title={(item) => item.url}
subtitle={(item) => ((mobileFieldVisibility.id ?? true) ? item.id : null)}
badges={[{ variant: 'purple' as const, text: m.common_registry() }]}
@@ -222,7 +211,7 @@
{
label: m.common_description(),
getValue: (item: ContainerRegistry) => item.description,
- icon: LinkIcon,
+ icon: ExternalLinkIcon,
iconVariant: 'gray' as const,
show: (mobileFieldVisibility.description ?? true) && item.description !== undefined
}
@@ -243,16 +232,29 @@
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
- <DropdownMenu.Item onclick={() => handleTest(item.id, item.url)} disabled={isLoading.testing}>
- <TestTubeIcon class="size-4" />
+ <DropdownMenu.Item onclick={() => handleTest(item.id, item.url)} disabled={testingId === item.id}>
+ {#if testingId === item.id}
+ <Spinner class="size-4" />
+ {:else}
+ <TestIcon class="size-4" />
+ {/if}
{m.registries_test_connection()}
</DropdownMenu.Item>
<DropdownMenu.Item onclick={() => onEditRegistry(item)}>
- <PencilIcon class="size-4" />
+ <EditIcon class="size-4" />
{m.common_edit()}
</DropdownMenu.Item>
- <DropdownMenu.Item variant="destructive" onclick={() => handleDeleteOne(item.id, item.url)} disabled={isLoading.removing}>
- <Trash2Icon class="size-4" />
+ <DropdownMenu.Separator />
+ <DropdownMenu.Item
+ variant="destructive"
+ onclick={() => handleDeleteOne(item.id, item.url)}
+ disabled={removingId === item.id}
+ >
+ {#if removingId === item.id}
+ <Spinner class="size-4" />
+ {:else}
+ <TrashIcon class="size-4" />
+ {/if}
{m.common_remove()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(app)/customize/templates/+page.svelte b/frontend/src/routes/(app)/customize/templates/+page.svelte
index 6221d8379..68a534d91 100644
--- a/frontend/src/routes/(app)/customize/templates/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/+page.svelte
@@ -1,8 +1,5 @@
<script lang="ts">
import { goto } from '$app/navigation';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import FolderOpenIcon from '@lucide/svelte/icons/folder-open';
- import LayersIcon from '@lucide/svelte/icons/layers';
import { toast } from 'svelte-sonner';
import AddTemplateRegistrySheet from '$lib/components/sheets/add-template-registry-sheet.svelte';
import { m } from '$lib/paraglide/messages';
@@ -15,6 +12,7 @@
import type { TemplateRegistry } from '$lib/types/template.type';
import { untrack } from 'svelte';
import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';
+ import { RegistryIcon, TemplateIcon, FolderOpenIcon } from '$lib/icons';
let { data } = $props();
@@ -27,12 +25,12 @@
{
value: 'browse',
label: m.templates_browse_templates(),
- icon: LayersIcon
+ icon: TemplateIcon
},
{
value: 'registries',
label: m.templates_manage_registries(),
- icon: GlobeIcon
+ icon: RegistryIcon
}
];
@@ -160,14 +158,14 @@
{
title: m.templates_remote_templates(),
value: remoteTemplatesCount,
- icon: GlobeIcon,
+ icon: RegistryIcon,
iconColor: 'text-green-500',
class: 'border-l-4 border-l-green-500'
},
{
title: m.templates_registries(),
value: registries.length,
- icon: LayersIcon,
+ icon: TemplateIcon,
iconColor: 'text-purple-500',
class: 'border-l-4 border-l-purple-500'
}
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
index c95f7c5e5..885337cc8 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
@@ -4,21 +4,26 @@
import { Badge } from '$lib/components/ui/badge';
import { Spinner } from '$lib/components/ui/spinner';
import CodeEditor from '$lib/components/code-editor/editor.svelte';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import FolderIcon from '@lucide/svelte/icons/folder';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
- import CodeIcon from '@lucide/svelte/icons/code';
- import BoxIcon from '@lucide/svelte/icons/box';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { goto, invalidateAll } from '$app/navigation';
import { m } from '$lib/paraglide/messages.js';
import { templateService } from '$lib/services/template-service';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { untrack } from 'svelte';
import { toast } from 'svelte-sonner';
+ import {
+ TrashIcon,
+ ArrowLeftIcon,
+ ProjectsIcon,
+ FileTextIcon,
+ CodeIcon,
+ TemplateIcon,
+ DownloadIcon,
+ GlobeIcon,
+ ContainersIcon,
+ BoxIcon,
+ VariableIcon,
+ MoveToFolderIcon
+ } from '$lib/icons';
let { data } = $props();
@@ -111,7 +116,7 @@
</Badge>
{:else}
<Badge variant="secondary" class="gap-1">
- <LayersIcon class="size-3" />
+ <TemplateIcon class="size-3" />
{m.templates_local()}
</Badge>
{/if}
@@ -123,7 +128,7 @@
</div>
<div class="flex flex-col gap-2 sm:flex-row">
<Button onclick={() => goto(`/projects/new?templateId=${template.id}`)} class="w-full gap-2 sm:w-auto">
- <FolderIcon class="size-4" />
+ <MoveToFolderIcon class="size-4" />
{m.compose_create_project()}
</Button>
@@ -143,7 +148,7 @@
onclick={() => goto(`/customize/templates/${localVersionOfRemote()?.id}`)}
class="w-full gap-2 sm:w-auto"
>
- <FolderIcon class="size-4" />
+ <ProjectsIcon class="size-4" />
{m.templates_view_local_version()}
</Button>
{/if}
@@ -154,7 +159,7 @@
<Spinner class="size-4" />
{m.common_action_deleting()}
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.templates_delete_template()}
{/if}
</Button>
@@ -166,7 +171,7 @@
<Card.Root variant="subtle">
<Card.Content class="flex items-center gap-4 p-4">
<div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-blue-500/10">
- <BoxIcon class="size-6 text-blue-500" />
+ <ContainersIcon class="size-6 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.compose_services()}</div>
@@ -180,7 +185,7 @@
<Card.Root variant="subtle">
<Card.Content class="flex items-center gap-4 p-4">
<div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-purple-500/10">
- <FileTextIcon class="size-6 text-purple-500" />
+ <VariableIcon class="size-6 text-purple-500" />
</div>
<div class="min-w-0 flex-1">
<div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">
@@ -217,7 +222,7 @@
<div class="flex min-w-0 flex-col gap-6 lg:col-span-1">
{#if services?.length}
<Card.Root class="min-w-0 flex-shrink-0">
- <Card.Header icon={BoxIcon}>
+ <Card.Header icon={ContainersIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>{m.services()}</h2>
@@ -242,7 +247,7 @@
{#if envVars?.length}
<Card.Root class="min-w-0 flex-shrink-0">
- <Card.Header icon={FileTextIcon}>
+ <Card.Header icon={VariableIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>{m.common_environment_variables()}</h2>
diff --git a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
index 9278a7d6c..c779f15f6 100644
--- a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
+++ b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
@@ -5,14 +5,9 @@
import * as Alert from '$lib/components/ui/alert';
import { Switch } from '$lib/components/ui/switch';
import { Snippet } from '$lib/components/ui/snippet';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import PlusIcon from '@lucide/svelte/icons/plus';
- import ExternalLinkIcon from '@lucide/svelte/icons/external-link';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import UsersIcon from '@lucide/svelte/icons/users';
import { m } from '$lib/paraglide/messages';
import type { TemplateRegistry } from '$lib/types/template.type';
+ import { TrashIcon, RegistryIcon, CommunityIcon, RefreshIcon, ExternalLinkIcon, AddIcon } from '$lib/icons';
let {
registries,
@@ -39,7 +34,7 @@
<p class="text-muted-foreground text-sm">{m.templates_registries_section_description()}</p>
</div>
<Button onclick={onAddRegistry}>
- <PlusIcon class="mr-2 size-4" />
+ <AddIcon class="size-4" />
{m.common_add_button({ resource: m.resource_registry_cap() })}
</Button>
</div>
@@ -47,13 +42,13 @@
{#if registries.length === 0}
<div class="space-y-4">
<Alert.Root>
- <GlobeIcon class="size-4" />
+ <RegistryIcon class="size-4" />
<Alert.Title>{m.templates_alert_remote_registries_title()}</Alert.Title>
<Alert.Description>{m.templates_alert_remote_registries_description()}</Alert.Description>
</Alert.Root>
<Alert.Root class="border-blue-200 bg-blue-50 dark:border-blue-800 dark:bg-blue-950">
- <UsersIcon class="size-4" />
+ <CommunityIcon class="size-4" />
<Alert.Title>{m.templates_community_registry_title()}</Alert.Title>
<Alert.Description class="space-y-2">
<p>{m.templates_community_registry_description()}</p>
@@ -98,9 +93,9 @@
disabled={isLoading.removing[registry.id]}
>
{#if isLoading.removing[registry.id]}
- <RefreshCwIcon class="size-4 animate-spin" />
+ <RefreshIcon class="size-4 animate-spin" />
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{/if}
</Button>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.svelte b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
index 8817987a1..d7e3bf209 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
@@ -10,13 +10,10 @@
import { templateService } from '$lib/services/template-service';
import { z } from 'zod/v4';
import { goto } from '$app/navigation';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import CodeIcon from '@lucide/svelte/icons/code';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
- import SaveIcon from '@lucide/svelte/icons/save';
import TemplateSelectionDialog from '$lib/components/dialogs/template-selection-dialog.svelte';
import { untrack } from 'svelte';
import type { Template } from '$lib/types/template.type';
+ import { ArrowLeftIcon, CodeIcon, VariableIcon, SaveIcon } from '$lib/icons';
let { data } = $props();
@@ -141,7 +138,7 @@
</Card.Root>
<Card.Root class="flex min-w-0 flex-col lg:col-span-2">
- <Card.Header icon={FileTextIcon} class="shrink-0">
+ <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>
diff --git a/frontend/src/routes/(app)/customize/templates/template-table.svelte b/frontend/src/routes/(app)/customize/templates/template-table.svelte
index ba16b7a21..066cee9c7 100644
--- a/frontend/src/routes/(app)/customize/templates/template-table.svelte
+++ b/frontend/src/routes/(app)/customize/templates/template-table.svelte
@@ -2,13 +2,6 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
import { Badge } from '$lib/components/ui/badge';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
- import FolderOpenIcon from '@lucide/svelte/icons/folder-open';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import PlusCircleIcon from '@lucide/svelte/icons/plus-circle';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import type { Table as TableType, Row } from '@tanstack/table-core';
@@ -22,13 +15,24 @@
import UniversalMobileCard from '$lib/components/arcane-table/cards/universal-mobile-card.svelte';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { Template } from '$lib/types/template.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { templateService } from '$lib/services/template-service';
- import TagIcon from '@lucide/svelte/icons/tag';
import { truncateString } from '$lib/utils/string.utils';
import DropdownCard from '$lib/components/dropdown-card.svelte';
import { DataTableViewOptions } from '$lib/components/arcane-table/index.js';
+ import {
+ EllipsisIcon,
+ InspectIcon,
+ FolderOpenIcon,
+ GlobeIcon,
+ TrashIcon,
+ DownloadIcon,
+ TagIcon,
+ MoveToFolderIcon
+ } from '$lib/icons';
+
+ type TemplateTable = TableType<Template>;
let {
templates = $bindable(),
@@ -40,10 +44,8 @@
requestOptions: SearchPaginationSortRequest;
} = $props();
- let isLoading = $state({
- deleting: false,
- downloading: false
- });
+ let deletingId = $state<string | null>(null);
+ let downloadingId = $state<string | null>(null);
async function handleDeleteTemplate(id: string, name: string) {
openConfirmDialog({
@@ -53,16 +55,17 @@
label: m.templates_delete_template(),
destructive: true,
action: async () => {
- isLoading.deleting = true;
+ deletingId = id;
const result = await tryCatch(templateService.deleteTemplate(id));
handleApiResultWithCallbacks({
result,
message: m.common_delete_failed({ resource: `${m.resource_template()} "${name}"` }),
- setLoadingState: (value) => (isLoading.deleting = value),
+ setLoadingState: (value) => (value ? null : (deletingId = null)),
onSuccess: async () => {
toast.success(m.common_delete_success({ resource: `${m.resource_template()} "${name}"` }));
templates = await templateService.getTemplates(requestOptions);
+ deletingId = null;
}
});
}
@@ -71,22 +74,21 @@
}
async function handleDownloadTemplate(id: string, name: string) {
- isLoading.downloading = true;
+ downloadingId = id;
const result = await tryCatch(templateService.download(id));
handleApiResultWithCallbacks({
result,
message: m.templates_download_failed(),
- setLoadingState: (value) => (isLoading.downloading = value),
+ setLoadingState: (value) => (value ? null : (downloadingId = null)),
onSuccess: async () => {
toast.success(m.templates_downloaded_success({ name }));
templates = await templateService.getTemplates(requestOptions);
+ downloadingId = null;
}
});
}
- const isAnyLoading = $derived(Object.values(isLoading).some((loading) => loading));
-
const columns = [
{
accessorKey: 'name',
@@ -121,14 +123,7 @@
let mobileFieldVisibility = $state<Record<string, boolean>>({});
let customSettings = $state<Record<string, unknown>>({});
-
- let groupByRegistry = $derived.by(() => {
- return (customSettings.groupByRegistry as boolean) ?? false;
- });
-
- function setGroupByRegistry(value: boolean) {
- customSettings = { ...customSettings, groupByRegistry: value };
- }
+ let groupByRegistry = $derived((customSettings.groupByRegistry as boolean) ?? false);
function getRegistryName(template: Template): string {
if (template.registry?.name) {
@@ -144,26 +139,25 @@
if (!groupByRegistry) return null;
const groups = new Map<string, Template[]>();
+ const localName = m.templates_local_templates();
+ const unknownName = m.templates_unknown_registry();
for (const template of templates.data ?? []) {
const registryName = getRegistryName(template);
+ const group = groups.get(registryName) ?? [];
+ group.push(template);
if (!groups.has(registryName)) {
- groups.set(registryName, []);
- }
- const group = groups.get(registryName);
- if (group) {
- group.push(template);
+ groups.set(registryName, group);
}
}
- const sortedGroups = Array.from(groups.entries()).sort(([a], [b]) => {
- if (a === m.templates_local_templates()) return -1;
- if (b === m.templates_local_templates()) return 1;
- if (a === m.templates_unknown_registry()) return 1;
- if (b === m.templates_unknown_registry()) return -1;
+
+ return Array.from(groups.entries()).sort(([a], [b]) => {
+ if (a === localName) return -1;
+ if (b === localName) return 1;
+ if (a === unknownName) return 1;
+ if (b === unknownName) return -1;
return a.localeCompare(b);
});
-
- return sortedGroups;
});
</script>
@@ -207,13 +201,11 @@
{/snippet}
{#snippet TemplateMobileCardSnippet({
- row,
item,
mobileFieldVisibility
}: {
- row: Row<Template>;
item: Template;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
@@ -273,22 +265,19 @@
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
- <DropdownMenu.Item onclick={() => goto(`/customize/templates/${item.id}`)} disabled={isAnyLoading}>
- <ScanSearchIcon class="size-4" />
+ <DropdownMenu.Item onclick={() => goto(`/customize/templates/${item.id}`)}>
+ <InspectIcon class="size-4" />
{m.common_view_details()}
</DropdownMenu.Item>
- <DropdownMenu.Item onclick={() => goto(`/projects/new?templateId=${item.id}`)} disabled={isAnyLoading}>
- <PlusCircleIcon class="size-4" />
+ <DropdownMenu.Item onclick={() => goto(`/projects/new?templateId=${item.id}`)}>
+ <MoveToFolderIcon class="size-4" />
{m.compose_create_project()}
</DropdownMenu.Item>
{#if item.isRemote}
- <DropdownMenu.Item
- onclick={() => handleDownloadTemplate(item.id, item.name)}
- disabled={isLoading.downloading || isAnyLoading}
- >
- {#if isLoading.downloading}
+ <DropdownMenu.Item onclick={() => handleDownloadTemplate(item.id, item.name)} disabled={downloadingId === item.id}>
+ {#if downloadingId === item.id}
<Spinner class="size-4" />
{:else}
<DownloadIcon class="size-4" />
@@ -300,12 +289,12 @@
<DropdownMenu.Item
variant="destructive"
onclick={() => handleDeleteTemplate(item.id, item.name)}
- disabled={isLoading.deleting || isAnyLoading}
+ disabled={deletingId === item.id}
>
- {#if isLoading.deleting}
+ {#if deletingId === item.id}
<Spinner class="size-4" />
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{/if}
{m.templates_delete_template()}
</DropdownMenu.Item>
@@ -333,12 +322,14 @@
/>
{#snippet CustomViewOptions()}
- <DropdownMenu.CheckboxItem bind:checked={() => groupByRegistry, (v) => setGroupByRegistry(!!v)}>
+ <DropdownMenu.CheckboxItem
+ bind:checked={() => groupByRegistry, (v) => (customSettings = { ...customSettings, groupByRegistry: !!v })}
+ >
{m.templates_group_by_registry()}
</DropdownMenu.CheckboxItem>
{/snippet}
-{#snippet GroupedTableView({ table }: { table: TableType<Template> })}
+{#snippet GroupedTableView({ table }: { table: TemplateTable })}
<div class="mb-4 flex items-center justify-end border-b px-6 py-4">
<DataTableViewOptions {table} customViewOptions={CustomViewOptions} />
</div>
@@ -392,7 +383,7 @@
<div class="space-y-3 md:hidden">
{#each registryRows as row (row.id)}
- {@render TemplateMobileCardSnippet({ row, item: row.original as Template, mobileFieldVisibility })}
+ {@render TemplateMobileCardSnippet({ item: row.original as Template, mobileFieldVisibility })}
{:else}
<div class="flex h-24 items-center justify-center text-center text-muted-foreground">
{m.common_no_results_found()}
diff --git a/frontend/src/routes/(app)/customize/variables/+page.svelte b/frontend/src/routes/(app)/customize/variables/+page.svelte
index e56f5a5c3..f85591e63 100644
--- a/frontend/src/routes/(app)/customize/variables/+page.svelte
+++ b/frontend/src/routes/(app)/customize/variables/+page.svelte
@@ -3,19 +3,14 @@
import { Button } from '$lib/components/ui/button';
import { Input } from '$lib/components/ui/input';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
- import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import { toast } from 'svelte-sonner';
- import PlusIcon from '@lucide/svelte/icons/plus';
- import XIcon from '@lucide/svelte/icons/x';
- import SearchIcon from '@lucide/svelte/icons/search';
- import KeyIcon from '@lucide/svelte/icons/key';
- import AlertCircleIcon from '@lucide/svelte/icons/alert-circle';
- import CopyIcon from '@lucide/svelte/icons/copy';
+ import { CopyButton } from '$lib/components/ui/copy-button';
import { ResourcePageLayout, type ActionButton } from '$lib/layouts/index.js';
import { templateService } from '$lib/services/template-service.js';
import type { Variable } from '$lib/types/variable.type';
import { untrack } from 'svelte';
import { m } from '$lib/paraglide/messages';
+ import { AddIcon, SearchIcon, CloseIcon, AlertIcon, VariableIcon, CopyIcon } from '$lib/icons';
let { data } = $props();
let envVars = $state<Variable[]>(untrack(() => [...data.variables]));
@@ -164,7 +159,7 @@
<Card.Content class="px-3 py-4 sm:px-6">
<div class="flex items-start gap-3">
<div class="text-primary mt-0.5 shrink-0">
- <AlertCircleIcon class="size-5" />
+ <AlertIcon class="size-5" />
</div>
<div class="space-y-1 text-sm">
<p class="text-foreground font-medium">{m.variables_about_title()}</p>
@@ -181,7 +176,7 @@
<div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<div class="flex items-center gap-3">
<div class="bg-primary/10 text-primary ring-primary/20 flex size-8 items-center justify-center rounded-lg ring-1">
- <KeyIcon class="size-4" />
+ <VariableIcon class="size-4" />
</div>
<div>
<Card.Title class="text-base">{m.common_environment_variables()}</Card.Title>
@@ -201,7 +196,7 @@
<Input type="text" placeholder={m.common_search()} bind:value={searchQuery} class="h-9 pl-10" />
</div>
<Button type="button" size="sm" onclick={addEnvVar} disabled={isLoading} class="shrink-0">
- <PlusIcon class="mr-1.5 size-4" />
+ <AddIcon class="mr-1.5 size-4" />
{m.variables_add_button()}
</Button>
</div>
@@ -217,7 +212,7 @@
</div>
{:else if filteredVars.length === 0}
<div class="text-muted-foreground flex flex-col items-center justify-center py-12 text-center">
- <KeyIcon class="mb-3 size-12 opacity-20" />
+ <VariableIcon class="mb-3 size-12 opacity-20" />
<p class="text-sm font-medium">{m.variables_no_variables_title()}</p>
<p class="text-xs">{m.variables_no_variables_description()}</p>
</div>
@@ -261,49 +256,18 @@
onkeydown={(e) => handleKeyDown(e, actualIndex)}
/>
<InputGroup.Addon align="inline-end">
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- {#snippet child({ props })}
- <InputGroup.Button
- {...props}
- variant="ghost"
- aria-label={m.duplicate()}
- size="icon-xs"
- onclick={() => duplicateEnvVar(actualIndex)}
- disabled={isLoading}
- >
- <CopyIcon />
- </InputGroup.Button>
- {/snippet}
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p>{m.duplicate()}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
- <Tooltip.Provider>
- <Tooltip.Root>
- <Tooltip.Trigger>
- {#snippet child({ props })}
- <InputGroup.Button
- {...props}
- variant="ghost"
- aria-label={m.common_remove()}
- size="icon-xs"
- onclick={() => removeEnvVar(actualIndex)}
- disabled={isLoading}
- class="text-destructive hover:text-destructive"
- >
- <XIcon />
- </InputGroup.Button>
- {/snippet}
- </Tooltip.Trigger>
- <Tooltip.Content>
- <p>{m.common_remove()}</p>
- </Tooltip.Content>
- </Tooltip.Root>
- </Tooltip.Provider>
+ <CopyButton text={envVar.value} variant="ghost" tabindex={-1} />
+ <InputGroup.Button
+ variant="ghost"
+ aria-label={m.common_remove()}
+ size="icon-xs"
+ onclick={() => removeEnvVar(actualIndex)}
+ disabled={isLoading}
+ class="text-destructive hover:text-destructive"
+ title={m.common_remove()}
+ >
+ <CloseIcon />
+ </InputGroup.Button>
</InputGroup.Addon>
</InputGroup.Root>
</div>
diff --git a/frontend/src/routes/(app)/dashboard/+page.svelte b/frontend/src/routes/(app)/dashboard/+page.svelte
index f35640d22..259847588 100644
--- a/frontend/src/routes/(app)/dashboard/+page.svelte
+++ b/frontend/src/routes/(app)/dashboard/+page.svelte
@@ -1,6 +1,4 @@
<script lang="ts">
- import MemoryStickIcon from '@lucide/svelte/icons/memory-stick';
- import CpuIcon from '@lucide/svelte/icons/cpu';
import { toast } from 'svelte-sonner';
import PruneConfirmationDialog from '$lib/components/dialogs/prune-confirmation-dialog.svelte';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
@@ -23,6 +21,7 @@
import { systemService } from '$lib/services/system-service';
import { untrack } from 'svelte';
import bytes from 'bytes';
+ import { CpuIcon, MemoryStickIcon } from '$lib/icons';
let { data } = $props();
let containers = $state(untrack(() => data.containers));
diff --git a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
index 472114847..8c91d133b 100644
--- a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
@@ -2,10 +2,8 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
import * as Card from '$lib/components/ui/card/index.js';
- import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
- import BoxIcon from '@lucide/svelte/icons/box';
import { getStatusVariant } from '$lib/utils/status.utils';
import { capitalizeFirstLetter } from '$lib/utils/string.utils';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';
@@ -14,6 +12,7 @@
import { m } from '$lib/paraglide/messages';
import { containerService } from '$lib/services/container-service';
import { goto } from '$app/navigation';
+ import { ContainersIcon, ArrowRightIcon } from '$lib/icons';
let {
containers = $bindable(),
@@ -97,7 +96,7 @@
icon={(item) => {
const state = item.state;
return {
- component: BoxIcon,
+ component: ContainersIcon,
variant: state === 'running' ? 'emerald' : state === 'exited' ? 'red' : 'amber'
};
}}
@@ -127,7 +126,7 @@
<div class="flex h-full min-h-0 flex-col" bind:clientHeight={contentHeight}>
<Card.Root class="flex h-full min-h-0 flex-col">
- <Card.Header icon={BoxIcon} class="shrink-0">
+ <Card.Header icon={ContainersIcon} class="shrink-0">
<div class="flex flex-1 items-center justify-between">
<div class="flex flex-col space-y-1.5">
<Card.Title>
@@ -137,7 +136,7 @@
</div>
<Button variant="ghost" size="sm" href="/containers" disabled={isLoading}>
{m.common_view_all()}
- <ArrowRightIcon class="ml-2 size-4" />
+ <ArrowRightIcon class="size-4" />
</Button>
</div>
</Card.Header>
diff --git a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
index ba584649d..41c85b6ba 100644
--- a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
@@ -2,7 +2,6 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
import * as Card from '$lib/components/ui/card/index.js';
- import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';
import type { ImageSummaryDto } from '$lib/types/image.type';
@@ -12,7 +11,7 @@
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
import { goto } from '$app/navigation';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
+ import { ImagesIcon, ArrowRightIcon } from '$lib/icons';
let {
images = $bindable(),
@@ -114,7 +113,7 @@
<UniversalMobileCard
{item}
icon={(item: ImageSummaryDto) => ({
- component: HardDriveIcon,
+ component: ImagesIcon,
variant: item.inUse ? 'emerald' : 'amber'
})}
title={(item: ImageSummaryDto) => {
@@ -140,7 +139,7 @@
<div class="flex h-full min-h-0 flex-col" bind:clientHeight={contentHeight}>
<Card.Root class="flex h-full min-h-0 flex-col">
- <Card.Header icon={HardDriveIcon} class="shrink-0">
+ <Card.Header icon={ImagesIcon} class="shrink-0">
<div class="flex flex-1 items-center justify-between">
<div class="flex flex-col space-y-1.5">
<Card.Title>
@@ -150,7 +149,7 @@
</div>
<Button variant="ghost" size="sm" href="/images" disabled={isLoading}>
{m.common_view_all()}
- <ArrowRightIcon class="ml-2 size-4" />
+ <ArrowRightIcon class="size-4" />
</Button>
</div>
</Card.Header>
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index 99d536a2e..8cfac450f 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -3,16 +3,6 @@
import { Button } from '$lib/components/ui/button/index.js';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import MonitorIcon from '@lucide/svelte/icons/monitor';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import SaveIcon from '@lucide/svelte/icons/save';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import RotateCcwIcon from '@lucide/svelte/icons/rotate-ccw';
- import AlertTriangleIcon from '@lucide/svelte/icons/alert-triangle';
import { goto, invalidateAll } from '$app/navigation';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { toast } from 'svelte-sonner';
@@ -23,7 +13,19 @@
import { m } from '$lib/paraglide/messages';
import { environmentManagementService } from '$lib/services/env-mgmt-service.js';
import { environmentStore } from '$lib/stores/environment.store.svelte';
- import Spinner from '$lib/components/ui/spinner/spinner.svelte';
+ import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import {
+ ArrowLeftIcon,
+ RefreshIcon,
+ SettingsIcon,
+ ConnectionIcon,
+ SaveIcon,
+ EnvironmentsIcon,
+ AlertIcon,
+ TestIcon,
+ RegistryIcon,
+ ResetIcon
+ } from '$lib/icons';
let { data } = $props();
let { environment, settings } = $derived(data);
@@ -216,7 +218,7 @@
{#if hasChanges}
<Button variant="outline" size="sm" onclick={handleReset} disabled={isSaving}>
- <RotateCcwIcon class="mr-2 size-4" />
+ <ResetIcon class="mr-2 size-4" />
{m.common_reset()}
</Button>
{/if}
@@ -234,9 +236,9 @@
{#if environment.id !== '0'}
<Button variant="outline" onclick={syncRegistries} disabled={isSyncingRegistries}>
{#if isSyncingRegistries}
- <Spinner />
+ <Spinner class="size-4" />
{:else}
- <DatabaseIcon class="mr-2 size-4" />
+ <RegistryIcon class="size-4" />
{/if}
{m.sync_registries()}
</Button>
@@ -244,9 +246,9 @@
<Button variant="outline" onclick={refreshEnvironment} disabled={isRefreshing}>
{#if isRefreshing}
- <RefreshCwIcon class="mr-2 size-4 animate-spin" />
+ <Spinner class="size-4" />
{:else}
- <RefreshCwIcon class="mr-2 size-4" />
+ <RefreshIcon class="size-4" />
{/if}
{m.common_refresh()}
</Button>
@@ -270,7 +272,7 @@
<div
class="flex items-start gap-3 rounded-lg border border-amber-500/30 bg-amber-500/10 p-4 text-amber-900 dark:text-amber-200"
>
- <AlertTriangleIcon class="mt-0.5 size-5 shrink-0 text-amber-600 dark:text-amber-400" />
+ <AlertIcon class="mt-0.5 size-5 shrink-0 text-amber-600 dark:text-amber-400" />
<div class="flex-1 space-y-1">
<p class="text-sm font-medium">
{#if !environment.enabled}
@@ -288,7 +290,7 @@
<div class="grid gap-6 gap-x-6 gap-y-6 lg:grid-cols-2">
<Card.Root class="flex flex-col">
- <Card.Header icon={MonitorIcon}>
+ <Card.Header icon={EnvironmentsIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>{m.environments_overview_title()}</h2>
@@ -397,7 +399,7 @@
{/if}
<Card.Root class="flex flex-col">
- <Card.Header icon={GlobeIcon}>
+ <Card.Header icon={ConnectionIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>{m.environments_connection_title()}</h2>
@@ -442,10 +444,10 @@
<Button onclick={testConnection} disabled={isTestingConnection} class="w-full">
{#if isTestingConnection}
- <RefreshCwIcon class="mr-2 size-4 animate-spin" />
+ <Spinner />
{m.environments_testing_connection()}
{:else}
- <TerminalIcon class="mr-2 size-4" />
+ <TestIcon class="mr-2 size-4" />
{m.environments_test_connection()}
{/if}
</Button>
@@ -476,9 +478,9 @@
<div class="flex gap-2">
<Button onclick={pairOrRotate} disabled={isPairing || !bootstrapToken} class="flex-1">
{#if isPairing}
- <RefreshCwIcon class="mr-2 size-4 animate-spin" />
+ <Spinner class="size-4" />
{:else}
- <SettingsIcon class="mr-2 size-4" />
+ <SettingsIcon class="size-4" />
{/if}
{m.environments_pair_rotate_action()}
</Button>
diff --git a/frontend/src/routes/(app)/environments/environment-table.svelte b/frontend/src/routes/(app)/environments/environment-table.svelte
index 4c56245b5..f27aa2329 100644
--- a/frontend/src/routes/(app)/environments/environment-table.svelte
+++ b/frontend/src/routes/(app)/environments/environment-table.svelte
@@ -2,30 +2,34 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import EyeIcon from '@lucide/svelte/icons/eye';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import MonitorIcon from '@lucide/svelte/icons/monitor';
- import DownloadIcon from '@lucide/svelte/icons/download';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { goto } from '$app/navigation';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
import { toast } from 'svelte-sonner';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import type { Environment } from '$lib/types/environment.type';
import { m } from '$lib/paraglide/messages';
import { environmentManagementService } from '$lib/services/env-mgmt-service';
- import CloudIcon from '@lucide/svelte/icons/cloud';
- import PowerIcon from '@lucide/svelte/icons/power';
import environmentUpgradeService from '$lib/services/api/environment-upgrade-service';
import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';
import { environmentStore } from '$lib/stores/environment.store.svelte';
import { capitalizeFirstLetter } from '$lib/utils/string.utils';
+ import {
+ EllipsisIcon,
+ EyeOnIcon,
+ TrashIcon,
+ EnvironmentsIcon,
+ InspectIcon,
+ UpdateIcon,
+ StatsIcon,
+ EyeOffIcon,
+ TestIcon
+ } from '$lib/icons';
let {
environments = $bindable(),
@@ -230,7 +234,7 @@
<div class="flex items-center gap-3">
<div class="relative">
<div class="bg-muted flex size-8 items-center justify-center rounded-lg">
- <MonitorIcon class="text-muted-foreground size-4" />
+ <EnvironmentsIcon class="text-muted-foreground size-4" />
</div>
<div
class="border-background absolute -top-1 -right-1 size-3 rounded-full border-2 {item.status === 'online'
@@ -238,6 +242,11 @@
: 'bg-red-500'}"
></div>
</div>
+ {#if environmentStore.selected?.id === item.id}
+ <Badge variant="default" class="border-blue-500/20 bg-blue-500/10 text-blue-600">
+ {m.common_current()}
+ </Badge>
+ {/if}
<div class="flex flex-col gap-0.5 leading-tight">
<button
class="text-foreground-primary h-auto min-h-0 cursor-pointer p-0 text-left text-sm leading-tight font-medium hover:underline"
@@ -245,7 +254,7 @@
>
{item.name}
</button>
- <div class="text-muted-foreground font-mono text-xs leading-tight">{item.apiUrl}</div>
+ <span class="text-muted-foreground font-mono text-xs leading-tight">{item.apiUrl}</span>
</div>
</div>
{/snippet}
@@ -263,25 +272,26 @@
{/snippet}
{#snippet EnvironmentMobileCardSnippet({
- row,
item,
mobileFieldVisibility
}: {
- row: any;
item: Environment;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
- icon={{ component: CloudIcon, variant: 'emerald' }}
+ icon={{ component: StatsIcon, variant: 'emerald' }}
title={(item: Environment) => item.name || item.id}
subtitle={(item: Environment) => ((mobileFieldVisibility.id ?? true) ? item.id : null)}
- badges={[{ variant: 'green', text: m.sidebar_environment_label() }]}
+ badges={[
+ { variant: 'green', text: m.sidebar_environment_label() },
+ ...(environmentStore.selected?.id === item.id ? [{ variant: 'blue' as const, text: m.common_current() }] : [])
+ ]}
fields={[
{
label: m.environments_api_url(),
getValue: (item: Environment) => item.apiUrl,
- icon: CloudIcon,
+ icon: StatsIcon,
iconVariant: 'gray' as const,
show: (mobileFieldVisibility.apiUrl ?? true) && !!item.apiUrl
}
@@ -318,16 +328,16 @@
}}
disabled={!item.enabled || environmentStore.selected?.id === item.id}
>
- <MonitorIcon class="size-4" />
+ <EnvironmentsIcon class="size-4" />
{environmentStore.selected?.id === item.id ? m.environments_current_environment() : m.environments_use_environment()}
</DropdownMenu.Item>
<DropdownMenu.Separator />
<DropdownMenu.Item onclick={() => goto(`/environments/${item.id}`)}>
- <EyeIcon class="size-4" />
+ <InspectIcon class="size-4" />
{m.common_view_details()}
</DropdownMenu.Item>
<DropdownMenu.Item onclick={() => handleTest(item.id)} disabled={isLoading.testing}>
- <TerminalIcon class="size-4" />
+ <TestIcon class="size-4" />
{m.environments_test_connection()}
</DropdownMenu.Item>
{#if item.id !== '0'}
@@ -337,13 +347,18 @@
onclick={() => handleUpgradeClick(item)}
disabled={isLoading.upgrading || upgradingEnvironmentId === item.id}
>
- <DownloadIcon class="size-4" />
+ <UpdateIcon class="size-4" />
{upgradingEnvironmentId === item.id ? m.upgrade_in_progress() : m.upgrade_to_version({ version: 'Latest' })}
</DropdownMenu.Item>
{/if}
<DropdownMenu.Item onclick={() => handleToggleEnabled(item)} disabled={isLoading.toggling}>
- <PowerIcon class="size-4" />
- {item.enabled ? m.common_disable() : m.common_enable()}
+ {#if item.enabled}
+ <EyeOffIcon class="size-4" />
+ {m.common_disable()}
+ {:else}
+ <EyeOnIcon class="size-4" />
+ {m.common_disable()}
+ {/if}
</DropdownMenu.Item>
<DropdownMenu.Separator />
<DropdownMenu.Item
@@ -351,7 +366,7 @@
onclick={() => handleDeleteOne(item.id, item.name)}
disabled={isLoading.removing}
>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
{/if}
diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelte
index 3cb28ad73..9878455b7 100644
--- a/frontend/src/routes/(app)/events/+page.svelte
+++ b/frontend/src/routes/(app)/events/+page.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import ActivityIcon from '@lucide/svelte/icons/activity';
import { toast } from 'svelte-sonner';
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
@@ -11,6 +10,7 @@
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
import { simpleRefresh } from '$lib/utils/refresh.util';
+ import { EventsIcon } from '$lib/icons';
let { data } = $props();
@@ -54,7 +54,9 @@
result,
message: m.events_delete_item_failed({ id: eventId }),
setLoadingState: () => {},
- onSuccess: () => { successCount++; }
+ onSuccess: () => {
+ successCount++;
+ }
});
if (result.error) failureCount++;
}
@@ -75,21 +77,82 @@
const actionButtons: ActionButton[] = $derived([
...(selectedIds.length > 0
- ? [{ id: 'remove-selected', action: 'remove' as const, label: m.events_remove_selected(), onclick: handleDeleteSelected, loading: isLoading.deleting, disabled: isLoading.deleting }]
+ ? [
+ {
+ id: 'remove-selected',
+ action: 'remove' as const,
+ label: m.events_remove_selected(),
+ onclick: handleDeleteSelected,
+ loading: isLoading.deleting,
+ disabled: isLoading.deleting
+ }
+ ]
: []),
- { id: 'refresh', action: 'restart' as const, label: m.common_refresh(), onclick: refresh, loading: isLoading.refreshing, disabled: isLoading.refreshing }
+ {
+ id: 'refresh',
+ action: 'restart' as const,
+ label: m.common_refresh(),
+ onclick: refresh,
+ loading: isLoading.refreshing,
+ disabled: isLoading.refreshing
+ }
]);
const statCards: StatCardConfig[] = $derived([
- { title: m.events_total(), value: totalEvents, subtitle: m.events_total_subtitle(), icon: ActivityIcon, class: 'border-l-4 border-l-primary' },
- { title: m.events_info(), value: infoEvents, subtitle: m.events_info_subtitle(), icon: ActivityIcon, iconColor: 'text-blue-500', bgColor: 'bg-blue-500/10', class: 'border-l-4 border-l-blue-500' },
- { title: m.events_success(), value: successEvents, subtitle: m.events_success_subtitle(), icon: ActivityIcon, iconColor: 'text-green-500', bgColor: 'bg-green-500/10', class: 'border-l-4 border-l-green-500' },
- { title: m.events_warning(), value: warningEvents, subtitle: m.events_warning_subtitle(), icon: ActivityIcon, iconColor: 'text-yellow-500', bgColor: 'bg-yellow-500/10', class: 'border-l-4 border-l-yellow-500' },
- { title: m.events_error(), value: errorEvents, subtitle: m.events_error_subtitle(), icon: ActivityIcon, iconColor: 'text-red-500', bgColor: 'bg-red-500/10', class: 'border-l-4 border-l-red-500' }
+ {
+ title: m.events_total(),
+ value: totalEvents,
+ subtitle: m.events_total_subtitle(),
+ icon: EventsIcon,
+ class: 'border-l-4 border-l-primary'
+ },
+ {
+ title: m.events_info(),
+ value: infoEvents,
+ subtitle: m.events_info_subtitle(),
+ icon: EventsIcon,
+ iconColor: 'text-blue-500',
+ bgColor: 'bg-blue-500/10',
+ class: 'border-l-4 border-l-blue-500'
+ },
+ {
+ title: m.events_success(),
+ value: successEvents,
+ subtitle: m.events_success_subtitle(),
+ icon: EventsIcon,
+ iconColor: 'text-green-500',
+ bgColor: 'bg-green-500/10',
+ class: 'border-l-4 border-l-green-500'
+ },
+ {
+ title: m.events_warning(),
+ value: warningEvents,
+ subtitle: m.events_warning_subtitle(),
+ icon: EventsIcon,
+ iconColor: 'text-yellow-500',
+ bgColor: 'bg-yellow-500/10',
+ class: 'border-l-4 border-l-yellow-500'
+ },
+ {
+ title: m.events_error(),
+ value: errorEvents,
+ subtitle: m.events_error_subtitle(),
+ icon: EventsIcon,
+ iconColor: 'text-red-500',
+ bgColor: 'bg-red-500/10',
+ class: 'border-l-4 border-l-red-500'
+ }
]);
</script>
-<ResourcePageLayout title={m.events_title()} subtitle={m.events_subtitle()} {actionButtons} {statCards} statCardsColumns={5} containerClass="flex h-full flex-col space-y-6">
+<ResourcePageLayout
+ title={m.events_title()}
+ subtitle={m.events_subtitle()}
+ {actionButtons}
+ {statCards}
+ statCardsColumns={5}
+ containerClass="flex h-full flex-col space-y-6"
+>
{#snippet mainContent()}
<div class="flex-1 overflow-hidden">
<EventTable bind:events bind:selectedIds bind:requestOptions />
diff --git a/frontend/src/routes/(app)/events/event-table.svelte b/frontend/src/routes/(app)/events/event-table.svelte
index 50122a5a4..898f6ebc4 100644
--- a/frontend/src/routes/(app)/events/event-table.svelte
+++ b/frontend/src/routes/(app)/events/event-table.svelte
@@ -2,8 +2,6 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
@@ -13,16 +11,12 @@
import { formatDistanceToNow } from 'date-fns';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { Event } from '$lib/types/event.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import EventDetailsDialog from '$lib/components/dialogs/event-details-dialog.svelte';
- import InfoIcon from '@lucide/svelte/icons/info';
import { m } from '$lib/paraglide/messages';
import { eventService } from '$lib/services/event-service';
- import BellIcon from '@lucide/svelte/icons/bell';
- import TagIcon from '@lucide/svelte/icons/tag';
- import ServerIcon from '@lucide/svelte/icons/server';
- import UserIcon from '@lucide/svelte/icons/user';
+ import { EllipsisIcon, TrashIcon, InfoIcon, NotificationsIcon, TagIcon, EnvironmentsIcon, UserIcon } from '$lib/icons';
let {
events = $bindable(),
@@ -170,19 +164,11 @@
<span class="text-sm">{formatTimestamp(String(value ?? new Date().toISOString()))}</span>
{/snippet}
-{#snippet EventMobileCardSnippet({
- row,
- item,
- mobileFieldVisibility
-}: {
- row: any;
- item: Event;
- mobileFieldVisibility: Record<string, boolean>;
-})}
+{#snippet EventMobileCardSnippet({ item, mobileFieldVisibility }: { item: Event; mobileFieldVisibility: MobileFieldVisibility })}
<UniversalMobileCard
{item}
icon={(item: Event) => ({
- component: BellIcon,
+ component: NotificationsIcon,
variant: getIconVariant(item.severity)
})}
title={(item: Event) => item.title}
@@ -212,7 +198,7 @@
if (item.resourceName) parts.push(item.resourceName);
return parts.join(' - ');
},
- icon: ServerIcon,
+ icon: EnvironmentsIcon,
iconVariant: 'gray' as const,
show: (mobileFieldVisibility.resource ?? true) && (!!item.resourceType || !!item.resourceName)
},
@@ -249,7 +235,7 @@
onclick={() => handleDeleteEvent(item.id, item.title)}
disabled={isLoading.removing}
>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(app)/images/+page.svelte b/frontend/src/routes/(app)/images/+page.svelte
index 6d030ac04..94cf479e0 100644
--- a/frontend/src/routes/(app)/images/+page.svelte
+++ b/frontend/src/routes/(app)/images/+page.svelte
@@ -1,9 +1,6 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import PackageIcon from '@lucide/svelte/icons/package';
- import XIcon from '@lucide/svelte/icons/x';
import { toast } from 'svelte-sonner';
import ImagePullSheet from '$lib/components/sheets/image-pull-sheet.svelte';
import bytes from 'bytes';
@@ -18,6 +15,7 @@
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
import { useEnvironmentRefresh } from '$lib/hooks/use-environment-refresh.svelte';
import { parallelRefresh } from '$lib/utils/refresh.util';
+ import { CloseIcon, VolumesIcon, LocalFolderComputerIcon } from '$lib/icons';
let { data } = $props();
@@ -87,8 +85,12 @@
handleApiResultWithCallbacks({
result: await tryCatch(imageService.uploadImage(file)),
message: m.images_upload_failed(),
- setLoadingState: (v) => { isLoading.uploading = v; },
- onSuccess: () => { toast.success(m.images_upload_success()); }
+ setLoadingState: (v) => {
+ isLoading.uploading = v;
+ },
+ onSuccess: () => {
+ toast.success(m.images_upload_success());
+ }
});
}
images = await imageService.getImages(requestOptions);
@@ -122,7 +124,14 @@
loading: isLoading.checking,
disabled: isLoading.checking
},
- { id: 'refresh', action: 'restart', label: m.common_refresh(), onclick: refresh, loading: isLoading.refreshing, disabled: isLoading.refreshing },
+ {
+ id: 'refresh',
+ action: 'restart',
+ label: m.common_refresh(),
+ onclick: refresh,
+ loading: isLoading.refreshing,
+ disabled: isLoading.refreshing
+ },
{
id: 'prune',
action: 'remove',
@@ -135,18 +144,42 @@
]);
const statCards: StatCardConfig[] = $derived([
- { title: m.images_total(), value: imageUsageCounts.totalImages, icon: HardDriveIcon, iconColor: 'text-blue-500', class: 'border-l-4 border-l-blue-500' },
- { title: m.images_total_size(), value: String(bytes.format(imageUsageCounts.totalImageSize)), icon: PackageIcon, iconColor: 'text-amber-500', class: 'border-l-4 border-l-amber-500' }
+ {
+ title: m.images_total(),
+ value: imageUsageCounts.totalImages,
+ icon: VolumesIcon,
+ iconColor: 'text-blue-500',
+ class: 'border-l-4 border-l-blue-500'
+ },
+ {
+ title: m.images_total_size(),
+ value: String(bytes.format(imageUsageCounts.totalImageSize)),
+ icon: LocalFolderComputerIcon,
+ iconColor: 'text-amber-500',
+ class: 'border-l-4 border-l-amber-500'
+ }
]);
</script>
<ResourcePageLayout title={m.images_title()} subtitle={m.images_subtitle()} {actionButtons} {statCards} statCardsColumns={2}>
{#snippet mainContent()}
- <ImageTable bind:images bind:selectedIds bind:requestOptions onImageUpdated={async () => { images = await imageService.getImages(requestOptions); }} />
+ <ImageTable
+ bind:images
+ bind:selectedIds
+ bind:requestOptions
+ onImageUpdated={async () => {
+ images = await imageService.getImages(requestOptions);
+ }}
+ />
{/snippet}
{#snippet additionalContent()}
- <ImagePullSheet bind:open={isPullDialogOpen} onPullFinished={async () => { images = await imageService.getImages(requestOptions); }} />
+ <ImagePullSheet
+ bind:open={isPullDialogOpen}
+ onPullFinished={async () => {
+ images = await imageService.getImages(requestOptions);
+ }}
+ />
<Dialog.Root bind:open={isUploadDialogOpen}>
<Dialog.Content class="max-w-2xl">
@@ -155,7 +188,15 @@
<Dialog.Description>{m.images_upload_description()}</Dialog.Description>
</Dialog.Header>
<div class="space-y-4 py-4">
- <FileDropZone {onUpload} {onFileRejected} maxFileSize={maxUploadSizeMB * MEGABYTE} accept=".tar,.tar.gz,.tgz,.tar.xz" maxFiles={10} fileCount={uploadedFiles.length} disabled={isLoading.uploading} />
+ <FileDropZone
+ {onUpload}
+ {onFileRejected}
+ maxFileSize={maxUploadSizeMB * MEGABYTE}
+ accept=".tar,.tar.gz,.tgz,.tar.xz"
+ maxFiles={10}
+ fileCount={uploadedFiles.length}
+ disabled={isLoading.uploading}
+ />
{#if uploadedFiles.length > 0}
<div class="flex flex-col gap-2">
{#each uploadedFiles as file, i (file.name)}
@@ -164,19 +205,33 @@
<span class="text-sm font-medium">{file.name}</span>
<span class="text-muted-foreground text-xs">{displaySize(file.size)}</span>
</div>
- <Button variant="ghost" size="icon" onclick={() => (uploadedFiles = [...uploadedFiles.slice(0, i), ...uploadedFiles.slice(i + 1)])} disabled={isLoading.uploading}>
- <XIcon class="size-4" />
+ <Button
+ variant="ghost"
+ size="icon"
+ onclick={() => (uploadedFiles = [...uploadedFiles.slice(0, i), ...uploadedFiles.slice(i + 1)])}
+ disabled={isLoading.uploading}
+ >
+ <CloseIcon class="size-4" />
</Button>
</div>
{/each}
</div>
{/if}
{#if isLoading.uploading}
- <div class="text-muted-foreground flex items-center gap-2 text-sm"><Spinner class="size-4" />{m.images_uploading()}</div>
+ <div class="text-muted-foreground flex items-center gap-2 text-sm">
+ <Spinner class="size-4" />{m.images_uploading()}
+ </div>
{/if}
</div>
<div class="flex justify-end gap-3">
- <Button variant="outline" onclick={() => { isUploadDialogOpen = false; uploadedFiles = []; }} disabled={isLoading.uploading}>{m.common_cancel()}</Button>
+ <Button
+ variant="outline"
+ onclick={() => {
+ isUploadDialogOpen = false;
+ uploadedFiles = [];
+ }}
+ disabled={isLoading.uploading}>{m.common_cancel()}</Button
+ >
<Button onclick={handleUploadImages} disabled={isLoading.uploading || uploadedFiles.length === 0}>
{#if isLoading.uploading}<Spinner class="mr-2 size-4" />{/if}
{m.images_upload_image()}
@@ -189,12 +244,17 @@
<Dialog.Content>
<Dialog.Header>
<Dialog.Title>{m.images_prune_confirm_title()}</Dialog.Title>
- <Dialog.Description>{m.images_prune_confirm_description({ mode: String(data.settings.dockerPruneMode) })}</Dialog.Description>
+ <Dialog.Description
+ >{m.images_prune_confirm_description({ mode: String(data.settings.dockerPruneMode) })}</Dialog.Description
+ >
</Dialog.Header>
<div class="flex justify-end gap-3 pt-6">
- <Button variant="outline" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isLoading.pruning}>{m.common_cancel()}</Button>
+ <Button variant="outline" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isLoading.pruning}
+ >{m.common_cancel()}</Button
+ >
<Button variant="destructive" onclick={handlePruneImages} disabled={isLoading.pruning}>
- {#if isLoading.pruning}<Spinner class="mr-2 size-4" /> {m.common_action_pruning()}{:else}{m.images_prune_action()}{/if}
+ {#if isLoading.pruning}<Spinner class="mr-2 size-4" />
+ {m.common_action_pruning()}{:else}{m.images_prune_action()}{/if}
</Button>
</div>
</Dialog.Content>
diff --git a/frontend/src/routes/(app)/images/[imageId]/+page.svelte b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
index b805e5d3c..b3ec7445b 100644
--- a/frontend/src/routes/(app)/images/[imageId]/+page.svelte
+++ b/frontend/src/routes/(app)/images/[imageId]/+page.svelte
@@ -1,13 +1,5 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ClockIcon from '@lucide/svelte/icons/clock';
- import TagIcon from '@lucide/svelte/icons/tag';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import HashIcon from '@lucide/svelte/icons/hash';
- import CpuIcon from '@lucide/svelte/icons/cpu';
- import InfoIcon from '@lucide/svelte/icons/info';
- import SettingsIcon from '@lucide/svelte/icons/settings';
import * as Breadcrumb from '$lib/components/ui/breadcrumb';
import { goto } from '$app/navigation';
import { Badge } from '$lib/components/ui/badge';
@@ -20,6 +12,7 @@
import { ArcaneButton } from '$lib/components/arcane-button';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service.js';
+ import { VolumesIcon, ClockIcon, TagIcon, LayersIcon, CpuIcon, InfoIcon, SettingsIcon, HashIcon } from '$lib/icons';
let { data } = $props();
let { image } = $derived(data);
@@ -130,7 +123,7 @@
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-blue-500/10 p-2">
- <HardDriveIcon class="size-5 text-blue-500" />
+ <VolumesIcon class="size-5 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.common_size()}</p>
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index c063b468a..98c7fc865 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -1,10 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import DownloadIcon from '@lucide/svelte/icons/download';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -17,15 +13,13 @@
import { tryCatch } from '$lib/utils/try-catch';
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
import UniversalMobileCard from '$lib/components/arcane-table/cards/universal-mobile-card.svelte';
- import ImageIcon from '@lucide/svelte/icons/image';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ClockIcon from '@lucide/svelte/icons/clock';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { ImageSummaryDto, ImageUpdateInfoDto } from '$lib/types/image.type';
import { format } from 'date-fns';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { imageService } from '$lib/services/image-service';
+ import { DownloadIcon, TrashIcon, EllipsisIcon, InspectIcon, ImagesIcon, VolumesIcon, ClockIcon } from '$lib/icons';
let {
images = $bindable(),
@@ -241,12 +235,12 @@
}: {
row: any;
item: ImageSummaryDto;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
icon={(item) => ({
- component: ImageIcon,
+ component: ImagesIcon,
variant: item.inUse ? 'emerald' : 'amber'
})}
title={(item) => {
@@ -266,14 +260,14 @@
{
label: m.common_size(),
getValue: (item: ImageSummaryDto) => bytes.format(Number(item.size ?? 0)),
- icon: HardDriveIcon,
+ icon: VolumesIcon,
iconVariant: 'blue' as const,
show: mobileFieldVisibility.size ?? true
},
{
label: m.images_repository(),
getValue: (item: ImageSummaryDto) => (item.repo && item.repo !== '<none>' ? item.repo : m.images_untagged()),
- icon: ImageIcon,
+ icon: ImagesIcon,
iconVariant: 'purple' as const,
show: mobileFieldVisibility.repo ?? true
},
@@ -285,7 +279,7 @@
}
return item.tag && item.tag !== '<none>' ? item.tag : m.images_untagged();
},
- icon: ImageIcon,
+ icon: ImagesIcon,
iconVariant: 'purple' as const,
show: mobileFieldVisibility.repoTags ?? true
}
@@ -334,7 +328,7 @@
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
<DropdownMenu.Item onclick={() => goto(`/images/${item.id}`)}>
- <ScanSearchIcon class="size-4" />
+ <InspectIcon class="size-4" />
{m.common_inspect()}
</DropdownMenu.Item>
<DropdownMenu.Item
@@ -354,7 +348,7 @@
{#if isLoading.removing}
<Spinner class="size-4" />
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{/if}
{m.common_remove()}
</DropdownMenu.Item>
diff --git a/frontend/src/routes/(app)/networks/+page.svelte b/frontend/src/routes/(app)/networks/+page.svelte
index bb5fd7581..43a41e9c5 100644
--- a/frontend/src/routes/(app)/networks/+page.svelte
+++ b/frontend/src/routes/(app)/networks/+page.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
- import NetworkIcon from '@lucide/svelte/icons/network';
- import EthernetPortIcon from '@lucide/svelte/icons/ethernet-port';
+ import { NetworksIcon, ConnectionIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
import type { NetworkCreateOptions } from '$lib/types/network.type';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
@@ -76,14 +75,14 @@
{
title: m.networks_total(),
value: networkUsageCounts.total,
- icon: NetworkIcon,
+ icon: NetworksIcon,
iconColor: 'text-blue-500',
class: 'border-l-4 border-l-blue-500'
},
{
title: m.unused_networks(),
value: networkUsageCounts.unused,
- icon: EthernetPortIcon,
+ icon: ConnectionIcon,
iconColor: 'text-amber-500',
class: 'border-l-4 border-l-amber-500'
}
diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
index 9544f5db4..6f2502c8e 100644
--- a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
@@ -1,20 +1,21 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import type { PageData } from './$types';
- import CircleAlertIcon from '@lucide/svelte/icons/alert-circle';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ClockIcon from '@lucide/svelte/icons/clock';
- import TagIcon from '@lucide/svelte/icons/tag';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import HashIcon from '@lucide/svelte/icons/hash';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import ListTreeIcon from '@lucide/svelte/icons/list-tree';
- import ContainerIcon from '@lucide/svelte/icons/container';
- import InfoIcon from '@lucide/svelte/icons/info';
- import ArrowUpIcon from '@lucide/svelte/icons/arrow-up';
- import ArrowDownIcon from '@lucide/svelte/icons/arrow-down';
+ import {
+ AlertIcon,
+ VolumesIcon,
+ ClockIcon,
+ TagIcon,
+ LayersIcon,
+ HashIcon,
+ NetworksIcon,
+ GlobeIcon,
+ SettingsIcon,
+ ContainersIcon,
+ InfoIcon,
+ ArrowUpIcon,
+ ArrowDownIcon
+ } from '$lib/icons';
import * as Breadcrumb from '$lib/components/ui/breadcrumb';
import * as Alert from '$lib/components/ui/alert';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
@@ -25,7 +26,6 @@
import { goto } from '$app/navigation';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
- import type { NetworkInspectDto } from '$lib/types/network.type';
import { m } from '$lib/paraglide/messages';
import { networkService } from '$lib/services/network-service';
@@ -156,7 +156,7 @@
{#if errorMessage}
<Alert.Root variant="destructive">
- <CircleAlertIcon class="mr-2 size-4" />
+ <AlertIcon class="mr-2 size-4" />
<Alert.Title>{m.common_action_failed()}</Alert.Title>
<Alert.Description>{errorMessage}</Alert.Description>
</Alert.Root>
@@ -190,7 +190,7 @@
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-blue-500/10 p-2">
- <NetworkIcon class="size-5 text-blue-500" />
+ <NetworksIcon class="size-5 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.common_name()}</p>
@@ -202,7 +202,7 @@
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-orange-500/10 p-2">
- <HardDriveIcon class="size-5 text-orange-500" />
+ <VolumesIcon class="size-5 text-orange-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.common_driver()}</p>
@@ -268,7 +268,7 @@
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-indigo-500/10 p-2">
- <ListTreeIcon class="size-5 text-indigo-500" />
+ <NetworksIcon class="size-5 text-indigo-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.ipv6_enabled()}</p>
@@ -386,7 +386,7 @@
{#if connectedContainers.length > 0}
<Card.Root>
- <Card.Header icon={ContainerIcon}>
+ <Card.Header icon={ContainersIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.networks_connected_containers_title()}</Card.Title>
<Card.Description
@@ -437,7 +437,7 @@
<div class="flex flex-col p-3 sm:flex-row sm:items-center">
<div class="mb-2 w-full font-medium break-all sm:mb-0 sm:w-1/3">
<a href="/containers/{container.id}" class="text-primary flex items-center hover:underline">
- <ContainerIcon class="text-muted-foreground mr-1.5 size-3.5" />
+ <ContainersIcon class="text-muted-foreground mr-1.5 size-3.5" />
{container.name ?? container.Name}
</a>
</div>
@@ -521,7 +521,7 @@
{:else}
<div class="flex flex-col items-center justify-center px-4 py-16 text-center">
<div class="bg-muted/30 mb-4 rounded-full p-4">
- <NetworkIcon class="text-muted-foreground size-10 opacity-70" />
+ <NetworksIcon class="text-muted-foreground size-10 opacity-70" />
</div>
<h2 class="mb-2 text-xl font-medium">{m.common_not_found_title({ resource: m.networks_title() })}</h2>
<p class="text-muted-foreground mb-6">{m.common_not_found_description({ resource: m.networks_title().toLowerCase() })}</p>
diff --git a/frontend/src/routes/(app)/networks/network-table.svelte b/frontend/src/routes/(app)/networks/network-table.svelte
index 3ccc65922..e08b3da73 100644
--- a/frontend/src/routes/(app)/networks/network-table.svelte
+++ b/frontend/src/routes/(app)/networks/network-table.svelte
@@ -2,9 +2,6 @@
import type { NetworkSummaryDto } from '$lib/types/network.type';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -19,9 +16,7 @@
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { networkService } from '$lib/services/network-service';
- import NetworkIcon from '@lucide/svelte/icons/network';
- import RouteIcon from '@lucide/svelte/icons/route';
- import GlobeIcon from '@lucide/svelte/icons/globe';
+ import { NetworksIcon, GlobeIcon, EllipsisIcon, InspectIcon, TrashIcon } from '$lib/icons';
type FieldVisibility = Record<string, boolean>;
@@ -222,7 +217,7 @@
<UniversalMobileCard
{item}
icon={(item: NetworkSummaryDto) => ({
- component: NetworkIcon,
+ component: NetworksIcon,
variant: item.inUse ? 'emerald' : 'amber'
})}
title={(item: NetworkSummaryDto) => item.name}
@@ -241,7 +236,7 @@
{
label: m.common_driver(),
getValue: (item: NetworkSummaryDto) => capitalizeFirstLetter(item.driver),
- icon: RouteIcon,
+ icon: NetworksIcon,
iconVariant: 'gray' as const,
type: 'badge' as const,
badgeVariant: getDriverVariant(item.driver),
@@ -275,7 +270,7 @@
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
<DropdownMenu.Item onclick={() => goto(`/networks/${item.id}`)} disabled={isAnyLoading}>
- <ScanSearchIcon class="size-4" />
+ <InspectIcon class="size-4" />
{m.common_inspect()}
</DropdownMenu.Item>
<DropdownMenu.Separator />
@@ -284,7 +279,7 @@
onclick={() => handleDeleteNetwork(item.id, item.name)}
disabled={isAnyLoading || item.isDefault || DEFAULT_NETWORK_NAMES.has(item.name)}
>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/projects/+page.svelte
index 72b5e99b0..8062a30a8 100644
--- a/frontend/src/routes/(app)/projects/+page.svelte
+++ b/frontend/src/routes/(app)/projects/+page.svelte
@@ -1,7 +1,5 @@
<script lang="ts">
- import FileStackIcon from '@lucide/svelte/icons/file-stack';
- import PlayCircleIcon from '@lucide/svelte/icons/play-circle';
- import StopCircleIcon from '@lucide/svelte/icons/stop-circle';
+ import { ProjectsIcon, StartIcon, StopIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
@@ -11,7 +9,6 @@
import { projectService } from '$lib/services/project-service';
import { imageService } from '$lib/services/image-service';
import { environmentStore } from '$lib/stores/environment.store.svelte';
- import type { Environment } from '$lib/types/environment.type';
import { untrack } from 'svelte';
import { ResourcePageLayout, type ActionButton, type StatCardConfig } from '$lib/layouts/index.js';
@@ -87,20 +84,20 @@
});
const actionButtons: ActionButton[] = $derived.by(() => [
+ {
+ id: 'create',
+ action: 'create',
+ label: m.compose_create_project(),
+ onclick: () => goto('/projects/new')
+ },
{
id: 'check-updates',
- action: 'inspect',
+ action: 'update',
label: m.compose_update_projects(),
onclick: handleCheckForUpdates,
loading: isLoading.updating,
disabled: isLoading.updating
},
- {
- id: 'create',
- action: 'create',
- label: m.compose_create_project(),
- onclick: () => goto('/projects/new')
- },
{
id: 'refresh',
action: 'restart',
@@ -115,21 +112,21 @@
{
title: m.compose_total(),
value: totalCompose,
- icon: FileStackIcon,
+ icon: ProjectsIcon,
iconColor: 'text-amber-500',
class: 'border-l-4 border-l-amber-500'
},
{
title: m.common_running(),
value: runningCompose,
- icon: PlayCircleIcon,
+ icon: StartIcon,
iconColor: 'text-green-500',
class: 'border-l-4 border-l-green-500'
},
{
title: m.common_stopped(),
value: stoppedCompose,
- icon: StopCircleIcon,
+ icon: StopIcon,
iconColor: 'text-red-500',
class: 'border-l-4 border-l-red-500'
}
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index 81e3f98f7..388fa58fc 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -4,12 +4,7 @@
import * as Tabs from '$lib/components/ui/tabs/index.js';
import * as TreeView from '$lib/components/ui/tree-view/index.js';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import FileStackIcon from '@lucide/svelte/icons/file-stack';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import LogsIcon from '@lucide/svelte/icons/logs';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
+ import { ArrowLeftIcon, ProjectsIcon, LayersIcon, SettingsIcon, FileTextIcon } from '$lib/icons';
import { type TabItem } from '$lib/components/tab-bar/index.js';
import TabbedPageLayout from '$lib/layouts/tabbed-page-layout.svelte';
import ActionButtons from '$lib/components/action-buttons.svelte';
@@ -103,7 +98,7 @@
{
value: 'logs',
label: m.compose_nav_logs(),
- icon: LogsIcon,
+ icon: FileTextIcon,
disabled: project?.status !== 'running'
}
]);
@@ -402,7 +397,7 @@
<div class="flex min-h-screen items-center justify-center">
<div class="text-center">
<div class="bg-muted/50 mb-6 inline-flex rounded-full p-6">
- <FileStackIcon class="text-muted-foreground size-10" />
+ <ProjectsIcon class="text-muted-foreground size-10" />
</div>
<h2 class="mb-3 text-2xl font-medium">{m.common_not_found_title({ resource: m.project() })}</h2>
<p class="text-muted-foreground mb-8 max-w-md text-center">
diff --git a/frontend/src/routes/(app)/projects/components/CodePanel.svelte b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
index 0cbc2e474..3a75c0e05 100644
--- a/frontend/src/routes/(app)/projects/components/CodePanel.svelte
+++ b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import CodeEditor from '$lib/components/code-editor/editor.svelte';
- import FileTextIcon from '@lucide/svelte/icons/file-text';
+ import { CodeIcon } from '$lib/icons';
type CodeLanguage = 'yaml' | 'env';
@@ -23,7 +23,7 @@
</script>
<Card.Root class="flex h-full flex-col">
- <Card.Header icon={FileTextIcon} class="flex-shrink-0 items-center">
+ <Card.Header icon={CodeIcon} class="flex-shrink-0 items-center">
<Card.Title>
<h2>
{title}
diff --git a/frontend/src/routes/(app)/projects/components/EditableName.svelte b/frontend/src/routes/(app)/projects/components/EditableName.svelte
index e2cf04c9b..027fd1555 100644
--- a/frontend/src/routes/(app)/projects/components/EditableName.svelte
+++ b/frontend/src/routes/(app)/projects/components/EditableName.svelte
@@ -2,11 +2,10 @@
import { Input } from '$lib/components/ui/input/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
- import InfoIcon from '@lucide/svelte/icons/info';
- import PencilIcon from '@lucide/svelte/icons/pencil';
import { tick } from 'svelte';
import { m } from '$lib/paraglide/messages';
import { cn } from '$lib/utils';
+ import { InfoIcon, EditIcon } from '$lib/icons';
let {
value = $bindable(),
@@ -109,7 +108,7 @@
{#if canEdit}
<div class="flex items-center justify-center">
<span class="text-muted-foreground flex items-center gap-0.5 text-[8px] whitespace-nowrap opacity-30">
- <PencilIcon class="size-1.5" />
+ <EditIcon class="size-1.5" />
{m.tap_to_edit()}
</span>
</div>
@@ -145,7 +144,7 @@
title="Edit name"
onclick={beginEdit}
>
- <PencilIcon class="size-3.5" />
+ <EditIcon class="size-3.5" />
</Button>
{:else}
<Tooltip.Provider>
diff --git a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
index dd8d6bc2d..c7df67faa 100644
--- a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
+++ b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
import LogViewer from '$lib/components/logs/log-viewer.svelte';
import LogControls from '$lib/components/logs/log-controls.svelte';
import { m } from '$lib/paraglide/messages';
+ import { TerminalIcon } from '$lib/icons';
let {
projectId,
@@ -72,16 +72,16 @@
<Card.Description>Real-time project logs</Card.Description>
</div>
<LogControls
- bind:autoScroll
- bind:tailLines
- bind:autoStartLogs
- {isStreaming}
- disabled={!projectId}
- onStart={handleStart}
- onStop={handleStop}
- onClear={handleClear}
- onRefresh={handleRefresh}
- />
+ bind:autoScroll
+ bind:tailLines
+ bind:autoStartLogs
+ {isStreaming}
+ disabled={!projectId}
+ onStart={handleStart}
+ onStop={handleStop}
+ onClear={handleClear}
+ onRefresh={handleRefresh}
+ />
</div>
</Card.Header>
<Card.Content class="p-0">
diff --git a/frontend/src/routes/(app)/projects/components/ServicesGrid.svelte b/frontend/src/routes/(app)/projects/components/ServicesGrid.svelte
index 46ab15606..e8f7d118e 100644
--- a/frontend/src/routes/(app)/projects/components/ServicesGrid.svelte
+++ b/frontend/src/routes/(app)/projects/components/ServicesGrid.svelte
@@ -1,7 +1,5 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import HeartPulseIcon from '@lucide/svelte/icons/heart-pulse';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { PortBadge } from '$lib/components/badges';
import { getStatusVariant } from '$lib/utils/status.utils';
@@ -9,6 +7,7 @@
import { m } from '$lib/paraglide/messages';
import { Badge } from '$lib/components/ui/badge';
import type { RuntimeService } from '$lib/types/project.type';
+ import { HealthIcon, ContainersIcon } from '$lib/icons';
interface Props {
services?: RuntimeService[];
@@ -71,7 +70,7 @@
<Card.Content class="flex flex-col p-4">
<div class="flex items-start gap-3">
<div class="rounded-lg bg-blue-500/10 p-2 transition-colors group-hover:bg-blue-500/15">
- <LayersIcon class="size-5 text-blue-500" />
+ <ContainersIcon class="size-5 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<div class="mb-2 flex items-center gap-2">
@@ -87,7 +86,7 @@
{#if service.health}
{@const healthColor = getHealthColor(service.health)}
<div class="flex items-center gap-1.5">
- <HeartPulseIcon class="{healthColor} size-4" />
+ <HealthIcon class="{healthColor} size-4" />
<span class="text-muted-foreground text-xs">{capitalizeFirstLetter(service.health)}</span>
</div>
{/if}
@@ -103,7 +102,7 @@
<Card.Content class="flex flex-col p-4">
<div class="flex items-start gap-3">
<div class="rounded-lg bg-amber-500/10 p-2">
- <LayersIcon class="size-5 text-amber-500" />
+ <ContainersIcon class="size-5 text-amber-500" />
</div>
<div class="min-w-0 flex-1">
<h3 class="text-foreground mb-2 text-base font-semibold">
@@ -122,7 +121,7 @@
{/snippet}
<Card.Root>
- <Card.Header icon={LayersIcon}>
+ <Card.Header icon={ContainersIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>
<h2>
@@ -142,7 +141,7 @@
{:else}
<div class="rounded-lg border border-dashed py-12 text-center">
<div class="bg-muted/50 mx-auto mb-4 flex size-16 items-center justify-center rounded-full">
- <LayersIcon class="text-muted-foreground size-6" />
+ <ContainersIcon class="text-muted-foreground size-6" />
</div>
<div class="text-muted-foreground text-sm">{m.compose_no_services_found()}</div>
</div>
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index 538ef6a93..0ec8cb3bd 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -1,12 +1,7 @@
<script lang="ts">
import { Button } from '$lib/components/ui/button/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
- import CopyIcon from '@lucide/svelte/icons/copy';
- import InfoIcon from '@lucide/svelte/icons/info';
+ import { ArrowLeftIcon, TerminalIcon, CopyIcon, InfoIcon, TemplateIcon, AddIcon } from '$lib/icons';
import { Spinner } from '$lib/components/ui/spinner/index.js';
- import LayoutTemplateIcon from '@lucide/svelte/icons/layout-template';
- import WandIcon from '@lucide/svelte/icons/wand';
import { Label } from '$lib/components/ui/label/index.js';
import { goto, invalidateAll } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -20,14 +15,13 @@
import type { Template } from '$lib/types/template.type';
import { z } from 'zod/v4';
import { arcaneButtonVariants, actionConfigs } from '$lib/components/arcane-button/variants';
- import PlusCircleIcon from '@lucide/svelte/icons/plus-circle';
import { m } from '$lib/paraglide/messages';
import { projectService } from '$lib/services/project-service.js';
import { systemService } from '$lib/services/system-service.js';
import { templateService } from '$lib/services/template-service.js';
import * as ButtonGroup from '$lib/components/ui/button-group/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
- import ChevronDown from '@lucide/svelte/icons/chevron-down';
+ import { ArrowDownIcon as ChevronDown } from '$lib/icons';
import CodePanel from '../components/CodePanel.svelte';
import EditableName from '../components/EditableName.svelte';
@@ -209,7 +203,7 @@
<Spinner class="size-4" />
{m.common_action_creating()}
{:else}
- <PlusCircleIcon class="size-4" />
+ <AddIcon class="size-4" />
{m.compose_create_project()}
{/if}
</Button>
@@ -249,7 +243,7 @@
disabled={saving || converting || isLoadingTemplateContent}
onclick={() => (showTemplateDialog = true)}
>
- <LayoutTemplateIcon class="size-4" />
+ <TemplateIcon class="size-4" />
{m.common_use_template()}
</DropdownMenu.Item>
<DropdownMenu.Item class={dropdownItemClass} onclick={() => (showConverterDialog = true)}>
@@ -270,7 +264,7 @@
{#if creatingTemplate}
<Spinner class="size-4" />
{:else}
- <WandIcon class="size-4" />
+ <AddIcon class="size-4" />
{/if}
{m.templates_create_template()}
</DropdownMenu.Item>
@@ -374,7 +368,7 @@
<Spinner class="mr-2 size-4" />
{m.compose_converting()}
{:else}
- <WandIcon class="mr-2 size-4" />
+ <AddIcon class="mr-2 size-4" />
{m.compose_convert_action()}
{/if}
</Button>
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index 6d77ed6c0..1dafaa525 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -2,12 +2,7 @@
import type { Project } from '$lib/types/project.type';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import PenIcon from '@lucide/svelte/icons/pen';
- import PlayIcon from '@lucide/svelte/icons/play';
- import RotateCcwIcon from '@lucide/svelte/icons/rotate-ccw';
- import StopCircleIcon from '@lucide/svelte/icons/stop-circle';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
+ import { EllipsisIcon, EditIcon, StartIcon, RestartIcon, StopIcon, TrashIcon } from '$lib/icons';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -20,13 +15,11 @@
import { getStatusVariant } from '$lib/utils/status.utils';
import { capitalizeFirstLetter } from '$lib/utils/string.utils';
import { format } from 'date-fns';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { projectService } from '$lib/services/project-service';
- import FolderIcon from '@lucide/svelte/icons/folder';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import CalendarIcon from '@lucide/svelte/icons/calendar';
+ import { FolderOpenIcon, LayersIcon, CalendarIcon } from '$lib/icons';
let {
projects = $bindable(),
@@ -181,12 +174,12 @@
}: {
row: any;
item: Project;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
icon={(item: Project) => ({
- component: FolderIcon,
+ component: FolderOpenIcon,
variant: item.status === 'running' ? 'emerald' : item.status === 'exited' ? 'red' : 'amber'
})}
title={(item: Project) => item.name}
@@ -238,7 +231,7 @@
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
<DropdownMenu.Item onclick={() => goto(`/projects/${item.id}`)} disabled={isAnyLoading}>
- <PenIcon class="size-4" />
+ <EditIcon class="size-4" />
{m.common_edit()}
</DropdownMenu.Item>
@@ -247,7 +240,7 @@
{#if isLoading.start}
<Spinner class="size-4" />
{:else}
- <PlayIcon class="size-4" />
+ <StartIcon class="size-4" />
{/if}
{m.common_up()}
</DropdownMenu.Item>
@@ -259,7 +252,7 @@
{#if isLoading.restart}
<Spinner class="size-4" />
{:else}
- <RotateCcwIcon class="size-4" />
+ <RestartIcon class="size-4" />
{/if}
{m.common_restart()}
</DropdownMenu.Item>
@@ -268,7 +261,7 @@
{#if isLoading.stop}
<Spinner class="size-4" />
{:else}
- <StopCircleIcon class="size-4" />
+ <StopIcon class="size-4" />
{/if}
{m.common_down()}
</DropdownMenu.Item>
@@ -278,7 +271,7 @@
{#if isLoading.pull}
<Spinner class="size-4" />
{:else}
- <RotateCcwIcon class="size-4" />
+ <RestartIcon class="size-4" />
{/if}
{m.compose_pull_redeploy()}
</DropdownMenu.Item>
@@ -293,7 +286,7 @@
{#if isLoading.remove}
<Spinner class="size-4" />
{:else}
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{/if}
{m.compose_destroy()}
</DropdownMenu.Item>
diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelte
index e8d94c74f..325fd90af 100644
--- a/frontend/src/routes/(app)/settings/+layout.svelte
+++ b/frontend/src/routes/(app)/settings/+layout.svelte
@@ -3,17 +3,15 @@
import { goto } from '$app/navigation';
import { setContext } from 'svelte';
import { Button } from '$lib/components/ui/button';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import SaveIcon from '@lucide/svelte/icons/save';
- import RotateCcwIcon from '@lucide/svelte/icons/rotate-ccw';
+ import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon, SaveIcon, ResetIcon } from '$lib/icons';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
import { m } from '$lib/paraglide/messages';
import settingsStore from '$lib/stores/config-store';
import { IsMobile } from '$lib/hooks/is-mobile.svelte.js';
import { IsTablet } from '$lib/hooks/is-tablet.svelte.js';
import { getEffectiveNavigationSettings } from '$lib/utils/navigation.utils';
+ import { cn } from '$lib/utils';
+ import { navigationItems } from '$lib/config/navigation-config';
interface Props {
children: import('svelte').Snippet;
@@ -33,6 +31,17 @@
const navigationMode = $derived(navigationSettings.mode);
const scrollToHideEnabled = $derived(navigationSettings.scrollToHide);
+ const navItems = $derived.by(() => {
+ const settingsEntry = navigationItems.settingsItems.find((item) => item.url === '/settings');
+ return (
+ settingsEntry?.items?.map((item) => ({
+ href: item.url,
+ label: item.title,
+ icon: item.icon
+ })) ?? []
+ );
+ });
+
// Track mobile nav visibility for FAB positioning
let mobileNavVisible = $state(true);
@@ -130,6 +139,10 @@
return m.users_title();
case 'navigation':
return m.navigation_title();
+ case 'notifications':
+ return m.notifications_title();
+ case 'api-keys':
+ return m.api_key_page_title();
default:
return m.sidebar_settings();
}
@@ -157,86 +170,73 @@
}
</script>
-{#if isSubPage}
- <div
- class="bg-background/95 fixed top-4 z-5 rounded-lg border shadow-lg backdrop-blur-md transition-all duration-200"
- style="left: {leftPosition()}; right: 1rem;"
- >
- <div class="px-4 py-3">
- <div class="flex items-center justify-between gap-4">
- <div class="flex min-w-0 items-center gap-2">
- <Button
- variant="ghost"
- size="sm"
- onclick={goBackToSettings}
- class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
+<div class="flex min-h-[calc(100vh-4rem)] flex-col md:flex-row">
+ <!-- Desktop Sidebar -->
+ <aside class="bg-background/50 hidden w-64 shrink-0 border-r backdrop-blur-sm md:block">
+ <div class="sticky top-0 px-3 py-4">
+ <h2 class="mb-4 px-4 text-lg font-semibold tracking-tight">{m.settings_title()}</h2>
+ <nav class="space-y-1">
+ {#each navItems as item}
+ {@const isActive = currentPath.startsWith(item.href)}
+ <a
+ href={item.href}
+ class={cn(
+ 'flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',
+ isActive ? 'bg-primary/10 text-primary' : 'text-muted-foreground hover:bg-muted hover:text-foreground'
+ )}
>
- <ArrowLeftIcon class="size-4" />
- <span class="hidden sm:inline">Back</span>
- </Button>
-
- <nav class="flex min-w-0 items-center gap-2 text-sm">
- <Button
- variant="ghost"
- size="sm"
- onclick={goBackToSettings}
- class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
- >
- <SettingsIcon class="size-4" />
- <span>Settings</span>
- </Button>
- <ChevronRightIcon class="text-muted-foreground size-4 shrink-0" />
- <span class="text-foreground truncate font-medium">{pageTitle()}</span>
- </nav>
- </div>
-
- <!-- Save Section - Desktop only -->
- <div class="hidden shrink-0 items-center gap-3 sm:flex">
- {#if !isReadOnly}
- {#if formState.hasChanges}
- <span class="text-xs text-orange-600 dark:text-orange-400"> Unsaved changes </span>
- {:else if !formState.hasChanges && formState.saveFunction}
- <span class="text-xs text-green-600 dark:text-green-400"> All changes saved </span>
- {/if}
+ <item.icon class="size-4" />
+ {item.label}
+ </a>
+ {/each}
+ </nav>
+ </div>
+ </aside>
- {#if formState.hasChanges && formState.resetFunction}
+ <!-- Main Content -->
+ <main class="min-w-0 flex-1">
+ {#if isSubPage}
+ <div
+ class="bg-background/95 sticky top-4 z-5 mx-4 mb-6 rounded-lg border shadow-lg backdrop-blur-md transition-all duration-200 md:hidden"
+ >
+ <div class="px-4 py-3">
+ <div class="flex items-center justify-between gap-4">
+ <div class="flex min-w-0 items-center gap-2">
<Button
- variant="outline"
+ variant="ghost"
size="sm"
- onclick={() => formState.resetFunction && formState.resetFunction()}
- disabled={formState.isLoading}
- class="gap-2"
+ onclick={goBackToSettings}
+ class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
>
- <RotateCcwIcon class="size-4" />
- <span class="hidden sm:inline">{m.common_reset()}</span>
+ <ArrowLeftIcon class="size-4" />
+ <span class="hidden sm:inline">{m.common_back()}</span>
</Button>
- {/if}
- <Button
- onclick={handleSave}
- disabled={formState.isLoading || !formState.hasChanges || !formState.saveFunction}
- size="sm"
- class="min-w-[80px] gap-2"
- >
- {#if formState.isLoading}
- <div class="border-background size-4 animate-spin rounded-full border-2 border-t-transparent"></div>
- <span class="hidden sm:inline">{m.common_saving()}</span>
- {:else}
- <SaveIcon class="size-4" />
- <span class="hidden sm:inline">{m.common_save()}</span>
- {/if}
- </Button>
- {/if}
+ <nav class="flex min-w-0 items-center gap-2 text-sm">
+ <Button
+ variant="ghost"
+ size="sm"
+ onclick={goBackToSettings}
+ class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
+ >
+ <SettingsIcon class="size-4" />
+ <span>{m.settings_title()}</span>
+ </Button>
+ <ArrowRightIcon class="text-muted-foreground size-4 shrink-0" />
+ <span class="text-foreground truncate font-medium">{pageTitle()}</span>
+ </nav>
+ </div>
+ </div>
</div>
</div>
- </div>
- </div>
-{/if}
+ {/if}
-<div class="settings-container">
- <div class="settings-content w-full max-w-none" class:pt-20={isSubPage}>
- {@render children()}
- </div>
+ <div class="settings-container">
+ <div class="settings-content w-full max-w-none">
+ {@render children()}
+ </div>
+ </div>
+ </main>
</div>
<!-- Mobile Floating Action Buttons -->
@@ -259,7 +259,7 @@
disabled={formState.isLoading}
class="bg-background/80 size-14 rounded-full border-2 shadow-lg backdrop-blur-md"
>
- <RotateCcwIcon class="size-5" />
+ <ResetIcon class="size-5" />
</Button>
{/if}
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index 2921956df..c0c3700b6 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -1,14 +1,17 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { onMount } from 'svelte';
- import SearchIcon from '@lucide/svelte/icons/search';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import UserIcon from '@lucide/svelte/icons/user';
- import ShieldIcon from '@lucide/svelte/icons/shield';
- import NavigationIcon from '@lucide/svelte/icons/navigation';
- import BellIcon from '@lucide/svelte/icons/bell';
- import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
+ import {
+ SearchIcon,
+ SettingsIcon,
+ UserIcon,
+ SecurityIcon,
+ NotificationsIcon,
+ ArrowRightIcon,
+ DockerBrandIcon,
+ ApiKeyIcon,
+ ApperanceIcon
+ } from '$lib/icons';
import { Button } from '$lib/components/ui/button';
import { Card } from '$lib/components/ui/card';
import { m } from '$lib/paraglide/messages';
@@ -16,6 +19,7 @@
import { settingsSearchService } from '$lib/services/settings-search';
import type { SettingsCategory } from '$lib/types/settings-search.type';
import { debounced } from '$lib/utils/utils';
+ import * as InputGroup from '$lib/components/ui/input-group/index.js';
let { data } = $props();
let searchQuery = $state('');
@@ -27,10 +31,12 @@
const iconMap: Record<string, any> = {
settings: SettingsIcon,
- database: DatabaseIcon,
- shield: ShieldIcon,
- navigation: NavigationIcon,
- user: UserIcon
+ database: DockerBrandIcon,
+ shield: SecurityIcon,
+ appearance: ApperanceIcon,
+ bell: NotificationsIcon,
+ user: UserIcon,
+ apikey: ApiKeyIcon
};
onMount(async () => {
@@ -115,33 +121,37 @@
<UiConfigDisabledTag />
</div>
</div>
- <p class="text-muted-foreground mt-1 text-sm sm:text-base">Configure and customize your Arcane experience</p>
+ <p class="text-muted-foreground mt-1 text-sm sm:text-base">{m.settings_subtitle()}</p>
</div>
</div>
</div>
<div class="relative mt-4 w-full sm:mt-6 sm:max-w-md">
- <SearchIcon class="text-muted-foreground absolute top-1/2 left-3 size-4 -translate-y-1/2" />
- <input
- type="text"
- placeholder="Search settings..."
- value={searchQuery}
- oninput={(e) => {
- searchQuery = e.currentTarget.value;
- debouncedSearch(e.currentTarget.value);
- }}
- onkeydown={(e) => {
- if (e.key === 'Enter') {
- performSearch((e.currentTarget as HTMLInputElement).value, true);
- }
- }}
- class="bg-background/50 border-input ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 pl-10 text-sm backdrop-blur-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
- />
- {#if showSearchResults}
- <Button variant="ghost" size="sm" onclick={clearSearch} class="absolute top-1/2 right-2 h-6 w-6 -translate-y-1/2 p-0">
- ×
- </Button>
- {/if}
+ <InputGroup.Root>
+ <InputGroup.Input
+ placeholder={m.settings_search_placeholder()}
+ value={searchQuery}
+ oninput={(e) => {
+ searchQuery = e.currentTarget.value;
+ debouncedSearch(e.currentTarget.value);
+ }}
+ onkeydown={(e) => {
+ if (e.key === 'Enter') {
+ performSearch((e.currentTarget as HTMLInputElement).value, true);
+ }
+ }}
+ />
+ <InputGroup.Addon>
+ {#if showSearchResults}
+ <Button variant="ghost" size="sm" onclick={clearSearch} class="h-6 w-6 p-0">
+ <span class="sr-only">{m.settings_clear_search()}</span>
+ ×
+ </Button>
+ {:else}
+ <SearchIcon />
+ {/if}
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
</div>
</div>
@@ -165,9 +175,7 @@
<p class="text-muted-foreground mt-1 text-xs leading-relaxed sm:text-sm">{category.description}</p>
</div>
</div>
- <ChevronRightIcon
- class="text-muted-foreground group-hover:text-foreground mt-1 size-4 shrink-0 transition-colors"
- />
+ <ArrowRightIcon class="text-muted-foreground group-hover:text-foreground mt-1 size-4 shrink-0 transition-colors" />
</div>
</button>
</Card>
@@ -177,8 +185,7 @@
<div class="space-y-6 sm:space-y-8">
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
<h2 class="text-base font-semibold sm:text-lg">
- Search Results for "{searchQuery}" ({searchResults.length}
- {searchResults.length === 1 ? 'result' : 'results'})
+ {m.settings_search_results({ query: searchQuery, count: searchResults.length })}
</h2>
</div>
@@ -187,13 +194,13 @@
<div
class="border-primary mx-auto mb-3 size-8 animate-spin rounded-full border-4 border-t-transparent sm:mb-4 sm:size-12"
></div>
- <p class="text-muted-foreground text-sm sm:text-base">Searching...</p>
+ <p class="text-muted-foreground text-sm sm:text-base">{m.settings_searching()}</p>
</div>
{:else if searchResults.length === 0}
<div class="py-8 text-center sm:py-12">
<SearchIcon class="text-muted-foreground mx-auto mb-3 size-8 sm:mb-4 sm:size-12" />
- <h3 class="mb-2 text-base font-medium sm:text-lg">No settings found</h3>
- <p class="text-muted-foreground text-sm sm:text-base">Try adjusting your search terms or browse categories above.</p>
+ <h3 class="mb-2 text-base font-medium sm:text-lg">{m.settings_no_results()}</h3>
+ <p class="text-muted-foreground text-sm sm:text-base">{m.settings_no_results_description()}</p>
</div>
{:else}
<div class="space-y-4 sm:space-y-6">
@@ -210,7 +217,7 @@
</div>
</div>
<Button variant="outline" size="sm" onclick={() => navigateToCategory(result.url)} class="shrink-0">
- Go to Page
+ {m.settings_go_to_page()}
</Button>
</div>
</div>
@@ -218,7 +225,7 @@
<!-- Show matching settings with descriptions -->
{#if result.matchingSettings && result.matchingSettings.length > 0}
<div class="space-y-3 p-4 sm:p-6">
- <h4 class="text-muted-foreground mb-3 text-sm font-medium">Matching Settings:</h4>
+ <h4 class="text-muted-foreground mb-3 text-sm font-medium">{m.settings_matching_settings()}</h4>
{#each result.matchingSettings as setting}
<div class="bg-background/60 border-primary/20 rounded-md border-l-2 p-3">
<div class="flex items-start justify-between gap-3">
@@ -236,7 +243,7 @@
{/each}
{#if setting.keywords.length > 6}
<span class="text-muted-foreground px-2 py-0.5 text-xs">
- +{setting.keywords.length - 6} more
+ {m.settings_more_keywords({ count: setting.keywords.length - 6 })}
</span>
{/if}
</div>
diff --git a/frontend/src/routes/(app)/settings/api-keys/+page.svelte b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
index 7d04b2190..09a42d99a 100644
--- a/frontend/src/routes/(app)/settings/api-keys/+page.svelte
+++ b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import KeyIcon from '@lucide/svelte/icons/key';
import { toast } from 'svelte-sonner';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
@@ -9,11 +8,12 @@
import type { ApiKey, ApiKeyCreated } from '$lib/types/api-key.type';
import { apiKeyService } from '$lib/services/api-key-service';
import { SettingsPageLayout, type SettingsActionButton } from '$lib/layouts/index.js';
- import * as Dialog from '$lib/components/ui/dialog/index.js';
+ import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
import { Button } from '$lib/components/ui/button/index.js';
import { Snippet } from '$lib/components/ui/snippet/index.js';
import * as m from '$lib/paraglide/messages.js';
import { untrack } from 'svelte';
+ import { ApiKeyIcon } from '$lib/icons';
let { data } = $props();
@@ -109,7 +109,7 @@
<SettingsPageLayout
title={m.api_key_page_title()}
description={m.api_key_page_description()}
- icon={KeyIcon}
+ icon={ApiKeyIcon}
pageType="management"
{actionButtons}
statCardsColumns={3}
@@ -136,17 +136,13 @@
<ApiKeyFormSheet bind:open={isDialogOpen.edit} {apiKeyToEdit} onSubmit={handleApiKeySubmit} isLoading={isLoading.editing} />
- <Dialog.Root bind:open={isDialogOpen.showKey}>
- <Dialog.Content class="!max-w-fit">
- <Dialog.Header>
- <Dialog.Title class="flex items-center gap-2">
- <KeyIcon class="size-5" />
- {m.api_key_created_title()}
- </Dialog.Title>
- <Dialog.Description>
- {m.api_key_created_description()}
- </Dialog.Description>
- </Dialog.Header>
+ <ResponsiveDialog.Root
+ bind:open={isDialogOpen.showKey}
+ title={m.api_key_created_title()}
+ description={m.api_key_created_description()}
+ contentClass="!max-w-fit"
+ >
+ {#snippet children()}
<div class="space-y-4 py-4">
<div class="bg-muted rounded-lg p-4">
<p class="text-muted-foreground mb-2 text-sm font-medium">{m.api_key_your_key()}</p>
@@ -166,10 +162,10 @@
</p>
</div>
</div>
- <Dialog.Footer>
- <Button onclick={() => (isDialogOpen.showKey = false)}>{m.common_done()}</Button>
- </Dialog.Footer>
- </Dialog.Content>
- </Dialog.Root>
+ {/snippet}
+ {#snippet footer()}
+ <Button onclick={() => (isDialogOpen.showKey = false)}>{m.common_done()}</Button>
+ {/snippet}
+ </ResponsiveDialog.Root>
{/snippet}
</SettingsPageLayout>
diff --git a/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte b/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte
index 1ed6ec1ea..cce6404ec 100644
--- a/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte
+++ b/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte
@@ -1,10 +1,7 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import EditIcon from '@lucide/svelte/icons/edit';
- import CopyIcon from '@lucide/svelte/icons/copy';
+ import { CopyButton } from '$lib/components/ui/copy-button';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -13,11 +10,11 @@
import { tryCatch } from '$lib/utils/try-catch';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { ApiKey } from '$lib/types/api-key.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { apiKeyService } from '$lib/services/api-key-service';
- import KeyIcon from '@lucide/svelte/icons/key';
import * as m from '$lib/paraglide/messages.js';
+ import { ApiKeyIcon, TrashIcon, EllipsisIcon, EditIcon } from '$lib/icons';
let {
apiKeys = $bindable(),
@@ -57,15 +54,6 @@
return 'green';
}
- async function copyToClipboard(text: string) {
- try {
- await navigator.clipboard.writeText(text);
- toast.success(m.common_copied());
- } catch {
- toast.error(m.common_copy_failed());
- }
- }
-
async function handleDeleteSelected() {
if (selectedIds.length === 0) return;
@@ -166,9 +154,7 @@
{#snippet KeyPrefixCell({ item }: { item: ApiKey })}
<div class="flex items-center gap-2">
<code class="bg-muted rounded px-2 py-1 text-xs">{item.keyPrefix}...</code>
- <Button variant="ghost" size="icon" class="size-6" onclick={() => copyToClipboard(item.keyPrefix)}>
- <CopyIcon class="size-3" />
- </Button>
+ <CopyButton text={item.keyPrefix} class="size-6" />
</div>
{/snippet}
@@ -188,17 +174,15 @@
{/snippet}
{#snippet ApiKeyMobileCardSnippet({
- row,
item,
mobileFieldVisibility
}: {
- row: any;
item: ApiKey;
- mobileFieldVisibility: Record<string, boolean>;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
- icon={{ component: KeyIcon, variant: 'blue' }}
+ icon={{ component: ApiKeyIcon, variant: 'blue' }}
title={(item: ApiKey) => item.name}
subtitle={(item: ApiKey) => ((mobileFieldVisibility.keyPrefix ?? true) ? `${item.keyPrefix}...` : null)}
badges={[
@@ -211,21 +195,21 @@
{
label: m.api_key_description_label(),
getValue: (item: ApiKey) => item.description || '-',
- icon: KeyIcon,
+ icon: ApiKeyIcon,
iconVariant: 'gray' as const,
show: mobileFieldVisibility.description ?? true
},
{
label: m.api_key_expires_at(),
getValue: (item: ApiKey) => (item.expiresAt ? formatDate(item.expiresAt) : m.api_key_expires_never()),
- icon: KeyIcon,
+ icon: ApiKeyIcon,
iconVariant: 'gray' as const,
show: mobileFieldVisibility.expiresAt ?? true
},
{
label: m.api_key_last_used(),
getValue: (item: ApiKey) => formatDate(item.lastUsedAt),
- icon: KeyIcon,
+ icon: ApiKeyIcon,
iconVariant: 'gray' as const,
show: mobileFieldVisibility.lastUsedAt ?? true
}
@@ -251,7 +235,7 @@
{m.common_edit()}
</DropdownMenu.Item>
<DropdownMenu.Item variant="destructive" onclick={() => handleDeleteApiKey(item.id, item.name)}>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelte
new file mode 100644
index 000000000..a24a9cda9
--- /dev/null
+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte
@@ -0,0 +1,239 @@
+<script lang="ts">
+ import { z } from 'zod/v4';
+ import { onMount } from 'svelte';
+ import { toast } from 'svelte-sonner';
+ import NavigationSettingControl from '$lib/components/navigation-setting-control.svelte';
+ import NavigationModeSettingControl from '$lib/components/navigation-mode-setting-control.svelte';
+ import settingsStore from '$lib/stores/config-store';
+ import { m } from '$lib/paraglide/messages';
+ import { navigationSettingsOverridesStore, resetNavigationVisibility } from '$lib/utils/navigation.utils';
+ import { SettingsPageLayout } from '$lib/layouts';
+ import { Switch } from '$lib/components/ui/switch/index.js';
+ import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
+ import { createSettingsForm } from '$lib/utils/settings-form.util';
+ import { Separator } from '$lib/components/ui/separator';
+ import { Label } from '$lib/components/ui/label';
+ import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
+ import { applyAccentColor } from '$lib/utils/accent-color-util';
+ import { ApperanceIcon } from '$lib/icons';
+
+ let { data } = $props();
+ const currentSettings = $derived($settingsStore || data.settings!);
+ const isReadOnly = $derived.by(() => $settingsStore?.uiConfigDisabled);
+
+ const formSchema = z.object({
+ mobileNavigationMode: z.enum(['floating', 'docked']),
+ mobileNavigationShowLabels: z.boolean(),
+ sidebarHoverExpansion: z.boolean(),
+ accentColor: z.string(),
+ glassEffectEnabled: z.boolean(),
+ enableGravatar: z.boolean()
+ });
+
+ // Track local override state using the shared store
+ let persistedState = $state(navigationSettingsOverridesStore.current);
+
+ // Sidebar context is only available in desktop view
+ let sidebar: ReturnType<typeof useSidebar> | null = null;
+ try {
+ sidebar = useSidebar();
+ } catch {
+ // Sidebar context not available (mobile view)
+ }
+
+ let { formInputs, registerOnMount } = $derived(
+ createSettingsForm({
+ schema: formSchema,
+ currentSettings,
+ getCurrentSettings: () => $settingsStore || data.settings!,
+ successMessage: m.navigation_settings_saved(),
+ onReset: () => applyAccentColor(currentSettings.accentColor)
+ })
+ );
+
+ function setLocalOverride(key: 'mode' | 'showLabels', value: any) {
+ const currentOverrides = navigationSettingsOverridesStore.current;
+ navigationSettingsOverridesStore.current = { ...currentOverrides, [key]: value };
+ persistedState = navigationSettingsOverridesStore.current;
+ if (key === 'mode') resetNavigationVisibility();
+ }
+
+ function clearLocalOverride(key: 'mode' | 'showLabels') {
+ const currentOverrides = navigationSettingsOverridesStore.current;
+ const newOverrides = { ...currentOverrides };
+ delete newOverrides[key];
+ navigationSettingsOverridesStore.current = newOverrides;
+ persistedState = navigationSettingsOverridesStore.current;
+ if (key === 'mode') resetNavigationVisibility();
+ toast.success(`Local override cleared for ${key.replace(/([A-Z])/g, ' $1').toLowerCase()}`);
+ }
+
+ onMount(() => registerOnMount());
+</script>
+
+<SettingsPageLayout
+ title={m.appearance_title()}
+ description={m.appearance_description()}
+ icon={ApperanceIcon}
+ pageType="form"
+ showReadOnlyTag={isReadOnly}
+>
+ {#snippet mainContent()}
+ <div class="space-y-8">
+ <!-- Appearance Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.appearance_title()}</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- 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>
+
+ <Separator />
+
+ <!-- Glass Effect -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.glass_effect_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.glass_effect_description()}</p>
+ </div>
+ <div class="flex items-center gap-2">
+ <Switch
+ id="glassEffectEnabled"
+ bind:checked={$formInputs.glassEffectEnabled.value}
+ disabled={isReadOnly}
+ onCheckedChange={(checked) => {
+ $formInputs.glassEffectEnabled.value = checked;
+ }}
+ />
+ <Label for="glassEffectEnabled" class="font-normal">
+ {$formInputs.glassEffectEnabled.value ? m.glass_effect_enabled() : m.glass_effect_disabled()}
+ </Label>
+ </div>
+ </div>
+
+ <Separator />
+
+ <!-- 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>
+ </div>
+ </div>
+ </div>
+
+ <!-- Desktop Sidebar Section -->
+ <div class="space-y-4">
+ <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;
+ // Update the sidebar immediately if context is available
+ 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>
+ </div>
+ </div>
+ </div>
+
+ <!-- Mobile Appearance Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.navigation_mobile_appearance_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_mode_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.navigation_mode_description()}</p>
+ </div>
+ <div>
+ <NavigationModeSettingControl
+ id="mobileNavigationMode"
+ description=""
+ serverValue={$formInputs.mobileNavigationMode.value}
+ localOverride={persistedState.mode}
+ onServerChange={(value) => {
+ $formInputs.mobileNavigationMode.value = value;
+ }}
+ onLocalOverride={(value) => setLocalOverride('mode', value)}
+ onClearOverride={() => clearLocalOverride('mode')}
+ serverDisabled={isReadOnly}
+ />
+ </div>
+ </div>
+
+ <Separator />
+
+ <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>
+ <NavigationSettingControl
+ id="mobileNavigationShowLabels"
+ description=""
+ serverValue={$formInputs.mobileNavigationShowLabels.value}
+ localOverride={persistedState.showLabels}
+ onServerChange={(value) => {
+ $formInputs.mobileNavigationShowLabels.value = value;
+ }}
+ onLocalOverride={(value) => setLocalOverride('showLabels', value)}
+ onClearOverride={() => clearLocalOverride('showLabels')}
+ serverDisabled={isReadOnly}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ {/snippet}
+</SettingsPageLayout>
diff --git a/frontend/src/routes/(app)/settings/docker/+page.svelte b/frontend/src/routes/(app)/settings/docker/+page.svelte
index 6a57686c9..1547ded85 100644
--- a/frontend/src/routes/(app)/settings/docker/+page.svelte
+++ b/frontend/src/routes/(app)/settings/docker/+page.svelte
@@ -1,22 +1,19 @@
<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import ZapIcon from '@lucide/svelte/icons/zap';
+ import { AlertIcon } from '$lib/icons';
import * as Alert from '$lib/components/ui/alert';
import type { Settings } from '$lib/types/settings.type';
import { z } from 'zod/v4';
import { onMount } from 'svelte';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
import { m } from '$lib/paraglide/messages';
- import ActivityIcon from '@lucide/svelte/icons/activity';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import TrashIcon from '@lucide/svelte/icons/trash';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import settingsStore from '$lib/stores/config-store';
- import BoxesIcon from '@lucide/svelte/icons/boxes';
import { SettingsPageLayout } from '$lib/layouts';
import { createSettingsForm } from '$lib/utils/settings-form.util';
+ import { Separator } from '$lib/components/ui/separator';
+ import { Label } from '$lib/components/ui/label';
+ import { Switch } from '$lib/components/ui/switch/index.js';
+ import { DockerBrandIcon } from '$lib/icons';
let { data } = $props();
const currentSettings = $derived<Settings>($settingsStore || data.settings!);
@@ -29,7 +26,8 @@
autoUpdateInterval: z.number().int(),
dockerPruneMode: z.enum(['all', 'dangling']),
maxImageUploadSize: z.number().int().min(50).max(5000),
- defaultShell: z.string()
+ defaultShell: z.string(),
+ baseServerUrl: z.string().min(1, m.general_base_url_required())
});
let pruneMode = $derived(currentSettings.dockerPruneMode);
@@ -103,85 +101,120 @@
<SettingsPageLayout
title={m.docker_title()}
description={m.docker_description()}
- icon={BoxesIcon}
+ icon={DockerBrandIcon}
pageType="form"
showReadOnlyTag={isReadOnly}
>
{#snippet mainContent()}
- <fieldset disabled={isReadOnly} class="relative">
- <div class="space-y-4 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={ActivityIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.docker_image_polling_title()}</Card.Title>
- <Card.Description>{m.docker_image_polling_description()}</Card.Description>
+ <fieldset disabled={isReadOnly} class="relative space-y-8">
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Connection</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.general_base_url_label()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.general_base_url_help()}</p>
+ </div>
+ <div class="space-y-4">
+ <TextInputWithLabel
+ bind:value={$formInputs.baseServerUrl.value}
+ error={$formInputs.baseServerUrl.error}
+ label={m.general_base_url_label()}
+ placeholder={m.general_base_url_placeholder()}
+ helpText={m.general_base_url_help()}
+ type="text"
+ />
+ </div>
</div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <SwitchWithLabel
- id="pollingEnabled"
- label={m.docker_enable_polling_label()}
- description={m.docker_enable_polling_description()}
- error={$formInputs.pollingEnabled.error}
- bind:checked={$formInputs.pollingEnabled.value}
- />
+ </div>
+ </div>
+ </div>
- {#if $formInputs.pollingEnabled.value}
- <div class="border-primary/20 space-y-3 border-l-2 pl-3">
- <SelectWithLabel
- id="pollingIntervalMode"
- name="pollingIntervalMode"
- bind:value={pollingIntervalMode}
- label={m.docker_polling_interval_label()}
- placeholder={m.docker_polling_interval_placeholder_select()}
- options={imagePollingOptions.map(({ value, label, description }) => ({ value, label, description }))}
+ <!-- Automation Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Automation</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- Image Polling -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.docker_image_polling_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.docker_image_polling_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="pollingEnabled"
+ bind:checked={$formInputs.pollingEnabled.value}
+ onCheckedChange={(checked) => {
+ $formInputs.pollingEnabled.value = checked;
+ }}
/>
+ <Label for="pollingEnabled" class="font-normal">
+ {m.docker_enable_polling_label()}
+ </Label>
+ </div>
- {#if pollingIntervalMode === 'custom'}
- <TextInputWithLabel
- bind:value={$formInputs.pollingInterval.value}
- error={$formInputs.pollingInterval.error}
- label={m.custom_polling_interval()}
- placeholder={m.docker_polling_interval_placeholder()}
- helpText={m.docker_polling_interval_description()}
- type="number"
+ {#if $formInputs.pollingEnabled.value}
+ <div class="space-y-3 pt-2">
+ <SelectWithLabel
+ id="pollingIntervalMode"
+ name="pollingIntervalMode"
+ bind:value={pollingIntervalMode}
+ label={m.docker_polling_interval_label()}
+ placeholder={m.docker_polling_interval_placeholder_select()}
+ options={imagePollingOptions.map(({ value, label, description }) => ({ value, label, description }))}
/>
- {/if}
- {#if $formInputs.pollingInterval.value < 30}
- <Alert.Root variant="warning">
- <ZapIcon class="size-4" />
- <Alert.Title>{m.docker_rate_limit_warning_title()}</Alert.Title>
- <Alert.Description>{m.docker_rate_limit_warning_description()}</Alert.Description>
- </Alert.Root>
- {/if}
- </div>
- {/if}
+ {#if pollingIntervalMode === 'custom'}
+ <TextInputWithLabel
+ bind:value={$formInputs.pollingInterval.value}
+ error={$formInputs.pollingInterval.error}
+ label={m.custom_polling_interval()}
+ placeholder={m.docker_polling_interval_placeholder()}
+ helpText={m.docker_polling_interval_description()}
+ type="number"
+ />
+ {/if}
+
+ {#if $formInputs.pollingInterval.value < 30}
+ <Alert.Root variant="warning">
+ <AlertIcon class="size-4" />
+ <Alert.Title>{m.docker_rate_limit_warning_title()}</Alert.Title>
+ <Alert.Description>{m.docker_rate_limit_warning_description()}</Alert.Description>
+ </Alert.Root>
+ {/if}
+ </div>
+ {/if}
+ </div>
</div>
- </Card.Content>
- </Card.Root>
- {#if $formInputs.pollingEnabled.value}
- <Card.Root>
- <Card.Header icon={RefreshCwIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.docker_auto_updates_title()}</Card.Title>
- <Card.Description>{m.docker_auto_updates_description()}</Card.Description>
+ <Separator />
+
+ <!-- Auto Updates -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.docker_auto_updates_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.docker_auto_updates_description()}</p>
</div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <SwitchWithLabel
- id="autoUpdateSwitch"
- label={m.docker_auto_update_label()}
- description={m.docker_auto_update_description()}
- error={$formInputs.autoUpdate.error}
- bind:checked={$formInputs.autoUpdate.value}
- />
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="autoUpdateSwitch"
+ bind:checked={$formInputs.autoUpdate.value}
+ disabled={!$formInputs.pollingEnabled.value}
+ onCheckedChange={(checked) => {
+ $formInputs.autoUpdate.value = checked;
+ }}
+ />
+ <Label for="autoUpdateSwitch" class="font-normal">
+ {m.docker_auto_update_label()}
+ </Label>
+ </div>
- {#if $formInputs.autoUpdate.value}
- <div class="border-primary/20 border-l-2 pl-3">
+ {#if $formInputs.autoUpdate.value && $formInputs.pollingEnabled.value}
+ <div class="pt-2">
<TextInputWithLabel
bind:value={$formInputs.autoUpdateInterval.value}
error={$formInputs.autoUpdateInterval.error}
@@ -193,80 +226,90 @@
</div>
{/if}
</div>
- </Card.Content>
- </Card.Root>
- {/if}
-
- <Card.Root>
- <Card.Header icon={TrashIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.docker_cleanup_settings_title()}</Card.Title>
- <Card.Description>{m.docker_cleanup_settings_description()}</Card.Description>
</div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <SelectWithLabel
- id="dockerPruneMode"
- name="pruneMode"
- bind:value={$formInputs.dockerPruneMode.value}
- error={$formInputs.dockerPruneMode.error}
- label={m.docker_prune_action_label()}
- description={pruneModeDescription}
- placeholder={m.docker_prune_placeholder()}
- options={pruneModeOptions}
- onValueChange={(v) => (pruneMode = v as 'all' | 'dangling')}
- />
+ </div>
+ </div>
+ </div>
- <TextInputWithLabel
- bind:value={$formInputs.maxImageUploadSize.value}
- error={$formInputs.maxImageUploadSize.error}
- label={m.docker_max_upload_size_label()}
- placeholder={m.docker_max_upload_size_placeholder()}
- helpText={m.docker_max_upload_size_description()}
- type="number"
- />
- </div>
- </Card.Content>
- </Card.Root>
+ <!-- Maintenance Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Maintenance</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- Cleanup Settings -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.docker_cleanup_settings_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.docker_cleanup_settings_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <SelectWithLabel
+ id="dockerPruneMode"
+ name="pruneMode"
+ bind:value={$formInputs.dockerPruneMode.value}
+ error={$formInputs.dockerPruneMode.error}
+ label={m.docker_prune_action_label()}
+ description={pruneModeDescription}
+ placeholder={m.docker_prune_placeholder()}
+ options={pruneModeOptions}
+ onValueChange={(v) => (pruneMode = v as 'all' | 'dangling')}
+ />
- <Card.Root>
- <Card.Header icon={TerminalIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.docker_terminal_settings_title()}</Card.Title>
- <Card.Description>{m.docker_terminal_settings_description()}</Card.Description>
+ <TextInputWithLabel
+ bind:value={$formInputs.maxImageUploadSize.value}
+ error={$formInputs.maxImageUploadSize.error}
+ label={m.docker_max_upload_size_label()}
+ placeholder={m.docker_max_upload_size_placeholder()}
+ helpText={m.docker_max_upload_size_description()}
+ type="number"
+ />
+ </div>
</div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <SelectWithLabel
- id="shellSelectValue"
- name="shellSelectValue"
- bind:value={shellSelectValue}
- label={m.docker_default_shell_label()}
- description={m.docker_default_shell_description()}
- placeholder={m.docker_default_shell_placeholder()}
- options={[
- ...shellOptions,
- { value: 'custom', label: m.custom(), description: m.docker_shell_custom_description() }
- ]}
- />
+ </div>
+ </div>
+ </div>
- {#if shellSelectValue === 'custom'}
- <div class="border-primary/20 border-l-2 pl-3">
- <TextInputWithLabel
- bind:value={$formInputs.defaultShell.value}
- error={$formInputs.defaultShell.error}
- label={m.custom()}
- placeholder={m.docker_shell_custom_path_placeholder()}
- helpText={m.docker_shell_custom_path_help()}
- type="text"
- />
- </div>
- {/if}
+ <!-- Terminal Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Terminal</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- Terminal Settings -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.docker_terminal_settings_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.docker_terminal_settings_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <SelectWithLabel
+ id="shellSelectValue"
+ name="shellSelectValue"
+ bind:value={shellSelectValue}
+ label={m.docker_default_shell_label()}
+ description={m.docker_default_shell_description()}
+ placeholder={m.docker_default_shell_placeholder()}
+ options={[
+ ...shellOptions,
+ { value: 'custom', label: m.custom(), description: m.docker_shell_custom_description() }
+ ]}
+ />
+
+ {#if shellSelectValue === 'custom'}
+ <div class="pt-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.defaultShell.value}
+ error={$formInputs.defaultShell.error}
+ label={m.custom()}
+ placeholder={m.docker_shell_custom_path_placeholder()}
+ helpText={m.docker_shell_custom_path_help()}
+ type="text"
+ />
+ </div>
+ {/if}
+ </div>
</div>
- </Card.Content>
- </Card.Root>
+ </div>
+ </div>
</div>
</fieldset>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/general/+page.svelte b/frontend/src/routes/(app)/settings/general/+page.svelte
index d228674d2..0f60ff408 100644
--- a/frontend/src/routes/(app)/settings/general/+page.svelte
+++ b/frontend/src/routes/(app)/settings/general/+page.svelte
@@ -1,21 +1,14 @@
<script lang="ts">
- import * as Card from '$lib/components/ui/card';
import { z } from 'zod/v4';
import { onMount } from 'svelte';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { m } from '$lib/paraglide/messages';
- import FolderIcon from '@lucide/svelte/icons/folder';
- import UserIcon from '@lucide/svelte/icons/user';
- import PaletteIcon from '@lucide/svelte/icons/palette';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import settingsStore from '$lib/stores/config-store';
- import SettingsIcon from '@lucide/svelte/icons/settings';
+ import { SettingsIcon } from '$lib/icons';
import { SettingsPageLayout } from '$lib/layouts';
- import AccentColorPicker from '$lib/components/accent-color/accent-color-picker.svelte';
- import { applyAccentColor } from '$lib/utils/accent-color-util';
- import SparklesIcon from '@lucide/svelte/icons/sparkles';
- import { Switch } from '$lib/components/ui/switch/index.js';
import { createSettingsForm } from '$lib/utils/settings-form.util';
+ import { Separator } from '$lib/components/ui/separator';
+ import { Label } from '$lib/components/ui/label';
let { data } = $props();
@@ -24,11 +17,8 @@
const formSchema = z.object({
projectsDirectory: z.string().min(1, m.general_projects_directory_required()),
- baseServerUrl: z.string().min(1, m.general_base_url_required()),
- enableGravatar: z.boolean(),
- environmentHealthInterval: z.number().int().min(1).max(60),
- accentColor: z.string(),
- glassEffectEnabled: z.boolean()
+ diskUsagePath: z.string().min(1, m.common_field_required({ field: m.directory_path() })),
+ environmentHealthInterval: z.number().int().min(1).max(60)
});
let { formInputs, registerOnMount } = $derived(
@@ -36,8 +26,7 @@
schema: formSchema,
currentSettings,
getCurrentSettings: () => $settingsStore || data.settings!,
- successMessage: m.general_settings_saved(),
- onReset: () => applyAccentColor(currentSettings.accentColor)
+ successMessage: m.general_settings_saved()
})
);
@@ -52,131 +41,60 @@
showReadOnlyTag={isReadOnly}
>
{#snippet mainContent()}
- <fieldset disabled={isReadOnly} class="relative">
- <div class="space-y-4 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={FolderIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.general_projects_heading()}</Card.Title>
- <Card.Description>{m.general_projects_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-3">
- <TextInputWithLabel
- bind:value={$formInputs.projectsDirectory.value}
- error={$formInputs.projectsDirectory.error}
- label={m.general_projects_directory_label()}
- placeholder={m.general_projects_directory_placeholder()}
- helpText={m.general_projects_directory_help()}
- type="text"
- />
-
- <TextInputWithLabel
- bind:value={$formInputs.baseServerUrl.value}
- error={$formInputs.baseServerUrl.error}
- label={m.general_base_url_label()}
- placeholder={m.general_base_url_placeholder()}
- helpText={m.general_base_url_help()}
- type="text"
- />
- </div>
- </Card.Content>
- </Card.Root>
-
- <Card.Root>
- <Card.Header icon={UserIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.general_user_avatars_heading()}</Card.Title>
- <Card.Description>{m.general_user_avatars_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <SwitchWithLabel
- id="enableGravatar"
- label={m.general_enable_gravatar_label()}
- description={m.general_enable_gravatar_description()}
- error={$formInputs.enableGravatar.error}
- bind:checked={$formInputs.enableGravatar.value}
- />
- </Card.Content>
- </Card.Root>
+ <fieldset disabled={isReadOnly} class="relative space-y-8">
+ <!-- System Configuration Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">System Configuration</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- Project Paths -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.general_projects_heading()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.general_projects_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <TextInputWithLabel
+ bind:value={$formInputs.projectsDirectory.value}
+ error={$formInputs.projectsDirectory.error}
+ label={m.general_projects_directory_label()}
+ placeholder={m.general_projects_directory_placeholder()}
+ helpText={m.general_projects_directory_help()}
+ type="text"
+ />
- <Card.Root>
- <Card.Header icon={SettingsIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.environments_health_check_title()}</Card.Title>
- <Card.Description>{m.environments_health_check_description()}</Card.Description>
+ <TextInputWithLabel
+ bind:value={$formInputs.diskUsagePath.value}
+ error={$formInputs.diskUsagePath.error}
+ label={m.disk_usage_settings()}
+ placeholder="/var/lib/docker"
+ helpText={m.disk_usage_settings_description()}
+ type="text"
+ />
+ </div>
</div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <TextInputWithLabel
- bind:value={$formInputs.environmentHealthInterval.value}
- error={$formInputs.environmentHealthInterval.error}
- label={m.environments_health_check_interval_label()}
- placeholder="2"
- helpText={m.environments_health_check_interval_description()}
- type="number"
- />
- </Card.Content>
- </Card.Root>
- <Card.Root>
- <Card.Header icon={PaletteIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.accent_color()}</Card.Title>
- <Card.Description>{m.accent_color_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="space-y-5">
- <AccentColorPicker
- previousColor={currentSettings.accentColor}
- bind:selectedColor={$formInputs.accentColor.value}
- disabled={isReadOnly}
- />
- </div>
- </Card.Content>
- </Card.Root>
+ <Separator />
- <Card.Root>
- <Card.Header icon={SparklesIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.glass_effect_title()}</Card.Title>
- <Card.Description>{m.glass_effect_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <div class="flex items-start gap-3 rounded-lg border p-3 sm:p-4">
- <div
- class="bg-primary/10 text-primary ring-primary/20 flex size-7 flex-shrink-0 items-center justify-center rounded-lg ring-1 sm:size-8"
- >
- <SparklesIcon class="size-3 sm:size-4" />
+ <!-- Health Check -->
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.environments_health_check_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.environments_health_check_description()}</p>
</div>
- <div class="flex flex-1 flex-col gap-3">
- <div>
- <h4 class="mb-1 text-sm leading-tight font-medium">{m.glass_effect_label()}</h4>
- <p class="text-muted-foreground text-xs leading-relaxed">
- {m.glass_effect_description_long()}
- </p>
- </div>
- <div class="flex items-center gap-2">
- <Switch
- id="glassEffectEnabled"
- bind:checked={$formInputs.glassEffectEnabled.value}
- disabled={isReadOnly}
- onCheckedChange={(checked) => {
- $formInputs.glassEffectEnabled.value = checked;
- }}
- />
- <label for="glassEffectEnabled" class="text-xs font-medium">
- {$formInputs.glassEffectEnabled.value ? m.glass_effect_enabled() : m.glass_effect_disabled()}
- </label>
- </div>
+ <div class="max-w-xs">
+ <TextInputWithLabel
+ bind:value={$formInputs.environmentHealthInterval.value}
+ error={$formInputs.environmentHealthInterval.error}
+ label={m.environments_health_check_interval_label()}
+ placeholder="2"
+ helpText={m.environments_health_check_interval_description()}
+ type="number"
+ />
</div>
</div>
- </Card.Content>
- </Card.Root>
+ </div>
+ </div>
</div>
</fieldset>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/navigation/+page.svelte b/frontend/src/routes/(app)/settings/navigation/+page.svelte
deleted file mode 100644
index 62bda4105..000000000
--- a/frontend/src/routes/(app)/settings/navigation/+page.svelte
+++ /dev/null
@@ -1,166 +0,0 @@
-<script lang="ts">
- import * as Card from '$lib/components/ui/card';
- import { z } from 'zod/v4';
- import { onMount } from 'svelte';
- import { toast } from 'svelte-sonner';
- import EyeIcon from '@lucide/svelte/icons/eye';
- import NavigationIcon from '@lucide/svelte/icons/navigation';
- import SidebarIcon from '@lucide/svelte/icons/sidebar';
- import NavigationSettingControl from '$lib/components/navigation-setting-control.svelte';
- import NavigationModeSettingControl from '$lib/components/navigation-mode-setting-control.svelte';
- import settingsStore from '$lib/stores/config-store';
- import { m } from '$lib/paraglide/messages';
- import { navigationSettingsOverridesStore, resetNavigationVisibility } from '$lib/utils/navigation.utils';
- import { SettingsPageLayout } from '$lib/layouts';
- import { Switch } from '$lib/components/ui/switch/index.js';
- import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
- import { createSettingsForm } from '$lib/utils/settings-form.util';
-
- let { data } = $props();
- const currentSettings = $derived($settingsStore || data.settings!);
- const isReadOnly = $derived.by(() => $settingsStore?.uiConfigDisabled);
-
- const formSchema = z.object({
- mobileNavigationMode: z.enum(['floating', 'docked']),
- mobileNavigationShowLabels: z.boolean(),
- sidebarHoverExpansion: z.boolean()
- });
-
- // Track local override state using the shared store
- let persistedState = $state(navigationSettingsOverridesStore.current);
-
- // Sidebar context is only available in desktop view
- let sidebar: ReturnType<typeof useSidebar> | null = null;
- try {
- sidebar = useSidebar();
- } catch {
- // Sidebar context not available (mobile view)
- }
-
- let { formInputs, registerOnMount } = $derived(
- createSettingsForm({
- schema: formSchema,
- currentSettings,
- getCurrentSettings: () => $settingsStore || data.settings!,
- successMessage: m.navigation_settings_saved()
- })
- );
-
- function setLocalOverride(key: 'mode' | 'showLabels', value: any) {
- const currentOverrides = navigationSettingsOverridesStore.current;
- navigationSettingsOverridesStore.current = { ...currentOverrides, [key]: value };
- persistedState = navigationSettingsOverridesStore.current;
- if (key === 'mode') resetNavigationVisibility();
- }
-
- function clearLocalOverride(key: 'mode' | 'showLabels') {
- const currentOverrides = navigationSettingsOverridesStore.current;
- const newOverrides = { ...currentOverrides };
- delete newOverrides[key];
- navigationSettingsOverridesStore.current = newOverrides;
- persistedState = navigationSettingsOverridesStore.current;
- if (key === 'mode') resetNavigationVisibility();
- toast.success(`Local override cleared for ${key.replace(/([A-Z])/g, ' $1').toLowerCase()}`);
- }
-
- onMount(() => registerOnMount());
-</script>
-
-<SettingsPageLayout
- title={m.navigation_title()}
- description={m.navigation_description()}
- icon={NavigationIcon}
- pageType="form"
- showReadOnlyTag={isReadOnly}
->
- {#snippet mainContent()}
- <div class="space-y-4 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={SidebarIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.navigation_desktop_sidebar_title()}</Card.Title>
- <Card.Description>{m.navigation_desktop_sidebar_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-3 sm:px-6 sm:py-4">
- <div class="flex items-start gap-3 rounded-lg border p-3 sm:p-4">
- <div
- class="bg-primary/10 text-primary ring-primary/20 flex size-7 shrink-0 items-center justify-center rounded-lg ring-1 sm:size-8"
- >
- <SidebarIcon class="size-3 sm:size-4" />
- </div>
- <div class="flex flex-1 flex-col gap-3">
- <div>
- <h4 class="mb-1 text-sm leading-tight font-medium">{m.navigation_sidebar_hover_expansion_label()}</h4>
- <p class="text-muted-foreground text-xs leading-relaxed">
- {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;
- // Update the sidebar immediately if context is available
- if (sidebar) {
- sidebar.setHoverExpansion(checked);
- }
- }}
- />
- <label for="sidebarHoverExpansion" class="text-xs font-medium">
- {$formInputs.sidebarHoverExpansion.value
- ? m.navigation_sidebar_hover_expansion_enabled()
- : m.navigation_sidebar_hover_expansion_disabled()}
- </label>
- </div>
- </div>
- </div>
- </Card.Content>
- </Card.Root>
-
- <Card.Root>
- <Card.Header icon={NavigationIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.navigation_mobile_appearance_title()}</Card.Title>
- <Card.Description>{m.navigation_mobile_appearance_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-3 sm:px-6 sm:py-4">
- <div class="grid grid-cols-1 gap-3 sm:gap-4 lg:grid-cols-[repeat(auto-fit,minmax(400px,1fr))]">
- <NavigationModeSettingControl
- id="mobileNavigationMode"
- label={m.navigation_mode_label()}
- description={m.navigation_mode_description()}
- icon={NavigationIcon}
- serverValue={$formInputs.mobileNavigationMode.value}
- localOverride={persistedState.mode}
- onServerChange={(value) => {
- $formInputs.mobileNavigationMode.value = value;
- }}
- onLocalOverride={(value) => setLocalOverride('mode', value)}
- onClearOverride={() => clearLocalOverride('mode')}
- serverDisabled={isReadOnly}
- />
-
- <NavigationSettingControl
- id="mobileNavigationShowLabels"
- label={m.navigation_show_labels_label()}
- description={m.navigation_show_labels_description()}
- icon={EyeIcon}
- serverValue={$formInputs.mobileNavigationShowLabels.value}
- localOverride={persistedState.showLabels}
- onServerChange={(value) => {
- $formInputs.mobileNavigationShowLabels.value = value;
- }}
- onLocalOverride={(value) => setLocalOverride('showLabels', value)}
- onClearOverride={() => clearLocalOverride('showLabels')}
- serverDisabled={isReadOnly}
- />
- </div>
- </Card.Content>
- </Card.Root>
- </div>
- {/snippet}
-</SettingsPageLayout>
diff --git a/frontend/src/routes/(app)/settings/notifications/+page.svelte b/frontend/src/routes/(app)/settings/notifications/+page.svelte
index abb504993..15f764073 100644
--- a/frontend/src/routes/(app)/settings/notifications/+page.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/+page.svelte
@@ -1,5 +1,4 @@
<script lang="ts">
- import * as Card from '$lib/components/ui/card';
import * as Alert from '$lib/components/ui/alert';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import * as Tabs from '$lib/components/ui/tabs';
@@ -14,9 +13,6 @@
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import SelectWithLabel from '$lib/components/form/select-with-label.svelte';
import { SettingsPageLayout } from '$lib/layouts';
- import BellIcon from '@lucide/svelte/icons/bell';
- import SendIcon from '@lucide/svelte/icons/send';
- import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
import settingsStore from '$lib/stores/config-store';
import { Label } from '$lib/components/ui/label';
import { Input } from '$lib/components/ui/input';
@@ -24,6 +20,8 @@
import { m } from '$lib/paraglide/messages';
import { notificationService } from '$lib/services/notification-service';
import type { EmailTLSMode, AppriseSettings } from '$lib/types/notification.type';
+ import { Switch } from '$lib/components/ui/switch/index.js';
+ import { NotificationsIcon, SendEmailIcon, ArrowDownIcon } from '$lib/icons';
interface FormNotificationSettings {
discordEnabled: boolean;
@@ -436,7 +434,7 @@
<SettingsPageLayout
title={m.notifications_title()}
description={m.notifications_description()}
- icon={BellIcon}
+ icon={NotificationsIcon}
pageType="form"
showReadOnlyTag={isReadOnly}
>
@@ -455,319 +453,357 @@
<Tabs.Trigger value="apprise">{m.notifications_tab_apprise()}</Tabs.Trigger>
</Tabs.List>
- <Tabs.Content value="built-in" class="mt-4 space-y-4 sm:mt-6 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={BellIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.notifications_discord_title()}</Card.Title>
- <Card.Description>{m.notifications_discord_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="space-y-4 px-3 py-4 sm:px-6">
- <SwitchWithLabel
- id="discord-enabled"
- bind:checked={$formInputs.discordEnabled.value}
- disabled={isReadOnly}
- label={m.notifications_discord_enabled_label()}
- description={m.notifications_discord_enabled_description()}
- />
-
- {#if $formInputs.discordEnabled.value}
- <div class="space-y-4 border-l-2 pl-4">
- <TextInputWithLabel
- bind:value={$formInputs.discordWebhookUrl.value}
- disabled={isReadOnly}
- label={m.notifications_discord_webhook_url_label()}
- placeholder={m.notifications_discord_webhook_url_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_discord_webhook_url_help()}
- />
- {#if $formInputs.discordWebhookUrl.error}
- <p class="text-destructive -mt-2 text-sm">{$formInputs.discordWebhookUrl.error}</p>
- {/if}
-
- <TextInputWithLabel
- bind:value={$formInputs.discordUsername.value}
- disabled={isReadOnly}
- label={m.notifications_discord_username_label()}
- placeholder={m.notifications_discord_username_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_discord_username_help()}
- />
-
- <TextInputWithLabel
- bind:value={$formInputs.discordAvatarUrl.value}
- disabled={isReadOnly}
- label={m.notifications_discord_avatar_url_label()}
- placeholder={m.notifications_discord_avatar_url_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_discord_avatar_url_help()}
- />
-
- <div class="space-y-3 pt-2">
- <Label class="text-sm font-medium">{m.notifications_events_title()}</Label>
- <p class="text-muted-foreground text-xs">{m.notifications_events_description()}</p>
- <div class="space-y-2">
- <SwitchWithLabel
- id="discord-event-image-update"
- bind:checked={$formInputs.discordEventImageUpdate.value}
- disabled={isReadOnly}
- label={m.notifications_event_image_update_label()}
- description={m.notifications_event_image_update_description()}
- />
- <SwitchWithLabel
- id="discord-event-container-update"
- bind:checked={$formInputs.discordEventContainerUpdate.value}
+ <Tabs.Content value="built-in" class="mt-4 space-y-8 sm:mt-6">
+ <!-- Discord Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Discord</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.notifications_discord_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.notifications_discord_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="discord-enabled"
+ bind:checked={$formInputs.discordEnabled.value}
disabled={isReadOnly}
- label={m.notifications_event_container_update_label()}
- description={m.notifications_event_container_update_description()}
+ onCheckedChange={(checked) => {
+ $formInputs.discordEnabled.value = checked;
+ }}
/>
+ <Label for="discord-enabled" class="font-normal">
+ {m.notifications_discord_enabled_label()}
+ </Label>
</div>
+
+ {#if $formInputs.discordEnabled.value}
+ <div class="space-y-4 pt-2">
+ <TextInputWithLabel
+ bind:value={$formInputs.discordWebhookUrl.value}
+ disabled={isReadOnly}
+ label={m.notifications_discord_webhook_url_label()}
+ placeholder={m.notifications_discord_webhook_url_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_discord_webhook_url_help()}
+ />
+ {#if $formInputs.discordWebhookUrl.error}
+ <p class="text-destructive -mt-2 text-sm">{$formInputs.discordWebhookUrl.error}</p>
+ {/if}
+
+ <TextInputWithLabel
+ bind:value={$formInputs.discordUsername.value}
+ disabled={isReadOnly}
+ label={m.notifications_discord_username_label()}
+ placeholder={m.notifications_discord_username_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_discord_username_help()}
+ />
+
+ <TextInputWithLabel
+ bind:value={$formInputs.discordAvatarUrl.value}
+ disabled={isReadOnly}
+ label={m.notifications_discord_avatar_url_label()}
+ placeholder={m.notifications_discord_avatar_url_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_discord_avatar_url_help()}
+ />
+
+ <div class="space-y-3 pt-2">
+ <Label class="text-sm font-medium">{m.notifications_events_title()}</Label>
+ <p class="text-muted-foreground text-xs">{m.notifications_events_description()}</p>
+ <div class="space-y-2">
+ <SwitchWithLabel
+ id="discord-event-image-update"
+ bind:checked={$formInputs.discordEventImageUpdate.value}
+ disabled={isReadOnly}
+ label={m.notifications_event_image_update_label()}
+ description={m.notifications_event_image_update_description()}
+ />
+ <SwitchWithLabel
+ id="discord-event-container-update"
+ bind:checked={$formInputs.discordEventContainerUpdate.value}
+ disabled={isReadOnly}
+ label={m.notifications_event_container_update_label()}
+ description={m.notifications_event_container_update_description()}
+ />
+ </div>
+ </div>
+
+ <div class="pt-2">
+ <Button
+ variant="outline"
+ onclick={() => testNotification('discord')}
+ disabled={isReadOnly || isTesting}
+ >
+ {#if isTesting}
+ <Spinner class="mr-2 h-4 w-4" />
+ {:else}
+ <SendEmailIcon class="mr-2 h-4 w-4" />
+ {/if}
+ {m.notifications_discord_test_button()}
+ </Button>
+ </div>
+ </div>
+ {/if}
</div>
</div>
- {/if}
- </Card.Content>
- <Card.Footer class="flex gap-2 px-3 py-4 sm:px-6">
- {#if $formInputs.discordEnabled.value}
- <Button variant="outline" onclick={() => testNotification('discord')} disabled={isReadOnly || isTesting}>
- {#if isTesting}
- <Spinner class="mr-2 h-4 w-4" />
- {:else}
- <SendIcon class="mr-2 h-4 w-4" />
- {/if}
- {m.notifications_discord_test_button()}
- </Button>
- {/if}
- </Card.Footer>
- </Card.Root>
- <Card.Root>
- <Card.Header icon={BellIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.notifications_email_title()}</Card.Title>
- <Card.Description>{m.notifications_email_description()}</Card.Description>
</div>
- </Card.Header>
- <Card.Content class="space-y-4 px-3 py-4 sm:px-6">
- <SwitchWithLabel
- id="email-enabled"
- bind:checked={$formInputs.emailEnabled.value}
- disabled={isReadOnly}
- label={m.notifications_email_enabled_label()}
- description={m.notifications_email_enabled_description()}
- />
-
- {#if $formInputs.emailEnabled.value}
- <div class="space-y-4 border-l-2 pl-4">
- <div class="grid grid-cols-2 gap-4">
- <TextInputWithLabel
- bind:value={$formInputs.emailSmtpHost.value}
- disabled={isReadOnly}
- label={m.notifications_email_smtp_host_label()}
- placeholder={m.notifications_email_smtp_host_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_email_smtp_host_help()}
- />
- {#if $formInputs.emailSmtpHost.error}
- <p class="text-destructive col-span-2 -mt-2 text-sm">{$formInputs.emailSmtpHost.error}</p>
- {/if}
-
- <div class="space-y-2">
- <Label for="smtp-port">{m.notifications_email_smtp_port_label()}</Label>
- <Input
- id="smtp-port"
- type="number"
- bind:value={$formInputs.emailSmtpPort.value}
+ </div>
+ </div>
+
+ <!-- Email Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Email</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.notifications_email_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.notifications_email_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="email-enabled"
+ bind:checked={$formInputs.emailEnabled.value}
disabled={isReadOnly}
- autocomplete="off"
- placeholder={m.notifications_email_smtp_port_placeholder()}
+ onCheckedChange={(checked) => {
+ $formInputs.emailEnabled.value = checked;
+ }}
/>
- <p class="text-muted-foreground text-sm">{m.notifications_email_smtp_port_help()}</p>
+ <Label for="email-enabled" class="font-normal">
+ {m.notifications_email_enabled_label()}
+ </Label>
</div>
- </div>
- <div class="grid grid-cols-2 gap-4">
- <TextInputWithLabel
- bind:value={$formInputs.emailSmtpUsername.value}
- disabled={isReadOnly}
- label={m.notifications_email_username_label()}
- placeholder={m.notifications_email_username_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_email_username_help()}
- />
-
- <TextInputWithLabel
- bind:value={$formInputs.emailSmtpPassword.value}
- disabled={isReadOnly}
- label={m.notifications_email_password_label()}
- placeholder={m.notifications_email_password_placeholder()}
- type="password"
- autocomplete="new-password"
- helpText={m.notifications_email_password_help()}
- />
- </div>
-
- <TextInputWithLabel
- bind:value={$formInputs.emailFromAddress.value}
- disabled={isReadOnly}
- label={m.notifications_email_from_address_label()}
- placeholder={m.notifications_email_from_address_placeholder()}
- type="email"
- autocomplete="off"
- helpText={m.notifications_email_from_address_help()}
- />
- {#if $formInputs.emailFromAddress.error}
- <p class="text-destructive -mt-2 text-sm">{$formInputs.emailFromAddress.error}</p>
- {/if}
-
- <div class="space-y-2">
- <Label for="to-addresses">{m.notifications_email_to_addresses_label()}</Label>
- <Textarea
- id="to-addresses"
- bind:value={$formInputs.emailToAddresses.value}
- disabled={isReadOnly}
- autocomplete="off"
- placeholder={m.notifications_email_to_addresses_placeholder()}
- rows={2}
- />
- {#if $formInputs.emailToAddresses.error}
- <p class="text-destructive text-sm">{$formInputs.emailToAddresses.error}</p>
- {:else}
- <p class="text-muted-foreground text-sm">{m.notifications_email_to_addresses_help()}</p>
+ {#if $formInputs.emailEnabled.value}
+ <div class="space-y-4 pt-2">
+ <div class="grid grid-cols-2 gap-4">
+ <TextInputWithLabel
+ bind:value={$formInputs.emailSmtpHost.value}
+ disabled={isReadOnly}
+ label={m.notifications_email_smtp_host_label()}
+ placeholder={m.notifications_email_smtp_host_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_email_smtp_host_help()}
+ />
+ {#if $formInputs.emailSmtpHost.error}
+ <p class="text-destructive col-span-2 -mt-2 text-sm">{$formInputs.emailSmtpHost.error}</p>
+ {/if}
+
+ <div class="space-y-2">
+ <Label for="smtp-port">{m.notifications_email_smtp_port_label()}</Label>
+ <Input
+ id="smtp-port"
+ type="number"
+ bind:value={$formInputs.emailSmtpPort.value}
+ disabled={isReadOnly}
+ autocomplete="off"
+ placeholder={m.notifications_email_smtp_port_placeholder()}
+ />
+ <p class="text-muted-foreground text-sm">{m.notifications_email_smtp_port_help()}</p>
+ </div>
+ </div>
+
+ <div class="grid grid-cols-2 gap-4">
+ <TextInputWithLabel
+ bind:value={$formInputs.emailSmtpUsername.value}
+ disabled={isReadOnly}
+ label={m.notifications_email_username_label()}
+ placeholder={m.notifications_email_username_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_email_username_help()}
+ />
+
+ <TextInputWithLabel
+ bind:value={$formInputs.emailSmtpPassword.value}
+ disabled={isReadOnly}
+ label={m.notifications_email_password_label()}
+ placeholder={m.notifications_email_password_placeholder()}
+ type="password"
+ autocomplete="new-password"
+ helpText={m.notifications_email_password_help()}
+ />
+ </div>
+
+ <TextInputWithLabel
+ bind:value={$formInputs.emailFromAddress.value}
+ disabled={isReadOnly}
+ label={m.notifications_email_from_address_label()}
+ placeholder={m.notifications_email_from_address_placeholder()}
+ type="email"
+ autocomplete="off"
+ helpText={m.notifications_email_from_address_help()}
+ />
+ {#if $formInputs.emailFromAddress.error}
+ <p class="text-destructive -mt-2 text-sm">{$formInputs.emailFromAddress.error}</p>
+ {/if}
+
+ <div class="space-y-2">
+ <Label for="to-addresses">{m.notifications_email_to_addresses_label()}</Label>
+ <Textarea
+ id="to-addresses"
+ bind:value={$formInputs.emailToAddresses.value}
+ disabled={isReadOnly}
+ autocomplete="off"
+ placeholder={m.notifications_email_to_addresses_placeholder()}
+ rows={2}
+ />
+ {#if $formInputs.emailToAddresses.error}
+ <p class="text-destructive text-sm">{$formInputs.emailToAddresses.error}</p>
+ {:else}
+ <p class="text-muted-foreground text-sm">{m.notifications_email_to_addresses_help()}</p>
+ {/if}
+ </div>
+
+ <SelectWithLabel
+ id="email-tls-mode"
+ label={m.notifications_email_tls_mode_label()}
+ bind:value={$formInputs.emailTlsMode.value}
+ disabled={isReadOnly}
+ placeholder={m.notifications_email_tls_mode_placeholder()}
+ options={[
+ { value: 'none', label: 'None' },
+ { value: 'starttls', label: 'StartTLS' },
+ { value: 'ssl', label: 'SSL/TLS' }
+ ]}
+ description={m.notifications_email_tls_mode_description()}
+ />
+ <div class="space-y-3 pt-2">
+ <Label class="text-sm font-medium">{m.notifications_events_title()}</Label>
+ <p class="text-muted-foreground text-xs">{m.notifications_events_description()}</p>
+ <div class="space-y-2">
+ <SwitchWithLabel
+ id="email-event-image-update"
+ bind:checked={$formInputs.emailEventImageUpdate.value}
+ disabled={isReadOnly}
+ label={m.notifications_event_image_update_label()}
+ description={m.notifications_event_image_update_description()}
+ />
+ <SwitchWithLabel
+ id="email-event-container-update"
+ bind:checked={$formInputs.emailEventContainerUpdate.value}
+ disabled={isReadOnly}
+ label={m.notifications_event_container_update_label()}
+ description={m.notifications_event_container_update_description()}
+ />
+ </div>
+ </div>
+
+ <div class="pt-2">
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger>
+ <Button variant="outline" disabled={isReadOnly || isTesting}>
+ {#if isTesting}
+ <Spinner class="mr-2 h-4 w-4" />
+ {:else}
+ <SendEmailIcon class="mr-2 h-4 w-4" />
+ {/if}
+ {m.notifications_email_test_button()}
+ <ArrowDownIcon class="ml-2 h-4 w-4" />
+ </Button>
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Content align="start">
+ <DropdownMenu.Item onclick={() => testNotification('email', 'simple')}>
+ <SendEmailIcon class="mr-2 h-4 w-4" />
+ {m.notifications_email_test_simple()}
+ </DropdownMenu.Item>
+ <DropdownMenu.Item onclick={() => testNotification('email', 'image-update')}>
+ <SendEmailIcon class="mr-2 h-4 w-4" />
+ {m.notifications_email_test_image_update()}
+ </DropdownMenu.Item>
+ </DropdownMenu.Content>
+ </DropdownMenu.Root>
+ </div>
+ </div>
{/if}
</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </Tabs.Content>
- <SelectWithLabel
- id="email-tls-mode"
- label={m.notifications_email_tls_mode_label()}
- bind:value={$formInputs.emailTlsMode.value}
- disabled={isReadOnly}
- placeholder={m.notifications_email_tls_mode_placeholder()}
- options={[
- { value: 'none', label: 'None' },
- { value: 'starttls', label: 'StartTLS' },
- { value: 'ssl', label: 'SSL/TLS' }
- ]}
- description={m.notifications_email_tls_mode_description()}
- />
- <div class="space-y-3 pt-2">
- <Label class="text-sm font-medium">{m.notifications_events_title()}</Label>
- <p class="text-muted-foreground text-xs">{m.notifications_events_description()}</p>
- <div class="space-y-2">
- <SwitchWithLabel
- id="email-event-image-update"
- bind:checked={$formInputs.emailEventImageUpdate.value}
- disabled={isReadOnly}
- label={m.notifications_event_image_update_label()}
- description={m.notifications_event_image_update_description()}
- />
- <SwitchWithLabel
- id="email-event-container-update"
- bind:checked={$formInputs.emailEventContainerUpdate.value}
+ <Tabs.Content value="apprise" class="mt-4 space-y-4 sm:mt-6 sm:space-y-6">
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">Apprise</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.notifications_apprise_title()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.notifications_apprise_description()}</p>
+ </div>
+ <div class="space-y-4">
+ <div class="flex items-center gap-2">
+ <Switch
+ id="apprise-enabled"
+ bind:checked={appriseSettings.enabled}
disabled={isReadOnly}
- label={m.notifications_event_container_update_label()}
- description={m.notifications_event_container_update_description()}
+ onCheckedChange={(checked) => {
+ appriseSettings.enabled = checked;
+ }}
/>
+ <Label for="apprise-enabled" class="font-normal">
+ {m.notifications_apprise_enabled_label()}
+ </Label>
</div>
+
+ {#if appriseSettings.enabled}
+ <div class="space-y-4 pt-2">
+ <TextInputWithLabel
+ bind:value={appriseSettings.apiUrl}
+ disabled={isReadOnly}
+ label={m.notifications_apprise_api_url_label()}
+ placeholder={m.notifications_apprise_api_url_placeholder()}
+ type="url"
+ autocomplete="off"
+ helpText={m.notifications_apprise_api_url_help()}
+ />
+ <TextInputWithLabel
+ bind:value={appriseSettings.imageUpdateTag}
+ disabled={isReadOnly}
+ label={m.notifications_apprise_image_tag_label()}
+ placeholder={m.notifications_apprise_image_tag_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_apprise_image_tag_help()}
+ />
+ <TextInputWithLabel
+ bind:value={appriseSettings.containerUpdateTag}
+ disabled={isReadOnly}
+ label={m.notifications_apprise_container_tag_label()}
+ placeholder={m.notifications_apprise_container_tag_placeholder()}
+ type="text"
+ autocomplete="off"
+ helpText={m.notifications_apprise_container_tag_help()}
+ />
+
+ <div class="pt-2">
+ <Button variant="outline" onclick={() => testAppriseNotification()} disabled={isReadOnly || isTesting}>
+ {#if isTesting}
+ <Spinner class="mr-2 h-4 w-4" />
+ {:else}
+ <SendEmailIcon class="mr-2 h-4 w-4" />
+ {/if}
+ {m.notifications_apprise_test_button()}
+ </Button>
+ </div>
+ </div>
+ {/if}
</div>
</div>
- {/if}
- </Card.Content>
- <Card.Footer class="flex gap-2 px-3 py-4 sm:px-6">
- {#if $formInputs.emailEnabled.value}
- <DropdownMenu.Root>
- <DropdownMenu.Trigger>
- <Button variant="outline" disabled={isReadOnly || isTesting}>
- {#if isTesting}
- <Spinner class="mr-2 h-4 w-4" />
- {:else}
- <SendIcon class="mr-2 h-4 w-4" />
- {/if}
- {m.notifications_email_test_button()}
- <ChevronDownIcon class="ml-2 h-4 w-4" />
- </Button>
- </DropdownMenu.Trigger>
- <DropdownMenu.Content align="start">
- <DropdownMenu.Item onclick={() => testNotification('email', 'simple')}>
- <SendIcon class="mr-2 h-4 w-4" />
- {m.notifications_email_test_simple()}
- </DropdownMenu.Item>
- <DropdownMenu.Item onclick={() => testNotification('email', 'image-update')}>
- <SendIcon class="mr-2 h-4 w-4" />
- {m.notifications_email_test_image_update()}
- </DropdownMenu.Item>
- </DropdownMenu.Content>
- </DropdownMenu.Root>
- {/if}
- </Card.Footer>
- </Card.Root>
- </Tabs.Content>
-
- <Tabs.Content value="apprise" class="mt-4 space-y-4 sm:mt-6 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={BellIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.notifications_apprise_title()}</Card.Title>
- <Card.Description>{m.notifications_apprise_description()}</Card.Description>
</div>
- </Card.Header>
- <Card.Content class="space-y-4 px-3 py-4 sm:px-6">
- <SwitchWithLabel
- id="apprise-enabled"
- bind:checked={appriseSettings.enabled}
- disabled={isReadOnly}
- label={m.notifications_apprise_enabled_label()}
- description={m.notifications_apprise_enabled_description()}
- />
- {#if appriseSettings.enabled}
- <div class="space-y-4 border-l-2 pl-4">
- <TextInputWithLabel
- bind:value={appriseSettings.apiUrl}
- disabled={isReadOnly}
- label={m.notifications_apprise_api_url_label()}
- placeholder={m.notifications_apprise_api_url_placeholder()}
- type="url"
- autocomplete="off"
- helpText={m.notifications_apprise_api_url_help()}
- />
- <TextInputWithLabel
- bind:value={appriseSettings.imageUpdateTag}
- disabled={isReadOnly}
- label={m.notifications_apprise_image_tag_label()}
- placeholder={m.notifications_apprise_image_tag_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_apprise_image_tag_help()}
- />
- <TextInputWithLabel
- bind:value={appriseSettings.containerUpdateTag}
- disabled={isReadOnly}
- label={m.notifications_apprise_container_tag_label()}
- placeholder={m.notifications_apprise_container_tag_placeholder()}
- type="text"
- autocomplete="off"
- helpText={m.notifications_apprise_container_tag_help()}
- />
- </div>
- {/if}
- </Card.Content>
- <Card.Footer class="flex gap-2 px-3 py-4 sm:px-6">
- {#if appriseSettings.enabled}
- <Button variant="outline" onclick={() => testAppriseNotification()} disabled={isReadOnly || isTesting}>
- {#if isTesting}
- <Spinner class="mr-2 h-4 w-4" />
- {:else}
- <SendIcon class="mr-2 h-4 w-4" />
- {/if}
- {m.notifications_apprise_test_button()}
- </Button>
- {/if}
- </Card.Footer>
- </Card.Root>
+ </div>
+ </div>
</Tabs.Content>
</Tabs.Root>
</fieldset>
diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelte
index fb2f1fa14..a89d7b685 100644
--- a/frontend/src/routes/(app)/settings/security/+page.svelte
+++ b/frontend/src/routes/(app)/settings/security/+page.svelte
@@ -1,28 +1,22 @@
<script lang="ts">
- import * as Card from '$lib/components/ui/card';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
import { z } from 'zod/v4';
import { onMount } from 'svelte';
import { Button } from '$lib/components/ui/button';
import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
- import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
- import DropdownCard from '$lib/components/dropdown-card.svelte';
+ import { Switch } from '$lib/components/ui/switch/index.js';
+ import { Separator } from '$lib/components/ui/separator';
import { toast } from 'svelte-sonner';
import type { PageData } from './$types';
import type { Settings } from '$lib/types/settings.type';
import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import { m } from '$lib/paraglide/messages';
- import LockIcon from '@lucide/svelte/icons/lock';
- import ClockIcon from '@lucide/svelte/icons/clock';
- import KeyIcon from '@lucide/svelte/icons/key';
- import ShieldCheckIcon from '@lucide/svelte/icons/shield-check';
- import CopyIcon from '@lucide/svelte/icons/copy';
- import InfoIcon from '@lucide/svelte/icons/info';
+ import { LockIcon, InfoIcon } from '$lib/icons';
import TextInputWithLabel from '$lib/components/form/text-input-with-label.svelte';
import settingsStore from '$lib/stores/config-store';
import { SettingsPageLayout } from '$lib/layouts';
- import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
+ import { CopyButton } from '$lib/components/ui/copy-button';
import { createSettingsForm } from '$lib/utils/settings-form.util';
let { data }: { data: PageData } = $props();
@@ -111,7 +105,6 @@
$formInputs.oidcClientSecret.value !== ''
);
- const clipboard = new UseClipboard();
const redirectUri = $derived(`${globalThis?.location?.origin ?? ''}/auth/oidc/callback`);
const isOidcEnvForced = $derived(data.oidcStatus.envForced);
@@ -195,11 +188,6 @@
showMergeAccountsAlert = false;
}
- function handleCopy(text?: string) {
- if (!text) return;
- clipboard.copy(text);
- }
-
onMount(() => {
// Use custom submit/reset for security page
settingsForm.registerFormActions(customSubmit, customReset);
@@ -214,243 +202,268 @@
showReadOnlyTag={isReadOnly}
>
{#snippet mainContent()}
- <fieldset disabled={isReadOnly} class="relative">
- <div class="space-y-4 sm:space-y-6">
- <Card.Root>
- <Card.Header icon={LockIcon}>
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.security_authentication_heading()}</Card.Title>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <SwitchWithLabel
- id="localAuthSwitch"
- label={m.security_local_auth_label()}
- description={m.security_local_auth_description()}
- error={$formInputs.authLocalEnabled.error}
- bind:checked={$formInputs.authLocalEnabled.value}
- onCheckedChange={handleLocalSwitchChange}
- />
- </Card.Content>
- </Card.Root>
-
- <DropdownCard
- id="oidc-settings"
- title={m.security_oidc_auth_label()}
- description={m.security_oidc_auth_description()}
- icon={ShieldCheckIcon}
- defaultExpanded={currentSettings.oidcEnabled || isOidcEnvForced}
- >
- {#snippet badge()}
- {#if isOidcEnvForced}
- <span
- class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
- >
- {m.security_server_configured()}
- </span>
- {/if}
- {/snippet}
- <div class="space-y-4">
- <SwitchWithLabel
- id="oidcEnabledSwitch"
- label={m.security_oidc_enabled_label()}
- description={m.security_oidc_enabled_description()}
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcEnabled.value}
- onCheckedChange={handleOidcEnabledChange}
- />
-
- <div class="space-y-4 border-t pt-4">
- <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"
- />
- </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>
+ <fieldset disabled={isReadOnly} class="relative space-y-8">
+ <!-- Authentication Section -->
+ <div class="space-y-4">
+ <h3 class="text-lg font-medium">{m.security_authentication_heading()}</h3>
+ <div class="bg-card rounded-lg border shadow-sm">
+ <div class="space-y-6 p-6">
+ <!-- Local Auth -->
+ <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="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"
+ <div class="flex items-center gap-2">
+ <Switch
+ id="localAuthSwitch"
+ bind:checked={$formInputs.authLocalEnabled.value}
+ onCheckedChange={handleLocalSwitchChange}
/>
- <p class="text-muted-foreground text-xs">{m.oidc_issuer_url_description()}</p>
+ <Label for="localAuthSwitch" class="font-normal">
+ {$formInputs.authLocalEnabled.value ? m.common_enabled() : m.common_disabled()}
+ </Label>
</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"
- />
+ <Separator />
+
+ <!-- OIDC Auth -->
+ <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>
+ {#if isOidcEnvForced}
+ <div class="mt-2">
+ <span
+ class="inline-flex items-center gap-1.5 rounded-full bg-amber-100 px-2.5 py-1 text-xs font-medium text-amber-800 ring-1 ring-amber-200 dark:bg-amber-900/50 dark:text-amber-200 dark:ring-amber-800"
+ >
+ {m.security_server_configured()}
+ </span>
+ </div>
+ {/if}
</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>
- <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.oidcEnabled.value || isOidcEnvForced}
+ <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"
+ />
+ </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>
+ </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>
+ </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"
+ />
+ </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"
+ />
+ </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>
+ </div>
+ </div>
+ </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>
+ <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>
- <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>
- </div>
- </div>
+ {/if}
</div>
+ </div>
+ </div>
+ </div>
+ </div>
- <div class="border-t pt-4">
- <SwitchWithLabel
- id="oidcMergeAccountsSwitch"
- label={m.security_oidc_merge_accounts_label()}
- description={m.security_oidc_merge_accounts_description()}
- disabled={isOidcEnvForced}
- bind:checked={$formInputs.oidcMergeAccounts.value}
- onCheckedChange={handleMergeAccountsChange}
+ <!-- Session Section -->
+ <div class="space-y-4">
+ <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">
+ <TextInputWithLabel
+ bind:value={$formInputs.authSessionTimeout.value}
+ error={$formInputs.authSessionTimeout.error}
+ label={m.security_session_timeout_label()}
+ placeholder={m.security_session_timeout_placeholder()}
+ helpText={m.security_session_timeout_description()}
+ type="number"
/>
</div>
</div>
+ </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>
+ <!-- Password Policy Section -->
+ <div class="space-y-4">
+ <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>
- <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>
- <Button
- size="sm"
- variant="outline"
- onclick={() => handleCopy(redirectUri)}
- class="shrink-0"
- title={m.common_copy()}
- >
- <CopyIcon class="size-3" />
- </Button>
+ <div>
+ <Tooltip.Provider>
+ <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'basic'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
+ type="button"
+ >{m.common_basic()}
+ </Button>
+ </Tooltip.Trigger>
+ <Tooltip.Content side="top" align="center">{m.security_password_policy_basic_tooltip()}</Tooltip.Content>
+ </Tooltip.Root>
+
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'standard'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
+ type="button"
+ >{m.security_password_policy_standard()}
+ </Button>
+ </Tooltip.Trigger>
+ <Tooltip.Content side="top" align="center">{m.security_password_policy_standard_tooltip()}</Tooltip.Content>
+ </Tooltip.Root>
+
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ <Button
+ variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
+ class={$formInputs.authPasswordPolicy.value === 'strong'
+ ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
+ : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
+ type="button"
+ >{m.security_password_policy_strong()}
+ </Button>
+ </Tooltip.Trigger>
+ <Tooltip.Content side="top" align="center">{m.security_password_policy_strong_tooltip()}</Tooltip.Content>
+ </Tooltip.Root>
+ </div>
+ </Tooltip.Provider>
</div>
</div>
- </div></DropdownCard
- >
-
- <Card.Root>
- <Card.Header icon={ClockIcon} class="items-start">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.security_session_heading()}</Card.Title>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <TextInputWithLabel
- bind:value={$formInputs.authSessionTimeout.value}
- error={$formInputs.authSessionTimeout.error}
- label={m.security_session_timeout_label()}
- placeholder={m.security_session_timeout_placeholder()}
- helpText={m.security_session_timeout_description()}
- type="number"
- />
- </Card.Content>
- </Card.Root>
-
- <Card.Root>
- <Card.Header icon={KeyIcon} class="items-start">
- <div class="flex flex-col space-y-1.5">
- <Card.Title>{m.security_password_policy_label()}</Card.Title>
- <Card.Description>{m.security_password_policy_description()}</Card.Description>
- </div>
- </Card.Header>
- <Card.Content class="px-3 py-4 sm:px-6">
- <Tooltip.Provider>
- <div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'basic'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- type="button"
- >{m.common_basic()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_basic_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'standard'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- type="button"
- >{m.security_password_policy_standard()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_standard_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
-
- <Tooltip.Root>
- <Tooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'strong'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
- onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- type="button"
- >{m.security_password_policy_strong()}
- </Button>
- </Tooltip.Trigger>
- <Tooltip.Content side="top" align="center">{m.security_password_policy_strong_tooltip()}</Tooltip.Content>
- </Tooltip.Root>
- </div>
- </Tooltip.Provider>
- </Card.Content>
- </Card.Root>
+ </div>
+ </div>
</div>
</fieldset>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/users/+page.svelte b/frontend/src/routes/(app)/settings/users/+page.svelte
index 6770c3072..7cad69052 100644
--- a/frontend/src/routes/(app)/settings/users/+page.svelte
+++ b/frontend/src/routes/(app)/settings/users/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import UsersIcon from '@lucide/svelte/icons/users';
+ import { UsersIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
diff --git a/frontend/src/routes/(app)/settings/users/user-table.svelte b/frontend/src/routes/(app)/settings/users/user-table.svelte
index d7af12a6d..91f00672a 100644
--- a/frontend/src/routes/(app)/settings/users/user-table.svelte
+++ b/frontend/src/routes/(app)/settings/users/user-table.svelte
@@ -1,9 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import EditIcon from '@lucide/svelte/icons/edit';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -12,11 +9,11 @@
import { tryCatch } from '$lib/utils/try-catch';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { User } from '$lib/types/user.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import { m } from '$lib/paraglide/messages';
import { userService } from '$lib/services/user-service';
- import UserIcon from '@lucide/svelte/icons/user';
+ import { UserIcon, TrashIcon, EditIcon, EllipsisIcon } from '$lib/icons';
let {
users = $bindable(),
@@ -151,15 +148,7 @@
<StatusBadge text={getRoleText(item.roles)} variant={getRoleBadgeVariant(item.roles)} />
{/snippet}
-{#snippet UserMobileCardSnippet({
- row,
- item,
- mobileFieldVisibility
-}: {
- row: any;
- item: User;
- mobileFieldVisibility: Record<string, boolean>;
-})}
+{#snippet UserMobileCardSnippet({ item, mobileFieldVisibility }: { item: User; mobileFieldVisibility: MobileFieldVisibility })}
<UniversalMobileCard
{item}
icon={{ component: UserIcon, variant: 'blue' }}
@@ -206,7 +195,7 @@
</DropdownMenu.Item>
{/if}
<DropdownMenu.Item variant="destructive" onclick={() => handleDeleteUser(item.id, item.username)}>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_delete()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(app)/volumes/+page.svelte b/frontend/src/routes/(app)/volumes/+page.svelte
index a2b97f4df..d8dd9bdac 100644
--- a/frontend/src/routes/(app)/volumes/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/+page.svelte
@@ -1,7 +1,5 @@
<script lang="ts">
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ArchiveRestoreIcon from '@lucide/svelte/icons/archive-restore';
- import ArchiveXIcon from '@lucide/svelte/icons/archive-x';
+ import { VolumesIcon, VolumeUnusedIcon, VolumeUsedIcon } from '$lib/icons';
import { toast } from 'svelte-sonner';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { tryCatch } from '$lib/utils/try-catch';
@@ -81,21 +79,21 @@
{
title: m.volumes_stat_total(),
value: volumeUsageCounts.total,
- icon: HardDriveIcon,
+ icon: VolumesIcon,
iconColor: 'text-blue-500',
class: 'border-l-4 border-l-blue-500'
},
{
title: m.volumes_stat_used(),
value: volumeUsageCounts.inuse,
- icon: ArchiveRestoreIcon,
+ icon: VolumeUsedIcon,
iconColor: 'text-green-500',
class: 'border-l-4 border-l-green-500'
},
{
title: m.volumes_stat_unused(),
value: volumeUsageCounts.unused,
- icon: ArchiveXIcon,
+ icon: VolumeUnusedIcon,
iconColor: 'text-red-500',
class: 'border-l-4 border-l-red-500'
}
diff --git a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
index e7cf67ea7..7e79e0437 100644
--- a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
@@ -1,12 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import HardDriveIcon from '@lucide/svelte/icons/hard-drive';
- import ClockIcon from '@lucide/svelte/icons/clock';
- import TagIcon from '@lucide/svelte/icons/tag';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import GlobeIcon from '@lucide/svelte/icons/globe';
- import InfoIcon from '@lucide/svelte/icons/info';
+ import { VolumesIcon, ClockIcon, TagIcon, LayersIcon, InfoIcon, GlobeIcon, ContainersIcon, BoxIcon } from '$lib/icons';
import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
import { goto } from '$app/navigation';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
@@ -17,7 +11,6 @@
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { format } from 'date-fns';
- import ContainerIcon from '@lucide/svelte/icons/container';
import { m } from '$lib/paraglide/messages';
import { untrack } from 'svelte';
import { volumeService } from '$lib/services/volume-service.js';
@@ -121,7 +114,7 @@
<div class="grid grid-cols-1 gap-x-4 gap-y-6 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6">
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-gray-500/10 p-2">
- <DatabaseIcon class="size-5 text-gray-500" />
+ <BoxIcon class="size-5 text-gray-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.common_name()}</p>
@@ -133,7 +126,7 @@
<div class="flex items-start gap-3">
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-blue-500/10 p-2">
- <HardDriveIcon class="size-5 text-blue-500" />
+ <VolumesIcon class="size-5 text-blue-500" />
</div>
<div class="min-w-0 flex-1">
<p class="text-muted-foreground text-sm font-medium">{m.common_driver()}</p>
@@ -199,7 +192,7 @@
</Card.Root>
<Card.Root>
- <Card.Header icon={ContainerIcon}>
+ <Card.Header icon={ContainersIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.volumes_containers_using_title()}</Card.Title>
<Card.Description>{m.volumes_containers_using_description()}</Card.Description>
@@ -213,7 +206,7 @@
<div class="flex flex-col p-3 sm:flex-row sm:items-center">
<div class="mb-2 w-full font-medium break-all sm:mb-0 sm:w-1/3">
<a href="/containers/{c.id}" class="text-primary flex items-center hover:underline">
- <ContainerIcon class="text-muted-foreground mr-1.5 size-3.5" />
+ <ContainersIcon class="text-muted-foreground mr-1.5 size-3.5" />
{c.name}
</a>
</div>
@@ -277,7 +270,7 @@
{#if volume.options && Object.keys(volume.options).length > 0}
<Card.Root>
- <Card.Header icon={HardDriveIcon}>
+ <Card.Header icon={VolumesIcon}>
<div class="flex flex-col space-y-1.5">
<Card.Title>{m.common_driver_options()}</Card.Title>
<Card.Description>{m.volumes_driver_options_description()}</Card.Description>
@@ -319,7 +312,7 @@
{:else}
<div class="flex flex-col items-center justify-center px-4 py-16 text-center">
<div class="bg-muted/30 mb-4 rounded-full p-4">
- <DatabaseIcon class="text-muted-foreground size-10 opacity-70" />
+ <BoxIcon class="text-muted-foreground size-10 opacity-70" />
</div>
<h2 class="mb-2 text-xl font-medium">{m.common_not_found_title({ resource: m.volumes_title() })}</h2>
<p class="text-muted-foreground mb-6">{m.common_not_found_description({ resource: m.volumes_title().toLowerCase() })}</p>
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index 25eaeccd5..c8fb019a5 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -1,9 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { Button } from '$lib/components/ui/button/index.js';
- import EllipsisIcon from '@lucide/svelte/icons/ellipsis';
- import ScanSearchIcon from '@lucide/svelte/icons/scan-search';
- import Trash2Icon from '@lucide/svelte/icons/trash-2';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -15,16 +12,13 @@
import { truncateString } from '$lib/utils/string.utils';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { VolumeSummaryDto, VolumeSizeInfo } from '$lib/types/volume.type';
- import type { ColumnSpec } from '$lib/components/arcane-table';
+ import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
- import DatabaseIcon from '@lucide/svelte/icons/database';
- import CalendarIcon from '@lucide/svelte/icons/calendar';
- import LoaderCircleIcon from '@lucide/svelte/icons/loader-circle';
import { m } from '$lib/paraglide/messages';
import { volumeService } from '$lib/services/volume-service';
import bytes from 'bytes';
-
- type FieldVisibility = Record<string, boolean>;
+ import { TrashIcon, EllipsisIcon, InspectIcon, VolumesIcon, CalendarIcon } from '$lib/icons';
+ import { Spinner } from '$lib/components/ui/spinner';
let {
volumes = $bindable(),
@@ -163,7 +157,7 @@
{#if volumeSizesPromise}
{#await volumeSizesPromise}
<span class="text-muted-foreground flex items-center gap-1 text-sm">
- <LoaderCircleIcon class="size-3 animate-spin" />
+ <Spinner class="size-4" />
</span>
{:then sizesMap}
{@const sizeInfo = sizesMap.get(item.name)}
@@ -185,18 +179,16 @@
{/snippet}
{#snippet VolumeMobileCardSnippet({
- row,
item,
mobileFieldVisibility
}: {
- row: any;
item: VolumeSummaryDto;
- mobileFieldVisibility: FieldVisibility;
+ mobileFieldVisibility: MobileFieldVisibility;
})}
<UniversalMobileCard
{item}
icon={(item) => ({
- component: DatabaseIcon,
+ component: VolumesIcon,
variant: item.inUse ? 'emerald' : 'amber'
})}
title={(item) => item.name}
@@ -213,7 +205,7 @@
{
label: m.common_driver(),
getValue: (item: VolumeSummaryDto) => item.driver,
- icon: DatabaseIcon,
+ icon: VolumesIcon,
iconVariant: 'gray' as const,
show: mobileFieldVisibility.driver ?? true
}
@@ -243,11 +235,11 @@
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
<DropdownMenu.Item onclick={() => goto(`/volumes/${item.id}`)}>
- <ScanSearchIcon class="size-4" />
+ <InspectIcon class="size-4" />
{m.common_inspect()}
</DropdownMenu.Item>
<DropdownMenu.Item variant="destructive" onclick={() => handleRemoveVolumeConfirm(item.name)} disabled={item.inUse}>
- <Trash2Icon class="size-4" />
+ <TrashIcon class="size-4" />
{m.common_remove()}
</DropdownMenu.Item>
</DropdownMenu.Group>
diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelte
index 07901bf67..252839db8 100644
--- a/frontend/src/routes/(auth)/login/+page.svelte
+++ b/frontend/src/routes/(auth)/login/+page.svelte
@@ -4,17 +4,13 @@
import * as Card from '$lib/components/ui/card/index.js';
import * as Alert from '$lib/components/ui/alert/index.js';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
- import CircleAlertIcon from '@lucide/svelte/icons/alert-circle';
- import LogInIcon from '@lucide/svelte/icons/log-in';
- import LockIcon from '@lucide/svelte/icons/lock';
- import UserIcon from '@lucide/svelte/icons/user';
+ import { AlertIcon, LockIcon, UserIcon, ArrowRightIcon, GithubIcon, OpenIdIcon, LoginIcon } from '$lib/icons';
import type { PageData } from './$types';
import { goto } from '$app/navigation';
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
import { authService } from '$lib/services/auth-service';
import { getApplicationLogo } from '$lib/utils/image.util';
- import GithubIcon from '$lib/icons/github-icon.svelte';
let { data }: { data: PageData } = $props();
@@ -116,7 +112,7 @@
<div class="space-y-4">
{#if data.error}
<Alert.Root variant="destructive" class="glass-light">
- <CircleAlertIcon class="size-4" />
+ <AlertIcon class="size-4" />
<Alert.Title>{m.auth_login_problem_title()}</Alert.Title>
<Alert.Description>
{#if data.error === 'oidc_invalid_response'}
@@ -142,7 +138,7 @@
{#if error}
<Alert.Root variant="destructive" class="glass-light">
- <CircleAlertIcon class="size-4" />
+ <AlertIcon class="size-4" />
<Alert.Title>{m.auth_failed_title()}</Alert.Title>
<Alert.Description>{error}</Alert.Description>
</Alert.Root>
@@ -150,7 +146,7 @@
{#if !showLocalLoginForm && !showOidcLoginButton}
<Alert.Root variant="destructive" class="glass-light">
- <CircleAlertIcon class="size-4" />
+ <AlertIcon class="size-4" />
<Alert.Title>{m.auth_no_login_methods_title()}</Alert.Title>
<Alert.Description>{m.auth_no_login_methods_description()}</Alert.Description>
</Alert.Root>
@@ -158,7 +154,7 @@
{#if showOidcLoginButton && !showLocalLoginForm}
<Button onclick={handleOidcLogin} class="hover-lift w-full" size="lg">
- <LogInIcon class="mr-2 size-4" />
+ <ArrowRightIcon class="mr-2 size-4" />
{m.auth_oidc_signin()}
</Button>
{/if}
@@ -206,7 +202,7 @@
<div class="mr-2 size-4 animate-spin rounded-full border-2 border-white/30 border-t-white"></div>
{m.auth_signing_in()}
{:else}
- <LogInIcon class="mr-2 size-4" />
+ <LoginIcon class="mr-2 size-4" />
{m.auth_signin_button()}
{/if}
</Button>
@@ -227,7 +223,7 @@
{#if showOidcLoginButton && showDivider}
<Button onclick={handleOidcLogin} variant="outline" class="hover-lift w-full" size="lg">
- <LogInIcon class="mr-2 size-4" />
+ <OpenIdIcon class="size-4" />
{m.auth_oidc_signin()}
</Button>
{/if}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 28e696e0f..b94b62efe 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,8 +1,8 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
- "target": "ES2022",
- "verbatimModuleSyntax": true,
+ "target": "ES2022",
+ "verbatimModuleSyntax": true,
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
@@ -11,6 +11,7 @@
"skipLibCheck": true,
"sourceMap": false,
"strict": true,
- "moduleResolution": "bundler"
+ "moduleResolution": "bundler",
+ "types": ["unplugin-icons/types/svelte"]
}
}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 7ed45a01d..8359eeab7 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -3,6 +3,7 @@ import { paraglideVitePlugin } from '@inlang/paraglide-js';
import tailwindcss from '@tailwindcss/vite';
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';
+import Icons from 'unplugin-icons/vite';
export default defineConfig({
optimizeDeps: { exclude: ['@lucide/svelte'] },
@@ -15,7 +16,11 @@ export default defineConfig({
cookieName: 'locale',
strategy: ['cookie', 'preferredLanguage', 'baseLocale']
}),
- devtoolsJson()
+ devtoolsJson(),
+ Icons({
+ compiler: 'svelte',
+ autoInstall: true
+ })
],
build: {
target: 'es2022',
diff --git a/go.work.sum b/go.work.sum
index b98ddfb06..4d05a6623 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -1,278 +1,554 @@
+cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
+cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=
cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=
+cloud.google.com/go/auth v0.16.4 h1:fXOAIQmkApVvcIn7Pc2+5J8QTMVbUGLscnSVNl11su8=
cloud.google.com/go/auth v0.16.4/go.mod h1:j10ncYwjX/g3cdX7GpEzsdM+d+ZNsXAbb6qXA7p1Y5M=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
+cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
+cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
+cloud.google.com/go/longrunning v0.6.7 h1:IGtfDWHhQCgCjwQjV9iiLnUta9LBCo8R9QmAFsS/PrE=
cloud.google.com/go/longrunning v0.6.7/go.mod h1:EAFV3IZAKmM56TyiE6VAP3VoTzhZzySwI/YI1s/nRsY=
+cloud.google.com/go/monitoring v1.24.2 h1:5OTsoJ1dXYIiMiuL+sYscLc9BumrL3CarVLL7dd7lHM=
cloud.google.com/go/monitoring v1.24.2/go.mod h1:x7yzPWcgDRnPEv3sI+jJGBkwl5qINf+6qY4eq0I9B4U=
+cloud.google.com/go/spanner v1.85.0 h1:VVO3yW+0+Yx9tg4SQaZvJHGAnU6qCnGXQ3NX4E3+src=
cloud.google.com/go/spanner v1.85.0/go.mod h1:9zhmtOEoYV06nE4Orbin0dc/ugHzZW9yXuvaM61rpxs=
+cloud.google.com/go/storage v1.56.0 h1:iixmq2Fse2tqxMbWhLWC9HfBj1qdxqAmiK8/eqtsLxI=
cloud.google.com/go/storage v1.56.0/go.mod h1:Tpuj6t4NweCLzlNbw9Z9iwxEkrSem20AetIeH/shgVU=
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
+github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
+github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o=
github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
+github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRiRH3CR3Mj8pxqCcdD5A=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 h1:MhRfI58HblXzCtWEZCO0feHs8LweePB3s90r7WaR1KU=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0/go.mod h1:okZ+ZURbArNdlJ+ptXoyHNuOETzOl1Oww19rm8I2WLA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 h1:mlmW46Q0B79I+Aj4azKC6xDMFN9a9SyZWESlGWYXbFs=
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0/go.mod h1:PXe2h+LKcWTX9afWdZoHyODqR4fBa5boUM/8uJfZ0Jo=
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest/autorest/adal v0.9.16 h1:P8An8Z9rH1ldbOLdFpxYorgOt2sywL9V24dAwWHPuGc=
github.com/Azure/go-autorest/autorest/adal v0.9.16/go.mod h1:tGMin8I49Yij6AQ+rvV+Xa/zwxYQB5hmsd6DkfAx2+A=
+github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
+github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
+github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/ClickHouse/clickhouse-go v1.4.3 h1:iAFMa2UrQdR5bHJ2/yaSLffZkxpcOYQMCUuKeNXGdqc=
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
+github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3 h1:2afWGsMzkIcN8Qm4mgPJKZWyroE5QBszMiDMYEBrnfw=
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs=
+github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ=
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/Microsoft/go-winio v0.4.21/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
+github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
+github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI=
github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
+github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
+github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U=
github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs=
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/aws/aws-sdk-go v1.49.6 h1:yNldzF5kzLBRvKlKz1S0bkvc2+04R1kt13KfBWQBfFA=
github.com/aws/aws-sdk-go v1.49.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8=
github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=
+github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco=
github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg=
github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10 h1:zeN9UtUlA6FTx0vFSayxSX32HDw73Yb6Hh2izDSFxXY=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.10/go.mod h1:3HKuexPDcwLWPaqpW2UR/9n8N/u/3CKcGAzSs8p8u8g=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw=
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4=
+github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0=
github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM=
+github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc=
github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo=
+github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
+github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/checkpoint-restore/checkpointctl v1.4.0 h1:3kRns56TArwiyHOMakaumUgSZZlB1hZBkjVgR6IeZ3E=
github.com/checkpoint-restore/checkpointctl v1.4.0/go.mod h1:ynQ52zQBazgcTZuxpwTFzRinIcAf0haDTC1X1LA/FKA=
+github.com/checkpoint-restore/go-criu/v7 v7.2.0 h1:qGiWA4App1gGlEfIJ68WR9jbezV9J7yZdjzglezcqKo=
github.com/checkpoint-restore/go-criu/v7 v7.2.0/go.mod h1:u0LCWLg0w4yqqu14aXhiB4YD3a1qd8EcCEg7vda5dwo=
+github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
+github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
+github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f h1:Y8xYupdHxryycyPlc9Y+bSQAYZnetRJ70VMVKm5CKI0=
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f/go.mod h1:HlzOvOjVBOfTGSRXRyY0OiCS/3J1akRGQQpRO/7zyF4=
+github.com/cockroachdb/cockroach-go/v2 v2.1.1 h1:3XzfSMuUT0wBe1a3o5C0eOTcArhmmFAg2Jzh/7hhKqo=
github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM=
+github.com/containerd/accelerated-container-image v1.3.0 h1:sFbTgSuMboeKHa9f7MY11hWF1XxVWjFoiTsXYtOtvdU=
github.com/containerd/accelerated-container-image v1.3.0/go.mod h1:EvKVWor6ZQNUyYp0MZm5hw4k21ropuz7EegM+m/Jb/Q=
+github.com/containerd/btrfs/v2 v2.0.0 h1:FN4wsx7KQrYoLXN7uLP0vBV4oVWHOIKDRQ1G2Z0oL5M=
github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=
+github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6 h1:gfW1JsN//B97zhsQ84Kkar7WJqod1fmWf8zKHmz+ieY=
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.6/go.mod h1:Mau9LZ7ZnyKCIgcNT7sMG5fjaZ9YCOHU5RuolUikhBQ=
+github.com/containerd/go-cni v1.1.13 h1:eFSGOKlhoYNxpJ51KRIMHZNlg5UgocXEIEBGkY7Hnis=
github.com/containerd/go-cni v1.1.13/go.mod h1:nTieub0XDRmvCZ9VI/SBG6PyqT95N4FIhxsauF1vSBI=
+github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA=
github.com/containerd/go-runc v1.1.0/go.mod h1:xJv2hFF7GvHtTJd9JqTS2UVxMkULUYw4JN5XAUZqH5U=
+github.com/containerd/imgcrypt/v2 v2.0.1 h1:gQcmeCKA97fAl0wlpq0itSY/PagFBsn4/mlKUy6kOio=
github.com/containerd/imgcrypt/v2 v2.0.1/go.mod h1:/qIJL8nxzdzMA2n5iYyyuIY36KfoVQWmgTWdfVtyebM=
+github.com/containerd/nri v0.10.0 h1:bt2NzfvlY6OJE0i+fB5WVeGQEycxY7iFVQpEbh7J3Go=
github.com/containerd/nri v0.10.0/go.mod h1:5VyvLa/4uL8FjyO8nis1UjbCutXDpngil17KvBSL6BU=
+github.com/containerd/otelttrpc v0.1.0 h1:UOX68eVTE8H/T45JveIg+I22Ev2aFj4qPITCmXsskjw=
github.com/containerd/otelttrpc v0.1.0/go.mod h1:XhoA2VvaGPW1clB2ULwrBZfXVuEWuyOd2NUD1IM0yTg=
github.com/containerd/stargz-snapshotter v0.17.0/go.mod h1:ySEul1ck7jCE4jqsuFCo8FFLrHU20UWQeI9g7mdsanI=
+github.com/containerd/zfs/v2 v2.0.0-rc.0 h1:0dRlgpoaepW7HuovtcvYQMF7NlpceQVdn7+3Udeth4M=
github.com/containerd/zfs/v2 v2.0.0-rc.0/go.mod h1:g36g/XCEGDRxUXIFdM3oWAEvmTvhfz/eKWElqg4Secw=
+github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEmnuFjskwo=
github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
+github.com/containernetworking/plugins v1.8.0 h1:WjGbV/0UQyo8A4qBsAh6GaDAtu1hevxVxsEuqtBqUFk=
github.com/containernetworking/plugins v1.8.0/go.mod h1:JG3BxoJifxxHBhG3hFyxyhid7JgRVBu/wtooGEvWf1c=
+github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
+github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
+github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
+github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 h1:XNT/Zf5l++1Pyg08/HV04ppB0gKxAqtZQBRYiYrUuYk=
github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
+github.com/danielgtaylor/mexpr v1.9.1 h1:nA9bsGRmNlJeVCPFgGf7WhrLuKag/+iWfOaJ03iKFPI=
github.com/danielgtaylor/mexpr v1.9.1/go.mod h1:kAivYNRnBeE/IJinqBvVFvLrX54xX//9zFYwADo4Bc8=
+github.com/danielgtaylor/shorthand/v2 v2.2.0 h1:hVsemdRq6v3JocP6YRTfu9rOoghZI9PFmkngdKqzAVQ=
github.com/danielgtaylor/shorthand/v2 v2.2.0/go.mod h1:t5QfaNf7DPru9ZLIIhPQSO7Gyvajm3euw7LxB/MTUqE=
+github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
+github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73 h1:OGNva6WhsKst5OZf7eZOklDztV3hwtTHovdrLHV+MsA=
+github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
+github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
+github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9TzqvtQZPo=
github.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
+github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM=
github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329/go.mod h1:Alz8LEClvR7xKsrq3qzoc4N0guvVNSS8KmSChGYr9hs=
+github.com/envoyproxy/go-control-plane/envoy v1.35.0 h1:ixjkELDE+ru6idPxcHLj8LBVc2bFP7iBytj353BoHUo=
github.com/envoyproxy/go-control-plane/envoy v1.35.0/go.mod h1:09qwbGVuSWWAyN5t/b3iyVfz5+z8QWGrzkoqm/8SbEs=
+github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
+github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
+github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
+github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
+github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
+github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8=
github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
+github.com/fsouza/fake-gcs-server v1.17.0 h1:OeH75kBZcZa3ZE+zz/mFdJ2btt9FgqfjI7gIh9+5fvk=
github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
+github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
+github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556 h1:N/MD/sr6o61X+iZBAT2qEUF023s4KbA8RWfKzl0L6MQ=
github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
+github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofiber/fiber/v2 v2.52.7 h1:6xJpE4sSqErvMiEZo9ZpJLRSVcpkNBvioeqAHKwhTZY=
github.com/gofiber/fiber/v2 v2.52.7/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I=
github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/certtostore v1.0.6 h1:LlCIgyTvDxTlcncMPTSYZGo6lCsiHzO6Dy7ff6ltk/0=
github.com/google/certtostore v1.0.6/go.mod h1:2N0ZPLkGvQWhYvXaiBGq02r71fnSLfq78VKIWQHr1wo=
+github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae h1:Iy1Ad7L9qPtNAFJad+Ch2kwDXrcwu7QUBR0bfChjnEM=
github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae/go.mod h1:DoDv8G58DuLNZF0KysYn0bA/6ZWhmRW3fZE2VnGEH0w=
+github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM=
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
+github.com/google/go-dap v0.12.0 h1:rVcjv3SyMIrpaOoTAdFDyHs99CwVOItIJGKLQFQhNeM=
github.com/google/go-dap v0.12.0/go.mod h1:tNjCASCm5cqePi/RVXXWEVqtnNLV1KTWtYOqu6rZNzc=
+github.com/google/go-github/v39 v39.2.0 h1:rNNM311XtPOz5rDdsJXAp2o8F67X9FnROXTvto3aSnQ=
github.com/google/go-github/v39 v39.2.0/go.mod h1:C1s8C5aCC9L+JXIYpJM5GYytdX52vC1bLvHEF1IhBrE=
+github.com/google/go-intervals v0.0.2 h1:FGrVEiUnTRKR8yE04qzXYaJMtnIYqobR5QbblK3ixcM=
github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
+github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
+github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=
+github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
+github.com/hanwen/go-fuse/v2 v2.8.0 h1:wV8rG7rmCz8XHSOwBZhG5YcVqcYjkzivjmbaMafPlAs=
github.com/hanwen/go-fuse/v2 v2.8.0/go.mod h1:yE6D2PqWwm3CbYRxFXV9xUd8Md5d6NG0WBs5spCswmI=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-cty-funcs v0.0.0-20250818135842-6aab67130928 h1:NFpfJOqEV8DUhomtXx9A0FfcMg7OCYRugdyw6Ar/Y7s=
github.com/hashicorp/go-cty-funcs v0.0.0-20250818135842-6aab67130928/go.mod h1:YC9ASYt9Z9sQEAtzCe+yaAzi3E7wcxfRphDXtwZoWC0=
+github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo=
github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw=
+github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
+github.com/hiddeco/sshsig v0.2.0 h1:gMWllgKCITXdydVkDL+Zro0PU96QI55LwUwebSwNTSw=
github.com/hiddeco/sshsig v0.2.0/go.mod h1:nJc98aGgiH6Yql2doqH4CTBVHexQA40Q+hMMLHP4EqE=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/intel/goresctrl v0.10.0 h1:Q94PBhLtQM/aVxVTKzB1j/ooMuV+9XleTN1fq2OGsSo=
github.com/intel/goresctrl v0.10.0/go.mod h1:1S8GDqL46GuKb525bxNhIEEkhf4rhVcbSf9DuKhp7mw=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
+github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa h1:s+4MhCQ6YrzisK6hFJUX53drDT4UsSW3DEhKn0ifuHw=
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgx/v4 v4.18.2 h1:xVpYkNR5pk5bMCZGfClbO962UIqVABcAGt7ha1s/FeU=
github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 h1:UUHMLvzt/31azWTN/ifGWef4WUqvXk0iRqdhdy/2uzI=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg=
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
+github.com/k0kubun/pp v2.3.0+incompatible h1:EKhKbi34VQDWJtq+zpsKSEhkHHs9w2P8Izbq8IhLVSo=
github.com/k0kubun/pp v2.3.0+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
+github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=
github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
+github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
+github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
+github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/knqyf263/go-plugin v0.9.0 h1:CQs2+lOPIlkZVtcb835ZYDEoyyWJWLbSTWeCs0EwTwI=
github.com/knqyf263/go-plugin v0.9.0/go.mod h1:2z5lCO1/pez6qGo8CvCxSlBFSEat4MEp1DrnA+f7w8Q=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
+github.com/ktrysmt/go-bitbucket v0.6.4 h1:C8dUGp0qkwncKtAnozHCbbqhptefzEd1I0sfnuy9rYQ=
github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
+github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
+github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
+github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ=
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
+github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=
github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
+github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/microsoft/go-mssqldb v1.0.0 h1:k2p2uuG8T5T/7Hp7/e3vMGTnnR0sU4h8d1CcC71iLHU=
github.com/microsoft/go-mssqldb v1.0.0/go.mod h1:+4wZTUnz/SV6nffv+RRRB/ss8jPng5Sho2SmM1l2ts4=
+github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
+github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
+github.com/mistifyio/go-zfs/v3 v3.1.0 h1:FZaylcg0hjUp27i23VcJJQiuBeAZjrC8lPqCGM1CopY=
github.com/mistifyio/go-zfs/v3 v3.1.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
+github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14 h1:JO22uXMy3CN7wh7A/wrtYQWV1WYQMg2gh6d8YO325k4=
github.com/moby/policy-helpers v0.0.0-20251105011237-bcaa71c99f14/go.mod h1:HJfK0E8dR+Jpk5anJ3oADg2dRSom1gJK17sqEiiMS7w=
+github.com/moby/profiles/seccomp v0.1.0 h1:kVf1lc5ytNB1XPxEdZUVF+oPpbBYJHR50eEvPt/9k8A=
github.com/moby/profiles/seccomp v0.1.0/go.mod h1:Kqk57vxH6/wuOc5bmqRiSXJ6iEz8Pvo3LQRkv0ytFWs=
+github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
+github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=
github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=
+github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok=
github.com/moby/sys/reexec v0.1.0/go.mod h1:EqjBg8F3X7iZe5pU6nRZnYCMUTXoxsjiIfHup5wYIN8=
+github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
+github.com/mutecomm/go-sqlcipher/v4 v4.4.0 h1:sV1tWCWGAVlPhNGT95Q+z/txFxuhAYWwHD1afF5bMZg=
github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8 h1:P48LjvUQpTReR3TQRbxSeSBsMXzfK0uol7eRcr7VBYQ=
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
+github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba h1:fhFP5RliM2HW/8XdcO5QngSfFli9GcRIpMXvypTQt6E=
github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=
github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
+github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 h1:2xZEHOdeQBV6PW8ZtimN863bIOl7OCW/X10K0cnxKeA=
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2/go.mod h1:MXdPzqAA8pHC58USHqNCSjyLnRQ6D+NjbpP+02Z1U/0=
+github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
+github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
+github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=
github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
+github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw=
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/pierrec/lz4/v4 v4.1.16 h1:kQPfno+wyx6C5572ABwV+Uo3pDFzQ7yhyGchSyRda0c=
github.com/pierrec/lz4/v4 v4.1.16/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
+github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=
github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
+github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79 h1:V7x0hCAgL8lNGezuex1RW1sh7VXXCqfw8nXZti66iFg=
github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmrRyahPfo5L7Szb5cAAUl53dMWBh9cMruGEZg=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
+github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=
github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=
+github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQEo87pStk/a99dzIO1mM9KxIyLPGTU=
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/sigstore/fulcio v1.7.1 h1:RcoW20Nz49IGeZyu3y9QYhyyV3ZKQ85T+FXPKkvE+aQ=
github.com/sigstore/fulcio v1.7.1/go.mod h1:7lYY+hsd8Dt+IvKQRC+KEhWpCZ/GlmNvwIa5JhypMS8=
+github.com/sigstore/protobuf-specs v0.4.1 h1:5SsMqZbdkcO/DNHudaxuCUEjj6x29tS2Xby1BxGU7Zc=
github.com/sigstore/protobuf-specs v0.4.1/go.mod h1:+gXR+38nIa2oEupqDdzg4qSBT0Os+sP7oYv6alWewWc=
+github.com/sigstore/sigstore v1.9.5 h1:Wm1LT9yF4LhQdEMy5A2JeGRHTrAWGjT3ubE5JUSrGVU=
github.com/sigstore/sigstore v1.9.5/go.mod h1:VtxgvGqCmEZN9X2zhFSOkfXxvKUjpy8RpUW39oCtoII=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU=
github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA=
+github.com/snowflakedb/gosnowflake v1.6.19 h1:KSHXrQ5o7uso25hNIzi/RObXtnSGkFgie91X82KcvMY=
github.com/snowflakedb/gosnowflake v1.6.19/go.mod h1:FM1+PWUdwB9udFDsXdfD58NONC0m+MlOSmQRvimobSM=
+github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo=
github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs=
+github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/sylabs/sif/v2 v2.22.0 h1:Y+xXufp4RdgZe02SR3nWEg7S6q4tPWN237WHYzkDSKA=
github.com/sylabs/sif/v2 v2.22.0/go.mod h1:W1XhWTmG1KcG7j5a3KSYdMcUIFvbs240w/MMVW627hs=
+github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
+github.com/tchap/go-patricia/v2 v2.3.3 h1:xfNEsODumaEcCcY3gI0hYPZ/PcpVv5ju6RMAhgwZDDc=
github.com/tchap/go-patricia/v2 v2.3.3/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
+github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
+github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
+github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9 h1:GWuTlpuUQBaK6u0R3HwE+eWaQ2aXwHgo8CaXgqtDQZU=
github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=
+github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=
github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho=
+github.com/tonistiigi/jaeger-ui-rest v0.0.0-20250408171107-3dd17559e117 h1:XFwyh2JZwR5aiKLXHX2C1n0v5F11dCJpyGL1W/Cpl3U=
github.com/tonistiigi/jaeger-ui-rest v0.0.0-20250408171107-3dd17559e117/go.mod h1:3Ez1Paeg+0Ghu3KwpEGC1HgZ4CHDlg+Ez/5Baeomk54=
+github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/uptrace/bunrouter v1.0.23 h1:Bi7NKw3uCQkcA/GUCtDNPq5LE5UdR9pe+UyWbjHB/wU=
github.com/uptrace/bunrouter v1.0.23/go.mod h1:O3jAcl+5qgnF+ejhgkmbceEk0E/mqaK+ADOocdNpY8M=
+github.com/urfave/cli v1.22.17 h1:SYzXoiPfQjHBbkYxbew5prZHS1TOLT3ierW8SYLqtVQ=
github.com/urfave/cli v1.22.17/go.mod h1:b0ht0aqgH/6pBYzzxURyrM4xXNgsoT/n2ZzwQiEhNVo=
+github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.62.0 h1:8dKRBX/y2rCzyc6903Zu1+3qN0H/d2MsxPPmVNamiH0=
github.com/valyala/fasthttp v1.62.0/go.mod h1:FCINgr4GKdKqV8Q0xv8b+UxPV+H/O5nNFo3D+r54Htg=
+github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4hHM=
github.com/vbauerster/mpb/v8 v8.10.2/go.mod h1:+Ja4P92E3/CorSZgfDtK46D7AVbDqmBQRTmyTqPElo0=
+github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
+github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+github.com/xanzy/go-gitlab v0.15.0 h1:rWtwKTgEnXyNUGrOArN7yyc3THRkpYcKXIXia9abywQ=
github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0=
github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U=
+github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b h1:7gd+rd8P3bqcn/96gOZa3F5dpJr/vEiDQYlNb/y2uNs=
gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
+go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
+go.mongodb.org/mongo-driver v1.7.5 h1:ny3p0reEpgsR2cfA5cjgwFZg3Cv/ofFh/8jbhGtz9VI=
go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
+go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs=
go.opentelemetry.io/contrib/detectors/gcp v1.38.0/go.mod h1:SU+iU7nu5ud4oCb3LQOhIZ3nRLj6FNVrKgtflbaf2ts=
+go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=
+go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA=
go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 h1:UGZ1QwZWY67Z6BmckTU+9Rxn04m2bD3gD6Mk0OIOCPk=
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0/go.mod h1:fcwWuDuaObkkChiDlhEpSq9+X1C0omv+s5mBtToAQ64=
-go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
@@ -283,47 +559,88 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
+golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
+golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM=
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
+golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk=
golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=
google.golang.org/api v0.247.0/go.mod h1:r1qZOPmxXffXg6xS5uhx16Fa/UFY8QU/K4bfKrnvovM=
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
+gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
+gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
+k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
+k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
+k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
+k8s.io/cri-api v0.34.1 h1:n2bU++FqqJq0CNjP/5pkOs0nIx7aNpb1Xa053TecQkM=
k8s.io/cri-api v0.34.1/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE=
+k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+kernel.org/pub/linux/libs/security/libcap/cap v1.2.76 h1:mrdLPj8ujM6eIKGtd1PkkuCIodpFFDM42Cfm0YODkIM=
kernel.org/pub/linux/libs/security/libcap/cap v1.2.76/go.mod h1:7V2BQeHnVAQwhCnCPJ977giCeGDiywVewWF+8vkpPlc=
+kernel.org/pub/linux/libs/security/libcap/psx v1.2.76 h1:3DyzQ30OHt3wiOZVL1se2g1PAPJIU7+tMUyvfMUj1dY=
kernel.org/pub/linux/libs/security/libcap/psx v1.2.76/go.mod h1:+l6Ee2F59XiJ2I6WR5ObpC1utCQJZ/VLsEbQCD8RG24=
+lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/b v1.0.0 h1:vpvqeyp17ddcQWF29Czawql4lDdABCDRbXRAS4+aF2o=
modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg=
+modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q=
modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
+modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0=
modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
+modernc.org/db v1.0.0 h1:2c6NdCfaLnshSvY7OU09cyAY0gYXUZj4lmg5ItHyucg=
modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8=
+modernc.org/file v1.0.0 h1:9/PdvjVxd5+LcWUQIfapAWRGOkDLK90rloa8s/au06A=
modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw=
+modernc.org/golex v1.0.0 h1:wWpDlbK8ejRfSyi0frMyhilD3JBvtcx2AdGDnU+JtsE=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/internal v1.0.0 h1:XMDsFDcBDsibbBnHB2xzljZ+B1yrOVLEFkKL2u15Glw=
modernc.org/internal v1.0.0/go.mod h1:VUD/+JAkhCpvkUitlEOnhpVxCgsBI90oTzSCRcqQVSM=
+modernc.org/lldb v1.0.0 h1:6vjDJxQEfhlOLwl4bhpwIz00uyFK4EmSYcbwqwbynsc=
modernc.org/lldb v1.0.0/go.mod h1:jcRvJGWfCGodDZz8BPwiKMJxGJngQ/5DrRapkQnLob8=
+modernc.org/ql v1.0.0 h1:bIQ/trWNVjQPlinI6jdOQsi195SIturGo3mp5hsDqVU=
modernc.org/ql v1.0.0/go.mod h1:xGVyrLIatPcO2C1JvI/Co8c0sr6y91HKFNy4pt9JXEY=
+modernc.org/zappy v1.0.0 h1:dPVaP+3ueIUv4guk8PuZ2wiUGcJ1WUVvIheeSSTD0yk=
modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4=
+rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
+tags.cncf.io/container-device-interface/specs-go v1.0.0 h1:8gLw29hH1ZQP9K1YtAzpvkHCjjyIxHZYzBAvlQ+0vD8=
tags.cncf.io/container-device-interface/specs-go v1.0.0/go.mod h1:u86hoFWqnh3hWz3esofRFKbI261bUlvUfLKGrDhJkgQ=
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f0c8f8201..109842151 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,15 +115,15 @@ importers:
specifier: ^2.1.0
devDependencies:
+ '@iconify/json':
+ specifier: ^2.2.416
+ version: 2.2.416
'@inlang/paraglide-js':
specifier: 2.6.0
version: 2.6.0
'@internationalized/date':
specifier: ^3.10.0
version: 3.10.0
- '@lucide/svelte':
- specifier: ^0.556.0
- version: 0.556.0([email protected])
'@sveltejs/kit':
specifier: ^2.49.1
@@ -205,6 +205,9 @@ importers:
typescript:
specifier: ^5.9.3
version: 5.9.3
+ unplugin-icons:
+ specifier: ^22.5.0
+ version: 22.5.0([email protected])
vaul-svelte:
specifier: 1.0.0-next.7
version: 1.0.0-next.7([email protected])
@@ -232,6 +235,9 @@ packages:
'@acemir/[email protected]':
resolution: {integrity: sha512-5YjgMmAiT2rjJZU7XK1SNI7iqTy92DpaYVgG6x63FxkJ11UpYfLndHJATtinWJClAXiOlW9XWaUyAQf8pMrQPg==}
+ '@antfu/[email protected]':
+ resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
+
resolution: {integrity: sha512-1PB7RThUiTlmIu8jbSurPrhHpVixPd4C+xNBUF/HrjIENCeDcAMg36n5mpMzED7OQGDVIzpfXXiMnaTiutjHJw==}
@@ -696,6 +702,15 @@ packages:
resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
+ '@iconify/[email protected]':
+ resolution: {integrity: sha512-9cD842bd/unmBJhM79Vo+x2LNpc9aN29VYSlsa2i6hKJFB6u6bvSgr3XPCcqht1SRv3kSdcWlbMjSeJ8xSc1Mw==}
+
+ '@iconify/[email protected]':
+ resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
+
+ '@iconify/[email protected]':
+ resolution: {integrity: sha512-Zlzem1ZXhI1iHeeERabLNzBHdOa4VhQbqAcOQaMKuTuyZCpwKbC2R4Dd0Zo3g9EAc+Y4fiarO8HIHRAth7+skw==}
+
resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
engines: {node: '>=18'}
@@ -897,11 +912,6 @@ packages:
'@lix-js/[email protected]':
resolution: {integrity: sha512-jBeALB6prAbtr5q4vTuxnRZZv1M2rKe8iNqRQhFJ4Tv7150unEa0vKyz0hs8Gl3fUGsWaNJBh3J8++fpbrpRBQ==}
- '@lucide/[email protected]':
- resolution: {integrity: sha512-jsJhyyd2xrJ4WtflO5TrTtyCBacF4OLBNCzotvwh4zfbbuE6aqdblx+OB0zg6zOno06ib1GJGdDcfR/2TUcb7g==}
- peerDependencies:
- svelte: ^5
-
'@marijn/[email protected]':
resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
@@ -1763,6 +1773,9 @@ packages:
resolution: {integrity: sha512-JBSrutapCafTrddF9dH3lc7+T2tBycGF4uPkI4Js+g4vLLEhG6RZcFi3aJd5zntdf5tQxAejJt8dihkoQ/eSJw==}
engines: {node: '>=20'}
+ resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==}
@@ -2334,6 +2347,10 @@ packages:
resolution: {integrity: sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==}
engines: {node: '>= 12.0.0'}
+ resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==}
+ engines: {node: '>=14'}
+
resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
@@ -2417,6 +2434,9 @@ packages:
resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
engines: {node: '>=16 || 14 >=14.17'}
+ resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==}
+
resolution: {integrity: sha512-mUT9RRGPDYenk59qJauN1rhsIMKBmWA3xMF+uRwE8MW/tjhaDSCCARqkSuDTq8vr4/2KcAxIGVjACxTjdk5C3g==}
peerDependencies:
@@ -2498,6 +2518,9 @@ packages:
resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+ resolution: {integrity: sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==}
+
resolution: {integrity: sha512-KzmIXQH1wCfwZ4RsMohD/IUtEjVhteR+c+ulb/CHYJHX8SuDXoJmChtsc/Xs5Wl8NHS4L5Q7cxL8MG40gSU1bA==}
peerDependencies:
@@ -2534,6 +2557,9 @@ packages:
resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
engines: {node: '>=12'}
+ resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+
resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
@@ -2642,6 +2668,9 @@ packages:
resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
+ resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
+
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -2964,6 +2993,10 @@ packages:
resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
+ resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==}
+ engines: {node: '>=18'}
+
resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
engines: {node: '>=12.0.0'}
@@ -3039,6 +3072,9 @@ packages:
engines: {node: '>=14.17'}
hasBin: true
+ resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==}
+
resolution: {integrity: sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==}
engines: {node: '>=18'}
@@ -3046,6 +3082,29 @@ packages:
resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+ resolution: {integrity: sha512-MBlMtT5RuMYZy4TZgqUL2OTtOdTUVsS1Mhj6G1pEzMlFJlEnq6mhUfoIt45gBWxHcsOdXJDWLg3pRZ+YmvAVWQ==}
+ peerDependencies:
+ '@svgr/core': '>=7.0.0'
+ '@svgx/core': ^1.0.1
+ '@vue/compiler-sfc': ^3.0.2 || ^2.7.0
+ svelte: ^3.0.0 || ^4.0.0 || ^5.0.0
+ vue-template-compiler: ^2.6.12
+ vue-template-es2015-compiler: ^1.9.0
+ peerDependenciesMeta:
+ '@svgr/core':
+ optional: true
+ '@svgx/core':
+ optional: true
+ '@vue/compiler-sfc':
+ optional: true
+ svelte:
+ optional: true
+ vue-template-compiler:
+ optional: true
+ vue-template-es2015-compiler:
+ optional: true
+
resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==}
engines: {node: '>=18.12.0'}
@@ -3235,6 +3294,11 @@ snapshots:
'@acemir/[email protected]': {}
+ '@antfu/[email protected]':
+ dependencies:
+ package-manager-detector: 1.6.0
+ tinyexec: 1.0.2
+
dependencies:
'@ark/util': 0.53.0
@@ -3603,6 +3667,19 @@ snapshots:
'@hapi/hoek': 9.3.0
optional: true
+ '@iconify/[email protected]':
+ dependencies:
+ '@iconify/types': 2.0.0
+ pathe: 2.0.3
+
+ '@iconify/[email protected]': {}
+
+ '@iconify/[email protected]':
+ dependencies:
+ '@antfu/install-pkg': 1.1.0
+ '@iconify/types': 2.0.0
+ mlly: 1.8.0
+
optional: true
@@ -3800,10 +3877,6 @@ snapshots:
'@lix-js/[email protected]': {}
- dependencies:
- svelte: 5.45.6
-
'@marijn/[email protected]': {}
'@napi-rs/[email protected]':
@@ -4532,6 +4605,8 @@ snapshots:
semver: 7.7.3
uint8array-extras: 1.5.0
+
@@ -5121,6 +5196,12 @@ snapshots:
lightningcss-win32-arm64-msvc: 1.30.2
lightningcss-win32-x64-msvc: 1.30.2
+ dependencies:
+ mlly: 1.8.0
+ pkg-types: 2.3.0
+ quansync: 0.2.11
+
@@ -5184,6 +5265,13 @@ snapshots:
+ dependencies:
+ acorn: 8.15.0
+ pathe: 2.0.3
+ pkg-types: 1.3.1
+ ufo: 1.6.1
+
dependencies:
runed: 0.25.0([email protected])
@@ -5281,6 +5369,8 @@ snapshots:
+
dependencies:
runed: 0.23.4([email protected])
@@ -5313,6 +5403,12 @@ snapshots:
+ dependencies:
+ confbox: 0.1.8
+ mlly: 1.8.0
+ pathe: 2.0.3
+
dependencies:
confbox: 0.2.2
@@ -5369,6 +5465,8 @@ snapshots:
optional: true
+
@@ -5784,6 +5882,8 @@ snapshots:
+
dependencies:
fdir: 6.5.0([email protected])
@@ -5853,10 +5953,24 @@ snapshots:
+
+ dependencies:
+ '@antfu/install-pkg': 1.1.0
+ '@iconify/utils': 3.1.0
+ debug: 4.4.3
+ local-pkg: 1.1.2
+ unplugin: 2.3.11
+ optionalDependencies:
+ svelte: 5.45.6
+ transitivePeerDependencies:
+ - supports-color
+
dependencies:
'@jridgewell/remapping': 2.3.5
diff --git a/tests/spec/containers.spec.ts b/tests/spec/containers.spec.ts
index 2d6951c6d..3ac147966 100644
--- a/tests/spec/containers.spec.ts
+++ b/tests/spec/containers.spec.ts
@@ -30,9 +30,9 @@ test.describe('Containers Page', () => {
const running = containersData.data.filter((c) => c.state === 'running').length;
const stopped = containersData.data.filter((c) => c.state !== 'running').length;
- await expect(page.locator('p:has-text("Total") + p')).toHaveText(String(total));
- await expect(page.locator('p:has-text("Running") + p')).toHaveText(String(running));
- await expect(page.locator('p:has-text("Stopped") + p')).toHaveText(String(stopped));
+ await expect(page.locator('div:has(> p:has-text("Total")) h3').first()).toHaveText(String(total));
+ await expect(page.locator('div:has(> p:has-text("Running")) h3').first()).toHaveText(String(running));
+ await expect(page.locator('div:has(> p:has-text("Stopped")) h3').first()).toHaveText(String(stopped));
});
test('should display the container table with columns', async ({ page }) => {
diff --git a/tests/spec/converter.spec.ts b/tests/spec/converter.spec.ts
index abfbc6ff7..8ad3e3e35 100644
--- a/tests/spec/converter.spec.ts
+++ b/tests/spec/converter.spec.ts
@@ -22,8 +22,14 @@ const SELECTORS = {
};
async function openConvertFromDockerRun(page: Page) {
- const dropdownTrigger = page.locator('button').filter({ has: page.locator('svg.lucide-chevron-down') });
+ // Wait for the page to be fully loaded and the button group to be visible
+ await page.waitForLoadState('networkidle');
+
+ // Find the dropdown trigger button with chevron-down icon (ChevronDown / ArrowDownIcon)
+ const dropdownTrigger = page.locator('button:has(svg)').filter({ hasText: '' }).last();
await dropdownTrigger.click();
+
+ // Click the Convert from Docker Run menu item
await page.getByRole('menuitem', { name: 'Convert from Docker Run' }).click();
}
diff --git a/tests/spec/images.spec.ts b/tests/spec/images.spec.ts
index cd86230ff..ac55bcd40 100644
--- a/tests/spec/images.spec.ts
+++ b/tests/spec/images.spec.ts
@@ -38,8 +38,8 @@ test.describe('Images Page', () => {
test('should display stats cards with correct counts and size', async ({ page }) => {
await navigateToImages(page);
- await expect(page.locator('p:has-text("Total Images") + p')).toHaveText(imageCounts.totalImages.toString());
- await expect(page.locator('p:has-text("Total Size") + p')).not.toBeEmpty();
+ await expect(page.locator('div:has(> p:has-text("Total Images")) h3').first()).toHaveText(imageCounts.totalImages.toString());
+ await expect(page.locator('div:has(> p:has-text("Total Size")) h3').first()).not.toBeEmpty();
});
test('should display the image table when images exist', async ({ page }) => {
@@ -58,7 +58,9 @@ test.describe('Images Page', () => {
test('should open the Prune Unused Images dialog', async ({ page }) => {
await navigateToImages(page);
await page.locator('button:has-text("Prune Unused")').click();
- await expect(page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')).toBeVisible();
+ await expect(
+ page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')
+ ).toBeVisible();
});
test('should navigate to image details on inspect click', async ({ page }) => {
@@ -105,7 +107,9 @@ test.describe('Images Page', () => {
await page.locator('button:has-text("Prune Unused")').click();
- await expect(page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')).toBeVisible();
+ await expect(
+ page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')
+ ).toBeVisible();
await page.locator('button:has-text("Prune Images")').click();
diff --git a/tests/spec/network.spec.ts b/tests/spec/network.spec.ts
index acfb607c4..5cfb46e85 100644
--- a/tests/spec/network.spec.ts
+++ b/tests/spec/network.spec.ts
@@ -31,9 +31,9 @@ test.describe('Networks Page', () => {
console.log('Network Counts:', counts);
- // Use the div filter locator to find stat cards
- const totalValue = page.locator('div').filter({ hasText: 'Total Networks' }).nth(5).locator('p').nth(1);
- const unusedValue = page.locator('div').filter({ hasText: 'Unused Networks' }).nth(5).locator('p').nth(1);
+ // Use the new stat card structure with h3 for values
+ const totalValue = page.locator('div:has(> p:has-text("Total Networks")) h3').first();
+ const unusedValue = page.locator('div:has(> p:has-text("Unused Networks")) h3').first();
await expect(totalValue).toHaveText(String(counts.total));
await expect(unusedValue).toHaveText(String(counts.unused));
@@ -53,12 +53,7 @@ test.describe('Networks Page', () => {
await navigateToNetworks(page);
await page.locator('button:has-text("Create Network")').first().click();
await expect(page.getByRole('dialog')).toBeVisible();
- });
-
- test('Create Network', async ({ page }) => {
- await navigateToNetworks(page);
- await page.locator('button:has-text("Create Network")').first().click();
- await expect(page.getByRole('dialog')).toBeVisible();
+ await expect(page.getByRole('heading', { name: 'Create New Network' })).toBeVisible();
const networkName = `test-network-${Date.now()}`;
const nameInput = page.getByLabel('Name').first();
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index eae5e4f5e..2f488e673 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -39,9 +39,11 @@ test.describe('Projects Page', () => {
});
test('should display summary cards with correct counts', async ({ page }) => {
- await expect(page.locator('p:has-text("Total Projects") + p')).toHaveText(String(projectCounts.totalProjects));
- await expect(page.locator('p:has-text("Running") + p')).toHaveText(String(projectCounts.runningProjects));
- await expect(page.locator('p:has-text("Stopped") + p')).toHaveText(String(projectCounts.stoppedProjects));
+ await expect(page.locator('div:has(> p:has-text("Total Projects")) h3').first()).toHaveText(
+ String(projectCounts.totalProjects)
+ );
+ await expect(page.locator('div:has(> p:has-text("Running")) h3').first()).toHaveText(String(projectCounts.runningProjects));
+ await expect(page.locator('div:has(> p:has-text("Stopped")) h3').first()).toHaveText(String(projectCounts.stoppedProjects));
});
test('should display projects list', async ({ page }) => {
diff --git a/tests/spec/volumes.spec.ts b/tests/spec/volumes.spec.ts
index 8ecadd2a8..2dfb8dfad 100644
--- a/tests/spec/volumes.spec.ts
+++ b/tests/spec/volumes.spec.ts
@@ -43,11 +43,8 @@ test.describe('Volumes Page', () => {
await page.goto('/volumes');
await page.waitForLoadState('networkidle');
- const totalCard = page
- .locator('div')
- .filter({ hasText: /^Total Volumes/ })
- .first();
- await expect(totalCard.locator('p').nth(1)).toHaveText(volumeCount.total.toString());
+ const totalValue = page.locator('div:has(> p:has-text("Total Volumes")) h3').first();
+ await expect(totalValue).toHaveText(volumeCount.total.toString());
});
test('Create Volume Sheet Opens', async ({ page }) => {