Skip to content

Modern Docker Management, Designed for Everyone

chore: fix some layout issues

Kyle Mendell7ef9edff70f6
diff --git a/frontend/src/lib/components/dropdowns/filter-dropdown.svelte b/frontend/src/lib/components/dropdowns/filter-dropdown.svelte
new file mode 100644
index 000000000..eaf141ca7
--- /dev/null
+++ b/frontend/src/lib/components/dropdowns/filter-dropdown.svelte
@@ -0,0 +1,41 @@
+<script lang="ts" generics="TFilters extends Record<string, any>">
+ import { Button } from '$lib/components/ui/button/index.js';
+ import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
+ import { ChevronDown, Funnel } from '@lucide/svelte';
+ import type { Snippet } from 'svelte';
+ import { cn } from '$lib/utils';
+
+ let {
+ filters = $bindable(),
+ children,
+ label = 'Filter',
+ icon = Funnel,
+ variant = 'outline',
+ align = 'end',
+ class: className = ''
+ }: {
+ filters: TFilters;
+ children: Snippet<[{ filters: TFilters }]>;
+ label?: string;
+ icon?: any;
+ variant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link';
+ align?: 'start' | 'center' | 'end';
+ class?: string;
+ } = $props();
+</script>
+
+<DropdownMenu.Root>
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ {@const Icon = icon}
+ <Button {...props} {variant} class={cn('', className)}>
+ <Icon class="size-4" />
+ {label}
+ <ChevronDown class="size-4" />
+ </Button>
+ {/snippet}
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Content class="border-primary" {align}>
+ {@render children({ filters })}
+ </DropdownMenu.Content>
+</DropdownMenu.Root>
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 3dde08f9a..b9e159b12 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -65,7 +65,7 @@
<Sidebar.Provider>
<AppSidebar {versionInformation} user={currentUser} />
<main class="flex-1">
- <section class="p-6">
+ <section class="p-10">
{@render children()}
</section>
</main>
diff --git a/frontend/src/routes/auth/logout/+page.ts b/frontend/src/routes/auth/logout/+page.ts
index 1f5d21ad6..59aefd7d2 100644
--- a/frontend/src/routes/auth/logout/+page.ts
+++ b/frontend/src/routes/auth/logout/+page.ts
@@ -14,6 +14,5 @@ export const load: PageLoad = async ({ fetch }) => {
}
}
- // Redirect to login page
throw redirect(302, '/auth/login');
};
diff --git a/frontend/src/routes/auth/oidc/callback/+page.svelte b/frontend/src/routes/auth/oidc/callback/+page.svelte
index 61ede1b2a..d583fd1c8 100644
--- a/frontend/src/routes/auth/oidc/callback/+page.svelte
+++ b/frontend/src/routes/auth/oidc/callback/+page.svelte
@@ -65,13 +65,13 @@
});
</script>
-<div class="flex min-h-screen items-center justify-center bg-gray-50">
+<div class="flex min-h-screen items-center justify-center bg-background">
<div class="w-full max-w-md space-y-8">
<div class="text-center">
{#if isProcessing}
- <div class="mx-auto h-12 w-12 animate-spin rounded-full border-b-2 border-blue-600"></div>
- <h2 class="mt-6 text-2xl font-bold text-gray-900">Authenticating...</h2>
- <p class="mt-2 text-sm text-gray-600">Please wait while we complete your login.</p>
+ <div class="mx-auto h-12 w-12 animate-spin rounded-full border-b-2 border-white-600"></div>
+ <h2 class="mt-6 text-2xl font-bold">Authenticating...</h2>
+ <p class="mt-2 text-sm">Please wait while we complete your login.</p>
{:else if error}
<div class="text-red-600">
<svg class="mx-auto h-12 w-12" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -82,9 +82,9 @@
d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.732-.833-2.5 0L3.341 16.5c-.77.833.192 2.5 1.732 2.5z"
/>
</svg>
- <h2 class="mt-6 text-2xl font-bold text-gray-900">Authentication Error</h2>
- <p class="mt-2 text-sm text-gray-600">{error}</p>
- <p class="mt-4 text-xs text-gray-500">Redirecting you back to login...</p>
+ <h2 class="mt-6 text-2xl font-bold">Authentication Error</h2>
+ <p class="mt-2 text-sm">{error}</p>
+ <p class="mt-4 text-xs">Redirecting you back to login...</p>
</div>
{/if}
</div>
diff --git a/frontend/src/routes/auth/oidc/login/+page.svelte b/frontend/src/routes/auth/oidc/login/+page.svelte
index a5234bf70..95976f233 100644
--- a/frontend/src/routes/auth/oidc/login/+page.svelte
+++ b/frontend/src/routes/auth/oidc/login/+page.svelte
@@ -33,21 +33,26 @@
<title>Redirecting to Login... - Arcane</title>
</svelte:head>
-<div class="flex min-h-screen items-center justify-center bg-gray-50">
+<div class="flex min-h-screen items-center justify-center bg-background">
<div class="w-full max-w-md space-y-8">
<div class="text-center">
{#if isRedirecting && !error}
- <div class="mx-auto h-12 w-12 animate-spin rounded-full border-b-2 border-blue-600"></div>
- <h2 class="mt-6 text-2xl font-bold text-gray-900">Redirecting to Login...</h2>
- <p class="mt-2 text-sm text-gray-600">Please wait while we redirect you to your identity provider.</p>
+ <div class="mx-auto h-12 w-12 animate-spin rounded-full border-b-2 border-white"></div>
+ <h2 class="mt-6 text-2xl font-bold">Redirecting to Login...</h2>
+ <p class="mt-2 text-sm">Please wait while we redirect you to your identity provider.</p>
{:else if error}
<div class="text-red-600">
<svg class="mx-auto h-12 w-12" fill="none" viewBox="0 0 24 24" stroke="currentColor">
- <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.732-.833-2.5 0L3.341 16.5c-.77.833.192 2.5 1.732 2.5z" />
+ <path
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ stroke-width="2"
+ d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.732-.833-2.5 0L3.341 16.5c-.77.833.192 2.5 1.732 2.5z"
+ />
</svg>
- <h2 class="mt-6 text-2xl font-bold text-gray-900">Login Error</h2>
- <p class="mt-2 text-sm text-gray-600">{error}</p>
- <p class="mt-4 text-xs text-gray-500">Redirecting you back to the login page...</p>
+ <h2 class="mt-6 text-2xl font-bold">Login Error</h2>
+ <p class="mt-2 text-sm">{error}</p>
+ <p class="mt-4 text-xs">Redirecting you back to the login page...</p>
</div>
{/if}
</div>
diff --git a/frontend/src/routes/images/+page.svelte b/frontend/src/routes/images/+page.svelte
index 724476d4f..fffbde3d5 100644
--- a/frontend/src/routes/images/+page.svelte
+++ b/frontend/src/routes/images/+page.svelte
@@ -115,7 +115,7 @@
}
</script>
-<div class="space-y-6 pb-8">
+<div class="space-y-6">
<div class="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
<div>
<h1 class="text-2xl font-bold">Images</h1>
diff --git a/frontend/src/routes/images/image-table.svelte b/frontend/src/routes/images/image-table.svelte
index e44125c0b..3fc2e0a59 100644
--- a/frontend/src/routes/images/image-table.svelte
+++ b/frontend/src/routes/images/image-table.svelte
@@ -26,6 +26,7 @@
import ImageUpdateItem from '$lib/components/image-update-item.svelte';
import { environmentAPI } from '$lib/services/api';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
+ import FilterDropdown from '$lib/components/dropdowns/filter-dropdown.svelte';
interface ImageWithId extends EnhancedImageInfo {
id: string;
@@ -199,30 +200,21 @@
<Card.Title>Images List</Card.Title>
</div>
<div class="flex items-center gap-2">
- <DropdownMenu.Root>
- <DropdownMenu.Trigger>
- {#snippet child({ props })}
- <Button {...props} variant="outline">
- <Funnel class="size-4" />
- Filter
- <ChevronDown class="size-4" />
- </Button>
- {/snippet}
- </DropdownMenu.Trigger>
- <DropdownMenu.Content class="border-primary" align="end">
+ <FilterDropdown bind:filters={imageFilters}>
+ {#snippet children({ filters })}
<DropdownMenu.Label>Image Usage</DropdownMenu.Label>
<DropdownMenu.CheckboxItem
- checked={imageFilters.showUsed}
+ checked={filters.showUsed}
onCheckedChange={(checked) => {
- imageFilters.showUsed = checked;
+ filters.showUsed = checked;
}}
>
Show Used Images
</DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem
- checked={imageFilters.showUnused}
+ checked={filters.showUnused}
onCheckedChange={(checked) => {
- imageFilters.showUnused = checked;
+ filters.showUnused = checked;
}}
>
Show Unused Images
@@ -230,23 +222,23 @@
<DropdownMenu.Separator />
<DropdownMenu.Label>Update Status</DropdownMenu.Label>
<DropdownMenu.CheckboxItem
- checked={imageFilters.showWithUpdates}
+ checked={filters.showWithUpdates}
onCheckedChange={(checked) => {
- imageFilters.showWithUpdates = checked;
+ filters.showWithUpdates = checked;
}}
>
Show Images with Updates
</DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem
- checked={imageFilters.showWithoutUpdates}
+ checked={filters.showWithoutUpdates}
onCheckedChange={(checked) => {
- imageFilters.showWithoutUpdates = checked;
+ filters.showWithoutUpdates = checked;
}}
>
Show Images without Updates
</DropdownMenu.CheckboxItem>
- </DropdownMenu.Content>
- </DropdownMenu.Root>
+ {/snippet}
+ </FilterDropdown>
{#if selectedIds.length > 0}
<ArcaneButton
action="remove"
diff --git a/frontend/src/routes/volumes/+page.svelte b/frontend/src/routes/volumes/+page.svelte
index 2d16a7a24..fb5e73a2e 100644
--- a/frontend/src/routes/volumes/+page.svelte
+++ b/frontend/src/routes/volumes/+page.svelte
@@ -102,7 +102,7 @@
}
</script>
-<div class="space-y-6 pb-8">
+<div class="space-y-6">
<div class="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
<div>
<h1 class="text-3xl font-bold tracking-tight">Volumes</h1>
diff --git a/frontend/src/routes/volumes/volume-table.svelte b/frontend/src/routes/volumes/volume-table.svelte
index 3bdbd187d..f75f2db6a 100644
--- a/frontend/src/routes/volumes/volume-table.svelte
+++ b/frontend/src/routes/volumes/volume-table.svelte
@@ -16,6 +16,7 @@
import { formatFriendlyDate } from '$lib/utils/date.utils';
import { environmentAPI } from '$lib/services/api';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
+ import FilterDropdown from '$lib/components/dropdowns/filter-dropdown.svelte';
type EnhancedVolumeInfo = VolumeInspectInfo & {
InUse: boolean;
@@ -150,36 +151,27 @@
<div class="flex items-center justify-between">
<Card.Title>Volumes List</Card.Title>
<div class="flex items-center gap-2">
- <DropdownMenu.Root>
- <DropdownMenu.Trigger>
- {#snippet child({ props })}
- <Button {...props} variant="outline">
- <Funnel class="size-4" />
- Filter
- <ChevronDown class="size-4" />
- </Button>
- {/snippet}
- </DropdownMenu.Trigger>
- <DropdownMenu.Content>
+ <FilterDropdown bind:filters={volumeFilters}>
+ {#snippet children({ filters })}
<DropdownMenu.Label>Volume Usage</DropdownMenu.Label>
<DropdownMenu.CheckboxItem
- checked={volumeFilters.showUsed}
+ checked={filters.showUsed}
onCheckedChange={(checked) => {
- volumeFilters.showUsed = checked;
+ filters.showUsed = checked;
}}
>
Show Used Volumes
</DropdownMenu.CheckboxItem>
<DropdownMenu.CheckboxItem
- checked={volumeFilters.showUnused}
+ checked={filters.showUnused}
onCheckedChange={(checked) => {
- volumeFilters.showUnused = checked;
+ filters.showUnused = checked;
}}
>
Show Unused Volumes
</DropdownMenu.CheckboxItem>
- </DropdownMenu.Content>
- </DropdownMenu.Root>
+ {/snippet}
+ </FilterDropdown>
{#if selectedIds.length > 0}
<ArcaneButton
action="remove"