Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

feat(ui): shape loading skeletons to the page that is loading

Juan Denis5b1403dfaa14
diff --git a/docs/screenshots/skeletons.png b/docs/screenshots/skeletons.png
new file mode 100644
index 00000000..41a036f5
Binary files /dev/null and b/docs/screenshots/skeletons.png differ
diff --git a/frontend/src/components/EmptyState.jsx b/frontend/src/components/EmptyState.jsx
index 72f9e303..7653e46e 100644
--- a/frontend/src/components/EmptyState.jsx
+++ b/frontend/src/components/EmptyState.jsx
@@ -1,17 +1,24 @@
import { Inbox } from 'lucide-react';
-import { Skeleton } from './Skeleton';
+import { PageSkeleton } from './PageSkeleton';
+/**
+ * `loadingVariant` names the shape of the page that is loading — see
+ * PageSkeleton for the archetypes (table, feed, cards, detail, console, form,
+ * chart, tree, split). It defaults to the generic `panel`, which is a safe
+ * fallback but predicts nothing: prefer naming the real shape, so the skeleton
+ * resolves into the content instead of being replaced by it.
+ */
export default function EmptyState({
icon: Icon = Inbox,
title = 'No items found',
description = '',
action = null,
size = 'default',
- loading = false
+ loading = false,
+ loadingVariant = 'panel',
+ loadingRows,
}) {
if (loading) {
- // Skeleton placeholder (not a spinner): a generic panel shape that reads
- // as "content is loading" across the ~40 page/section loaders that use it.
return (
<div
className={`empty-state empty-state--${size} empty-state--loading`}
@@ -19,25 +26,7 @@ export default function EmptyState({
aria-busy="true"
aria-label={title || 'Loading'}
>
- <div className="skeleton-panel">
- <div className="skeleton-panel__head">
- <Skeleton variant="avatar" />
- <div className="skeleton-panel__head-text">
- <Skeleton variant="title" width="42%" />
- <Skeleton variant="line" width="26%" />
- </div>
- </div>
- <div className="skeleton-panel__cards">
- <Skeleton variant="card" />
- <Skeleton variant="card" />
- <Skeleton variant="card" />
- </div>
- <div className="skeleton-panel__rows">
- <Skeleton variant="line" width="100%" />
- <Skeleton variant="line" width="92%" />
- <Skeleton variant="line" width="76%" />
- </div>
- </div>
+ <PageSkeleton variant={loadingVariant} rows={loadingRows} />
</div>
);
}
diff --git a/frontend/src/components/EnvironmentVariables.jsx b/frontend/src/components/EnvironmentVariables.jsx
index f2a018f6..1cea1c51 100644
--- a/frontend/src/components/EnvironmentVariables.jsx
+++ b/frontend/src/components/EnvironmentVariables.jsx
@@ -260,7 +260,7 @@ const EnvironmentVariables = ({ appId }) => {
: envVars;
if (loading) {
- return <EmptyState loading title="Loading environment variables..." />;
+ return <EmptyState loading loadingVariant="form" title="Loading environment variables..." />;
}
return (
diff --git a/frontend/src/components/PageSkeleton.jsx b/frontend/src/components/PageSkeleton.jsx
new file mode 100644
index 00000000..c23e4539
--- /dev/null
+++ b/frontend/src/components/PageSkeleton.jsx
@@ -0,0 +1,337 @@
+import { Skeleton } from './Skeleton';
+
+/**
+ * PageSkeleton — a loading placeholder shaped like the page that is loading.
+ *
+ * The point of a skeleton is to predict the layout that is about to appear, so
+ * arrival is a fill-in rather than a jump. One generic shape reused everywhere
+ * cannot do that: it mispredicts on every page but the one it was drawn for,
+ * which is worse than honest, because it promises a layout that never comes.
+ *
+ * So this is a set of layout archetypes. Pick the one whose shape the page
+ * actually has:
+ *
+ * panel generic card + lines (the historical default; a safe fallback)
+ * table toolbar, column header, N rows — list/index pages
+ * feed grouped rows with a leading status glyph — activity streams
+ * cards a responsive grid of equal cards — catalogs, galleries
+ * detail entity header, stat strip, two content panels
+ * console toolbar + monospace lines of ragged width — logs, terminals
+ * form label/field pairs, then a footer action
+ * chart stat tiles above a plot area — monitoring, telemetry
+ * tree a narrow rail beside a content pane — file/db explorers
+ * split a wide content column beside a narrower sidebar
+ *
+ * `rows` tunes the repeat count for the variants that repeat (table, feed,
+ * cards, console, form, tree). Every variant is driven by SCSS in
+ * `styles/components/_skeleton.scss`, so widths stay responsive rather than
+ * being guessed in pixels here.
+ *
+ * For a pixel-exact skeleton of one specific region, prefer captured bones —
+ * `npm run capture:skeletons` measures the real DOM and SkeletonBoundary
+ * replays it. These archetypes are the broad-coverage answer for the ~30 pages
+ * that will never be worth capturing individually.
+ */
+
+// A deterministic ragged width, so repeated lines look like text rather than a
+// row of identical bars — and so they don't reshuffle on every render the way
+// Math.random() would.
+const raggedWidth = (i, spread = [92, 74, 88, 62, 96, 70, 84, 58]) => `${spread[i % spread.length]}%`;
+
+const range = (n) => Array.from({ length: n }, (_, i) => i);
+
+function TableSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--table">
+ <div className="sk-page__toolbar">
+ <Skeleton variant="block" width={220} height={34} radius={9} />
+ <Skeleton variant="block" width={150} height={34} radius={9} />
+ <Skeleton variant="block" width={230} height={34} radius={9} className="sk-page__push" />
+ </div>
+ <div className="sk-page__table">
+ <div className="sk-page__thead">
+ {range(5).map((i) => (
+ <Skeleton key={i} variant="line" height={9} width={i === 0 ? '55%' : '40%'} />
+ ))}
+ </div>
+ {range(rows).map((r) => (
+ <div className="sk-page__trow" key={r}>
+ <div className="sk-page__cell sk-page__cell--lead">
+ <Skeleton variant="block" width={30} height={30} radius={8} />
+ <div className="skeleton-stack">
+ <Skeleton variant="line" width={raggedWidth(r)} />
+ <Skeleton variant="line" width="38%" height={9} />
+ </div>
+ </div>
+ {range(4).map((c) => (
+ <Skeleton key={c} variant="line" width={raggedWidth(r + c + 1)} />
+ ))}
+ </div>
+ ))}
+ </div>
+ </div>
+ );
+}
+
+function FeedSkeleton({ rows }) {
+ // Two groups, so the group headings that a real feed shows are predicted too.
+ const groups = [Math.ceil(rows / 2), Math.floor(rows / 2)].filter(Boolean);
+ return (
+ <div className="sk-page sk-page--feed">
+ <div className="sk-page__toolbar">
+ <Skeleton variant="block" width={300} height={34} radius={9} />
+ <Skeleton variant="block" width={160} height={34} radius={9} />
+ </div>
+ {groups.map((count, g) => (
+ <div className="sk-page__group" key={g}>
+ <Skeleton variant="line" width={70} height={9} />
+ {range(count).map((r) => (
+ <div className="sk-page__feedrow" key={r}>
+ <Skeleton variant="circle" width={16} height={16} />
+ <div className="skeleton-stack">
+ <Skeleton variant="line" width={raggedWidth(r + g)} height={13} />
+ <Skeleton variant="line" width="46%" height={9} />
+ </div>
+ <div className="sk-page__ticks">
+ {range(6).map((t) => <Skeleton key={t} variant="block" width={7} height={15} radius={2} />)}
+ </div>
+ <Skeleton variant="line" width={70} height={10} />
+ <Skeleton variant="line" width={54} height={10} />
+ </div>
+ ))}
+ </div>
+ ))}
+ </div>
+ );
+}
+
+function CardsSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--cards">
+ {range(rows).map((c) => (
+ <div className="sk-page__card" key={c}>
+ <div className="sk-page__card-top">
+ <Skeleton variant="block" width={42} height={42} radius={11} />
+ <div className="skeleton-stack">
+ <Skeleton variant="line" width="62%" height={14} />
+ <Skeleton variant="line" width="34%" height={9} />
+ </div>
+ </div>
+ <Skeleton variant="line" width="100%" />
+ <Skeleton variant="line" width={raggedWidth(c)} />
+ <div className="sk-page__card-tags">
+ <Skeleton variant="block" width={58} height={18} radius={5} />
+ <Skeleton variant="block" width={44} height={18} radius={5} />
+ <Skeleton variant="block" width={50} height={18} radius={5} />
+ </div>
+ </div>
+ ))}
+ </div>
+ );
+}
+
+function DetailSkeleton() {
+ return (
+ <div className="sk-page sk-page--detail">
+ <div className="sk-page__hero">
+ <Skeleton variant="block" width={52} height={52} radius={13} />
+ <div className="skeleton-stack">
+ <Skeleton variant="title" width="26%" />
+ <Skeleton variant="line" width="40%" height={10} />
+ </div>
+ <Skeleton variant="block" width={92} height={30} radius={8} />
+ </div>
+ <div className="sk-page__stats">
+ {range(4).map((i) => (
+ <div className="sk-page__stat" key={i}>
+ <Skeleton variant="line" width="52%" height={9} />
+ <Skeleton variant="line" width="70%" height={20} />
+ </div>
+ ))}
+ </div>
+ <div className="sk-page__panels">
+ {range(2).map((p) => (
+ <div className="sk-page__panel" key={p}>
+ <Skeleton variant="line" width="30%" height={13} />
+ {range(4).map((i) => (
+ <div className="sk-page__kv" key={i}>
+ <Skeleton variant="line" width={88} height={10} />
+ <Skeleton variant="line" width={raggedWidth(p + i)} height={10} />
+ </div>
+ ))}
+ </div>
+ ))}
+ </div>
+ </div>
+ );
+}
+
+function ConsoleSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--console">
+ <div className="sk-page__conbar">
+ <Skeleton variant="block" width={70} height={26} radius={7} />
+ <Skeleton variant="block" width={60} height={26} radius={7} />
+ <Skeleton variant="block" width={96} height={26} radius={7} />
+ <Skeleton variant="block" width={190} height={26} radius={7} className="sk-page__push" />
+ </div>
+ <div className="sk-page__lines">
+ {range(rows).map((i) => (
+ <div className="sk-page__logline" key={i}>
+ <Skeleton variant="line" width={54} height={9} />
+ <Skeleton variant="line" width={raggedWidth(i, [88, 64, 96, 46, 78, 92, 58, 70, 84, 52])} height={9} />
+ </div>
+ ))}
+ </div>
+ </div>
+ );
+}
+
+function FormSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--form">
+ {range(rows).map((i) => (
+ <div className="sk-page__field" key={i}>
+ <Skeleton variant="line" width={raggedWidth(i, [110, 140, 96, 128])} height={10} />
+ <Skeleton variant="block" height={36} radius={8} />
+ </div>
+ ))}
+ <div className="sk-page__formfoot">
+ <Skeleton variant="block" width={84} height={34} radius={8} />
+ <Skeleton variant="block" width={120} height={34} radius={8} />
+ </div>
+ </div>
+ );
+}
+
+function ChartSkeleton() {
+ // Bars of varied height read as a plot rather than a grey slab.
+ const bars = [38, 62, 45, 78, 55, 88, 40, 70, 52, 95, 60, 74, 48, 83, 58, 66];
+ return (
+ <div className="sk-page sk-page--chart">
+ <div className="sk-page__stats">
+ {range(4).map((i) => (
+ <div className="sk-page__stat" key={i}>
+ <Skeleton variant="line" width="50%" height={9} />
+ <Skeleton variant="line" width="66%" height={22} />
+ </div>
+ ))}
+ </div>
+ <div className="sk-page__plot">
+ <div className="sk-page__plot-bars">
+ {bars.map((h, i) => (
+ <Skeleton key={i} variant="block" height={`${h}%`} radius={3} />
+ ))}
+ </div>
+ <div className="sk-page__plot-axis">
+ {range(6).map((i) => <Skeleton key={i} variant="line" width={38} height={8} />)}
+ </div>
+ </div>
+ </div>
+ );
+}
+
+function TreeSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--tree">
+ <div className="sk-page__rail">
+ <Skeleton variant="block" height={32} radius={8} />
+ {range(rows).map((i) => (
+ <div className="sk-page__twig" key={i} style={{ paddingLeft: `${(i % 3) * 14}px` }}>
+ <Skeleton variant="block" width={14} height={14} radius={4} />
+ <Skeleton variant="line" width={raggedWidth(i, [70, 88, 56, 78, 64, 92])} height={10} />
+ </div>
+ ))}
+ </div>
+ <div className="sk-page__pane">
+ <Skeleton variant="block" height={34} radius={8} />
+ <div className="sk-page__lines">
+ {range(Math.max(rows, 8)).map((i) => (
+ <Skeleton key={i} variant="line" width={raggedWidth(i, [92, 70, 84, 58, 96, 66])} height={10} />
+ ))}
+ </div>
+ </div>
+ </div>
+ );
+}
+
+function SplitSkeleton({ rows }) {
+ return (
+ <div className="sk-page sk-page--split">
+ <div className="sk-page__main">
+ {range(rows).map((i) => (
+ <div className="sk-page__panel" key={i}>
+ <Skeleton variant="line" width="34%" height={13} />
+ <Skeleton variant="line" width="100%" />
+ <Skeleton variant="line" width={raggedWidth(i)} />
+ </div>
+ ))}
+ </div>
+ <div className="sk-page__aside">
+ {range(3).map((i) => (
+ <div className="sk-page__panel" key={i}>
+ <Skeleton variant="line" width="52%" height={11} />
+ <Skeleton variant="line" width="86%" height={10} />
+ </div>
+ ))}
+ </div>
+ </div>
+ );
+}
+
+function PanelSkeleton() {
+ return (
+ <div className="skeleton-panel">
+ <div className="skeleton-panel__head">
+ <Skeleton variant="avatar" />
+ <div className="skeleton-panel__head-text">
+ <Skeleton variant="title" width="42%" />
+ <Skeleton variant="line" width="26%" />
+ </div>
+ </div>
+ <div className="skeleton-panel__cards">
+ <Skeleton variant="card" />
+ <Skeleton variant="card" />
+ <Skeleton variant="card" />
+ </div>
+ <div className="skeleton-panel__rows">
+ <Skeleton variant="line" width="100%" />
+ <Skeleton variant="line" width="92%" />
+ <Skeleton variant="line" width="76%" />
+ </div>
+ </div>
+ );
+}
+
+const VARIANTS = {
+ panel: PanelSkeleton,
+ table: TableSkeleton,
+ feed: FeedSkeleton,
+ cards: CardsSkeleton,
+ detail: DetailSkeleton,
+ console: ConsoleSkeleton,
+ form: FormSkeleton,
+ chart: ChartSkeleton,
+ tree: TreeSkeleton,
+ split: SplitSkeleton,
+};
+
+// Sensible repeat counts per variant — enough to fill a viewport without
+// animating dozens of nodes.
+const DEFAULT_ROWS = {
+ table: 6, feed: 5, cards: 8, console: 12, form: 5, tree: 9, split: 3,
+};
+
+export function PageSkeleton({ variant = 'panel', rows, className = '' }) {
+ const Variant = VARIANTS[variant] || PanelSkeleton;
+ const count = rows ?? DEFAULT_ROWS[variant] ?? 4;
+ return (
+ <div className={`sk-page-wrap ${className}`.trim()} aria-hidden="true">
+ <Variant rows={count} />
+ </div>
+ );
+}
+
+export const PAGE_SKELETON_VARIANTS = Object.keys(VARIANTS);
+
+export default PageSkeleton;
diff --git a/frontend/src/components/appdetail/BuildTab.jsx b/frontend/src/components/appdetail/BuildTab.jsx
index c1af3b28..85243277 100644
--- a/frontend/src/components/appdetail/BuildTab.jsx
+++ b/frontend/src/components/appdetail/BuildTab.jsx
@@ -193,7 +193,7 @@ const BuildTab = ({ appId, appPath, app }) => {
}
if (loading) {
- return <EmptyState loading title="Loading build configuration..." />;
+ return <EmptyState loading loadingVariant="form" title="Loading build configuration..." />;
}
return (
diff --git a/frontend/src/components/appdetail/DeployTab.jsx b/frontend/src/components/appdetail/DeployTab.jsx
index dc02f766..93657825 100644
--- a/frontend/src/components/appdetail/DeployTab.jsx
+++ b/frontend/src/components/appdetail/DeployTab.jsx
@@ -152,7 +152,7 @@ const DeployTab = ({ appId, appPath, embedded = false }) => {
}
if (loading) {
- return <EmptyState loading title="Loading deployment configuration..." />;
+ return <EmptyState loading loadingVariant="form" title="Loading deployment configuration..." />;
}
return (
diff --git a/frontend/src/components/appdetail/GunicornTab.jsx b/frontend/src/components/appdetail/GunicornTab.jsx
index f04080c3..b90d8548 100644
--- a/frontend/src/components/appdetail/GunicornTab.jsx
+++ b/frontend/src/components/appdetail/GunicornTab.jsx
@@ -39,7 +39,7 @@ const GunicornTab = ({ appId }) => {
}
if (loading) {
- return <EmptyState loading title="Loading Gunicorn configuration..." />;
+ return <EmptyState loading loadingVariant="form" title="Loading Gunicorn configuration..." />;
}
return (
diff --git a/frontend/src/components/appdetail/PackagesTab.jsx b/frontend/src/components/appdetail/PackagesTab.jsx
index d2df274d..c8deb1b5 100644
--- a/frontend/src/components/appdetail/PackagesTab.jsx
+++ b/frontend/src/components/appdetail/PackagesTab.jsx
@@ -54,7 +54,7 @@ const PackagesTab = ({ appId }) => {
}
if (loading) {
- return <EmptyState loading title="Loading packages..." />;
+ return <EmptyState loading loadingVariant="table" title="Loading packages..." />;
}
return (
diff --git a/frontend/src/components/databases/BackupsTab.jsx b/frontend/src/components/databases/BackupsTab.jsx
index 334d625c..f523dd5d 100644
--- a/frontend/src/components/databases/BackupsTab.jsx
+++ b/frontend/src/components/databases/BackupsTab.jsx
@@ -60,7 +60,7 @@ export default function BackupsTab() {
<div className="dbx-backups-body">
{loading ? (
- <EmptyState loading title="Loading backups…" />
+ <EmptyState loading loadingVariant="table" title="Loading backups…" />
) : backups.length === 0 ? (
<EmptyState icon={Archive} title="No backups yet" description="Back up a database from its tree menu and it will appear here." />
) : (
diff --git a/frontend/src/components/databases/ResultsGrid.jsx b/frontend/src/components/databases/ResultsGrid.jsx
index ddabbe42..54dd3298 100644
--- a/frontend/src/components/databases/ResultsGrid.jsx
+++ b/frontend/src/components/databases/ResultsGrid.jsx
@@ -50,7 +50,7 @@ export default function ResultsGrid({ columns, rows, loading, error, emptyTitle
if (loading) {
return (
<div className="dbx-grid-status">
- <EmptyState loading title="Running query…" />
+ <EmptyState loading loadingVariant="table" title="Running query…" />
</div>
);
}
diff --git a/frontend/src/components/ds/DataTable.jsx b/frontend/src/components/ds/DataTable.jsx
index 70673e13..6ce3e03a 100644
--- a/frontend/src/components/ds/DataTable.jsx
+++ b/frontend/src/components/ds/DataTable.jsx
@@ -81,7 +81,7 @@ export function DataTable({
};
if (loading) {
- return <EmptyState loading title="Loading" />;
+ return <EmptyState loading loadingVariant="table" title="Loading" />;
}
if (!loading && data.length === 0) {
diff --git a/frontend/src/components/layouts/ResourceListPage.jsx b/frontend/src/components/layouts/ResourceListPage.jsx
index 834bbe7a..11c1ec52 100644
--- a/frontend/src/components/layouts/ResourceListPage.jsx
+++ b/frontend/src/components/layouts/ResourceListPage.jsx
@@ -89,7 +89,16 @@ export default function ResourceListPage({
};
if (loading) {
- return <EmptyState loading title={loadingTitle} />;
+ // A resource list is always a table (or a card grid, when the page opted
+ // into one), so the skeleton can predict the real shape rather than
+ // falling back to the generic panel.
+ return (
+ <EmptyState
+ loading
+ loadingVariant={renderCard && view === 'cards' ? 'cards' : 'table'}
+ title={loadingTitle}
+ />
+ );
}
return (
diff --git a/frontend/src/components/monitoring/DoctorPanel.jsx b/frontend/src/components/monitoring/DoctorPanel.jsx
index 18673de4..b3f7ccb9 100644
--- a/frontend/src/components/monitoring/DoctorPanel.jsx
+++ b/frontend/src/components/monitoring/DoctorPanel.jsx
@@ -118,7 +118,7 @@ const DoctorPanel = () => {
</p>
{loading ? (
- <EmptyState loading title="Loading last report" />
+ <EmptyState loading loadingVariant="detail" title="Loading last report" />
) : checks.length === 0 ? (
<EmptyState
icon={Stethoscope}
diff --git a/frontend/src/components/previews/PreviewList.jsx b/frontend/src/components/previews/PreviewList.jsx
index 37c85268..215203fc 100644
--- a/frontend/src/components/previews/PreviewList.jsx
+++ b/frontend/src/components/previews/PreviewList.jsx
@@ -125,7 +125,7 @@ const PreviewList = ({ appId }) => {
}
if (loading) {
- return <EmptyState loading title="Loading previews..." />;
+ return <EmptyState loading loadingVariant="cards" title="Loading previews..." />;
}
const enabled = !!settings?.enabled;
diff --git a/frontend/src/components/proxy/ProxyStackPanel.jsx b/frontend/src/components/proxy/ProxyStackPanel.jsx
index ec61f10b..e0bde777 100644
--- a/frontend/src/components/proxy/ProxyStackPanel.jsx
+++ b/frontend/src/components/proxy/ProxyStackPanel.jsx
@@ -172,7 +172,7 @@ const ProxyStackPanel = ({ serverId }) => {
}
if (loading) {
- return <EmptyState loading title="Loading proxy configuration" />;
+ return <EmptyState loading loadingVariant="form" title="Loading proxy configuration" />;
}
if (error) {
diff --git a/frontend/src/components/serverdetail/CloudflaredTab.jsx b/frontend/src/components/serverdetail/CloudflaredTab.jsx
index 5d600349..1dd72d29 100644
--- a/frontend/src/components/serverdetail/CloudflaredTab.jsx
+++ b/frontend/src/components/serverdetail/CloudflaredTab.jsx
@@ -212,7 +212,7 @@ const CloudflaredTab = ({ serverId, serverStatus }) => {
}
if (loading) {
- return <EmptyState loading title="Loading tunnels" />;
+ return <EmptyState loading loadingVariant="table" title="Loading tunnels" />;
}
// Status banner — three distinct states the UI cares about:
diff --git a/frontend/src/pages/Backups.jsx b/frontend/src/pages/Backups.jsx
index c9f7fc77..75b4d25f 100644
--- a/frontend/src/pages/Backups.jsx
+++ b/frontend/src/pages/Backups.jsx
@@ -408,7 +408,7 @@ const Backups = () => {
if (loading) {
return (
<div className="sk-tabgroup__inner backups-page">
- <EmptyState loading size="lg" title="Loading backup data..." />
+ <EmptyState loading loadingVariant="table" size="lg" title="Loading backup data..." />
</div>
);
}
diff --git a/frontend/src/pages/Coexistence.jsx b/frontend/src/pages/Coexistence.jsx
index 15264588..f0c885ab 100644
--- a/frontend/src/pages/Coexistence.jsx
+++ b/frontend/src/pages/Coexistence.jsx
@@ -144,7 +144,7 @@ export default function Coexistence() {
</div>
<div className="app-panel-body">
{loading ? (
- <EmptyState loading title="Loading servers" />
+ <EmptyState loading loadingVariant="table" title="Loading servers" />
) : observed.length === 0 ? (
<EmptyState
icon={Eye}
diff --git a/frontend/src/pages/CronJobs.jsx b/frontend/src/pages/CronJobs.jsx
index 68ce6822..355dcb48 100644
--- a/frontend/src/pages/CronJobs.jsx
+++ b/frontend/src/pages/CronJobs.jsx
@@ -212,7 +212,7 @@ const CronJobs = () => {
if (loading) {
return (
<div className="page-container cron-page">
- <EmptyState loading size="lg" title="Loading cron jobs..." />
+ <EmptyState loading loadingVariant="table" size="lg" title="Loading cron jobs..." />
</div>
);
}
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index 571d69df..3d2b6250 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -278,7 +278,7 @@ const Dashboard = () => {
const isConnected = isRemote ? !remoteLoading && !!remoteMetrics : !!localMetrics;
if (loading && metricsLoading) {
- return <EmptyState loading title="Loading dashboard..." />;
+ return <EmptyState loading loadingVariant="chart" title="Loading dashboard..." />;
}
return (
diff --git a/frontend/src/pages/Docker.jsx b/frontend/src/pages/Docker.jsx
index 42f08a76..bae0a7f7 100644
--- a/frontend/src/pages/Docker.jsx
+++ b/frontend/src/pages/Docker.jsx
@@ -164,7 +164,7 @@ const Docker = () => {
}
if (loading) {
- return <EmptyState loading title="Checking Docker status..." />;
+ return <EmptyState loading loadingVariant="table" title="Checking Docker status..." />;
}
if (!dockerStatus?.installed) {
diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsx
index 8a0ca14b..4c4f9457 100644
--- a/frontend/src/pages/Domains.jsx
+++ b/frontend/src/pages/Domains.jsx
@@ -307,7 +307,7 @@ const Domains = () => {
)}
{loading ? (
- <EmptyState loading title="Loading domains..." />
+ <EmptyState loading loadingVariant="table" title="Loading domains..." />
) : mergedRows.length === 0 ? (
<EmptyState
icon={Globe}
diff --git a/frontend/src/pages/FTPServer.jsx b/frontend/src/pages/FTPServer.jsx
index 8a09783d..ef19f8a6 100644
--- a/frontend/src/pages/FTPServer.jsx
+++ b/frontend/src/pages/FTPServer.jsx
@@ -281,7 +281,7 @@ function FTPServer() {
);
if (loading) {
- return <EmptyState loading size="lg" title="Loading FTP server" />;
+ return <EmptyState loading loadingVariant="table" size="lg" title="Loading FTP server" />;
}
const activeServer = status?.active_server;
diff --git a/frontend/src/pages/FileManager.jsx b/frontend/src/pages/FileManager.jsx
index f502c304..d88a51dc 100644
--- a/frontend/src/pages/FileManager.jsx
+++ b/frontend/src/pages/FileManager.jsx
@@ -1215,7 +1215,7 @@ function FileManager() {
)}
{loading ? (
- <EmptyState loading title="Loading files" />
+ <EmptyState loading loadingVariant="tree" title="Loading files" />
) : sortedFiltered.length === 0 ? (
<EmptyState
icon={FolderOpen}
diff --git a/frontend/src/pages/Git.jsx b/frontend/src/pages/Git.jsx
index 10eff357..afbd81ed 100644
--- a/frontend/src/pages/Git.jsx
+++ b/frontend/src/pages/Git.jsx
@@ -655,7 +655,7 @@ function Git({ basePath = '/git' }) {
/>
);
}
- if (reposLoading) return <EmptyState loading title="Loading repositories" />;
+ if (reposLoading) return <EmptyState loading loadingVariant="table" title="Loading repositories" />;
if (repositories.length === 0) {
return (
<EmptyState
@@ -770,7 +770,7 @@ function Git({ basePath = '/git' }) {
);
const renderWebhooks = () => {
- if (webhooksLoading) return <EmptyState loading title="Loading webhooks" />;
+ if (webhooksLoading) return <EmptyState loading loadingVariant="table" title="Loading webhooks" />;
if (webhooks.length === 0) {
return (
<EmptyState
@@ -847,7 +847,7 @@ function Git({ basePath = '/git' }) {
};
const renderDeployments = () => {
- if (deploymentsLoading) return <EmptyState loading title="Loading deployments" />;
+ if (deploymentsLoading) return <EmptyState loading loadingVariant="table" title="Loading deployments" />;
if (deployments.length === 0) {
return (
<EmptyState
@@ -1021,7 +1021,7 @@ function Git({ basePath = '/git' }) {
<div className="page-container--full-bleed sk-tabgroup git-page domains-page">
<div className="sk-tabgroup__content">
<div className="sk-tabgroup__inner">
- <EmptyState loading size="lg" title="Loading Git" />
+ <EmptyState loading loadingVariant="table" size="lg" title="Loading Git" />
</div>
</div>
</div>
diff --git a/frontend/src/pages/Monitoring.jsx b/frontend/src/pages/Monitoring.jsx
index c92a4b38..f64f5aac 100644
--- a/frontend/src/pages/Monitoring.jsx
+++ b/frontend/src/pages/Monitoring.jsx
@@ -370,7 +370,7 @@ const Monitoring = () => {
if (loading) {
return (
<div className="sk-tabgroup__inner monitoring-page">
- <EmptyState loading size="lg" title="Loading monitoring data" />
+ <EmptyState loading loadingVariant="chart" size="lg" title="Loading monitoring data" />
</div>
);
}
diff --git a/frontend/src/pages/ProjectDetail.jsx b/frontend/src/pages/ProjectDetail.jsx
index b32e2c69..577a5b84 100644
--- a/frontend/src/pages/ProjectDetail.jsx
+++ b/frontend/src/pages/ProjectDetail.jsx
@@ -105,7 +105,7 @@ const ProjectDetail = () => {
if (loading) {
return (
<div className="project-detail-page">
- <EmptyState loading title="Loading project" />
+ <EmptyState loading loadingVariant="detail" title="Loading project" />
</div>
);
}
diff --git a/frontend/src/pages/Projects.jsx b/frontend/src/pages/Projects.jsx
index 3fe6018e..2efdab30 100644
--- a/frontend/src/pages/Projects.jsx
+++ b/frontend/src/pages/Projects.jsx
@@ -51,7 +51,7 @@ const Projects = () => {
<div className="sk-tabgroup__inner projects-page">
<div className="projects-page__body">
{loading ? (
- <EmptyState loading title="Loading projects" />
+ <EmptyState loading loadingVariant="cards" title="Loading projects" />
) : projects.length === 0 ? (
<EmptyState
icon={FolderKanban}
diff --git a/frontend/src/pages/PublicStatusPage.jsx b/frontend/src/pages/PublicStatusPage.jsx
index 03ae219e..57475970 100644
--- a/frontend/src/pages/PublicStatusPage.jsx
+++ b/frontend/src/pages/PublicStatusPage.jsx
@@ -61,7 +61,7 @@ function PublicStatusPage() {
if (loading) {
return (
<main className="public-status-page">
- <EmptyState loading title="Loading status" />
+ <EmptyState loading loadingVariant="detail" title="Loading status" />
</main>
);
}
diff --git a/frontend/src/pages/RemoteAccess.jsx b/frontend/src/pages/RemoteAccess.jsx
index c1e622cd..602c27c8 100644
--- a/frontend/src/pages/RemoteAccess.jsx
+++ b/frontend/src/pages/RemoteAccess.jsx
@@ -222,7 +222,7 @@ const RemoteAccess = ({ serverId }) => {
</div>
{loading ? (
- <EmptyState loading title="Loading tunnels" />
+ <EmptyState loading loadingVariant="table" title="Loading tunnels" />
) : visibleTunnels.length === 0 ? (
<EmptyState
icon={Network}
diff --git a/frontend/src/pages/Security.jsx b/frontend/src/pages/Security.jsx
index c080fa27..154d8309 100644
--- a/frontend/src/pages/Security.jsx
+++ b/frontend/src/pages/Security.jsx
@@ -65,7 +65,7 @@ const Security = () => {
if (loading) {
return (
<div className="sk-tabgroup__inner security-page">
- <EmptyState loading title="Loading security status..." />
+ <EmptyState loading loadingVariant="detail" title="Loading security status..." />
</div>
);
}
diff --git a/frontend/src/pages/ServerDetail.jsx b/frontend/src/pages/ServerDetail.jsx
index 8d2e6e19..c43f8401 100644
--- a/frontend/src/pages/ServerDetail.jsx
+++ b/frontend/src/pages/ServerDetail.jsx
@@ -171,7 +171,7 @@ const ServerDetail = () => {
}
if (loading) {
- return <EmptyState loading title="Loading server details" />;
+ return <EmptyState loading loadingVariant="detail" title="Loading server details" />;
}
if (error) {
diff --git a/frontend/src/pages/ServiceDetail.jsx b/frontend/src/pages/ServiceDetail.jsx
index 1f029894..6ce3a0f7 100644
--- a/frontend/src/pages/ServiceDetail.jsx
+++ b/frontend/src/pages/ServiceDetail.jsx
@@ -239,7 +239,7 @@ const ServiceDetail = () => {
}
if (loading) {
- return <EmptyState loading title="Loading service" />;
+ return <EmptyState loading loadingVariant="detail" title="Loading service" />;
}
if (error || !service) {
diff --git a/frontend/src/pages/StyleGuide.jsx b/frontend/src/pages/StyleGuide.jsx
index 187bb8a7..bc2769a3 100644
--- a/frontend/src/pages/StyleGuide.jsx
+++ b/frontend/src/pages/StyleGuide.jsx
@@ -14,6 +14,7 @@ import Modal from '../components/Modal';
import { ConfirmDialog } from '../components/ConfirmDialog';
import StatusBadge from '../components/StatusBadge';
import EmptyState from '../components/EmptyState';
+import { PageSkeleton, PAGE_SKELETON_VARIANTS } from '../components/PageSkeleton';
import { Spinner } from '../components/Spinner';
import { StatCard, StatsGrid } from '../components/StatCard';
import { DangerZone } from '../components/DangerZone';
@@ -964,6 +965,21 @@ export default function StyleGuide() {
<SectionTitle title="Spinner Sizes (standalone)" />
<p className="text-sm text-tertiary mb-2">Use Spinner directly only inside buttons or inline indicators.</p>
+
+ <SectionTitle title="Loading skeleton archetypes" />
+ <p className="text-sm text-tertiary mb-2">
+ A skeleton should predict the layout that is about to arrive. Pick the
+ archetype matching the page shape via
+ {' '}<code>&lt;EmptyState loading loadingVariant="table" /&gt;</code>, or render
+ {' '}<code>&lt;PageSkeleton /&gt;</code> directly. For a pixel-exact skeleton of one
+ region, capture bones instead (<code>npm run capture:skeletons</code>).
+ </p>
+ {PAGE_SKELETON_VARIANTS.map(variant => (
+ <div key={variant} className="sk-gallery">
+ <div className="sk-gallery__name">{variant}</div>
+ <PageSkeleton variant={variant} />
+ </div>
+ ))}
</div>
)}
diff --git a/frontend/src/pages/Templates.jsx b/frontend/src/pages/Templates.jsx
index 9d5c8ce2..59485fd7 100644
--- a/frontend/src/pages/Templates.jsx
+++ b/frontend/src/pages/Templates.jsx
@@ -536,7 +536,7 @@ const Templates = () => {
if (loading) {
return (
<div className="sk-tabgroup__inner">
- <EmptyState loading title="Loading templates" />
+ <EmptyState loading loadingVariant="cards" title="Loading templates" />
</div>
);
}
diff --git a/frontend/src/pages/TestSandbox.jsx b/frontend/src/pages/TestSandbox.jsx
index 1657a3ab..4072a46b 100644
--- a/frontend/src/pages/TestSandbox.jsx
+++ b/frontend/src/pages/TestSandbox.jsx
@@ -344,7 +344,7 @@ const TestSandbox = () => {
if (loading) {
return (
<div className="page-container test-sandbox-page">
- <EmptyState loading size="lg" title="Loading test sandbox..." />
+ <EmptyState loading loadingVariant="table" size="lg" title="Loading test sandbox..." />
</div>
);
}
@@ -505,7 +505,7 @@ const TestSandbox = () => {
<section className="ts-history">
<h2 className="ts-section-title">Run history</h2>
{runsLoading ? (
- <EmptyState loading title="Loading run history..." />
+ <EmptyState loading loadingVariant="table" title="Loading run history..." />
) : runs.length === 0 ? (
<EmptyState
icon={FlaskConical}
diff --git a/frontend/src/pages/Vaults.jsx b/frontend/src/pages/Vaults.jsx
index 49938ea9..21204704 100644
--- a/frontend/src/pages/Vaults.jsx
+++ b/frontend/src/pages/Vaults.jsx
@@ -134,7 +134,7 @@ export default function Vaults() {
if (loading) {
return (
<div className="sk-tabgroup__inner secrets-page">
- <EmptyState loading title="Loading vaults..." />
+ <EmptyState loading loadingVariant="table" title="Loading vaults..." />
</div>
);
}
diff --git a/frontend/src/pages/Webhooks.jsx b/frontend/src/pages/Webhooks.jsx
index 671d7926..28f672a3 100644
--- a/frontend/src/pages/Webhooks.jsx
+++ b/frontend/src/pages/Webhooks.jsx
@@ -121,7 +121,7 @@ export default function Webhooks() {
return (
<div className="page-container secrets-page">
<PageTopbar icon={<Webhook size={18} />} title="Webhooks" />
- <EmptyState loading title="Loading webhooks..." />
+ <EmptyState loading loadingVariant="table" title="Loading webhooks..." />
</div>
);
}
diff --git a/frontend/src/pages/WordPressProject.jsx b/frontend/src/pages/WordPressProject.jsx
index 8a942d67..65c649df 100644
--- a/frontend/src/pages/WordPressProject.jsx
+++ b/frontend/src/pages/WordPressProject.jsx
@@ -398,7 +398,7 @@ const WordPressProject = () => {
}, [id, toast]);
if (loading) {
- return <EmptyState loading size="lg" title="Loading project pipeline" />;
+ return <EmptyState loading loadingVariant="detail" size="lg" title="Loading project pipeline" />;
}
if (!pipeline) {
diff --git a/frontend/src/pages/WordPressProjects.jsx b/frontend/src/pages/WordPressProjects.jsx
index eb2d23e4..354000f4 100644
--- a/frontend/src/pages/WordPressProjects.jsx
+++ b/frontend/src/pages/WordPressProjects.jsx
@@ -30,7 +30,7 @@ const WordPressProjects = () => {
}
if (loading) {
- return <EmptyState loading size="lg" title="Loading WordPress pipelines" />;
+ return <EmptyState loading loadingVariant="cards" size="lg" title="Loading WordPress pipelines" />;
}
return (
diff --git a/frontend/src/pages/WorkspaceDetail.jsx b/frontend/src/pages/WorkspaceDetail.jsx
index 14afdd45..af3d65a7 100644
--- a/frontend/src/pages/WorkspaceDetail.jsx
+++ b/frontend/src/pages/WorkspaceDetail.jsx
@@ -180,7 +180,7 @@ const WorkspaceDetail = () => {
} catch (err) { toast.error(err.message); }
};
- if (loading) return <div className="page-container workspaces-page ws-detail"><EmptyState loading title="Loading workspace" /></div>;
+ if (loading) return <div className="page-container workspaces-page ws-detail"><EmptyState loading loadingVariant="detail" title="Loading workspace" /></div>;
if (!ws) {
return (
diff --git a/frontend/src/pages/Workspaces.jsx b/frontend/src/pages/Workspaces.jsx
index 487d875b..937a5883 100644
--- a/frontend/src/pages/Workspaces.jsx
+++ b/frontend/src/pages/Workspaces.jsx
@@ -69,7 +69,7 @@ const Workspaces = () => {
}
};
- if (loading) return <div className="sk-tabgroup__inner workspaces-page"><EmptyState loading title="Loading workspaces" /></div>;
+ if (loading) return <div className="sk-tabgroup__inner workspaces-page"><EmptyState loading loadingVariant="cards" title="Loading workspaces" /></div>;
const q = search.trim().toLowerCase();
const shownWorkspaces = workspaces.filter(ws => {
diff --git a/frontend/src/styles/components/_skeleton.scss b/frontend/src/styles/components/_skeleton.scss
index 6f8b7466..2eec7a39 100644
--- a/frontend/src/styles/components/_skeleton.scss
+++ b/frontend/src/styles/components/_skeleton.scss
@@ -127,6 +127,283 @@
width: 100%;
max-width: 880px;
margin-inline: auto;
+
+ // Shaped variants predict a full page layout, so they are not squeezed into
+ // the 880px column the generic panel uses.
+ &:has(.sk-page-wrap) {
+ max-width: none;
+ }
+}
+
+// ============================================
+// PAGE SKELETON ARCHETYPES (components/PageSkeleton.jsx)
+// One shape per page layout, so the placeholder predicts what is about to
+// arrive instead of promising a layout that never comes.
+// ============================================
+.sk-page-wrap {
+ width: 100%;
+}
+
+.sk-page {
+ display: flex;
+ flex-direction: column;
+ gap: $space-4;
+ width: 100%;
+
+ // Pushes a trailing control to the right edge of a toolbar row.
+ &__push { margin-left: auto; }
+
+ &__toolbar,
+ &__conbar {
+ display: flex;
+ align-items: center;
+ gap: $space-3;
+ flex-wrap: wrap;
+ }
+
+ // ---- table ----
+ &__table {
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ overflow: hidden;
+ }
+
+ &__thead,
+ &__trow {
+ display: grid;
+ grid-template-columns: minmax(0, 2.2fr) repeat(4, minmax(0, 1fr));
+ align-items: center;
+ gap: $space-4;
+ padding: $space-3 $space-4;
+ }
+
+ &__thead {
+ background: $bg-elevated;
+ border-bottom: 1px solid $border-subtle;
+ }
+
+ &__trow + &__trow { border-top: 1px solid $border-subtle; }
+
+ &__cell--lead {
+ display: flex;
+ align-items: center;
+ gap: $space-3;
+ min-width: 0;
+ }
+
+ // ---- feed ----
+ &__group {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ }
+
+ &__feedrow {
+ display: grid;
+ grid-template-columns: 16px minmax(0, 1fr) auto 70px 54px;
+ align-items: center;
+ gap: 18px;
+ padding: 12px 16px;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__ticks { display: flex; gap: 3px; }
+
+ // ---- cards ----
+ &--cards {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(264px, 1fr));
+ gap: 14px;
+ }
+
+ &__card {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ padding: $space-4;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__card-top {
+ display: flex;
+ align-items: center;
+ gap: $space-3;
+ margin-bottom: $space-2;
+ }
+
+ &__card-tags {
+ display: flex;
+ gap: 5px;
+ margin-top: $space-2;
+ }
+
+ // ---- detail ----
+ &__hero {
+ display: flex;
+ align-items: center;
+ gap: $space-4;
+ padding: $space-5;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__stats {
+ display: grid;
+ grid-template-columns: repeat(4, 1fr);
+ gap: $space-4;
+ }
+
+ &__stat {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ padding: $space-4;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__panels {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: $space-4;
+ }
+
+ &__panel {
+ display: flex;
+ flex-direction: column;
+ gap: $space-3;
+ padding: $space-4;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__kv {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: $space-4;
+ }
+
+ // ---- console ----
+ &--console {
+ // The log surface is intentionally the same dark slab in every theme,
+ // matching the real console.
+ .sk-page__lines {
+ padding: $space-3 $space-4;
+ background: #0d1117;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+ }
+
+ &__lines {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ }
+
+ &__logline {
+ display: flex;
+ align-items: center;
+ gap: $space-4;
+ }
+
+ // ---- form ----
+ &--form { max-width: 640px; }
+
+ &__field {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ }
+
+ &__formfoot {
+ display: flex;
+ justify-content: flex-end;
+ gap: $space-2;
+ margin-top: $space-2;
+ }
+
+ // ---- chart ----
+ &__plot {
+ display: flex;
+ flex-direction: column;
+ gap: $space-3;
+ padding: $space-4;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__plot-bars {
+ display: flex;
+ align-items: flex-end;
+ gap: $space-2;
+ height: 190px;
+
+ > * { flex: 1; }
+ }
+
+ &__plot-axis {
+ display: flex;
+ justify-content: space-between;
+ }
+
+ // ---- tree / split ----
+ &--tree,
+ &--split {
+ display: grid;
+ gap: $space-4;
+ }
+
+ &--tree { grid-template-columns: 260px minmax(0, 1fr); }
+ &--split { grid-template-columns: minmax(0, 1fr) 320px; }
+
+ &__rail,
+ &__pane,
+ &__main,
+ &__aside {
+ display: flex;
+ flex-direction: column;
+ gap: $space-3;
+ min-width: 0;
+ }
+
+ &__rail {
+ padding: $space-3;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+ }
+
+ &__twig {
+ display: flex;
+ align-items: center;
+ gap: $space-2;
+ }
+
+ @media (max-width: $breakpoint-md) {
+ &__thead,
+ &__trow { grid-template-columns: minmax(0, 2fr) minmax(0, 1fr); }
+ &__thead > *:nth-child(n + 3),
+ &__trow > *:nth-child(n + 3) { display: none; }
+
+ &__feedrow { grid-template-columns: 16px minmax(0, 1fr) auto; }
+ &__feedrow > *:nth-child(n + 4) { display: none; }
+
+ &__stats { grid-template-columns: repeat(2, 1fr); }
+ &__panels { grid-template-columns: 1fr; }
+ &--tree,
+ &--split { grid-template-columns: 1fr; }
+ &__rail { display: none; }
+ }
}
// ============================================
@@ -194,3 +471,23 @@
animation: none;
}
}
+
+// Style-guide gallery: each archetype labelled, so they can be compared and a
+// regression in any one of them is visible in a single screenshot.
+.sk-gallery {
+ padding: $space-4;
+ background: $bg-card;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-lg;
+
+ + .sk-gallery { margin-top: $space-4; }
+
+ &__name {
+ margin-bottom: $space-3;
+ color: $text-tertiary;
+ font-family: var(--mono);
+ font-size: 11px;
+ letter-spacing: 0.1em;
+ text-transform: uppercase;
+ }
+}