Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: sidebar grouping and edge cases (#2188)
Chase Baucombf858735b09d
diff --git a/backend/internal/models/customize.go b/backend/internal/models/customize.goindex 9a56a0343..16500aa89 100644--- a/backend/internal/models/customize.go+++ b/backend/internal/models/customize.go@@ -15,7 +15,7 @@ type CustomizeItem struct {TemplateValidation CustomizeVariable `key:"templateValidation" meta:"label=Template Validation;type=boolean;keywords=validation,check,verify,lint,syntax,schema;category=templates;description=Enable validation for template files"`// Registries category- ContainerRegistries CustomizeVariable `key:"containerRegistries" meta:"label=Container Registries;type=array;keywords=registry,docker,images,hub,private,authentication,credentials;category=registries;description=Manage container registry connections" catmeta:"id=registries;title=Registries;icon=package;url=/customize/registries;description=Configure container registries and authentication"`+ ContainerRegistries CustomizeVariable `key:"containerRegistries" meta:"label=Container Registries;type=array;keywords=registry,docker,images,hub,private,authentication,credentials;category=registries;description=Manage container registry connections" catmeta:"id=registries;title=Container Registries;icon=package;url=/customize/registries;description=Configure container registries and authentication"`RegistryCredentials CustomizeVariable `key:"registryCredentials" meta:"label=Registry Credentials;type=secure;keywords=credentials,auth,username,password,token,login,security;category=registries;description=Configure authentication for container registries"`RegistryMirrors CustomizeVariable `key:"registryMirrors" meta:"label=Registry Mirrors;type=array;keywords=mirrors,proxy,cache,performance,cdn,regional;category=registries;description=Configure registry mirrors and proxies"`@@ -24,7 +24,7 @@ type CustomizeItem struct {SecretVariables CustomizeVariable `key:"secretVariables" meta:"label=Secret Variables;type=secure;keywords=secrets,sensitive,secure,encrypted,password,api,key;category=variables;description=Manage sensitive and encrypted variables"`VariableTemplates CustomizeVariable `key:"variableTemplates" meta:"label=Variable Templates;type=array;keywords=templates,reusable,preset,configuration,standard,common;category=variables;description=Create reusable variable configurations"`- // Git Repositories category+ // Git repositories categoryGitRepositories CustomizeVariable `key:"gitRepositories" meta:"label=Git Repositories;type=array;keywords=git,repository,repositories,source,code,version,control,github,gitlab,bitbucket;category=git-repositories;description=Manage git repository connections for GitOps" catmeta:"id=git-repositories;title=Git Repositories;icon=git-branch;url=/customize/git-repositories;description=Configure git repositories for Git synchronization"`GitRepositoryDefaults CustomizeVariable `key:"gitRepositoryDefaults" meta:"label=Repository Defaults;type=object;keywords=defaults,settings,configuration,branch,auth,authentication;category=git-repositories;description=Set default settings for git repositories"`GitRepositoryTemplates CustomizeVariable `key:"gitRepositoryTemplates" meta:"label=Repository Templates;type=array;keywords=templates,presets,common,reusable,standard;category=git-repositories;description=Create reusable repository configurations"`diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelteindex 58a4290ce..3a5ffcc60 100644--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte@@ -1,5 +1,5 @@<script lang="ts">- import { navigationItems, getBuildAndDeploymentItems } from '$lib/config/navigation-config';+ import { navigationItems, getManagementItems } from '$lib/config/navigation-config';import type { NavigationItem } from '$lib/config/navigation-config';import { cn } from '$lib/utils';import { page } from '$app/state';@@ -42,7 +42,7 @@const currentPath = $derived(page.url.pathname);const memoizedUser = $derived.by(() => user ?? storeUser);const currentEnvId = $derived(environmentStore.selected?.id || '0');- const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));+ const managementItems = $derived(getManagementItems(currentEnvId));let upgrading = $state(false);let showConfirmDialog = $state(false);@@ -151,23 +151,64 @@{m.sidebar_management()}</h4><div class="space-y-2">- {#each navigationItems.managementItems as item (item.url)}- {@const IconComponent = item.icon}- <a- href={item.url}- onclick={handleItemClick}- 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 managementItems as item (item.url)}+ {#if item.items}+ {@const IconComponent = item.icon}+ <div class="space-y-2">+ <a+ href={item.url}+ onclick={handleItemClick}+ 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>+ <div class="ml-6 space-y-1">+ {#each item.items as subItem (subItem.url)}+ {@const SubIconComponent = subItem.icon}+ <a+ href={subItem.url}+ onclick={handleItemClick}+ 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}+ 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}</div></section>@@ -239,65 +280,13 @@</div></section>- <section>- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">- {m.builds_and_deployments()}- </h4>- <div class="space-y-2">- {#each buildDeploymentItems as item (item.url)}- {@const IconComponent = item.icon}- <a- href={item.url}- onclick={handleItemClick}- 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>-- <section>- <h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">- {m.security_title()}- </h4>- <div class="space-y-2">- {#each navigationItems.securityItems as item (item.url)}- {@const IconComponent = item.icon}- <a- href={item.url}- onclick={handleItemClick}- 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 swarmItems.length > 0}<section><h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">{m.swarm_title()}</h4><div class="space-y-2">- {#each swarmItems as item}+ {#each swarmItems as item (item.url)}{@const IconComponent = item.icon}<ahref={item.url}diff --git a/frontend/src/lib/components/settings/trivy-security-settings.svelte b/frontend/src/lib/components/settings/trivy-security-settings.svelteindex 04d41dcac..5df24505f 100644--- a/frontend/src/lib/components/settings/trivy-security-settings.svelte+++ b/frontend/src/lib/components/settings/trivy-security-settings.svelte@@ -139,7 +139,7 @@</Card.Title></div></Card.Header>- <Card.Content class="space-y-6 p-4">+ <Card.Content class="space-y-6 lg:p-6 lg:pt-0"><div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8"><div><Label class="text-base">{m.security_trivy_image_label()}</Label>diff --git a/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelte b/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelteindex d2cf1ea39..183cbca67 100644--- a/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-collapsible-item.svelte@@ -23,7 +23,7 @@};showTooltip: boolean;includeTitleInTooltip: boolean;- getIsOpen: (title: string, isActive: boolean) => boolean;+ getIsOpen: (url: string, isActive: boolean) => boolean;onOpenChange: (open: boolean) => void;content?: Snippet;} = $props();@@ -33,7 +33,7 @@<SidebarItemTooltipContent title={item.title} shortcut={item.shortcut} includeTitle={includeTitleInTooltip} />{/snippet}-<Collapsible.Root open={getIsOpen(item.title, item.isActive)} {onOpenChange} class="group/collapsible">+<Collapsible.Root open={getIsOpen(item.url, item.isActive)} {onOpenChange} class="group/collapsible"><Sidebar.MenuItem class="flex-col">{@const Icon = item.icon}<Sidebar.MenuButton tooltipContent={showTooltip ? tooltipContent : undefined} isActive={item.isActive}>diff --git a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelteindex 744135fed..49f4add91 100644--- a/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-itemgroup.svelte@@ -43,6 +43,7 @@}let openStates = $state<Record<string, boolean>>({});+ let hoveredGroup = $state<string | null>(null);const enhancedItems = $derived(items.map((item) => {@@ -61,14 +62,11 @@}));- function getIsOpen(itemTitle: string, isActive: boolean): boolean {- if (sidebar.hoverExpansionEnabled) {+ function getIsOpen(itemUrl: string, isActive: boolean): boolean {+ if (openStates[itemUrl] === undefined) {return isActive;}- if (openStates[itemTitle] === undefined) {- return isActive;- }- return openStates[itemTitle];+ return openStates[itemUrl];}const collapsed = $derived(sidebar.state === 'collapsed');@@ -79,48 +77,53 @@<Sidebar.Group class="p-1.5"><Sidebar.GroupLabel class="h-7 px-1.5">{label}</Sidebar.GroupLabel><Sidebar.Menu class="gap-0.5">- {#each enhancedItems as item (item.title)}+ {#each enhancedItems as item (item.url)}{#if (item.items?.length ?? 0) > 0}{#if sidebar.state === 'collapsed' && !sidebar.hoverExpansionEnabled}- <!-- In collapsed mode without hover expansion, show parent and children as separate icon buttons -->{#snippet tooltipContent()}<SidebarItemTooltipContent title={item.title} shortcut={item.shortcut} includeTitle={true} />{/snippet}- <Sidebar.MenuItem>- <Sidebar.MenuButton isActive={item.isActive} {tooltipContent}>- {#snippet child({ props })}- {@const Icon = item.icon}- <a href={item.url} {...props}>- {#if item.icon}- <Icon />- {/if}- <span>{item.title}</span>- </a>- {/snippet}- </Sidebar.MenuButton>- </Sidebar.MenuItem>- <!-- Separator before sub-items -->- <div class="flex justify-center px-2 py-1">- <Sidebar.Separator class="my-0 w-6" />- </div>- {#each item.items ?? [] as subItem (subItem.title)}- {#snippet subItemTooltipContent()}- <SidebarItemTooltipContent title={subItem.title} shortcut={subItem.shortcut} includeTitle={true} />- {/snippet}+ {@const groupExpanded = hoveredGroup === item.url}+ <div+ class={['rounded-lg transition-colors duration-150', groupExpanded && 'bg-sidebar-accent/40 py-0.5']}+ role="group"+ onmouseenter={() => (hoveredGroup = item.url)}+ onmouseleave={() => (hoveredGroup = null)}+ ><Sidebar.MenuItem>- <Sidebar.MenuButton isActive={subItem.isActive} tooltipContent={subItemTooltipContent}>+ <Sidebar.MenuButton isActive={item.isActive} {tooltipContent}>{#snippet child({ props })}- {@const SubIcon = subItem.icon}- <a href={subItem.url} {...props}>- {#if subItem.icon}- <SubIcon />+ {@const Icon = item.icon}+ <a href={item.url} {...props}>+ {#if item.icon}+ <Icon />{/if}- <span>{subItem.title}</span>+ <span>{item.title}</span></a>{/snippet}</Sidebar.MenuButton></Sidebar.MenuItem>- {/each}+ {#if groupExpanded}+ {#each item.items ?? [] as subItem (subItem.url)}+ {#snippet subItemTooltipContent()}+ <SidebarItemTooltipContent title={subItem.title} shortcut={subItem.shortcut} includeTitle={true} />+ {/snippet}+ <Sidebar.MenuItem>+ <Sidebar.MenuButton isActive={subItem.isActive} tooltipContent={subItemTooltipContent}>+ {#snippet child({ props })}+ {@const SubIcon = subItem.icon}+ <a href={subItem.url} {...props}>+ {#if subItem.icon}+ <SubIcon />+ {/if}+ <span>{subItem.title}</span>+ </a>+ {/snippet}+ </Sidebar.MenuButton>+ </Sidebar.MenuItem>+ {/each}+ {/if}+ </div>{:else}{#snippet collapsibleSubMenu()}<Collapsible.Content>@@ -129,7 +132,7 @@? 'hidden': undefined}>- {#each item.items ?? [] as subItem (subItem.title)}+ {#each item.items ?? [] as subItem (subItem.url)}<Sidebar.MenuSubItem><Sidebar.MenuSubButton isActive={subItem.isActive} size="md">{#snippet child({ props })}@@ -151,11 +154,9 @@{item}showTooltip={collapsed || (shortcutsEnabled && !!item.shortcut?.length)}{includeTitleInTooltip}- {getIsOpen}+ getIsOpen={(itemUrl: string, isActive: boolean) => getIsOpen(itemUrl, isActive)}onOpenChange={(open) => {- if (!sidebar.hoverExpansionEnabled) {- openStates[item.title] = open;- }+ openStates[item.url] = open;}}content={collapsibleSubMenu}/>diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelteindex 83de0b245..d148b7f94 100644--- a/frontend/src/lib/components/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/sidebar/sidebar.svelte@@ -1,5 +1,5 @@<script lang="ts" module>- import { navigationItems, getBuildAndDeploymentItems, getSwarmNavigationItems } from '$lib/config/navigation-config';+ import { navigationItems, getManagementItems, getSwarmNavigationItems } from '$lib/config/navigation-config';</script><script lang="ts">@@ -54,18 +54,8 @@const isAdmin = $derived(!!effectiveUser?.roles?.includes('admin'));let envSwitcherOpen = $state(false);- // 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;- }) ?? [];-const currentEnvId = $derived(environmentStore.selected?.id || '0');- const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));+ const managementItems = $derived(getManagementItems(currentEnvId));const swarmItems = $derived(getSwarmNavigationItems(swarmEnabled));</script>@@ -102,15 +92,13 @@{/if}</Sidebar.Header><Sidebar.Content class={!isCollapsed ? '-mt-2' : ''}>- <SidebarItemGroup label={m.sidebar_management()} items={navigationItems.managementItems} />+ <SidebarItemGroup label={m.sidebar_management()} items={managementItems} /><SidebarItemGroup label={m.sidebar_resources()} items={navigationItems.resourceItems} />- <SidebarItemGroup label={m.builds_and_deployments()} items={buildDeploymentItems} />{#if swarmItems.length > 0}<SidebarItemGroup label={m.swarm_title()} items={swarmItems} />{/if}- <SidebarItemGroup label={m.security_title()} items={navigationItems.securityItems} />{#if isAdmin}- <SidebarItemGroup label={m.sidebar_administration()} items={desktopSettingsItems} />+ <SidebarItemGroup label={m.sidebar_administration()} items={navigationItems.settingsItems} />{/if}</Sidebar.Content><Sidebar.Footer>diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelteindex 3f178c8f5..191073b7b 100644--- a/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte+++ b/frontend/src/lib/components/ui/sidebar/sidebar-menu-action.svelte@@ -2,6 +2,7 @@import { cn, type WithElementRef } from '$lib/utils.js';import type { Snippet } from 'svelte';import type { HTMLButtonAttributes } from 'svelte/elements';+ import { useSidebar } from './context.svelte.js';let {ref = $bindable(null),@@ -15,6 +16,8 @@showOnHover?: boolean;} = $props();+ const sidebar = useSidebar();+const mergedProps = $derived({class: cn('text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground peer-hover/menu-button:text-sidebar-accent-foreground outline-hidden absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',@@ -23,7 +26,9 @@'peer-data-[size=sm]/menu-button:top-1','peer-data-[size=default]/menu-button:top-1.5','peer-data-[size=lg]/menu-button:top-2.5',- 'group-data-[collapsible=icon]:hidden',+ sidebar.hoverExpansionEnabled+ ? 'group-data-[collapsible=icon]:group-data-[hovered=false]:hidden'+ : 'group-data-[collapsible=icon]:hidden',showOnHover &&'peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0',classNamediff --git a/frontend/src/lib/config/navigation-config.ts b/frontend/src/lib/config/navigation-config.tsindex bc6df9567..9c56c2791 100644--- a/frontend/src/lib/config/navigation-config.ts+++ b/frontend/src/lib/config/navigation-config.ts@@ -1,6 +1,6 @@import {ApiKeyIcon,- ApperanceIcon,+ AppearanceIcon,UsersIcon,LockIcon,NotificationsIcon,@@ -8,6 +8,7 @@ import {ProjectsIcon,EnvironmentsIcon,CustomizeIcon,+ RegistryIcon,ContainersIcon,ImagesIcon,NetworksIcon,@@ -23,7 +24,8 @@ import {HammerIcon,TemplateIcon,GlobeIcon,- UpdateIcon+ UpdateIcon,+ VariableIcon} from '$lib/icons';import { m } from '$lib/paraglide/messages';import type { ShortcutKey } from '$lib/utils/keyboard-shortcut.utils';@@ -39,9 +41,7 @@ export type NavigationItem = {export type NavigationSections = {managementItems: NavigationItem[];resourceItems: NavigationItem[];- deploymentItems: NavigationItem[];swarmItems: NavigationItem[];- securityItems: NavigationItem[];settingsItems: NavigationItem[];};@@ -50,11 +50,31 @@ export const navigationItems: NavigationSections = {{ title: m.dashboard_title(), url: '/dashboard', icon: DashboardIcon, shortcut: ['mod', '1'] },{ title: m.projects_title(), url: '/projects', icon: ProjectsIcon, shortcut: ['mod', '2'] },{ title: m.environments_title(), url: '/environments', icon: EnvironmentsIcon, shortcut: ['mod', '3'] },- { title: m.customize_title(), url: '/customize', icon: CustomizeIcon, shortcut: ['mod', '4'] }+ {+ title: m.customize_title(),+ url: '/customize',+ icon: CustomizeIcon,+ shortcut: ['mod', '4'],+ items: [+ { title: m.templates_title(), url: '/customize/templates', icon: TemplateIcon },+ { title: m.registries_title(), url: '/customize/registries', icon: RegistryIcon },+ { title: m.variables_title(), url: '/customize/variables', icon: VariableIcon },+ { title: m.git_repositories_title(), url: '/customize/git-repositories', icon: GitBranchIcon }+ ]+ }],resourceItems: [{ title: m.containers_title(), url: '/containers', icon: ContainersIcon, shortcut: ['mod', '5'] },- { title: m.images_title(), url: '/images', icon: ImagesIcon, shortcut: ['mod', '6'] },+ {+ title: m.images_title(),+ url: '/images',+ icon: ImagesIcon,+ shortcut: ['mod', '6'],+ items: [+ { title: m.builds(), url: '/images/builds', icon: HammerIcon },+ { title: m.vuln_title(), url: '/images/vulnerabilities', icon: ShieldAlertIcon }+ ]+ },{ title: m.images_updates(), url: '/updates', icon: UpdateIcon, shortcut: ['mod', 'u'] },{title: m.networks_title(),@@ -68,7 +88,6 @@ export const navigationItems: NavigationSections = {},{ title: m.volumes_title(), url: '/volumes', icon: VolumesIcon, shortcut: ['mod', '8'] }],- deploymentItems: [{ title: m.builds(), url: '/images/builds', icon: HammerIcon, shortcut: ['mod', 'b'] }],swarmItems: [{ title: 'Services', url: '/swarm/services', icon: DockIcon },{ title: 'Nodes', url: '/swarm/nodes', icon: UsersIcon },@@ -78,7 +97,6 @@ export const navigationItems: NavigationSections = {{ title: 'Configs', url: '/swarm/configs', icon: TemplateIcon },{ title: 'Secrets', url: '/swarm/secrets', icon: LockIcon }],- securityItems: [{ title: m.vuln_title(), url: '/security', icon: ShieldAlertIcon, shortcut: ['mod', 's'] }],settingsItems: [{title: m.events_title(),@@ -93,8 +111,8 @@ export const navigationItems: NavigationSections = {shortcut: ['mod', '0'],items: [{ title: m.api_key_page_title(), url: '/settings/api-keys', icon: ApiKeyIcon, shortcut: ['mod', 'shift', '1'] },+ { title: m.appearance_title(), url: '/settings/appearance', icon: AppearanceIcon, shortcut: ['mod', 'shift', '2'] },{ title: m.webhook_page_title(), url: '/settings/webhooks', icon: GlobeIcon },- { title: m.appearance_title(), url: '/settings/appearance', icon: ApperanceIcon, shortcut: ['mod', 'shift', '2'] },{title: m.authentication_title(),url: '/settings/authentication',@@ -115,6 +133,16 @@ export const navigationItems: NavigationSections = {]};+export function getSettingsSubpageUrlsInNavOrder(): string[] {+ const entry = navigationItems.settingsItems.find((item) => item.url === '/settings');+ return entry?.items?.map((item) => item.url) ?? [];+}++export function getCustomizeSubpageUrlsInNavOrder(): string[] {+ const entry = navigationItems.managementItems.find((item) => item.url === '/customize');+ return entry?.items?.map((item) => item.url) ?? [];+}+export const defaultMobilePinnedItems: NavigationItem[] = [navigationItems.managementItems[0]!,navigationItems.managementItems[1]!,@@ -147,19 +175,11 @@ export function getAvailableMobileNavItems(options?: { swarmEnabled?: boolean })flatItems.push(...navigationItems.resourceItems);}- if (navigationItems.deploymentItems) {- flatItems.push(...navigationItems.deploymentItems);- }-const swarmItems = getSwarmNavigationItems(!!options?.swarmEnabled);if (swarmItems.length > 0) {flatItems.push(...swarmItems);}- if (navigationItems.securityItems) {- flatItems.push(...navigationItems.securityItems);- }-if (navigationItems.settingsItems) {const settingsTopLevel = navigationItems.settingsItems.filter((item) => !item.items);flatItems.push(...settingsTopLevel);@@ -180,14 +200,16 @@ export const defaultMobileNavigationSettings: MobileNavigationSettings = {scrollToHide: true};-export function getBuildAndDeploymentItems(environmentId: string): NavigationItem[] {- return [- ...navigationItems.deploymentItems,- {- title: m.git_syncs_title(),- url: `/environments/${environmentId}/gitops`,- icon: GitBranchIcon,- shortcut: ['mod', 'g']- }- ];+export function getManagementItems(environmentId: string): NavigationItem[] {+ const gitSyncsItem: NavigationItem = {+ title: m.git_syncs_title(),+ url: `/environments/${environmentId}/gitops`,+ icon: GitBranchIcon,+ shortcut: ['mod', 'g']+ };++ return navigationItems.managementItems.map((item) => {+ if (item.url !== '/environments') return item;+ return { ...item, items: [...(item.items ?? []), gitSyncsItem] };+ });}diff --git a/frontend/src/lib/icons/index.ts b/frontend/src/lib/icons/index.tsindex 9447fa8fc..5a3efca8f 100644--- a/frontend/src/lib/icons/index.ts+++ b/frontend/src/lib/icons/index.ts@@ -13,7 +13,7 @@ export { default as NetworksIcon } from 'virtual:icons/fluent/virtual-network-16export { 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 AppearanceIcon } 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';diff --git a/frontend/src/lib/layouts/resource-detail-layout.svelte b/frontend/src/lib/layouts/resource-detail-layout.svelteindex 6cd01ac00..e80c4f312 100644--- a/frontend/src/lib/layouts/resource-detail-layout.svelte+++ b/frontend/src/lib/layouts/resource-detail-layout.svelte@@ -7,8 +7,8 @@import type { DetailAction } from './types.js';interface Props {- backUrl: string;- backLabel: string;+ backUrl?: string;+ backLabel?: string;title: string;subtitle?: string;actions?: DetailAction[];@@ -50,11 +50,13 @@<divclass="bg-popover/95 supports-backdrop-filter:bg-popover/85 border-border/60 flex items-center gap-3 rounded-full border px-4 py-2 shadow-lg backdrop-blur-lg">- <ArcaneButton action="base" tone="ghost" href={backUrl} class="size-8 rounded-full p-0">- <ArrowLeftIcon class="size-4" />- </ArcaneButton>+ {#if backUrl}+ <ArcaneButton action="base" tone="ghost" href={backUrl} class="size-8 rounded-full p-0">+ <ArrowLeftIcon class="size-4" />+ </ArcaneButton>- <div class="bg-border/60 h-4 w-px"></div>+ <div class="bg-border/60 h-4 w-px"></div>+ {/if}<span class="max-w-[200px] truncate text-sm font-semibold">{title}</span>@@ -97,10 +99,14 @@<div class={cn('space-y-6 pb-8', className)}><div class="space-y-4"><div class="flex items-center justify-between">- <ArcaneButton action="base" tone="ghost" href={backUrl} class="-ml-2">- <ArrowLeftIcon class="size-4" />- {backLabel}- </ArcaneButton>+ {#if backUrl}+ <ArcaneButton action="base" tone="ghost" href={backUrl} class="-ml-2">+ <ArrowLeftIcon class="size-4" />+ {backLabel ?? ''}+ </ArcaneButton>+ {:else}+ <span></span>+ {/if}<div class="flex items-center gap-2 sm:hidden">{#if actions.length === 1 && primaryAction}diff --git a/frontend/src/lib/layouts/tabbed-page-layout.svelte b/frontend/src/lib/layouts/tabbed-page-layout.svelteindex c67a27cb9..8b5fd4e22 100644--- a/frontend/src/lib/layouts/tabbed-page-layout.svelte+++ b/frontend/src/lib/layouts/tabbed-page-layout.svelte@@ -7,8 +7,8 @@import { ArrowLeftIcon } from '$lib/icons';interface Props {- backUrl: string;- backLabel: string;+ backUrl?: string;+ backLabel?: string;tabItems: TabItem[];selectedTab: string;onTabChange: (value: string) => void;@@ -58,10 +58,12 @@<div class="max-w-full px-4 py-3"><div class="flex items-start justify-between gap-3"><div class="flex min-w-0 items-start gap-3">- <ArcaneButton action="base" tone="ghost" size="sm" href={backUrl}>- <ArrowLeftIcon class="size-4" />- {backLabel}- </ArcaneButton>+ {#if backUrl}+ <ArcaneButton action="base" tone="ghost" size="sm" href={backUrl}>+ <ArrowLeftIcon class="size-4" />+ {backLabel ?? ''}+ </ArcaneButton>+ {/if}<div class="min-w-0">{@render headerInfo()}</div>diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelteindex 0dd9c7882..fdfd3dd9d 100644--- a/frontend/src/routes/(app)/+layout.svelte+++ b/frontend/src/routes/(app)/+layout.svelte@@ -10,7 +10,7 @@import { getEffectiveNavigationSettings, navigationSettingsOverridesStore } from '$lib/utils/navigation.utils';import { browser } from '$app/environment';import { environmentStore } from '$lib/stores/environment.store.svelte';- import { navigationItems, getBuildAndDeploymentItems, type NavigationItem } from '$lib/config/navigation-config';+ import { navigationItems, getManagementItems, type NavigationItem } from '$lib/config/navigation-config';import { isEditableTarget, matchesShortcutEvent } from '$lib/utils/keyboard-shortcut.utils';import { cn } from '$lib/utils';import type { Snippet } from 'svelte';@@ -40,16 +40,10 @@const navigationMode = $derived(navigationSettings.mode);const isAdmin = $derived(!!user?.roles?.includes('admin'));const currentEnvId = $derived(environmentStore.selected?.id || '0');- const managementItems = $derived(navigationItems.managementItems);- const buildDeploymentItems = $derived(getBuildAndDeploymentItems(currentEnvId));+ const managementItems = $derived(getManagementItems(currentEnvId));const settingsShortcutItems = $derived.by(() => (isAdmin ? (navigationItems.settingsItems ?? []) : []));const shortcutItems = $derived.by(() => {- const items: NavigationItem[] = [- ...managementItems,- ...navigationItems.resourceItems,- ...buildDeploymentItems,- ...settingsShortcutItems- ];+ const items: NavigationItem[] = [...managementItems, ...navigationItems.resourceItems, ...settingsShortcutItems];return flattenNavigationItems(items).filter((item) => item.shortcut?.length);});diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelteindex c18c547e1..7e37964af 100644--- a/frontend/src/routes/(app)/customize/+page.svelte+++ b/frontend/src/routes/(app)/customize/+page.svelte@@ -9,6 +9,7 @@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 { getCustomizeSubpageUrlsInNavOrder } from '$lib/config/navigation-config';import {SearchIcon,TemplateIcon,@@ -39,12 +40,25 @@onMount(async () => {try {- customizeCategories = await customizeSearchService.getCategories();+ customizeCategories = orderCategoriesByNav(await customizeSearchService.getCategories());} catch (error) {console.error('Failed to load categories:', error);}});+ function orderCategoriesByNav(categories: CustomizeCategory[]) {+ const navUrls = getCustomizeSubpageUrlsInNavOrder();+ const categoriesByUrl = new Map(categories.map((category) => [category.url, category]));+ const orderedCategories = navUrls+ .map((url) => categoriesByUrl.get(url))+ .filter((category): category is CustomizeCategory => Boolean(category));+ const unmatchedCategories = categories+ .filter((category) => !navUrls.includes(category.url))+ .sort((a, b) => a.title.localeCompare(b.title));++ return [...orderedCategories, ...unmatchedCategories];+ }+async function performSearch(query: string, immediate = false) {const trimmedQuery = query.trim();@@ -144,7 +158,7 @@{#if !showSearchResults}<div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-6 xl:grid-cols-3">- {#each customizeCategories as category}+ {#each customizeCategories as category (category.id)}{@const Icon = getIconComponent(category.icon)}<Card class="hover:border-primary/20 group cursor-pointer transition-all duration-200 hover:shadow-md"><button onclick={() => navigateToCategory(category.url)} class="w-full p-4 text-left sm:p-6">@@ -190,7 +204,7 @@</div>{:else}<div class="space-y-4 sm:space-y-6">- {#each searchResults as result}+ {#each searchResults as result (result.id)}{@const Icon = getIconComponent(result.icon)}<div class="bg-background/40 rounded-lg border shadow-sm"><div class="border-b p-4 sm:p-6">@@ -212,7 +226,7 @@{#if result.matchingCustomizations && result.matchingCustomizations.length > 0}<div class="space-y-3 p-4 sm:p-6"><h4 class="text-muted-foreground mb-3 text-sm font-medium">{m.customize_available_options()}</h4>- {#each result.matchingCustomizations as customization}+ {#each result.matchingCustomizations as customization (customization.key)}<div class="bg-background/60 border-primary/20 rounded-md border-l-2 p-3"><div class="flex items-start justify-between gap-3"><div class="min-w-0 flex-1">@@ -222,7 +236,7 @@{/if}{#if customization.keywords && customization.keywords.length > 0}<div class="mt-2 flex flex-wrap gap-1">- {#each customization.keywords.slice(0, 6) as keyword}+ {#each customization.keywords.slice(0, 6) as keyword (keyword)}<span class="bg-muted/50 text-muted-foreground rounded px-2 py-0.5 text-xs">{keyword}</span>diff --git a/frontend/src/routes/(app)/dashboard/+page.svelte b/frontend/src/routes/(app)/dashboard/+page.svelteindex 185087153..6cd23589f 100644--- a/frontend/src/routes/(app)/dashboard/+page.svelte+++ b/frontend/src/routes/(app)/dashboard/+page.svelte@@ -505,7 +505,7 @@value={actionableVulnerabilitiesAttentionCount}description={m.security_subtitle()}ctaLabel={m.common_view()}- href="/security"+ href="/images/vulnerabilities"/>{/if}@@ -555,6 +555,7 @@<Card.Header icon={StatsIcon} class="items-start"><div class="flex w-full min-w-0 flex-col gap-2"><h2 class="text-lg font-semibold tracking-tight">{m.common_overview()}</h2>+ <p class="text-muted-foreground text-sm">{m.dashboard_overview_caption()}</p></div></Card.Header><Card.Content class="space-y-2.5 pt-0 pb-3">diff --git a/frontend/src/routes/(app)/images/builds/+page.svelte b/frontend/src/routes/(app)/images/builds/+page.svelteindex 1ef68c882..20b1045cb 100644--- a/frontend/src/routes/(app)/images/builds/+page.svelte+++ b/frontend/src/routes/(app)/images/builds/+page.svelte@@ -1098,7 +1098,7 @@{m.build_args()}</div>{#if buildHistorySelected.buildArgs && Object.keys(buildHistorySelected.buildArgs).length > 0}- <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ <pre class="mt-2 font-mono text-[11px] wrap-break-word whitespace-pre-wrap">{formatBuildArgs(buildHistorySelected.buildArgs)}</pre>{:else}@@ -1110,7 +1110,7 @@{m.common_labels()}</div>{#if buildHistorySelected.labels && Object.keys(buildHistorySelected.labels).length > 0}- <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ <pre class="mt-2 font-mono text-[11px] wrap-break-word whitespace-pre-wrap">{formatKeyValueMap(buildHistorySelected.labels)}</pre>{:else}@@ -1148,7 +1148,7 @@{m.build_ulimits_label()}</div>{#if buildHistorySelected.ulimits && Object.keys(buildHistorySelected.ulimits).length > 0}- <pre class="mt-2 font-mono text-[11px] break-words whitespace-pre-wrap">+ <pre class="mt-2 font-mono text-[11px] wrap-break-word whitespace-pre-wrap">{formatKeyValueMap(buildHistorySelected.ulimits)}</pre>{:else}@@ -1324,12 +1324,7 @@{/snippet}{#if isDesktop}- <ResourceDetailLayout- backUrl="/images"- backLabel={m.images_title()}- title={m.manual_build_workspace()}- subtitle={m.manual_build_workspace_subtitle()}- >+ <ResourceDetailLayout title={m.manual_build_workspace()} subtitle={m.manual_build_workspace_subtitle()}><Tabs.Root bind:value={mainTab} class="flex h-[calc(100vh-12rem)] flex-col"><Tabs.List class="border-border/60 bg-muted/60 mb-3 flex w-fit gap-2 rounded-lg border p-1"><Tabs.Trigger@@ -1391,14 +1386,7 @@</Tabs.Root></ResourceDetailLayout>{:else}- <TabbedPageLayout- backUrl="/images"- backLabel={m.images_title()}- tabItems={mainTabItems}- selectedTab={mainTab}- onTabChange={onMainTabChange}- class="min-h-[calc(100vh-10rem)]"- >+ <TabbedPageLayout tabItems={mainTabItems} selectedTab={mainTab} onTabChange={onMainTabChange} class="min-h-[calc(100vh-10rem)]">{#snippet headerInfo()}<div class="flex flex-col gap-1">{#if mainTab === 'history'}@@ -1421,8 +1409,6 @@<div class="min-h-[60vh]">{#if tab === 'build'}<TabbedPageLayout- backUrl="/images"- backLabel={m.images_title()}tabItems={buildMobileTabItems}selectedTab={buildTab}onTabChange={onBuildTabChange}diff --git a/frontend/src/routes/(app)/security/+page.svelte b/frontend/src/routes/(app)/images/vulnerabilities/+page.sveltesimilarity index 100%rename from frontend/src/routes/(app)/security/+page.svelterename to frontend/src/routes/(app)/images/vulnerabilities/+page.sveltediff --git a/frontend/src/routes/(app)/security/+page.ts b/frontend/src/routes/(app)/images/vulnerabilities/+page.tssimilarity index 100%rename from frontend/src/routes/(app)/security/+page.tsrename to frontend/src/routes/(app)/images/vulnerabilities/+page.tsdiff --git a/frontend/src/routes/(app)/security/ignored-vulnerabilities-table.svelte b/frontend/src/routes/(app)/images/vulnerabilities/ignored-vulnerabilities-table.sveltesimilarity index 100%rename from frontend/src/routes/(app)/security/ignored-vulnerabilities-table.svelterename to frontend/src/routes/(app)/images/vulnerabilities/ignored-vulnerabilities-table.sveltediff --git a/frontend/src/routes/(app)/security/security-vulnerability-table.svelte b/frontend/src/routes/(app)/images/vulnerabilities/security-vulnerability-table.sveltesimilarity index 100%rename from frontend/src/routes/(app)/security/security-vulnerability-table.svelterename to frontend/src/routes/(app)/images/vulnerabilities/security-vulnerability-table.sveltediff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelteindex b1ea724f0..54d7af1fa 100644--- a/frontend/src/routes/(app)/settings/+layout.svelte+++ b/frontend/src/routes/(app)/settings/+layout.svelte@@ -2,19 +2,13 @@import { page } from '$app/state';import { goto, beforeNavigate } from '$app/navigation';import { setContext } from 'svelte';- import * as ArcaneTooltip from '$lib/components/arcane-tooltip';import { ArcaneButton } from '$lib/components/arcane-button/index.js';import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon } 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';import MobileFloatingFormActions from '$lib/components/form/mobile-floating-form-actions.svelte';- import SidebarItemTooltipContent from '$lib/components/sidebar/sidebar-item-tooltip-content.svelte';interface Props {children: import('svelte').Snippet;@@ -22,116 +16,12 @@let { children }: Props = $props();- let currentPath = $derived(page.url.pathname);- let isSubPage = $derived(currentPath !== '/settings');+ let isSubPage = $derived(page.url.pathname !== '/settings');let currentPageName = $derived(page.url.pathname.split('/').pop() || 'settings');- const sidebar = useSidebar();const isMobile = new IsMobile();- const isTablet = new IsTablet();const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);- const navigationSettings = $derived(getEffectiveNavigationSettings());- const scrollToHideEnabled = $derived(navigationSettings.scrollToHide);- const shortcutsEnabled = $derived($settingsStore?.keyboardShortcutsEnabled ?? true);-- 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,- shortcut: item.shortcut- })) ?? []- );- });-- // Track mobile nav visibility for FAB positioning- let mobileNavVisible = $state(true);-- // Monitor mobile nav visibility when scroll-to-hide is enabled- $effect(() => {- if (typeof window === 'undefined') return;- if (!scrollToHideEnabled || !(isMobile.current || isTablet.current)) {- mobileNavVisible = true;- return;- }-- // Check the mobile nav element's transform to determine visibility- const checkNavVisibility = () => {- const navElement = document.querySelector('[data-testid="mobile-floating-nav"], [data-testid="mobile-docked-nav"]');- if (!navElement) {- mobileNavVisible = true;- return;- }-- const style = window.getComputedStyle(navElement);- const transform = style.transform;- const opacity = parseFloat(style.opacity);-- // Check if nav is translated away or has low opacity- if (transform !== 'none' && transform.includes('matrix')) {- const matrix = transform.match(/matrix.*\((.+)\)/);- if (matrix) {- const values = matrix[1].split(', ');- const translateY = parseFloat(values[5] || '0');- // If translateY is positive (moved down), nav is hidden- mobileNavVisible = translateY === 0 && opacity > 0.5;- }- } else {- mobileNavVisible = opacity > 0.5;- }- };-- // Initial check- checkNavVisibility();-- // Use MutationObserver to watch for style changes on nav- const observer = new MutationObserver(checkNavVisibility);- const navElement = document.querySelector('[data-testid="mobile-floating-nav"], [data-testid="mobile-docked-nav"]');-- if (navElement) {- observer.observe(navElement, {- attributes: true,- attributeFilter: ['style', 'class']- });- }-- // Also check on scroll as a fallback- const handleScroll = () => {- requestAnimationFrame(checkNavVisibility);- };-- window.addEventListener('scroll', handleScroll, { passive: true });-- return () => {- observer.disconnect();- window.removeEventListener('scroll', handleScroll);- };- });-- // Calculate left position based on sidebar state to match sidebar spacing system- // Uses the same CSS variables and spacing as the sidebar component- const leftPosition = $derived(() => {- const margin = '1rem'; // Standard spacing-4 equivalent-- // On mobile, use standard margin without sidebar offset- if (isMobile.current) {- return margin;- }-- if (sidebar.state === 'expanded') {- // Full sidebar width + standard margin- return `calc(var(--sidebar-width) + ${margin})`;- } else {- // For floating variant with icon collapsible:- // sidebar-width-icon + spacing(4) + 2px padding + standard margin- // This matches the exact calculation from sidebar.svelte line 84- return `calc(var(--sidebar-width-icon) + 1rem + 2px + ${margin})`;- }- });-- let pageTitle = $derived(() => {+ let pageTitle = $derived.by(() => {switch (currentPageName) {case 'jobs':return m.jobs_title();@@ -188,44 +78,7 @@}</script>-<div class="flex h-full min-h-full flex-col md:flex-row">- <!-- Desktop Sidebar -->- <aside class={cn('relative hidden w-64 shrink-0 self-stretch md:block md:h-full md:min-h-full', 'backdrop-blur-sm')}>- <div aria-hidden="true" class="bg-border/60 pointer-events-none absolute top-4 right-0 bottom-4 w-px"></div>- <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="flex min-w-0 flex-col gap-1">- {#each navItems as item (item.href)}- {@const isActive = currentPath.startsWith(item.href)}- {@const linkClass = cn(- 'flex w-full min-w-0 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'- )}- <div class="w-full min-w-0">- {#if item.shortcut?.length && shortcutsEnabled}- <ArcaneTooltip.Root>- <ArcaneTooltip.Trigger class="w-full">- <a href={item.href} class={linkClass}>- <item.icon class="size-4 shrink-0" />- <span class="truncate">{item.label}</span>- </a>- </ArcaneTooltip.Trigger>- <ArcaneTooltip.Content side="right" align="start">- <SidebarItemTooltipContent title={item.label} shortcut={item.shortcut} includeTitle={false} />- </ArcaneTooltip.Content>- </ArcaneTooltip.Root>- {:else}- <a href={item.href} class={linkClass}>- <item.icon class="size-4 shrink-0" />- <span class="truncate">{item.label}</span>- </a>- {/if}- </div>- {/each}- </nav>- </div>- </aside>-+<div class="flex h-full min-h-full flex-col"><!-- Main Content --><main class="min-w-0 flex-1">{#if isSubPage}@@ -258,7 +111,7 @@customLabel={m.settings_title()}/><ArrowRightIcon class="text-muted-foreground size-4 shrink-0" />- <span class="text-foreground truncate font-medium">{pageTitle()}</span>+ <span class="text-foreground truncate font-medium">{pageTitle}</span></nav></div></div>diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelteindex 10dc8a106..2c27cc038 100644--- a/frontend/src/routes/(app)/settings/+page.svelte+++ b/frontend/src/routes/(app)/settings/+page.svelte@@ -11,7 +11,7 @@ArrowRightIcon,DockerBrandIcon,ApiKeyIcon,- ApperanceIcon,+ AppearanceIcon,CloseIcon,JobsIcon,CodeIcon,@@ -25,8 +25,9 @@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';+ import { getSettingsSubpageUrlsInNavOrder } from '$lib/config/navigation-config';+ import HeaderCard from '$lib/components/header-card.svelte';- let { data } = $props();let searchQuery = $state('');let showSearchResults = $state(false);let searchResults = $state<SettingsCategory[]>([]);@@ -40,7 +41,7 @@database: DockerBrandIcon,lock: LockIcon,shield: SecurityIcon,- appearance: ApperanceIcon,+ appearance: AppearanceIcon,bell: NotificationsIcon,user: UserIcon,apikey: ApiKeyIcon,@@ -51,7 +52,7 @@onMount(async () => {try {- settingsCategories = sortCategories((await settingsSearchService.getCategories()).filter(isVisibleCategory));+ settingsCategories = orderCategoriesByNav((await settingsSearchService.getCategories()).filter(isVisibleCategory));} catch (error) {console.error('Failed to load categories:', error);}@@ -76,7 +77,7 @@try {const response = await settingsSearchService.search(trimmedQuery);if (requestId === currentSearchRequest) {- searchResults = sortCategories((response.results || []).filter(isVisibleCategory));+ searchResults = (response.results || []).filter(isVisibleCategory);isSearching = false;}} catch (error) {@@ -100,8 +101,17 @@return !hiddenCategoryUrls.has(category.url);}- function sortCategories(categories: SettingsCategory[]) {- return [...categories].sort((a, b) => a.title.localeCompare(b.title));+ function orderCategoriesByNav(categories: SettingsCategory[]) {+ const navUrls = getSettingsSubpageUrlsInNavOrder();+ const categoriesByUrl = new Map(categories.map((category) => [category.url, category]));+ const orderedCategories = navUrls+ .map((url) => categoriesByUrl.get(url))+ .filter((category): category is SettingsCategory => Boolean(category));+ const unmatchedCategories = categories+ .filter((category) => !navUrls.includes(category.url))+ .sort((a, b) => a.title.localeCompare(b.title));++ return [...orderedCategories, ...unmatchedCategories];}function clearSearch() {@@ -117,73 +127,63 @@}</script>-<div class="px-2 py-4 sm:px-6 sm:py-6 lg:px-8">- <div class="mb-6 sm:mb-8">- <div- class="from-background/60 via-background/40 to-background/60 relative overflow-hidden rounded-xl border bg-linear-to-br p-4 shadow-sm sm:p-6"- >- <div class="bg-primary/10 pointer-events-none absolute -top-10 -right-10 size-40 rounded-full blur-3xl"></div>- <div class="bg-muted/40 pointer-events-none absolute -bottom-10 -left-10 size-40 rounded-full blur-3xl"></div>- <div class="relative">- <div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">- <div class="flex w-full items-start gap-3 sm:gap-4">- <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"- >- <SettingsIcon class="size-4 sm:size-5" />- </div>- <div class="min-w-0 flex-1">- <div class="flex items-start justify-between gap-3">- <h1 class="min-w-0 text-xl font-bold tracking-tight sm:text-2xl">{m.sidebar_settings()}</h1>- <div class="shrink-0">- <UiConfigDisabledTag />- </div>- </div>- <p class="text-muted-foreground mt-1 text-sm sm:text-base">{m.settings_subtitle()}</p>- </div>- </div>+<div class="space-y-8 pb-5 md:space-y-10 md:pb-5">+ <HeaderCard>+ <div class="flex items-center justify-between gap-4">+ <div class="flex min-w-64 flex-1 items-center gap-3 sm:gap-4">+ <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"+ >+ <SettingsIcon class="size-4 sm:size-5" /></div>-- <div class="relative mt-4 w-full sm:mt-6 sm:max-w-md">- <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}- <ArcaneButton- action="base"- tone="ghost"- size="sm"- onclick={clearSearch}- class="h-6 w-6 p-0"- icon={CloseIcon}- showLabel={false}- customLabel={m.settings_clear_search()}- />- {:else}- <SearchIcon />- {/if}- </InputGroup.Addon>- </InputGroup.Root>+ <div class="min-w-0">+ <h1 class="text-3xl font-bold tracking-tight">{m.sidebar_settings()}</h1>+ <p class="text-muted-foreground mt-1 text-sm sm:text-base">{m.settings_subtitle()}</p></div></div>+ <div class="flex items-center gap-3">+ <UiConfigDisabledTag />+ </div>+ </div>++ <div class="relative mt-4 w-full sm:mt-6 sm:max-w-md">+ <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}+ <ArcaneButton+ action="base"+ tone="ghost"+ size="sm"+ onclick={clearSearch}+ class="h-6 w-6 p-0"+ icon={CloseIcon}+ showLabel={false}+ customLabel={m.settings_clear_search()}+ />+ {:else}+ <SearchIcon />+ {/if}+ </InputGroup.Addon>+ </InputGroup.Root></div>- </div>+ </HeaderCard>{#if !showSearchResults}<div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:gap-6 xl:grid-cols-3">- {#each settingsCategories as category}+ {#each settingsCategories as category (category.id)}{@const Icon = getIconComponent(category.icon)}<Card class="hover:border-primary/20 group cursor-pointer transition-all duration-200 hover:shadow-md"><button onclick={() => navigateToCategory(category.url)} class="w-full p-4 text-left sm:p-6">@@ -228,7 +228,7 @@</div>{:else}<div class="space-y-4 sm:space-y-6">- {#each searchResults as result}+ {#each searchResults as result (result.id)}{@const Icon = getIconComponent(result.icon)}<div class="bg-background/40 rounded-lg border shadow-sm"><div class="border-b p-4 sm:p-6">@@ -255,7 +255,7 @@{#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">{m.settings_matching_settings()}</h4>- {#each result.matchingSettings as setting}+ {#each result.matchingSettings as setting (setting.key)}<div class="bg-background/60 border-primary/20 rounded-md border-l-2 p-3"><div class="flex items-start justify-between gap-3"><div class="min-w-0 flex-1">@@ -265,7 +265,7 @@{/if}{#if setting.keywords && setting.keywords.length > 0}<div class="mt-2 flex flex-wrap gap-1">- {#each setting.keywords.slice(0, 6) as keyword}+ {#each setting.keywords.slice(0, 6) as keyword (keyword)}<span class="bg-muted/50 text-muted-foreground rounded px-2 py-0.5 text-xs">{keyword}</span>diff --git a/frontend/src/routes/(app)/settings/appearance/+page.svelte b/frontend/src/routes/(app)/settings/appearance/+page.svelteindex 52a3711af..1abb14797 100644--- a/frontend/src/routes/(app)/settings/appearance/+page.svelte+++ b/frontend/src/routes/(app)/settings/appearance/+page.svelte@@ -17,7 +17,7 @@import { applyAccentColor } from '$lib/utils/accent-color-util';import { APPLICATION_THEME_VALUES, applyApplicationTheme } from '$lib/utils/application-theme-util';import { applyOledMode } from '$lib/utils/oled-mode-util';- import { ApperanceIcon, MonitorSpeakerIcon, DockIcon, MoonIcon, SunIcon } from '$lib/icons';+ import { AppearanceIcon, MonitorSpeakerIcon, DockIcon, MoonIcon, SunIcon } from '$lib/icons';import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';import { ArcaneButton } from '$lib/components/arcane-button/index.js';@@ -135,7 +135,7 @@<SettingsPageLayouttitle={m.appearance_title()}description={m.appearance_description()}- icon={ApperanceIcon}+ icon={AppearanceIcon}pageType="form"showReadOnlyTag={isReadOnly}>