Skip to content

Modern Docker Management, Designed for Everyone

fix: pull real data for dashboard

Kyle Mendelld66c73540a39
diff --git a/src/lib/components/ui/alert/alert-description.svelte b/src/lib/components/ui/alert/alert-description.svelte
new file mode 100644
index 000000000..ef74aa4ec
--- /dev/null
+++ b/src/lib/components/ui/alert/alert-description.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+ import type { WithElementRef } from "bits-ui";
+ import type { HTMLAttributes } from "svelte/elements";
+ import { cn } from "$lib/utils.js";
+
+ let {
+ ref = $bindable(null),
+ class: className,
+ children,
+ ...restProps
+ }: WithElementRef<HTMLAttributes<HTMLDivElement>> = $props();
+</script>
+
+<div bind:this={ref} class={cn("text-sm [&_p]:leading-relaxed", className)} {...restProps}>
+ {@render children?.()}
+</div>
diff --git a/src/lib/components/ui/alert/alert-title.svelte b/src/lib/components/ui/alert/alert-title.svelte
new file mode 100644
index 000000000..12ec9fc52
--- /dev/null
+++ b/src/lib/components/ui/alert/alert-title.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+ import type { HTMLAttributes } from "svelte/elements";
+ import type { WithElementRef } from "bits-ui";
+ import { cn } from "$lib/utils.js";
+
+ let {
+ ref = $bindable(null),
+ class: className,
+ level = 5,
+ children,
+ ...restProps
+ }: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+ level?: 1 | 2 | 3 | 4 | 5 | 6;
+ } = $props();
+</script>
+
+<div
+ role="heading"
+ aria-level={level}
+ bind:this={ref}
+ class={cn("mb-1 font-medium leading-none tracking-tight", className)}
+ {...restProps}
+>
+ {@render children?.()}
+</div>
diff --git a/src/lib/components/ui/alert/alert.svelte b/src/lib/components/ui/alert/alert.svelte
new file mode 100644
index 000000000..8b4528f64
--- /dev/null
+++ b/src/lib/components/ui/alert/alert.svelte
@@ -0,0 +1,39 @@
+<script lang="ts" module>
+ import { type VariantProps, tv } from "tailwind-variants";
+
+ export const alertVariants = tv({
+ base: "[&>svg]:text-foreground relative w-full rounded-lg border p-4 [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg~*]:pl-7",
+ variants: {
+ variant: {
+ default: "bg-background text-foreground",
+ destructive:
+ "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
+ },
+ },
+ defaultVariants: {
+ variant: "default",
+ },
+ });
+
+ export type AlertVariant = VariantProps<typeof alertVariants>["variant"];
+</script>
+
+<script lang="ts">
+ import type { HTMLAttributes } from "svelte/elements";
+ import type { WithElementRef } from "bits-ui";
+ import { cn } from "$lib/utils.js";
+
+ let {
+ ref = $bindable(null),
+ class: className,
+ variant = "default",
+ children,
+ ...restProps
+ }: WithElementRef<HTMLAttributes<HTMLDivElement>> & {
+ variant?: AlertVariant;
+ } = $props();
+</script>
+
+<div bind:this={ref} class={cn(alertVariants({ variant }), className)} {...restProps} role="alert">
+ {@render children?.()}
+</div>
diff --git a/src/lib/components/ui/alert/index.ts b/src/lib/components/ui/alert/index.ts
new file mode 100644
index 000000000..97e21b4ea
--- /dev/null
+++ b/src/lib/components/ui/alert/index.ts
@@ -0,0 +1,14 @@
+import Root from "./alert.svelte";
+import Description from "./alert-description.svelte";
+import Title from "./alert-title.svelte";
+export { alertVariants, type AlertVariant } from "./alert.svelte";
+
+export {
+ Root,
+ Description,
+ Title,
+ //
+ Root as Alert,
+ Description as AlertDescription,
+ Title as AlertTitle,
+};
diff --git a/src/lib/services/docker-service.ts b/src/lib/services/docker-service.ts
index 0552ffc4f..cf74cf071 100644
--- a/src/lib/services/docker-service.ts
+++ b/src/lib/services/docker-service.ts
@@ -143,6 +143,62 @@ export async function getContainer(containerId: string) {
}
}
-// Add more functions here as needed (e.g., startContainer, stopContainer, removeContainer, listImages, etc.)
+// Define and export the type returned by listImages
+export type ServiceImage = {
+ id: string;
+ repoTags: string[] | undefined;
+ repoDigests: string[] | undefined;
+ created: number;
+ size: number;
+ virtualSize: number;
+ labels: { [label: string]: string } | undefined;
+ // Add primary repo and tag for easier display
+ repo: string;
+ tag: string;
+};
+
+/**
+ * Lists Docker images.
+ */
+// Add the return type annotation
+export async function listImages(): Promise<ServiceImage[]> {
+ try {
+ const images = await defaultDocker.listImages({ all: false }); // Usually only show non-intermediate images
+
+ // Function to parse repo and tag
+ const parseRepoTag = (
+ tag: string | undefined
+ ): { repo: string; tag: string } => {
+ if (!tag || tag === "<none>:<none>") {
+ return { repo: "<none>", tag: "<none>" };
+ }
+ const parts = tag.split(":");
+ if (parts.length === 1) {
+ return { repo: parts[0], tag: "latest" }; // Assume latest if no tag
+ }
+ const tagPart = parts.pop() || "latest";
+ const repoPart = parts.join(":");
+ return { repo: repoPart, tag: tagPart };
+ };
+
+ return images.map((img): ServiceImage => {
+ const { repo, tag } = parseRepoTag(img.RepoTags?.[0]);
+ return {
+ id: img.Id,
+ repoTags: img.RepoTags,
+ repoDigests: img.RepoDigests,
+ created: img.Created,
+ size: img.Size,
+ virtualSize: img.VirtualSize,
+ labels: img.Labels,
+ repo: repo,
+ tag: tag,
+ };
+ });
+ } catch (error: any) {
+ console.error("Error listing images:", error);
+ throw new Error("Failed to list Docker images.");
+ }
+}
export default defaultDocker;
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
new file mode 100644
index 000000000..56b54852f
--- /dev/null
+++ b/src/routes/+page.server.ts
@@ -0,0 +1,69 @@
+import type { PageServerLoad } from "./$types";
+import {
+ getDockerInfo,
+ listContainers,
+ listImages,
+} from "$lib/services/docker-service";
+import type {
+ ServiceContainer,
+ ServiceImage,
+} from "$lib/services/docker-service";
+
+// Infer the Docker Info type from the return type of getDockerInfo
+type DockerInfoType = Awaited<ReturnType<typeof getDockerInfo>>;
+
+// Define a type for the combined data using the inferred type
+type DashboardData = {
+ dockerInfo: DockerInfoType | null; // Use the inferred type
+ containers: ServiceContainer[];
+ images: ServiceImage[];
+ error?: string;
+};
+
+export const load: PageServerLoad = async (): Promise<DashboardData> => {
+ try {
+ // Fetch all data concurrently
+ const [dockerInfo, containers, images] = await Promise.all([
+ getDockerInfo().catch((e) => {
+ console.error("Dashboard: Failed to get Docker info:", e.message);
+ return null; // Return null on error for this specific piece
+ }),
+ listContainers(true).catch((e) => {
+ console.error("Dashboard: Failed to list containers:", e.message);
+ return []; // Return empty array on error
+ }),
+ listImages().catch((e) => {
+ console.error("Dashboard: Failed to list images:", e.message);
+ return []; // Return empty array on error
+ }),
+ ]);
+
+ // Check if the primary connection failed
+ if (!dockerInfo) {
+ return {
+ dockerInfo: null,
+ containers: [],
+ images: [],
+ error:
+ "Failed to connect to Docker Engine. Please check settings and ensure Docker is running.",
+ };
+ }
+
+ return {
+ dockerInfo,
+ containers,
+ images,
+ };
+ } catch (err: any) {
+ // Catch any unexpected errors during Promise.all or processing
+ console.error("Dashboard: Unexpected error loading data:", err);
+ return {
+ dockerInfo: null,
+ containers: [],
+ images: [],
+ error:
+ err.message ||
+ "An unexpected error occurred while loading dashboard data.",
+ };
+ }
+};
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a99cd356b..2b0b0ce7e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,23 +1,36 @@
<script lang="ts">
+ import type { PageData } from "./$types";
import * as Card from "$lib/components/ui/card/index.js";
+ import { Button } from "$lib/components/ui/button/index.js";
+ import * as Table from "$lib/components/ui/table/index.js";
+ import StatusBadge from "$lib/components/docker/StatusBadge.svelte";
+ import { AlertCircle } from "@lucide/svelte";
+ import * as Alert from "$lib/components/ui/alert/index.js";
- // Placeholder data; replace with API calls later
- let containers = [
- { id: "1a2b3c", name: "web", status: "running", image: "nginx:latest" },
- { id: "4d5e6f", name: "db", status: "exited", image: "postgres:15" },
- ];
- let images = [
- { id: "abc123", repo: "nginx", tag: "latest", size: "133MB" },
- { id: "def456", repo: "postgres", tag: "15", size: "350MB" },
- ];
- let dockerInfo = {
- version: "25.0.0",
- os: "Linux",
- containers: 2,
- images: 2,
- };
+ let { data }: { data: PageData } = $props();
+ const { dockerInfo, containers, images, error } = data;
+
+ // Helper to format bytes
+ function formatBytes(bytes: number, decimals = 2): string {
+ if (!+bytes) return "0 Bytes";
+ const k = 1024;
+ const dm = decimals < 0 ? 0 : decimals;
+ const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+ const i = Math.floor(Math.log(bytes) / Math.log(k));
+ return `${parseFloat((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
+ }
</script>
+<h1 class="text-2xl font-bold mb-6">Dashboard</h1>
+
+{#if error}
+ <Alert.Root variant="destructive" class="mb-6">
+ <AlertCircle class="h-4 w-4" />
+ <Alert.Title>Error Loading Data</Alert.Title>
+ <Alert.Description>{error}</Alert.Description>
+ </Alert.Root>
+{/if}
+
<div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
<Card.Root>
<Card.Header>
@@ -25,14 +38,25 @@
<Card.Description>System overview</Card.Description>
</Card.Header>
<Card.Content>
- <ul class="text-sm">
- <li><strong>Version:</strong> {dockerInfo.version}</li>
- <li><strong>OS:</strong> {dockerInfo.os}</li>
- <li><strong>Containers:</strong> {dockerInfo.containers}</li>
- <li><strong>Images:</strong> {dockerInfo.images}</li>
- </ul>
+ {#if dockerInfo}
+ <ul class="text-sm space-y-1">
+ <li><strong>Version:</strong> {dockerInfo.ServerVersion || "N/A"}</li>
+ <li><strong>OS:</strong> {dockerInfo.OperatingSystem || "N/A"}</li>
+ <li>
+ <strong>Architecture:</strong>
+ {dockerInfo.Architecture || "N/A"}
+ </li>
+ <li>
+ <strong>Total Memory:</strong>
+ {formatBytes(dockerInfo.MemTotal || 0)}
+ </li>
+ <li><strong>Containers:</strong> {dockerInfo.Containers || 0}</li>
+ <li><strong>Images:</strong> {dockerInfo.Images || 0}</li>
+ </ul>
+ {:else}
+ <p class="text-sm text-muted-foreground">Could not load Docker info.</p>
+ {/if}
</Card.Content>
- <Card.Footer />
</Card.Root>
<Card.Root class="md:col-span-2">
@@ -41,87 +65,112 @@
<Card.Description>Manage all containers</Card.Description>
</Card.Header>
<Card.Content>
- <div class="flex gap-4">
- <button
- class="bg-primary text-primary-foreground px-4 py-2 rounded hover:bg-primary/80"
- >Start All</button
- >
- <button
- class="bg-secondary text-secondary-foreground px-4 py-2 rounded hover:bg-secondary/80"
- >Stop All</button
- >
- <button
- class="bg-accent text-accent-foreground px-4 py-2 rounded hover:bg-accent/80"
- >Prune</button
+ <div class="flex gap-2 flex-wrap">
+ <!-- TODO: Implement actions -->
+ <Button disabled={!dockerInfo}>Start All</Button>
+ <Button variant="secondary" disabled={!dockerInfo}>Stop All</Button>
+ <Button variant="destructive" disabled={!dockerInfo}
+ >Prune System</Button
>
</div>
+ <p class="text-xs text-muted-foreground mt-2">
+ Note: Actions not yet implemented.
+ </p>
</Card.Content>
- <Card.Footer />
</Card.Root>
</div>
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
<Card.Root>
<Card.Header>
- <Card.Title>Containers</Card.Title>
+ <Card.Title>Containers ({containers.length})</Card.Title>
<Card.Description>Active and stopped containers</Card.Description>
</Card.Header>
<Card.Content>
- <table class="w-full text-sm">
- <thead>
- <tr>
- <th class="text-left">Name</th>
- <th class="text-left">Image</th>
- <th class="text-left">Status</th>
- </tr>
- </thead>
- <tbody>
- {#each containers as c}
- <tr>
- <td>{c.name}</td>
- <td>{c.image}</td>
- <td>
- <span
- class={c.status === "running"
- ? "text-green-600"
- : "text-gray-500"}
+ {#if containers.length > 0}
+ <Table.Root>
+ <Table.Header>
+ <Table.Row>
+ <Table.Head>Name</Table.Head>
+ <Table.Head>Image</Table.Head>
+ <Table.Head>State</Table.Head>
+ <Table.Head>Status</Table.Head>
+ </Table.Row>
+ </Table.Header>
+ <Table.Body>
+ {#each containers.slice(0, 5) as c (c.id)}
+ <Table.Row>
+ <Table.Cell class="font-medium">{c.name}</Table.Cell>
+ <Table.Cell class="text-xs truncate max-w-xs"
+ >{c.image}</Table.Cell
>
- {c.status}
- </span>
- </td>
- </tr>
- {/each}
- </tbody>
- </table>
+ <Table.Cell>
+ <StatusBadge state={c.state} />
+ </Table.Cell>
+ <Table.Cell class="text-xs">{c.status}</Table.Cell>
+ </Table.Row>
+ {/each}
+ </Table.Body>
+ </Table.Root>
+ {#if containers.length > 5}
+ <p class="text-xs text-muted-foreground mt-2">
+ Showing first 5 containers.
+ </p>
+ {/if}
+ {:else if !error}
+ <p class="text-sm text-muted-foreground">No containers found.</p>
+ {/if}
</Card.Content>
- <Card.Footer />
+ <Card.Footer>
+ <Button
+ variant="outline"
+ size="sm"
+ href="/containers"
+ disabled={!dockerInfo}>View All Containers</Button
+ >
+ </Card.Footer>
</Card.Root>
<Card.Root>
<Card.Header>
- <Card.Title>Images</Card.Title>
+ <Card.Title>Images ({images.length})</Card.Title>
<Card.Description>Available Docker images</Card.Description>
</Card.Header>
<Card.Content>
- <table class="w-full text-sm">
- <thead>
- <tr>
- <th class="text-left">Repository</th>
- <th class="text-left">Tag</th>
- <th class="text-left">Size</th>
- </tr>
- </thead>
- <tbody>
- {#each images as img}
- <tr>
- <td>{img.repo}</td>
- <td>{img.tag}</td>
- <td>{img.size}</td>
- </tr>
- {/each}
- </tbody>
- </table>
+ {#if images.length > 0}
+ <Table.Root>
+ <Table.Header>
+ <Table.Row>
+ <Table.Head>Repository</Table.Head>
+ <Table.Head>Tag</Table.Head>
+ <Table.Head>Size</Table.Head>
+ </Table.Row>
+ </Table.Header>
+ <Table.Body>
+ {#each images.slice(0, 5) as img (img.id)}
+ <Table.Row>
+ <Table.Cell class="font-medium truncate max-w-xs"
+ >{img.repo}</Table.Cell
+ >
+ <Table.Cell>{img.tag}</Table.Cell>
+ <Table.Cell>{formatBytes(img.size)}</Table.Cell>
+ </Table.Row>
+ {/each}
+ </Table.Body>
+ </Table.Root>
+ {#if images.length > 5}
+ <p class="text-xs text-muted-foreground mt-2">
+ Showing first 5 images.
+ </p>
+ {/if}
+ {:else if !error}
+ <p class="text-sm text-muted-foreground">No images found.</p>
+ {/if}
</Card.Content>
- <Card.Footer />
+ <Card.Footer>
+ <Button variant="outline" size="sm" href="/images" disabled={!dockerInfo}
+ >View All Images</Button
+ >
+ </Card.Footer>
</Card.Root>
</div>