Skip to content

Modern Docker Management, Designed for Everyone

refactor: ui layout and input tweaks and cleanup (#1194)

Kyle Mendell6825b9187365
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index ec39bd762..a704b7cf4 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -2,6 +2,7 @@ name: 🐞 Bug Report
description: Report a bug to help improve Arcane
title: '🐞 Bug: '
type: 'Bug'
+labels: 'triage'
body:
- type: markdown
attributes:
@@ -61,8 +62,47 @@ body:
id: version
attributes:
label: Arcane Version
- description: What version of Arcane are you using?
- placeholder: v0.1.0
+ description: What version of Arcane are you using? (Check the About dialog or version info)
+ placeholder: v1.2.3
+ validations:
+ required: true
+
+ - type: dropdown
+ id: installation
+ attributes:
+ label: Installation Method
+ description: How did you install Arcane?
+ options:
+ - Docker Compose (Recommended)
+ - Docker Run
+ - Binary/Executable
+ - Development/Build from source
+ - Other
+ validations:
+ required: true
+
+ - type: dropdown
+ id: environment
+ attributes:
+ label: Environment Type
+ description: Which environment are you running?
+ options:
+ - Local Docker (Single instance)
+ - Remote Agent Mode
+ - Both Local and Remote Agents
+ - Not sure
+ validations:
+ required: true
+
+ - type: dropdown
+ id: database
+ attributes:
+ label: Database Type
+ description: What database backend are you using?
+ options:
+ - SQLite (Default)
+ - PostgreSQL
+ - Not sure
validations:
required: true
@@ -70,32 +110,81 @@ body:
id: os
attributes:
label: Operating System
- description: What operating system are you using?
+ description: What operating system is Arcane running on?
options:
+ - Linux
- macOS
- Windows
- - Linux
- Other
validations:
required: true
- type: input
- id: browser
+ id: docker
attributes:
- label: Browser
- description: What browser are you using?
- placeholder: Chrome 119, Firefox 120, etc.
+ label: Docker Version
+ description: What Docker version are you using? (Run `docker --version`)
+ placeholder: '24.0.6'
validations:
required: true
- type: input
- id: docker
+ id: browser
attributes:
- label: Docker Version
- description: What Docker version are you using?
- placeholder: 24.0.6
+ label: Browser & Version
+ description: What browser and version are you using to access Arcane?
+ placeholder: 'Chrome 119, Firefox 120, Safari 17, etc.'
validations:
- required: true
+ required: false
+
+ - type: textarea
+ id: logs
+ attributes:
+ label: Relevant Logs or Error Messages
+ description: Please share any relevant logs, error messages, or console output
+ placeholder: |
+ Paste any error messages, logs from the browser console, or Docker logs here...
+
+ To get Docker logs: docker logs <container-name>
+ Browser console: F12 -> Console tab
+ render: shell
+ validations:
+ required: false
+
+ - type: textarea
+ id: compose
+ attributes:
+ label: Docker Compose Configuration
+ description: Please share your docker-compose.yml file content (remove sensitive data like passwords first)
+ placeholder: |
+ Paste your docker-compose.yml content here...
+
+ Please remove any sensitive information like:
+ - Passwords
+ - API keys
+ - Private URLs
+ - JWT secrets
+ render: yaml
+ validations:
+ required: false
+
+ - type: textarea
+ id: env
+ attributes:
+ label: Environment Configuration (.env file)
+ description: Please share your .env file content (remove sensitive data like passwords, API keys, and secrets)
+ placeholder: |
+ Paste your .env file content here...
+
+ Please remove any sensitive information like:
+ - ENCRYPTION_KEY
+ - JWT_SECRET
+ - OIDC client secrets
+ - Database passwords
+ - API keys
+ render: shell
+ validations:
+ required: false
- type: textarea
id: additional
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index c919cc1cb..3d2e62279 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -22,50 +22,13 @@ concurrency:
cancel-in-progress: true
jobs:
- build:
- name: E2E Tests - Build Image
- if: ${{ github.event_name != 'pull_request' || github.head_ref != 'l10n_crowdin' }}
- timeout-minutes: 20
- permissions:
- contents: read
- actions: write
- id-token: write
- runs-on: depot-ubuntu-24.04-16
- steps:
- - uses: actions/checkout@v6
-
- - name: Set up Depot CLI
- uses: depot/setup-action@v1
-
- - name: Build Arcane image for Playwright
- uses: depot/build-push-action@v1
- with:
- context: .
- file: docker/Dockerfile
- load: true
- tags: arcane:playwright-tests
- build-args: |
- BUILD_TAGS=playwright
- provenance: true
- sbom: true
-
- - name: Export image to tarball
- run: docker save arcane:playwright-tests -o /tmp/arcane-image.tar
-
- - name: Upload Docker image artifact
- uses: actions/upload-artifact@v6
- with:
- name: arcane-image
- path: /tmp/arcane-image.tar
- retention-days: 1
-
test:
if: ${{ github.event_name != 'pull_request' || github.head_ref != 'l10n_crowdin' }}
permissions:
contents: read
actions: write
+ id-token: write
runs-on: depot-ubuntu-24.04-16
- needs: build
strategy:
fail-fast: false
matrix:
@@ -94,6 +57,14 @@ jobs:
node-version: 25
cache: pnpm
+ - name: Set up Depot CLI
+ uses: depot/setup-action@v1
+
+ - name: Setup depot buildx driver
+ id: setup-buildx-driver
+ run: |
+ depot configure-docker
+
- name: Cache Playwright Browsers
uses: actions/cache@v5
id: playwright-cache
@@ -103,15 +74,6 @@ jobs:
restore-keys: |
${{ runner.os }}-playwright-
- - name: Download Arcane Docker image artifact
- uses: actions/download-artifact@v7
- with:
- name: arcane-image
- path: /tmp
-
- - name: Load Arcane Docker image
- run: docker load -i /tmp/arcane-image.tar
-
- name: Pull and save test images
run: |
docker pull ghcr.io/linuxserver/nginx:latest
diff --git a/SECURITY.md b/SECURITY.md
index cd035b361..36e8e5f7f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,22 +1,34 @@
# Security Policy
-## Reporting Vulnerabilities
+## Reporting Security Vulnerabilities
-Thank you for helping us keep this project secure!
+We take the security of our project seriously and appreciate your efforts to help us maintain a secure environment for all users.
-If you discover a security vulnerability (such as a CVE), **please do not file an issue on GitHub**. Publicly disclosing vulnerabilities in GitHub issues can put users at risk before the problem is addressed.
+> [!IMPORTANT]
+> If you discover a security vulnerability, please do not create a public GitHub issue. Public disclosure can expose users to risk before a fix is available.
-Instead, please report vulnerabilities directly to our security team by emailing **[[email protected]](mailto:[email protected])**.
+Instead, please report security vulnerabilities directly to our security team via email at **[[email protected]](mailto:[email protected])**.
-We will review your report promptly and work to resolve the issue as quickly as possible. When submitting a report, please include as much detail as possible, such as:
+### What to Include in Your Report
-- A description of the vulnerability.
-- Steps to reproduce the issue.
-- Potential impact of the vulnerability.
-- Any suggested fixes or mitigations.
+To help us address vulnerabilities effectively, please provide:
-We appreciate your responsible disclosure and your assistance in keeping this project secure.
+- A clear description of the vulnerability and its potential impact
+- Detailed steps to reproduce the issue
+- Information about the affected versions or environments
+- Any suggested fixes, workarounds, or mitigations (if available)
+
+### Our Commitment
+
+We will:
+
+- Acknowledge receipt of your report within 48 hours
+- Investigate and validate the vulnerability promptly
+- Work to develop and release a fix as quickly as possible
+- Keep you informed of our progress throughout the process
+
+We value responsible disclosure and are grateful for your contribution to the security of our project.
---
-For non-security-related issues, feel free to use the GitHub issue tracker as usual.
+**Note:** For general bug reports, feature requests, or other non-security issues, please use our [GitHub issue tracker](https://github.com/getarcaneapp/arcane/issues).
diff --git a/frontend/src/app.css b/frontend/src/app.css
index adab6130a..f7233346c 100644
--- a/frontend/src/app.css
+++ b/frontend/src/app.css
@@ -66,27 +66,8 @@
--bg-surface: oklch(1 0 0);
--glass-base: var(--bg-surface);
--glass-tint: var(--primary);
- --glass-bg-alpha: 0.25;
- --glass-border-alpha: 0.3;
--glass-shadow-color: oklch(0 0 0 / 0.12);
- --glass-blur: 16px;
- --glass-saturation: 180%;
- --glass-stroke-outer: color-mix(in oklch, white 8%, transparent);
- --glass-stroke-inner: color-mix(in oklch, black 8%, transparent);
- --glass-stroke-outer-strong: color-mix(in oklch, white 12%, transparent);
- --glass-stroke-inner-strong: color-mix(in oklch, black 12%, transparent);
--glass-noise-opacity: 0.03;
-
- --glass-light-alpha: 0.15;
- --glass-medium-alpha: 0.25;
- --glass-heavy-alpha: 0.35;
-
- --glass-blur-xs: 4px;
- --glass-blur-sm: 8px;
- --glass-blur-md: 14px;
- --glass-blur-lg: 20px;
- --glass-blur-xl: 28px;
- --glass-blur-popup: 48px;
}
.dark {
@@ -125,20 +106,7 @@
--bg-surface: oklch(0.21 0.006 285.885);
--glass-base: var(--bg-surface);
--glass-tint: var(--primary);
- --glass-bg-alpha: 0.35;
- --glass-border-alpha: 0.28;
--glass-shadow-color: oklch(0 0 0 / 0.32);
- --glass-saturation: 180%;
- --glass-stroke-outer: color-mix(in oklch, white 10%, transparent);
- --glass-stroke-inner: color-mix(in oklch, black 10%, transparent);
- --glass-stroke-outer-strong: color-mix(in oklch, white 14%, transparent);
- --glass-stroke-inner-strong: color-mix(in oklch, black 14%, transparent);
-
- --glass-light-alpha: 0.2;
- --glass-medium-alpha: 0.35;
- --glass-heavy-alpha: 0.5;
-
- --glass-blur-popup: 48px;
}
@theme inline {
@@ -194,13 +162,6 @@
@apply cursor-pointer;
}
- .glass,
- .glass-light,
- .glass-medium,
- .glass-heavy {
- contain: layout style paint;
- content-visibility: auto;
- }
}
body:not(.glass-enabled) {
@@ -217,18 +178,6 @@ body:not(.glass-enabled) {
opacity: 0.015;
}
- .glass,
- .glass-light,
- .glass-medium,
- .glass-heavy,
- .glass-strong,
- .glass-subtle {
- -webkit-backdrop-filter: none !important;
- backdrop-filter: none !important;
- background: var(--bg-surface) !important;
- border-color: var(--border) !important;
- box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05) !important;
- }
.bubble {
background: var(--bg-surface) !important;
@@ -303,11 +252,6 @@ body:not(.glass-enabled) {
background-color: var(--bg-surface) !important;
}
- .glass-medium {
- background: var(--bg-surface) !important;
- backdrop-filter: none !important;
- -webkit-backdrop-filter: none !important;
- }
}
body.glass-enabled {
@@ -344,16 +288,7 @@ body::after {
}
}
-@layer components {
- /* Convenience wrapper for content blocks */
- .glass-card {
- border-radius: var(--radius-lg);
- padding: 1rem;
- }
-}
-
@layer utilities {
- /* Bubbly UI helpers */
.bubble {
background:
radial-gradient(
@@ -373,24 +308,6 @@ body::after {
0 1px 0 0 color-mix(in oklch, var(--glass-base, var(--bg-surface)) 30%, transparent) inset;
}
- .glass-glow {
- box-shadow:
- 0 0 20px -5px color-mix(in oklch, var(--glass-tint, var(--primary)) 40%, transparent),
- 0 10px 30px -10px var(--glass-shadow-color),
- 0 1px 0 0 color-mix(in oklch, var(--glass-base, var(--bg-surface)) 28%, transparent) inset;
- }
-
- .glass-shadow-soft {
- box-shadow:
- 0 2px 8px -2px color-mix(in oklch, var(--glass-shadow-color) 40%, transparent),
- 0 1px 0 0 color-mix(in oklch, var(--glass-base, var(--bg-surface)) 20%, transparent) inset;
- }
-
- .glass-shadow-medium {
- box-shadow:
- 0 4px 16px -4px color-mix(in oklch, var(--glass-shadow-color) 60%, transparent),
- 0 1px 0 0 color-mix(in oklch, var(--glass-base, var(--bg-surface)) 25%, transparent) inset;
- }
.bubble-pill {
border-radius: 9999px;
@@ -429,14 +346,6 @@ body::after {
}
}
- /* Prevent stat-card value from scaling out of bounds on hover */
- .glass-light.group .tabular-nums {
- transform-origin: left center;
- }
- .glass-light.group:hover .tabular-nums {
- transform: none !important;
- }
-
.bubble-outline {
background:
linear-gradient(var(--glass-base, var(--bg-surface)), var(--glass-base, var(--bg-surface))) padding-box,
@@ -477,12 +386,6 @@ body::after {
}
}
- /* Glass variants for cards/components */
- .glass-medium {
- background: color-mix(in oklch, var(--glass-base, var(--bg-surface)) var(--glass-medium-alpha), transparent);
- backdrop-filter: blur(var(--glass-blur-md)) saturate(var(--glass-saturation));
- -webkit-backdrop-filter: blur(var(--glass-blur-md)) saturate(var(--glass-saturation));
- }
}
.version-collapsed {
diff --git a/frontend/src/lib/components/accent-color/custom-color.svelte b/frontend/src/lib/components/accent-color/custom-color.svelte
index c87cb14bd..925517261 100644
--- a/frontend/src/lib/components/accent-color/custom-color.svelte
+++ b/frontend/src/lib/components/accent-color/custom-color.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Dialog from '$lib/components/ui/dialog';
import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label/index.js';
@@ -67,8 +67,13 @@
</div>
<Dialog.Footer class="mt-6">
- <Button variant="secondary" onclick={() => onOpenChange(false)}>{m.cancel()}</Button>
- <Button type="submit" disabled={!customColorInput || !isValidColor(customColorInput)}>{m.apply()}</Button>
+ <ArcaneButton action="cancel" tone="ghost" onclick={() => onOpenChange(false)} customLabel={m.cancel()} />
+ <ArcaneButton
+ action="confirm"
+ type="submit"
+ disabled={!customColorInput || !isValidColor(customColorInput)}
+ customLabel={m.apply()}
+ />
</Dialog.Footer>
</form>
</Dialog.Content>
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index 028a8820e..8098d6c7e 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -10,12 +10,7 @@
import { m } from '$lib/paraglide/messages';
import { containerService } from '$lib/services/container-service';
import { projectService } from '$lib/services/project-service';
- import {
- type LayerProgress,
- isDownloadingLine,
- calculateOverallProgress,
- areAllLayersComplete
- } from '$lib/utils/pull-progress';
+ import { isDownloadingLine, calculateOverallProgress, areAllLayersComplete } from '$lib/utils/pull-progress';
import { EllipsisIcon, DownloadIcon } from '$lib/icons';
type TargetType = 'container' | 'project';
diff --git a/frontend/src/lib/components/arcane-button/arcane-button.svelte b/frontend/src/lib/components/arcane-button/arcane-button.svelte
index c59e710b8..11e3cbf55 100644
--- a/frontend/src/lib/components/arcane-button/arcane-button.svelte
+++ b/frontend/src/lib/components/arcane-button/arcane-button.svelte
@@ -1,17 +1,20 @@
<script lang="ts" module>
import type { WithChildren, WithoutChildren } from 'bits-ui';
import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
- import type { ArcaneButtonSize, Action, ArcaneButtonHoverEffect } from './variants';
+ import type { ArcaneButtonSize, Action, ArcaneButtonHoverEffect, ActionConfig, ArcaneButtonTone } from './variants';
+ import type { IconType } from '$lib/icons';
export type ArcaneButtonPropsWithoutHTML = WithChildren<{
ref?: HTMLElement | null;
action: Action;
size?: ArcaneButtonSize;
+ tone?: ArcaneButtonTone;
hoverEffect?: ArcaneButtonHoverEffect;
loading?: boolean;
showLabel?: boolean;
customLabel?: string;
loadingLabel?: string;
+ icon?: IconType;
onClickPromise?: (
e: MouseEvent & {
currentTarget: EventTarget & HTMLButtonElement;
@@ -46,6 +49,7 @@
ref = $bindable(null),
action,
size = 'default',
+ tone = undefined,
hoverEffect = undefined,
href = undefined,
type = 'button',
@@ -54,6 +58,7 @@
showLabel = true,
customLabel = undefined,
loadingLabel = undefined,
+ icon = undefined,
tabindex = 0,
onclick,
onClickPromise,
@@ -62,13 +67,14 @@
...rest
}: ArcaneButtonProps = $props();
- let config = $derived(actionConfigs[action]);
+ let config = $derived(actionConfigs[action] as ActionConfig);
let displayLabel = $derived(customLabel ?? config.defaultLabel);
let displayLoadingLabel = $derived(loadingLabel ?? config.loadingLabel ?? m.common_processing());
let isIconOnlyButton = $derived(size === 'icon' || !showLabel);
+ let IconComponent = $derived(icon ?? config.IconComponent);
+
let hasChildren = $derived(!!children);
- let shouldUseInternalContent = $derived(!hasChildren);
</script>
<svelte:element
@@ -81,7 +87,7 @@
aria-disabled={href ? disabled : undefined}
role={href && disabled ? 'link' : undefined}
tabindex={href && disabled ? -1 : tabindex}
- class={cn('relative', arcaneButtonVariants({ tone: config.tone, size, hoverEffect }), className)}
+ class={cn('relative', arcaneButtonVariants({ tone: tone ?? config.tone, size, hoverEffect }), className)}
aria-label={hasChildren ? undefined : isIconOnlyButton ? displayLabel : undefined}
bind:this={ref}
onclick={async (e: any) => {
@@ -94,24 +100,21 @@
}
}}
>
- {#if shouldUseInternalContent}
- {#if type !== undefined && loading}
- <div class="absolute inset-0 flex place-items-center justify-center bg-inherit">
- <div class="flex place-items-center justify-center">
- <Spinner class="size-4" />
- </div>
- </div>
- <span class="sr-only">{m.common_loading_label({ label: displayLoadingLabel })}</span>
- {#if !isIconOnlyButton}
- <span class="opacity-0">{displayLabel}</span>
- {/if}
- {:else}
- <config.IconComponent class="size-4" />
- {#if !isIconOnlyButton}
- {displayLabel}
- {/if}
+ {#if type !== undefined && loading}
+ <div class="bg-background/30 absolute inset-0 flex items-center justify-center rounded-[inherit] backdrop-blur-[1px]">
+ <Spinner class="size-4" />
+ </div>
+ <span class="sr-only">{m.common_loading_label({ label: displayLoadingLabel })}</span>
+ {#if !isIconOnlyButton && displayLabel}
+ <span class="opacity-0">{displayLabel}</span>
{/if}
{:else}
+ {#if IconComponent}
+ <IconComponent class="size-4" />
+ {/if}
+ {#if !isIconOnlyButton && displayLabel}
+ {displayLabel}
+ {/if}
{@render children?.()}
{/if}
</svelte:element>
diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.ts
index 0c8113c8c..0cdc418ed 100644
--- a/frontend/src/lib/components/arcane-button/variants.ts
+++ b/frontend/src/lib/components/arcane-button/variants.ts
@@ -17,26 +17,38 @@ import {
InspectIcon,
FileTextIcon,
TemplateIcon,
- type IconType
+ type IconType,
+ LoginIcon,
+ OpenIdIcon
} from '$lib/icons';
export const arcaneButtonVariants = tv({
base:
'inline-flex items-center justify-center gap-2 rounded-lg text-sm font-medium whitespace-nowrap select-none ' +
- 'transition-[transform,box-shadow,background-color,border-color,color] duration-150 will-change-transform ' +
+ 'transition-all duration-200 will-change-transform ' +
+ 'active:scale-[0.98] ' +
'border disabled:pointer-events-none disabled:opacity-50 ' +
- 'focus-visible:outline-none focus-visible:ring-0 ring-0 ring-offset-0 ' +
+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50 focus-visible:ring-offset-0 ' +
"[&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
variants: {
tone: {
'outline-primary':
- 'bg-transparent text-muted-foreground border-primary/70 hover:bg-primary/15 hover:border-primary/75 ' +
- 'dark:text-muted-foreground dark:border-primary/60 dark:hover:bg-primary/20 shadow-none hover:shadow-none',
+ 'bg-primary/5 text-foreground! border-primary/20 hover:bg-primary/10 hover:border-primary/40 ' +
+ 'dark:bg-primary/10 dark:text-primary-foreground dark:border-primary/30 dark:hover:bg-primary/20 ' +
+ 'shadow-sm hover:shadow-md',
+ 'outline-primary-login':
+ 'bg-primary/5 text-foreground! border-primary/20 hover:bg-primary/10 hover:border-primary/40 ' +
+ 'dark:bg-primary/10 dark:text-primary-foreground dark:border-primary/30 dark:hover:bg-primary/20 ' +
+ 'shadow-sm hover:shadow-md w-full',
'outline-destructive':
- 'bg-transparent text-destructive/75 border-destructive/60 hover:bg-destructive/10 hover:border-destructive/65 ' +
- 'dark:text-destructive/75 dark:border-destructive/55 dark:hover:bg-destructive/14 shadow-none hover:shadow-none',
+ 'bg-destructive/5 text-foreground! border-destructive/20 hover:bg-destructive/10 hover:border-destructive/40 ' +
+ 'dark:bg-destructive/10 dark:text-destructive-foreground dark:border-destructive/30 dark:hover:bg-destructive/20 ' +
+ 'shadow-sm hover:shadow-md',
- ghost: 'border-transparent bg-transparent text-foreground hover:bg-accent/40 shadow-none hover:shadow-none',
+ outline: 'bg-background border-input hover:bg-accent hover:text-accent-foreground shadow-sm',
+
+ ghost:
+ 'border-transparent bg-transparent text-foreground! hover:bg-accent/40 hover:text-accent-foreground shadow-none hover:shadow-none',
link: 'border-transparent bg-transparent text-primary underline-offset-4 hover:underline shadow-none hover:shadow-none'
},
size: {
@@ -47,13 +59,13 @@ export const arcaneButtonVariants = tv({
},
hoverEffect: {
none: '',
- lift: 'hover:-translate-y-0.5 active:translate-y-0'
+ lift: 'hover-lift'
}
},
defaultVariants: {
tone: 'outline-primary',
size: 'default',
- hoverEffect: 'lift'
+ hoverEffect: 'none'
}
});
@@ -61,33 +73,17 @@ export type ArcaneButtonTone = VariantProps<typeof arcaneButtonVariants>['tone']
export type ArcaneButtonSize = VariantProps<typeof arcaneButtonVariants>['size'];
export type ArcaneButtonHoverEffect = VariantProps<typeof arcaneButtonVariants>['hoverEffect'];
-export type Action =
- | 'start'
- | 'deploy'
- | 'stop'
- | 'restart'
- | 'remove'
- | 'pull'
- | 'redeploy'
- | 'refresh'
- | 'inspect'
- | 'logs'
- | 'edit'
- | 'confirm'
- | 'cancel'
- | 'save'
- | 'create'
- | 'template'
- | 'update';
-
export type ActionConfig = {
- defaultLabel: string;
- IconComponent: IconType;
+ defaultLabel?: string;
+ IconComponent?: IconType;
tone: ArcaneButtonTone;
loadingLabel?: string;
};
-export const actionConfigs: Record<Action, ActionConfig> = {
+export const actionConfigs = {
+ base: {
+ tone: 'outline'
+ },
start: {
defaultLabel: m.common_start(),
IconComponent: StartIcon,
@@ -179,5 +175,19 @@ export const actionConfigs: Record<Action, ActionConfig> = {
IconComponent: UpdateIcon,
tone: 'outline-primary',
loadingLabel: m.common_action_updating()
+ },
+ login: {
+ defaultLabel: m.auth_signin_button(),
+ IconComponent: LoginIcon,
+ tone: 'outline-primary-login',
+ loadingLabel: m.auth_signing_in()
+ },
+ oidc_login: {
+ defaultLabel: m.auth_oidc_signin(),
+ IconComponent: OpenIdIcon,
+ tone: 'outline-primary-login',
+ loadingLabel: m.auth_signing_in()
}
-};
+} satisfies Record<string, ActionConfig>;
+
+export type Action = keyof typeof actionConfigs;
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
index bf5d7c5dd..8204797ab 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-filter.svelte
@@ -3,7 +3,7 @@
import { SvelteSet } from 'svelte/reactivity';
import * as Command from '$lib/components/ui/command/index.js';
import * as Popover from '$lib/components/ui/popover/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { cn } from '$lib/utils.js';
import { Separator } from '$lib/components/ui/separator/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
@@ -33,15 +33,16 @@
<Popover.Root>
<Popover.Trigger>
{#snippet child({ props })}
- <Button
+ <ArcaneButton
{...props}
- variant="ghost"
+ action="base"
+ tone="ghost"
size="sm"
+ icon={FilterIcon}
+ customLabel={title}
class="border-input hover:bg-card/60 h-8 min-w-24 border border-dashed hover:text-inherit"
data-testid={`facet-${title.toLowerCase()}-trigger`}
>
- <FilterIcon />
- {title}
{#if selectedValues.size > 0}
<Separator orientation="vertical" class="mx-2 h-4" />
<Badge variant="secondary" class="rounded-sm px-1 font-normal lg:hidden">
@@ -61,7 +62,7 @@
{/if}
</div>
{/if}
- </Button>
+ </ArcaneButton>
{/snippet}
</Popover.Trigger>
<Popover.Content class="w-[240px] p-0" align="start" data-testid={`facet-${title.toLowerCase()}-content`}>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
index c37c2bc8a..eba365dd7 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-toolbar.svelte
@@ -1,7 +1,6 @@
<script lang="ts" generics="TData">
import type { Table } from '@tanstack/table-core';
import { DataTableFacetedFilter, DataTableViewOptions } from './index.js';
- import Button from '$lib/components/ui/button/button.svelte';
import { Input } from '$lib/components/ui/input/index.js';
import { imageUpdateFilters, usageFilters, severityFilters, templateTypeFilters } from './data.js';
import { debounced } from '$lib/utils/utils.js';
@@ -45,7 +44,7 @@
const hasSelection = $derived(!selectionDisabled && (selectedIds?.length ?? 0) > 0);
</script>
-<div class={cn('flex flex-col gap-2 px-6 py-4 sm:flex-row sm:items-center sm:justify-between', className)}>
+<div class={cn('flex flex-col gap-2 px-2 py-2 sm:flex-row sm:items-center sm:justify-between', className)}>
<div class="flex flex-col gap-2 sm:flex-1 sm:flex-row sm:items-center sm:justify-between">
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:space-x-2">
<div class="flex items-center gap-2">
@@ -84,17 +83,18 @@
{/if}
{#if isFiltered}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
+ size="sm"
+ icon={ResetIcon}
+ customLabel={m.common_reset()}
onclick={() => {
table.resetColumnFilters();
table.resetGlobalFilter();
}}
class="h-8 px-2 lg:px-3"
- >
- {m.common_reset()}
- <ResetIcon />
- </Button>
+ />
{/if}
</div>
</div>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte b/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
index 5b9e46061..1d509a9b9 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table-view-options.svelte
@@ -1,6 +1,6 @@
<script lang="ts" generics="TData">
import type { Table } from '@tanstack/table-core';
- import { buttonVariants } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { m } from '$lib/paraglide/messages';
import type { Snippet } from 'svelte';
@@ -20,17 +20,20 @@
</script>
<DropdownMenu.Root>
- <DropdownMenu.Trigger
- class={buttonVariants({
- variant: 'ghost',
- size: 'sm',
- class: 'border-input hover:bg-card/60 h-8 border hover:text-inherit'
- })}
- >
- <ViewOptionsIcon />
- {m.common_view()}
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="sm"
+ icon={ViewOptionsIcon}
+ customLabel={m.common_view()}
+ class="border-input hover:bg-card/60 h-8 border hover:text-inherit"
+ />
+ {/snippet}
</DropdownMenu.Trigger>
- <DropdownMenu.Content align="end">
+ <DropdownMenu.Content align="center">
{#if customViewOptions}
<DropdownMenu.Group>
<DropdownMenu.Label>{m.common_view()}</DropdownMenu.Label>
diff --git a/frontend/src/lib/components/arcane-table/arcane-table.svelte b/frontend/src/lib/components/arcane-table/arcane-table.svelte
index 2ba074091..4ef35ad7b 100644
--- a/frontend/src/lib/components/arcane-table/arcane-table.svelte
+++ b/frontend/src/lib/components/arcane-table/arcane-table.svelte
@@ -17,7 +17,7 @@
import * as Card from '$lib/components/ui/card/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { renderComponent, renderSnippet } from '$lib/components/ui/data-table/render-helpers.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Select from '$lib/components/ui/select/index.js';
import type { SvelteHTMLElements } from 'svelte/elements';
import { cn } from '$lib/utils.js';
@@ -541,22 +541,46 @@
{m.common_page_of({ page: currentPage, total: totalPages })}
</div>
<div class="flex items-center space-x-1 sm:space-x-2">
- <Button variant="outline" class="hidden size-8 p-0 lg:flex" onclick={() => setPage(1)} disabled={!canPrev}>
- <span class="sr-only">{m.common_go_first_page()}</span>
- <DoubleArrowLeftIcon />
- </Button>
- <Button variant="outline" class="size-8 p-0" onclick={() => setPage(currentPage - 1)} disabled={!canPrev}>
- <span class="sr-only">{m.common_go_prev_page()}</span>
- <ArrowLeftIcon />
- </Button>
- <Button variant="outline" class="size-8 p-0" onclick={() => setPage(currentPage + 1)} disabled={!canNext}>
- <span class="sr-only">{m.common_go_next_page()}</span>
- <ArrowRightIcon />
- </Button>
- <Button variant="outline" class="hidden size-8 p-0 lg:flex" onclick={() => setPage(totalPages)} disabled={!canNext}>
- <span class="sr-only">{m.common_go_last_page()}</span>
- <DoubleArrowRightIcon />
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="icon"
+ icon={DoubleArrowLeftIcon}
+ class="hidden size-8 lg:flex"
+ onclick={() => setPage(1)}
+ disabled={!canPrev}
+ aria-label={m.common_go_first_page()}
+ />
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="icon"
+ icon={ArrowLeftIcon}
+ class="size-8"
+ onclick={() => setPage(currentPage - 1)}
+ disabled={!canPrev}
+ aria-label={m.common_go_prev_page()}
+ />
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="icon"
+ icon={ArrowRightIcon}
+ class="size-8"
+ onclick={() => setPage(currentPage + 1)}
+ disabled={!canNext}
+ aria-label={m.common_go_next_page()}
+ />
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="icon"
+ icon={DoubleArrowRightIcon}
+ class="hidden size-8 lg:flex"
+ onclick={() => setPage(totalPages)}
+ disabled={!canNext}
+ aria-label={m.common_go_last_page()}
+ />
</div>
</div>
</div>
@@ -581,10 +605,14 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="sm" class="data-[state=open]:bg-accent -ml-3 h-8">
- <span>
- {title}
- </span>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="sm"
+ customLabel={title}
+ class="data-[state=open]:bg-accent -ml-3 h-8"
+ >
{#if column.getIsSorted() === 'desc'}
<ArrowDownIcon />
{:else if column.getIsSorted() === 'asc'}
@@ -592,7 +620,7 @@
{:else}
<ArrowsUpDownIcon />
{/if}
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="start">
@@ -705,7 +733,7 @@
<Card.Root class="overflow-hiddens flex h-full min-h-0 flex-col">
{#snippet children()}
{#if !withoutSearch}
- <Card.Header class="border-b">
+ <Card.Header class="border-b px-2 py-2">
<DataTableToolbar
{table}
{selectedIds}
diff --git a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
index 49efec847..cc2d2025a 100644
--- a/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
+++ b/frontend/src/lib/components/confirm-dialog/confirm-dialog.svelte
@@ -2,7 +2,7 @@
import * as Dialog from '$lib/components/ui/dialog';
import { AlertIcon } from '$lib/icons';
import { confirmDialogStore } from '.';
- import Button from '../ui/button/button.svelte';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Label } from '$lib/components/ui/label';
import Checkbox from '../ui/checkbox/checkbox.svelte';
@@ -82,14 +82,13 @@
<Dialog.Footer class="mt-6">
<div class="flex w-full justify-end gap-3">
- <Button class="min-w-[80px]" variant="outline" onclick={() => ($confirmDialogStore.open = false)}>Cancel</Button>
- <Button
+ <ArcaneButton class="min-w-[80px]" action="cancel" onclick={() => ($confirmDialogStore.open = false)} />
+ <ArcaneButton
class="min-w-[80px]"
- variant={$confirmDialogStore.confirm.destructive ? 'destructive' : 'default'}
+ action={$confirmDialogStore.confirm.destructive ? 'remove' : 'confirm'}
+ customLabel={$confirmDialogStore.confirm.label}
onclick={handleConfirm}
- >
- {$confirmDialogStore.confirm.label}
- </Button>
+ />
</div>
</Dialog.Footer>
</Dialog.Content>
diff --git a/frontend/src/lib/components/dialogs/create-container-dialog.svelte b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
index b68f8dd2a..5c514a5e3 100644
--- a/frontend/src/lib/components/dialogs/create-container-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/create-container-dialog.svelte
@@ -2,7 +2,7 @@
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
import * as Tabs from '$lib/components/ui/tabs/index.js';
import { TabBar, type TabItem } from '$lib/components/tab-bar/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { Checkbox } from '$lib/components/ui/checkbox/index.js';
import { Label } from '$lib/components/ui/label/index.js';
@@ -429,22 +429,27 @@
<Input type="text" placeholder="KEY" bind:value={env.key} disabled={isLoading} class="flex-1" />
<span class="text-muted-foreground hidden font-mono sm:inline">=</span>
<Input type="text" placeholder="value" bind:value={env.value} disabled={isLoading} class="flex-1" />
- <Button
- type="button"
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
onclick={() => removeEnvVar(index)}
disabled={isLoading || envVars.length <= 1}
class="text-destructive hover:text-destructive shrink-0"
- >
- <CloseIcon class="size-4" />
- </Button>
+ icon={CloseIcon}
+ />
</div>
{/each}
- <Button type="button" variant="outline" size="sm" onclick={addEnvVar} disabled={isLoading} class="w-full">
- <AddIcon class="mr-2 size-4" />
- {m.add_env_var_button()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ onclick={addEnvVar}
+ disabled={isLoading}
+ class="w-full"
+ icon={AddIcon}
+ customLabel={m.add_env_var_button()}
+ />
</div>
</div>
</div>
@@ -508,31 +513,29 @@
<option value="tcp">TCP</option>
<option value="udp">UDP</option>
</select>
- <Button
- type="button"
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
onclick={() => removePortMapping(index)}
disabled={isLoading || portMappings.length <= 1}
class="text-destructive hover:text-destructive shrink-0"
- >
- <CloseIcon class="size-4" />
- </Button>
+ icon={CloseIcon}
+ />
</div>
</div>
</div>
{/each}
- <Button
- type="button"
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="sm"
onclick={addPortMapping}
disabled={isLoading}
class="w-full"
- >
- <AddIcon class="mr-2 size-4" />
- {m.add_port_mapping_button()}
- </Button>
+ icon={AddIcon}
+ customLabel={m.add_port_mapping_button()}
+ />
</div>
</div>
</div>
@@ -585,16 +588,15 @@
disabled={isLoading}
class="flex-1"
/>
- <Button
- type="button"
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
onclick={() => removeVolumeMount(index)}
disabled={isLoading || volumeMounts.length <= 1}
class="text-destructive hover:text-destructive shrink-0 self-end sm:self-auto"
- >
- <CloseIcon class="size-4" />
- </Button>
+ icon={CloseIcon}
+ />
</div>
<div class="flex items-center space-x-2 pl-0 sm:pl-3">
<Checkbox bind:checked={mount.readonly} disabled={isLoading} />
@@ -602,17 +604,16 @@
</div>
</div>
{/each}
- <Button
- type="button"
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="sm"
onclick={addVolumeMount}
disabled={isLoading}
class="w-full"
- >
- <AddIcon class="mr-2 size-4" />
- {m.add_volume_mount_button()}
- </Button>
+ icon={AddIcon}
+ customLabel={m.add_volume_mount_button()}
+ />
</div>
</div>
</div>
@@ -740,18 +741,16 @@
{#snippet footer()}
<div class="flex flex-col-reverse gap-2 sm:flex-row sm:justify-end">
- <Button type="button" variant="outline" onclick={() => (open = false)} disabled={isLoading} class="w-full sm:w-auto">
- {m.common_cancel()}
- </Button>
- <Button type="submit" form="create-container-form" disabled={isLoading} class="w-full sm:w-auto">
- {#if isLoading}
- <Spinner class="size-4" />
- {m.common_action_creating()}
- {:else}
- <AddIcon class="size-4" />
- {m.common_create_button({ resource: m.resource_container_cap() })}
- {/if}
- </Button>
+ <ArcaneButton action="cancel" tone="outline" onclick={() => (open = false)} disabled={isLoading} class="w-full sm:w-auto" />
+ <ArcaneButton
+ action="create"
+ form="create-container-form"
+ type="submit"
+ disabled={isLoading}
+ loading={isLoading}
+ class="w-full sm:w-auto"
+ customLabel={m.common_create_button({ resource: m.resource_container_cap() })}
+ />
</div>
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
index 30ccdc513..eccd70106 100644
--- a/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/docker-info-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Badge } from '$lib/components/ui/badge';
import { CopyButton } from '$lib/components/ui/copy-button';
import type { DockerInfo } from '$lib/types/docker-info.type';
@@ -35,42 +35,40 @@
bind:open
title={m.docker_engine_title({ engine: dockerInfo?.Name ?? 'Docker Engine' })}
description={m.docker_info_dialog_description()}
- contentClass="sm:max-w-[800px]"
+ contentClass="sm:max-w-[1100px]"
>
{#snippet children()}
- <div class="space-y-4 pt-4">
- {@render statsSection()}
+ <div class="space-y-6 pt-4">
+ <div class="grid gap-6">
+ {@render statsSection()}
+ {@render resourcesSection()}
+ </div>
- <div class="grid gap-4 sm:grid-cols-2">
+ <div class="grid gap-6 lg:grid-cols-3">
{@render systemSection()}
{@render versionSection()}
+ {@render configurationSection()}
</div>
- {@render resourcesSection()}
-
- <div class="grid gap-4 sm:grid-cols-2">
- {@render configurationSection()}
+ <div class="grid gap-6 lg:grid-cols-3">
{@render networkSection()}
+ {@render securitySection()}
+ {@render pluginsSection()}
</div>
-
- {@render pluginsSection()}
- {@render securitySection()}
</div>
{/snippet}
{#snippet footer()}
- <Button variant="outline" onclick={handleClose}>
- {m.common_close()}
- </Button>
+ <ArcaneButton action="base" tone="outline" onclick={handleClose} customLabel={m.common_close()} />
{/snippet}
</ResponsiveDialog>
{#snippet statsSection()}
<div>
- <h3 class="mb-3 text-sm font-semibold">
+ <h3 class="text-muted-foreground mb-2 text-xs font-semibold tracking-wider uppercase">
{m.docker_info_stats_section()}
</h3>
- <div class="grid gap-4 sm:grid-cols-4">
+ <div class="grid gap-3 sm:grid-cols-4">
{@render statCard(m.common_running(), dockerInfo?.ContainersRunning ?? 0, 'emerald', true)}
{@render statCard(m.docker_info_paused_label(), dockerInfo?.ContainersPaused ?? 0, 'amber', true)}
{@render statCard(m.common_stopped(), dockerInfo?.ContainersStopped ?? 0, 'red', true)}
@@ -80,11 +78,11 @@
{/snippet}
{#snippet systemSection()}
- <div class="space-y-3">
- <h3 class="text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.docker_info_system_section()}
</h3>
- <div class="space-y-2 rounded-lg border p-4">
+ <div class="space-y-1.5 rounded-lg border p-3">
{@render infoRow(m.common_name(), dockerInfo?.Name)}
{@render infoRow(m.common_id(), dockerInfo?.ID, true, true)}
{@render infoRow(m.docker_info_os_label(), dockerInfo?.OperatingSystem)}
@@ -98,11 +96,11 @@
{/snippet}
{#snippet versionSection()}
- <div class="space-y-3">
- <h3 class="text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.docker_info_version_section()}
</h3>
- <div class="space-y-2 rounded-lg border p-4">
+ <div class="space-y-1.5 rounded-lg border p-3">
{@render infoRow(m.docker_info_server_version_label(), dockerInfo?.ServerVersion)}
{@render infoRow(m.docker_info_api_version_label(), dockerInfo?.apiVersion)}
{@render infoRow(m.docker_info_go_version_label(), dockerInfo?.goVersion)}
@@ -111,7 +109,7 @@
<div class="flex items-center gap-2">
<code class="bg-muted rounded px-1.5 py-0.5 text-xs">{shortGitCommit}</code>
{#if dockerInfo?.gitCommit}
- <CopyButton text={dockerInfo.gitCommit} size="icon" class="size-7" title="Copy full commit hash" />
+ <CopyButton text={dockerInfo.gitCommit} size="icon" class="size-6" title="Copy full commit hash" />
{/if}
</div>
</div>
@@ -123,39 +121,39 @@
{#snippet resourcesSection()}
<div>
- <h3 class="mb-3 text-sm font-semibold">
+ <h3 class="text-muted-foreground mb-2 text-xs font-semibold tracking-wider uppercase">
{m.docker_info_resources_section()}
</h3>
- <div class="grid gap-4 sm:grid-cols-4">
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.common_cpus()}</div>
+ <div class="grid gap-3 sm:grid-cols-4">
+ <div class="rounded-lg border p-3">
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.common_cpus()}</div>
<div class="flex items-center gap-2">
- <Badge variant="secondary" class="text-base">{dockerInfo?.NCPU ?? 0}</Badge>
- <span class="text-muted-foreground text-xs">cores</span>
+ <Badge variant="secondary" class="text-sm font-bold">{dockerInfo?.NCPU ?? 0}</Badge>
+ <span class="text-muted-foreground text-[10px]">cores</span>
</div>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_memory_label()}</div>
- <Badge variant="secondary" class="text-base">{formattedMemory}</Badge>
+ <div class="rounded-lg border p-3">
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_memory_label()}</div>
+ <Badge variant="secondary" class="text-sm font-bold">{formattedMemory}</Badge>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_goroutines()}</div>
- <Badge variant="secondary" class="text-base">{dockerInfo?.NGoroutines ?? 0}</Badge>
+ <div class="rounded-lg border p-3">
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_goroutines()}</div>
+ <Badge variant="secondary" class="text-sm font-bold">{dockerInfo?.NGoroutines ?? 0}</Badge>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_file_descriptors()}</div>
- <Badge variant="secondary" class="text-base">{dockerInfo?.NFd ?? 0}</Badge>
+ <div class="rounded-lg border p-3">
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_file_descriptors()}</div>
+ <Badge variant="secondary" class="text-sm font-bold">{dockerInfo?.NFd ?? 0}</Badge>
</div>
</div>
</div>
{/snippet}
{#snippet configurationSection()}
- <div class="space-y-3">
- <h3 class="text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.common_configuration()}
</h3>
- <div class="space-y-2 rounded-lg border p-4">
+ <div class="space-y-1.5 rounded-lg border p-3">
{@render infoRow(m.docker_info_storage_driver_label(), dockerInfo?.Driver)}
{@render infoRow(m.docker_info_logging_driver_label(), dockerInfo?.LoggingDriver)}
{@render infoRow(m.docker_info_cgroup_driver_label(), dockerInfo?.CgroupDriver)}
@@ -168,11 +166,11 @@
{/snippet}
{#snippet networkSection()}
- <div class="space-y-3">
- <h3 class="text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.resource_networks_cap()} & {m.docker_info_proxy_label()}
</h3>
- <div class="space-y-2 rounded-lg border p-4">
+ <div class="space-y-1.5 rounded-lg border p-3">
{@render infoRow(
m.docker_info_ipv4_forwarding(),
dockerInfo?.IPv4Forwarding ? m.common_enabled() : m.common_disabled(),
@@ -187,36 +185,36 @@
{/snippet}
{#snippet pluginsSection()}
- <div>
- <h3 class="mb-3 text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.docker_info_plugins_section()}
</h3>
- <div class="grid gap-4 sm:grid-cols-3">
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.resource_volumes_cap()}</div>
+ <div class="space-y-3 rounded-lg border p-3">
+ <div>
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.resource_volumes_cap()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Volume ?? [] as plugin}
- <Badge variant="outline" class="text-xs">{plugin}</Badge>
+ <Badge variant="outline" class="px-1.5 py-0 text-[10px]">{plugin}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
</div>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.resource_networks_cap()}</div>
+ <div>
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.resource_networks_cap()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Network ?? [] as plugin}
- <Badge variant="outline" class="text-xs">{plugin}</Badge>
+ <Badge variant="outline" class="px-1.5 py-0 text-[10px]">{plugin}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
</div>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_logs_plugin()}</div>
+ <div>
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_logs_plugin()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.Plugins?.Log ?? [] as plugin}
- <Badge variant="outline" class="text-xs">{plugin}</Badge>
+ <Badge variant="outline" class="px-1.5 py-0 text-[10px]">{plugin}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
@@ -227,26 +225,26 @@
{/snippet}
{#snippet securitySection()}
- <div>
- <h3 class="mb-3 text-sm font-semibold">
+ <div class="space-y-2">
+ <h3 class="text-muted-foreground text-xs font-semibold tracking-wider uppercase">
{m.security_title()} & {m.docker_info_runtimes()}
</h3>
- <div class="grid gap-4 sm:grid-cols-2">
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_security_options()}</div>
+ <div class="space-y-3 rounded-lg border p-3">
+ <div>
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_security_options()}</div>
<div class="flex flex-wrap gap-1">
{#each dockerInfo?.SecurityOptions ?? [] as opt}
- <Badge variant="secondary" class="text-xs">{opt}</Badge>
+ <Badge variant="secondary" class="px-1.5 py-0 text-[10px]">{opt}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
</div>
</div>
- <div class="rounded-lg border p-4">
- <div class="text-muted-foreground mb-2 text-xs">{m.docker_info_runtimes()}</div>
+ <div>
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{m.docker_info_runtimes()}</div>
<div class="flex flex-wrap gap-1">
{#each Object.keys(dockerInfo?.Runtimes ?? {}) as runtime}
- <Badge variant="outline" class="text-xs">{runtime}</Badge>
+ <Badge variant="outline" class="px-1.5 py-0 text-[10px]">{runtime}</Badge>
{:else}
<span class="text-muted-foreground text-xs">-</span>
{/each}
@@ -284,14 +282,14 @@
badge: ''
}
}}
- <div class="rounded-lg border p-4 {colors[color].bg}">
- <div class="text-muted-foreground mb-2 text-xs">{label}</div>
+ <div class="rounded-lg border p-3 {colors[color].bg}">
+ <div class="text-muted-foreground mb-1 text-[10px] tracking-tight uppercase">{label}</div>
{#if color === 'neutral'}
- <Badge variant="secondary" class="rounded-md text-2xl font-semibold tabular-nums">
+ <Badge variant="secondary" class="rounded-md text-xl font-bold tabular-nums">
{value}
</Badge>
{:else}
- <Badge variant={outline ? 'outline' : undefined} class="{colors[color].badge} rounded-md text-lg">
+ <Badge variant={outline ? 'outline' : undefined} class="{colors[color].badge} rounded-md text-base font-bold">
{value}
</Badge>
{/if}
@@ -300,8 +298,8 @@
{#snippet infoRow(label: string, value: string | undefined | null, mono: boolean = true, truncate: boolean = false)}
<div class="flex items-center justify-between gap-4">
- <span class="text-muted-foreground shrink-0 text-xs">{label}</span>
- <span class="text-sm {mono ? 'font-mono' : ''} {truncate ? 'max-w-[200px] truncate' : ''}" title={value ?? ''}>
+ <span class="text-muted-foreground shrink-0 text-[10px] tracking-tight uppercase">{label}</span>
+ <span class="text-xs {mono ? 'font-mono' : ''} {truncate ? 'max-w-[180px] truncate' : ''}" title={value ?? ''}>
{value || '-'}
</span>
</div>
diff --git a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
index cc9d7ba6f..d647cd424 100644
--- a/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/environment-switcher-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Input } from '$lib/components/ui/input/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { environmentStore } from '$lib/stores/environment.store.svelte';
@@ -327,22 +327,20 @@
{#snippet footer()}
<div class="flex w-full items-center justify-between gap-2">
{#if isAdmin}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ icon={AddIcon}
+ customLabel={m.sidebar_manage_environments()}
onclick={() => {
closeDialog();
goto('/environments');
}}
- >
- <AddIcon class="size-4" />
- {m.sidebar_manage_environments()}
- </Button>
+ />
{:else}
<div></div>
{/if}
- <Button variant="outline" onclick={closeDialog}>
- {m.common_close()}
- </Button>
+ <ArcaneButton action="base" tone="outline" customLabel={m.common_close()} onclick={closeDialog} />
</div>
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/event-details-dialog.svelte b/frontend/src/lib/components/dialogs/event-details-dialog.svelte
index 719b3b5aa..14237ad62 100644
--- a/frontend/src/lib/components/dialogs/event-details-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/event-details-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Badge } from '$lib/components/ui/badge';
import { CopyButton } from '$lib/components/ui/copy-button';
import type { Event } from '$lib/types/event.type';
@@ -66,9 +66,7 @@
{/snippet}
{#snippet footer()}
- <Button variant="outline" onclick={handleClose}>
- {m.common_close()}
- </Button>
+ <ArcaneButton action="base" tone="outline" customLabel={m.common_close()} onclick={handleClose} />
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
index 874955195..417fa21ae 100644
--- a/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/first-login-password-dialog.svelte
@@ -2,7 +2,7 @@
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
import * as Alert from '$lib/components/ui/alert';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Label } from '$lib/components/ui/label';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { authService } from '$lib/services/auth-service';
@@ -172,13 +172,14 @@
{/snippet}
{#snippet footer()}
- <Button type="submit" onclick={handleSubmit} disabled={!isValid || isLoading}>
- {#if isLoading}
- <Spinner class="size-4" />
- {m.first_login_submitting()}
- {:else}
- {m.first_login_submit()}
- {/if}
- </Button>
+ <ArcaneButton
+ type="submit"
+ onclick={handleSubmit}
+ disabled={!isValid || isLoading}
+ loading={isLoading}
+ action="confirm"
+ customLabel={m.first_login_submit()}
+ loadingLabel={m.first_login_submitting()}
+ />
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte b/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
index 8a69d69ea..2759f6b64 100644
--- a/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/prune-confirmation-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Checkbox from '$lib/components/ui/checkbox/index.js';
import { Label } from '$lib/components/ui/label/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -125,20 +125,14 @@
{/snippet}
{#snippet footer()}
- <Button class="arcane-button-cancel" variant="outline" onclick={handleCancel} disabled={isPruning}>
- {m.common_cancel()}
- </Button>
- <Button
- class="arcane-button-remove"
- variant="destructive"
+ <ArcaneButton action="cancel" onclick={handleCancel} disabled={isPruning} />
+ <ArcaneButton
+ action="remove"
onclick={handleConfirm}
disabled={selectedTypes.length === 0 || isPruning}
- >
- {#if isPruning}
- <Spinner class="size-4" /> {m.common_action_pruning()}
- {:else}
- <TrashIcon class="size-4" /> {m.prune_button({ count: selectedTypes.length })}
- {/if}
- </Button>
+ loading={isPruning}
+ customLabel={m.prune_button({ count: selectedTypes.length })}
+ loadingLabel={m.common_action_pruning()}
+ />
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
index d18bf57a2..e8b0c68d0 100644
--- a/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/template-selection-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { ResponsiveDialog } from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Card } from '$lib/components/ui/card/index.js';
import { Badge } from '$lib/components/ui/badge/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -195,29 +195,27 @@
</div>
<div class="flex gap-2">
{#if template.isRemote}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="sm"
onclick={() => handleDownload(template)}
disabled={loadingStates.has(`download-${template.id}`)}
- >
- {#if loadingStates.has(`download-${template.id}`)}
- <Spinner class="size-3" />
- {m.common_action_downloading()}
- {:else}
- <DownloadIcon class="size-3" />
- {m.templates_download()}
- {/if}
- </Button>
+ loading={loadingStates.has(`download-${template.id}`)}
+ icon={DownloadIcon}
+ customLabel={m.templates_download()}
+ loadingLabel={m.common_action_downloading()}
+ />
{/if}
- <Button size="sm" onclick={() => handleSelect(template)} disabled={loadingStates.has(template.id)}>
- {#if loadingStates.has(template.id)}
- <Spinner class="size-3" />
- {m.common_loading()}
- {:else}
- {m.templates_use_now()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="base"
+ size="sm"
+ onclick={() => handleSelect(template)}
+ disabled={loadingStates.has(template.id)}
+ loading={loadingStates.has(template.id)}
+ customLabel={m.templates_use_now()}
+ loadingLabel={m.common_loading()}
+ />
</div>
</div>
</div>
@@ -305,7 +303,7 @@
{/snippet}
{#snippet footer()}
- <Button variant="outline" onclick={() => (open = false)}>{m.common_cancel()}</Button>
+ <ArcaneButton action="cancel" onclick={() => (open = false)} />
{/snippet}
</ResponsiveDialog>
diff --git a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
index 3006c3fea..bffb75007 100644
--- a/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/upgrade-confirmation-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Dialog from '$lib/components/ui/dialog';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import Spinner from '$lib/components/ui/spinner/spinner.svelte';
import * as m from '$lib/paraglide/messages';
import { onDestroy } from 'svelte';
@@ -176,9 +176,13 @@
</p>
</div>
<div class="flex justify-center">
- <Button onclick={reloadPage} variant="default" size="sm" class="w-full sm:w-auto">
- {m.upgrade_reload_now()}
- </Button>
+ <ArcaneButton
+ action="base"
+ onclick={reloadPage}
+ size="sm"
+ customLabel={m.upgrade_reload_now()}
+ class="w-full sm:w-auto"
+ />
</div>
{:else if upgradeStatus === 'waiting'}
<div class="rounded-lg border border-blue-200 bg-blue-50 p-3 dark:border-blue-800 dark:bg-blue-950/20">
@@ -215,12 +219,8 @@
</div>
<Dialog.Footer>
- <Button variant="outline" onclick={() => (open = false)}>
- {m.cancel()}
- </Button>
- <Button onclick={handleConfirm}>
- {m.upgrade_now()}
- </Button>
+ <ArcaneButton action="cancel" onclick={() => (open = false)} />
+ <ArcaneButton action="update" customLabel={m.upgrade_now()} onclick={handleConfirm} />
</Dialog.Footer>
{/if}
</Dialog.Content>
diff --git a/frontend/src/lib/components/dialogs/version-info-dialog.svelte b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
index c890a7b40..dc9a36ab7 100644
--- a/frontend/src/lib/components/dialogs/version-info-dialog.svelte
+++ b/frontend/src/lib/components/dialogs/version-info-dialog.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Dialog from '$lib/components/ui/dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Badge } from '$lib/components/ui/badge';
import type { AppVersionInformation } from '$lib/types/application-configuration';
import { m } from '$lib/paraglide/messages';
@@ -55,22 +55,31 @@
<Dialog.Footer class="flex-col gap-2 sm:flex-row">
{#if versionInfo.releaseUrl}
- <Button variant="outline" class="gap-2" onclick={() => window.open(versionInfo.releaseUrl, '_blank')}>
- <ExternalLinkIcon class="size-4" />
- {m.version_info_view_release()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ class="gap-2"
+ onclick={() => window.open(versionInfo.releaseUrl, '_blank')}
+ icon={ExternalLinkIcon}
+ customLabel={m.version_info_view_release()}
+ />
{/if}
- <Button variant="outline" size="icon" onclick={() => window.open('https://getarcane.app', '_blank')} title="Documentation">
- <BookOpenIcon class="size-4" />
- </Button>
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="icon"
+ onclick={() => window.open('https://getarcane.app', '_blank')}
+ title="Documentation"
+ icon={BookOpenIcon}
+ />
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="icon"
onclick={() => window.open('https://github.com/getarcaneapp/arcane', '_blank')}
title="GitHub"
- >
- <GithubIcon class="size-4" />
- </Button>
+ icon={GithubIcon}
+ />
</Dialog.Footer>
</Dialog.Content>
</Dialog.Root>
diff --git a/frontend/src/lib/components/disk-meter.svelte b/frontend/src/lib/components/disk-meter.svelte
index 8ca85b6a7..9d80d0b17 100644
--- a/frontend/src/lib/components/disk-meter.svelte
+++ b/frontend/src/lib/components/disk-meter.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import * as Popover from '$lib/components/ui/popover';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
import { Progress } from '$lib/components/ui/progress/index.js';
@@ -85,9 +85,14 @@
<Popover.Root bind:open={popoverOpen}>
<Popover.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="hover:bg-muted h-7 w-7 shrink-0">
- <SettingsIcon class="size-4" />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ icon={SettingsIcon}
+ class="hover:bg-muted size-7 shrink-0"
+ />
{/snippet}
</Popover.Trigger>
<Popover.Content class="w-80">
@@ -101,20 +106,16 @@
<Input id="disk-path" placeholder="data/projects" bind:value={diskUsagePath} disabled={isSaving} />
</div>
<div class="flex justify-end gap-2">
- <Button
- variant="outline"
+ <ArcaneButton
+ action="cancel"
size="sm"
onclick={() => {
diskUsagePath = $settingsStore.diskUsagePath || 'data/projects';
popoverOpen = false;
}}
disabled={isSaving}
- >
- Cancel
- </Button>
- <Button size="sm" onclick={saveDiskUsagePath} disabled={isSaving}>
- {isSaving ? m.common_saving() : m.common_save()}
- </Button>
+ />
+ <ArcaneButton action="save" size="sm" onclick={saveDiskUsagePath} disabled={isSaving} loading={isSaving} />
</div>
</div>
</Popover.Content>
diff --git a/frontend/src/lib/components/docker-overview.svelte b/frontend/src/lib/components/docker-overview.svelte
index ec6bda28d..cd31a325f 100644
--- a/frontend/src/lib/components/docker-overview.svelte
+++ b/frontend/src/lib/components/docker-overview.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Skeleton } from '$lib/components/ui/skeleton';
import DockerInfoDialog from '$lib/components/dialogs/docker-info-dialog.svelte';
import type { DockerInfo } from '$lib/types/docker-info.type';
@@ -67,14 +67,14 @@
</div>
{#if dockerInfo}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
+ icon={InfoIcon}
class="text-muted-foreground hover:text-foreground size-8 shrink-0"
onclick={() => (dockerInfoDialogOpen = true)}
- >
- <InfoIcon class="size-4" />
- </Button>
+ />
{/if}
{/if}
{/snippet}
diff --git a/frontend/src/lib/components/dropdown-card.svelte b/frontend/src/lib/components/dropdown-card.svelte
index e86b4edfe..b04eb397d 100644
--- a/frontend/src/lib/components/dropdown-card.svelte
+++ b/frontend/src/lib/components/dropdown-card.svelte
@@ -2,9 +2,9 @@
import { cn } from '$lib/utils';
import { onMount, type Snippet } from 'svelte';
import { slide } from 'svelte/transition';
- import { Button } from './ui/button';
import * as Card from './ui/card';
import { ArrowDownIcon } from '$lib/icons';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
let {
id,
@@ -91,15 +91,15 @@
{/if}
</div>
<Card.Action class="ml-auto">
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
- class="h-8 w-8"
- aria-label={expanded ? 'Collapse section' : 'Expand section'}
+ icon={ArrowDownIcon}
+ class={cn('[&_svg]:size-5 [&_svg]:transition-transform [&_svg]:duration-200', expanded && '[&_svg]:rotate-180')}
onclick={() => toggleExpanded()}
- >
- <ArrowDownIcon class={cn('size-5 transition-transform duration-200', expanded && 'rotate-180')} />
- </Button>
+ aria-label={expanded ? 'Collapse section' : 'Expand section'}
+ />
</Card.Action>
</Card.Header>
{#if expanded}
diff --git a/frontend/src/lib/components/error.svelte b/frontend/src/lib/components/error.svelte
index b15bab5cf..b6c8b1770 100644
--- a/frontend/src/lib/components/error.svelte
+++ b/frontend/src/lib/components/error.svelte
@@ -1,8 +1,9 @@
<script lang="ts">
import * as Empty from '$lib/components/ui/empty/index.js';
- import { Button } from '$lib/components/ui/button';
import { m } from '$lib/paraglide/messages';
import { ErrorNotFoundIcon } from '$lib/icons';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import { goto } from '$app/navigation';
let {
message,
@@ -33,7 +34,7 @@
<Empty.Content>
{#if showButton}
<Empty.Content>
- <Button href={actionHref}>{actionLabel}</Button>
+ <ArcaneButton action="base" customLabel={actionLabel} onclick={() => goto(actionHref)} />
</Empty.Content>
{/if}
</Empty.Content>
diff --git a/frontend/src/lib/components/form/date-picker.svelte b/frontend/src/lib/components/form/date-picker.svelte
index dfd03af6f..0e984a3d9 100644
--- a/frontend/src/lib/components/form/date-picker.svelte
+++ b/frontend/src/lib/components/form/date-picker.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Calendar } from '$lib/components/ui/calendar';
import * as Popover from '$lib/components/ui/popover';
import { m } from '$lib/paraglide/messages';
@@ -63,15 +63,15 @@
<Popover.Root bind:open>
<Popover.Trigger {id} class="w-full">
{#snippet child({ props })}
- <Button
+ <ArcaneButton
{...props}
- variant="outline"
+ action="base"
+ tone="outline"
class={cn('w-full justify-start text-left font-normal', !value && 'text-muted-foreground')}
aria-label={m.select_a_date()}
- >
- <CalendarIcon class="mr-2 size-4" />
- {calendarDisplayDate ? df.format(calendarDisplayDate.toDate(getLocalTimeZone())) : m.select_a_date()}
- </Button>
+ icon={CalendarIcon}
+ customLabel={calendarDisplayDate ? df.format(calendarDisplayDate.toDate(getLocalTimeZone())) : m.select_a_date()}
+ />
{/snippet}
</Popover.Trigger>
<Popover.Content class="w-auto p-0" align="start">
diff --git a/frontend/src/lib/components/form/url-input.svelte b/frontend/src/lib/components/form/url-input.svelte
index 812c4ed6b..e83564525 100644
--- a/frontend/src/lib/components/form/url-input.svelte
+++ b/frontend/src/lib/components/form/url-input.svelte
@@ -3,7 +3,7 @@
import * as ButtonGroup from '$lib/components/ui/button-group/index.js';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
import { Label } from '$lib/components/ui/label/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { ArrowDownIcon } from '$lib/icons';
type Props = {
@@ -44,10 +44,15 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="secondary" class="w-[5.5rem] shrink-0 justify-between gap-1 text-sm" {disabled}>
- {protocol}://
- <ArrowDownIcon class="size-3 opacity-50" />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="outline"
+ class="w-[5.5rem] shrink-0 justify-between gap-1 text-sm"
+ {disabled}
+ customLabel="{protocol}://"
+ icon={ArrowDownIcon}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="center" class="min-w-0">
diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelte
index 9ddb9f1a3..1bdcbeff2 100644
--- a/frontend/src/lib/components/logs/log-controls.svelte
+++ b/frontend/src/lib/components/logs/log-controls.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Select from '$lib/components/ui/select';
import { m } from '$lib/paraglide/messages';
import { PersistedState } from 'runed';
@@ -84,27 +84,28 @@
</Select.Root>
<div class="flex items-center gap-2">
- <Button variant="outline" size="sm" class="text-xs font-medium" onclick={onClear}>
- {m.common_clear()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ class="text-xs font-medium"
+ onclick={onClear}
+ customLabel={m.common_clear()}
+ />
{#if isStreaming}
- <Button variant="outline" size="sm" class="text-xs font-medium" onclick={onStop}>
- {m.common_stop()}
- </Button>
+ <ArcaneButton action="stop" tone="outline" size="sm" class="text-xs font-medium" onclick={onStop} />
{:else}
- <Button variant="outline" size="sm" class="text-xs font-medium" onclick={onStart} {disabled}>
- {m.common_start()}
- </Button>
+ <ArcaneButton action="start" tone="outline" size="sm" class="text-xs font-medium" onclick={onStart} {disabled} />
{/if}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="refresh"
+ tone="outline"
size="sm"
class="px-2"
onclick={onRefresh}
aria-label={m.log_refresh_aria_label()}
title={m.common_refresh()}
- >
- <RefreshIcon class="size-4" />
- </Button>
+ showLabel={false}
+ />
</div>
</div>
diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-item.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-item.svelte
index f68fd9785..012617a1f 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-nav-item.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-item.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import type { NavigationItem } from '$lib/config/navigation-config';
import { cn } from '$lib/utils';
- import * as Button from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
let {
item,
@@ -16,8 +16,9 @@
} = $props();
</script>
-<Button.Root
- variant="ghost"
+<ArcaneButton
+ action="base"
+ tone="ghost"
size={showLabels ? 'sm' : 'icon'}
href={item.url}
aria-label={`${item.title}${active ? ' (current page)' : ''}`}
@@ -41,4 +42,4 @@
{:else}
<span class="sr-only">{item.title}</span>
{/if}
-</Button.Root>
+</ArcaneButton>
diff --git a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
index e7e8e86f6..d69882864 100644
--- a/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
+++ b/frontend/src/lib/components/mobile-nav/mobile-user-card.svelte
@@ -7,7 +7,7 @@
import LocalePicker from '$lib/components/locale-picker.svelte';
import EnvironmentSwitcherDialog from '$lib/components/dialogs/environment-switcher-dialog.svelte';
import settingsStore from '$lib/stores/config-store';
- import * as Button from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import {
ArrowDownIcon,
MoonIcon,
@@ -69,8 +69,9 @@
<ArrowDownIcon class="size-8" />
</div>
<form action="/logout" method="POST">
- <Button.Root
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
type="submit"
title={m.common_logout()}
@@ -78,7 +79,7 @@
onclick={(e) => e.stopPropagation()}
>
<LogoutIcon class="size-5" />
- </Button.Root>
+ </ArcaneButton>
</form>
</div>
</button>
diff --git a/frontend/src/lib/components/navigation-mode-setting-control.svelte b/frontend/src/lib/components/navigation-mode-setting-control.svelte
index 92147f7ab..3b5f2c1ee 100644
--- a/frontend/src/lib/components/navigation-mode-setting-control.svelte
+++ b/frontend/src/lib/components/navigation-mode-setting-control.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { m } from '$lib/paraglide/messages';
import { CloseIcon, EnvironmentsIcon, SmartphoneIcon, MonitorSpeakerIcon, DockIcon, type IconType } from '$lib/icons';
@@ -35,15 +35,16 @@
<div class="min-w-0 flex-1">
<div class="mb-1 flex items-start justify-between gap-2">
{#if hasOverride}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
onclick={onClearOverride}
class="h-6 w-6 flex-shrink-0 p-0 text-orange-600 hover:text-orange-700 dark:text-orange-400 dark:hover:text-orange-300"
title={m.clear_local_override()}
>
<CloseIcon class="size-3" />
- </Button>
+ </ArcaneButton>
{/if}
</div>
<p class="text-muted-foreground text-xs leading-relaxed">{description}</p>
@@ -62,8 +63,9 @@
</div>
<div class="flex flex-shrink-0 gap-1">
- <Button
- variant={serverValue === 'floating' ? 'default' : 'outline'}
+ <ArcaneButton
+ action="base"
+ tone={serverValue === 'floating' ? 'outline-primary' : 'outline'}
size="sm"
onclick={() => !serverDisabled && onServerChange('floating')}
disabled={serverDisabled}
@@ -71,9 +73,10 @@
>
<MonitorSpeakerIcon class="size-3" />
<span class="hidden sm:inline">{m.navigation_mode_floating()}</span>
- </Button>
- <Button
- variant={serverValue === 'docked' ? 'default' : 'outline'}
+ </ArcaneButton>
+ <ArcaneButton
+ action="base"
+ tone={serverValue === 'docked' ? 'outline-primary' : 'outline'}
size="sm"
onclick={() => !serverDisabled && onServerChange('docked')}
disabled={serverDisabled}
@@ -81,7 +84,7 @@
>
<DockIcon class="size-3" />
<span class="hidden sm:inline">{m.navigation_mode_docked()}</span>
- </Button>
+ </ArcaneButton>
</div>
</div>
</div>
@@ -107,24 +110,26 @@
{#if hasOverride}
<div class="flex flex-shrink-0 gap-1">
- <Button
- variant={localOverride === 'floating' ? 'default' : 'outline'}
+ <ArcaneButton
+ action="base"
+ tone={localOverride === 'floating' ? 'outline-primary' : 'outline'}
size="sm"
onclick={() => onLocalOverride('floating')}
class="flex h-7 min-w-[2.5rem] items-center gap-1 px-2 text-xs sm:h-8 sm:px-3"
>
<MonitorSpeakerIcon class="size-3" />
<span class="hidden sm:inline">{m.navigation_mode_floating()}</span>
- </Button>
- <Button
- variant={localOverride === 'docked' ? 'default' : 'outline'}
+ </ArcaneButton>
+ <ArcaneButton
+ action="base"
+ tone={localOverride === 'docked' ? 'outline-primary' : 'outline'}
size="sm"
onclick={() => onLocalOverride('docked')}
class="flex h-7 min-w-[2.5rem] items-center gap-1 px-2 text-xs sm:h-8 sm:px-3"
>
<DockIcon class="size-3" />
<span class="hidden sm:inline">{m.navigation_mode_docked()}</span>
- </Button>
+ </ArcaneButton>
</div>
{:else}
<div class="flex flex-shrink-0 items-center gap-2">
@@ -137,14 +142,15 @@
{m.navigation_mode_docked()}
{/if}
</span>
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="sm"
onclick={() => onLocalOverride(effectiveValue === 'floating' ? 'docked' : 'floating')}
class="h-6 px-2 text-xs sm:h-7"
>
{m.override()}
- </Button>
+ </ArcaneButton>
</div>
{/if}
</div>
diff --git a/frontend/src/lib/components/navigation-setting-control.svelte b/frontend/src/lib/components/navigation-setting-control.svelte
index 6adc445d8..5ce65c1ed 100644
--- a/frontend/src/lib/components/navigation-setting-control.svelte
+++ b/frontend/src/lib/components/navigation-setting-control.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Switch } from '$lib/components/ui/switch/index.js';
import { m } from '$lib/paraglide/messages';
import { CloseIcon, EnvironmentsIcon, SmartphoneIcon, type IconType } from '$lib/icons';
@@ -36,15 +36,15 @@
<div class="min-w-0 flex-1">
<div class="mb-1 flex items-start justify-between gap-2">
{#if hasOverride}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
+ icon={CloseIcon}
onclick={onClearOverride}
class="h-6 w-6 flex-shrink-0 p-0 text-orange-600 hover:text-orange-700 dark:text-orange-400 dark:hover:text-orange-300"
title={m.clear_local_override()}
- >
- <CloseIcon class="size-3" />
- </Button>
+ />
{/if}
</div>
<p class="text-muted-foreground text-xs leading-relaxed">{description}</p>
@@ -105,14 +105,13 @@
<span class="text-muted-foreground hidden text-xs font-medium sm:inline">
{effectiveValue ? m.on() : m.off()}
</span>
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
size="sm"
+ customLabel={m.override()}
onclick={() => onLocalOverride(!effectiveValue)}
class="h-6 px-2 text-xs sm:h-7"
- >
- {m.override()}
- </Button>
+ />
</div>
{/if}
</div>
diff --git a/frontend/src/lib/components/progress-popover.svelte b/frontend/src/lib/components/progress-popover.svelte
index f306adb71..83b00781a 100644
--- a/frontend/src/lib/components/progress-popover.svelte
+++ b/frontend/src/lib/components/progress-popover.svelte
@@ -5,7 +5,7 @@
import { Progress } from '$lib/components/ui/progress/index.js';
import * as Item from '$lib/components/ui/item/index.js';
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import type { Snippet } from 'svelte';
import { m } from '$lib/paraglide/messages';
import {
@@ -159,9 +159,7 @@
</Item.Content>
{#if loading && onCancel}
<Item.Actions>
- <Button variant="outline" size="sm" onclick={onCancel}>
- {m.common_cancel()}
- </Button>
+ <ArcaneButton action="cancel" size="sm" onclick={onCancel} />
</Item.Actions>
{/if}
{#if !error}
diff --git a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
index ff3bfc4f0..fbaba723c 100644
--- a/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/add-template-registry-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -104,21 +104,23 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
disabled={isLoading}
- >
- {m.common_cancel()}
- </Button>
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="size-4" />
- {/if}
- {m.templates_add_registry_button()}
- </Button>
+ />
+ <ArcaneButton
+ action="create"
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={m.templates_add_registry_button()}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/api-key-form-sheet.svelte b/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
index e61b26233..ea8f58bba 100644
--- a/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/api-key-form-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import type { ApiKey } from '$lib/types/api-key.type';
@@ -97,20 +97,23 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- <SubmitIcon class="mr-2 size-4" />
- {isEditMode ? m.api_key_save_changes() : m.api_key_create_button()}
- </Button>
+ disabled={isLoading}
+ />
+ <ArcaneButton
+ action={isEditMode ? 'save' : 'create'}
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={isEditMode ? m.api_key_save_changes() : m.api_key_create_button()}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/container-registry-sheet.svelte b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
index f015fcf10..099af3e4b 100644
--- a/frontend/src/lib/components/sheets/container-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -109,22 +109,24 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
disabled={isLoading}
- >
- {m.common_cancel()}
- </Button>
+ />
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- {isEditMode ? m.registries_save_changes() : m.common_add_button({ resource: m.resource_registry_cap() })}
- </Button>
+ <ArcaneButton
+ action={isEditMode ? 'save' : 'create'}
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={isEditMode ? m.registries_save_changes() : m.common_add_button({ resource: m.resource_registry_cap() })}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/create-network-sheet.svelte b/frontend/src/lib/components/sheets/create-network-sheet.svelte
index 4b7429eee..56bf60a1c 100644
--- a/frontend/src/lib/components/sheets/create-network-sheet.svelte
+++ b/frontend/src/lib/components/sheets/create-network-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Accordion from '$lib/components/ui/accordion/index.js';
import { Checkbox } from '$lib/components/ui/checkbox/index.js';
import { Label } from '$lib/components/ui/label/index.js';
@@ -214,22 +214,26 @@
<div class="flex items-center gap-2">
<Input type="text" placeholder="Key" bind:value={label.key} disabled={isLoading} class="flex-1" />
<Input type="text" placeholder="Value" bind:value={label.value} disabled={isLoading} class="flex-1" />
- <Button
- type="button"
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
onclick={() => removeLabel(index)}
disabled={isLoading || labels.length <= 1}
class="text-destructive hover:text-destructive"
title={m.common_remove()}
- >
- <CloseIcon class="size-4" />
- </Button>
+ icon={CloseIcon}
+ />
</div>
{/each}
- <Button type="button" variant="outline" size="sm" onclick={addLabel} disabled={isLoading}
- >{m.add_label_button()}</Button
- >
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ onclick={addLabel}
+ disabled={isLoading}
+ customLabel={m.add_label_button()}
+ />
</div>
<div class="space-y-2">
@@ -325,21 +329,23 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {:else}
- <AddIcon class="mr-2 size-4" />
- {/if}
- {isLoading ? m.common_action_creating() : m.common_create_button({ resource: m.resource_network_cap() })}
- </Button>
+ disabled={isLoading}
+ />
+ <ArcaneButton
+ action="create"
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={m.common_create_button({ resource: m.resource_network_cap() })}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/create-volume-sheet.svelte b/frontend/src/lib/components/sheets/create-volume-sheet.svelte
index 8ec6c4afb..ab860997f 100644
--- a/frontend/src/lib/components/sheets/create-volume-sheet.svelte
+++ b/frontend/src/lib/components/sheets/create-volume-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import * as Accordion from '$lib/components/ui/accordion/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -154,20 +154,23 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- <AddIcon class="mr-2 size-4" />
- {isLoading ? m.common_action_creating() : m.common_create_button({ resource: m.resource_volume_cap() })}
- </Button>
+ disabled={isLoading}
+ />
+ <ArcaneButton
+ action="create"
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={m.common_create_button({ resource: m.resource_volume_cap() })}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sheets/image-pull-sheet.svelte b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
index 63faebcd3..6879a9c8f 100644
--- a/frontend/src/lib/components/sheets/image-pull-sheet.svelte
+++ b/frontend/src/lib/components/sheets/image-pull-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import { Progress } from '$lib/components/ui/progress/index.js';
import * as Collapsible from '$lib/components/ui/collapsible/index.js';
@@ -336,22 +336,20 @@
{#snippet footer()}
{#if pullError}
<div class="flex w-full flex-row gap-2">
- <Button type="button" class="flex-1" variant="outline" onclick={() => resetState()}>
- {m.common_retry()}
- </Button>
- <Button type="button" class="flex-1" onclick={() => (open = false)}>
- {m.common_close()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ type="button"
+ class="flex-1"
+ onclick={() => resetState()}
+ customLabel={m.common_retry()}
+ />
+ <ArcaneButton action="base" type="button" class="flex-1" onclick={() => (open = false)} customLabel={m.common_close()} />
</div>
{:else if !showPullUI}
<div class="flex w-full flex-row gap-2">
- <Button type="button" class="arcane-button-cancel flex-1" variant="outline" onclick={() => (open = false)}>
- {m.common_cancel()}
- </Button>
- <Button type="submit" class="arcane-button-create flex-1" onclick={handleSubmit}>
- <DownloadIcon class="mr-2 size-4" />
- {m.images_pull_image()}
- </Button>
+ <ArcaneButton action="cancel" tone="outline" type="button" class="flex-1" onclick={() => (open = false)} />
+ <ArcaneButton action="pull" type="submit" class="flex-1" onclick={handleSubmit} />
</div>
{/if}
{/snippet}
diff --git a/frontend/src/lib/components/sheets/new-environment-sheet.svelte b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
index 1a5c8c23f..c9d377700 100644
--- a/frontend/src/lib/components/sheets/new-environment-sheet.svelte
+++ b/frontend/src/lib/components/sheets/new-environment-sheet.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { toast } from 'svelte-sonner';
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import UrlInput from '$lib/components/form/url-input.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -164,7 +164,7 @@
</div>
{/if}
- <Button class="w-full" onclick={handleDone}>{m.common_done()}</Button>
+ <ArcaneButton action="base" class="w-full" onclick={handleDone} customLabel={m.common_done()} />
</div>
{:else}
<form onsubmit={preventDefault(handleNewAgentSubmit)} class="space-y-4">
@@ -182,12 +182,14 @@
error={$newAgentInputs.apiUrl.error ?? undefined}
/>
- <Button type="submit" class="w-full" disabled={isSubmittingNewAgent}>
- {#if isSubmittingNewAgent}
- <Spinner class="mr-2 size-4" />
- {/if}
- {m.environments_generate_config()}
- </Button>
+ <ArcaneButton
+ action="confirm"
+ type="submit"
+ class="w-full"
+ disabled={isSubmittingNewAgent}
+ loading={isSubmittingNewAgent}
+ customLabel={m.environments_generate_config()}
+ />
</form>
{/if}
</div>
diff --git a/frontend/src/lib/components/sheets/user-form-sheet.svelte b/frontend/src/lib/components/sheets/user-form-sheet.svelte
index 2a345d751..8455facb4 100644
--- a/frontend/src/lib/components/sheets/user-form-sheet.svelte
+++ b/frontend/src/lib/components/sheets/user-form-sheet.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import FormInput from '$lib/components/form/form-input.svelte';
import SwitchWithLabel from '$lib/components/form/labeled-switch.svelte';
import { Spinner } from '$lib/components/ui/spinner/index.js';
@@ -151,20 +151,23 @@
{#snippet footer()}
<div class="flex w-full flex-row gap-2">
- <Button
+ <ArcaneButton
+ action="cancel"
+ tone="outline"
type="button"
- class="arcane-button-cancel flex-1"
- variant="outline"
+ class="flex-1"
onclick={() => (open = false)}
- disabled={isLoading}>{m.common_cancel()}</Button
- >
- <Button type="submit" class="arcane-button-create flex-1" disabled={isLoading} onclick={handleSubmit}>
- {#if isLoading}
- <Spinner class="mr-2 size-4" />
- {/if}
- <SubmitIcon class="mr-2 size-4" />
- {isEditMode ? m.users_save_changes() : m.common_create_button({ resource: m.resource_user_cap() })}
- </Button>
+ disabled={isLoading}
+ />
+ <ArcaneButton
+ action={isEditMode ? 'save' : 'create'}
+ type="submit"
+ class="flex-1"
+ disabled={isLoading}
+ loading={isLoading}
+ onclick={handleSubmit}
+ customLabel={isEditMode ? m.users_save_changes() : m.common_create_button({ resource: m.resource_user_cap() })}
+ />
</div>
{/snippet}
</ResponsiveDialog.Root>
diff --git a/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
index 20ec503d1..d207b0a01 100644
--- a/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-pin-button.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { cn } from '$lib/utils.js';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
import { PinOnIcon, PinOffIcon } from '$lib/icons';
@@ -18,11 +18,12 @@
const isPinned = $derived(sidebar.isPinned);
</script>
-<Button
+<ArcaneButton
bind:ref
data-sidebar="pin-button"
data-slot="sidebar-pin-button"
- variant="ghost"
+ action="base"
+ tone="ghost"
size="icon"
class={cn('text-muted-foreground hover:text-foreground size-7', className)}
type="button"
@@ -49,4 +50,4 @@
<PinOffIcon />
<span class="sr-only">Pin sidebar</span>
{/if}
-</Button>
+</ArcaneButton>
diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
index 9f08d914c..e7912d9e3 100644
--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte
@@ -6,7 +6,7 @@
import type { AppVersionInformation } from '$lib/types/application-configuration';
import type { User } from '$lib/types/user.type';
import { m } from '$lib/paraglide/messages';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import systemUpgradeService from '$lib/services/api/system-upgrade-service';
import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';
import { toast } from 'svelte-sonner';
@@ -135,16 +135,15 @@
{/snippet}
{#snippet upgradeButton()}
- <Button
- variant="default"
+ <ArcaneButton
+ action="update"
size="sm"
- class="bg-primary text-primary-foreground hover:bg-primary/90 focus-visible:ring-primary/40 h-9 w-full gap-2 rounded-xl shadow-sm transition-colors focus-visible:ring-2 focus-visible:outline-none"
+ class="h-9 w-full gap-2 rounded-xl shadow-sm transition-colors"
onclick={handleUpgradeClick}
disabled={upgrading || checkingUpgrade}
- >
- <DownloadIcon class="size-4" />
- {upgradeButtonText}
- </Button>
+ customLabel={upgradeButtonText}
+ icon={DownloadIcon}
+ />
{/snippet}
<UpgradeConfirmationDialog
diff --git a/frontend/src/lib/components/sidebar/sidebar-user.svelte b/frontend/src/lib/components/sidebar/sidebar-user.svelte
index 9c8734bd1..496afcee5 100644
--- a/frontend/src/lib/components/sidebar/sidebar-user.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar-user.svelte
@@ -2,7 +2,7 @@
import * as Avatar from '$lib/components/ui/avatar/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import * as Sidebar from '$lib/components/ui/sidebar/index.js';
- import * as Button from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { useSidebar } from '$lib/components/ui/sidebar/index.js';
import type { User } from '$lib/types/user.type';
import { mode, toggleMode } from 'mode-watcher';
@@ -78,7 +78,8 @@
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content
- class="border-border/20 min-w-56 rounded-2xl border p-0 shadow-lg backdrop-blur-(--glass-blur-popup) backdrop-saturate-150"
+ class="border-border/20 min-w-56 rounded-2xl border p-0 shadow-lg backdrop-blur-2xl
+ backdrop-saturate-150"
side="right"
align="end"
sideOffset={12}
@@ -136,8 +137,9 @@
/>
<DropdownMenu.Group class="px-3 pb-2">
- <Button.Root
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
class={cn(
'text-muted-foreground flex w-full items-center rounded-xl text-sm font-medium transition-all duration-200 hover:bg-linear-to-br',
'h-11 justify-start gap-3 px-3 py-2.5'
@@ -153,7 +155,7 @@
{/if}
</div>
<span class="font-medium">{m.common_toggle_theme()}</span>
- </Button.Root>
+ </ArcaneButton>
</DropdownMenu.Group>
</div>
</DropdownMenu.Content>
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index 5e52c3c49..3d30c6504 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -17,7 +17,7 @@
import SidebarPinButton from './sidebar-pin-button.svelte';
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
- import * as Button from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import VersionInfoDialog from '$lib/components/dialogs/version-info-dialog.svelte';
import { LogoutIcon } from '$lib/icons';
@@ -117,14 +117,16 @@
<div class="flex items-center gap-2">
<SidebarUser {isCollapsed} user={effectiveUser} />
<form action="/logout" method="POST" class="ml-auto">
- <Button.Root
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
title={m.common_logout()}
type="submit"
class="text-muted-foreground hover:text-destructive hover:bg-destructive/10 h-9 w-9 rounded-xl p-0"
- >
- <LogoutIcon class="size-5" />
- </Button.Root>
+ icon={LogoutIcon}
+ showLabel={false}
+ customLabel={m.common_logout()}
+ />
</form>
</div>
</div>
diff --git a/frontend/src/lib/components/stat-card.svelte b/frontend/src/lib/components/stat-card.svelte
index ac3fdc7ba..20bb7bec2 100644
--- a/frontend/src/lib/components/stat-card.svelte
+++ b/frontend/src/lib/components/stat-card.svelte
@@ -11,6 +11,7 @@
bgColor?: string;
subtitle?: string;
class?: ClassValue;
+ variant?: 'default' | 'mini';
}
let {
@@ -20,42 +21,57 @@
iconColor = 'text-primary',
bgColor = 'bg-primary/10',
subtitle,
- class: className
+ class: className,
+ variant = 'default'
}: Props = $props();
</script>
-<div
- class={cn(
- 'bg-card group relative overflow-hidden rounded-2xl border p-6 transition-all duration-300 hover:-translate-y-1 hover:shadow-lg',
- iconColor,
- className
- )}
- style="--stat-hover-tint: currentColor;"
->
- <div
- class="pointer-events-none absolute inset-0 bg-gradient-to-br from-[var(--stat-hover-tint)]/5 via-transparent to-transparent opacity-0 transition-opacity duration-500 group-hover:opacity-100"
- ></div>
-
- <div class="relative flex items-start justify-between">
- <div class="space-y-2">
- <p class="text-muted-foreground text-sm font-medium tracking-wide">
- {title}
- </p>
- <h3 class="text-3xl font-bold tracking-tight tabular-nums">
+{#if variant === 'mini'}
+ <div class={cn('flex items-center gap-1.5 px-1', className)}>
+ <Icon class={cn('size-3.5 opacity-80', iconColor)} />
+ <div class="flex items-baseline gap-1">
+ <span class="text-sm leading-none font-bold tabular-nums">
{value}
- </h3>
- {#if subtitle}
- <p class="text-muted-foreground text-xs">{subtitle}</p>
- {/if}
+ </span>
+ <span class="text-muted-foreground text-[10px] leading-none font-medium tracking-wider uppercase">
+ {title}
+ </span>
</div>
-
+ </div>
+{:else}
+ <div
+ class={cn(
+ 'bg-card group relative overflow-hidden rounded-2xl border p-6 transition-all duration-300 hover:-translate-y-1 hover:shadow-lg',
+ iconColor,
+ className
+ )}
+ style="--stat-hover-tint: currentColor;"
+ >
<div
- class={cn(
- 'flex size-10 items-center justify-center rounded-full transition-colors duration-300',
- 'bg-transparent group-hover:bg-[var(--stat-hover-tint)]/10'
- )}
- >
- <Icon class={cn('size-6 transition-transform duration-300 group-hover:scale-110', iconColor)} />
+ class="pointer-events-none absolute inset-0 bg-gradient-to-br from-[var(--stat-hover-tint)]/5 via-transparent to-transparent opacity-0 transition-opacity duration-500 group-hover:opacity-100"
+ ></div>
+
+ <div class="relative flex items-start justify-between">
+ <div class="space-y-2">
+ <p class="text-muted-foreground text-sm font-medium tracking-wide">
+ {title}
+ </p>
+ <h3 class="text-3xl font-bold tracking-tight tabular-nums">
+ {value}
+ </h3>
+ {#if subtitle}
+ <p class="text-muted-foreground text-xs">{subtitle}</p>
+ {/if}
+ </div>
+
+ <div
+ class={cn(
+ 'flex size-10 items-center justify-center rounded-full transition-colors duration-300',
+ 'bg-transparent group-hover:bg-[var(--stat-hover-tint)]/10'
+ )}
+ >
+ <Icon class={cn('size-6 transition-transform duration-300 group-hover:scale-110', iconColor)} />
+ </div>
</div>
</div>
-</div>
+{/if}
diff --git a/frontend/src/lib/components/terminal/terminal-controls.svelte b/frontend/src/lib/components/terminal/terminal-controls.svelte
index ba7346358..683138bf7 100644
--- a/frontend/src/lib/components/terminal/terminal-controls.svelte
+++ b/frontend/src/lib/components/terminal/terminal-controls.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Select from '$lib/components/ui/select/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Input } from '$lib/components/ui/input/index.js';
import { m } from '$lib/paraglide/messages';
import { RefreshIcon } from '$lib/icons';
@@ -103,12 +103,16 @@
}
}}
/>
- <Button size="sm" variant="outline" onclick={handleCustomShellSubmit} class="h-8">
- {m.apply()}
- </Button>
+ <ArcaneButton action="base" size="sm" tone="outline" onclick={handleCustomShellSubmit} class="h-8" customLabel={m.apply()} />
{/if}
- <Button size="icon" variant="ghost" onclick={onReconnect} class="size-8" title="Reconnect shell">
- <RefreshIcon class="size-4" />
- </Button>
+ <ArcaneButton
+ action="refresh"
+ size="icon"
+ tone="ghost"
+ onclick={onReconnect}
+ class="size-8"
+ title="Reconnect shell"
+ showLabel={false}
+ />
</div>
diff --git a/frontend/src/lib/components/ui/badge/badge.svelte b/frontend/src/lib/components/ui/badge/badge.svelte
index f77438cac..265ca26c7 100644
--- a/frontend/src/lib/components/ui/badge/badge.svelte
+++ b/frontend/src/lib/components/ui/badge/badge.svelte
@@ -5,21 +5,26 @@
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',
variants: {
variant: {
- default: 'bubble-pill bg-primary text-primary-foreground [a&]:hover:bg-primary/90 [a&]:hover-lift border-transparent',
- secondary:
- 'bubble-pill bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90 [a&]:hover-lift border-transparent',
+ 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',
destructive:
- 'bubble-pill bg-destructive [a&]:hover:bg-destructive/90 [a&]:hover-lift focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/70 border-transparent text-white',
+ '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',
outline:
- 'backdrop-blur-sm bg-card/60 text-foreground [a&]:hover:backdrop-blur-sm [a&]:hover:bg-card/90 [a&]:hover:text-accent-foreground [a&]:hover-lift'
+ 'backdrop-blur-sm bg-card/60 text-foreground [a&]:hover:backdrop-blur-sm [a&]:hover:bg-card/90 [a&]:hover:text-accent-foreground'
+ },
+ hoverEffect: {
+ none: '',
+ lift: '[a&]:hover-lift'
}
},
defaultVariants: {
- variant: 'default'
+ variant: 'default',
+ hoverEffect: 'lift'
}
});
export type BadgeVariant = VariantProps<typeof badgeVariants>['variant'];
+ export type BadgeHoverEffect = VariantProps<typeof badgeVariants>['hoverEffect'];
</script>
<script lang="ts">
@@ -31,10 +36,12 @@
href,
class: className,
variant = 'default',
+ hoverEffect = 'lift',
children,
...restProps
}: WithElementRef<HTMLAnchorAttributes> & {
variant?: BadgeVariant;
+ hoverEffect?: BadgeHoverEffect;
} = $props();
</script>
@@ -43,7 +50,7 @@
bind:this={ref}
data-slot="badge"
{href}
- class={cn(badgeVariants({ variant }), className)}
+ class={cn(badgeVariants({ variant, hoverEffect }), className)}
{...restProps}
>
{@render children?.()}
diff --git a/frontend/src/lib/components/ui/button/button.svelte b/frontend/src/lib/components/ui/button/button.svelte
index 345438257..a7b335e62 100644
--- a/frontend/src/lib/components/ui/button/button.svelte
+++ b/frontend/src/lib/components/ui/button/button.svelte
@@ -8,12 +8,11 @@
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 shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
variants: {
variant: {
- default: 'bg-primary text-primary-foreground bubble-shadow hover:bg-primary/90 hover-lift',
+ default: 'bg-primary text-primary-foreground bubble-shadow hover:bg-primary/90',
destructive:
- 'bg-destructive bubble-shadow hover:bg-destructive/90 hover-lift focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white',
- outline:
- 'backdrop-blur-sm bg-card/60 border hover:backdrop-blur-sm hover:bg-card/90 hover:text-accent-foreground hover-lift',
- secondary: 'bg-secondary text-secondary-foreground bubble-shadow hover:bg-secondary/80 hover-lift',
+ 'bg-destructive bubble-shadow hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white',
+ outline: 'backdrop-blur-sm bg-card/60 border hover:backdrop-blur-sm hover:bg-card/90 hover:text-accent-foreground',
+ secondary: 'bg-secondary text-secondary-foreground bubble-shadow hover:bg-secondary/80',
ghost: 'hover:backdrop-blur-sm hover:bg-card/60 hover:text-accent-foreground',
link: 'text-primary underline-offset-4 hover:underline'
},
@@ -22,21 +21,28 @@
sm: 'h-8 gap-1.5 rounded-lg px-3 has-[>svg]:px-2.5',
lg: 'h-10 rounded-lg px-6 has-[>svg]:px-4',
icon: 'size-9'
+ },
+ hoverEffect: {
+ none: '',
+ lift: 'hover-lift'
}
},
defaultVariants: {
variant: 'default',
- size: 'default'
+ size: 'default',
+ hoverEffect: 'lift'
}
});
export type ButtonVariant = VariantProps<typeof buttonVariants>['variant'];
export type ButtonSize = VariantProps<typeof buttonVariants>['size'];
+ export type ButtonHoverEffect = VariantProps<typeof buttonVariants>['hoverEffect'];
export type ButtonPropsWithoutHTML = WithChildren<{
ref?: HTMLElement | null;
variant?: ButtonVariant;
size?: ButtonSize;
+ hoverEffect?: ButtonHoverEffect;
loading?: boolean;
onClickPromise?: (
e: MouseEvent & {
@@ -49,6 +55,7 @@
WithElementRef<HTMLAnchorAttributes> & {
variant?: ButtonVariant;
size?: ButtonSize;
+ hoverEffect?: ButtonHoverEffect;
};
</script>
@@ -57,6 +64,7 @@
class: className,
variant = 'default',
size = 'default',
+ hoverEffect = 'lift',
ref = $bindable(null),
href = undefined,
type = 'button',
@@ -70,7 +78,7 @@
<a
bind:this={ref}
data-slot="button"
- class={cn(buttonVariants({ variant, size }), className)}
+ class={cn(buttonVariants({ variant, size, hoverEffect }), className)}
href={disabled ? undefined : href}
aria-disabled={disabled}
role={disabled ? 'link' : undefined}
@@ -83,7 +91,7 @@
<button
bind:this={ref}
data-slot="button"
- class={cn(buttonVariants({ variant, size }), className)}
+ class={cn(buttonVariants({ variant, size, hoverEffect }), className)}
{type}
{disabled}
{...restProps}
diff --git a/frontend/src/lib/components/ui/copy-button/copy-button.svelte b/frontend/src/lib/components/ui/copy-button/copy-button.svelte
index 3685fd2c4..34cb6a539 100644
--- a/frontend/src/lib/components/ui/copy-button/copy-button.svelte
+++ b/frontend/src/lib/components/ui/copy-button/copy-button.svelte
@@ -3,7 +3,7 @@
-->
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { UseClipboard } from '$lib/hooks/use-clipboard.svelte';
import { cn } from '$lib/utils';
import { scale } from 'svelte/transition';
@@ -28,9 +28,10 @@
const resolvedSize = $derived(size === 'icon' && children ? 'default' : size);
</script>
-<Button
+<ArcaneButton
bind:ref
- {variant}
+ action="base"
+ tone={variant === 'ghost' ? 'ghost' : variant === 'outline' ? 'outline' : 'outline'}
size={resolvedSize}
{tabindex}
class={cn('flex items-center gap-2', className)}
@@ -63,4 +64,4 @@
</div>
{/if}
{@render children?.()}
-</Button>
+</ArcaneButton>
diff --git a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
index 93118b053..76b883341 100644
--- a/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
+++ b/frontend/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
@@ -20,7 +20,7 @@
preventScroll={false}
{sideOffset}
class={cn(
- 'text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-xl border p-1 shadow-md backdrop-blur-(--glass-blur-popup) backdrop-saturate-150 outline-none',
+ 'text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-xl border p-1 shadow-md backdrop-blur-2xl backdrop-saturate-150 outline-none',
'max-h-(--radix-dropdown-menu-content-available-height) max-w-[calc(100vw-2rem)]',
'max-[768px]:max-w-[calc(100vw-1rem)]',
className
diff --git a/frontend/src/lib/components/ui/form/form-button.svelte b/frontend/src/lib/components/ui/form/form-button.svelte
index 44dde3975..7d44d217c 100644
--- a/frontend/src/lib/components/ui/form/form-button.svelte
+++ b/frontend/src/lib/components/ui/form/form-button.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
interface Props {
ref?: HTMLButtonElement | null;
@@ -14,6 +14,15 @@
let { ref = $bindable(null), variant, size, disabled, class: className, onclick, children }: Props = $props();
</script>
-<Button bind:ref type="submit" {variant} {size} {disabled} class={className} {onclick}>
+<ArcaneButton
+ bind:ref
+ action="base"
+ type="submit"
+ tone={variant === 'destructive' ? 'outline-destructive' : variant === 'ghost' ? 'ghost' : 'outline'}
+ {size}
+ {disabled}
+ class={className}
+ {onclick}
+>
{@render children?.()}
-</Button>
+</ArcaneButton>
diff --git a/frontend/src/lib/components/ui/input-group/input-group-button.svelte b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
index b4c69a3a8..3411bfbf0 100644
--- a/frontend/src/lib/components/ui/input-group/input-group-button.svelte
+++ b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
@@ -21,21 +21,27 @@
<script lang="ts">
import { cn } from '$lib/utils.js';
- import type { ComponentProps } from 'svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- let {
- class: className,
- children,
- type = 'button',
- variant = 'ghost',
- size = 'xs',
- ...restProps
- }: Omit<ComponentProps<typeof Button>, 'href' | 'size'> & {
+ interface Props {
+ class?: string;
+ children?: import('svelte').Snippet;
+ type?: 'button' | 'submit' | 'reset';
+ variant?: 'ghost' | 'outline';
size?: InputGroupButtonSize;
- } = $props();
+ [key: string]: any;
+ }
+
+ let { class: className, children, type = 'button', variant = 'ghost', size = 'xs', ...restProps }: Props = $props();
</script>
-<Button {type} data-size={size} {variant} class={cn(inputGroupButtonVariants({ size }), className)} {...restProps}>
+<ArcaneButton
+ action="base"
+ {type}
+ data-size={size}
+ tone={variant === 'ghost' ? 'ghost' : 'outline'}
+ class={cn(inputGroupButtonVariants({ size }), className)}
+ {...restProps}
+>
{@render children?.()}
-</Button>
+</ArcaneButton>
diff --git a/frontend/src/lib/components/ui/select/select-content.svelte b/frontend/src/lib/components/ui/select/select-content.svelte
index d11588279..ad0b6582a 100644
--- a/frontend/src/lib/components/ui/select/select-content.svelte
+++ b/frontend/src/lib/components/ui/select/select-content.svelte
@@ -24,7 +24,7 @@
{align}
data-slot="select-content"
class={cn(
- 'text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 min-w-32 overflow-x-hidden overflow-y-auto rounded-xl border shadow-md backdrop-blur-(--glass-blur-popup) backdrop-saturate-150 data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
+ 'text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 min-w-32 overflow-x-hidden overflow-y-auto rounded-xl border shadow-md backdrop-blur-2xl backdrop-saturate-150 data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
'max-h-(--bits-select-content-available-height) origin-(--bits-select-content-transform-origin)',
'w-(--radix-popper-anchor-width) max-w-[calc(100vw-2rem)] min-w-(--radix-popper-anchor-width)',
'max-[768px]:max-w-[calc(100vw-1rem)]',
diff --git a/frontend/src/lib/components/ui/separator/separator.svelte b/frontend/src/lib/components/ui/separator/separator.svelte
index 89b2695b5..ae8321b6c 100644
--- a/frontend/src/lib/components/ui/separator/separator.svelte
+++ b/frontend/src/lib/components/ui/separator/separator.svelte
@@ -1,20 +1,15 @@
<script lang="ts">
- import { Separator as SeparatorPrimitive } from "bits-ui";
- import { cn } from "$lib/utils.js";
+ import { Separator as SeparatorPrimitive } from 'bits-ui';
+ import { cn } from '$lib/utils.js';
- let {
- ref = $bindable(null),
- class: className,
- "data-slot": dataSlot = "separator",
- ...restProps
- }: SeparatorPrimitive.RootProps = $props();
+ let { ref = $bindable(null), class: className, ...restProps }: SeparatorPrimitive.RootProps = $props();
</script>
<SeparatorPrimitive.Root
bind:ref
- data-slot={dataSlot}
+ data-slot="separator"
class={cn(
- "bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=vertical]:h-full data-[orientation=horizontal]:w-full data-[orientation=vertical]:w-px",
+ 'bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px',
className
)}
{...restProps}
diff --git a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
index 8d18e4e0b..14f3a6d84 100644
--- a/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
+++ b/frontend/src/lib/components/ui/sidebar/sidebar-trigger.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { cn } from '$lib/utils.js';
import { ArrowLeftIcon } from '$lib/icons';
import { useSidebar } from './context.svelte.js';
@@ -21,11 +21,12 @@
const sidebar = useSidebar();
</script>
-<Button
+<ArcaneButton
bind:ref
data-sidebar="trigger"
data-slot="sidebar-trigger"
- variant="ghost"
+ action="base"
+ tone="ghost"
size="icon"
class={cn('size-7', className)}
type="button"
@@ -40,4 +41,4 @@
>
<ArrowLeftIcon />
<span class="sr-only">Toggle Sidebar</span>
-</Button>
+</ArcaneButton>
diff --git a/frontend/src/lib/icons/github-icon.svelte b/frontend/src/lib/icons/github-icon.svelte
deleted file mode 100644
index e3dbd3ce6..000000000
--- a/frontend/src/lib/icons/github-icon.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-<script lang="ts">
- let {
- class: className
- }: {
- class?: string;
- } = $props();
-</script>
-
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class={className}>
- <title>GitHub</title>
- <path
- d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
- fill="currentColor"
- />
-</svg>
diff --git a/frontend/src/lib/layouts/index.ts b/frontend/src/lib/layouts/index.ts
index c61fac28f..aff464254 100644
--- a/frontend/src/lib/layouts/index.ts
+++ b/frontend/src/lib/layouts/index.ts
@@ -1,8 +1,7 @@
export {
default as ResourcePageLayout,
type ActionButton,
- type StatCardConfig,
- type StatCardsColumns
+ type StatCardConfig
} from './resource-page-layout.svelte';
export { default as TabbedPageLayout } from './tabbed-page-layout.svelte';
export {
diff --git a/frontend/src/lib/layouts/resource-page-layout.svelte b/frontend/src/lib/layouts/resource-page-layout.svelte
index 253e7f5c6..5d57e1925 100644
--- a/frontend/src/lib/layouts/resource-page-layout.svelte
+++ b/frontend/src/lib/layouts/resource-page-layout.svelte
@@ -27,14 +27,11 @@
class?: string;
}
- export type StatCardsColumns = 'auto' | 1 | 2 | 3 | 4 | 5;
-
interface Props {
title: string;
subtitle?: string;
actionButtons?: ActionButton[];
statCards?: StatCardConfig[];
- statCardsColumns?: StatCardsColumns;
mainContent: Snippet;
additionalContent?: Snippet;
class?: string;
@@ -46,7 +43,6 @@
subtitle,
actionButtons = [],
statCards = [],
- statCardsColumns = 'auto',
mainContent,
additionalContent,
class: className = '',
@@ -55,106 +51,100 @@
const mobileVisibleButtons = $derived(actionButtons.filter((btn) => btn.showOnMobile));
const mobileDropdownButtons = $derived(actionButtons.filter((btn) => !btn.showOnMobile));
-
- const getStatCardsGridClass = (columns: typeof statCardsColumns) => {
- switch (columns) {
- case 1:
- return 'grid-cols-1';
- case 2:
- return 'grid-cols-2 sm:grid-cols-2';
- case 3:
- return 'grid-cols-2 sm:grid-cols-3 [&>*:nth-child(3)]:col-span-2 sm:[&>*:nth-child(3)]:col-span-1';
- case 4:
- return 'grid-cols-2 sm:grid-cols-2 lg:grid-cols-4';
- case 5:
- return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-5';
- case 'auto':
- default:
- if (statCards.length <= 2) return 'grid-cols-2 sm:grid-cols-2';
- if (statCards.length === 3)
- return 'grid-cols-2 sm:grid-cols-3 [&>*:nth-child(3)]:col-span-2 sm:[&>*:nth-child(3)]:col-span-1';
- if (statCards.length === 4) return 'grid-cols-2 sm:grid-cols-2 lg:grid-cols-4';
- return 'grid-cols-2 sm:grid-cols-3 lg:grid-cols-5';
- }
- };
</script>
<div class="{containerClass} {className}">
<div class="relative flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
- <div>
+ <div class="flex-1">
<h1 class="text-2xl font-bold tracking-tight sm:text-3xl">{title}</h1>
{#if subtitle}
<p class="text-muted-foreground mt-1 text-sm">{subtitle}</p>
{/if}
</div>
- {#if actionButtons.length > 0}
- <div class="hidden items-center gap-2 sm:flex">
- {#each actionButtons as button}
- <ArcaneButton
- action={button.action}
- customLabel={button.label}
- loadingLabel={button.loadingLabel}
- loading={button.loading}
- disabled={button.disabled}
- onclick={button.onclick}
- />
- {/each}
+ {#if statCards && statCards.length > 0}
+ <div class="hidden flex-1 items-center justify-center md:flex">
+ <div class="border-border/50 relative overflow-hidden rounded-full border">
+ <!-- Subtle muted background overlay -->
+ <div class="bg-muted/50 absolute inset-0"></div>
+
+ <!-- Glass effect container -->
+ <div class="relative flex items-center gap-4 px-4 py-1.5 backdrop-blur-md">
+ {#each statCards as card, i}
+ {#if i > 0}
+ <div class="bg-border/50 h-4 w-px"></div>
+ {/if}
+ <StatCard
+ variant="mini"
+ title={card.title}
+ value={card.value}
+ icon={card.icon}
+ iconColor={card.iconColor}
+ class={card.class}
+ />
+ {/each}
+ </div>
+ </div>
</div>
+ {/if}
- <div class="absolute top-4 right-4 flex items-center gap-2 sm:hidden">
- {#each mobileVisibleButtons as button}
- <ArcaneButton
- action={button.action}
- customLabel={button.label}
- loadingLabel={button.loadingLabel}
- loading={button.loading}
- disabled={button.disabled}
- onclick={button.onclick}
- size="sm"
- />
- {/each}
+ <div class="flex flex-1 items-center justify-end gap-2">
+ {#if actionButtons.length > 0}
+ <div class="hidden items-center gap-2 sm:flex">
+ {#each actionButtons as button}
+ <ArcaneButton
+ action={button.action}
+ customLabel={button.label}
+ loadingLabel={button.loadingLabel}
+ loading={button.loading}
+ disabled={button.disabled}
+ onclick={button.onclick}
+ />
+ {/each}
+ </div>
- {#if mobileDropdownButtons.length > 0}
- <DropdownMenu.Root>
- <DropdownMenu.Trigger class="bg-background/70 inline-flex size-9 items-center justify-center rounded-lg border">
- <span class="sr-only">Open menu</span>
- <EllipsisIcon class="size-4" />
- </DropdownMenu.Trigger>
+ <div class="absolute top-4 right-4 flex items-center gap-2 sm:hidden">
+ {#each mobileVisibleButtons as button}
+ <ArcaneButton
+ action={button.action}
+ customLabel={button.label}
+ loadingLabel={button.loadingLabel}
+ loading={button.loading}
+ disabled={button.disabled}
+ onclick={button.onclick}
+ size="sm"
+ />
+ {/each}
- <DropdownMenu.Content
- align="end"
- class="bg-popover/90 z-50 min-w-[160px] rounded-xl border p-1 shadow-lg backdrop-blur-md"
- >
- <DropdownMenu.Group>
- {#each mobileDropdownButtons as button}
- <DropdownMenu.Item onclick={button.onclick} disabled={button.disabled || button.loading}>
- {button.loading ? button.loadingLabel || button.label : button.label}
- </DropdownMenu.Item>
- {/each}
- </DropdownMenu.Group>
- </DropdownMenu.Content>
- </DropdownMenu.Root>
- {/if}
- </div>
- {/if}
- </div>
+ {#if mobileDropdownButtons.length > 0}
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="bg-background/70 size-9 border">
+ <span class="sr-only">Open menu</span>
+ <EllipsisIcon class="size-4" />
+ </ArcaneButton>
+ {/snippet}
+ </DropdownMenu.Trigger>
- {#if statCards && statCards.length > 0}
- <div class="grid gap-4 {getStatCardsGridClass(statCardsColumns)}">
- {#each statCards as card}
- <StatCard
- title={card.title}
- value={card.value}
- subtitle={card.subtitle}
- icon={card.icon}
- iconColor={card.iconColor}
- bgColor={card.bgColor}
- class={card.class}
- />
- {/each}
+ <DropdownMenu.Content
+ align="end"
+ class="bg-popover/90 z-50 min-w-[160px] rounded-xl border p-1 shadow-lg backdrop-blur-md"
+ >
+ <DropdownMenu.Group>
+ {#each mobileDropdownButtons as button}
+ <DropdownMenu.Item onclick={button.onclick} disabled={button.disabled || button.loading}>
+ {button.loading ? button.loadingLabel || button.label : button.label}
+ </DropdownMenu.Item>
+ {/each}
+ </DropdownMenu.Group>
+ </DropdownMenu.Content>
+ </DropdownMenu.Root>
+ {/if}
+ </div>
+ {/if}
</div>
- {/if}
+ </div>
{@render mainContent()}
diff --git a/frontend/src/lib/layouts/settings-page-layout.svelte b/frontend/src/lib/layouts/settings-page-layout.svelte
index d36156d77..ba09724ee 100644
--- a/frontend/src/lib/layouts/settings-page-layout.svelte
+++ b/frontend/src/lib/layouts/settings-page-layout.svelte
@@ -6,7 +6,6 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import type { Action } from '$lib/components/arcane-button/index.js';
import { getContext } from 'svelte';
- import { Button } from '$lib/components/ui/button';
import { m } from '$lib/paraglide/messages';
import { EllipsisIcon, ResetIcon, SaveIcon, type IconType } from '$lib/icons';
@@ -32,7 +31,6 @@
}
export type SettingsPageType = 'form' | 'management';
- export type StatCardsColumns = 'auto' | 1 | 2 | 3 | 4 | 5;
interface Props {
title: string;
@@ -42,7 +40,6 @@
showReadOnlyTag?: boolean;
actionButtons?: SettingsActionButton[];
statCards?: SettingsStatCard[];
- statCardsColumns?: StatCardsColumns;
mainContent: Snippet;
additionalContent?: Snippet;
class?: string;
@@ -56,7 +53,6 @@
showReadOnlyTag = false,
actionButtons = [],
statCards = [],
- statCardsColumns = 'auto',
mainContent,
additionalContent,
class: className = ''
@@ -72,27 +68,6 @@
saveFunction: (() => Promise<void>) | null;
resetFunction: (() => void) | null;
}>('settingsFormState');
-
- const getStatCardsGridClass = (columns: typeof statCardsColumns) => {
- switch (columns) {
- case 1:
- return 'grid-cols-1';
- case 2:
- return 'grid-cols-1 sm:grid-cols-2';
- case 3:
- return 'grid-cols-1 sm:grid-cols-3';
- case 4:
- return 'grid-cols-1 sm:grid-cols-2 lg:grid-cols-4';
- case 5:
- return 'grid-cols-1 sm:grid-cols-2 lg:grid-cols-5';
- case 'auto':
- default:
- if (statCards.length <= 2) return 'grid-cols-1 sm:grid-cols-2';
- if (statCards.length === 3) return 'grid-cols-1 sm:grid-cols-3';
- if (statCards.length === 4) return 'grid-cols-1 sm:grid-cols-2 lg:grid-cols-4';
- return 'grid-cols-1 sm:grid-cols-2 lg:grid-cols-5';
- }
- };
</script>
<div class="px-2 py-4 pb-5 sm:px-6 sm:py-6 sm:pb-10 lg:px-8 {className}">
@@ -110,8 +85,37 @@
<div class="min-w-0 flex-1">
<div class="flex items-start justify-between gap-3">
- <h1 class="settings-title min-w-0 text-xl sm:text-3xl">{title}</h1>
- <div class="flex shrink-0 items-center gap-2">
+ <div class="flex-1">
+ <h1 class="settings-title min-w-0 text-xl sm:text-3xl">{title}</h1>
+ </div>
+
+ {#if pageType === 'management' && statCards && statCards.length > 0}
+ <div class="hidden flex-1 items-center justify-center md:flex">
+ <div class="border-border/50 relative overflow-hidden rounded-full border">
+ <!-- Subtle muted background overlay -->
+ <div class="bg-muted/50 absolute inset-0"></div>
+
+ <!-- Glass effect container -->
+ <div class="relative flex items-center gap-4 px-4 py-1.5 backdrop-blur-md">
+ {#each statCards as card, i}
+ {#if i > 0}
+ <div class="bg-border/50 h-4 w-px"></div>
+ {/if}
+ <StatCard
+ variant="mini"
+ title={card.title}
+ value={card.value}
+ icon={card.icon}
+ iconColor={card.iconColor}
+ class={card.class}
+ />
+ {/each}
+ </div>
+ </div>
+ </div>
+ {/if}
+
+ <div class="flex flex-1 shrink-0 items-center justify-end gap-2">
{#if showReadOnlyTag}
<UiConfigDisabledTag />
{/if}
@@ -125,36 +129,30 @@
{/if}
{#if formState.hasChanges && formState.resetFunction}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
size="sm"
onclick={() => formState.resetFunction && formState.resetFunction()}
disabled={formState.isLoading}
class="gap-2"
- >
- <ResetIcon class="size-4" />
- <span class="hidden sm:inline">{m.common_reset()}</span>
- </Button>
+ icon={ResetIcon}
+ customLabel={m.common_reset()}
+ />
{/if}
- <Button
+ <ArcaneButton
+ action="save"
onclick={async () => {
if (formState.saveFunction) {
await formState.saveFunction();
}
}}
- disabled={formState.isLoading || !formState.hasChanges || !formState.saveFunction}
+ disabled={!formState.hasChanges || !formState.saveFunction}
+ loading={formState.isLoading}
size="sm"
class="min-w-[80px] gap-2"
- >
- {#if formState.isLoading}
- <div class="border-background size-4 animate-spin rounded-full border-2 border-t-transparent"></div>
- <span class="hidden sm:inline">{m.common_saving()}</span>
- {:else}
- <SaveIcon class="size-4" />
- <span class="hidden sm:inline">{m.common_save()}</span>
- {/if}
- </Button>
+ />
</div>
{/if}
@@ -188,11 +186,13 @@
{#if mobileDropdownButtons.length > 0}
<DropdownMenu.Root>
- <DropdownMenu.Trigger
- class="bg-background/70 inline-flex size-8 items-center justify-center rounded-lg border"
- >
- <span class="sr-only">Open menu</span>
- <EllipsisIcon class="size-4" />
+ <DropdownMenu.Trigger>
+ {#snippet child({ props })}
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="bg-background/70 size-8 border">
+ <span class="sr-only">Open menu</span>
+ <EllipsisIcon class="size-4" />
+ </ArcaneButton>
+ {/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content
@@ -220,22 +220,6 @@
</div>
</div>
- {#if pageType === 'management' && statCards && statCards.length > 0}
- <div class="mt-6 grid gap-4 sm:mt-8 {getStatCardsGridClass(statCardsColumns)}">
- {#each statCards as card}
- <StatCard
- title={card.title}
- value={card.value}
- subtitle={card.subtitle}
- icon={card.icon}
- iconColor={card.iconColor}
- bgColor={card.bgColor}
- class={card.class}
- />
- {/each}
- </div>
- {/if}
-
<div class="mt-6 sm:mt-8">
{@render mainContent()}
</div>
diff --git a/frontend/src/lib/layouts/tabbed-page-layout.svelte b/frontend/src/lib/layouts/tabbed-page-layout.svelte
index 2aa52512a..890390b77 100644
--- a/frontend/src/lib/layouts/tabbed-page-layout.svelte
+++ b/frontend/src/lib/layouts/tabbed-page-layout.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Tabs from '$lib/components/ui/tabs/index.js';
import { TabBar, type TabItem } from '$lib/components/tab-bar/index.js';
import type { Snippet } from 'svelte';
@@ -60,10 +60,10 @@
<div class="max-w-full px-4 py-3">
<div class="flex items-start justify-between gap-3">
<div class="flex min-w-0 items-start gap-3">
- <Button variant="ghost" size="sm" href={backUrl}>
+ <ArcaneButton action="base" tone="ghost" size="sm" href={backUrl}>
<ArrowLeftIcon class="size-4" />
{backLabel}
- </Button>
+ </ArcaneButton>
<div class="min-w-0">
{@render headerInfo()}
</div>
diff --git a/frontend/src/routes/(app)/containers/+page.svelte b/frontend/src/routes/(app)/containers/+page.svelte
index 5f68fd7e3..1dd436665 100644
--- a/frontend/src/routes/(app)/containers/+page.svelte
+++ b/frontend/src/routes/(app)/containers/+page.svelte
@@ -84,34 +84,24 @@
{
title: m.common_total(),
value: containerStatusCounts.totalContainers,
- icon: BoxIcon,
- class: 'border-l-primary border-l-4'
+ icon: BoxIcon
},
{
title: m.common_running(),
value: containerStatusCounts.runningContainers,
icon: BoxIcon,
- iconColor: 'text-green-500',
- bgColor: 'bg-green-500/10',
- class: 'border-l-4 border-l-green-500'
+ iconColor: 'text-green-500'
},
{
title: m.common_stopped(),
value: containerStatusCounts.stoppedContainers,
icon: BoxIcon,
- iconColor: 'text-amber-500',
- class: 'border-l-4 border-l-amber-500'
+ iconColor: 'text-amber-500'
}
]);
</script>
-<ResourcePageLayout
- title={m.containers_title()}
- subtitle={m.containers_subtitle()}
- {actionButtons}
- {statCards}
- statCardsColumns={3}
->
+<ResourcePageLayout title={m.containers_title()} subtitle={m.containers_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<ContainerTable bind:containers bind:selectedIds bind:requestOptions />
{/snippet}
diff --git a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
index 4b90e1a12..e9adb5756 100644
--- a/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
+++ b/frontend/src/routes/(app)/containers/[containerId]/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { invalidateAll } from '$app/navigation';
import ActionButtons from '$lib/components/action-buttons.svelte';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
@@ -376,14 +376,13 @@
{m.common_not_found_description({ resource: m.container().toLowerCase() })}
</p>
<div class="flex justify-center gap-4">
- <Button variant="outline" href="/containers">
+ <ArcaneButton action="base" href="/containers">
<ArrowLeftIcon class="size-4" />
{m.common_back_to({ resource: m.containers_title() })}
- </Button>
- <Button variant="default" onclick={refreshData}>
- <RefreshIcon class="size-4" />
+ </ArcaneButton>
+ <ArcaneButton action="refresh" onclick={refreshData}>
{m.common_retry()}
- </Button>
+ </ArcaneButton>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/containers/container-table.svelte b/frontend/src/routes/(app)/containers/container-table.svelte
index 00d82b485..e048d3856 100644
--- a/frontend/src/routes/(app)/containers/container-table.svelte
+++ b/frontend/src/routes/(app)/containers/container-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -367,39 +367,39 @@
{/if}
<div class="flex items-center gap-1">
{#if !status && item.state !== 'running'}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
class="size-7 p-0"
onclick={() => performContainerAction('start', item.id)}
disabled={isAnyLoading}
+ icon={StartIcon}
title={m.common_start()}
- >
- <StartIcon class="size-3.5" />
- </Button>
+ />
{:else if !status && item.state === 'running'}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
class="size-7 p-0"
onclick={() => performContainerAction('stop', item.id)}
disabled={isAnyLoading}
title={m.common_stop()}
- >
- <StopIcon class="size-3.5" />
- </Button>
+ icon={StopIcon}
+ />
{/if}
{#if !status && item.updateInfo?.hasUpdate}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
class="size-7 p-0"
onclick={() => handleUpdateContainer(item)}
disabled={isAnyLoading}
title={m.containers_update_container()}
- >
- <UpdateIcon class="size-3.5" />
- </Button>
+ icon={UpdateIcon}
+ />
{/if}
</div>
</div>
@@ -519,10 +519,10 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="relative size-8 p-0">
<span class="sr-only">{m.common_open_menu()}</span>
<EllipsisIcon />
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
@@ -623,7 +623,13 @@
</DropdownMenu.CheckboxItem>
{/snippet}
-{#snippet GroupedTableView({ table, renderPagination }: { table: TableType<ContainerSummaryDto>; renderPagination: import('svelte').Snippet })}
+{#snippet GroupedTableView({
+ table,
+ renderPagination
+}: {
+ table: TableType<ContainerSummaryDto>;
+ renderPagination: import('svelte').Snippet;
+})}
<div class="flex h-full flex-col">
<div class="shrink-0 border-b">
<DataTableToolbar
diff --git a/frontend/src/routes/(app)/customize/+page.svelte b/frontend/src/routes/(app)/customize/+page.svelte
index 9d62153e1..f31edc2bf 100644
--- a/frontend/src/routes/(app)/customize/+page.svelte
+++ b/frontend/src/routes/(app)/customize/+page.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { onMount } from 'svelte';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Card } from '$lib/components/ui/card';
import { m } from '$lib/paraglide/messages';
import { UiConfigDisabledTag } from '$lib/components/badges/index.js';
@@ -130,7 +130,7 @@
/>
<InputGroup.Addon>
{#if showSearchResults}
- <Button variant="ghost" size="icon" onclick={clearSearch} class="size-6 p-0">×</Button>
+ <ArcaneButton action="base" tone="ghost" size="icon" onclick={clearSearch} class="size-6 p-0">×</ArcaneButton>
{:else}
<SearchIcon class="size-4" />
{/if}
@@ -201,9 +201,9 @@
<p class="text-muted-foreground text-xs sm:text-sm">{result.description}</p>
</div>
</div>
- <Button variant="outline" size="sm" onclick={() => navigateToCategory(result.url)} class="shrink-0">
+ <ArcaneButton action="base" size="sm" onclick={() => navigateToCategory(result.url)} class="shrink-0">
{m.customize_button()}
- </Button>
+ </ArcaneButton>
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/registries/registry-table.svelte b/frontend/src/routes/(app)/customize/registries/registry-table.svelte
index 783dc87ac..c9e53d3f5 100644
--- a/frontend/src/routes/(app)/customize/registries/registry-table.svelte
+++ b/frontend/src/routes/(app)/customize/registries/registry-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -224,10 +224,10 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="relative size-8 p-0">
<span class="sr-only">{m.common_open_menu()}</span>
<EllipsisIcon />
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/customize/templates/+page.svelte b/frontend/src/routes/(app)/customize/templates/+page.svelte
index 68a534d91..f96d61af5 100644
--- a/frontend/src/routes/(app)/customize/templates/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/+page.svelte
@@ -152,33 +152,24 @@
title: m.templates_local_templates(),
value: localTemplatesCount,
icon: FolderOpenIcon,
- iconColor: 'text-blue-500',
- class: 'border-l-4 border-l-blue-500'
+ iconColor: 'text-blue-500'
},
{
title: m.templates_remote_templates(),
value: remoteTemplatesCount,
icon: RegistryIcon,
- iconColor: 'text-green-500',
- class: 'border-l-4 border-l-green-500'
+ iconColor: 'text-green-500'
},
{
title: m.templates_registries(),
value: registries.length,
icon: TemplateIcon,
- iconColor: 'text-purple-500',
- class: 'border-l-4 border-l-purple-500'
+ iconColor: 'text-purple-500'
}
]);
</script>
-<ResourcePageLayout
- title={m.templates_title()}
- subtitle={m.templates_subtitle()}
- {actionButtons}
- {statCards}
- statCardsColumns={3}
->
+<ResourcePageLayout title={m.templates_title()} subtitle={m.templates_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<div class="space-y-6">
<Tabs.Root bind:value={activeView}>
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
index 6d60cc9e8..e379cbebe 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
import { Spinner } from '$lib/components/ui/spinner';
@@ -96,10 +96,10 @@
<div class="container mx-auto max-w-full space-y-6 overflow-hidden p-2 sm:p-6">
<div class="space-y-3 sm:space-y-4">
- <Button variant="ghost" onclick={() => goto('/customize/templates')} class="w-fit gap-2">
+ <ArcaneButton action="base" tone="ghost" onclick={() => goto('/customize/templates')} class="w-fit gap-2">
<ArrowLeftIcon class="size-4" />
<span>{m.common_back_to({ resource: m.templates_title() })}</span>
- </Button>
+ </ArcaneButton>
<div>
<h1 class="text-xl font-bold break-words sm:text-2xl">{template.name}</h1>
@@ -127,42 +127,48 @@
{/if}
</div>
<div class="flex flex-col gap-2 sm:flex-row">
- <Button onclick={() => goto(`/projects/new?templateId=${template.id}`)} class="w-full gap-2 sm:w-auto">
- <MoveToFolderIcon class="size-4" />
+ <ArcaneButton
+ action="create"
+ onclick={() => goto(`/projects/new?templateId=${template.id}`)}
+ class="w-full gap-2 sm:w-auto"
+ >
{m.compose_create_project()}
- </Button>
+ </ArcaneButton>
{#if canDownload}
- <Button variant="secondary" onclick={handleDownload} disabled={isDownloading} class="w-full gap-2 sm:w-auto">
- {#if isDownloading}
- <Spinner class="size-4" />
- {m.common_action_downloading()}
- {:else}
- <DownloadIcon class="size-4" />
- {m.templates_download()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="base"
+ onclick={handleDownload}
+ disabled={isDownloading}
+ loading={isDownloading}
+ loadingLabel={m.common_action_downloading()}
+ class="w-full gap-2 sm:w-auto"
+ >
+ <DownloadIcon class="size-4" />
+ {m.templates_download()}
+ </ArcaneButton>
{:else if template.isRemote && localVersionOfRemote()}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
onclick={() => goto(`/customize/templates/${localVersionOfRemote()?.id}`)}
class="w-full gap-2 sm:w-auto"
>
<ProjectsIcon class="size-4" />
{m.templates_view_local_version()}
- </Button>
+ </ArcaneButton>
{/if}
{#if canDelete}
- <Button variant="destructive" onclick={handleDelete} disabled={isDeleting} class="w-full gap-2 sm:w-auto">
- {#if isDeleting}
- <Spinner class="size-4" />
- {m.common_action_deleting()}
- {:else}
- <TrashIcon class="size-4" />
- {m.templates_delete_template()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="remove"
+ onclick={handleDelete}
+ disabled={isDeleting}
+ loading={isDeleting}
+ loadingLabel={m.common_action_deleting()}
+ class="w-full gap-2 sm:w-auto"
+ >
+ {m.templates_delete_template()}
+ </ArcaneButton>
{/if}
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
index c779f15f6..22f69e761 100644
--- a/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
+++ b/frontend/src/routes/(app)/customize/templates/components/RegistryManager.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
import * as Alert from '$lib/components/ui/alert';
@@ -33,10 +33,9 @@
<h3 class="text-lg font-semibold">{m.templates_registries_section_title()}</h3>
<p class="text-muted-foreground text-sm">{m.templates_registries_section_description()}</p>
</div>
- <Button onclick={onAddRegistry}>
- <AddIcon class="size-4" />
+ <ArcaneButton action="create" onclick={onAddRegistry}>
{m.common_add_button({ resource: m.resource_registry_cap() })}
- </Button>
+ </ArcaneButton>
</div>
{#if registries.length === 0}
@@ -82,22 +81,21 @@
disabled={isLoading.updating[registry.id]}
/>
- <Button variant="outline" size="sm" onclick={() => window.open(registry.url, '_blank', 'noopener,noreferrer')}>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ onclick={() => window.open(registry.url, '_blank', 'noopener,noreferrer')}
+ >
<ExternalLinkIcon class="size-4" />
- </Button>
+ </ArcaneButton>
- <Button
- variant="destructive"
+ <ArcaneButton
+ action="remove"
size="sm"
onclick={() => onRemoveRegistry(registry.id)}
- disabled={isLoading.removing[registry.id]}
- >
- {#if isLoading.removing[registry.id]}
- <RefreshIcon class="size-4 animate-spin" />
- {:else}
- <TrashIcon class="size-4" />
- {/if}
- </Button>
+ loading={isLoading.removing[registry.id]}
+ />
</div>
</div>
</Card.Root>
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.svelte b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
index 03c1fee44..bad79271a 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Card from '$lib/components/ui/card';
import { toast } from 'svelte-sonner';
import CodeEditor from '$lib/components/monaco-code-editor/editor.svelte';
@@ -86,10 +86,10 @@
<div class="container mx-auto flex h-full min-h-0 max-w-full flex-col gap-6 overflow-hidden p-2 pb-10 sm:p-6 sm:pb-10">
<div class="space-y-3 sm:space-y-4">
- <Button variant="ghost" onclick={() => goto('/customize/templates')} class="w-fit gap-2">
+ <ArcaneButton action="base" tone="ghost" onclick={() => goto('/customize/templates')} class="w-fit gap-2">
<ArrowLeftIcon class="size-4" />
<span>{m.common_back_to({ resource: m.templates_title() })}</span>
- </Button>
+ </ArcaneButton>
<div class="flex flex-col justify-between gap-4 sm:flex-row sm:items-center">
<div>
@@ -99,16 +99,27 @@
</p>
</div>
<div class="flex flex-col gap-2 sm:flex-row">
- <Button variant="outline" onclick={() => (showTemplateDialog = true)} disabled={saving || isLoadingTemplate}>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ onclick={() => (showTemplateDialog = true)}
+ disabled={saving || isLoadingTemplate}
+ >
{m.common_use_template()}
- </Button>
- <Button variant="outline" onclick={handleReset} disabled={!hasChanges || saving || isLoadingTemplate}>
+ </ArcaneButton>
+ <ArcaneButton action="cancel" onclick={handleReset} disabled={!hasChanges || saving || isLoadingTemplate}>
{m.common_reset()}
- </Button>
- <Button onclick={handleSave} disabled={!hasChanges || saving || isLoadingTemplate} class="gap-2">
- <SaveIcon class="size-4" />
- {saving ? m.common_action_saving() : m.common_save()}
- </Button>
+ </ArcaneButton>
+ <ArcaneButton
+ action="save"
+ onclick={handleSave}
+ disabled={!hasChanges || isLoadingTemplate}
+ loading={saving}
+ loadingLabel={m.common_action_saving()}
+ class="gap-2"
+ >
+ {m.common_save()}
+ </ArcaneButton>
</div>
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/template-table.svelte b/frontend/src/routes/(app)/customize/templates/template-table.svelte
index 635fbb0a1..1925f2af5 100644
--- a/frontend/src/routes/(app)/customize/templates/template-table.svelte
+++ b/frontend/src/routes/(app)/customize/templates/template-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Badge } from '$lib/components/ui/badge';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -292,10 +292,10 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="relative size-8 p-0">
<span class="sr-only">{m.common_open_menu()}</span>
<EllipsisIcon />
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/customize/variables/+page.svelte b/frontend/src/routes/(app)/customize/variables/+page.svelte
index f85591e63..6612e338a 100644
--- a/frontend/src/routes/(app)/customize/variables/+page.svelte
+++ b/frontend/src/routes/(app)/customize/variables/+page.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Input } from '$lib/components/ui/input';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
import { toast } from 'svelte-sonner';
@@ -195,10 +195,14 @@
<SearchIcon class="text-muted-foreground pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2" />
<Input type="text" placeholder={m.common_search()} bind:value={searchQuery} class="h-9 pl-10" />
</div>
- <Button type="button" size="sm" onclick={addEnvVar} disabled={isLoading} class="shrink-0">
- <AddIcon class="mr-1.5 size-4" />
- {m.variables_add_button()}
- </Button>
+ <ArcaneButton
+ action="create"
+ size="sm"
+ onclick={addEnvVar}
+ disabled={isLoading}
+ customLabel={m.variables_add_button()}
+ class="shrink-0"
+ />
</div>
</div>
</Card.Header>
diff --git a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
index 8c91d133b..c3ec83d51 100644
--- a/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-container-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Card from '$lib/components/ui/card/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { UniversalMobileCard } from '$lib/components/arcane-table/index.js';
@@ -134,10 +134,10 @@
</Card.Title>
<Card.Description>{m.containers_recent()}</Card.Description>
</div>
- <Button variant="ghost" size="sm" href="/containers" disabled={isLoading}>
+ <ArcaneButton action="base" tone="ghost" size="sm" href="/containers" disabled={isLoading}>
{m.common_view_all()}
<ArrowRightIcon class="size-4" />
- </Button>
+ </ArcaneButton>
</div>
</Card.Header>
<Card.Content class="flex min-h-0 flex-1 flex-col px-0">
diff --git a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
index 41c85b6ba..56eef0775 100644
--- a/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
+++ b/frontend/src/routes/(app)/dashboard/dash-image-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as Card from '$lib/components/ui/card/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import type { SearchPaginationSortRequest, Paginated } from '$lib/types/pagination.type';
@@ -147,10 +147,10 @@
</Card.Title>
<Card.Description>{m.images_top_largest()}</Card.Description>
</div>
- <Button variant="ghost" size="sm" href="/images" disabled={isLoading}>
+ <ArcaneButton action="base" tone="ghost" size="sm" href="/images" disabled={isLoading}>
{m.common_view_all()}
<ArrowRightIcon class="size-4" />
- </Button>
+ </ArcaneButton>
</div>
</Card.Header>
<Card.Content class="flex min-h-0 flex-1 flex-col px-0">
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index e26ba0e44..45d665f8b 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { goto, invalidateAll } from '$app/navigation';
@@ -208,10 +208,14 @@
<div class="container mx-auto max-w-full space-y-6 overflow-hidden p-2 sm:p-6">
<div class="space-y-3 sm:space-y-4">
- <Button variant="ghost" onclick={() => goto('/environments')} class="w-fit gap-2">
- <ArrowLeftIcon class="size-4" />
- <span>{m.common_back_to({ resource: m.environments_title() })}</span>
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="ghost"
+ onclick={() => goto('/environments')}
+ class="w-fit gap-2"
+ icon={ArrowLeftIcon}
+ customLabel={m.common_back_to({ resource: m.environments_title() })}
+ />
<div class="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
<div class="flex-1">
@@ -227,41 +231,43 @@
{/if}
{#if hasChanges}
- <Button variant="outline" size="sm" onclick={handleReset} disabled={isSaving}>
- <ResetIcon class="mr-2 size-4" />
- {m.common_reset()}
- </Button>
+ <ArcaneButton
+ action="restart"
+ tone="outline"
+ onclick={handleReset}
+ disabled={isSaving}
+ customLabel={m.common_reset()}
+ />
{/if}
- <Button size="sm" onclick={handleSave} disabled={!hasChanges || isSaving}>
- {#if isSaving}
- <div class="border-background mr-2 size-4 animate-spin rounded-full border-2 border-t-transparent"></div>
- {m.common_saving()}
- {:else}
- <SaveIcon class="mr-2 size-4" />
- {m.common_save()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="save"
+ onclick={handleSave}
+ disabled={!hasChanges || isSaving}
+ loading={isSaving}
+ customLabel={m.common_save()}
+ loadingLabel={m.common_saving()}
+ />
{#if environment.id !== '0'}
- <Button variant="outline" onclick={syncRegistries} disabled={isSyncingRegistries}>
- {#if isSyncingRegistries}
- <Spinner class="size-4" />
- {:else}
- <RegistryIcon class="size-4" />
- {/if}
- {m.sync_registries()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ onclick={syncRegistries}
+ disabled={isSyncingRegistries}
+ loading={isSyncingRegistries}
+ icon={RegistryIcon}
+ customLabel={m.sync_registries()}
+ />
{/if}
- <Button variant="outline" onclick={refreshEnvironment} disabled={isRefreshing}>
- {#if isRefreshing}
- <Spinner class="size-4" />
- {:else}
- <RefreshIcon class="size-4" />
- {/if}
- {m.common_refresh()}
- </Button>
+ <ArcaneButton
+ action="refresh"
+ tone="outline"
+ onclick={refreshEnvironment}
+ disabled={isRefreshing}
+ loading={isRefreshing}
+ />
</div>
</div>
@@ -454,15 +460,16 @@
<p class="text-muted-foreground mt-1.5 text-xs">{m.environments_api_url_help()}</p>
</div>
- <Button onclick={testConnection} disabled={isTestingConnection} class="w-full">
- {#if isTestingConnection}
- <Spinner />
- {m.environments_testing_connection()}
- {:else}
- <TestIcon class="mr-2 size-4" />
- {m.environments_test_connection()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="base"
+ onclick={testConnection}
+ disabled={isTestingConnection}
+ loading={isTestingConnection}
+ icon={TestIcon}
+ customLabel={m.environments_test_connection()}
+ loadingLabel={m.environments_testing_connection()}
+ class="w-full"
+ />
</Card.Content>
</Card.Root>
@@ -489,28 +496,28 @@
</div>
<p class="text-muted-foreground text-xs">{m.environments_api_key_save_warning()}</p>
</div>
- <Button variant="outline" onclick={() => (regeneratedApiKey = null)} class="w-full">
- {m.common_dismiss()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ onclick={() => (regeneratedApiKey = null)}
+ customLabel={m.common_dismiss()}
+ class="w-full"
+ />
</div>
{:else}
<div class="rounded-lg border border-amber-500/30 bg-amber-500/10 p-4 text-sm text-amber-900 dark:text-amber-200">
<p class="font-medium">{m.environments_regenerate_warning_title()}</p>
<p class="mt-1">{m.environments_regenerate_warning_message()}</p>
</div>
- <Button
- variant="destructive"
+ <ArcaneButton
+ action="remove"
onclick={() => (showRegenerateDialog = true)}
disabled={isRegeneratingKey}
+ loading={isRegeneratingKey}
+ icon={ResetIcon}
+ customLabel={m.environments_regenerate_api_key()}
class="w-full"
- >
- {#if isRegeneratingKey}
- <Spinner class="size-4" />
- {:else}
- <ResetIcon class="size-4" />
- {/if}
- {m.environments_regenerate_api_key()}
- </Button>
+ />
{/if}
</Card.Content>
</Card.Root>
diff --git a/frontend/src/routes/(app)/environments/environment-table.svelte b/frontend/src/routes/(app)/environments/environment-table.svelte
index 24344ede2..e10ad6262 100644
--- a/frontend/src/routes/(app)/environments/environment-table.svelte
+++ b/frontend/src/routes/(app)/environments/environment-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import StatusBadge from '$lib/components/badges/status-badge.svelte';
import { Badge } from '$lib/components/ui/badge';
@@ -307,10 +307,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/events/+page.svelte b/frontend/src/routes/(app)/events/+page.svelte
index 9878455b7..81114baf9 100644
--- a/frontend/src/routes/(app)/events/+page.svelte
+++ b/frontend/src/routes/(app)/events/+page.svelte
@@ -103,44 +103,35 @@
title: m.events_total(),
value: totalEvents,
subtitle: m.events_total_subtitle(),
- icon: EventsIcon,
- class: 'border-l-4 border-l-primary'
+ icon: EventsIcon
},
{
title: m.events_info(),
value: infoEvents,
subtitle: m.events_info_subtitle(),
icon: EventsIcon,
- iconColor: 'text-blue-500',
- bgColor: 'bg-blue-500/10',
- class: 'border-l-4 border-l-blue-500'
+ iconColor: 'text-blue-500'
},
{
title: m.events_success(),
value: successEvents,
subtitle: m.events_success_subtitle(),
icon: EventsIcon,
- iconColor: 'text-green-500',
- bgColor: 'bg-green-500/10',
- class: 'border-l-4 border-l-green-500'
+ iconColor: 'text-green-500'
},
{
title: m.events_warning(),
value: warningEvents,
subtitle: m.events_warning_subtitle(),
icon: EventsIcon,
- iconColor: 'text-yellow-500',
- bgColor: 'bg-yellow-500/10',
- class: 'border-l-4 border-l-yellow-500'
+ iconColor: 'text-yellow-500'
},
{
title: m.events_error(),
value: errorEvents,
subtitle: m.events_error_subtitle(),
icon: EventsIcon,
- iconColor: 'text-red-500',
- bgColor: 'bg-red-500/10',
- class: 'border-l-4 border-l-red-500'
+ iconColor: 'text-red-500'
}
]);
</script>
@@ -150,7 +141,6 @@
subtitle={m.events_subtitle()}
{actionButtons}
{statCards}
- statCardsColumns={5}
containerClass="flex h-full flex-col space-y-6"
>
{#snippet mainContent()}
diff --git a/frontend/src/routes/(app)/events/event-table.svelte b/frontend/src/routes/(app)/events/event-table.svelte
index 898f6ebc4..f72284fae 100644
--- a/frontend/src/routes/(app)/events/event-table.svelte
+++ b/frontend/src/routes/(app)/events/event-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { toast } from 'svelte-sonner';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -218,10 +218,10 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="relative size-8 p-0">
<span class="sr-only">{m.common_open_menu()}</span>
<EllipsisIcon />
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/images/+page.svelte b/frontend/src/routes/(app)/images/+page.svelte
index 94cf479e0..8b9005298 100644
--- a/frontend/src/routes/(app)/images/+page.svelte
+++ b/frontend/src/routes/(app)/images/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { toast } from 'svelte-sonner';
import ImagePullSheet from '$lib/components/sheets/image-pull-sheet.svelte';
@@ -148,20 +148,18 @@
title: m.images_total(),
value: imageUsageCounts.totalImages,
icon: VolumesIcon,
- iconColor: 'text-blue-500',
- class: 'border-l-4 border-l-blue-500'
+ iconColor: 'text-blue-500'
},
{
title: m.images_total_size(),
value: String(bytes.format(imageUsageCounts.totalImageSize)),
icon: LocalFolderComputerIcon,
- iconColor: 'text-amber-500',
- class: 'border-l-4 border-l-amber-500'
+ iconColor: 'text-amber-500'
}
]);
</script>
-<ResourcePageLayout title={m.images_title()} subtitle={m.images_subtitle()} {actionButtons} {statCards} statCardsColumns={2}>
+<ResourcePageLayout title={m.images_title()} subtitle={m.images_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<ImageTable
bind:images
@@ -205,14 +203,14 @@
<span class="text-sm font-medium">{file.name}</span>
<span class="text-muted-foreground text-xs">{displaySize(file.size)}</span>
</div>
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
onclick={() => (uploadedFiles = [...uploadedFiles.slice(0, i), ...uploadedFiles.slice(i + 1)])}
disabled={isLoading.uploading}
- >
- <CloseIcon class="size-4" />
- </Button>
+ icon={CloseIcon}
+ />
</div>
{/each}
</div>
@@ -224,18 +222,21 @@
{/if}
</div>
<div class="flex justify-end gap-3">
- <Button
- variant="outline"
+ <ArcaneButton
+ action="cancel"
onclick={() => {
isUploadDialogOpen = false;
uploadedFiles = [];
}}
- disabled={isLoading.uploading}>{m.common_cancel()}</Button
- >
- <Button onclick={handleUploadImages} disabled={isLoading.uploading || uploadedFiles.length === 0}>
- {#if isLoading.uploading}<Spinner class="mr-2 size-4" />{/if}
- {m.images_upload_image()}
- </Button>
+ disabled={isLoading.uploading}
+ />
+ <ArcaneButton
+ action="create"
+ onclick={handleUploadImages}
+ disabled={isLoading.uploading || uploadedFiles.length === 0}
+ loading={isLoading.uploading}
+ customLabel={m.images_upload_image()}
+ />
</div>
</Dialog.Content>
</Dialog.Root>
@@ -249,13 +250,15 @@
>
</Dialog.Header>
<div class="flex justify-end gap-3 pt-6">
- <Button variant="outline" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isLoading.pruning}
- >{m.common_cancel()}</Button
- >
- <Button variant="destructive" onclick={handlePruneImages} disabled={isLoading.pruning}>
- {#if isLoading.pruning}<Spinner class="mr-2 size-4" />
- {m.common_action_pruning()}{:else}{m.images_prune_action()}{/if}
- </Button>
+ <ArcaneButton action="cancel" onclick={() => (isConfirmPruneDialogOpen = false)} disabled={isLoading.pruning} />
+ <ArcaneButton
+ action="remove"
+ onclick={handlePruneImages}
+ disabled={isLoading.pruning}
+ loading={isLoading.pruning}
+ customLabel={m.images_prune_action()}
+ loadingLabel={m.common_action_pruning()}
+ />
</div>
</Dialog.Content>
</Dialog.Root>
diff --git a/frontend/src/routes/(app)/images/image-table.svelte b/frontend/src/routes/(app)/images/image-table.svelte
index 677309cb5..42cc0f655 100644
--- a/frontend/src/routes/(app)/images/image-table.svelte
+++ b/frontend/src/routes/(app)/images/image-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
@@ -319,10 +319,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/networks/+page.svelte b/frontend/src/routes/(app)/networks/+page.svelte
index 43a41e9c5..b95ffec93 100644
--- a/frontend/src/routes/(app)/networks/+page.svelte
+++ b/frontend/src/routes/(app)/networks/+page.svelte
@@ -76,20 +76,18 @@
title: m.networks_total(),
value: networkUsageCounts.total,
icon: NetworksIcon,
- iconColor: 'text-blue-500',
- class: 'border-l-4 border-l-blue-500'
+ iconColor: 'text-blue-500'
},
{
title: m.unused_networks(),
value: networkUsageCounts.unused,
icon: ConnectionIcon,
- iconColor: 'text-amber-500',
- class: 'border-l-4 border-l-amber-500'
+ iconColor: 'text-amber-500'
}
]);
</script>
-<ResourcePageLayout title={m.networks_title()} subtitle={m.networks_subtitle()} {actionButtons} {statCards} statCardsColumns={2}>
+<ResourcePageLayout title={m.networks_title()} subtitle={m.networks_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<NetworkTable bind:networks bind:selectedIds bind:requestOptions />
{/snippet}
diff --git a/frontend/src/routes/(app)/networks/network-table.svelte b/frontend/src/routes/(app)/networks/network-table.svelte
index e08b3da73..56cfb8b28 100644
--- a/frontend/src/routes/(app)/networks/network-table.svelte
+++ b/frontend/src/routes/(app)/networks/network-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import type { NetworkSummaryDto } from '$lib/types/network.type';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -261,10 +261,10 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
+ <ArcaneButton {...props} action="base" tone="ghost" size="icon" class="relative size-8 p-0">
<span class="sr-only">{m.common_open_menu()}</span>
<EllipsisIcon />
- </Button>
+ </ArcaneButton>
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/projects/+page.svelte
index 8062a30a8..f4d3d9085 100644
--- a/frontend/src/routes/(app)/projects/+page.svelte
+++ b/frontend/src/routes/(app)/projects/+page.svelte
@@ -113,27 +113,24 @@
title: m.compose_total(),
value: totalCompose,
icon: ProjectsIcon,
- iconColor: 'text-amber-500',
- class: 'border-l-4 border-l-amber-500'
+ iconColor: 'text-amber-500'
},
{
title: m.common_running(),
value: runningCompose,
icon: StartIcon,
- iconColor: 'text-green-500',
- class: 'border-l-4 border-l-green-500'
+ iconColor: 'text-green-500'
},
{
title: m.common_stopped(),
value: stoppedCompose,
icon: StopIcon,
- iconColor: 'text-red-500',
- class: 'border-l-4 border-l-red-500'
+ iconColor: 'text-red-500'
}
]);
</script>
-<ResourcePageLayout title={m.projects_title()} subtitle={m.compose_subtitle()} {actionButtons} {statCards} statCardsColumns={3}>
+<ResourcePageLayout title={m.projects_title()} subtitle={m.compose_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<ProjectsTable bind:projects bind:selectedIds bind:requestOptions={projectRequestOptions} />
{/snippet}
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index 7ad23e89c..a1427cdec 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
import type { Project } from '$lib/types/project.type';
- import { Button } from '$lib/components/ui/button/index.js';
import * as Tabs from '$lib/components/ui/tabs/index.js';
import * as TreeView from '$lib/components/ui/tree-view/index.js';
import * as Card from '$lib/components/ui/card';
@@ -418,18 +417,18 @@
<div class="border-border bg-card rounded-lg border">
<div class="border-border scrollbar-hide flex gap-2 overflow-x-auto border-b p-2">
{#each project.includeFiles as includeFile}
- <Button
- variant={selectedIncludeTab === includeFile.relativePath ? 'default' : 'ghost'}
+ <ArcaneButton
+ action="base"
+ tone={selectedIncludeTab === includeFile.relativePath ? 'outline-primary' : 'ghost'}
size="sm"
class="flex-shrink-0"
onclick={() => {
selectedIncludeTab =
selectedIncludeTab === includeFile.relativePath ? null : includeFile.relativePath;
}}
- >
- <FileTextIcon class="mr-2 size-4 text-amber-500" />
- {includeFile.relativePath}
- </Button>
+ icon={FileTextIcon}
+ customLabel={includeFile.relativePath}
+ />
{/each}
</div>
</div>
@@ -494,10 +493,13 @@
<p class="text-muted-foreground mb-8 max-w-md text-center">
{m.common_not_found_description({ resource: m.project().toLowerCase() })}
</p>
- <Button variant="outline" href="/projects">
- <ArrowLeftIcon class="mr-2 size-4" />
- {m.common_back_to({ resource: m.projects_title() })}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ href="/projects"
+ icon={ArrowLeftIcon}
+ customLabel={m.common_back_to({ resource: m.projects_title() })}
+ />
</div>
</div>
{/if}
diff --git a/frontend/src/routes/(app)/projects/components/EditableName.svelte b/frontend/src/routes/(app)/projects/components/EditableName.svelte
index 083822fef..c5f2cc45e 100644
--- a/frontend/src/routes/(app)/projects/components/EditableName.svelte
+++ b/frontend/src/routes/(app)/projects/components/EditableName.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import { Input } from '$lib/components/ui/input/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import * as ArcaneTooltip from '$lib/components/arcane-tooltip';
import { tick } from 'svelte';
import { m } from '$lib/paraglide/messages';
@@ -136,16 +136,16 @@
</button>
</h1>
{#if canEdit}
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="icon"
class="size-6 opacity-0 transition-opacity group-hover:opacity-100"
- aria-label="Edit name"
- title="Edit name"
+ customLabel="Edit name"
+ showLabel={false}
+ icon={EditIcon}
onclick={beginEdit}
- >
- <EditIcon class="size-3.5" />
- </Button>
+ />
{:else}
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index f9a344b5d..8da625e1d 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { ArrowLeftIcon, TerminalIcon, CopyIcon, InfoIcon, TemplateIcon, AddIcon } from '$lib/icons';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { Label } from '$lib/components/ui/label/index.js';
@@ -162,13 +162,18 @@
</script>
<div class="bg-background flex h-full min-h-0 flex-col">
- <div class="sticky top-0 border-b">
+ <div class="sticky top-0 mb-2 border-b">
<div class="mx-auto flex h-16 max-w-full items-center justify-between gap-4 px-6">
<div class="flex items-center gap-4">
- <Button variant="ghost" size="sm" href="/projects" class="gap-2 bg-transparent">
- <ArrowLeftIcon class="size-4" />
- {m.common_back()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="ghost"
+ size="sm"
+ href="/projects"
+ class="gap-2 bg-transparent"
+ icon={ArrowLeftIcon}
+ customLabel={m.common_back()}
+ />
<div class="bg-border hidden h-4 w-px sm:block"></div>
<div class="hidden items-center gap-3 sm:flex">
<EditableName
@@ -191,8 +196,9 @@
>
<ArcaneTooltip.Trigger>
<span>
- <Button
- variant="ghost"
+ <ArcaneButton
+ action="create"
+ tone="ghost"
disabled={!$inputs.name.value ||
!$inputs.composeContent.value ||
saving ||
@@ -200,15 +206,10 @@
isLoadingTemplateContent}
onclick={() => handleSubmit()}
class={`${templateBtnClass} gap-2 rounded-r-none`}
- >
- {#if saving}
- <Spinner class="size-4" />
- {m.common_action_creating()}
- {:else}
- <AddIcon class="size-4" />
- {m.compose_create_project()}
- {/if}
- </Button>
+ loading={saving}
+ customLabel={m.compose_create_project()}
+ loadingLabel={m.common_action_creating()}
+ />
</span>
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content class="arcane-tooltip-content max-w-[280px]">
@@ -227,9 +228,13 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} class={`${templateBtnClass} -ml-px rounded-l-none px-2`} variant="ghost">
- <ChevronDown class="size-4" />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ class={`${templateBtnClass} -ml-px rounded-l-none px-2`}
+ icon={ChevronDown}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end" class={dropdownContentClass}>
@@ -275,7 +280,7 @@
<div class="flex min-h-0 flex-1 overflow-hidden">
<div class="mx-auto h-full w-full max-w-full min-w-0">
<div class="flex h-full min-h-0 flex-col gap-4">
- <div class="block flex-shrink-0 pt-4 sm:hidden">
+ <div class="block flex-shrink-0 py-4 sm:hidden">
<EditableName
bind:value={$inputs.name.value}
bind:ref={nameInputRef}
@@ -340,31 +345,29 @@
<Label class="text-muted-foreground text-xs">{m.compose_example_commands_label()}</Label>
<div class="space-y-1">
{#each exampleCommands as command}
- <Button
- type="button"
- variant="ghost"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
size="sm"
class="h-auto w-full justify-start p-2 text-left font-mono text-xs break-all whitespace-normal"
onclick={() => useExample(command)}
- >
- <CopyIcon class="mr-2 size-3 shrink-0" />
- <span>{command}</span>
- </Button>
+ icon={CopyIcon}
+ customLabel={command}
+ />
{/each}
</div>
</div>
</div>
<div class="flex w-full justify-end pt-4">
- <Button type="button" disabled={!dockerRunCommand.trim() || converting} onclick={handleConvertDockerRun}>
- {#if converting}
- <Spinner class="mr-2 size-4" />
- {m.compose_converting()}
- {:else}
- <AddIcon class="mr-2 size-4" />
- {m.compose_convert_action()}
- {/if}
- </Button>
+ <ArcaneButton
+ action="create"
+ disabled={!dockerRunCommand.trim() || converting}
+ onclick={handleConvertDockerRun}
+ loading={converting}
+ customLabel={m.compose_convert_action()}
+ loadingLabel={m.compose_converting()}
+ />
</div>
</Dialog.Content>
</Dialog.Root>
diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelte
index 1dafaa525..e7131cf82 100644
--- a/frontend/src/routes/(app)/projects/projects-table.svelte
+++ b/frontend/src/routes/(app)/projects/projects-table.svelte
@@ -1,7 +1,7 @@
<script lang="ts">
import type { Project } from '$lib/types/project.type';
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { EllipsisIcon, EditIcon, StartIcon, RestartIcon, StopIcon, TrashIcon } from '$lib/icons';
import { Spinner } from '$lib/components/ui/spinner/index.js';
import { goto } from '$app/navigation';
@@ -222,10 +222,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/settings/+layout.svelte b/frontend/src/routes/(app)/settings/+layout.svelte
index 2f1b49585..9716f69d4 100644
--- a/frontend/src/routes/(app)/settings/+layout.svelte
+++ b/frontend/src/routes/(app)/settings/+layout.svelte
@@ -2,7 +2,7 @@
import { page } from '$app/state';
import { goto, beforeNavigate } from '$app/navigation';
import { setContext } from 'svelte';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { SettingsIcon, ArrowRightIcon, ArrowLeftIcon, SaveIcon, ResetIcon } from '$lib/icons';
import { useSidebar } from '$lib/components/ui/sidebar/context.svelte.js';
import { m } from '$lib/paraglide/messages';
@@ -214,26 +214,25 @@
<div class="px-4 py-3">
<div class="flex items-center justify-between gap-4">
<div class="flex min-w-0 items-center gap-2">
- <Button
- variant="ghost"
- size="sm"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
onclick={goBackToSettings}
class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
- >
- <ArrowLeftIcon class="size-4" />
- <span class="hidden sm:inline">{m.common_back()}</span>
- </Button>
+ icon={ArrowLeftIcon}
+ customLabel={m.common_back()}
+ showLabel={!isMobile.current}
+ />
<nav class="flex min-w-0 items-center gap-2 text-sm">
- <Button
- variant="ghost"
- size="sm"
+ <ArcaneButton
+ action="base"
+ tone="ghost"
onclick={goBackToSettings}
class="text-muted-foreground hover:text-foreground shrink-0 gap-2"
- >
- <SettingsIcon class="size-4" />
- <span>{m.settings_title()}</span>
- </Button>
+ icon={SettingsIcon}
+ customLabel={m.settings_title()}
+ />
<ArrowRightIcon class="text-muted-foreground size-4 shrink-0" />
<span class="text-foreground truncate font-medium">{pageTitle()}</span>
</nav>
@@ -264,29 +263,26 @@
') + 1rem)'};"
>
{#if formState.hasChanges && formState.resetFunction}
- <Button
- variant="outline"
+ <ArcaneButton
+ action="restart"
+ tone="outline"
size="lg"
onclick={() => formState.resetFunction && formState.resetFunction()}
disabled={formState.isLoading}
class={cn('size-14 rounded-full border-2 shadow-lg', isGlassEnabled ? 'bg-background/80 backdrop-blur-md' : 'bg-card')}
- >
- <ResetIcon class="size-5" />
- </Button>
+ showLabel={false}
+ />
{/if}
- <Button
+ <ArcaneButton
+ action="save"
onclick={handleSave}
disabled={formState.isLoading || !formState.hasChanges || !formState.saveFunction}
+ loading={formState.isLoading}
size="lg"
- class="bg-primary text-primary-foreground hover:bg-primary/90 disabled:bg-muted disabled:text-muted-foreground size-14 rounded-full shadow-lg"
- >
- {#if formState.isLoading}
- <div class="border-background size-5 animate-spin rounded-full border-2 border-t-transparent"></div>
- {:else}
- <SaveIcon class="size-5" />
- {/if}
- </Button>
+ class="size-14 rounded-full shadow-lg"
+ showLabel={false}
+ />
<!-- Status indicator for mobile -->
{#if formState.hasChanges}
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index c0c3700b6..7695177a9 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -10,9 +10,10 @@
ArrowRightIcon,
DockerBrandIcon,
ApiKeyIcon,
- ApperanceIcon
+ ApperanceIcon,
+ CloseIcon
} from '$lib/icons';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Card } from '$lib/components/ui/card';
import { m } from '$lib/paraglide/messages';
import { UiConfigDisabledTag } from '$lib/components/badges/index.js';
@@ -143,10 +144,16 @@
/>
<InputGroup.Addon>
{#if showSearchResults}
- <Button variant="ghost" size="sm" onclick={clearSearch} class="h-6 w-6 p-0">
- <span class="sr-only">{m.settings_clear_search()}</span>
- ×
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="ghost"
+ size="sm"
+ onclick={clearSearch}
+ class="h-6 w-6 p-0"
+ icon={CloseIcon}
+ showLabel={false}
+ customLabel={m.settings_clear_search()}
+ />
{:else}
<SearchIcon />
{/if}
@@ -216,9 +223,14 @@
<p class="text-muted-foreground text-xs sm:text-sm">{result.description}</p>
</div>
</div>
- <Button variant="outline" size="sm" onclick={() => navigateToCategory(result.url)} class="shrink-0">
- {m.settings_go_to_page()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ size="sm"
+ onclick={() => navigateToCategory(result.url)}
+ class="shrink-0"
+ customLabel={m.settings_go_to_page()}
+ />
</div>
</div>
diff --git a/frontend/src/routes/(app)/settings/api-keys/+page.svelte b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
index 09a42d99a..49884107d 100644
--- a/frontend/src/routes/(app)/settings/api-keys/+page.svelte
+++ b/frontend/src/routes/(app)/settings/api-keys/+page.svelte
@@ -9,7 +9,7 @@
import { apiKeyService } from '$lib/services/api-key-service';
import { SettingsPageLayout, type SettingsActionButton } from '$lib/layouts/index.js';
import * as ResponsiveDialog from '$lib/components/ui/responsive-dialog/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Snippet } from '$lib/components/ui/snippet/index.js';
import * as m from '$lib/paraglide/messages.js';
import { untrack } from 'svelte';
@@ -112,7 +112,6 @@
icon={ApiKeyIcon}
pageType="management"
{actionButtons}
- statCardsColumns={3}
>
{#snippet mainContent()}
<ApiKeyTable
@@ -164,7 +163,7 @@
</div>
{/snippet}
{#snippet footer()}
- <Button onclick={() => (isDialogOpen.showKey = false)}>{m.common_done()}</Button>
+ <ArcaneButton action="confirm" onclick={() => (isDialogOpen.showKey = false)} customLabel={m.common_done()} />
{/snippet}
</ResponsiveDialog.Root>
{/snippet}
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 cce6404ec..86fe9898c 100644
--- a/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte
+++ b/frontend/src/routes/(app)/settings/api-keys/api-key-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { CopyButton } from '$lib/components/ui/copy-button';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -222,10 +222,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/settings/notifications/+page.svelte b/frontend/src/routes/(app)/settings/notifications/+page.svelte
index 419d6d34d..7a865701e 100644
--- a/frontend/src/routes/(app)/settings/notifications/+page.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/+page.svelte
@@ -3,7 +3,7 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import * as Tabs from '$lib/components/ui/tabs';
import * as Dialog from '$lib/components/ui/dialog';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Spinner } from '$lib/components/ui/spinner';
import { toast } from 'svelte-sonner';
import { getContext, onMount } from 'svelte';
@@ -538,18 +538,15 @@
</div>
<div class="pt-2">
- <Button
- variant="outline"
+ <ArcaneButton
+ action="base"
+ tone="outline"
onclick={() => testNotification('discord')}
disabled={isReadOnly || isTesting}
- >
- {#if isTesting}
- <Spinner class="mr-2 h-4 w-4" />
- {:else}
- <SendEmailIcon class="mr-2 h-4 w-4" />
- {/if}
- {m.notifications_discord_test_button()}
- </Button>
+ loading={isTesting}
+ icon={SendEmailIcon}
+ customLabel={m.notifications_discord_test_button()}
+ />
</div>
</div>
{/if}
@@ -703,15 +700,16 @@
<div class="pt-2">
<DropdownMenu.Root>
<DropdownMenu.Trigger>
- <Button variant="outline" disabled={isReadOnly || isTesting}>
- {#if isTesting}
- <Spinner class="size-4" />
- {:else}
- <SendEmailIcon class="size-4" />
- {/if}
- {m.notifications_email_test_button()}
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ disabled={isReadOnly || isTesting}
+ loading={isTesting}
+ icon={SendEmailIcon}
+ customLabel={m.notifications_email_test_button()}
+ >
<ArrowDownIcon class="ml-2 size-4" />
- </Button>
+ </ArcaneButton>
</DropdownMenu.Trigger>
<DropdownMenu.Content align="start">
<DropdownMenu.Item onclick={() => testNotification('email', 'simple')}>
@@ -794,14 +792,15 @@
/>
<div class="pt-2">
- <Button variant="outline" onclick={() => testAppriseNotification()} disabled={isReadOnly || isTesting}>
- {#if isTesting}
- <Spinner class="mr-2 h-4 w-4" />
- {:else}
- <SendEmailIcon class="mr-2 h-4 w-4" />
- {/if}
- {m.notifications_apprise_test_button()}
- </Button>
+ <ArcaneButton
+ action="base"
+ tone="outline"
+ onclick={() => testAppriseNotification()}
+ disabled={isReadOnly || isTesting}
+ loading={isTesting}
+ icon={SendEmailIcon}
+ customLabel={m.notifications_apprise_test_button()}
+ />
</div>
</div>
{/if}
@@ -825,12 +824,8 @@
</Dialog.Description>
</Dialog.Header>
<Dialog.Footer>
- <Button variant="outline" onclick={() => (showUnsavedDialog = false)}>
- {m.common_cancel()}
- </Button>
- <Button onclick={handleSaveAndTest}>
- {m.notifications_unsaved_changes_save_and_test()}
- </Button>
+ <ArcaneButton action="cancel" onclick={() => (showUnsavedDialog = false)} />
+ <ArcaneButton action="confirm" onclick={handleSaveAndTest} customLabel={m.notifications_unsaved_changes_save_and_test()} />
</Dialog.Footer>
</Dialog.Content>
</Dialog.Root>
diff --git a/frontend/src/routes/(app)/settings/security/+page.svelte b/frontend/src/routes/(app)/settings/security/+page.svelte
index 73941fbdc..b9cbc76fb 100644
--- a/frontend/src/routes/(app)/settings/security/+page.svelte
+++ b/frontend/src/routes/(app)/settings/security/+page.svelte
@@ -2,7 +2,7 @@
import * as AlertDialog from '$lib/components/ui/alert-dialog';
import { z } from 'zod/v4';
import { onMount } from 'svelte';
- import { Button } from '$lib/components/ui/button';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Input } from '$lib/components/ui/input';
import { Label } from '$lib/components/ui/label';
import { Switch } from '$lib/components/ui/switch/index.js';
@@ -415,15 +415,13 @@
<div class="grid grid-cols-1 gap-2 sm:grid-cols-3 sm:gap-3" role="group" aria-labelledby="passwordPolicyLabel">
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'basic' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'basic'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'basic' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
onclick={() => ($formInputs.authPasswordPolicy.value = 'basic')}
- type="button"
- >{m.common_basic()}
- </Button>
+ customLabel={m.common_basic()}
+ />
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content side="top">
{m.security_password_policy_basic_tooltip()}
@@ -432,15 +430,13 @@
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'standard' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'standard'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'standard' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
onclick={() => ($formInputs.authPasswordPolicy.value = 'standard')}
- type="button"
- >{m.security_password_policy_standard()}
- </Button>
+ customLabel={m.security_password_policy_standard()}
+ />
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content side="top">
{m.security_password_policy_standard_tooltip()}
@@ -449,15 +445,13 @@
<ArcaneTooltip.Root>
<ArcaneTooltip.Trigger>
- <Button
- variant={$formInputs.authPasswordPolicy.value === 'strong' ? 'default' : 'outline'}
- class={$formInputs.authPasswordPolicy.value === 'strong'
- ? 'arcane-button-create h-12 w-full text-xs sm:text-sm'
- : 'arcane-button-restart h-12 w-full text-xs sm:text-sm'}
+ <ArcaneButton
+ action="base"
+ tone={$formInputs.authPasswordPolicy.value === 'strong' ? 'outline-primary' : 'outline'}
+ class="h-12 w-full text-xs sm:text-sm"
onclick={() => ($formInputs.authPasswordPolicy.value = 'strong')}
- type="button"
- >{m.security_password_policy_strong()}
- </Button>
+ customLabel={m.security_password_policy_strong()}
+ />
</ArcaneTooltip.Trigger>
<ArcaneTooltip.Content side="top">
{m.security_password_policy_strong_tooltip()}
diff --git a/frontend/src/routes/(app)/settings/users/+page.svelte b/frontend/src/routes/(app)/settings/users/+page.svelte
index 7cad69052..89917ec01 100644
--- a/frontend/src/routes/(app)/settings/users/+page.svelte
+++ b/frontend/src/routes/(app)/settings/users/+page.svelte
@@ -121,7 +121,6 @@
icon={UsersIcon}
pageType="management"
{actionButtons}
- statCardsColumns={3}
>
{#snippet mainContent()}
<UserTable
diff --git a/frontend/src/routes/(app)/settings/users/user-table.svelte b/frontend/src/routes/(app)/settings/users/user-table.svelte
index 91f00672a..70719a4d8 100644
--- a/frontend/src/routes/(app)/settings/users/user-table.svelte
+++ b/frontend/src/routes/(app)/settings/users/user-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
import { openConfirmDialog } from '$lib/components/confirm-dialog';
@@ -180,10 +180,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(app)/volumes/+page.svelte b/frontend/src/routes/(app)/volumes/+page.svelte
index d8dd9bdac..b3f2068c5 100644
--- a/frontend/src/routes/(app)/volumes/+page.svelte
+++ b/frontend/src/routes/(app)/volumes/+page.svelte
@@ -80,27 +80,24 @@
title: m.volumes_stat_total(),
value: volumeUsageCounts.total,
icon: VolumesIcon,
- iconColor: 'text-blue-500',
- class: 'border-l-4 border-l-blue-500'
+ iconColor: 'text-blue-500'
},
{
title: m.volumes_stat_used(),
value: volumeUsageCounts.inuse,
icon: VolumeUsedIcon,
- iconColor: 'text-green-500',
- class: 'border-l-4 border-l-green-500'
+ iconColor: 'text-green-500'
},
{
title: m.volumes_stat_unused(),
value: volumeUsageCounts.unused,
icon: VolumeUnusedIcon,
- iconColor: 'text-red-500',
- class: 'border-l-4 border-l-red-500'
+ iconColor: 'text-red-500'
}
]);
</script>
-<ResourcePageLayout title={m.volumes_title()} subtitle={m.volumes_subtitle()} {actionButtons} {statCards} statCardsColumns={3}>
+<ResourcePageLayout title={m.volumes_title()} subtitle={m.volumes_subtitle()} {actionButtons} {statCards}>
{#snippet mainContent()}
<VolumeTable bind:volumes bind:selectedIds bind:requestOptions />
{/snippet}
diff --git a/frontend/src/routes/(app)/volumes/volume-table.svelte b/frontend/src/routes/(app)/volumes/volume-table.svelte
index c8fb019a5..717073fc8 100644
--- a/frontend/src/routes/(app)/volumes/volume-table.svelte
+++ b/frontend/src/routes/(app)/volumes/volume-table.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import ArcaneTable from '$lib/components/arcane-table/arcane-table.svelte';
- import { Button } from '$lib/components/ui/button/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { goto } from '$app/navigation';
import { toast } from 'svelte-sonner';
import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
@@ -226,10 +226,16 @@
<DropdownMenu.Root>
<DropdownMenu.Trigger>
{#snippet child({ props })}
- <Button {...props} variant="ghost" size="icon" class="relative size-8 p-0">
- <span class="sr-only">{m.common_open_menu()}</span>
- <EllipsisIcon />
- </Button>
+ <ArcaneButton
+ {...props}
+ action="base"
+ tone="ghost"
+ size="icon"
+ class="relative size-8 p-0"
+ icon={EllipsisIcon}
+ showLabel={false}
+ customLabel={m.common_open_menu()}
+ />
{/snippet}
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
diff --git a/frontend/src/routes/(auth)/login/+page.svelte b/frontend/src/routes/(auth)/login/+page.svelte
index 252839db8..cc675fc69 100644
--- a/frontend/src/routes/(auth)/login/+page.svelte
+++ b/frontend/src/routes/(auth)/login/+page.svelte
@@ -1,16 +1,17 @@
<script lang="ts">
- import { Button } from '$lib/components/ui/button/index.js';
import { Label } from '$lib/components/ui/label/index.js';
import * as Card from '$lib/components/ui/card/index.js';
import * as Alert from '$lib/components/ui/alert/index.js';
import * as InputGroup from '$lib/components/ui/input-group/index.js';
- import { AlertIcon, LockIcon, UserIcon, ArrowRightIcon, GithubIcon, OpenIdIcon, LoginIcon } from '$lib/icons';
+ import { AlertIcon, LockIcon, UserIcon, GithubIcon } from '$lib/icons';
import type { PageData } from './$types';
import { goto } from '$app/navigation';
import userStore from '$lib/stores/user-store';
import { m } from '$lib/paraglide/messages';
import { authService } from '$lib/services/auth-service';
import { getApplicationLogo } from '$lib/utils/image.util';
+ import { Motion } from 'svelte-motion';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
let { data }: { data: PageData } = $props();
@@ -19,7 +20,6 @@
let username = $state('');
let password = $state('');
- // Make logo URL reactive to accent color changes
let logoUrl = $derived(getApplicationLogo());
const oidcEnabledBySettings = $derived(data.settings?.oidcEnabled === true);
@@ -58,51 +58,67 @@
const showDivider = $derived(showOidcLoginButton && showLocalLoginForm);
- // Generate random starting positions for each orb
- const orb1X = Math.random() * 80 - 40;
- const orb1Y = Math.random() * 80 - 40;
- const orb2X = Math.random() * 80 - 40;
- const orb2Y = Math.random() * 80 - 40;
- const orb3X = Math.random() * 80 - 40;
- const orb3Y = Math.random() * 80 - 40;
- const orb4X = Math.random() * 80 - 40;
- const orb4Y = Math.random() * 80 - 40;
+ function getOrbAnimation(startX: number, startY: number, duration: number, delay: number) {
+ const xOffset = startX * 4;
+ const yOffset = startY * 4;
+
+ return {
+ animate: {
+ x: [-20 + xOffset, 60 + xOffset, 20 + xOffset, -80 + xOffset, -20 + xOffset],
+ y: [-20 + yOffset, -80 + yOffset, 20 + yOffset, 60 + yOffset, -20 + yOffset],
+ scale: [1, 1.15, 0.95, 1.1, 1]
+ },
+ transition: {
+ duration: duration,
+ ease: 'easeInOut',
+ repeat: Infinity,
+ delay: delay
+ }
+ };
+ }
- // Add random delay for each orb to create natural animation
- const orb1Delay = Math.random() * 2;
- const orb2Delay = Math.random() * 2;
- const orb3Delay = Math.random() * 2;
- const orb4Delay = Math.random() * 2;
+ const orb1Anim = getOrbAnimation(-20, 30, 18, 0.5);
+ const orb2Anim = getOrbAnimation(35, -10, 22, 1.2);
+ const orb3Anim = getOrbAnimation(-15, -30, 20, 0.8);
+ const orb4Anim = getOrbAnimation(25, 15, 16, 1.8);
</script>
<div class="fixed inset-0 overflow-hidden">
- <div
- class="bg-primary orb absolute top-[-150px] left-[10%] h-[330px] w-[330px] rounded-full opacity-30 blur-[57px] md:h-[500px] md:w-[500px] md:blur-[85px]"
- style="--start-x: {orb1X}; --start-y: {orb1Y}; --orb-delay: {orb1Delay}s; --orb-duration: 18s;"
- ></div>
- <div
- class="bg-primary orb absolute right-[15%] bottom-[-150px] h-[280px] w-[280px] rounded-full opacity-30 blur-[57px] md:h-[420px] md:w-[420px] md:blur-[85px]"
- style="--start-x: {orb2X}; --start-y: {orb2Y}; --orb-delay: {orb2Delay}s; --orb-duration: 22s;"
- ></div>
- <div
- class="bg-primary orb absolute top-[20%] right-[-120px] h-[250px] w-[250px] rounded-full opacity-30 blur-[57px] md:h-[380px] md:w-[380px] md:blur-[85px]"
- style="--start-x: {orb3X}; --start-y: {orb3Y}; --orb-delay: {orb3Delay}s; --orb-duration: 20s;"
- ></div>
- <div
- class="bg-primary orb absolute bottom-[30%] left-[-100px] h-[210px] w-[210px] rounded-full opacity-30 blur-[57px] md:h-[320px] md:w-[320px] md:blur-[85px]"
- style="--start-x: {orb4X}; --start-y: {orb4Y}; --orb-delay: {orb4Delay}s; --orb-duration: 16s;"
- ></div>
+ <Motion animate={orb1Anim.animate} transition={orb1Anim.transition} let:motion>
+ <div
+ use:motion
+ class="bg-primary absolute top-[-150px] left-[10%] h-[330px] w-[330px] rounded-full opacity-30 blur-[57px] md:h-[500px] md:w-[500px] md:blur-[85px]"
+ ></div>
+ </Motion>
+ <Motion animate={orb2Anim.animate} transition={orb2Anim.transition} let:motion>
+ <div
+ use:motion
+ class="bg-primary absolute right-[15%] bottom-[-150px] h-[280px] w-[280px] rounded-full opacity-30 blur-[57px] md:h-[420px] md:w-[420px] md:blur-[85px]"
+ ></div>
+ </Motion>
+ <Motion animate={orb3Anim.animate} transition={orb3Anim.transition} let:motion>
+ <div
+ use:motion
+ class="bg-primary absolute top-[20%] right-[-120px] h-[250px] w-[250px] rounded-full opacity-30 blur-[57px] md:h-[380px] md:w-[380px] md:blur-[85px]"
+ ></div>
+ </Motion>
+ <Motion animate={orb4Anim.animate} transition={orb4Anim.transition} let:motion>
+ <div
+ use:motion
+ class="bg-primary absolute bottom-[30%] left-[-100px] h-[210px] w-[210px] rounded-full opacity-30 blur-[57px] md:h-[320px] md:w-[320px] md:blur-[85px]"
+ ></div>
+ </Motion>
</div>
<div class="relative flex min-h-screen flex-col items-center justify-center p-6 md:p-10">
<div class="w-full max-w-md">
<div class="mb-8 flex justify-center">
- <div class="glass-light bubble bubble-shadow-lg flex items-center justify-center rounded-2xl p-6">
+ <div class="bg-card/60 flex items-center justify-center rounded-2xl border p-6 shadow-lg backdrop-blur-2xl">
<img class="h-24 w-auto" src={logoUrl} alt={m.layout_title()} />
</div>
</div>
- <Card.Root class="bubble bubble-shadow-lg flex flex-col gap-6 overflow-hidden">
+ <Card.Root class="bg-card/60 flex flex-col gap-6 overflow-hidden border shadow-lg backdrop-blur-2xl">
<Card.Content class="p-8">
<div class="mb-8 flex flex-col items-center text-center">
<h1 class="text-3xl font-bold tracking-tight">{m.auth_welcome_back_title()}</h1>
@@ -111,7 +127,7 @@
<div class="space-y-4">
{#if data.error}
- <Alert.Root variant="destructive" class="glass-light">
+ <Alert.Root variant="destructive" class="bg-card/60 border backdrop-blur-2xl">
<AlertIcon class="size-4" />
<Alert.Title>{m.auth_login_problem_title()}</Alert.Title>
<Alert.Description>
@@ -137,7 +153,7 @@
{/if}
{#if error}
- <Alert.Root variant="destructive" class="glass-light">
+ <Alert.Root variant="destructive" class="bg-card/60 border backdrop-blur-2xl">
<AlertIcon class="size-4" />
<Alert.Title>{m.auth_failed_title()}</Alert.Title>
<Alert.Description>{error}</Alert.Description>
@@ -145,7 +161,7 @@
{/if}
{#if !showLocalLoginForm && !showOidcLoginButton}
- <Alert.Root variant="destructive" class="glass-light">
+ <Alert.Root variant="destructive" class="bg-card/60 border backdrop-blur-2xl">
<AlertIcon class="size-4" />
<Alert.Title>{m.auth_no_login_methods_title()}</Alert.Title>
<Alert.Description>{m.auth_no_login_methods_description()}</Alert.Description>
@@ -153,10 +169,7 @@
{/if}
{#if showOidcLoginButton && !showLocalLoginForm}
- <Button onclick={handleOidcLogin} class="hover-lift w-full" size="lg">
- <ArrowRightIcon class="mr-2 size-4" />
- {m.auth_oidc_signin()}
- </Button>
+ <ArcaneButton hoverEffect="none" action="oidc_login" onclick={() => handleOidcLogin()} {loading} />
{/if}
{#if showLocalLoginForm}
@@ -197,15 +210,7 @@
/>
</InputGroup.Root>
</div>
- <Button type="submit" class="hover-lift w-full" size="lg" disabled={loading} aria-busy={loading}>
- {#if loading}
- <div class="mr-2 size-4 animate-spin rounded-full border-2 border-white/30 border-t-white"></div>
- {m.auth_signing_in()}
- {:else}
- <LoginIcon class="mr-2 size-4" />
- {m.auth_signin_button()}
- {/if}
- </Button>
+ <ArcaneButton type="submit" action="login" {loading} hoverEffect="none" />
</form>
{#if showDivider}
@@ -214,7 +219,7 @@
<div class="border-border/60 w-full border-t"></div>
</div>
<div class="relative flex justify-center text-xs">
- <span class="glass-light bubble-pill text-muted-foreground px-3 py-1">
+ <span class="bg-card/60 text-muted-foreground rounded-full border px-3 py-1 backdrop-blur-2xl">
{m.auth_or_continue()}
</span>
</div>
@@ -222,10 +227,7 @@
{/if}
{#if showOidcLoginButton && showDivider}
- <Button onclick={handleOidcLogin} variant="outline" class="hover-lift w-full" size="lg">
- <OpenIdIcon class="size-4" />
- {m.auth_oidc_signin()}
- </Button>
+ <ArcaneButton action="oidc_login" hoverEffect="none" onclick={() => handleOidcLogin()} {loading} />
{/if}
{/if}
</div>
@@ -240,7 +242,7 @@
href="https://github.com/ofkm/arcane"
target="_blank"
rel="noopener noreferrer"
- class="glass-light bubble-pill hover:text-primary flex items-center gap-1.5 text-xs transition-colors"
+ class="bg-card/60 hover:text-primary inline-flex items-center gap-1.5 rounded-full border px-3 py-1.5 text-xs shadow-sm backdrop-blur-2xl transition-colors"
>
<GithubIcon class="size-4" />
{m.common_view_on_github()}
@@ -250,33 +252,3 @@
{/if}
</div>
</div>
-
-<style>
- .orb {
- transform: translate(calc(-20px + var(--start-x) * 4px), calc(-20px + var(--start-y) * 4px)) scale(1);
- animation: orb-float var(--orb-duration, 18s) ease-in-out infinite;
- animation-delay: var(--orb-delay, 0s);
- }
-
- @keyframes orb-float {
- 0%,
- 100% {
- transform: translate(calc(-20px + var(--start-x) * 4px), calc(-20px + var(--start-y) * 4px)) scale(1);
- }
- 25% {
- transform: translate(calc(60px + var(--start-x) * 4px), calc(-80px + var(--start-y) * 4px)) scale(1.15);
- }
- 50% {
- transform: translate(calc(20px + var(--start-x) * 4px), calc(20px + var(--start-y) * 4px)) scale(0.95);
- }
- 75% {
- transform: translate(calc(-80px + var(--start-x) * 4px), calc(60px + var(--start-y) * 4px)) scale(1.1);
- }
- }
-
- @media (prefers-reduced-motion: reduce) {
- .orb {
- animation: none;
- }
- }
-</style>
diff --git a/package.json b/package.json
index f3f067c21..711398b83 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,12 @@
"build": "pnpm --filter arcane-frontend build",
"test:up": "docker compose -f tests/setup/compose.yaml up -d --build",
"test:down": "docker compose -f tests/setup/compose.yaml down",
- "test": "pnpm test:up && pnpm --filter arcane-tests test && pnpm test:down",
+ "test": "pnpm --filter arcane-tests test",
"format": "pnpm --filter arcane-frontend format",
"check": "pnpm --filter arcane-frontend check",
"knip": "pnpm --filter arcane-frontend knip"
+ },
+ "dependencies": {
+ "svelte-motion": "^0.12.2"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60b38faa7..5e25d905f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,11 @@ overrides:
importers:
- .: {}
+ .:
+ dependencies:
+ svelte-motion:
+ specifier: ^0.12.2
+ version: 0.12.2([email protected])
email-templates:
dependencies:
@@ -1667,11 +1671,17 @@ packages:
resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
+
resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
peerDependencies:
'@types/react': ^19.2.0
+ '@types/[email protected]':
+ resolution: {integrity: sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==}
+
resolution: {integrity: sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==}
@@ -2205,6 +2215,9 @@ packages:
svelte: ^5.0.0
sveltekit-superforms: ^2.19.0
+ resolution: {integrity: sha512-jBTqhX6KaQVDyus8muwZbBeGGP0XgujBRbQ7gM7BRdS3CadCZIHiawyzYLnafYcvZIh5j8WE7cxZKFn7dXhu9g==}
+
resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -2267,6 +2280,9 @@ packages:
resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+ resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==}
+
resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
engines: {node: '>=18'}
@@ -2748,6 +2764,9 @@ packages:
engines: {node: '>=18'}
hasBin: true
+ resolution: {integrity: sha512-la8gPM1WYeFznb/JqF4GiTkRRPZsfaj2+kCxqQgr2MJylMmIKUwBfWW8Wa5fml/8gmtlD5yI01MP1QCZPWmppA==}
+
resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
engines: {node: ^10 || ^12 || >=14}
@@ -3072,6 +3091,9 @@ packages:
resolution: {integrity: sha512-5A560JmXr7wDyGLK12Nq/EYS38VkGlglVzkis1JEdbGWSnbQIEhZzTJhzURXN5/8WwwFCs/f/VVcmkTppbXLow==}
+ resolution: {integrity: sha512-Vs9fNreYF9j6W2VvuDTP7kepALi7sk0xtk2Tu8Yxi9UoajJdEVpNpCov0HsLTqXvNGKX+Uv09pkozVITi1jf3Q==}
+
resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
engines: {node: '>= 12.0.0'}
@@ -3097,6 +3119,11 @@ packages:
svelte: ^4.0.0 || ^5.0.0-next.0
typescript: '>=5.0.0'
+ resolution: {integrity: sha512-7RrdRz9iVP55B9HT/C0hYW3pyrKlF61kAby/AkDtOAP0uHFQDrfd0qQetDC81cEsK9b40jt+jfcqSAXcA7LPEw==}
+ peerDependencies:
+ svelte: '>=3.35.0 || ^4.0.0 || ^5.0.0 || ^5.0.0-next.0'
+
resolution: {integrity: sha512-1EUFYmd7q/xfs2qCHwJzGPh9n5VJ3X6QjBN10fof2vxgy8fYE7kVfZ7uGnd7i6fQaWIr5KvXcwYXE/cmTEjk5A==}
peerDependencies:
@@ -3229,6 +3256,9 @@ packages:
resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
+
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
@@ -4618,10 +4648,17 @@ snapshots:
dependencies:
undici-types: 7.16.0
+ '@types/[email protected]': {}
+
dependencies:
'@types/react': 19.2.7
+ '@types/[email protected]':
+ dependencies:
+ '@types/prop-types': 15.7.15
+ csstype: 3.2.3
+
dependencies:
csstype: 3.2.3
@@ -5193,6 +5230,10 @@ snapshots:
svelte-toolbelt: 0.5.0([email protected])
+ dependencies:
+ tslib: 2.4.0
+
optional: true
@@ -5270,6 +5311,8 @@ snapshots:
dependencies:
'@types/hast': 3.0.4
+
dependencies:
whatwg-encoding: 3.1.1
@@ -5769,6 +5812,13 @@ snapshots:
optionalDependencies:
fsevents: 2.3.2
+ dependencies:
+ framesync: 6.1.2
+ hey-listen: 1.0.8
+ style-value-types: 5.1.2
+ tslib: 2.4.0
+
dependencies:
nanoid: 3.3.11
@@ -6118,6 +6168,11 @@ snapshots:
dependencies:
inline-style-parser: 0.2.4
+ dependencies:
+ hey-listen: 1.0.8
+ tslib: 2.4.0
+
dependencies:
client-only: 0.0.1
@@ -6138,6 +6193,15 @@ snapshots:
transitivePeerDependencies:
- picomatch
+ dependencies:
+ '@types/react': 18.3.27
+ framesync: 6.1.2
+ popmotion: 11.0.5
+ style-value-types: 5.1.2
+ svelte: 5.46.0
+ tslib: 2.8.1
+
dependencies:
runed: 0.28.0([email protected])
@@ -6295,6 +6359,8 @@ snapshots:
minimist: 1.2.8
strip-bom: 3.0.0
+
diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts
index 646cc2c30..f0d3f2684 100644
--- a/tests/playwright.config.ts
+++ b/tests/playwright.config.ts
@@ -1,7 +1,6 @@
import { defineConfig, devices } from '@playwright/test';
const baseURL = process.env.BASE_URL || 'http://localhost:3000';
-const composeFile = process.env.COMPOSE_FILE || 'setup/compose.yaml';
export default defineConfig({
testDir: '.',
@@ -9,8 +8,11 @@ export default defineConfig({
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
workers: process.env.CI ? 1 : undefined,
- reporter: process.env.CI
- ? [['html', { outputFolder: '.report' }], ['github']]
+ globalSetup: './setup/global-setup',
+ globalTeardown: './setup/global-teardown',
+ reporter:
+ process.env.CI ?
+ [['html', { outputFolder: '.report' }], ['github']]
: [['line'], ['html', { open: 'never', outputFolder: '.report' }]],
use: {
baseURL,
@@ -29,10 +31,4 @@ export default defineConfig({
testMatch: /spec\/.*\.spec\.ts/,
},
],
- webServer: {
- command: `docker compose -f ${composeFile} up --abort-on-container-exit`,
- url: baseURL,
- reuseExistingServer: !process.env.CI,
- timeout: 120 * 1000,
- },
});
diff --git a/tests/setup/global-setup.ts b/tests/setup/global-setup.ts
new file mode 100644
index 000000000..1cafc0fce
--- /dev/null
+++ b/tests/setup/global-setup.ts
@@ -0,0 +1,57 @@
+import { execSync } from 'child_process';
+import path from 'node:path';
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+async function globalSetup() {
+ console.log('\nStarting global setup...');
+
+ const composeFile =
+ process.env.COMPOSE_FILE ? path.resolve(__dirname, '..', process.env.COMPOSE_FILE) : path.resolve(__dirname, 'compose.yaml');
+
+ try {
+ console.log('Building and starting Docker containers...');
+ execSync(`docker compose -f ${composeFile} up -d --build`, { stdio: 'inherit' });
+ console.log('Docker containers are up.');
+ } catch (error) {
+ console.error('Failed to start Docker containers:', error);
+ throw error;
+ }
+
+ // 2. Wait for the server to be ready
+ const baseURL = process.env.BASE_URL || 'http://localhost:3000';
+ console.log(`Waiting for server at ${baseURL}...`);
+
+ const maxAttempts = 60;
+ let attempts = 0;
+ while (attempts < maxAttempts) {
+ try {
+ const response = await fetch(baseURL);
+ if (response.ok) {
+ console.log('Server is ready!');
+ break;
+ }
+ } catch (e) {
+ // Ignore connection errors
+ }
+ attempts++;
+ await new Promise((resolve) => setTimeout(resolve, 2000));
+ }
+
+ if (attempts === maxAttempts) {
+ throw new Error(`Server at ${baseURL} did not become ready in time.`);
+ }
+
+ // 3. Ensure the projects directory exists
+ const projectsDir = path.resolve(__dirname, 'projects');
+ if (!fs.existsSync(projectsDir)) {
+ fs.mkdirSync(projectsDir, { recursive: true });
+ }
+
+ console.log('Global setup complete.\n');
+}
+
+export default globalSetup;
diff --git a/tests/setup/global-teardown.ts b/tests/setup/global-teardown.ts
new file mode 100644
index 000000000..84c11cb9c
--- /dev/null
+++ b/tests/setup/global-teardown.ts
@@ -0,0 +1,53 @@
+import { execSync } from 'child_process';
+import path from 'node:path';
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+async function globalTeardown() {
+ console.log('\nStarting global teardown...');
+
+ const composeFile =
+ process.env.COMPOSE_FILE ? path.resolve(__dirname, '..', process.env.COMPOSE_FILE) : path.resolve(__dirname, 'compose.yaml');
+ const projectsDir = path.resolve(__dirname, 'projects');
+
+ // 1. Stop and remove Docker containers
+ try {
+ console.log('Stopping Docker containers...');
+ execSync(`docker compose -f ${composeFile} down -v`, { stdio: 'inherit' });
+ console.log('Docker containers stopped and volumes removed.');
+ } catch (error) {
+ console.error('Warning: Failed to stop Docker containers cleanly:', error);
+ }
+
+ // 2. Clean up test projects created on disk
+ try {
+ if (fs.existsSync(projectsDir)) {
+ console.log('Cleaning up test projects...');
+ const items = fs.readdirSync(projectsDir);
+
+ for (const item of items) {
+ const itemPath = path.join(projectsDir, item);
+
+ // Keep .env.global and test-project-static if they exist, remove everything else that looks like a test project
+ if (item === '.env.global' || item === 'test-project-static') continue;
+
+ if (fs.lstatSync(itemPath).isDirectory()) {
+ fs.rmSync(itemPath, { recursive: true, force: true });
+ console.log(` - Removed directory: ${item}`);
+ } else if (item.startsWith('test-project-')) {
+ fs.unlinkSync(itemPath);
+ console.log(` - Removed file: ${item}`);
+ }
+ }
+ }
+ } catch (error) {
+ console.error('Warning: Failed to clean up projects directory:', error);
+ }
+
+ console.log('Global teardown complete.\n');
+}
+
+export default globalTeardown;
diff --git a/tests/setup/projects/test-project-1757432438167/compose.yaml b/tests/setup/projects/test-project-1757432438167/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757432438167/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757433509008/compose.yaml b/tests/setup/projects/test-project-1757433509008/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757433509008/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757433829228/compose.yaml b/tests/setup/projects/test-project-1757433829228/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757433829228/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757433999375/compose.yaml b/tests/setup/projects/test-project-1757433999375/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757433999375/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757434604211/compose.yaml b/tests/setup/projects/test-project-1757434604211/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757434604211/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757434924091/compose.yaml b/tests/setup/projects/test-project-1757434924091/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757434924091/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757435145265/compose.yaml b/tests/setup/projects/test-project-1757435145265/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757435145265/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1757435754905/compose.yaml b/tests/setup/projects/test-project-1757435754905/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1757435754905/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-1761077902556/compose.yaml b/tests/setup/projects/test-project-1761077902556/compose.yaml
deleted file mode 100644
index 48532829c..000000000
--- a/tests/setup/projects/test-project-1761077902556/compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-services:
- nginx:
- image: nginx:alpine
- container_name: nginx_service
- env_file:
- - .env
- ports:
- - "8080:80"
- volumes:
- - nginx_data:/usr/share/nginx/html
- restart: unless-stopped
-
-volumes:
- nginx_data:
- driver: local
\ No newline at end of file
diff --git a/tests/setup/projects/test-project-static/compose.yaml b/tests/setup/projects/test-project-static/compose.yaml
index 29e47724f..d13d59024 100644
--- a/tests/setup/projects/test-project-static/compose.yaml
+++ b/tests/setup/projects/test-project-static/compose.yaml
@@ -5,7 +5,7 @@ services:
env_file:
- .env
ports:
- - '8081:80'
+ - "8081:80"
volumes:
- nginx_data:/usr/share/nginx/html
restart: unless-stopped
diff --git a/tests/spec/containers.spec.ts b/tests/spec/containers.spec.ts
index b4aae88c6..6d045d955 100644
--- a/tests/spec/containers.spec.ts
+++ b/tests/spec/containers.spec.ts
@@ -30,9 +30,9 @@ test.describe('Containers Page', () => {
const running = containersData.data.filter((c) => c.state === 'running').length;
const stopped = containersData.data.filter((c) => c.state !== 'running').length;
- await expect(page.locator('div:has(> p:has-text("Total")) h3').first()).toHaveText(String(total));
- await expect(page.locator('div:has(> p:has-text("Running")) h3').first()).toHaveText(String(running));
- await expect(page.locator('div:has(> p:has-text("Stopped")) h3').first()).toHaveText(String(stopped));
+ await expect(page.getByText(`${total} Total`)).toBeVisible();
+ await expect(page.getByText(`${running} Running`)).toBeVisible();
+ await expect(page.getByText(`${stopped} Stopped`)).toBeVisible();
});
test('should display the container table with columns', async ({ page }) => {
diff --git a/tests/spec/images.spec.ts b/tests/spec/images.spec.ts
index ac55bcd40..bc16efeea 100644
--- a/tests/spec/images.spec.ts
+++ b/tests/spec/images.spec.ts
@@ -38,8 +38,8 @@ test.describe('Images Page', () => {
test('should display stats cards with correct counts and size', async ({ page }) => {
await navigateToImages(page);
- await expect(page.locator('div:has(> p:has-text("Total Images")) h3').first()).toHaveText(imageCounts.totalImages.toString());
- await expect(page.locator('div:has(> p:has-text("Total Size")) h3').first()).not.toBeEmpty();
+ await expect(page.getByText(`${imageCounts.totalImages} Total Images`)).toBeVisible();
+ await expect(page.getByText(/Total Size/i)).toBeVisible();
});
test('should display the image table when images exist', async ({ page }) => {
@@ -59,7 +59,7 @@ test.describe('Images Page', () => {
await navigateToImages(page);
await page.locator('button:has-text("Prune Unused")').click();
await expect(
- page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')
+ page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")'),
).toBeVisible();
});
@@ -108,7 +108,7 @@ test.describe('Images Page', () => {
await page.locator('button:has-text("Prune Unused")').click();
await expect(
- page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")')
+ page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Prune Unused Images")'),
).toBeVisible();
await page.locator('button:has-text("Prune Images")').click();
@@ -122,13 +122,13 @@ test.describe('Images Page', () => {
await navigateToImages(page);
await page.locator('button:has-text("Pull Image")').first().click();
- const dialogHeading = page.locator('div[role="heading"][aria-level="2"][data-dialog-title]:has-text("Pull Image")');
+ const dialogHeading = page.getByRole('heading', { name: 'Pull Image' });
await expect(dialogHeading).toBeVisible();
- const imageName = 'ghcr.io/linuxserver/nginx';
- await page.locator('input[id="image-name-*"]').fill(imageName);
+ await page.getByRole('textbox', { name: 'Image Name *' }).fill('ghcr.io/linuxserver/nginx');
+ await page.getByRole('textbox', { name: 'Tag' }).fill('1.28.0');
- await page.locator('button[type="submit"]:has-text("Pull Image")').click();
+ await page.getByRole('button', { name: 'Pull', exact: true }).click();
await expect(dialogHeading).toBeHidden({ timeout: 120_000 });
});
diff --git a/tests/spec/network.spec.ts b/tests/spec/network.spec.ts
index c3b79bbed..0ee514fd5 100644
--- a/tests/spec/network.spec.ts
+++ b/tests/spec/network.spec.ts
@@ -29,12 +29,8 @@ test.describe('Networks Page', () => {
// Fetch counts directly in the test to ensure we have fresh data
const counts = await fetchNetworksCountsWithRetry(page);
- // Use the new stat card structure with h3 for values
- const totalValue = page.locator('div:has(> p:has-text("Total Networks")) h3').first();
- const unusedValue = page.locator('div:has(> p:has-text("Unused Networks")) h3').first();
-
- await expect(totalValue).toHaveText(String(counts.total));
- await expect(unusedValue).toHaveText(String(counts.unused));
+ await expect(page.getByText(`${counts.total} Total Networks`)).toBeVisible();
+ await expect(page.getByText(`${counts.unused} Unused Networks`)).toBeVisible();
});
test('Table displays when networks exist, else empty state', async ({ page }) => {
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index 255cfc2fe..d30df1104 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -35,11 +35,9 @@ test.describe('Projects Page', () => {
});
test('should display summary cards with correct counts', async ({ page }) => {
- await expect(page.locator('div:has(> p:has-text("Total Projects")) h3').first()).toHaveText(
- String(projectCounts.totalProjects)
- );
- await expect(page.locator('div:has(> p:has-text("Running")) h3').first()).toHaveText(String(projectCounts.runningProjects));
- await expect(page.locator('div:has(> p:has-text("Stopped")) h3').first()).toHaveText(String(projectCounts.stoppedProjects));
+ await expect(page.getByText(`${projectCounts.totalProjects} Total Projects`)).toBeVisible();
+ await expect(page.getByText(`${projectCounts.runningProjects} Running`)).toBeVisible();
+ await expect(page.getByText(`${projectCounts.stoppedProjects} Stopped`)).toBeVisible();
});
test('should display projects list', async ({ page }) => {
@@ -115,11 +113,10 @@ test.describe('New Compose Project Page', () => {
await expect(page.getByRole('button', { name: 'My New Project' })).toBeVisible();
await expect(page.getByRole('heading', { name: 'Docker Compose File' })).toBeVisible();
await expect(page.getByRole('heading', { name: 'Environment (.env)' })).toBeVisible();
-
});
test('should validate required fields', async ({ page }) => {
- const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]');
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="arcane-button"]');
await expect(createButton).toBeDisabled();
await page.getByRole('button', { name: 'My New Project' }).click();
@@ -134,7 +131,7 @@ test.describe('New Compose Project Page', () => {
if (msg.type() === 'error') observedErrors.push(msg.text());
});
- const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]');
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="arcane-button"]');
await expect(createButton).toBeVisible();
@@ -170,12 +167,15 @@ test.describe('New Compose Project Page', () => {
await expect(composeEditor.locator('textarea')).toHaveCount(1);
// Use page.evaluate to set the value directly in Monaco to avoid auto-indentation issues during typing
- await page.evaluate(({ text, lang }) => {
- const models = (window as any).monaco.editor.getModels();
- const model = models.find((m: any) => m.getLanguageId() === lang);
- if (!model) throw new Error(`No ${lang} model found`);
- model.setValue(text);
- }, { text: TEST_COMPOSE_YAML, lang: 'yaml' });
+ await page.evaluate(
+ ({ text, lang }) => {
+ const models = (window as any).monaco.editor.getModels();
+ const model = models.find((m: any) => m.getLanguageId() === lang);
+ if (!model) throw new Error(`No ${lang} model found`);
+ model.setValue(text);
+ },
+ { text: TEST_COMPOSE_YAML, lang: 'yaml' },
+ );
// Basic sanity check that the new content rendered.
await expect(composeEditor.locator('.view-lines')).toContainText(/redis/i);
@@ -189,12 +189,15 @@ test.describe('New Compose Project Page', () => {
await expect(envEditor.locator('textarea')).toHaveCount(1);
// Use page.evaluate to set the value directly in Monaco
- await page.evaluate(({ text, lang }) => {
- const models = (window as any).monaco.editor.getModels();
- const model = models.find((m: any) => m.getLanguageId() === lang);
- if (!model) throw new Error(`No ${lang} model found`);
- model.setValue(text);
- }, { text: TEST_ENV_FILE, lang: 'ini' });
+ await page.evaluate(
+ ({ text, lang }) => {
+ const models = (window as any).monaco.editor.getModels();
+ const model = models.find((m: any) => m.getLanguageId() === lang);
+ if (!model) throw new Error(`No ${lang} model found`);
+ model.setValue(text);
+ },
+ { text: TEST_ENV_FILE, lang: 'ini' },
+ );
await expect(envEditor.locator('.view-lines')).toContainText(/redis/i);
@@ -220,7 +223,7 @@ test.describe('New Compose Project Page', () => {
}
});
- const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="button"]')
+ const createButton = page.getByRole('button', { name: 'Create Project' }).locator('[data-slot="arcane-button"]');
await createButton.click();
await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
@@ -272,10 +275,10 @@ test.describe('New Compose Project Page', () => {
if (!model) throw new Error(`No ${lang} model found`);
model.setValue(text);
},
- { text: TEST_COMPOSE_YAML, lang: 'yaml' }
+ { text: TEST_COMPOSE_YAML, lang: 'yaml' },
);
- const createButton = page.locator('button[data-slot="button"]').filter({ hasText: 'Create Project' });
+ const createButton = page.locator('button[data-slot="arcane-button"]').filter({ hasText: 'Create Project' });
await createButton.click();
await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
@@ -368,7 +371,6 @@ test.describe('Project Detail Page', () => {
// - classic (default): side-by-side compose.yaml + .env panels
// - tree view: file list on the left and a single code panel on the right
await expect(page.getByRole('heading', { name: 'compose.yaml' })).toBeVisible();
-
const projectFilesHeading = page.getByRole('heading', { name: /Project Files/i });
const isTreeView = await projectFilesHeading.isVisible();
diff --git a/tests/spec/volumes.spec.ts b/tests/spec/volumes.spec.ts
index 9341224c9..c9cec58a2 100644
--- a/tests/spec/volumes.spec.ts
+++ b/tests/spec/volumes.spec.ts
@@ -43,8 +43,7 @@ test.describe('Volumes Page', () => {
await page.goto('/volumes');
await page.waitForLoadState('networkidle');
- const totalValue = page.locator('div:has(> p:has-text("Total Volumes")) h3').first();
- await expect(totalValue).toHaveText(volumeCount.total.toString());
+ await expect(page.getByText(`${volumeCount.total} Total Volumes`)).toBeVisible();
});
test('Create Volume Sheet Opens', async ({ page }) => {
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 2adb063f0..2e397fc4c 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -1,6 +1,11 @@
{
"compilerOptions": {
"baseUrl": ".",
- "lib": ["ES2022"]
+ "lib": ["ES2022"],
+ "module": "ESNext",
+ "moduleResolution": "Node",
+ "target": "ES2022",
+ "esModuleInterop": true,
+ "skipLibCheck": true
}
}