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.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(frontend): skeleton loaders, branded AppLoader, favicon refresh
Juan Denise1088aff71f8
diff --git a/frontend/index.html b/frontend/index.htmlindex 4a783ab4..348c8d98 100644--- a/frontend/index.html+++ b/frontend/index.html@@ -3,6 +3,7 @@<head><meta charset="UTF-8" />+ <link rel="icon" type="image/svg+xml" href="/favicon.svg" /><link rel="icon" type="image/x-icon" href="/favicon.ico" /><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" /><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />diff --git a/frontend/public/favicon-16x16.png b/frontend/public/favicon-16x16.pngindex 00248b94..3a8b61e8 100644Binary files a/frontend/public/favicon-16x16.png and b/frontend/public/favicon-16x16.png differdiff --git a/frontend/public/favicon-32x32.png b/frontend/public/favicon-32x32.pngindex 2e751b60..07bfa77d 100644Binary files a/frontend/public/favicon-32x32.png and b/frontend/public/favicon-32x32.png differdiff --git a/frontend/public/favicon.ico b/frontend/public/favicon.icoindex cb0748f3..6dff199e 100644Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differdiff --git a/frontend/public/favicon.svg b/frontend/public/favicon.svgindex dde8395c..c198cd50 100644--- a/frontend/public/favicon.svg+++ b/frontend/public/favicon.svg@@ -1,5 +1,15 @@<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none">- <rect width="32" height="32" rx="6" fill="#6366f1"/>- <path d="M8 10h16M8 16h16M8 22h12" stroke="white" stroke-width="2.5" stroke-linecap="round"/>- <circle cx="24" cy="22" r="2" fill="#22c55e"/>+ <defs>+ <linearGradient id="skFavTile" x1="0" y1="0" x2="32" y2="32" gradientUnits="userSpaceOnUse">+ <stop stop-color="#6d7cff"/>+ <stop offset="1" stop-color="#5a67e8"/>+ </linearGradient>+ </defs>+ <rect width="32" height="32" rx="7" fill="url(#skFavTile)"/>+ <g transform="translate(6 6) scale(0.8333)" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <rect x="2" y="2" width="20" height="8" rx="2" ry="2"/>+ <rect x="2" y="14" width="20" height="8" rx="2" ry="2"/>+ <line x1="6" y1="6" x2="6.01" y2="6"/>+ <line x1="6" y1="18" x2="6.01" y2="18" stroke="#3ddc97"/>+ </g></svg>diff --git a/frontend/src/components/AppLoader.jsx b/frontend/src/components/AppLoader.jsxindex ea47fae9..7f823401 100644--- a/frontend/src/components/AppLoader.jsx+++ b/frontend/src/components/AppLoader.jsx@@ -1,18 +1,34 @@-import ServerKitLogo from './ServerKitLogo';-/**- * Minimal full-screen initial loader shown while auth/setup state is resolved.- * A centered ServerKit logo with a soft pulsing ring — clean for the ~1s- * the user sees it on first paint.+ * Full-screen initial loader shown while auth/setup state is resolved.+ *+ * A ServerKit-branded tile holding the server glyph whose status LEDs blink like+ * a machine booting, plus a slim indeterminate progress bar. No spinner — the+ * server "powering on" is the loading metaphor. Matches the sidebar brand mark+ * and the favicon so first paint feels of-a-piece.*/export function AppLoader() {return (- <div className="app-loader">- <div className="app-loader__stage" aria-busy="true" aria-label="Loading ServerKit">- <div className="app-loader__ring" />- <div className="app-loader__logo">- <ServerKitLogo width={52} height={52} />- </div>+ <div className="app-loader" role="status" aria-live="polite" aria-label="Loading ServerKit">+ <div className="app-loader__logo">+ <svg+ className="app-loader__glyph"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth={2}+ strokeLinecap="round"+ strokeLinejoin="round"+ aria-hidden="true"+ >+ <rect x="2" y="2" width="20" height="8" rx="2" ry="2" />+ <rect x="2" y="14" width="20" height="8" rx="2" ry="2" />+ <line className="app-loader__led app-loader__led--1" x1="6" y1="6" x2="6.01" y2="6" />+ <line className="app-loader__led app-loader__led--2" x1="6" y1="18" x2="6.01" y2="18" />+ </svg>+ </div>+ <div className="app-loader__bar" aria-hidden="true">+ <span className="app-loader__bar-fill" /></div><span className="app-loader__label">Loading ServerKit</span></div>diff --git a/frontend/src/components/EmptyState.jsx b/frontend/src/components/EmptyState.jsxindex e585bba2..72f9e303 100644--- a/frontend/src/components/EmptyState.jsx+++ b/frontend/src/components/EmptyState.jsx@@ -1,5 +1,5 @@import { Inbox } from 'lucide-react';-import { Spinner } from './Spinner';+import { Skeleton } from './Skeleton';export default function EmptyState({icon: Icon = Inbox,@@ -10,10 +10,34 @@ export default function EmptyState({loading = false}) {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}`}>- <Spinner size={size === 'lg' ? 'lg' : 'md'} />- {title && <h3 className="empty-state__title">{title}</h3>}+ <div+ className={`empty-state empty-state--${size} empty-state--loading`}+ role="status"+ 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></div>);}diff --git a/frontend/src/components/PageLoader.jsx b/frontend/src/components/PageLoader.jsxindex c5d5dc3f..1f2077ff 100644--- a/frontend/src/components/PageLoader.jsx+++ b/frontend/src/components/PageLoader.jsx@@ -1,13 +1,13 @@-import { Spinner } from './Spinner';+import EmptyState from './EmptyState';/*** Full-page loader for tab-group pages.- * Centers a spinner inside the standard tab-group inner area.+ * Shows a skeleton placeholder inside the standard tab-group inner area.*/export function PageLoader({ className = '' }) {return (<div className={`sk-tabgroup__inner ${className}`.trim()}>- <Spinner />+ <EmptyState loading title="Loading" /></div>);}diff --git a/frontend/src/components/Skeleton.jsx b/frontend/src/components/Skeleton.jsxnew file mode 100644index 00000000..9eac7d1d--- /dev/null+++ b/frontend/src/components/Skeleton.jsx@@ -0,0 +1,34 @@+/**+ * Lightweight shimmer placeholder. Compose these to mirror real content while it+ * loads instead of showing a spinner.+ *+ * <Skeleton variant="title" width="40%" />+ * <Skeleton variant="line" />+ * <Skeleton variant="block" height={120} />+ *+ * Variants: line | title | avatar | card | block | circle.+ */+export function Skeleton({+ variant = 'line',+ width,+ height,+ radius,+ className = '',+ style = {},+}) {+ const css = { ...style };+ const toCss = (v) => (typeof v === 'number' ? `${v}px` : v);+ if (width != null) css.width = toCss(width);+ if (height != null) css.height = toCss(height);+ if (radius != null) css.borderRadius = toCss(radius);++ return (+ <span+ className={`skeleton skeleton--${variant} ${className}`.trim()}+ style={css}+ aria-hidden="true"+ />+ );+}++export default Skeleton;diff --git a/frontend/src/components/appdetail/DeployTab.jsx b/frontend/src/components/appdetail/DeployTab.jsxindex 92acce9a..dc02f766 100644--- a/frontend/src/components/appdetail/DeployTab.jsx+++ b/frontend/src/components/appdetail/DeployTab.jsx@@ -12,7 +12,12 @@ import { Textarea } from '@/components/ui/textarea';import { Pill } from '@/components/ds';import Modal from '@/components/Modal';-const DeployTab = ({ appId, appPath }) => {+// `embedded` renders this inside the Settings → Git & Deploy section, where the+// shared RepoConnectForm already owns the connect/disconnect + repo identity. In+// that mode we drop the empty-state CTA and the repo-config fields (repo/branch/+// auto-deploy) and surface only the deploy pipeline: run actions, deploy scripts,+// history and config checkpoints.+const DeployTab = ({ appId, appPath, embedded = false }) => {const toast = useToast();const { confirm: confirmDeploy } = useConfirm();const [config, setConfig] = useState(null);@@ -160,6 +165,9 @@ const DeployTab = ({ appId, appPath }) => {)}{!config ? (+ // Embedded: RepoConnectForm above handles connecting, so don't+ // duplicate the CTA — just show nothing until a repo is linked.+ embedded ? null : (<div className="deploy-setup"><EmptyStateicon={GitMerge}@@ -168,6 +176,7 @@ const DeployTab = ({ appId, appPath }) => {action={<Button onClick={() => setShowConfigModal(true)}>Configure Deployment</Button>}/></div>+ )) : (<><div className="deploy-header">@@ -176,10 +185,19 @@ const DeployTab = ({ appId, appPath }) => {<svg viewBox="0 0 24 24" width="20" height="20" stroke="currentColor" fill="none" strokeWidth="2"><path d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37 0 0 0-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44 0 0 0 20 4.77 5.07 5.07 0 0 0 19.91 1S18.73.65 16 2.48a13.38 13.38 0 0 0-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07 0 0 0 5 4.77a5.44 5.44 0 0 0-1.5 3.78c0 5.42 3.3 6.61 6.44 7A3.37 3.37 0 0 0 9 18.13V22"/></svg>- <div>- <span className="repo-url">{config.repo_url}</span>- <span className="repo-branch">Branch: {config.branch}</span>- </div>+ {/* Embedded: the connect form above already shows the+ repo, so label the action instead of repeating it. */}+ {embedded ? (+ <div>+ <span className="repo-url">Manual deploy</span>+ <span className="repo-branch">Pull latest & redeploy {config.branch}</span>+ </div>+ ) : (+ <div>+ <span className="repo-url">{config.repo_url}</span>+ <span className="repo-branch">Branch: {config.branch}</span>+ </div>+ )}</div><div className="deploy-actions"><Button@@ -202,19 +220,28 @@ const DeployTab = ({ appId, appPath }) => {<div className="deploy-grid"><div className="card">- <h3>Configuration</h3>- <InfoList>- <InfoItem label="Repository" value={config.repo_url} mono />- <InfoItem label="Branch" value={config.branch} />- <InfoItem label="Auto Deploy" value={config.auto_deploy ? 'Enabled' : 'Disabled'} />- </InfoList>+ <h3>{embedded ? 'Deploy Scripts' : 'Configuration'}</h3>+ {embedded ? (+ <InfoList>+ <InfoItem label="Pre-deploy" value={config.pre_deploy_script || '—'} mono />+ <InfoItem label="Post-deploy" value={config.post_deploy_script || '—'} mono />+ </InfoList>+ ) : (+ <InfoList>+ <InfoItem label="Repository" value={config.repo_url} mono />+ <InfoItem label="Branch" value={config.branch} />+ <InfoItem label="Auto Deploy" value={config.auto_deploy ? 'Enabled' : 'Disabled'} />+ </InfoList>+ )}<div className="card-actions"><Button variant="outline" size="sm" onClick={() => setShowConfigModal(true)}>- Edit- </Button>- <Button variant="destructive" size="sm" onClick={handleRemoveDeployment}>- Remove+ {embedded ? 'Edit Scripts' : 'Edit'}</Button>+ {!embedded && (+ <Button variant="destructive" size="sm" onClick={handleRemoveDeployment}>+ Remove+ </Button>+ )}</div></div>@@ -247,8 +274,14 @@ const DeployTab = ({ appId, appPath }) => {<DeploymentTimeline appId={appId} /></div>- <Modal open={showConfigModal} onClose={() => setShowConfigModal(false)} title="Configure Deployment">+ <Modal open={showConfigModal} onClose={() => setShowConfigModal(false)} title={embedded ? 'Edit Deploy Scripts' : 'Configure Deployment'}><form onSubmit={handleConfigureDeployment}>+ {/* In embedded mode repo/branch/auto-deploy are owned by the+ RepoConnectForm above; only the deploy scripts are edited+ here. The hidden fields stay seeded from `config` so saving+ preserves them. */}+ {!embedded && (+ <><div className="form-group"><label>Repository URL</label><Input@@ -278,6 +311,8 @@ const DeployTab = ({ appId, appPath }) => {<span>Enable auto-deploy on push</span></label></div>+ </>+ )}<div className="form-group"><label>Pre-deploy Script</label><Textareadiff --git a/frontend/src/components/ds/DataTable.jsx b/frontend/src/components/ds/DataTable.jsxindex c540f49d..70673e13 100644--- a/frontend/src/components/ds/DataTable.jsx+++ b/frontend/src/components/ds/DataTable.jsx@@ -10,7 +10,6 @@ import {} from '@/components/ui/table';import { cn } from '@/lib/utils';import EmptyState from '../EmptyState';-import { Spinner } from '../Spinner';/*** Declarative data table built on top of the shadcn/ui Table primitives.@@ -82,11 +81,7 @@ export function DataTable({};if (loading) {- return (- <div className="sk-dtable__loading">- <Spinner />- </div>- );+ return <EmptyState loading title="Loading" />;}if (!loading && data.length === 0) {diff --git a/frontend/src/components/service-detail/SettingsTab.jsx b/frontend/src/components/service-detail/SettingsTab.jsxindex 9b104867..3461e52c 100644--- a/frontend/src/components/service-detail/SettingsTab.jsx+++ b/frontend/src/components/service-detail/SettingsTab.jsx@@ -7,6 +7,9 @@ import {Globe,Lock,Shield,+ ShieldCheck,+ Boxes,+ Hammer,Archive,CircleCheck,CircleX,@@ -17,6 +20,10 @@ import { useToast } from '../../contexts/ToastContext';import { DangerZone } from '../DangerZone';import RepoConnectForm from '../git/RepoConnectForm';import ProtectionPanel from '../backups/ProtectionPanel';+import ContainerOpsPanel from '../apps/ContainerOpsPanel';+import AppWafPanel from '../apps/AppWafPanel';+import BuildTab from '../appdetail/BuildTab';+import DeployTab from '../appdetail/DeployTab';import Modal from '@/components/Modal';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';@@ -27,30 +34,52 @@ import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@// detail page's settings layout: an uppercase mono group label per section with// the existing setting panels on the right. Groups give it structure (and room// to grow) instead of one long flat stack.-const SVC_SETTINGS_GROUPS = [- {- label: 'General',- items: [- // Renamed from plain "Environment" to avoid clashing with the- // top-level "Env Vars" tab that edits runtime environment variables.- { id: 'environment', label: 'Environment Type', icon: SlidersHorizontal },- { id: 'domain', label: 'Domain & SSL', icon: Shield },- ],- },- { label: 'Connections', items: [{ id: 'git', label: 'Git', icon: GitBranch }] },- { label: 'Data', items: [{ id: 'backups', label: 'Backups', icon: Archive }] },- { label: 'Advanced', items: [{ id: 'danger', label: 'Danger Zone', icon: AlertTriangle }] },-];--const SVC_SETTINGS_ITEMS = SVC_SETTINGS_GROUPS.flatMap((g) => g.items);+//+// Built per-service so the type-gated sections relocated here from the old top+// tab strip only appear where they apply: Container Ops (Docker only) and WAF+// (Docker + Python, nginx-served). Build + Git & Deploy apply to every type.+function buildSettingsGroups(app) {+ const isDocker = app.isDocker ?? app.app_type === 'docker';+ const isPython = app.isPython ?? ['flask', 'django'].includes(app.app_type);++ return [+ {+ label: 'General',+ items: [+ // Renamed from plain "Environment" to avoid clashing with the+ // top-level "Env Vars" tab that edits runtime environment variables.+ { id: 'environment', label: 'Environment Type', icon: SlidersHorizontal },+ { id: 'domain', label: 'Domain & SSL', icon: Shield },+ ...(isDocker ? [{ id: 'ops', label: 'Container Ops', icon: Boxes }] : []),+ ],+ },+ {+ // "Git & Deploy" merges the old Deploy tab into the repo connection,+ // since both edited repo / branch / auto-deploy. Build sits beside it.+ label: 'Deployment',+ items: [+ { id: 'git', label: 'Git & Deploy', icon: GitBranch },+ { id: 'build', label: 'Build', icon: Hammer },+ ],+ },+ ...((isDocker || isPython) ? [{+ label: 'Security',+ items: [{ id: 'waf', label: 'WAF', icon: ShieldCheck }],+ }] : []),+ { label: 'Data', items: [{ id: 'backups', label: 'Backups', icon: Archive }] },+ { label: 'Advanced', items: [{ id: 'danger', label: 'Danger Zone', icon: AlertTriangle }] },+ ];+}const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) => {+ const settingsGroups = buildSettingsGroups(app);+ const settingsItems = settingsGroups.flatMap((g) => g.items);const navigate = useNavigate();const toast = useToast();// Section lives in the URL (/services/:id/settings/:section) so it's// shareable and survives a refresh — same as the WordPress detail page.const { section: sectionParam } = useParams();- const section = SVC_SETTINGS_ITEMS.some((s) => s.id === sectionParam) ? sectionParam : 'environment';+ const section = settingsItems.some((s) => s.id === sectionParam) ? sectionParam : 'environment';const setSection = (s) => navigate(`/services/${app.id}/settings/${s}`, { replace: true });const [deleting, setDeleting] = useState(false);const [environmentType, setEnvironmentType] = useState(app.environment_type || 'standalone');@@ -155,7 +184,7 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =>return (<div className="svc-settings"><nav className="svc-settings__nav" aria-label="Service settings sections">- {SVC_SETTINGS_GROUPS.map(g => (+ {settingsGroups.map(g => (<div className="svc-settings__group" key={g.label}><div className="svc-settings__grouplabel">{g.label}</div>{g.items.map(s => (@@ -250,12 +279,24 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =></div>)}- {/* Repository — the same shared RepoConnectForm the WordPress Git- settings use (provider picker + URL fallback, connected summary- with Disconnect), wired to the service deployment API. */}+ {/* Container Ops (Docker only) — image updates, restart policy,+ resource limits, auto-sleep. Relocated from the old top tab. */}+ {section === 'ops' && (+ <div className="svc-settings__section">+ <h3 className="svc-settings__section-title">Container Ops</h3>+ <ContainerOpsPanel app={app} onChanged={onUpdate} />+ </div>+ )}++ {/* Git & Deploy — the shared RepoConnectForm (provider picker + URL+ fallback, connected summary with Disconnect) owns the repo+ connection. Once a repo is linked, the embedded DeployTab adds+ the deploy pipeline (run actions, deploy scripts, history,+ config checkpoints) as a separated subsection — no second repo+ form, and nothing deploy-related shows before connecting. */}{section === 'git' && (<div className="svc-settings__section">- <h3 className="svc-settings__section-title">Git</h3>+ <h3 className="svc-settings__section-title">Git & Deploy</h3><RepoConnectFormgitStatus={gitStatus}onConnect={handleConnectRepo}@@ -267,6 +308,29 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =>submitLabel="Connect Repository"idPrefix="svc"/>+ {deployConfig && (+ <div className="svc-settings__subsection">+ <h4 className="svc-settings__subsection-title">Deployment</h4>+ <DeployTab embedded appId={app.id} appPath={app.path} />+ </div>+ )}+ </div>+ )}++ {/* Build — build method, Dockerfile / build pack, cache, timeouts,+ build logs. Relocated from the old top tab, beside Git & Deploy. */}+ {section === 'build' && (+ <div className="svc-settings__section">+ <h3 className="svc-settings__section-title">Build</h3>+ <BuildTab appId={app.id} appPath={app.path} app={app} />+ </div>+ )}++ {/* WAF (Docker + Python) — per-app ModSecurity policy + matches. */}+ {section === 'waf' && (+ <div className="svc-settings__section">+ <h3 className="svc-settings__section-title">WAF</h3>+ <AppWafPanel app={app} onChanged={onUpdate} /></div>)}diff --git a/frontend/src/pages/Email.jsx b/frontend/src/pages/Email.jsxindex 03ff7d67..3b4af17d 100644--- a/frontend/src/pages/Email.jsx+++ b/frontend/src/pages/Email.jsx@@ -3,7 +3,6 @@ import { Globe, AtSign, Forward, Server, Inbox, Mail, Send, KeyRound, ShieldAlerimport useTabParam from '../hooks/useTabParam';import { api } from '../services/api';import { useToast } from '../contexts/ToastContext';-import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';import ConfirmDialog from '../components/ConfirmDialog';import Modal from '@/components/Modal';@@ -483,7 +482,7 @@ function Email() {// ── Render ──- if (loading) return <div className="page-container email-page"><div className="page-loading"><Spinner /></div></div>;+ if (loading) return <div className="page-container email-page"><EmptyState loading title="Loading email settings" /></div>;const isInstalled = status?.installed;diff --git a/frontend/src/pages/FTPServer.jsx b/frontend/src/pages/FTPServer.jsxindex fb9b2de3..8a09783d 100644--- a/frontend/src/pages/FTPServer.jsx+++ b/frontend/src/pages/FTPServer.jsx@@ -8,7 +8,6 @@ import { useTopbarActions } from '@/hooks/useTopbarActions';import { api } from '../services/api';import { MetricCard, Pill } from '@/components/ds';import { useToast } from '../contexts/ToastContext';-import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';import ConfirmDialog from '../components/ConfirmDialog';import Modal from '@/components/Modal';@@ -282,11 +281,7 @@ function FTPServer() {);if (loading) {- return (- <div className="page-loading">- <Spinner size="lg" />- </div>- );+ return <EmptyState loading size="lg" title="Loading FTP server" />;}const activeServer = status?.active_server;diff --git a/frontend/src/pages/Git.jsx b/frontend/src/pages/Git.jsxindex c96475b2..b59f7100 100644--- a/frontend/src/pages/Git.jsx+++ b/frontend/src/pages/Git.jsx@@ -2,7 +2,6 @@ import { useState, useEffect, useMemo } from 'react';import useTabParam from '../hooks/useTabParam';import { api } from '../services/api';import { useToast } from '../contexts/ToastContext';-import Spinner from '../components/Spinner';import ConfirmDialog from '../components/ConfirmDialog';import { DangerZone } from '../components/DangerZone';import EmptyState from '../components/EmptyState';@@ -656,7 +655,7 @@ function Git({ basePath = '/git' }) {/>);}- if (reposLoading) return <div className="loading-state"><Spinner /></div>;+ if (reposLoading) return <EmptyState loading title="Loading repositories" />;if (repositories.length === 0) {return (<EmptyState@@ -771,7 +770,7 @@ function Git({ basePath = '/git' }) {);const renderWebhooks = () => {- if (webhooksLoading) return <div className="loading-state"><Spinner /></div>;+ if (webhooksLoading) return <EmptyState loading title="Loading webhooks" />;if (webhooks.length === 0) {return (<EmptyState@@ -848,7 +847,7 @@ function Git({ basePath = '/git' }) {};const renderDeployments = () => {- if (deploymentsLoading) return <div className="loading-state"><Spinner /></div>;+ if (deploymentsLoading) return <EmptyState loading title="Loading deployments" />;if (deployments.length === 0) {return (<EmptyState@@ -1022,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">- <div className="page-loading"><Spinner size="lg" /></div>+ <EmptyState loading size="lg" title="Loading Git" /></div></div></div>diff --git a/frontend/src/pages/GpuMonitor.jsx b/frontend/src/pages/GpuMonitor.jsxindex 091bf99b..3e6f8310 100644--- a/frontend/src/pages/GpuMonitor.jsx+++ b/frontend/src/pages/GpuMonitor.jsx@@ -4,7 +4,6 @@ import { PageTopbar } from '@/components/ds';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import EmptyState from '../components/EmptyState';-import Spinner from '../components/Spinner';import { Button } from '@/components/ui/button';function clampPercent(value) {@@ -143,7 +142,7 @@ const GpuMonitor = () => {/>{loading ? (- <div className="gpu-page__loading"><Spinner /></div>+ <EmptyState loading title="Loading GPU data" />) : !data?.available ? (<EmptyStateicon={Cpu}diff --git a/frontend/src/pages/PublicStatusPage.jsx b/frontend/src/pages/PublicStatusPage.jsxindex 27852606..03ae219e 100644--- a/frontend/src/pages/PublicStatusPage.jsx+++ b/frontend/src/pages/PublicStatusPage.jsx@@ -1,7 +1,7 @@import { useEffect, useMemo, useState } from 'react';import { useParams } from 'react-router-dom';import api from '../services/api';-import Spinner from '../components/Spinner';+import EmptyState from '../components/EmptyState';import { Badge } from '@/components/ui/badge';import { Activity, AlertTriangle, CheckCircle2, Clock, XCircle } from 'lucide-react';@@ -61,7 +61,7 @@ function PublicStatusPage() {if (loading) {return (<main className="public-status-page">- <Spinner />+ <EmptyState loading title="Loading status" /></main>);}diff --git a/frontend/src/pages/RemoteAccess.jsx b/frontend/src/pages/RemoteAccess.jsxindex f2f83a67..c1e622cd 100644--- a/frontend/src/pages/RemoteAccess.jsx+++ b/frontend/src/pages/RemoteAccess.jsx@@ -7,7 +7,6 @@ import {import api from '../services/api';import { useToast } from '../contexts/ToastContext';import EmptyState from '../components/EmptyState';-import Spinner from '../components/Spinner';import Modal from '../components/Modal';import { Pill } from '@/components/ds';import { useTopbarActions } from '@/hooks/useTopbarActions';@@ -223,9 +222,7 @@ const RemoteAccess = ({ serverId }) => {</div>{loading ? (- <div className="ra-loading">- <Spinner />- </div>+ <EmptyState loading title="Loading tunnels" />) : visibleTunnels.length === 0 ? (<EmptyStateicon={Network}diff --git a/frontend/src/pages/ServiceDetail.jsx b/frontend/src/pages/ServiceDetail.jsxindex 799b0a12..74a148ea 100644--- a/frontend/src/pages/ServiceDetail.jsx+++ b/frontend/src/pages/ServiceDetail.jsx@@ -16,14 +16,12 @@ import PackagesTab from '../components/service-detail/PackagesTab';import GunicornTab from '../components/service-detail/GunicornTab';import CommandsTab from '../components/service-detail/CommandsTab';import OverviewTab from '../components/service-detail/OverviewTab';-// Tabs merged in from the retired ApplicationDetail page (§1 unification).-import ContainerOpsPanel from '../components/apps/ContainerOpsPanel';-import AppWafPanel from '../components/apps/AppWafPanel';-import BuildTab from '../components/appdetail/BuildTab';-import DeployTab from '../components/appdetail/DeployTab';+// Container Ops / WAF / Build / Deploy (merged in from the retired+// ApplicationDetail page in §1) now live under the Settings sub-nav, so they're+// imported by SettingsTab rather than rendered as top-level tabs here.import PreviewList from '../components/previews/PreviewList';import EmptyState from '../components/EmptyState';-import { Layers, FileArchive, RotateCcw, LayoutDashboard, History, ScrollText, Variable, Terminal, Activity, Package, Server, SquareTerminal, Settings, Boxes, Shield, Hammer, Rocket, Eye } from 'lucide-react';+import { Layers, FileArchive, RotateCcw, LayoutDashboard, History, ScrollText, Variable, Terminal, Activity, Package, Server, SquareTerminal, Settings, Eye } from 'lucide-react';import { Button } from '@/components/ui/button';import { Pill, ServiceTile, PageTopbar } from '@/components/ds';@@ -48,14 +46,20 @@ const TAB_LABELS = {packages: 'Packages',gunicorn: 'Gunicorn',commands: 'Commands',- ops: 'Container Ops',- waf: 'WAF',- build: 'Build',- deploy: 'Deploy',previews: 'Previews',settings: 'Settings',};+// Tab slugs retired when Container Ops / WAF / Build / Deploy moved into the+// Settings sub-nav — old links / bookmarks land on the right settings section+// (Deploy folded into "Git & Deploy", so it redirects to settings/git).+const RETIRED_TAB_REDIRECTS = {+ ops: 'settings/ops',+ waf: 'settings/waf',+ build: 'settings/build',+ deploy: 'settings/git',+};+// Per-tab glyph for the detail tab strip (matches the WordPress detail page).const TAB_ICONS = {overview: LayoutDashboard,@@ -67,16 +71,12 @@ const TAB_ICONS = {packages: Package,gunicorn: Server,commands: SquareTerminal,- ops: Boxes,- waf: Shield,- build: Hammer,- deploy: Rocket,previews: Eye,settings: Settings,};const ServiceDetail = () => {- const { id } = useParams();+ const { id, tab: rawTab } = useParams();const navigate = useNavigate();const toast = useToast();const { confirm } = useConfirm();@@ -100,6 +100,12 @@ const ServiceDetail = () => {}}, [service, id, navigate]);+ // Forward retired top tabs (ops/waf/build/deploy) to their new Settings home.+ useEffect(() => {+ const target = RETIRED_TAB_REDIRECTS[rawTab];+ if (target) navigate(`/services/${id}/${target}`, { replace: true });+ }, [rawTab, id, navigate]);+// Load upload versionsuseEffect(() => {// Derive locally — the `isUpload` const below is declared after the@@ -541,10 +547,6 @@ const ServiceDetail = () => {{activeTab === 'packages' && service.isPython && <PackagesTab appId={service.id} />}{activeTab === 'gunicorn' && service.isPython && <GunicornTab appId={service.id} />}{activeTab === 'commands' && service.isPython && <CommandsTab appId={service.id} appType={service.app_type} />}- {activeTab === 'ops' && service.isDocker && <ContainerOpsPanel app={service} onChanged={reload} />}- {activeTab === 'waf' && <AppWafPanel app={service} onChanged={reload} />}- {activeTab === 'build' && <BuildTab appId={service.id} appPath={service.path} app={service} />}- {activeTab === 'deploy' && <DeployTab appId={service.id} appPath={service.path} />}{activeTab === 'previews' && <PreviewList appId={service.id} />}{activeTab === 'settings' && (<SettingsTabdiff --git a/frontend/src/pages/WorkspaceDetail.jsx b/frontend/src/pages/WorkspaceDetail.jsxindex c1f542f5..14afdd45 100644--- a/frontend/src/pages/WorkspaceDetail.jsx+++ b/frontend/src/pages/WorkspaceDetail.jsx@@ -4,7 +4,6 @@ import useTabParam from '../hooks/useTabParam';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { useAuth } from '../contexts/AuthContext';-import Spinner from '../components/Spinner';import ConfirmDialog from '../components/ConfirmDialog';import EmptyState from '../components/EmptyState';import Modal from '@/components/Modal';@@ -181,7 +180,7 @@ const WorkspaceDetail = () => {} catch (err) { toast.error(err.message); }};- if (loading) return <div className="page-container workspaces-page ws-detail"><Spinner /></div>;+ if (loading) return <div className="page-container workspaces-page ws-detail"><EmptyState loading title="Loading workspace" /></div>;if (!ws) {return (diff --git a/frontend/src/pages/Workspaces.jsx b/frontend/src/pages/Workspaces.jsxindex 59e9c2b5..487d875b 100644--- a/frontend/src/pages/Workspaces.jsx+++ b/frontend/src/pages/Workspaces.jsx@@ -2,7 +2,6 @@ import { useState, useEffect, useCallback } from 'react';import { useNavigate } from 'react-router-dom';import api from '../services/api';import { useToast } from '../contexts/ToastContext';-import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';import Modal from '@/components/Modal';import { LayoutGrid, Plus, ChevronRight, Search } from 'lucide-react';@@ -70,7 +69,7 @@ const Workspaces = () => {}};- if (loading) return <div className="sk-tabgroup__inner workspaces-page"><Spinner /></div>;+ if (loading) return <div className="sk-tabgroup__inner workspaces-page"><EmptyState loading 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.scssnew file mode 100644index 00000000..5413296b--- /dev/null+++ b/frontend/src/styles/components/_skeleton.scss@@ -0,0 +1,125 @@+// ============================================+// SKELETON LOADERS+// Shimmer placeholders shown while content loads — replaces the spinner in+// EmptyState's loading branch. Compose <Skeleton /> primitives for tailored+// per-page skeletons.+// ============================================++.skeleton {+ display: block;+ position: relative;+ overflow: hidden;+ background: var(--surface-2);+ border-radius: $radius-sm;++ // Shimmer sweep — a soft highlight travelling left → right.+ &::after {+ content: '';+ position: absolute;+ inset: 0;+ transform: translateX(-100%);+ background: linear-gradient(+ 90deg,+ transparent 0%,+ var(--surface-3) 50%,+ transparent 100%+ );+ animation: skeleton-shimmer 1.4s ease-in-out infinite;+ }++ &--line {+ width: 100%;+ height: 12px;+ }++ &--title {+ width: 40%;+ height: 20px;+ border-radius: $radius-md;+ }++ &--avatar {+ flex: none;+ width: 48px;+ height: 48px;+ border-radius: $radius-lg;+ }++ &--card {+ width: 100%;+ height: 84px;+ border-radius: $radius-lg;+ }++ &--block {+ width: 100%;+ height: 100%;+ }++ &--circle {+ border-radius: 50%;+ }+}++@keyframes skeleton-shimmer {+ 100% {+ transform: translateX(100%);+ }+}++// Generic panel skeleton used by EmptyState's loading branch: a header row+// (avatar + two lines), a row of stat cards, and a few content lines.+.skeleton-panel {+ width: 100%;+ display: flex;+ flex-direction: column;+ gap: $space-5;++ &__head {+ display: flex;+ align-items: center;+ gap: $space-4;+ }++ &__head-text {+ flex: 1;+ display: flex;+ flex-direction: column;+ gap: $space-2;+ }++ &__cards {+ display: grid;+ grid-template-columns: repeat(3, 1fr);+ gap: $space-4;+ }++ &__rows {+ display: flex;+ flex-direction: column;+ gap: $space-3;+ }++ @media (max-width: $breakpoint-md) {+ &__cards {+ grid-template-columns: 1fr;+ }+ }+}++// Loading variant: stretch the panel full-width and left-align it instead of the+// centered spinner layout the base .empty-state uses.+.empty-state--loading {+ align-items: stretch;+ justify-content: flex-start;+ text-align: left;+ width: 100%;+ max-width: 880px;+ margin-inline: auto;+}++@media (prefers-reduced-motion: reduce) {+ .skeleton::after {+ animation: none;+ }+}diff --git a/frontend/src/styles/layout/_main-content.scss b/frontend/src/styles/layout/_main-content.scssindex aeb29759..1f37b82c 100644--- a/frontend/src/styles/layout/_main-content.scss+++ b/frontend/src/styles/layout/_main-content.scss@@ -199,46 +199,57 @@flex-direction: column;align-items: center;justify-content: center;- gap: $space-5;+ gap: $space-4;background: var(--surface);- &__stage {- position: relative;- width: 96px;- height: 96px;+ // Branded tile holding the server glyph — same mark as the sidebar + favicon.+ &__logo {display: flex;align-items: center;justify-content: center;+ width: 76px;+ height: 76px;+ border-radius: 20px;+ color: #fff;+ background: linear-gradient(150deg, var(--accent-bright), var(--accent-hover));+ box-shadow: 0 14px 34px -10px var(--accent-shadow), inset 0 0 0 1px rgba(255, 255, 255, 0.10);+ animation: app-loader-breathe 2.6s ease-in-out infinite;}- &__logo {- position: relative;- z-index: 2;- display: flex;- align-items: center;- justify-content: center;- width: 64px;- height: 64px;- border-radius: 16px;- background: var(--surface-2);- box-shadow: var(--shadow-md), 0 0 0 1px var(--border-soft);- animation: app-loader-pulse 2s ease-in-out infinite;-- svg {- width: 38px;- height: 38px;+ &__glyph {+ width: 42px;+ height: 42px;+ }++ // Status LEDs blink like a booting machine; the lower one is "online" green.+ &__led {+ animation: app-loader-blink 1.4s ease-in-out infinite;++ &--2 {+ stroke: var(--green);+ animation-delay: 0.55s;}}- &__ring {+ // Slim indeterminate bar replaces the old spinner.+ &__bar {+ position: relative;+ width: 132px;+ height: 4px;+ border-radius: 999px;+ background: var(--surface-3);+ overflow: hidden;+ }++ &__bar-fill {position: absolute;- width: 96px;- height: 96px;- border-radius: 50%;- border: 2px solid transparent;- border-top-color: var(--accent-bright);- border-right-color: fade($accent-primary-raw, 30%);- animation: app-loader-spin 1.2s linear infinite;+ top: 0;+ left: 0;+ width: 40%;+ height: 100%;+ border-radius: inherit;+ background: linear-gradient(90deg, transparent, var(--accent-bright), transparent);+ animation: app-loader-slide 1.3s ease-in-out infinite;}&__label {@@ -249,12 +260,30 @@}}-@keyframes app-loader-pulse {- 0%, 100% { transform: scale(1); opacity: 1; }- 50% { transform: scale(1.03); opacity: 0.85; }+@keyframes app-loader-breathe {+ 0%, 100% { transform: translateY(0) scale(1); }+ 50% { transform: translateY(-2px) scale(1.025); }}-@keyframes app-loader-spin {- from { transform: rotate(0deg); }- to { transform: rotate(360deg); }+@keyframes app-loader-blink {+ 0%, 100% { opacity: 1; }+ 50% { opacity: 0.2; }+}++@keyframes app-loader-slide {+ 0% { transform: translateX(-130%); }+ 100% { transform: translateX(330%); }+}++// Respect reduced-motion: hold everything still, keep the bar visible.+@media (prefers-reduced-motion: reduce) {+ .app-loader__logo,+ .app-loader__led,+ .app-loader__bar-fill {+ animation: none;+ }++ .app-loader__bar-fill {+ width: 100%;+ }}diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scssindex 96507a03..0e923ca7 100644--- a/frontend/src/styles/main.scss+++ b/frontend/src/styles/main.scss@@ -44,6 +44,7 @@@import 'components/_credentials';@import 'components/_toasts';@import 'components/_spinner';+@import 'components/_skeleton';@import 'components/_uptime';@import 'components/_metrics-graph';@import 'components/_env-vars';diff --git a/frontend/src/styles/pages/_service-detail.scss b/frontend/src/styles/pages/_service-detail.scssindex 5a466a79..51ef37f5 100644--- a/frontend/src/styles/pages/_service-detail.scss+++ b/frontend/src/styles/pages/_service-detail.scss@@ -810,6 +810,25 @@ h3.svc-eyebrow {text-transform: uppercase;color: var(--text-faint);}++ // A divided sub-block within a section — e.g. the Deployment pipeline under+ // the Git connect form in "Git & Deploy". Mirrors the .svc-give-subdomain+ // divider so stacked panels read as distinct steps rather than one slab.+ &__subsection {+ margin-top: $space-5;+ padding-top: $space-5;+ border-top: 1px solid var(--border-soft);+ }++ &__subsection-title {+ margin: 0 0 $space-3;+ font-family: var(--mono);+ font-size: 11px;+ font-weight: $font-weight-semibold;+ letter-spacing: 0.08em;+ text-transform: uppercase;+ color: var(--text-faint);+ }}// Icon-only button (global utility consumed by several other components)diff --git a/frontend/src/utils/serviceTypes.js b/frontend/src/utils/serviceTypes.jsindex b415f3bd..7d12491f 100644--- a/frontend/src/utils/serviceTypes.js+++ b/frontend/src/utils/serviceTypes.js@@ -3,17 +3,19 @@// green #3ddc97 / red #fb6f6f / amber #f5b945 / accent #6d7cff /// cyan #49c7f0 / violet #b07bf5, neutral gray #646b7a.const SERVICE_TYPES = {- // Tab order note: ops/waf/build/deploy/previews were merged in from the- // retired ApplicationDetail page (§1 feature unification). Type-gating- // matches the old page exactly: ops = Docker only; waf = Docker + Python- // (nginx-served); build/deploy/previews = every type.+ // Tab order note: ops/waf/build/deploy were merged in from the retired+ // ApplicationDetail page (§1 feature unification), then relocated into the+ // Settings sub-nav to declutter the top strip — Container Ops + Git & Deploy+ // + Build live under Settings, WAF under Settings → Security. Type-gating of+ // those sections is handled in SettingsTab (ops = Docker only; waf = Docker ++ // Python). `previews` stays a top-level tab.docker: {label: 'Docker',color: '#49c7f0',bgColor: 'rgba(73, 199, 240, 0.1)',borderColor: 'rgba(73, 199, 240, 0.2)',icon: 'docker',- tabs: ['overview', 'events', 'logs', 'environment', 'shell', 'metrics', 'ops', 'waf', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'logs', 'environment', 'shell', 'metrics', 'previews', 'settings'],},flask: {label: 'Flask',@@ -21,7 +23,7 @@ const SERVICE_TYPES = {bgColor: 'rgba(245, 185, 69, 0.1)',borderColor: 'rgba(245, 185, 69, 0.2)',icon: 'flask',- tabs: ['overview', 'events', 'logs', 'environment', 'packages', 'gunicorn', 'commands', 'metrics', 'waf', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'logs', 'environment', 'packages', 'gunicorn', 'commands', 'metrics', 'previews', 'settings'],},django: {label: 'Django',@@ -29,7 +31,7 @@ const SERVICE_TYPES = {bgColor: 'rgba(61, 220, 151, 0.1)',borderColor: 'rgba(61, 220, 151, 0.2)',icon: 'django',- tabs: ['overview', 'events', 'logs', 'environment', 'packages', 'gunicorn', 'commands', 'metrics', 'waf', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'logs', 'environment', 'packages', 'gunicorn', 'commands', 'metrics', 'previews', 'settings'],},php: {label: 'PHP',@@ -37,7 +39,7 @@ const SERVICE_TYPES = {bgColor: 'rgba(176, 123, 245, 0.1)',borderColor: 'rgba(176, 123, 245, 0.2)',icon: 'php',- tabs: ['overview', 'events', 'logs', 'environment', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'logs', 'environment', 'previews', 'settings'],},static: {label: 'Static',@@ -45,7 +47,7 @@ const SERVICE_TYPES = {bgColor: 'rgba(109, 124, 255, 0.1)',borderColor: 'rgba(109, 124, 255, 0.2)',icon: 'static',- tabs: ['overview', 'events', 'environment', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'environment', 'previews', 'settings'],},wordpress: {label: 'WordPress',@@ -80,7 +82,7 @@ export function getServiceType(appType) {bgColor: 'rgba(100, 107, 122, 0.1)',borderColor: 'rgba(100, 107, 122, 0.2)',icon: 'default',- tabs: ['overview', 'events', 'logs', 'environment', 'build', 'deploy', 'previews', 'settings'],+ tabs: ['overview', 'events', 'logs', 'environment', 'previews', 'settings'],};}