Skip to content

Modern Docker Management, Designed for Everyone

feat: redesigned projects page (#464)

Kyle Mendell598f275f296a
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 651bacf3c..a28184c66 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1050,6 +1050,7 @@
"language": "Language",
"bridge": "Bridge",
"ports": "Ports",
+ "common_show": "Show",
"custom": "Custom",
"weekly": "Weekly",
"daily": "Daily",
diff --git a/frontend/src/lib/components/action-buttons.svelte b/frontend/src/lib/components/action-buttons.svelte
index 1b7435732..1aa3baf91 100644
--- a/frontend/src/lib/components/action-buttons.svelte
+++ b/frontend/src/lib/components/action-buttons.svelte
@@ -176,7 +176,7 @@
: m.action_removed_success({ type: m.container() })
);
await invalidateAll();
- goto(type === 'project' ? '/compose' : '/containers');
+ goto(type === 'project' ? '/projects' : '/containers');
}
});
}
diff --git a/frontend/src/lib/components/code-editor/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelte
index 01f899f19..99346d1f9 100644
--- a/frontend/src/lib/components/code-editor/editor.svelte
+++ b/frontend/src/lib/components/code-editor/editor.svelte
@@ -5,12 +5,10 @@
import { properties } from '@codemirror/legacy-modes/mode/properties';
import { linter, lintGutter } from '@codemirror/lint';
import jsyaml from 'js-yaml';
- import { githubDark } from '@uiw/codemirror-theme-github';
import { arcaneDark } from './theme';
import type { EditorView } from '@codemirror/view';
import type { Extension } from '@codemirror/state';
import type { Diagnostic, LintSource } from '@codemirror/lint';
- import { mode } from 'mode-watcher';
import { m } from '$lib/paraglide/messages';
type CodeLanguage = 'yaml' | 'env';
diff --git a/frontend/src/lib/components/code-editor/theme.ts b/frontend/src/lib/components/code-editor/theme.ts
index 2adc064cb..d2bbe4e9d 100644
--- a/frontend/src/lib/components/code-editor/theme.ts
+++ b/frontend/src/lib/components/code-editor/theme.ts
@@ -2,7 +2,6 @@ import { tags as t } from '@lezer/highlight';
import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
export const arcaneDarkSettings: CreateThemeOptions['settings'] = {
- // Higher-contrast dark base
background: '#0d1117',
foreground: '#c9d1d9',
caret: '#a78bfa',
@@ -14,7 +13,6 @@ export const arcaneDarkSettings: CreateThemeOptions['settings'] = {
gutterActiveForeground: '#c9d1d9',
gutterBorder: 'transparent',
- // Typography
fontFamily: '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
fontSize: '13px'
};
@@ -31,7 +29,6 @@ export const arcaneDarkStyles: CreateThemeOptions['styles'] = [
{ tag: [t.string, t.inserted, t.regexp, t.special(t.string)], color: '#7ee787' },
{ tag: [t.operator, t.url, t.link, t.escape], color: '#a5d6ff' },
- // Make separators/punctuation (e.g., "=") visible
{ tag: [t.separator, t.punctuation], color: '#6e7681' },
{ tag: t.heading, color: '#e6edf3', fontWeight: 'bold' },
diff --git a/frontend/src/lib/components/image-update-item.svelte b/frontend/src/lib/components/image-update-item.svelte
index 5bd3921d4..d4c94760c 100644
--- a/frontend/src/lib/components/image-update-item.svelte
+++ b/frontend/src/lib/components/image-update-item.svelte
@@ -166,6 +166,7 @@
<Tooltip.Content
side="right"
class="tooltip-with-arrow relative max-w-[280px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
+ arrowClasses="bg-popover"
align="center"
>
<div class="overflow-hidden rounded-xl">
@@ -405,6 +406,7 @@
<Tooltip.Content
side="right"
class="tooltip-with-arrow relative max-w-[220px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
+ arrowClasses="bg-popover"
align="center"
>
<div class="overflow-hidden rounded-xl">
@@ -452,6 +454,7 @@
<Tooltip.Content
side="right"
class="tooltip-with-arrow relative max-w-[240px] rounded-xl border border-gray-200/50 bg-white/95 p-0 shadow-2xl shadow-black/10 backdrop-blur-sm dark:border-gray-800/50 dark:bg-gray-950/95 dark:shadow-black/30"
+ arrowClasses="bg-popover"
align="center"
>
<div class="overflow-hidden rounded-xl">
diff --git a/frontend/src/lib/components/log-viewer.svelte b/frontend/src/lib/components/log-viewer.svelte
index 7e5047809..15d9397f9 100644
--- a/frontend/src/lib/components/log-viewer.svelte
+++ b/frontend/src/lib/components/log-viewer.svelte
@@ -75,7 +75,7 @@
export async function startLogStream() {
const targetId = type === 'project' ? projectId : containerId;
- if (!targetId || !browser) return;
+ if (!targetId) return;
try {
isStreaming = true;
diff --git a/frontend/src/lib/components/ui/tabs/tabs-content.svelte b/frontend/src/lib/components/ui/tabs/tabs-content.svelte
index c000a3783..68c3868c2 100644
--- a/frontend/src/lib/components/ui/tabs/tabs-content.svelte
+++ b/frontend/src/lib/components/ui/tabs/tabs-content.svelte
@@ -8,7 +8,7 @@
<TabsPrimitive.Content
bind:ref
class={cn(
- 'ring-offset-background focus-visible:ring-ring mt-2 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none',
+ 'ring-offset-background focus-visible:ring-ring h-full min-h-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
className
)}
{...restProps}
diff --git a/frontend/src/lib/components/ui/tooltip/index.ts b/frontend/src/lib/components/ui/tooltip/index.ts
index 273d831e6..313a7f069 100644
--- a/frontend/src/lib/components/ui/tooltip/index.ts
+++ b/frontend/src/lib/components/ui/tooltip/index.ts
@@ -1,6 +1,6 @@
-import { Tooltip as TooltipPrimitive } from 'bits-ui';
-import Trigger from './tooltip-trigger.svelte';
-import Content from './tooltip-content.svelte';
+import { Tooltip as TooltipPrimitive } from "bits-ui";
+import Trigger from "./tooltip-trigger.svelte";
+import Content from "./tooltip-content.svelte";
const Root = TooltipPrimitive.Root;
const Provider = TooltipPrimitive.Provider;
@@ -17,5 +17,5 @@ export {
Content as TooltipContent,
Trigger as TooltipTrigger,
Provider as TooltipProvider,
- Portal as TooltipPortal
+ Portal as TooltipPortal,
};
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
index 113f2396b..e495efe5f 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -1,12 +1,12 @@
<script lang="ts">
- import { Tooltip as TooltipPrimitive } from 'bits-ui';
- import { cn } from '$lib/utils.js';
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
+ import { cn } from "$lib/utils.js";
let {
ref = $bindable(null),
class: className,
sideOffset = 0,
- side = 'top',
+ side = "top",
children,
arrowClasses,
...restProps
@@ -22,7 +22,7 @@
{sideOffset}
{side}
class={cn(
- 'bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-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 w-fit origin-(--bits-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance',
+ "bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-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 origin-(--bits-tooltip-content-transform-origin) z-50 w-fit text-balance rounded-md px-3 py-1.5 text-xs",
className
)}
{...restProps}
@@ -32,11 +32,11 @@
{#snippet child({ props })}
<div
class={cn(
- 'bg-popover z-50 size-2.5 rotate-45 rounded-[2px]',
- 'data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]',
- 'data-[side=bottom]:translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]',
- 'data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2',
- 'data-[side=left]:translate-y-[calc(50%_-_3px)]',
+ "bg-primary z-50 size-2.5 rotate-45 rounded-[2px]",
+ "data-[side=top]:translate-x-1/2 data-[side=top]:translate-y-[calc(-50%_+_2px)]",
+ "data-[side=bottom]:-translate-x-1/2 data-[side=bottom]:-translate-y-[calc(-50%_+_1px)]",
+ "data-[side=right]:translate-x-[calc(50%_+_2px)] data-[side=right]:translate-y-1/2",
+ "data-[side=left]:-translate-y-[calc(50%_-_3px)]",
arrowClasses
)}
{...props}
diff --git a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
index 5631d1b4c..1acdaa47b 100644
--- a/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
+++ b/frontend/src/lib/components/ui/tooltip/tooltip-trigger.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import { Tooltip as TooltipPrimitive } from 'bits-ui';
+ import { Tooltip as TooltipPrimitive } from "bits-ui";
let { ref = $bindable(null), ...restProps }: TooltipPrimitive.TriggerProps = $props();
</script>
diff --git a/frontend/src/lib/config/sidebar-config.ts b/frontend/src/lib/config/sidebar-config.ts
index 9602294db..2640b8899 100644
--- a/frontend/src/lib/config/sidebar-config.ts
+++ b/frontend/src/lib/config/sidebar-config.ts
@@ -26,7 +26,7 @@ export const sidebarItems: Record<string, SidebarItem[]> = {
managementItems: [
{ title: m.dashboard_title(), url: '/dashboard', icon: HouseIcon },
{ title: m.containers_title(), url: '/containers', icon: ContainerIcon },
- { title: m.compose_title(), url: '/compose', icon: FileStackIcon },
+ { title: m.compose_title(), url: '/projects', icon: FileStackIcon },
{ title: m.images_title(), url: '/images', icon: ImageIcon },
{ title: m.networks_title(), url: '/networks', icon: NetworkIcon },
{ title: m.volumes_title(), url: '/volumes', icon: HardDriveIcon }
diff --git a/frontend/src/routes/compose/[projectId]/+page.svelte b/frontend/src/routes/compose/[projectId]/+page.svelte
deleted file mode 100644
index b2bd8466b..000000000
--- a/frontend/src/routes/compose/[projectId]/+page.svelte
+++ /dev/null
@@ -1,538 +0,0 @@
-<script lang="ts">
- import type { PageData } from './$types';
- import type { Project } from '$lib/types/project.type';
- import * as Card from '$lib/components/ui/card/index.js';
- import { Button } from '$lib/components/ui/button/index.js';
- import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
- import CircleAlertIcon from '@lucide/svelte/icons/alert-circle';
- import FileStackIcon from '@lucide/svelte/icons/file-stack';
- import LayersIcon from '@lucide/svelte/icons/layers';
- import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
- import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
- import TerminalIcon from '@lucide/svelte/icons/terminal';
- import SettingsIcon from '@lucide/svelte/icons/settings';
- import ActivityIcon from '@lucide/svelte/icons/activity';
- import * as Alert from '$lib/components/ui/alert/index.js';
- import { Input } from '$lib/components/ui/input/index.js';
- import { Label } from '$lib/components/ui/label/index.js';
- import ActionButtons from '$lib/components/action-buttons.svelte';
- import StatusBadge from '$lib/components/badges/status-badge.svelte';
- import { getStatusVariant } from '$lib/utils/status.utils';
- import { capitalizeFirstLetter } from '$lib/utils/string.utils';
- import { invalidateAll } from '$app/navigation';
- import { toast } from 'svelte-sonner';
- import CodeEditor from '$lib/components/code-editor/editor.svelte';
- import { tryCatch } from '$lib/utils/try-catch';
- import { environmentAPI } from '$lib/services/api';
- import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
- import LogViewer from '$lib/components/log-viewer.svelte';
- import { browser } from '$app/environment';
- import { z } from 'zod/v4';
- import { createForm } from '$lib/utils/form.utils';
- import { m } from '$lib/paraglide/messages';
-
- let { data }: { data: PageData } = $props();
- let { project, editorState, settings } = $derived(data);
-
- let isLoading = $state({
- deploying: false,
- stopping: false,
- restarting: false,
- removing: false,
- importing: false,
- redeploying: false,
- destroying: false,
- pulling: false,
- saving: false
- });
-
- let originalName = $derived(editorState.originalName);
- let originalComposeContent = $derived(editorState.originalComposeContent);
- let originalEnvContent = $derived(editorState.originalEnvContent || '');
-
- const formSchema = z.object({
- name: z
- .string()
- .min(1, 'Project name is required')
- .regex(/^[a-z0-9-_]+$/i, 'Only letters, numbers, hyphens, and underscores are allowed'),
- composeContent: z.string().min(1, 'Compose content is required'),
- envContent: z.string().optional().default('')
- });
-
- let formData = $derived({
- name: editorState.name,
- composeContent: editorState.composeContent,
- envContent: editorState.envContent || ''
- });
-
- let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
-
- let hasChanges = $derived(
- $inputs.name.value !== originalName ||
- $inputs.composeContent.value !== originalComposeContent ||
- $inputs.envContent.value !== originalEnvContent
- );
-
- // removed: service port host resolution
-
- let activeSection = $state<string>('overview');
- let autoScrollProjectLogs = $state(true);
- let isProjectLogsStreaming = $state(false);
- let projectLogViewer = $state<LogViewer>();
- let showFloatingHeader = $state(false);
-
- $effect(() => {
- if (browser) {
- const handleScroll = () => {
- showFloatingHeader = window.scrollY > 100;
- };
-
- window.addEventListener('scroll', handleScroll);
- return () => window.removeEventListener('scroll', handleScroll);
- }
- });
-
- async function handleSaveChanges() {
- if (!project || !hasChanges) return;
-
- const validated = form.validate();
- if (!validated) return;
-
- const { composeContent, envContent } = validated;
-
- handleApiResultWithCallbacks({
- result: await tryCatch(environmentAPI.updateProject(project.id, composeContent, envContent)),
- message: 'Failed to Save Project',
- setLoadingState: (value) => (isLoading.saving = value),
- onSuccess: async (updated: Project) => {
- toast.success('Project updated successfully!');
-
- originalName = updated.name;
- originalComposeContent = $inputs.composeContent.value;
- originalEnvContent = $inputs.envContent.value;
-
- await new Promise((resolve) => setTimeout(resolve, 200));
- await invalidateAll();
- }
- });
- }
-
- function handleProjectLogStart() {
- isProjectLogsStreaming = true;
- }
-
- function handleProjectLogStop() {
- isProjectLogsStreaming = false;
- }
-
- function handleProjectLogClear() {}
-
- function handleToggleProjectAutoScroll() {}
-
- const navigationSections = [
- { id: 'overview', label: m.compose_nav_overview(), icon: FileStackIcon },
- { id: 'services', label: m.compose_nav_services(), icon: LayersIcon },
- { id: 'config', label: m.compose_nav_config(), icon: SettingsIcon },
- { id: 'logs', label: m.compose_nav_logs(), icon: TerminalIcon }
- ] as const;
-
- type SectionId = (typeof navigationSections)[number]['id'];
-
- function scrollToSection(sectionId: SectionId) {
- activeSection = sectionId;
- const element = document.getElementById(sectionId);
- if (element) {
- element.scrollIntoView({ behavior: 'smooth', block: 'start' });
- }
- }
-</script>
-
-<div class="bg-background min-h-screen">
- {#if project}
- <div
- class="bg-background/95 sticky top-0 z-20 border-b backdrop-blur transition-all duration-300"
- style="opacity: {showFloatingHeader ? 0 : 1}; pointer-events: {showFloatingHeader ? 'none' : 'auto'};"
- >
- <div class="max-w-full px-4 py-3">
- <div class="flex items-center justify-between">
- <div class="flex items-center gap-3">
- <Button variant="ghost" size="sm" href="/compose">
- <ArrowLeftIcon class="mr-2 size-4" />
- {m.common_back()}
- </Button>
- <div class="bg-border h-4 w-px"></div>
- <div class="flex items-center gap-2">
- <h1 class="max-w-[300px] truncate text-lg font-semibold" title={project.name}>
- {project.name}
- </h1>
- {#if project.status}
- <StatusBadge variant={getStatusVariant(project.status)} text={capitalizeFirstLetter(project.status)} />
- {/if}
- </div>
- </div>
- <div class="flex items-center gap-2">
- <ActionButtons
- id={project.id}
- type="project"
- itemState={project.status}
- bind:startLoading={isLoading.deploying}
- bind:stopLoading={isLoading.stopping}
- bind:restartLoading={isLoading.restarting}
- bind:removeLoading={isLoading.removing}
- bind:redeployLoading={isLoading.redeploying}
- onActionComplete={() => invalidateAll()}
- />
- </div>
- </div>
- </div>
- </div>
-
- {#if showFloatingHeader}
- <div class="fixed left-1/2 top-4 z-30 -translate-x-1/2 transition-all duration-300 ease-in-out">
- <div class="bg-background/90 border-border/50 rounded-lg border px-4 py-3 shadow-xl backdrop-blur-xl">
- <div class="flex items-center gap-4">
- <div class="flex items-center gap-2">
- <h2 class="max-w-[150px] truncate text-sm font-medium" title={project.name}>
- {project.name}
- </h2>
- {#if project.status}
- <StatusBadge
- variant={getStatusVariant(project.status)}
- text={capitalizeFirstLetter(project.status)}
- class="text-xs"
- />
- {/if}
- </div>
- <div class="bg-border h-4 w-px"></div>
- <ActionButtons
- id={project.id}
- type="project"
- itemState={project.status}
- bind:startLoading={isLoading.deploying}
- bind:stopLoading={isLoading.stopping}
- bind:restartLoading={isLoading.restarting}
- bind:removeLoading={isLoading.removing}
- bind:redeployLoading={isLoading.redeploying}
- onActionComplete={() => invalidateAll()}
- />
- </div>
- </div>
- </div>
- {/if}
-
- {#if data.error}
- <div class="max-w-full px-4 py-4">
- <Alert.Root variant="destructive">
- <CircleAlertIcon class="size-4" />
- <Alert.Title>{m.compose_error_loading_stack_title()}</Alert.Title>
- <Alert.Description>{data.error}</Alert.Description>
- </Alert.Root>
- </div>
- {/if}
-
- <div class="flex min-h-0 overflow-hidden">
- <div class="bg-background/50 w-16 shrink-0 border-r">
- <div class="sticky top-16 p-2">
- <nav class="space-y-1">
- {#each navigationSections as section}
- {@const IconComponent = section.icon}
- <button
- onclick={() => scrollToSection(section.id)}
- class="relative flex w-full items-center justify-center rounded-md p-3 text-sm font-medium transition-colors
- {activeSection === section.id
- ? 'bg-primary/10 text-primary border-primary/20 border'
- : 'text-muted-foreground hover:text-foreground hover:bg-muted/50'}"
- title={section.label}
- >
- <IconComponent class="size-4" />
- {#if section.id === 'services' && project.serviceCount}
- <span
- class="bg-primary text-primary-foreground absolute -right-1 -top-1 flex h-[18px] min-w-[18px] items-center justify-center rounded-full px-1 text-xs"
- >
- {project.serviceCount}
- </span>
- {/if}
- </button>
- {/each}
- </nav>
- </div>
- </div>
-
- <div class="min-w-0 flex-1 overflow-hidden">
- <div class="max-w-none p-6">
- <div class="space-y-8">
- <section id="overview" class="scroll-mt-20">
- <h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
- <FileStackIcon class="size-5" />
- {m.compose_overview_title()}
- </h2>
-
- <div class="mb-6 grid grid-cols-1 gap-6 md:grid-cols-3">
- <Card.Root class="border">
- <Card.Content class="flex items-center justify-between p-6">
- <div>
- <p class="text-muted-foreground text-sm font-medium">{m.compose_services()}</p>
- <p class="text-2xl font-bold">{project.serviceCount}</p>
- </div>
- <div class="bg-primary/10 rounded-full p-3">
- <LayersIcon class="text-primary size-5" />
- </div>
- </Card.Content>
- </Card.Root>
-
- <Card.Root class="border">
- <Card.Content class="flex items-center justify-between p-6">
- <div>
- <p class="text-muted-foreground text-sm font-medium">{m.compose_running()}</p>
- <p class="text-2xl font-bold">{project.runningCount}</p>
- </div>
- <div class="rounded-full bg-green-500/10 p-3">
- <ActivityIcon class="size-5 text-green-500" />
- </div>
- </Card.Content>
- </Card.Root>
-
- <Card.Root class="border">
- <Card.Content class="flex items-center justify-between p-6">
- <div>
- <p class="text-muted-foreground text-sm font-medium">{m.common_created()}</p>
- <p class="text-lg font-medium">
- {new Date(project.createdAt ?? '').toLocaleDateString()}
- </p>
- </div>
- <div class="rounded-full bg-blue-500/10 p-3">
- <FileStackIcon class="size-5 text-blue-500" />
- </div>
- </Card.Content>
- </Card.Root>
- </div>
- </section>
-
- <section id="services" class="scroll-mt-20">
- <h2 class="mb-6 flex items-center gap-2 text-xl font-semibold">
- <LayersIcon class="size-5" />
- {m.compose_services_header({ count: project.serviceCount })}
- </h2>
-
- {#if project.services && project.services.length > 0}
- <div class="bg-card rounded-lg border">
- <div class="grid grid-cols-1 gap-2 p-4 sm:grid-cols-2 lg:grid-cols-3">
- {#each project.services as service (service.container_id || service.name)}
- {@const status = service.status || 'unknown'}
- {@const variant = getStatusVariant(status)}
-
- {#if service.container_id}
- <a
- href={`/containers/${service.container_id}`}
- class="bg-background hover:bg-muted/50 group flex items-center gap-3 rounded-lg border p-3 transition-all"
- >
- <div class="bg-primary/10 shrink-0 rounded-full p-2">
- <LayersIcon class="text-primary size-3" />
- </div>
- <div class="min-w-0 flex-1">
- <div class="flex items-center justify-between">
- <p class="truncate text-sm font-medium" title={service.name}>
- {service.name}
- </p>
- <ArrowRightIcon
- class="text-primary size-3 shrink-0 opacity-0 transition-opacity group-hover:opacity-100"
- />
- </div>
- <div class="mt-1 flex items-center gap-2">
- <StatusBadge {variant} text={capitalizeFirstLetter(status)} class="text-xs" />
- </div>
- </div>
- </a>
- {:else}
- <div class="bg-muted/10 flex items-center gap-3 rounded-lg border p-3">
- <div class="bg-muted/50 shrink-0 rounded-full p-2">
- <LayersIcon class="text-muted-foreground size-3" />
- </div>
- <div class="min-w-0 flex-1">
- <p class="truncate text-sm font-medium" title={service.name}>
- {service.name}
- </p>
- <div class="mt-1 flex items-center gap-2">
- <StatusBadge {variant} text={capitalizeFirstLetter(status)} class="text-xs" />
- <span class="text-muted-foreground text-xs">{m.compose_service_not_created()}</span>
- </div>
- </div>
- </div>
- {/if}
- {/each}
- </div>
- </div>
- {:else}
- <div class="py-12 text-center">
- <div class="bg-muted/50 mx-auto mb-4 flex size-16 items-center justify-center rounded-full">
- <LayersIcon class="text-muted-foreground size-6" />
- </div>
- <div class="text-muted-foreground">{m.compose_no_services_found()}</div>
- </div>
- {/if}
- </section>
-
- <section id="config" class="scroll-mt-20">
- <div class="mb-6 flex items-center justify-between">
- <h2 class="flex items-center gap-2 text-xl font-semibold">
- <SettingsIcon class="size-5" />
- {m.compose_configuration_title()}
- </h2>
- {#if hasChanges}
- <ArcaneButton
- action="save"
- loading={isLoading.saving}
- onclick={handleSaveChanges}
- disabled={!hasChanges}
- customLabel={m.common_save()}
- loadingLabel={m.common_saving()}
- />
- {/if}
- </div>
-
- <div class="mb-6 space-y-2">
- <Label for="name" class="mb-10 text-sm font-medium">{m.compose_name_label()}</Label>
- <div class="max-w-md">
- <Input
- type="text"
- id="name"
- name="name"
- bind:value={$inputs.name.value}
- required
- class="my-2 {$inputs.name.error ? 'border-destructive' : ''}"
- disabled={isLoading.saving || project?.status === 'running' || project?.status === 'partially running'}
- />
- {#if $inputs.name.error}
- <p class="text-destructive mt-1 text-xs">{$inputs.name.error}</p>
- {/if}
- {#if project?.status === 'running' || project?.status === 'partially running'}
- <p class="text-muted-foreground mt-2 text-sm">
- {m.compose_name_change_not_allowed()}
- </p>
- {/if}
- </div>
- </div>
-
- <div class="grid min-w-0 grid-cols-1 gap-6 overflow-hidden lg:grid-cols-3">
- <div class="min-w-0 overflow-hidden lg:col-span-2">
- <div class="space-y-4">
- <h3 class="text-lg">{m.compose_compose_file_title()}</h3>
- <div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">
- <CodeEditor
- bind:value={$inputs.composeContent.value}
- language="yaml"
- placeholder={m.compose_compose_placeholder()}
- />
- </div>
- {#if $inputs.composeContent.error}
- <p class="text-destructive mt-1 text-xs">{$inputs.composeContent.error}</p>
- {/if}
- </div>
- </div>
-
- <div class="min-w-0 overflow-hidden lg:col-span-1">
- <div class="space-y-4">
- <h3 class="text-lg font-semibold">{m.compose_env_title()}</h3>
- <div class="h-[590px] w-full min-w-0 overflow-hidden rounded-md">
- <CodeEditor
- bind:value={$inputs.envContent.value}
- language="env"
- placeholder={m.compose_env_placeholder()}
- />
- </div>
- {#if $inputs.envContent.error}
- <p class="text-destructive mt-1 text-xs">{$inputs.envContent.error}</p>
- {/if}
- </div>
- </div>
- </div>
- </section>
-
- {#if project.status == 'running'}
- <section id="logs" class="scroll-mt-20">
- <div class="mb-6 flex items-center justify-between">
- <h2 class="flex items-center gap-2 text-xl font-semibold">
- <TerminalIcon class="size-5" />
- {m.compose_logs_title()}
- </h2>
- <div class="flex items-center gap-3">
- <label class="flex items-center gap-2">
- <input type="checkbox" bind:checked={autoScrollProjectLogs} class="size-4" />
- {m.common_autoscroll()}
- </label>
- <Button variant="outline" size="sm" onclick={() => projectLogViewer?.clearLogs()}>{m.common_clear()}</Button>
- {#if isProjectLogsStreaming}
- <div class="flex items-center gap-2">
- <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
- <span class="text-sm font-medium text-green-600">{m.common_live()}</span>
- </div>
- <Button variant="outline" size="sm" onclick={() => projectLogViewer?.stopLogStream()}
- >{m.common_stop()}</Button
- >
- {:else}
- <Button
- variant="outline"
- size="sm"
- onclick={() => projectLogViewer?.startLogStream()}
- disabled={!project?.id}
- >
- {m.common_start()}
- </Button>
- {/if}
- <Button
- variant="outline"
- size="sm"
- onclick={() => {
- projectLogViewer?.stopLogStream();
- projectLogViewer?.startLogStream();
- }}
- >
- <RefreshCwIcon class="size-4" />
- </Button>
- </div>
- </div>
-
- <Card.Root class="min-w-0 overflow-hidden border">
- <Card.Content class="min-w-0 overflow-hidden p-0">
- <div class="w-full min-w-0 overflow-hidden">
- <LogViewer
- bind:this={projectLogViewer}
- bind:autoScroll={autoScrollProjectLogs}
- projectId={project.id}
- type="project"
- maxLines={500}
- showTimestamps={true}
- height="600px"
- onStart={handleProjectLogStart}
- onStop={handleProjectLogStop}
- onClear={handleProjectLogClear}
- onToggleAutoScroll={handleToggleProjectAutoScroll}
- />
- </div>
- </Card.Content>
- </Card.Root>
- </section>
- {/if}
- </div>
- </div>
- </div>
- </div>
- {:else if !data.error}
- <div class="flex min-h-screen items-center justify-center">
- <div class="text-center">
- <div class="bg-muted/50 mb-6 inline-flex rounded-full p-6">
- <FileStackIcon class="text-muted-foreground size-10" />
- </div>
- <h2 class="mb-3 text-2xl font-medium">{m.compose_not_found_title()}</h2>
- <p class="text-muted-foreground mb-8 max-w-md text-center">
- {m.compose_not_found_description()}
- </p>
- <Button variant="outline" href="/compose">
- <ArrowLeftIcon class="mr-2 size-4" />
- {m.compose_back_to_projects()}
- </Button>
- </div>
- </div>
- {/if}
-</div>
diff --git a/frontend/src/routes/compose/+page.svelte b/frontend/src/routes/projects/+page.svelte
similarity index 92%
rename from frontend/src/routes/compose/+page.svelte
rename to frontend/src/routes/projects/+page.svelte
index 94d833c53..8d0161d05 100644
--- a/frontend/src/routes/compose/+page.svelte
+++ b/frontend/src/routes/projects/+page.svelte
@@ -8,7 +8,7 @@
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { environmentAPI } from '$lib/services/api';
import StatCard from '$lib/components/stat-card.svelte';
- import ProjectsTable from './compose-table.svelte';
+ import ProjectsTable from './projects-table.svelte';
import { goto } from '$app/navigation';
import { m } from '$lib/paraglide/messages';
@@ -66,7 +66,7 @@
loading={isLoading.updating}
disabled={isLoading.updating}
/>
- <ArcaneButton action="create" customLabel={m.compose_create_project()} onclick={() => goto(`/compose/new`)} />
+ <ArcaneButton action="create" customLabel={m.compose_create_project()} onclick={() => goto(`/projects/new`)} />
<ArcaneButton
action="restart"
customLabel={m.common_refresh()}
@@ -101,10 +101,5 @@
/>
</div>
- <ProjectsTable
- bind:projects
- bind:selectedIds
- requestOptions={projectRequestOptions}
- onCheckForUpdates={handleCheckForUpdates}
- />
+ <ProjectsTable bind:projects bind:selectedIds bind:requestOptions={projectRequestOptions} />
</div>
diff --git a/frontend/src/routes/compose/+page.ts b/frontend/src/routes/projects/+page.ts
similarity index 100%
rename from frontend/src/routes/compose/+page.ts
rename to frontend/src/routes/projects/+page.ts
diff --git a/frontend/src/routes/projects/[projectId]/+page.svelte b/frontend/src/routes/projects/[projectId]/+page.svelte
new file mode 100644
index 000000000..30993bd18
--- /dev/null
+++ b/frontend/src/routes/projects/[projectId]/+page.svelte
@@ -0,0 +1,340 @@
+<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 Tooltip from '$lib/components/ui/tooltip/index.js';
+ import { Separator } from '$lib/components/ui/separator/index.js';
+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';
+ import ArrowLeftIcon from '@lucide/svelte/icons/arrow-left';
+ import FileStackIcon from '@lucide/svelte/icons/file-stack';
+ import LayersIcon from '@lucide/svelte/icons/layers';
+ import SettingsIcon from '@lucide/svelte/icons/settings';
+ import LogsIcon from '@lucide/svelte/icons/logs';
+ import ActionButtons from '$lib/components/action-buttons.svelte';
+ import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { getStatusVariant } from '$lib/utils/status.utils';
+ import { capitalizeFirstLetter } from '$lib/utils/string.utils';
+ import { invalidateAll } from '$app/navigation';
+ import { toast } from 'svelte-sonner';
+ import { tryCatch } from '$lib/utils/try-catch';
+ import { environmentAPI } from '$lib/services/api';
+ import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
+ import { z } from 'zod/v4';
+ import { createForm } from '$lib/utils/form.utils';
+ import { m } from '$lib/paraglide/messages';
+ import { PersistedState } from 'runed';
+ import EditableName from '../components/EditableName.svelte';
+ import ServicesGrid from '../components/ServicesGrid.svelte';
+ import CodePanel from '../components/CodePanel.svelte';
+ import StackLogsPanel from '../components/StackLogsPanel.svelte';
+
+ let { data } = $props();
+ let project = $derived(data.project);
+ let editorState = $derived(data.editorState);
+
+ let isLoading = $state({
+ deploying: false,
+ stopping: false,
+ restarting: false,
+ removing: false,
+ importing: false,
+ redeploying: false,
+ destroying: false,
+ pulling: false,
+ saving: false
+ });
+
+ let originalName = $state(data.editorState.originalName);
+ let originalComposeContent = $state(data.editorState.originalComposeContent);
+ let originalEnvContent = $state(data.editorState.originalEnvContent || '');
+
+ const formSchema = z.object({
+ name: z
+ .string()
+ .min(1, 'Project name is required')
+ .regex(/^[a-z0-9_-]+$/i, 'Only letters, numbers, hyphens, and underscores are allowed'),
+ composeContent: z.string().min(1, 'Compose content is required'),
+ envContent: z.string().optional().default('')
+ });
+
+ let formData = $derived({
+ name: editorState.name,
+ composeContent: editorState.composeContent,
+ envContent: editorState.envContent || ''
+ });
+
+ let { inputs, ...form } = $derived(createForm<typeof formSchema>(formSchema, formData));
+
+ let hasChanges = $derived(
+ $inputs.name.value !== originalName ||
+ $inputs.composeContent.value !== originalComposeContent ||
+ $inputs.envContent.value !== originalEnvContent
+ );
+
+ let canEditName = $derived(!isLoading.saving && project?.status !== 'running' && project?.status !== 'partially running');
+
+ let autoScrollStackLogs = $state(true);
+ let showFloatingHeader = $state(false);
+
+ let selectedTab = $state<'services' | 'compose' | 'logs'>('compose');
+ let composeOpen = $state(true);
+ let envOpen = $state(true);
+
+ let nameInputRef = $state<HTMLInputElement | null>(null);
+
+ type ComposeUIPrefs = {
+ tab: 'services' | 'compose' | 'logs';
+ composeOpen: boolean;
+ envOpen: boolean;
+ autoScroll: boolean;
+ };
+
+ const defaultComposeUIPrefs: ComposeUIPrefs = {
+ tab: 'compose',
+ composeOpen: true,
+ envOpen: true,
+ autoScroll: true
+ };
+
+ let prefs: PersistedState<ComposeUIPrefs> | null = null;
+
+ $effect(() => {
+ if (!project?.id) return;
+ prefs = new PersistedState<ComposeUIPrefs>(`arcane.compose.ui:${project.id}`, defaultComposeUIPrefs, {
+ storage: 'session',
+ syncTabs: false
+ });
+ const cur = prefs.current ?? {};
+ selectedTab = cur.tab ?? defaultComposeUIPrefs.tab;
+ composeOpen = cur.composeOpen ?? defaultComposeUIPrefs.composeOpen;
+ envOpen = cur.envOpen ?? defaultComposeUIPrefs.envOpen;
+ autoScrollStackLogs = cur.autoScroll ?? defaultComposeUIPrefs.autoScroll;
+ });
+
+ // Scroll listener with cleanup (reactive)
+ $effect(() => {
+ const handleScroll = () => {
+ showFloatingHeader = window.scrollY > 100;
+ };
+ window.addEventListener('scroll', handleScroll);
+ return () => window.removeEventListener('scroll', handleScroll);
+ });
+
+ async function handleSaveChanges() {
+ if (!project || !hasChanges) return;
+
+ const validated = form.validate();
+ if (!validated) return;
+
+ const { name, composeContent, envContent } = validated;
+
+ handleApiResultWithCallbacks({
+ result: await tryCatch(environmentAPI.updateProject(name, composeContent, envContent)),
+ message: 'Failed to Save Project',
+ setLoadingState: (value) => (isLoading.saving = value),
+ onSuccess: async (updatedStack: Project) => {
+ toast.success('Project updated successfully!');
+ originalName = updatedStack.name;
+ originalComposeContent = $inputs.composeContent.value;
+ originalEnvContent = $inputs.envContent.value;
+ await new Promise((resolve) => setTimeout(resolve, 200));
+ await invalidateAll();
+ }
+ });
+ }
+
+ function saveNameIfChanged() {
+ if ($inputs.name.value === originalName) return;
+ const validated = form.validate();
+ if (!validated) return;
+ handleSaveChanges();
+ }
+
+ function persistPrefs() {
+ if (!prefs) return;
+ prefs.current = {
+ tab: selectedTab,
+ composeOpen,
+ envOpen,
+ autoScroll: autoScrollStackLogs
+ };
+ }
+</script>
+
+<div class="bg-background flex h-full flex-col overflow-hidden overscroll-y-none">
+ {#if project}
+ <Tabs.Root value={selectedTab} class="flex min-h-0 w-full flex-1 flex-col">
+ <div class="bg-background sticky top-0 flex-shrink-0 border-b backdrop-blur">
+ <div class="mx-auto max-w-full px-4 py-3">
+ <div class="flex items-center justify-between gap-3">
+ <div class="flex min-w-0 items-center gap-3">
+ <Button variant="ghost" size="sm" href="/projects">
+ <ArrowLeftIcon class="mr-2 size-4" />
+ {m.common_back()}
+ </Button>
+ <Separator orientation="vertical" class="mx-1 h-5" />
+ <div class="min-w-0">
+ <div class="flex items-center gap-2">
+ <EditableName
+ bind:value={$inputs.name.value}
+ bind:ref={nameInputRef}
+ error={$inputs.name.error ?? undefined}
+ originalValue={originalName}
+ canEdit={canEditName}
+ onCommit={saveNameIfChanged}
+ />
+ {#if project.status}
+ <StatusBadge variant={getStatusVariant(project.status)} text={capitalizeFirstLetter(project.status)} />
+ {/if}
+ </div>
+ {#if project.createdAt}
+ <p class="text-muted-foreground mt-0.5 text-xs">
+ {m.common_created()}: {new Date(project.createdAt ?? '').toLocaleDateString()}
+ </p>
+ {/if}
+ </div>
+ </div>
+ <div class="flex items-center gap-2">
+ {#if hasChanges}
+ <ArcaneButton
+ action="save"
+ size="sm"
+ loading={isLoading.saving}
+ onclick={handleSaveChanges}
+ disabled={!hasChanges}
+ customLabel={m.common_save()}
+ loadingLabel={m.common_saving()}
+ />
+ {/if}
+ <ActionButtons
+ id={project.id}
+ type="project"
+ itemState={project.status}
+ bind:startLoading={isLoading.deploying}
+ bind:stopLoading={isLoading.stopping}
+ bind:restartLoading={isLoading.restarting}
+ bind:removeLoading={isLoading.removing}
+ bind:redeployLoading={isLoading.redeploying}
+ onActionComplete={() => invalidateAll()}
+ />
+ </div>
+ </div>
+
+ <div class="mt-4">
+ <Tabs.List class="w-full justify-start gap-4">
+ <Tabs.Trigger
+ value="services"
+ class="gap-2"
+ onclick={() => {
+ selectedTab = 'services';
+ persistPrefs();
+ }}
+ >
+ <LayersIcon class="size-4" />
+ {m.compose_nav_services()}
+ {#if project.serviceCount}
+ <span
+ class="bg-primary text-primary-foreground ml-1 inline-flex min-w-[18px] items-center justify-center rounded-full px-1 text-[10px] font-medium"
+ >
+ {project.serviceCount}
+ </span>
+ {/if}
+ </Tabs.Trigger>
+ <Tabs.Trigger
+ value="compose"
+ class="gap-2"
+ onclick={() => {
+ selectedTab = 'compose';
+ persistPrefs();
+ }}
+ >
+ <SettingsIcon class="size-4" />
+ {m.compose_nav_config()}
+ </Tabs.Trigger>
+ <Tabs.Trigger
+ value="logs"
+ class="gap-2"
+ disabled={project.status !== 'running'}
+ onclick={() => {
+ selectedTab = 'logs';
+ persistPrefs();
+ }}
+ >
+ <LogsIcon class="size-4" />
+ {m.compose_nav_logs()}
+ </Tabs.Trigger>
+ </Tabs.List>
+ </div>
+ </div>
+ </div>
+
+ <div class="min-h-0 flex-1 overflow-hidden">
+ <div class="h-full px-4 py-4">
+ <Tabs.Content value="services" class="h-full min-h-0">
+ <ServicesGrid services={project.services} />
+ </Tabs.Content>
+
+ <Tabs.Content value="compose" class="h-full min-h-0">
+ <div class="grid h-full min-h-0 grid-cols-1 gap-4 lg:grid-cols-3" style="grid-template-rows: 1fr;">
+ <div class="h-full min-h-0 lg:col-span-2">
+ <CodePanel
+ bind:open={composeOpen}
+ title={m.compose_compose_file_title()}
+ language="yaml"
+ bind:value={$inputs.composeContent.value}
+ placeholder={m.compose_compose_placeholder()}
+ error={$inputs.composeContent.error ?? undefined}
+ />
+ </div>
+
+ <div class="h-full min-h-0 lg:col-span-1">
+ <CodePanel
+ bind:open={envOpen}
+ title={m.compose_env_title()}
+ language="env"
+ bind:value={$inputs.envContent.value}
+ placeholder={m.compose_env_placeholder()}
+ error={$inputs.envContent.error ?? undefined}
+ />
+ </div>
+ </div>
+ </Tabs.Content>
+
+ <Tabs.Content value="logs" class="h-full min-h-0">
+ {#if project.status == 'running'}
+ <div class="h-full min-h-0">
+ <StackLogsPanel projectId={project.id} bind:autoScroll={autoScrollStackLogs} />
+ </div>
+ {:else}
+ <div class="text-muted-foreground py-12 text-center">{m.compose_logs_title()} Unavailable</div>
+ {/if}
+ </Tabs.Content>
+ </div>
+ </div>
+ </Tabs.Root>
+ {:else if !data.error}
+ <div class="flex min-h-screen items-center justify-center">
+ <div class="text-center">
+ <div class="bg-muted/50 mb-6 inline-flex rounded-full p-6">
+ <FileStackIcon class="text-muted-foreground size-10" />
+ </div>
+ <h2 class="mb-3 text-2xl font-medium">{m.compose_not_found_title()}</h2>
+ <p class="text-muted-foreground mb-8 max-w-md text-center">
+ {m.compose_not_found_description()}
+ </p>
+ <Button variant="outline" href="/projects">
+ <ArrowLeftIcon class="mr-2 size-4" />
+ {m.compose_back_to_projects()}
+ </Button>
+ </div>
+ </div>
+ {/if}
+
+ <Tooltip.Provider />
+</div>
+
+<style>
+ :global(.tab-body) {
+ height: calc(100dvh - 152px);
+ }
+</style>
diff --git a/frontend/src/routes/compose/[projectId]/+page.ts b/frontend/src/routes/projects/[projectId]/+page.ts
similarity index 82%
rename from frontend/src/routes/compose/[projectId]/+page.ts
rename to frontend/src/routes/projects/[projectId]/+page.ts
index 3b92a0ae3..2ae38eb7a 100644
--- a/frontend/src/routes/compose/[projectId]/+page.ts
+++ b/frontend/src/routes/projects/[projectId]/+page.ts
@@ -4,7 +4,6 @@ import type { PageLoad } from './$types';
export const load: PageLoad = async ({ params }) => {
const project = await environmentAPI.getProject(params.projectId);
- // Set up editor state with the project data
const editorState = {
name: project.name || '',
composeContent: project.composeContent || '',
@@ -17,7 +16,6 @@ export const load: PageLoad = async ({ params }) => {
return {
project,
editorState,
- servicePorts: {}, // TODO: Extract from project services if needed
error: null
};
};
diff --git a/frontend/src/routes/projects/components/CodePanel.svelte b/frontend/src/routes/projects/components/CodePanel.svelte
new file mode 100644
index 000000000..a2380228e
--- /dev/null
+++ b/frontend/src/routes/projects/components/CodePanel.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+ import * as Collapsible from '$lib/components/ui/collapsible/index.js';
+ import { Button } from '$lib/components/ui/button/index.js';
+ import CodeEditor from '$lib/components/code-editor/editor.svelte';
+ import { m } from '$lib/paraglide/messages';
+
+ type CodeLanguage = 'yaml' | 'env';
+
+ let {
+ title,
+ open = $bindable(),
+ language,
+ value = $bindable(),
+ placeholder,
+ error
+ }: {
+ title: string;
+ open: boolean;
+ language: CodeLanguage;
+ value: string;
+ placeholder?: string;
+ error?: string;
+ } = $props();
+</script>
+
+<div class="flex items-center justify-between px-4 py-2">
+ <h3 class="text-sm font-semibold">{title}</h3>
+</div>
+<div class="h-[560px] w-full overflow-hidden px-4 pb-4">
+ <CodeEditor bind:value {language} {placeholder} />
+ {#if error}
+ <p class="text-destructive mt-2 text-xs">{error}</p>
+ {/if}
+</div>
diff --git a/frontend/src/routes/projects/components/EditableName.svelte b/frontend/src/routes/projects/components/EditableName.svelte
new file mode 100644
index 000000000..5bae89eee
--- /dev/null
+++ b/frontend/src/routes/projects/components/EditableName.svelte
@@ -0,0 +1,99 @@
+<script lang="ts">
+ import { Input } from '$lib/components/ui/input/index.js';
+ import { Button } from '$lib/components/ui/button/index.js';
+ import * as Tooltip from '$lib/components/ui/tooltip/index.js';
+ import InfoIcon from '@lucide/svelte/icons/info';
+ import PencilIcon from '@lucide/svelte/icons/pencil';
+ import { tick } from 'svelte';
+ import { m } from '$lib/paraglide/messages';
+
+ let {
+ value = $bindable(),
+ ref = $bindable(),
+ error,
+ originalValue,
+ canEdit = true,
+ onCommit
+ }: {
+ value: string;
+ ref: HTMLInputElement | null;
+ error?: string;
+ originalValue: string;
+ canEdit?: boolean;
+ onCommit?: () => void;
+ } = $props();
+
+ let isEditing = $state(false);
+
+ async function beginEdit() {
+ if (!canEdit) return;
+ isEditing = true;
+ await tick();
+ ref?.focus();
+ }
+</script>
+
+<div class="group flex items-center gap-1">
+ {#if isEditing}
+ <Input
+ bind:ref
+ bind:value
+ class="h-8 max-w-[360px] px-2 text-lg font-semibold {error ? 'border-destructive' : ''}"
+ autofocus
+ onkeydown={(e) => {
+ if (e.key === 'Enter') {
+ e.preventDefault();
+ onCommit?.();
+ isEditing = false;
+ }
+ if (e.key === 'Escape') {
+ value = originalValue;
+ isEditing = false;
+ }
+ }}
+ onblur={() => {
+ if (!isEditing) return;
+ onCommit?.();
+ isEditing = false;
+ }}
+ disabled={!canEdit}
+ />
+ {:else}
+ <h1 class="m-0 max-w-[360px]">
+ <button
+ type="button"
+ class="w-full truncate bg-transparent px-0 py-0 text-left text-lg font-semibold leading-none"
+ title={value}
+ onclick={beginEdit}
+ disabled={!canEdit}
+ >
+ {value}
+ </button>
+ </h1>
+ {#if canEdit}
+ <Button
+ variant="ghost"
+ size="icon"
+ class="size-6 opacity-0 transition-opacity group-hover:opacity-100"
+ aria-label="Edit name"
+ title="Edit name"
+ onclick={beginEdit}
+ >
+ <PencilIcon class="size-3.5" />
+ </Button>
+ {:else}
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ <span class="text-muted-foreground inline-flex cursor-help items-center leading-none">
+ <InfoIcon class="relative top-0.5 size-4 shrink-0" />
+ </span>
+ </Tooltip.Trigger>
+ <Tooltip.Content>{m.compose_name_change_not_allowed()}</Tooltip.Content>
+ </Tooltip.Root>
+ {/if}
+ {/if}
+</div>
+
+{#if isEditing && error}
+ <p class="text-destructive mt-1 text-xs">{error}</p>
+{/if}
diff --git a/frontend/src/routes/projects/components/ServicesGrid.svelte b/frontend/src/routes/projects/components/ServicesGrid.svelte
new file mode 100644
index 000000000..0fd3cee4c
--- /dev/null
+++ b/frontend/src/routes/projects/components/ServicesGrid.svelte
@@ -0,0 +1,65 @@
+<script lang="ts">
+ import LayersIcon from '@lucide/svelte/icons/layers';
+ import StatusBadge from '$lib/components/badges/status-badge.svelte';
+ import { getStatusVariant } from '$lib/utils/status.utils';
+ import { capitalizeFirstLetter } from '$lib/utils/string.utils';
+ import { m } from '$lib/paraglide/messages';
+
+ type Service = {
+ container_id?: string;
+ name: string;
+ status?: string;
+ };
+
+ let { services }: { services?: Service[] } = $props();
+</script>
+
+{#if services && services.length > 0}
+ <div class="bg-card rounded-lg border">
+ <div class="grid grid-cols-1 gap-2 p-4 sm:grid-cols-2 lg:grid-cols-3">
+ {#each services as service (service.container_id || service.name)}
+ {@const status = service.status || 'unknown'}
+ {@const variant = getStatusVariant(status)}
+
+ {#if service.container_id}
+ <a
+ href={`/containers/${service.container_id}`}
+ class="bg-background hover:bg-muted/50 group flex items-center gap-3 rounded-lg border p-3 transition-all"
+ >
+ <div class="bg-primary/10 rounded-full p-2">
+ <LayersIcon class="text-primary size-3" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <div class="flex items-center justify-between">
+ <p class="truncate text-sm font-medium" title={service.name}>{service.name}</p>
+ </div>
+ <div class="mt-1 flex items-center gap-2">
+ <StatusBadge {variant} text={capitalizeFirstLetter(status)} class="text-xs" />
+ </div>
+ </div>
+ </a>
+ {:else}
+ <div class="bg-muted/10 flex items-center gap-3 rounded-lg border p-3">
+ <div class="bg-muted/50 rounded-full p-2">
+ <LayersIcon class="text-muted-foreground size-3" />
+ </div>
+ <div class="min-w-0 flex-1">
+ <p class="truncate text-sm font-medium" title={service.name}>{service.name}</p>
+ <div class="mt-1 flex items-center gap-2">
+ <StatusBadge {variant} text={capitalizeFirstLetter(status)} class="text-xs" />
+ <span class="text-muted-foreground text-xs">{m.compose_service_not_created()}</span>
+ </div>
+ </div>
+ </div>
+ {/if}
+ {/each}
+ </div>
+ </div>
+{:else}
+ <div class="py-12 text-center">
+ <div class="bg-muted/50 mx-auto mb-4 flex size-16 items-center justify-center rounded-full">
+ <LayersIcon class="text-muted-foreground size-6" />
+ </div>
+ <div class="text-muted-foreground">{m.compose_no_services_found()}</div>
+ </div>
+{/if}
diff --git a/frontend/src/routes/projects/components/StackLogsPanel.svelte b/frontend/src/routes/projects/components/StackLogsPanel.svelte
new file mode 100644
index 000000000..29ee7a3c2
--- /dev/null
+++ b/frontend/src/routes/projects/components/StackLogsPanel.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+ import * as Card from '$lib/components/ui/card/index.js';
+ import { Button } from '$lib/components/ui/button/index.js';
+ import TerminalIcon from '@lucide/svelte/icons/terminal';
+ import RefreshCwIcon from '@lucide/svelte/icons/refresh-cw';
+ import LogViewer from '$lib/components/log-viewer.svelte';
+ import { m } from '$lib/paraglide/messages';
+
+ let {
+ projectId,
+ autoScroll = $bindable()
+ }: {
+ projectId: string;
+ autoScroll: boolean;
+ } = $props();
+
+ let isStreaming = $state(false);
+ let viewer = $state<LogViewer>();
+
+ function onStart() {
+ isStreaming = true;
+ }
+ function onStop() {
+ isStreaming = false;
+ }
+ function onClear() {}
+ function onToggleAutoScroll() {}
+</script>
+
+<div class="mb-3 flex items-center justify-between">
+ <div class="flex items-center gap-2">
+ <TerminalIcon class="size-5" />
+ <h2 class="text-xl font-semibold">{m.compose_logs_title()}</h2>
+ </div>
+ <div class="flex items-center gap-3">
+ <label class="flex items-center gap-2">
+ <input type="checkbox" bind:checked={autoScroll} class="size-4" />
+ {m.common_autoscroll()}
+ </label>
+ <Button variant="outline" size="sm" onclick={() => viewer?.clearLogs()}>{m.common_clear()}</Button>
+ {#if isStreaming}
+ <div class="flex items-center gap-2">
+ <div class="size-2 animate-pulse rounded-full bg-green-500"></div>
+ <span class="text-sm font-medium text-green-600">{m.common_live()}</span>
+ </div>
+ <Button variant="outline" size="sm" onclick={() => viewer?.stopLogStream()}>{m.common_stop()}</Button>
+ {:else}
+ <Button variant="outline" size="sm" onclick={() => viewer?.startLogStream()} disabled={!projectId}>
+ {m.common_start()}
+ </Button>
+ {/if}
+ <Button
+ variant="outline"
+ size="sm"
+ onclick={() => {
+ viewer?.stopLogStream();
+ viewer?.startLogStream();
+ }}
+ aria-label="Refresh logs"
+ title="Refresh"
+ >
+ <RefreshCwIcon class="size-4" />
+ </Button>
+ </div>
+</div>
+
+<Card.Root class="overflow-hidden border">
+ <Card.Content class="p-0">
+ <div class="w-full overflow-hidden">
+ <LogViewer
+ bind:this={viewer}
+ bind:autoScroll
+ {projectId}
+ type="project"
+ maxLines={500}
+ showTimestamps={true}
+ height="600px"
+ {onStart}
+ {onStop}
+ {onClear}
+ {onToggleAutoScroll}
+ />
+ </div>
+ </Card.Content>
+</Card.Root>
diff --git a/frontend/src/routes/compose/new/+page.svelte b/frontend/src/routes/projects/new/+page.svelte
similarity index 99%
rename from frontend/src/routes/compose/new/+page.svelte
rename to frontend/src/routes/projects/new/+page.svelte
index 8e043fdd0..bcba1e0b4 100644
--- a/frontend/src/routes/compose/new/+page.svelte
+++ b/frontend/src/routes/projects/new/+page.svelte
@@ -69,7 +69,7 @@
setLoadingState: (value) => (saving = value),
onSuccess: async (project) => {
toast.success(m.compose_create_success({ name }));
- goto(`/compose/${project.id}`, { invalidateAll: true });
+ goto(`/projects/${project.id}`, { invalidateAll: true });
}
});
}
@@ -133,7 +133,7 @@
</script>
<div class="bg-background min-h-screen">
- <div class="bg-background/80 supports-[backdrop-filter]:bg-background/60 sticky top-0 z-20 border-b backdrop-blur">
+ <div class="bg-background/80 supports-[backdrop-filter]:bg-background/60 sticky top-0 border-b backdrop-blur">
<div class="max-w-full px-4 py-3">
<div class="flex items-center justify-between">
<div class="flex items-center gap-3">
diff --git a/frontend/src/routes/compose/new/+page.ts b/frontend/src/routes/projects/new/+page.ts
similarity index 100%
rename from frontend/src/routes/compose/new/+page.ts
rename to frontend/src/routes/projects/new/+page.ts
diff --git a/frontend/src/routes/compose/compose-table.svelte b/frontend/src/routes/projects/projects-table.svelte
similarity index 97%
rename from frontend/src/routes/compose/compose-table.svelte
rename to frontend/src/routes/projects/projects-table.svelte
index 60e763ea5..7b34745a9 100644
--- a/frontend/src/routes/compose/compose-table.svelte
+++ b/frontend/src/routes/projects/projects-table.svelte
@@ -28,13 +28,11 @@
let {
projects = $bindable(),
selectedIds = $bindable(),
- requestOptions = $bindable(),
- onCheckForUpdates
+ requestOptions = $bindable()
}: {
projects: Paginated<Project>;
selectedIds: string[];
requestOptions: SearchPaginationSortRequest;
- onCheckForUpdates: () => Promise<void>;
} = $props();
let isLoading = $state({
@@ -143,7 +141,7 @@
</script>
{#snippet NameCell({ item }: { item: Project })}
- <a class="font-medium hover:underline" href="/compose/{item.id}/">
+ <a class="font-medium hover:underline" href="/projects/{item.id}/">
{item.name}
</a>
{/snippet}
@@ -169,7 +167,7 @@
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end">
<DropdownMenu.Group>
- <DropdownMenu.Item onclick={() => goto(`/compose/${item.id}`)} disabled={isAnyLoading}>
+ <DropdownMenu.Item onclick={() => goto(`/projects/${item.id}`)} disabled={isAnyLoading}>
<PenIcon class="size-4" />
{m.common_edit()}
</DropdownMenu.Item>
diff --git a/tests/spec/converter.spec.ts b/tests/spec/converter.spec.ts
index 3eea35742..1c80b4d42 100644
--- a/tests/spec/converter.spec.ts
+++ b/tests/spec/converter.spec.ts
@@ -7,7 +7,7 @@ async function openConvertFromDockerRun(page: Page) {
test.describe('Docker Run to Compose Converter', () => {
test.beforeEach(async ({ page }) => {
- await page.goto('/compose/new');
+ await page.goto('/projects/new');
await page.waitForLoadState('networkidle');
});
diff --git a/tests/spec/compose.spec.ts b/tests/spec/project.spec.ts
similarity index 69%
rename from tests/spec/compose.spec.ts
rename to tests/spec/project.spec.ts
index cb1f92f9e..a52672109 100644
--- a/tests/spec/compose.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -20,7 +20,7 @@ async function fetchProjectsWithRetry(page: Page, maxRetries = 3): Promise<any[]
let realProjects: any[] = [];
test.beforeEach(async ({ page }) => {
- await page.goto('/compose');
+ await page.goto('/projects');
await page.waitForLoadState('networkidle');
try {
@@ -51,7 +51,7 @@ test.describe('Compose Projects Page', () => {
test('should navigate to new project page when "Create Project" is clicked', async ({ page }) => {
await page.getByRole('button', { name: 'Create Project' }).click();
- await expect(page).toHaveURL('/compose/new');
+ await expect(page).toHaveURL('/projects/new');
await expect(page.getByRole('heading', { name: 'Create New Project' })).toBeVisible();
});
@@ -82,7 +82,7 @@ test.describe('Compose Projects Page', () => {
const projectName = await firstProjectLink.textContent();
await firstProjectLink.click();
- await expect(page).toHaveURL(new RegExp(`/compose/.+`));
+ await expect(page).toHaveURL(new RegExp(`/projects/.+`));
await expect(page.getByRole('heading', { name: new RegExp(`.*${projectName}`) })).toBeVisible();
});
@@ -121,7 +121,7 @@ test.describe('Compose Projects Page', () => {
test.describe('New Compose Project Page', () => {
test.beforeEach(async ({ page }) => {
- await page.goto('/compose/new');
+ await page.goto('/projects/new');
await page.waitForLoadState('networkidle');
});
@@ -136,7 +136,6 @@ test.describe('New Compose Project Page', () => {
const createButton = page.getByRole('button', { name: 'Create' }).first();
await expect(createButton).toBeDisabled();
- // Fill in project name
await page.getByLabel('Project Name').fill('test-project');
});
@@ -169,107 +168,101 @@ test.describe('New Compose Project Page', () => {
}
});
- // Create the project
const createButton = page.getByRole('button', { name: 'Create' });
await createButton.click();
- // Wait for navigation and verify we're on the correct page
- await page.waitForURL(new RegExp(`/compose/.+`), { timeout: 10000 });
+ await page.waitForURL(new RegExp(`/projects/.+`), { timeout: 10000 });
- // Verify we redirected to the created project's page
if (createdProjectId) {
- await expect(page).toHaveURL(new RegExp(`/compose/${createdProjectId}`));
+ await expect(page).toHaveURL(new RegExp(`/projects/${createdProjectId}`));
} else {
- // Fallback: just check we're on a project detail page with some UUID
- await expect(page).toHaveURL(new RegExp(`/compose/[a-f0-9\\-]{36}`));
+ await expect(page).toHaveURL(new RegExp(`/projects/[a-f0-9\\-]{36}`));
}
- // Verify the project detail page loads correctly
- await expect(page.getByText('Overview')).toBeVisible();
+ await expect(page.getByRole('button', { name: projectName })).toBeVisible();
});
});
test.describe('Project Detail Page', () => {
- test('should display project overview for existing project', async ({ page }) => {
+ test('should display project details for existing project', async ({ page }) => {
test.skip(!realProjects.length, 'No projects available for detail page test');
const firstProject = realProjects[0];
- await page.goto(`/compose/${firstProject.id || firstProject.name}`);
+ await page.goto(`/projects/${firstProject.id || firstProject.name}`);
await page.waitForLoadState('networkidle');
- // Check for main sections
- await expect(page.getByText('Overview')).toBeVisible();
- await expect(page.getByText('Services').first()).toBeVisible();
- await expect(page.getByText('Configuration').first()).toBeVisible();
+ await expect(page.getByRole('button', { name: firstProject.name, exact: false })).toBeVisible();
- // Check for project stats
- await expect(page.getByText('Services').nth(1)).toBeVisible();
- await expect(page.getByText('Running')).toBeVisible();
- await expect(page.getByText('Created').first()).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Services/i })).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Configuration|Config/i })).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Logs/i })).toBeVisible();
});
- test('should display navigation sidebar', async ({ page }) => {
+ test('should display tabs navigation', async ({ page }) => {
test.skip(!realProjects.length, 'No projects available for navigation test');
-
const firstProject = realProjects[0];
- await page.goto(`/compose/${firstProject.id || firstProject.name}`);
+ await page.goto(`/projects/${firstProject.id || firstProject.name}`);
await page.waitForLoadState('networkidle');
- // Check navigation buttons
- const overviewButton = page.locator('button[title="Overview"]');
- const servicesButton = page.locator('button[title="Services"]');
- const configButton = page.locator('button[title="Configuration"]');
-
- await expect(overviewButton).toBeVisible();
- await expect(servicesButton).toBeVisible();
- await expect(configButton).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Services/i })).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Configuration|Config/i })).toBeVisible();
+ await expect(page.getByRole('tab', { name: /Logs/i })).toBeVisible();
});
- test('should display services section', async ({ page }) => {
+ test('should display services tab content', async ({ page }) => {
test.skip(!realProjects.length, 'No projects available for services test');
- const projectWithServices = realProjects.find((p) => p.serviceCount > 0);
- test.skip(!projectWithServices, 'No projects with services found');
-
- await page.goto(`/compose/${projectWithServices.id || projectWithServices.name}`);
+ const projectWithServices = realProjects.find((p) => p.serviceCount > 0) || realProjects[0];
+ await page.goto(`/projects/${projectWithServices.id || projectWithServices.name}`);
await page.waitForLoadState('networkidle');
- // Navigate to services section
- await page.locator('button[title="Services"]').click();
+ await page.getByRole('tab', { name: /Services/i }).click();
+
+ const nginxService = page.getByText(/nginx/i);
+ const emptyState = page.getByText(/No services found/i);
- await expect(page.getByText(`Services (${projectWithServices.serviceCount})`)).toBeVisible();
+ if ((await nginxService.count()) > 0) {
+ await expect(nginxService.first()).toBeVisible();
+ } else {
+ const anyServiceBadge = page.locator('text=/running|stopped|unknown/i').first();
+ if ((await anyServiceBadge.count()) > 0) {
+ await expect(anyServiceBadge).toBeVisible();
+ } else {
+ await expect(emptyState).toBeVisible();
+ }
+ }
});
- test('should display configuration section with editors', async ({ page }) => {
+ test('should display configuration editors', async ({ page }) => {
test.skip(!realProjects.length, 'No projects available for configuration test');
const firstProject = realProjects[0];
- await page.goto(`/compose/${firstProject.id || firstProject.name}`);
+ await page.goto(`/projects/${firstProject.id || firstProject.name}`);
await page.waitForLoadState('networkidle');
- // Navigate to configuration section
- await page.locator('button[title="Configuration"]').click();
- await expect(page.getByRole('heading', { name: 'Configuration' })).toBeVisible();
- await expect(page.getByText('Project Name')).toBeVisible();
- await expect(page.getByText('Compose File')).toBeVisible();
- await expect(page.getByText('Environment (.env)')).toBeVisible();
+ await page.getByRole('tab', { name: /Configuration|Config/i }).click();
+
+ // Titles inside CodePanel components
+ await expect(page.getByText(/Compose File/i)).toBeVisible();
+ await expect(page.getByText(/Environment\s*\(.env\)/i)).toBeVisible();
});
- test('should show logs section for running projects', async ({ page }) => {
+ test('should show logs tab for running projects', async ({ page }) => {
test.skip(!realProjects.length, 'No projects available for logs test');
const runningProject = realProjects.find((p) => p.status === 'running');
test.skip(!runningProject, 'No running projects found for logs test');
- await page.goto(`/compose/${runningProject.id || runningProject.name}`);
+ await page.goto(`/projects/${runningProject.id || runningProject.name}`);
await page.waitForLoadState('networkidle');
- // Navigate to logs section
- await page.locator('button[title="Logs"]').click();
+ const logsTab = page.getByRole('tab', { name: /Logs/i });
+ await expect(logsTab).toBeEnabled();
+ await logsTab.click();
- await expect(page.getByText('Project Logs')).toBeVisible();
- await expect(page.getByText('Auto-scroll')).toBeVisible();
- await expect(page.getByRole('button', { name: 'Clear' })).toBeVisible();
- await expect(page.getByRole('button', { name: 'Start' })).toBeVisible();
+ // StackLogsPanel heading
+ await expect(page.getByText(/Logs/i)).toBeVisible();
+ await expect(page.getByRole('button', { name: /Start|Stop/i })).toBeVisible();
+ await expect(page.getByRole('button', { name: /Clear/i })).toBeVisible();
});
});