Skip to content

Modern Docker Management, Designed for Everyone

refactor: unify badge styling

Kyle Mendellbc742f77df77
diff --git a/frontend/src/lib/components/activity/activity-detail-panel.svelte b/frontend/src/lib/components/activity/activity-detail-panel.svelte
index a457b6811..2bfac7b01 100644
--- a/frontend/src/lib/components/activity/activity-detail-panel.svelte
+++ b/frontend/src/lib/components/activity/activity-detail-panel.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Progress } from '$lib/components/ui/progress/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { CopyButton } from '$lib/components/ui/copy-button';
import { activityStore } from '$lib/stores/activity.store.svelte';
import type { Activity, ActivityMessage } from '$lib/types/activity.type';
@@ -105,12 +105,9 @@
<div class="min-w-0">
<div class="flex flex-wrap items-center gap-2">
<h3 class="truncate text-sm font-semibold">{activityTypeLabel(liveActivity.type)}</h3>
- <StatusBadge
- text={activityStatusLabel(liveActivity.status)}
- variant={activityStatusVariant(liveActivity.status)}
- size="sm"
- minWidth="none"
- />
+ <Badge variant={activityStatusVariant(liveActivity.status)} size="sm"
+ >{activityStatusLabel(liveActivity.status)}</Badge
+ >
</div>
<p class="text-muted-foreground mt-1 truncate text-xs">{activityTarget}</p>
</div>
diff --git a/frontend/src/lib/components/activity/activity-list-item.svelte b/frontend/src/lib/components/activity/activity-list-item.svelte
index cb01ec760..86d0c25a9 100644
--- a/frontend/src/lib/components/activity/activity-list-item.svelte
+++ b/frontend/src/lib/components/activity/activity-list-item.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Progress } from '$lib/components/ui/progress/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { ArrowDownIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
import { cn } from '$lib/utils';
@@ -90,12 +90,7 @@
{/if}
</div>
</div>
- <StatusBadge
- text={activityStatusLabel(activity.status)}
- variant={activityStatusVariant(activity.status)}
- size="sm"
- minWidth="none"
- />
+ <Badge variant={activityStatusVariant(activity.status)} size="sm">{activityStatusLabel(activity.status)}</Badge>
</div>
<div class="space-y-1.5">
diff --git a/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte b/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
index 0330e69f7..9c7742c15 100644
--- a/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
+++ b/frontend/src/lib/components/arcane-table/cards/universal-mobile-card.svelte
@@ -1,6 +1,6 @@
<script lang="ts" generics="T">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { cn } from '$lib/utils';
import type { Snippet, Component } from 'svelte';
@@ -111,7 +111,7 @@
{#snippet FieldValue(field: FieldDefinition<T>, value: any, isCompact: boolean)}
{#if field.type === 'badge' && field.badgeVariant}
- <StatusBadge variant={field.badgeVariant} text={String(value)} size="sm" />
+ <Badge variant={field.badgeVariant} size="sm" minWidth="20">{String(value)}</Badge>
{:else if field.type === 'mono'}
<span class={isCompact ? 'text-muted-foreground truncate font-mono text-xs leading-tight' : 'font-mono text-xs'}>{value}</span
>
@@ -189,7 +189,7 @@
{#if resolvedBadges.length > 0}
<div class="flex flex-wrap items-center gap-1">
{#each resolvedBadges as badge (`${badge.variant}:${badge.text}`)}
- <StatusBadge variant={badge.variant} text={badge.text} size="sm" />
+ <Badge variant={badge.variant} size="sm" minWidth="20">{badge.text}</Badge>
{/each}
</div>
{/if}
diff --git a/frontend/src/lib/components/arcane-table/cells/enabled-status-cell.svelte b/frontend/src/lib/components/arcane-table/cells/enabled-status-cell.svelte
index ab6a672a3..a26046e45 100644
--- a/frontend/src/lib/components/arcane-table/cells/enabled-status-cell.svelte
+++ b/frontend/src/lib/components/arcane-table/cells/enabled-status-cell.svelte
@@ -1,9 +1,9 @@
<script lang="ts">
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
let { value }: { value: unknown } = $props();
const enabled = $derived(Boolean(value));
</script>
-<StatusBadge variant={enabled ? 'green' : 'red'} text={enabled ? m.common_enabled() : m.common_disabled()} />
+<Badge variant={enabled ? 'green' : 'red'} minWidth="20">{enabled ? m.common_enabled() : m.common_disabled()}</Badge>
diff --git a/frontend/src/lib/components/arcane-table/cells/in-use-status.svelte b/frontend/src/lib/components/arcane-table/cells/in-use-status.svelte
index e5c736b9a..78548283d 100644
--- a/frontend/src/lib/components/arcane-table/cells/in-use-status.svelte
+++ b/frontend/src/lib/components/arcane-table/cells/in-use-status.svelte
@@ -1,12 +1,12 @@
<script lang="ts">
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
let { inUse }: { inUse: boolean } = $props();
</script>
{#if inUse}
- <StatusBadge text={m.common_in_use()} variant="green" />
+ <Badge variant="green" minWidth="20">{m.common_in_use()}</Badge>
{:else}
- <StatusBadge text={m.common_unused()} variant="amber" />
+ <Badge variant="amber" minWidth="20">{m.common_unused()}</Badge>
{/if}
diff --git a/frontend/src/lib/components/badges/index.ts b/frontend/src/lib/components/badges/index.ts
index c4c9544a1..6b8b15a3b 100644
--- a/frontend/src/lib/components/badges/index.ts
+++ b/frontend/src/lib/components/badges/index.ts
@@ -1,3 +1,2 @@
-export { default as StatusBadge } from './status-badge.svelte';
export { default as PortBadge } from './port-badge.svelte';
export { default as UiConfigDisabledTag } from './ui-config-disabled-tag.svelte';
diff --git a/frontend/src/lib/components/badges/port-badge.svelte b/frontend/src/lib/components/badges/port-badge.svelte
index 6065edb39..4b95f5f71 100644
--- a/frontend/src/lib/components/badges/port-badge.svelte
+++ b/frontend/src/lib/components/badges/port-badge.svelte
@@ -2,6 +2,8 @@
import type { ContainerPorts } from '$lib/types/docker';
import { m } from '$lib/paraglide/messages';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
+ import { badgeVariants } from '$lib/components/ui/badge';
+ import { cn } from '$lib/utils';
import settingsStore from '$lib/stores/config-store';
import { toPortHref } from '$lib/utils/navigation';
import { mergeProps } from 'bits-ui';
@@ -96,8 +98,10 @@
<ArcaneTooltip.Trigger>
{#snippet child({ props })}
{@const triggerProps = mergeProps(props, {
- class:
- 'ring-offset-background focus-visible:ring-ring bg-background/70 inline-flex items-center gap-1 rounded-md border border-sky-700/20 px-2 py-1 text-[11px] transition-colors hover:border-sky-700/40 hover:bg-sky-500/10 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none dark:border-sky-400/40 dark:bg-slate-500/20 dark:text-sky-100 dark:hover:border-sky-300/60 dark:hover:bg-sky-500/30',
+ class: cn(
+ badgeVariants({ variant: 'sky', size: 'sm' }),
+ 'hover:bg-sky-500/20 hover:border-sky-500/40 dark:hover:border-sky-500/50 focus-visible:outline-none'
+ ),
href: toPortHref(p.hostPort!, baseServerUrl),
target: '_blank',
rel: 'noopener noreferrer'
@@ -120,9 +124,7 @@
{#each exposedOnly as p, i (i)}
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <span
- class="bg-background/50 inline-flex items-center gap-1 rounded-md border border-gray-600/30 px-2 py-1 text-[11px] text-gray-400 dark:border-slate-400/40 dark:bg-slate-500/20 dark:text-slate-200"
- >
+ <span class={badgeVariants({ variant: 'gray', size: 'sm' })}>
<span class="tabular-nums">{p.containerPort}</span>
{#if p.proto}
<span class="text-muted-foreground uppercase">{p.proto}</span>
@@ -142,8 +144,7 @@
{#snippet child({ props })}
{@const triggerProps = mergeProps(props, {
onclick: () => (expanded = !expanded),
- class:
- 'bg-muted hover:bg-muted/80 text-muted-foreground inline-flex cursor-pointer items-center rounded-md border px-2 py-1 text-[11px] font-medium transition-colors'
+ class: cn(badgeVariants({ variant: 'gray', size: 'sm' }), 'hover:bg-muted cursor-pointer')
})}
<button {...triggerProps}>{expanded ? '−' : `+${hiddenCount}`}</button>
{/snippet}
diff --git a/frontend/src/lib/components/badges/status-badge.svelte b/frontend/src/lib/components/badges/status-badge.svelte
deleted file mode 100644
index 8750a9a6e..000000000
--- a/frontend/src/lib/components/badges/status-badge.svelte
+++ /dev/null
@@ -1,115 +0,0 @@
-<script lang="ts">
- import { cn } from '$lib/utils';
- import { m } from '$lib/paraglide/messages';
- import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
-
- type Variant =
- | 'red'
- | 'purple'
- | 'green'
- | 'blue'
- | 'gray'
- | 'amber'
- | 'pink'
- | 'indigo'
- | 'cyan'
- | 'lime'
- | 'emerald'
- | 'teal'
- | 'sky'
- | 'violet'
- | 'fuchsia'
- | 'rose'
- | 'orange';
-
- type Size = 'sm' | 'md' | 'lg';
- type MinWidth = 'none' | '16' | '20' | '24' | '28';
-
- let {
- text = m.common_unknown(),
- variant = 'gray',
- size = 'md',
- minWidth = '20',
- tooltip,
- class: className = '',
- ...restProps
- } = $props<{
- text: string;
- variant?: Variant;
- size?: Size;
- minWidth?: MinWidth;
- tooltip?: string;
- class?: string;
- }>();
-
- const minWidthClasses: Record<MinWidth, string> = {
- none: '',
- '16': 'min-w-16',
- '20': 'min-w-20',
- '24': 'min-w-24',
- '28': 'min-w-28'
- };
-
- const sizeStyles: Record<Size, string> = {
- sm: 'h-5 px-2 text-[11px]',
- md: 'h-6 px-2.5 text-[12px]',
- lg: 'h-7 px-3 text-[13px]'
- };
-
- const variantStyles: Record<Variant, string> = {
- red: 'text-red-600 bg-red-500/10 border-red-500/20 dark:text-red-400 dark:bg-red-500/10 dark:border-red-500/30',
- purple:
- 'text-purple-600 bg-purple-500/10 border-purple-500/20 dark:text-purple-400 dark:bg-purple-500/10 dark:border-purple-500/30',
- green:
- 'text-emerald-600 bg-emerald-500/10 border-emerald-500/20 dark:text-emerald-400 dark:bg-emerald-500/10 dark:border-emerald-500/30',
- blue: 'text-blue-600 bg-blue-500/10 border-blue-500/20 dark:text-blue-400 dark:bg-blue-500/10 dark:border-blue-500/30',
- gray: 'text-muted-foreground bg-muted/50 border-border/50 dark:bg-muted/20 dark:border-border/20',
- amber: 'text-amber-600 bg-amber-500/10 border-amber-500/20 dark:text-amber-400 dark:bg-amber-500/10 dark:border-amber-500/30',
- pink: 'text-pink-600 bg-pink-500/10 border-pink-500/20 dark:text-pink-400 dark:bg-pink-500/10 dark:border-pink-500/30',
- indigo:
- 'text-indigo-600 bg-indigo-500/10 border-indigo-500/20 dark:text-indigo-400 dark:bg-indigo-500/10 dark:border-indigo-500/30',
- cyan: 'text-cyan-600 bg-cyan-500/10 border-cyan-500/20 dark:text-cyan-400 dark:bg-cyan-500/10 dark:border-cyan-500/30',
- lime: 'text-lime-600 bg-lime-500/10 border-lime-500/20 dark:text-lime-400 dark:bg-lime-500/10 dark:border-lime-500/30',
- emerald:
- 'text-emerald-600 bg-emerald-500/10 border-emerald-500/20 dark:text-emerald-400 dark:bg-emerald-500/10 dark:border-emerald-500/30',
- teal: 'text-teal-600 bg-teal-500/10 border-teal-500/20 dark:text-teal-400 dark:bg-teal-500/10 dark:border-teal-500/30',
- sky: 'text-sky-600 bg-sky-500/10 border-sky-500/20 dark:text-sky-400 dark:bg-sky-500/10 dark:border-sky-500/30',
- violet:
- 'text-violet-600 bg-violet-500/10 border-violet-500/20 dark:text-violet-400 dark:bg-violet-500/10 dark:border-violet-500/30',
- fuchsia:
- 'text-fuchsia-600 bg-fuchsia-500/10 border-fuchsia-500/20 dark:text-fuchsia-400 dark:bg-fuchsia-500/10 dark:border-fuchsia-500/30',
- rose: 'text-rose-600 bg-rose-500/10 border-rose-500/20 dark:text-rose-400 dark:bg-rose-500/10 dark:border-rose-500/30',
- orange:
- 'text-orange-600 bg-orange-500/10 border-orange-500/20 dark:text-orange-400 dark:bg-orange-500/10 dark:border-orange-500/30'
- };
-
- const badgeClasses = $derived(
- cn(
- 'inline-flex shrink-0 items-center justify-center whitespace-nowrap rounded-[var(--radius)] font-semibold tracking-tight',
- 'border transition-colors',
- sizeStyles[size as Size],
- variantStyles[variant as Variant],
- minWidthClasses[minWidth as MinWidth],
- className
- )
- );
-</script>
-
-{#snippet BadgeContent()}
- <span class={badgeClasses} {...restProps}>
- {text}
- </span>
-{/snippet}
-
-{#if tooltip}
- <ArcaneTooltip.Root>
- <ArcaneTooltip.Trigger>
- {@render BadgeContent()}
- </ArcaneTooltip.Trigger>
- <ArcaneTooltip.Content>
- <p class="max-w-xs text-xs">{tooltip}</p>
- </ArcaneTooltip.Content>
- </ArcaneTooltip.Root>
-{:else}
- {@render BadgeContent()}
-{/if}
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 d8f869b64..aee2e8e7e 100644
--- a/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
+++ b/frontend/src/lib/components/badges/ui-config-disabled-tag.svelte
@@ -2,6 +2,7 @@
import settingsStore from '$lib/stores/config-store';
import { m } from '$lib/paraglide/messages';
import { LockIcon } from '$lib/icons';
+ import { Badge } from '$lib/components/ui/badge';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
const active = $derived.by(() => $settingsStore.uiConfigDisabled);
@@ -10,12 +11,10 @@
{#if active}
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <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"
- >
- <LockIcon class="size-3" />
+ <Badge variant="amber">
+ <LockIcon />
Read-only
- </span>
+ </Badge>
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content side="bottom" class="max-w-xs">
<div class="space-y-1">
diff --git a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
index 22913fdb0..3d51b692c 100644
--- a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
@@ -278,7 +278,7 @@
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_address_pools_label()}</div>
<div class="flex flex-wrap gap-1">
{#each info.DefaultAddressPools as pool, i (i)}
- <Badge variant="outline" class="px-1.5 py-0 font-mono text-[10px]">{pool.Base}/{pool.Size}</Badge>
+ <Badge variant="outline" size="sm" class="font-mono">{pool.Base}/{pool.Size}</Badge>
{/each}
</div>
</div>
@@ -343,7 +343,7 @@
<div class="rounded-lg border p-3">
<div class="flex flex-wrap gap-1">
{#each info.Labels ?? [] as label, i (i)}
- <Badge variant="outline" class="px-1.5 py-0 font-mono text-[10px]">{label}</Badge>
+ <Badge variant="outline" size="sm" class="font-mono">{label}</Badge>
{/each}
</div>
</div>
@@ -375,7 +375,7 @@
}}
<div class="rounded-lg border p-3 {colors[color].bg}">
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{label}</div>
- <Badge variant="outline" class="{colors[color].badge} rounded-md text-base font-semibold tabular-nums">
+ <Badge variant="outline" class="{colors[color].badge} text-base font-semibold tabular-nums">
{value}
</Badge>
</div>
@@ -386,7 +386,7 @@
<div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{label}</div>
<div class="flex flex-wrap gap-1">
{#each items ?? [] as item, i (i)}
- <Badge variant="outline" class="px-1.5 py-0 text-[10px]">{item}</Badge>
+ <Badge variant="outline" size="sm">{item}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
diff --git a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
index 45987fbcd..a573cecbd 100644
--- a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
@@ -201,7 +201,7 @@
{#if normalizeTags(template.metadata?.tags).length > 0}
<div class="mb-3 flex flex-wrap gap-1">
{#each normalizeTags(template.metadata?.tags) as tag}
- <Badge variant="outline" class="text-[10px]">{tag}</Badge>
+ <Badge variant="outline" size="sm">{tag}</Badge>
{/each}
</div>
{/if}
diff --git a/frontend/src/lib/components/forms/role-assignments-editor.svelte b/frontend/src/lib/components/forms/role-assignments-editor.svelte
index 98c96980e..c32603635 100644
--- a/frontend/src/lib/components/forms/role-assignments-editor.svelte
+++ b/frontend/src/lib/components/forms/role-assignments-editor.svelte
@@ -2,7 +2,7 @@
import * as Select from '$lib/components/ui/select';
import { Checkbox } from '$lib/components/ui/checkbox';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import {
type Role,
BUILT_IN_ROLE_ADMIN,
@@ -113,7 +113,7 @@
/>
<div class="flex flex-col gap-1">
<div class="flex items-center gap-2">
- <StatusBadge text={role.name} variant={getRoleVariant(role.id)} size="sm" minWidth="none" />
+ <Badge variant={getRoleVariant(role.id)} size="sm">{role.name}</Badge>
<span class="text-xs text-muted-foreground">{m.users_role_assignments_scope_global()}</span>
</div>
{#if role.description}
@@ -171,7 +171,7 @@
{#each roles as role (role.id)}
<Select.Item value={role.id} label={role.name}>
<span class="flex items-center gap-2">
- <StatusBadge text={role.name} variant={getRoleVariant(role.id)} size="sm" minWidth="none" />
+ <Badge variant={getRoleVariant(role.id)} size="sm">{role.name}</Badge>
{#if role.description}
<span class="text-muted-foreground text-xs">{role.description}</span>
{/if}
diff --git a/frontend/src/lib/components/image-update-item.svelte b/frontend/src/lib/components/image-update-item.svelte
index e446c1cf5..2532ba7ef 100644
--- a/frontend/src/lib/components/image-update-item.svelte
+++ b/frontend/src/lib/components/image-update-item.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
import { Spinner } from '$lib/components/ui/spinner/index.js';
+ import { Badge, type BadgeVariant } from '$lib/components/ui/badge';
import { toast } from 'svelte-sonner';
import type { ImageUpdateData } from '$lib/types/docker';
import { m } from '$lib/paraglide/messages';
@@ -95,7 +96,7 @@
const canCheckUpdate = $derived(!!(repo && tag && repo !== '<none>' && tag !== '<none>') && !isLocalImage);
const hasError = $derived(!!effectiveUpdateInfo?.error && effectiveUpdateInfo.error.trim() !== '');
- type AuthBadge = { label: string; classes: string };
+ type AuthBadge = { label: string; variant: BadgeVariant };
const authBadge = $derived.by((): AuthBadge | null => {
const mth = effectiveUpdateInfo?.authMethod;
@@ -105,19 +106,19 @@
const user = effectiveUpdateInfo?.authUsername;
return {
label: user ? m.image_update_auth_credential_with_user({ username: user }) : m.image_update_auth_credential(),
- classes: 'border-amber-200/60 text-amber-900 dark:text-amber-300 bg-amber-100 dark:bg-amber-900/30'
+ variant: 'amber'
};
}
if (mth === 'anonymous') {
return {
label: m.image_update_auth_anonymous(),
- classes: 'border-slate-200/60 text-slate-800 dark:text-slate-300 bg-slate-100 dark:bg-slate-900/40'
+ variant: 'gray'
};
}
if (mth === 'none') {
return {
label: m.image_update_auth_none(),
- classes: 'border-gray-200/60 text-gray-800 dark:text-gray-300 bg-gray-100 dark:bg-gray-900/40'
+ variant: 'gray'
};
}
return null;
@@ -233,12 +234,10 @@
{#snippet authBadgeDisplay()}
{#if authBadge}
<div class="mt-2">
- <div
- class="inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[10px] font-medium whitespace-nowrap {authBadge.classes}"
- >
- <ApiKeyIcon class="size-3 opacity-80" />
+ <Badge variant={authBadge.variant} size="sm">
+ <ApiKeyIcon class="opacity-80" />
<span>{m.image_update_auth({ label: authBadge.label })}</span>
- </div>
+ </Badge>
</div>
{/if}
{/snippet}
diff --git a/frontend/src/lib/components/job-card/job-card.svelte b/frontend/src/lib/components/job-card/job-card.svelte
index 259930e50..e6fa6779e 100644
--- a/frontend/src/lib/components/job-card/job-card.svelte
+++ b/frontend/src/lib/components/job-card/job-card.svelte
@@ -70,7 +70,7 @@
<div class="flex items-center gap-2">
<Card.Title class="text-sm leading-none font-medium">{job.name}</Card.Title>
{#if job.isContinuous}
- <Badge variant="outline" class="h-4.5 border-white/10 px-1.5 text-[0.6rem] font-medium">{m.jobs_continuous()}</Badge>
+ <Badge variant="outline" size="sm">{m.jobs_continuous()}</Badge>
{/if}
</div>
<Card.Description class="text-muted-foreground/80 line-clamp-1 text-xs">{job.description}</Card.Description>
diff --git a/frontend/src/lib/components/network-diagram/network-diagram.svelte b/frontend/src/lib/components/network-diagram/network-diagram.svelte
index 17be718d1..1963447ab 100644
--- a/frontend/src/lib/components/network-diagram/network-diagram.svelte
+++ b/frontend/src/lib/components/network-diagram/network-diagram.svelte
@@ -2,7 +2,7 @@
import { browser } from '$app/env';
import { goto } from '$app/navigation';
import { ArcaneButton } from '$lib/components/arcane-button';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import { EyeOnIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
@@ -471,8 +471,8 @@
<div class={cn('space-y-4', className)}>
<div class="flex flex-wrap items-center gap-2">
- <StatusBadge text={m.networks_topology_legend_networks()} variant="violet" minWidth="none" />
- <StatusBadge text={m.networks_topology_legend_containers()} variant="emerald" minWidth="none" />
+ <Badge variant="violet">{m.networks_topology_legend_networks()}</Badge>
+ <Badge variant="emerald">{m.networks_topology_legend_containers()}</Badge>
<p class="text-muted-foreground text-sm">{m.networks_topology_hint()}</p>
{#if presentDefaults.length > 0}
<div class="ml-auto">
diff --git a/frontend/src/lib/components/role-editor/permission-picker.svelte b/frontend/src/lib/components/role-editor/permission-picker.svelte
index 8c2dd6c39..2c87eb81c 100644
--- a/frontend/src/lib/components/role-editor/permission-picker.svelte
+++ b/frontend/src/lib/components/role-editor/permission-picker.svelte
@@ -2,7 +2,7 @@
import * as Accordion from '$lib/components/ui/accordion';
import { Checkbox } from '$lib/components/ui/checkbox';
import { Input } from '$lib/components/ui/input';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import type { PermissionsManifest, PermissionResource, PermissionAction, PermissionPreset } from '$lib/types/auth';
import { normalizePermissionSelection } from '$lib/utils/permissions';
import { m } from '$lib/paraglide/messages';
@@ -152,12 +152,9 @@
total: group.resource.actions.length
})}
</span>
- <StatusBadge
- text={group.resource.scope === 'global' ? m.permissions_scope_global() : m.permissions_scope_env()}
- variant={group.resource.scope === 'global' ? 'amber' : 'blue'}
- size="sm"
- minWidth="none"
- />
+ <Badge variant={group.resource.scope === 'global' ? 'amber' : 'blue'} size="sm"
+ >{group.resource.scope === 'global' ? m.permissions_scope_global() : m.permissions_scope_env()}</Badge
+ >
</div>
</Accordion.Trigger>
</div>
diff --git a/frontend/src/lib/components/role-editor/role-editor.svelte b/frontend/src/lib/components/role-editor/role-editor.svelte
index 4a03b24ca..a4cb62c75 100644
--- a/frontend/src/lib/components/role-editor/role-editor.svelte
+++ b/frontend/src/lib/components/role-editor/role-editor.svelte
@@ -2,7 +2,7 @@
import * as Card from '$lib/components/ui/card';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import PermissionPicker from './permission-picker.svelte';
import type { Role, PermissionsManifest } from '$lib/types/auth';
import { normalizePermissionSelection } from '$lib/utils/permissions';
@@ -62,12 +62,7 @@
</Card.Header>
<Card.Content class="space-y-4 p-6 pt-2">
<div class="flex items-center gap-2">
- <StatusBadge
- text={isBuiltIn ? m.roles_built_in() : m.roles_custom()}
- variant={isBuiltIn ? 'blue' : 'green'}
- size="sm"
- minWidth="none"
- />
+ <Badge variant={isBuiltIn ? 'blue' : 'green'} size="sm">{isBuiltIn ? m.roles_built_in() : m.roles_custom()}</Badge>
</div>
<FormInput
diff --git a/frontend/src/lib/components/ui/badge/badge.svelte b/frontend/src/lib/components/ui/badge/badge.svelte
index 566b82584..75110309d 100644
--- a/frontend/src/lib/components/ui/badge/badge.svelte
+++ b/frontend/src/lib/components/ui/badge/badge.svelte
@@ -2,15 +2,52 @@
import { type VariantProps, tv } from 'tailwind-variants';
export const badgeVariants = tv({
- base: 'focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden whitespace-nowrap rounded-lg border px-2.5 py-1 text-xs font-medium transition-all focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3',
+ base: 'focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex w-fit shrink-0 items-center justify-center gap-1 overflow-hidden whitespace-nowrap rounded-lg border text-xs font-medium transition-colors focus-visible:ring-[3px] [&>svg]:pointer-events-none [&>svg]:size-3',
variants: {
variant: {
- default: 'bubble-pill bg-primary text-primary-foreground [a&]:hover:bg-primary/90 border-transparent',
- secondary: 'bubble-pill bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90 border-transparent',
+ default: 'bg-primary text-primary-foreground [a&]:hover:bg-primary/90 border-transparent',
+ secondary: 'bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90 border-transparent',
destructive:
- 'bubble-pill bg-destructive [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white',
+ 'bg-destructive [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white',
outline:
- 'backdrop-blur-sm bg-card/60 text-foreground [a&]:hover:backdrop-blur-sm [a&]:hover:bg-card/90 [a&]:hover:text-accent-foreground'
+ 'backdrop-blur-sm bg-card/60 text-foreground [a&]:hover:backdrop-blur-sm [a&]:hover:bg-card/90 [a&]:hover:text-accent-foreground',
+ red: 'text-red-600 bg-red-500/10 border-red-500/20 dark:text-red-400 dark:bg-red-500/10 dark:border-red-500/30',
+ orange:
+ 'text-orange-600 bg-orange-500/10 border-orange-500/20 dark:text-orange-400 dark:bg-orange-500/10 dark:border-orange-500/30',
+ amber:
+ 'text-amber-600 bg-amber-500/10 border-amber-500/20 dark:text-amber-400 dark:bg-amber-500/10 dark:border-amber-500/30',
+ lime: 'text-lime-600 bg-lime-500/10 border-lime-500/20 dark:text-lime-400 dark:bg-lime-500/10 dark:border-lime-500/30',
+ green:
+ 'text-emerald-600 bg-emerald-500/10 border-emerald-500/20 dark:text-emerald-400 dark:bg-emerald-500/10 dark:border-emerald-500/30',
+ emerald:
+ 'text-emerald-600 bg-emerald-500/10 border-emerald-500/20 dark:text-emerald-400 dark:bg-emerald-500/10 dark:border-emerald-500/30',
+ teal: 'text-teal-600 bg-teal-500/10 border-teal-500/20 dark:text-teal-400 dark:bg-teal-500/10 dark:border-teal-500/30',
+ cyan: 'text-cyan-600 bg-cyan-500/10 border-cyan-500/20 dark:text-cyan-400 dark:bg-cyan-500/10 dark:border-cyan-500/30',
+ sky: 'text-sky-600 bg-sky-500/10 border-sky-500/20 dark:text-sky-400 dark:bg-sky-500/10 dark:border-sky-500/30',
+ blue: 'text-blue-600 bg-blue-500/10 border-blue-500/20 dark:text-blue-400 dark:bg-blue-500/10 dark:border-blue-500/30',
+ indigo:
+ 'text-indigo-600 bg-indigo-500/10 border-indigo-500/20 dark:text-indigo-400 dark:bg-indigo-500/10 dark:border-indigo-500/30',
+ violet:
+ 'text-violet-600 bg-violet-500/10 border-violet-500/20 dark:text-violet-400 dark:bg-violet-500/10 dark:border-violet-500/30',
+ purple:
+ 'text-purple-600 bg-purple-500/10 border-purple-500/20 dark:text-purple-400 dark:bg-purple-500/10 dark:border-purple-500/30',
+ fuchsia:
+ 'text-fuchsia-600 bg-fuchsia-500/10 border-fuchsia-500/20 dark:text-fuchsia-400 dark:bg-fuchsia-500/10 dark:border-fuchsia-500/30',
+ pink: 'text-pink-600 bg-pink-500/10 border-pink-500/20 dark:text-pink-400 dark:bg-pink-500/10 dark:border-pink-500/30',
+ rose: 'text-rose-600 bg-rose-500/10 border-rose-500/20 dark:text-rose-400 dark:bg-rose-500/10 dark:border-rose-500/30',
+ gray: 'text-muted-foreground bg-muted/50 border-border/50 dark:bg-muted/20 dark:border-border/20'
+ },
+ size: {
+ sm: 'px-2 py-0.5 text-[11px] [&>svg]:size-2.5',
+ default: 'px-2.5 py-1',
+ lg: 'px-3 py-1.5 text-[13px]'
+ },
+ minWidth: {
+ none: '',
+ '16': 'min-w-16',
+ '20': 'min-w-20',
+ '24': 'min-w-24',
+ '28': 'min-w-28'
},
hoverEffect: {
none: '',
@@ -19,11 +56,15 @@
},
defaultVariants: {
variant: 'default',
+ size: 'default',
+ minWidth: 'none',
hoverEffect: 'lift'
}
});
export type BadgeVariant = VariantProps<typeof badgeVariants>['variant'];
+ export type BadgeSize = VariantProps<typeof badgeVariants>['size'];
+ export type BadgeMinWidth = VariantProps<typeof badgeVariants>['minWidth'];
export type BadgeHoverEffect = VariantProps<typeof badgeVariants>['hoverEffect'];
</script>
@@ -36,11 +77,15 @@
href,
class: className,
variant = 'default',
+ size = 'default',
+ minWidth = 'none',
hoverEffect = 'lift',
children,
...restProps
}: WithElementRef<HTMLAnchorAttributes> & {
variant?: BadgeVariant;
+ size?: BadgeSize;
+ minWidth?: BadgeMinWidth;
hoverEffect?: BadgeHoverEffect;
} = $props();
void cn;
@@ -51,7 +96,7 @@
bind:this={ref}
data-slot="badge"
{href}
- class={cn(badgeVariants({ variant, hoverEffect }), className)}
+ class={cn(badgeVariants({ variant, size, minWidth, hoverEffect }), className)}
{...restProps}
>
{@render children?.()}
diff --git a/frontend/src/lib/components/ui/badge/index.ts b/frontend/src/lib/components/ui/badge/index.ts
index f05fb87fa..9b15011eb 100644
--- a/frontend/src/lib/components/ui/badge/index.ts
+++ b/frontend/src/lib/components/ui/badge/index.ts
@@ -1,2 +1,2 @@
export { default as Badge } from './badge.svelte';
-export { badgeVariants, type BadgeVariant } from './badge.svelte';
+export { badgeVariants, type BadgeVariant, type BadgeSize, type BadgeMinWidth } from './badge.svelte';
diff --git a/frontend/src/lib/components/vulnerability/severity-badge.svelte b/frontend/src/lib/components/vulnerability/severity-badge.svelte
index c2e1eddf3..a3fb13b26 100644
--- a/frontend/src/lib/components/vulnerability/severity-badge.svelte
+++ b/frontend/src/lib/components/vulnerability/severity-badge.svelte
@@ -1,18 +1,18 @@
<script lang="ts">
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
let { severity }: { severity: string | null | undefined } = $props();
</script>
{#if severity === 'CRITICAL'}
- <StatusBadge text={m.vuln_severity_critical()} variant="red" size="sm" />
+ <Badge variant="red" size="sm" minWidth="20">{m.vuln_severity_critical()}</Badge>
{:else if severity === 'HIGH'}
- <StatusBadge text={m.vuln_severity_high()} variant="orange" size="sm" />
+ <Badge variant="orange" size="sm" minWidth="20">{m.vuln_severity_high()}</Badge>
{:else if severity === 'MEDIUM'}
- <StatusBadge text={m.vuln_severity_medium()} variant="amber" size="sm" />
+ <Badge variant="amber" size="sm" minWidth="20">{m.vuln_severity_medium()}</Badge>
{:else if severity === 'LOW'}
- <StatusBadge text={m.vuln_severity_low()} variant="lime" size="sm" />
+ <Badge variant="lime" size="sm" minWidth="20">{m.vuln_severity_low()}</Badge>
{:else}
- <StatusBadge text={m.vuln_severity_unknown()} variant="gray" size="sm" />
+ <Badge variant="gray" size="sm" minWidth="20">{m.vuln_severity_unknown()}</Badge>
{/if}
diff --git a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
index 12166529c..4040a4fae 100644
--- a/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
+++ b/frontend/src/lib/components/vulnerability/vulnerability-scan-panel.svelte
@@ -8,6 +8,7 @@
import { ArcaneButton } from '$lib/components/arcane-button';
import { queryKeys } from '$lib/query/query-keys';
import { Spinner } from '$lib/components/ui/spinner';
+ import { Badge, type BadgeVariant } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import { vulnerabilityService } from '$lib/services/vulnerability-service.js';
import type { ColumnSpec } from '$lib/components/arcane-table/arcane-table.types.svelte';
@@ -141,14 +142,14 @@
return m.vuln_severity_unknown();
});
- const scanStatusTone = $derived.by(() => {
- if (!resolvedSummary) return 'bg-muted text-muted-foreground';
- if (resolvedSummary.total === 0) return 'bg-emerald-500/15 text-emerald-500 ring-emerald-500/30';
- if (resolvedSummary.critical > 0) return 'bg-red-500/15 text-red-500 ring-red-500/30';
- if (resolvedSummary.high > 0) return 'bg-orange-500/15 text-orange-500 ring-orange-500/30';
- if (resolvedSummary.medium > 0) return 'bg-amber-500/15 text-amber-500 ring-amber-500/30';
- if (resolvedSummary.low > 0) return 'bg-yellow-500/15 text-yellow-600 ring-yellow-500/30';
- return 'bg-gray-500/15 text-gray-500 ring-gray-500/30';
+ const scanStatusVariant = $derived.by((): BadgeVariant => {
+ if (!resolvedSummary) return 'gray';
+ if (resolvedSummary.total === 0) return 'green';
+ if (resolvedSummary.critical > 0) return 'red';
+ if (resolvedSummary.high > 0) return 'orange';
+ if (resolvedSummary.medium > 0) return 'amber';
+ if (resolvedSummary.low > 0) return 'lime';
+ return 'gray';
});
const scanDurationLabel = $derived.by(() => {
@@ -329,9 +330,7 @@
<div class="border-border/60 bg-muted/30 rounded-2xl border p-5 shadow-sm">
<div class="flex items-center justify-between">
<p class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.vuln_summary()}</p>
- <span class={`inline-flex items-center rounded-full px-2.5 py-1 text-xs font-semibold ring-1 ${scanStatusTone}`}>
- {scanStatusLabel}
- </span>
+ <Badge variant={scanStatusVariant}>{scanStatusLabel}</Badge>
</div>
<div class="mt-5 flex items-end gap-4">
<div class="text-5xl leading-none font-semibold tracking-tight">{summary.total}</div>
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index 18d1f0b13..c30fd0575 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -2,7 +2,7 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { refreshAll } from '$app/navigation';
import ActionButtons from '$lib/components/action-buttons.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { bytes } from '$lib/utils/formatting';
import { tick } from 'svelte';
import { page } from '$app/state';
@@ -318,10 +318,10 @@
{containerDisplayName}
</h1>
{#if container?.state}
- <StatusBadge
+ <Badge
variant={container.state.status === 'running' ? 'green' : container.state.status === 'exited' ? 'red' : 'amber'}
- text={getContainerStatusLabel(container.state.status)}
- />
+ minWidth="20">{getContainerStatusLabel(container.state.status)}</Badge
+ >
{/if}
</div>
{/snippet}
diff --git a/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte b/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
index d43d65914..0f7da4c38 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerHealthcheck.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto, ContainerHealthLogEntry, ContainerHealthcheckDto } from '$lib/types/docker';
import { HealthIcon, SettingsIcon, FileTextIcon } from '$lib/icons';
@@ -135,7 +135,7 @@
{m.common_health_status()}
</div>
<div>
- <StatusBadge variant={statusVariant} text={health?.status ?? m.common_unknown()} size="md" />
+ <Badge variant={statusVariant} minWidth="20">{health?.status ?? m.common_unknown()}</Badge>
</div>
</Card.Content>
</Card.Root>
@@ -294,11 +294,9 @@
<Card.Content class="flex flex-col gap-2 p-4">
<div class="flex flex-wrap items-center justify-between gap-2">
<div class="flex items-center gap-3">
- <StatusBadge
- variant={probe.exitCode === 0 ? 'green' : 'red'}
- text={`${m.health_exit_code()}: ${probe.exitCode}`}
- size="sm"
- />
+ <Badge variant={probe.exitCode === 0 ? 'green' : 'red'} size="sm" minWidth="20"
+ >{`${m.health_exit_code()}: ${probe.exitCode}`}</Badge
+ >
<span class="text-muted-foreground text-xs" title={formatProbeDate(probe.start)}>
{probe.start ? formatDistanceToNow(probe.start, { addSuffix: true }) : '—'}
</span>
diff --git a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
index 122de42e9..b269706d5 100644
--- a/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
+++ b/frontend/src/routes/(app)/containers/components/ContainerOverview.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { Switch } from '$lib/components/ui/switch';
import { m } from '$lib/paraglide/messages';
import type { ContainerDetailsDto } from '$lib/types/docker';
@@ -203,15 +203,14 @@
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-pink-500/10">
<HealthIcon class="size-5 text-pink-500" />
</div>
- <StatusBadge
+ <Badge
variant={container.state.health.status === 'healthy'
? 'green'
: container.state.health.status === 'unhealthy'
? 'red'
: 'amber'}
- text={container.state.health.status}
- size="md"
- />
+ minWidth="20">{container.state.health.status}</Badge
+ >
</div>
</div>
{/if}
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index 3199cad0f..7ce41f913 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -7,7 +7,7 @@
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import ContainerActionMenuItem from '$lib/components/arcane-table/cells/container-action-menu-item.svelte';
import type { SearchPaginationSortRequest } from '$lib/types/shared';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { formatDateTimeShort, truncateImageDigest } from '$lib/utils/formatting';
import type { ContainerSummaryDto } from '$lib/types/docker';
import type { ColumnSpec, BulkAction } from '$lib/components/arcane-table';
@@ -420,7 +420,7 @@
</span>
</div>
{:else}
- <StatusBadge variant={getStateBadgeVariant(item.state)} text={getContainerStatusLabel(item.state)} />
+ <Badge variant={getStateBadgeVariant(item.state)} minWidth="20">{getContainerStatusLabel(item.state)}</Badge>
{/if}
<div class="flex items-center gap-1">
{#if !status && item.state !== 'running'}
diff --git a/frontend/src/routes/(app)/customize/git-repositories/repository-table.svelte b/frontend/src/routes/(app)/customize/git-repositories/repository-table.svelte
index 2e0a671a3..9498ffb5c 100644
--- a/frontend/src/routes/(app)/customize/git-repositories/repository-table.svelte
+++ b/frontend/src/routes/(app)/customize/git-repositories/repository-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import RemoveMenuItem from '$lib/components/arcane-table/cells/remove-menu-item.svelte';
@@ -190,11 +190,11 @@
{#snippet AuthTypeCell({ value }: { value: unknown })}
{@const authType = String(value)}
{#if authType === 'http'}
- <StatusBadge variant="blue" text={m.git_repository_auth_http()} />
+ <Badge variant="blue" minWidth="20">{m.git_repository_auth_http()}</Badge>
{:else if authType === 'ssh'}
- <StatusBadge variant="purple" text={m.git_repository_auth_ssh()} />
+ <Badge variant="purple" minWidth="20">{m.git_repository_auth_ssh()}</Badge>
{:else}
- <StatusBadge variant="gray" text={m.git_repository_auth_none()} />
+ <Badge variant="gray" minWidth="20">{m.git_repository_auth_none()}</Badge>
{/if}
{/snippet}
diff --git a/frontend/src/routes/(app)/dashboard/dash-action-card.svelte b/frontend/src/routes/(app)/dashboard/dash-action-card.svelte
index 3cf40264c..156e1939c 100644
--- a/frontend/src/routes/(app)/dashboard/dash-action-card.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-action-card.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { ArrowRightIcon, type IconType } from '$lib/icons';
@@ -44,7 +44,7 @@
<Icon class="size-4" />
{title}
</div>
- <StatusBadge text={badgeText} variant={badgeVariant} size="sm" minWidth="none" />
+ <Badge variant={badgeVariant} size="sm">{badgeText}</Badge>
</div>
<p class="text-2xl leading-none font-semibold tracking-tight">{value}</p>
<p class="text-muted-foreground/90 text-xs leading-relaxed">{description}</p>
diff --git a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
index ed1c307c8..807df3eae 100644
--- a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import * as Card from '$lib/components/ui/card/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
import DashTableCardHeader from './dash-table-card-header.svelte';
import { getStatusVariant } from '$lib/utils/docker';
@@ -59,7 +59,7 @@
{/snippet}
{#snippet StateCell({ item }: { item: ContainerSummaryDto })}
- <StatusBadge variant={getStatusVariant(item.state)} text={capitalizeFirstLetter(item.state)} />
+ <Badge variant={getStatusVariant(item.state)} minWidth="20">{capitalizeFirstLetter(item.state)}</Badge>
{/snippet}
{#snippet DashContainerMobileCard({ item }: { item: ContainerSummaryDto })}
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index 75b9bbda8..e07bb2aa0 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -7,7 +7,7 @@
import { type ActionButton } from '$lib/components/action-button-group/index.js';
import { cn } from '$lib/utils';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge, badgeVariants } from '$lib/components/ui/badge';
import PruneConfirmationDialog from '$lib/components/dialogs/prune-confirmation-dialog.svelte';
import DockerInfoDialog from '$lib/components/dialogs/docker-info-dialog.svelte';
import { Skeleton } from '$lib/components/ui/skeleton';
@@ -878,15 +878,11 @@
<div class="flex min-w-0 flex-wrap items-center gap-2">
<div class="min-w-0 max-w-full break-words text-base font-semibold tracking-tight">{environment.name}</div>
{#if isCurrent}
- <StatusBadge text={m.common_current()} variant="blue" size="sm" minWidth="none" />
+ <Badge variant="blue" size="sm">{m.common_current()}</Badge>
{/if}
- <StatusBadge
- text={capitalizeFirstLetter(getResolvedStatusLabel(environment))}
- variant={statusVariant}
- size="sm"
- minWidth="none"
- />
- <StatusBadge text={transportBadge.text} variant={transportBadge.variant} size="sm" minWidth="none" />
+ <Badge variant={statusVariant} size="sm">{capitalizeFirstLetter(getResolvedStatusLabel(environment))}</Badge
+ >
+ <Badge variant={transportBadge.variant} size="sm">{transportBadge.text}</Badge>
{#if boardState}
{@const loadedItem = boardState.overviewById.get(environment.id) ?? baseItem}
{@const vInfo =
@@ -899,7 +895,7 @@
{#if vInfo.updateAvailable || debugUpgrade}
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger
- class="bg-surface/50 text-muted-foreground border-border/50 hover:text-foreground inline-flex items-center rounded-md border px-2 py-[2px] font-mono text-[11px] font-medium transition-colors"
+ class={cn(badgeVariants({ variant: 'gray', size: 'sm' }), 'hover:text-foreground font-mono')}
>
v{vInfo.displayVersion || vInfo.currentTag || vInfo.currentVersion || 'unknown'}
<span class="relative ml-1.5 flex h-2 w-2">
@@ -927,11 +923,9 @@
</ArcaneTooltip.Content>
</ArcaneTooltip.Root>
{:else}
- <div
- class="bg-surface/50 text-muted-foreground border-border/50 hover:text-foreground inline-flex items-center rounded-md border px-2 py-[2px] font-mono text-[11px] font-medium transition-colors"
- >
+ <Badge variant="gray" size="sm" class="font-mono">
{vInfo.displayVersion || vInfo.currentTag || vInfo.currentVersion || 'unknown'}
- </div>
+ </Badge>
{/if}
</div>
{#if vInfo.updateAvailable || debugUpgrade}
diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
index 477396957..b3bb83dfd 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentConnectionDetails.svelte
@@ -1,14 +1,11 @@
<script lang="ts">
- import type { ComponentProps } from 'svelte';
import * as Card from '$lib/components/ui/card/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge, type BadgeVariant } from '$lib/components/ui/badge';
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
import type { Environment, EnvironmentStatus } from '$lib/types/environment';
import { formatDateTimeShort } from '$lib/utils/formatting';
- type BadgeVariant = ComponentProps<typeof StatusBadge>['variant'];
-
let {
environment,
currentStatus
@@ -90,7 +87,7 @@
<Card.Root variant="subtle">
<Card.Content class="flex flex-col gap-1.5 p-4">
<div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{label}</div>
- <div><StatusBadge {text} {variant} /></div>
+ <div><Badge {variant} minWidth="20">{text}</Badge></div>
</Card.Content>
</Card.Root>
{/snippet}
diff --git a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte
index 6c0821537..7f158cb0d 100644
--- a/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/components/EnvironmentStatusSummary.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import { formatDistance } from 'date-fns';
import { Badge } from '$lib/components/ui/badge/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { cn } from '$lib/utils';
import { m } from '$lib/paraglide/messages';
@@ -108,13 +107,13 @@
<span class={cn('size-2.5 rounded-full transition-colors', statusDotClass)}></span>
<span class="text-sm font-semibold">{statusBadge.text}</span>
</div>
- <StatusBadge text={transportBadge.text} variant={transportBadge.variant} />
+ <Badge variant={transportBadge.variant} minWidth="20">{transportBadge.text}</Badge>
<div class="text-muted-foreground flex items-center gap-1.5 text-sm">
<TagIcon class="size-4 shrink-0" />
{#if environment.id === '0'}
<span class="font-mono">{localDisplayVersion}</span>
{#if versionInformation?.updateAvailable}
- <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
+ <Badge variant="amber">
{m.sidebar_update_available()}: {versionInformation.newestVersion}
</Badge>
{/if}
@@ -124,7 +123,7 @@
{:else if remoteVersion}
<span class="font-mono">{remoteDisplayVersion}</span>
{#if remoteVersion.updateAvailable}
- <Badge variant="secondary" class="bg-amber-500/10 text-amber-600 hover:bg-amber-500/20 dark:text-amber-400">
+ <Badge variant="amber">
{m.sidebar_update_available()}: {remoteVersion.newestVersion}
</Badge>
{#if remoteVersion.releaseUrl}
diff --git a/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte b/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
index 1869d8029..a3278554a 100644
--- a/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/gitops/sync-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { LifecycleIndicator } from '$lib/components/lifecycle-indicator';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
@@ -218,18 +218,18 @@
{/snippet}
{#snippet AutoSyncCell({ value }: { value: any; item: GitOpsSync; row: ArcaneRow<GitOpsSync> })}
- <StatusBadge variant={value ? 'blue' : 'gray'} text={value ? m.common_enabled() : m.common_disabled()} />
+ <Badge variant={value ? 'blue' : 'gray'} minWidth="20">{value ? m.common_enabled() : m.common_disabled()}</Badge>
{/snippet}
{#snippet StatusCell({ value }: { value: any; item: GitOpsSync; row: ArcaneRow<GitOpsSync> })}
{#if value === 'success'}
- <StatusBadge variant="green" text={m.common_success()} />
+ <Badge variant="green" minWidth="20">{m.common_success()}</Badge>
{:else if value === 'failed'}
- <StatusBadge variant="red" text={m.common_failed()} />
+ <Badge variant="red" minWidth="20">{m.common_failed()}</Badge>
{:else if value === 'pending'}
- <StatusBadge variant="amber" text={m.common_pending()} />
+ <Badge variant="amber" minWidth="20">{m.common_pending()}</Badge>
{:else}
- <StatusBadge variant="gray" text={m.common_na()} />
+ <Badge variant="gray" minWidth="20">{m.common_na()}</Badge>
{/if}
{/snippet}
diff --git a/frontend/src/routes/(app)/environments/environment-table.svelte b/frontend/src/routes/(app)/environments/environment-table.svelte
index 76f9b1018..855691e38 100644
--- a/frontend/src/routes/(app)/environments/environment-table.svelte
+++ b/frontend/src/routes/(app)/environments/environment-table.svelte
@@ -2,7 +2,6 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
- 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';
@@ -312,7 +311,7 @@
></div>
</div>
{#if environmentStore.selected?.id === item.id}
- <Badge variant="default" class="border-blue-500/20 bg-blue-500/10 text-blue-600">
+ <Badge variant="blue">
{m.common_current()}
</Badge>
{/if}
@@ -331,7 +330,7 @@
{#snippet StatusCell({ value }: { value: unknown })}
{@const statusValue = String(value)}
{@const variant = getEnvironmentStatusVariant(statusValue as Environment['status'])}
- <StatusBadge text={capitalizeFirstLetter(statusValue) || m.common_unknown()} {variant} />
+ <Badge {variant} minWidth="20">{capitalizeFirstLetter(statusValue) || m.common_unknown()}</Badge>
{/snippet}
{#snippet TypeCell({ value }: { value: unknown })}
@@ -339,7 +338,7 @@
{@const typeLabel = getEnvironmentTypeLabel(env)}
{@const transport = resolveEnvironmentTransport(env)}
{@const typeVariant = !env.isEdge || !transport ? 'gray' : transport === 'websocket' ? 'purple' : 'blue'}
- <StatusBadge text={typeLabel} variant={typeVariant} />
+ <Badge variant={typeVariant} minWidth="20">{typeLabel}</Badge>
{/snippet}
{#snippet ApiCell({ value }: { value: unknown })}
@@ -347,7 +346,7 @@
{/snippet}
{#snippet EnabledCell({ value }: { value: unknown })}
- <StatusBadge text={value ? m.common_enabled() : m.common_disabled()} variant={value ? 'green' : 'red'} />
+ <Badge variant={value ? 'green' : 'red'} minWidth="20">{value ? m.common_enabled() : m.common_disabled()}</Badge>
{/snippet}
{#snippet EnvironmentMobileCardSnippet({
diff --git a/frontend/src/routes/(app)/events/event-table.svelte b/frontend/src/routes/(app)/events/event-table.svelte
index 78f96d47e..749a25dc1 100644
--- a/frontend/src/routes/(app)/events/event-table.svelte
+++ b/frontend/src/routes/(app)/events/event-table.svelte
@@ -4,7 +4,6 @@
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { Badge } from '$lib/components/ui/badge';
import { tryCatch } from '$lib/utils/api';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
@@ -150,7 +149,7 @@
</script>
{#snippet SeverityCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? '')} variant={getSeverityBadgeVariant(String(value ?? 'info'))} />
+ <Badge variant={getSeverityBadgeVariant(String(value ?? 'info'))} minWidth="20">{String(value ?? '')}</Badge>
{/snippet}
{#snippet TypeCell({ value }: { value: unknown })}
diff --git a/frontend/src/routes/(app)/images/builds/+page.svelte b/frontend/src/routes/(app)/images/builds/+page.svelte
index a22bdfdb0..1ce8251ec 100644
--- a/frontend/src/routes/(app)/images/builds/+page.svelte
+++ b/frontend/src/routes/(app)/images/builds/+page.svelte
@@ -30,7 +30,7 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { UniversalMobileCard } from '$lib/components/arcane-table';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
import {
type LayerProgress,
@@ -880,11 +880,9 @@
{/snippet}
{#snippet BuildHistoryStatusCell({ value }: { value: unknown })}
- <StatusBadge
- variant={getStatusBadgeVariant(value as ImageBuildStatus)}
- text={buildHistoryStatusLabel(value as ImageBuildStatus)}
- size="sm"
- />
+ <Badge variant={getStatusBadgeVariant(value as ImageBuildStatus)} size="sm" minWidth="20"
+ >{buildHistoryStatusLabel(value as ImageBuildStatus)}</Badge
+ >
{/snippet}
{#snippet BuildHistoryTagsCell({ item }: { item: ImageBuildRecord })}
@@ -1003,11 +1001,9 @@
{#if buildHistorySelected}
<div class="flex flex-wrap items-center justify-between gap-3 text-sm">
<div class="flex flex-wrap items-center gap-2">
- <StatusBadge
- variant={getStatusBadgeVariant(buildHistorySelected.status)}
- text={buildHistoryStatusLabel(buildHistorySelected.status)}
- size="sm"
- />
+ <Badge variant={getStatusBadgeVariant(buildHistorySelected.status)} size="sm" minWidth="20"
+ >{buildHistoryStatusLabel(buildHistorySelected.status)}</Badge
+ >
{#if buildHistorySelected.provider}
<span class="text-muted-foreground">{buildHistorySelected.provider}</span>
{/if}
diff --git a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
index a64ee4ebe..0f2db5f99 100644
--- a/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
+++ b/frontend/src/routes/(app)/networks/[networkId]/+page.svelte
@@ -16,7 +16,7 @@
ArrowDownIcon
} from '$lib/icons';
import * as Alert from '$lib/components/ui/alert';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { formatDateTimeShort } from '$lib/utils/formatting';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -128,14 +128,14 @@
>
{#snippet badges()}
{#if inUse}
- <StatusBadge variant="green" text={m.networks_in_use_count({ count: connectedContainers.length })} />
+ <Badge variant="green" minWidth="20">{m.networks_in_use_count({ count: connectedContainers.length })}</Badge>
{:else}
- <StatusBadge variant="amber" text={m.common_unused()} />
+ <Badge variant="amber" minWidth="20">{m.common_unused()}</Badge>
{/if}
{#if isPredefined}
- <StatusBadge variant="blue" text={m.networks_predefined()} />
+ <Badge variant="blue" minWidth="20">{m.networks_predefined()}</Badge>
{/if}
- <StatusBadge variant="purple" text={network?.driver ?? m.common_unknown()} />
+ <Badge variant="purple" minWidth="20">{network?.driver ?? m.common_unknown()}</Badge>
{/snippet}
{#if errorMessage}
@@ -187,26 +187,24 @@
<PropertyItem icon={LayersIcon} color="yellow" label={m.attachable()}>
<p class="mt-1 text-base font-semibold">
- <StatusBadge
- variant={network.attachable ? 'green' : 'gray'}
- text={network.attachable ? m.common_yes() : m.common_no()}
- />
+ <Badge variant={network.attachable ? 'green' : 'gray'} minWidth="20"
+ >{network.attachable ? m.common_yes() : m.common_no()}</Badge
+ >
</p>
</PropertyItem>
<PropertyItem icon={SettingsIcon} color="red" label={m.internal()}>
<p class="mt-1 text-base font-semibold">
- <StatusBadge
- variant={network.internal ? 'blue' : 'gray'}
- text={network.internal ? m.common_yes() : m.common_no()}
- />
+ <Badge variant={network.internal ? 'blue' : 'gray'} minWidth="20"
+ >{network.internal ? m.common_yes() : m.common_no()}</Badge
+ >
</p>
</PropertyItem>
{#snippet ipToggleTile(label: string, enabled: boolean | undefined)}
<PropertyItem icon={NetworksIcon} color="indigo" {label}>
<p class="mt-1 text-base font-semibold">
- <StatusBadge variant={enabled ? 'indigo' : 'gray'} text={enabled ? m.common_yes() : m.common_no()} />
+ <Badge variant={enabled ? 'indigo' : 'gray'} minWidth="20">{enabled ? m.common_yes() : m.common_no()}</Badge>
</p>
</PropertyItem>
{/snippet}
@@ -217,19 +215,17 @@
<PropertyItem icon={SettingsIcon} color="cyan" label={m.ingress()}>
<p class="mt-1 text-base font-semibold">
- <StatusBadge
- variant={network.ingress ? 'cyan' : 'gray'}
- text={network.ingress ? m.common_yes() : m.common_no()}
- />
+ <Badge variant={network.ingress ? 'cyan' : 'gray'} minWidth="20"
+ >{network.ingress ? m.common_yes() : m.common_no()}</Badge
+ >
</p>
</PropertyItem>
<PropertyItem icon={SettingsIcon} color="pink" label={m.config_only()}>
<p class="mt-1 text-base font-semibold">
- <StatusBadge
- variant={network.configOnly ? 'pink' : 'gray'}
- text={network.configOnly ? m.common_yes() : m.common_no()}
- />
+ <Badge variant={network.configOnly ? 'pink' : 'gray'} minWidth="20"
+ >{network.configOnly ? m.common_yes() : m.common_no()}</Badge
+ >
</p>
</PropertyItem>
</div>
@@ -402,7 +398,7 @@
{#if network.ipam.driver}
<div class="mt-4 flex items-center">
<span class="text-muted-foreground mr-2 text-sm font-medium">{m.networks_ipam_driver_label()}:</span>
- <StatusBadge variant="cyan" text={network.ipam.driver} />
+ <Badge variant="cyan" minWidth="20">{network.ipam.driver}</Badge>
</div>
{/if}
diff --git a/frontend/src/routes/(app)/networks/network-table.svelte b/frontend/src/routes/(app)/networks/network-table.svelte
index 814bcf0b1..77bdffb82 100644
--- a/frontend/src/routes/(app)/networks/network-table.svelte
+++ b/frontend/src/routes/(app)/networks/network-table.svelte
@@ -6,7 +6,7 @@
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
import { DEFAULT_NETWORK_NAMES } from '$lib/constants';
@@ -165,7 +165,7 @@
{/snippet}
{#snippet DriverCell({ item }: { item: NetworkSummaryDto })}
- <StatusBadge
+ <Badge
variant={item.driver === 'bridge'
? 'blue'
: item.driver === 'overlay'
@@ -175,17 +175,17 @@
: item.driver === 'macvlan'
? 'orange'
: 'gray'}
- text={capitalizeFirstLetter(item.driver)}
- />
+ minWidth="20">{capitalizeFirstLetter(item.driver)}</Badge
+ >
{/snippet}
{#snippet ScopeCell({ item }: { item: NetworkSummaryDto })}
- <StatusBadge variant={item.scope === 'local' ? 'green' : 'amber'} text={capitalizeFirstLetter(item.scope)} />
+ <Badge variant={item.scope === 'local' ? 'green' : 'amber'} minWidth="20">{capitalizeFirstLetter(item.scope)}</Badge>
{/snippet}
{#snippet StatusCell({ item }: { item: NetworkSummaryDto })}
{#if item.isDefault}
- <StatusBadge text={m.networks_predefined()} variant="sky" />
+ <Badge variant="sky" minWidth="20">{m.networks_predefined()}</Badge>
{:else}
<InUseStatus inUse={item.inUse} />
{/if}
diff --git a/frontend/src/routes/(app)/ports/port-table.svelte b/frontend/src/routes/(app)/ports/port-table.svelte
index 2e24811ec..37a951e0c 100644
--- a/frontend/src/routes/(app)/ports/port-table.svelte
+++ b/frontend/src/routes/(app)/ports/port-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
import { ContainersIcon, ConnectionIcon, GlobeIcon, HashIcon } from '$lib/icons';
@@ -80,7 +80,7 @@
{/snippet}
{#snippet ProtocolCell({ item }: { item: PortMappingDto })}
- <StatusBadge text={item.protocol.toUpperCase()} variant="gray" minWidth="none" />
+ <Badge variant="gray">{item.protocol.toUpperCase()}</Badge>
{/snippet}
{#snippet ContainerCell({ item }: { item: PortMappingDto })}
@@ -96,11 +96,9 @@
{/snippet}
{#snippet PublishedCell({ item }: { item: PortMappingDto })}
- <StatusBadge
- text={item.isPublished ? m.ports_published_label() : m.ports_exposed_label()}
- variant={item.isPublished ? 'sky' : 'gray'}
- minWidth="none"
- />
+ <Badge variant={item.isPublished ? 'sky' : 'gray'}
+ >{item.isPublished ? m.ports_published_label() : m.ports_exposed_label()}</Badge
+ >
{/snippet}
{#snippet PortMobileCardSnippet({
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index 8031cdb59..eb7a075ff 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -24,7 +24,8 @@
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';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';
import { capitalizeFirstLetter } from '$lib/utils/formatting';
import { page } from '$app/state';
@@ -1347,14 +1348,25 @@
/>
{#if project.status}
{@const showTooltip = project.status.toLowerCase() === 'unknown' && project.statusReason}
- <StatusBadge
- variant={getStatusVariant(project.status)}
- text={capitalizeFirstLetter(project.status)}
- tooltip={showTooltip ? project.statusReason : undefined}
- />
+ {#if showTooltip}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Badge variant={getStatusVariant(project.status)} minWidth="20">
+ {capitalizeFirstLetter(project.status)}
+ </Badge>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="max-w-xs text-xs">{project.statusReason}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {:else}
+ <Badge variant={getStatusVariant(project.status)} minWidth="20">
+ {capitalizeFirstLetter(project.status)}
+ </Badge>
+ {/if}
{/if}
{#if project.isArchived}
- <StatusBadge variant="gray" text={m.projects_archived_badge()} />
+ <Badge variant="gray" minWidth="20">{m.projects_archived_badge()}</Badge>
{/if}
<ProjectUpdateItem
updateInfo={project.updateInfo}
diff --git a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte
index 758d79fc1..aba9d2a7a 100644
--- a/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte
+++ b/frontend/src/routes/(app)/projects/components/ProjectContainersTable.svelte
@@ -6,7 +6,7 @@
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import ContainerActionMenuItem from '$lib/components/arcane-table/cells/container-action-menu-item.svelte';
import * as Empty from '$lib/components/ui/empty/index.js';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { PortBadge } from '$lib/components/badges/index.js';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';
@@ -327,7 +327,7 @@
</span>
</div>
{:else}
- <StatusBadge variant={getStatusVariant(item.status)} text={capitalizeFirstLetter(item.status)} />
+ <Badge variant={getStatusVariant(item.status)} minWidth="20">{capitalizeFirstLetter(item.status)}</Badge>
{/if}
{/snippet}
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index c46f50259..793555988 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -8,7 +8,8 @@
import { goto } from '$app/navigation';
import { mode } from 'mode-watcher';
import { toast } from 'svelte-sonner';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
import { getStatusVariant, getThemedIconUrl } from '$lib/utils/docker';
import { capitalizeFirstLetter, formatDateTimeShort } from '$lib/utils/formatting';
@@ -269,11 +270,19 @@
{/snippet}
{#snippet StatusCell({ item }: { item: Project })}
- <StatusBadge
- variant={getStatusVariant(item.status)}
- text={capitalizeFirstLetter(item.status)}
- tooltip={getStatusTooltip(item)}
- />
+ {@const statusTooltip = getStatusTooltip(item)}
+ {#if statusTooltip}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Badge variant={getStatusVariant(item.status)} minWidth="20">{capitalizeFirstLetter(item.status)}</Badge>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="max-w-xs text-xs">{statusTooltip}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {:else}
+ <Badge variant={getStatusVariant(item.status)} minWidth="20">{capitalizeFirstLetter(item.status)}</Badge>
+ {/if}
{/snippet}
{#snippet UpdatesCell({ item }: { item: Project })}
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 ddc07b910..ddb0a209c 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
@@ -5,7 +5,7 @@
import { CopyButton } from '$lib/components/ui/copy-button';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
@@ -195,7 +195,7 @@
{:else}
<span class="text-muted-foreground">{m.api_key_expires_never()}</span>
{/if}
- <StatusBadge text={getStatusText(item)} variant={getStatusVariant(item)} />
+ <Badge variant={getStatusVariant(item)} minWidth="20">{getStatusText(item)}</Badge>
</div>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/authentication/+page.svelte b/frontend/src/routes/(app)/settings/authentication/+page.svelte
index 142445d13..5e2549e82 100644
--- a/frontend/src/routes/(app)/settings/authentication/+page.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/+page.svelte
@@ -8,6 +8,7 @@
import { toast } from 'svelte-sonner';
import type { Settings } from '$lib/types/settings';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import { LockIcon, InfoIcon, ArrowDownIcon } from '$lib/icons';
import settingsStore from '$lib/stores/config-store';
@@ -360,15 +361,13 @@
<div class="mt-2">
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <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"
- >
+ <Badge variant="amber">
{#if isOidcForcedDisabled}
{m.security_server_disabled_via_server()}
{:else}
{m.security_server_configured()}
{/if}
- </span>
+ </Badge>
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content side="top">
{#if isOidcForcedDisabled}
diff --git a/frontend/src/routes/(app)/settings/authentication/federated-credential-table.svelte b/frontend/src/routes/(app)/settings/authentication/federated-credential-table.svelte
index f058bad06..0d3b67351 100644
--- a/frontend/src/routes/(app)/settings/authentication/federated-credential-table.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/federated-credential-table.svelte
@@ -2,7 +2,7 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
@@ -182,7 +182,7 @@
{/snippet}
{#snippet StatusCell({ item }: { item: FederatedCredential })}
- <StatusBadge text={getStatusText(item)} variant={getStatusVariant(item)} />
+ <Badge variant={getStatusVariant(item)} minWidth="20">{getStatusText(item)}</Badge>
{/snippet}
{#snippet LastUsedCell({ item }: { item: FederatedCredential })}
diff --git a/frontend/src/routes/(app)/settings/authentication/oidc-mapping-table.svelte b/frontend/src/routes/(app)/settings/authentication/oidc-mapping-table.svelte
index 8802d20fd..3bb5371d8 100644
--- a/frontend/src/routes/(app)/settings/authentication/oidc-mapping-table.svelte
+++ b/frontend/src/routes/(app)/settings/authentication/oidc-mapping-table.svelte
@@ -4,7 +4,7 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
@@ -153,14 +153,14 @@
<div class="flex items-center gap-2">
<code class="bg-muted rounded px-2 py-1 text-xs">{item.claimValue}</code>
{#if item.source === 'env'}
- <StatusBadge text="ENV" variant="amber" size="sm" minWidth="none" />
+ <Badge variant="amber" size="sm">ENV</Badge>
{/if}
</div>
{/snippet}
{#snippet RoleCell({ item }: { item: OidcRoleMapping })}
{@const role = rolesById[item.roleId]}
- <StatusBadge text={getRoleName(item.roleId)} variant={getRoleBadgeVariant(role)} />
+ <Badge variant={getRoleBadgeVariant(role)} minWidth="20">{getRoleName(item.roleId)}</Badge>
{/snippet}
{#snippet ScopeCell({ item }: { item: OidcRoleMapping })}
diff --git a/frontend/src/routes/(app)/settings/roles/roles-table.svelte b/frontend/src/routes/(app)/settings/roles/roles-table.svelte
index b5e138bbe..e6782ec7b 100644
--- a/frontend/src/routes/(app)/settings/roles/roles-table.svelte
+++ b/frontend/src/routes/(app)/settings/roles/roles-table.svelte
@@ -5,7 +5,7 @@
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
import { goto } from '$app/navigation';
@@ -198,7 +198,7 @@
{/snippet}
{#snippet TypeCell({ item }: { item: Role })}
- <StatusBadge text={item.builtIn ? m.roles_built_in() : m.roles_custom()} variant={item.builtIn ? 'amber' : 'blue'} />
+ <Badge variant={item.builtIn ? 'amber' : 'blue'} minWidth="20">{item.builtIn ? m.roles_built_in() : m.roles_custom()}</Badge>
{/snippet}
{#snippet AssignedUsersCell({ item }: { item: Role })}
diff --git a/frontend/src/routes/(app)/settings/users/user-table.svelte b/frontend/src/routes/(app)/settings/users/user-table.svelte
index d9977e2d9..4679ca226 100644
--- a/frontend/src/routes/(app)/settings/users/user-table.svelte
+++ b/frontend/src/routes/(app)/settings/users/user-table.svelte
@@ -4,7 +4,8 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
+ import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { handleApiResultWithCallbacks } from '$lib/utils/api';
import { tryCatch } from '$lib/utils/api';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
@@ -223,7 +224,18 @@
{#snippet RoleCell({ item }: { item: User })}
<div class="flex flex-wrap items-center gap-1">
{#each rolesSummary(item) as badge (badge.text)}
- <StatusBadge text={badge.text} variant={badge.variant} tooltip={badge.tooltip} />
+ {#if badge.tooltip}
+ <ArcaneTooltip.Root>
+ <ArcaneTooltip.Trigger>
+ <Badge variant={badge.variant} minWidth="20">{badge.text}</Badge>
+ </ArcaneTooltip.Trigger>
+ <ArcaneTooltip.Content>
+ <p class="max-w-xs text-xs">{badge.tooltip}</p>
+ </ArcaneTooltip.Content>
+ </ArcaneTooltip.Root>
+ {:else}
+ <Badge variant={badge.variant} minWidth="20">{badge.text}</Badge>
+ {/if}
{/each}
</div>
{/snippet}
diff --git a/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte b/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
index c2202ec47..8b45cef63 100644
--- a/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
+++ b/frontend/src/routes/(app)/settings/webhooks/webhook-table.svelte
@@ -2,7 +2,7 @@
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import { UniversalMobileCard } from '$lib/components/arcane-table';
import type { ColumnSpec, MobileFieldVisibility } from '$lib/components/arcane-table';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import { CopyButton } from '$lib/components/ui/copy-button';
@@ -192,7 +192,7 @@
{/snippet}
{#snippet StatusCell({ item }: { item: Webhook })}
- <StatusBadge text={webhookStatusLabel(item)} variant={webhookStatusVariant(item)} />
+ <Badge variant={webhookStatusVariant(item)} minWidth="20">{webhookStatusLabel(item)}</Badge>
{/snippet}
{#snippet TokenPrefixCell({ item }: { item: Webhook })}
diff --git a/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte b/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte
index 5ddfbd96f..d0bfec456 100644
--- a/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte
+++ b/frontend/src/routes/(app)/swarm/nodes/nodes-table.svelte
@@ -16,7 +16,7 @@
import { swarmService } from '$lib/services/swarm-service';
import type { SwarmNodeAgentDeployment, SwarmNodeSummary } from '$lib/types/swarm';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { capitalizeFirstLetter } from '$lib/utils/formatting';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
@@ -317,30 +317,29 @@
{/snippet}
{#snippet StatusCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? m.common_unknown())} variant={statusVariant(String(value ?? ''))} />
+ <Badge variant={statusVariant(String(value ?? ''))} minWidth="20">{String(value ?? m.common_unknown())}</Badge>
{/snippet}
{#snippet AvailabilityCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? m.common_unknown())} variant={availabilityVariant(String(value ?? ''))} />
+ <Badge variant={availabilityVariant(String(value ?? ''))} minWidth="20">{String(value ?? m.common_unknown())}</Badge>
{/snippet}
{#snippet AgentCell({ value }: { value: unknown })}
- <StatusBadge
- text={getSwarmNodeAgentLabel(String(value ?? 'none') as SwarmNodeSummary['agent']['state'])}
- variant={getSwarmNodeAgentVariant(String(value ?? 'none') as SwarmNodeSummary['agent']['state'])}
- />
+ <Badge variant={getSwarmNodeAgentVariant(String(value ?? 'none') as SwarmNodeSummary['agent']['state'])} minWidth="20"
+ >{getSwarmNodeAgentLabel(String(value ?? 'none') as SwarmNodeSummary['agent']['state'])}</Badge
+ >
{/snippet}
{#snippet LabelsCell({ item }: { item: SwarmNodeSummary })}
<div class="flex flex-wrap items-center gap-1.5">
{#each Object.entries(item.systemLabels ?? {}) as [key, value] (key)}
<div class="group relative overflow-hidden rounded-[var(--radius)]">
- <StatusBadge text={`${key}${value ? `=${value}` : ''}`} variant="gray" minWidth="none" class="max-w-[200px] truncate" />
+ <Badge variant="gray" class="max-w-[200px] truncate">{`${key}${value ? `=${value}` : ''}`}</Badge>
</div>
{/each}
{#each Object.entries(item.labels ?? {}) as [key, value] (key)}
<div class="group relative overflow-hidden rounded-[var(--radius)]">
- <StatusBadge text={`${key}${value ? `=${value}` : ''}`} variant="blue" minWidth="none" class="max-w-[200px] truncate" />
+ <Badge variant="blue" class="max-w-[200px] truncate">{`${key}${value ? `=${value}` : ''}`}</Badge>
{#if canManageNodes}
<button
class="absolute inset-0 flex cursor-pointer items-center justify-end rounded-[var(--radius)] bg-blue-500/10 pr-1 opacity-0 backdrop-blur-[1px] transition-opacity group-hover:opacity-100 dark:bg-blue-400/20"
diff --git a/frontend/src/routes/(app)/swarm/nodes/swarm-node-agent-dialog.svelte b/frontend/src/routes/(app)/swarm/nodes/swarm-node-agent-dialog.svelte
index 36576be2a..ab72a6c5c 100644
--- a/frontend/src/routes/(app)/swarm/nodes/swarm-node-agent-dialog.svelte
+++ b/frontend/src/routes/(app)/swarm/nodes/swarm-node-agent-dialog.svelte
@@ -4,7 +4,7 @@
import AgentCommandBlock from '$lib/components/agent-command-block.svelte';
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog';
import { Spinner } from '$lib/components/ui/spinner';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { AlertTriangleIcon, EdgeConnectionIcon } from '$lib/icons';
import { m } from '$lib/paraglide/messages';
import type { SwarmNodeAgentDeployment, SwarmNodeSummary } from '$lib/types/swarm';
@@ -97,7 +97,7 @@
<div class="bg-muted/40 rounded-lg border p-4">
<div class="text-muted-foreground text-xs font-medium tracking-wide uppercase">{m.common_status()}</div>
<div class="mt-2 flex items-center gap-2">
- <StatusBadge text={agentStatusLabel} variant={getSwarmNodeAgentVariant(agentStatus.state)} />
+ <Badge variant={getSwarmNodeAgentVariant(agentStatus.state)} minWidth="20">{agentStatusLabel}</Badge>
</div>
</div>
diff --git a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
index ba995ecd1..95fc94c23 100644
--- a/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
+++ b/frontend/src/routes/(app)/swarm/services/[serviceId]/+page.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { goto, refreshAll } from '$app/navigation';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import TabbedPageLayout from '$lib/layouts/tabbed-page-layout.svelte';
import { type TabItem } from '$lib/components/tab-bar/index.js';
@@ -297,7 +297,7 @@
<h1 class="max-w-[300px] truncate text-lg font-semibold" title={serviceName}>
{serviceName}
</h1>
- <StatusBadge variant={getSwarmServiceModeVariant(serviceMode)} text={getSwarmServiceModeLabel(serviceMode)} />
+ <Badge variant={getSwarmServiceModeVariant(serviceMode)} minWidth="20">{getSwarmServiceModeLabel(serviceMode)}</Badge>
{#if canScaleService}
<span class="text-muted-foreground font-mono text-sm">
{desiredReplicas}
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceNetwork.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceNetwork.svelte
index d21cbe7d3..f921573a1 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceNetwork.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceNetwork.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import { NetworksIcon, GlobeIcon } from '$lib/icons';
import type { ServiceNetworkAttachment, ServiceNetworkDetail, ServiceVirtualIP, SwarmServicePort } from '$lib/types/swarm';
@@ -100,7 +100,7 @@
{#if ports.length > 0}
<div class="flex flex-wrap gap-2">
{#each ports as port (`${port.publishedPort ?? 'internal'}:${port.targetPort}/${port.protocol}:${port.publishMode ?? ''}`)}
- <StatusBadge text={formatPort(port)} variant="gray" size="md" minWidth="none" />
+ <Badge variant="gray">{formatPort(port)}</Badge>
{/each}
</div>
{:else}
@@ -139,22 +139,22 @@
</div>
<div class="mt-1 flex flex-wrap items-center gap-2">
{#if info?.driver}
- <StatusBadge text={info.driver} variant={driverVariant(info.driver)} />
+ <Badge variant={driverVariant(info.driver)} minWidth="20">{info.driver}</Badge>
{/if}
{#if info?.scope}
- <StatusBadge text={info.scope} variant="gray" />
+ <Badge variant="gray" minWidth="20">{info.scope}</Badge>
{/if}
{#if info?.internal}
- <StatusBadge text={m.internal()} variant="blue" />
+ <Badge variant="blue" minWidth="20">{m.internal()}</Badge>
{/if}
{#if info?.attachable}
- <StatusBadge text={m.attachable()} variant="green" />
+ <Badge variant="green" minWidth="20">{m.attachable()}</Badge>
{/if}
{#if info?.ingress}
- <StatusBadge text={m.ingress()} variant="cyan" />
+ <Badge variant="cyan" minWidth="20">{m.ingress()}</Badge>
{/if}
{#if info?.configOnly}
- <StatusBadge text={m.config_only()} variant="pink" />
+ <Badge variant="pink" minWidth="20">{m.config_only()}</Badge>
{/if}
{#if info?.configFrom}
<span class="text-muted-foreground text-xs">{info.configFrom}</span>
@@ -217,10 +217,10 @@
</div>
<div class="mt-1 flex flex-wrap items-center gap-1.5">
{#if info.configNetwork.driver}
- <StatusBadge text={info.configNetwork.driver} variant="gray" size="sm" minWidth="none" />
+ <Badge variant="gray" size="sm">{info.configNetwork.driver}</Badge>
{/if}
{#if info.configNetwork.scope}
- <StatusBadge text={info.configNetwork.scope} variant="gray" size="sm" minWidth="none" />
+ <Badge variant="gray" size="sm">{info.configNetwork.scope}</Badge>
{/if}
{#if info.configNetwork.options?.['parent']}
<span class="text-muted-foreground text-xs">{info.configNetwork.options['parent']}</span>
@@ -228,18 +228,12 @@
</div>
</div>
<div class="flex items-center gap-2">
- <StatusBadge
- text={info.configNetwork.enableIPv4 ? m.ipv4_enabled() : m.common_disabled()}
- variant={info.configNetwork.enableIPv4 ? 'indigo' : 'gray'}
- size="sm"
- minWidth="none"
- />
- <StatusBadge
- text={info.configNetwork.enableIPv6 ? m.ipv6_enabled() : m.common_disabled()}
- variant={info.configNetwork.enableIPv6 ? 'indigo' : 'gray'}
- size="sm"
- minWidth="none"
- />
+ <Badge variant={info.configNetwork.enableIPv4 ? 'indigo' : 'gray'} size="sm"
+ >{info.configNetwork.enableIPv4 ? m.ipv4_enabled() : m.common_disabled()}</Badge
+ >
+ <Badge variant={info.configNetwork.enableIPv6 ? 'indigo' : 'gray'} size="sm"
+ >{info.configNetwork.enableIPv6 ? m.ipv6_enabled() : m.common_disabled()}</Badge
+ >
</div>
</div>
<div class="grid grid-cols-1 gap-3 sm:grid-cols-2">
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
index 2b0a2717d..916515c1d 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceOverview.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { m } from '$lib/paraglide/messages';
import type { SwarmServiceInspect } from '$lib/types/swarm';
import { formatDistanceToNow } from 'date-fns';
@@ -75,7 +75,7 @@
{m.swarm_mode()} / {m.swarm_replicas()}
</div>
<div class="flex items-center gap-2">
- <StatusBadge variant={getSwarmServiceModeVariant(serviceMode)} text={getSwarmServiceModeLabel(serviceMode)} />
+ <Badge variant={getSwarmServiceModeVariant(serviceMode)} minWidth="20">{getSwarmServiceModeLabel(serviceMode)}</Badge>
{#if canScaleService}
<span class="text-foreground font-mono text-sm">
{desiredReplicas}
@@ -164,7 +164,7 @@
<Card.Content class="flex flex-col gap-2 p-4">
<div class="text-muted-foreground text-xs font-semibold tracking-wide uppercase">{m.common_status()}</div>
<div class="flex items-center gap-2">
- <StatusBadge
+ <Badge
variant={updateStatus['State'] === 'completed'
? 'green'
: updateStatus['State'] === 'updating'
@@ -172,8 +172,8 @@
: updateStatus['State'] === 'paused'
? 'amber'
: 'red'}
- text={updateStatus['State']}
- />
+ minWidth="20">{updateStatus['State']}</Badge
+ >
{#if updateStatus['Message']}
<span class="text-muted-foreground text-sm">{updateStatus['Message']}</span>
{/if}
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceStorage.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceStorage.svelte
index 67b27943b..707f41ece 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceStorage.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceStorage.svelte
@@ -1,7 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { m } from '$lib/paraglide/messages';
import { VolumesIcon, TerminalIcon, FolderOpenIcon } from '$lib/icons';
import type { SwarmServiceMount } from '$lib/types/swarm';
@@ -87,12 +86,12 @@
<div class="mt-1 flex flex-wrap items-center gap-1.5">
<span class="text-muted-foreground text-xs">{getMountLabel(type)}</span>
{#if mount.volumeDriver}
- <StatusBadge text={mount.volumeDriver} variant="gray" size="sm" minWidth="none" />
+ <Badge variant="gray" size="sm">{mount.volumeDriver}</Badge>
{/if}
</div>
</div>
</div>
- <Badge variant={readOnly ? 'secondary' : 'outline'} class="text-xs font-semibold">
+ <Badge variant={readOnly ? 'secondary' : 'outline'}>
{readOnly ? m.common_ro() : m.common_rw()}
</Badge>
</div>
diff --git a/frontend/src/routes/(app)/swarm/services/components/ServiceTasksPanel.svelte b/frontend/src/routes/(app)/swarm/services/components/ServiceTasksPanel.svelte
index 4e04160d5..4ec65a34a 100644
--- a/frontend/src/routes/(app)/swarm/services/components/ServiceTasksPanel.svelte
+++ b/frontend/src/routes/(app)/swarm/services/components/ServiceTasksPanel.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { m } from '$lib/paraglide/messages';
import { swarmService } from '$lib/services/swarm-service';
@@ -80,7 +80,7 @@
</div>
<div class="text-muted-foreground font-mono text-xs">{task.id.slice(0, 12)}</div>
</div>
- <StatusBadge text={task.currentState} variant={getSwarmTaskStateVariant(task.currentState)} />
+ <Badge variant={getSwarmTaskStateVariant(task.currentState)} minWidth="20">{task.currentState}</Badge>
</div>
<div class="grid grid-cols-2 gap-2">
<div>
@@ -96,7 +96,7 @@
<div class="text-muted-foreground mb-1 text-xs font-semibold">
{m.swarm_desired_state()}
</div>
- <StatusBadge text={task.desiredState} variant={getSwarmTaskStateVariant(task.desiredState)} size="sm" />
+ <Badge variant={getSwarmTaskStateVariant(task.desiredState)} size="sm" minWidth="20">{task.desiredState}</Badge>
</div>
{#if task.error}
<div class="col-span-2">
diff --git a/frontend/src/routes/(app)/swarm/services/services-table.svelte b/frontend/src/routes/(app)/swarm/services/services-table.svelte
index 58bf0631e..08e55527b 100644
--- a/frontend/src/routes/(app)/swarm/services/services-table.svelte
+++ b/frontend/src/routes/(app)/swarm/services/services-table.svelte
@@ -7,7 +7,7 @@
import { swarmService } from '$lib/services/swarm-service';
import type { SwarmServiceSummary, SwarmServicePort } from '$lib/types/swarm';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import RowActionsMenu from '$lib/components/arcane-table/row-actions-menu.svelte';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -130,7 +130,9 @@
{/snippet}
{#snippet ModeCell({ value }: { value: unknown })}
- <StatusBadge text={getSwarmServiceModeLabel(String(value ?? ''))} variant={getSwarmServiceModeVariant(String(value ?? ''))} />
+ <Badge variant={getSwarmServiceModeVariant(String(value ?? ''))} minWidth="20"
+ >{getSwarmServiceModeLabel(String(value ?? ''))}</Badge
+ >
{/snippet}
{#snippet StackCell({ value }: { value: unknown })}
diff --git a/frontend/src/routes/(app)/swarm/tasks/tasks-table.svelte b/frontend/src/routes/(app)/swarm/tasks/tasks-table.svelte
index 689531f88..f6af87dd8 100644
--- a/frontend/src/routes/(app)/swarm/tasks/tasks-table.svelte
+++ b/frontend/src/routes/(app)/swarm/tasks/tasks-table.svelte
@@ -7,7 +7,7 @@
import { swarmService } from '$lib/services/swarm-service';
import type { SwarmTaskSummary } from '$lib/types/swarm';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/shared';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { getSwarmTaskIconVariant, getSwarmTaskStateVariant } from '$lib/utils/swarm-tasks';
let {
@@ -42,11 +42,11 @@
</script>
{#snippet StateCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? m.common_unknown())} variant={getSwarmTaskStateVariant(String(value ?? ''))} />
+ <Badge variant={getSwarmTaskStateVariant(String(value ?? ''))} minWidth="20">{String(value ?? m.common_unknown())}</Badge>
{/snippet}
{#snippet DesiredStateCell({ value }: { value: unknown })}
- <StatusBadge text={String(value ?? m.common_unknown())} variant={getSwarmTaskStateVariant(String(value ?? ''))} />
+ <Badge variant={getSwarmTaskStateVariant(String(value ?? ''))} minWidth="20">{String(value ?? m.common_unknown())}</Badge>
{/snippet}
{#snippet TaskMobileCardSnippet({
diff --git a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
index 30e103c5b..0512d6ee8 100644
--- a/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/[volumeName]/+page.svelte
@@ -2,7 +2,7 @@
import * as Card from '$lib/components/ui/card/index.js';
import { VolumesIcon, ClockIcon, TagIcon, LayersIcon, InfoIcon, GlobeIcon, ContainersIcon, BoxIcon } from '$lib/icons';
import { goto } from '$app/navigation';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { Badge } from '$lib/components/ui/badge';
import { formatDateTimeShort, truncateString } from '$lib/utils/formatting';
import { openConfirmDialog } from '$lib/components/confirm-dialog/';
import { toast } from 'svelte-sonner';
@@ -103,15 +103,15 @@
<h1 class="text-2xl font-semibold tracking-tight break-all sm:text-3xl">{volume.name}</h1>
<div class="flex flex-wrap items-center gap-2 pt-1">
{#if volume.inUse}
- <StatusBadge variant="green" text={m.common_in_use()} />
+ <Badge variant="green" minWidth="20">{m.common_in_use()}</Badge>
{:else}
- <StatusBadge variant="amber" text={m.common_unused()} />
+ <Badge variant="amber" minWidth="20">{m.common_unused()}</Badge>
{/if}
{#if volume.driver}
- <StatusBadge variant="blue" text={volume.driver} />
+ <Badge variant="blue" minWidth="20">{volume.driver}</Badge>
{/if}
{#if volume.scope}
- <StatusBadge variant="purple" text={volume.scope} />
+ <Badge variant="purple" minWidth="20">{volume.scope}</Badge>
{/if}
</div>
</div>
@@ -166,9 +166,9 @@
<PropertyItem icon={InfoIcon} color="amber" label={m.common_status()}>
<p class="mt-1 text-base font-semibold">
{#if volume.inUse}
- <StatusBadge variant="green" text={m.common_in_use()} />
+ <Badge variant="green" minWidth="20">{m.common_in_use()}</Badge>
{:else}
- <StatusBadge variant="amber" text={m.common_unused()} />
+ <Badge variant="amber" minWidth="20">{m.common_unused()}</Badge>
{/if}
</p>
</PropertyItem>
diff --git a/frontend/src/routes/layout.css b/frontend/src/routes/layout.css
index e72d7f199..3630949c6 100644
--- a/frontend/src/routes/layout.css
+++ b/frontend/src/routes/layout.css
@@ -267,12 +267,6 @@ html.reduce-effects *::after {
box-shadow: 0 2px 8px -4px color-mix(in oklch, var(--glass-shadow-color) 50%, transparent);
}
- .bubble-pill {
- border-radius: 9999px;
- padding-inline: 0.875rem;
- padding-block: 0.5rem;
- }
-
.bubble-shadow {
box-shadow: 0 1px 2px -1px color-mix(in oklch, var(--glass-shadow-color) 60%, transparent);
}