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
Add TabGroupLayout and topbar actions
Juan Denis19f702b8e869
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex de04ea6f..7021e523 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -33,6 +33,14 @@ import Servers from './pages/Servers';import ServerDetail from './pages/ServerDetail';import AgentFleet from './pages/AgentFleet';import FleetMonitor from './pages/FleetMonitor';+import TabGroupLayout from './layouts/TabGroupLayout';+import { SERVER_TABS } from './components/servers/serverTabs';+import { DOMAIN_TABS } from './components/domains/domainTabs';+import { SERVICE_TABS } from './components/services/serviceTabs';+import { FILE_TABS } from './components/files/fileTabs';+import { MONITOR_TABS } from './components/monitoring/monitorTabs';+import { MARKET_TABS } from './components/marketplace/marketTabs';+import { WORDPRESS_TABS } from './components/wordpress/wordpressTabs';import Downloads from './pages/Downloads';import WordPress from './pages/WordPress';import WordPressDetail from './pages/WordPressDetail';@@ -250,58 +258,77 @@ function AppRoutes() {</PrivateRoute>}><Route index element={<Dashboard />} />- <Route path="services" element={<Services />} />- <Route path="services/new" element={<NewService />} />+ {/* Tab groups — each parent TabGroupLayout renders the shared+ PageTopbar + sub-nav once and swaps only the routed content+ below, so the tabs act like real tabs (no full-page remount)+ and keep the group's sidebar item lit. Detail / full-bleed+ routes (services/:id, wordpress/:id, …) stay outside. */}+ <Route element={<TabGroupLayout tabs={SERVICE_TABS} />}>+ <Route path="services" element={<Services />} />+ <Route path="services/new" element={<NewService />} />+ <Route path="templates" element={<Templates />} />+ <Route path="deployments" element={<Deployments />} />+ <Route path="deployments/:jobId" element={<Deployments />} />+ </Route><Route path="services/:id" element={<ServiceDetail />} /><Route path="apps" element={<Navigate to="/services" replace />} /><Route path="apps/:id" element={<ApplicationDetail />} /><Route path="apps/:id/:tab" element={<ApplicationDetail />} />- <Route path="wordpress" element={<WordPress />} />- <Route path="wordpress/projects" element={<WordPressProjects />} />+ <Route element={<TabGroupLayout tabs={WORDPRESS_TABS} />}>+ <Route path="wordpress" element={<WordPress />} />+ <Route path="wordpress/projects" element={<WordPressProjects />} />+ </Route><Route path="wordpress/projects/:id" element={<WordPressProject />} /><Route path="wordpress/projects/:id/:tab" element={<WordPressProject />} /><Route path="wordpress/:id" element={<WordPressDetail />} /><Route path="wordpress/:id/:tab" element={<WordPressDetail />} />- <Route path="templates" element={<Templates />} />- <Route path="deployments" element={<Deployments />} />- <Route path="deployments/:jobId" element={<Deployments />} /><Route path="workflow" element={<WorkflowBuilder />} />- <Route path="domains" element={<Domains />} />+ <Route element={<TabGroupLayout tabs={DOMAIN_TABS} />}>+ <Route path="domains" element={<Domains />} />+ <Route path="dns" element={<DNSZones />} />+ <Route path="ssl" element={<SSLCertificates />} />+ <Route path="dynamic-dns" element={<DynamicDns />} />+ </Route><Route path="remote-access" element={<RemoteAccess />} /><Route path="databases" element={<Databases />} /><Route path="databases/:tab" element={<Databases />} />- <Route path="ssl" element={<SSLCertificates />} /><Route path="docker" element={<Docker />} /><Route path="docker/:tab" element={<Docker />} />- <Route path="servers" element={<Servers />} />+ <Route element={<TabGroupLayout tabs={SERVER_TABS} />}>+ <Route path="servers" element={<Servers />} />+ <Route path="fleet" element={<AgentFleet />} />+ <Route path="fleet-monitor" element={<FleetMonitor />} />+ <Route path="cloud" element={<CloudProvision />} />+ <Route path="server-templates" element={<ServerTemplates />} />+ </Route><Route path="servers/:id" element={<ServerDetail />} /><Route path="servers/:id/:tab" element={<ServerDetail />} />- <Route path="fleet" element={<AgentFleet />} />- <Route path="fleet-monitor" element={<FleetMonitor />} /><Route path="agent-plugins" element={<Navigate to="/marketplace" replace />} />- <Route path="server-templates" element={<ServerTemplates />} /><Route path="workspaces" element={<Workspaces />} /><Route path="workspaces/:id" element={<WorkspaceDetail />} />- <Route path="dns" element={<DNSZones />} />- <Route path="status-pages" element={<StatusPages />} />- <Route path="cloud" element={<CloudProvision />} />- <Route path="marketplace" element={<Marketplace />} />+ <Route element={<TabGroupLayout tabs={MARKET_TABS} />}>+ <Route path="marketplace" element={<Marketplace />} />+ <Route path="downloads" element={<Downloads />} />+ </Route><Route path="style-guide" element={<StyleGuide />} /><Route path="style-guide/:tab" element={<StyleGuide />} /><Route path="app-map" element={<AppMap />} /><Route path="app-map/:tab" element={<AppMap />} /><Route path="documentation" element={<Documentation />} />- <Route path="downloads" element={<Downloads />} /><Route path="firewall" element={<Navigate to="/security/firewall" replace />} /><Route path="git-ext" element={<LegacyGitExtRedirect />} /><Route path="git-ext/:tab" element={<LegacyGitExtRedirect />} />- <Route path="files" element={<FileManager />} />- <Route path="ftp" element={<FTPServer />} />- <Route path="ftp/:tab" element={<FTPServer />} />- <Route path="monitoring" element={<Monitoring />} />- <Route path="monitoring/:tab" element={<Monitoring />} />+ <Route element={<TabGroupLayout tabs={FILE_TABS} />}>+ <Route path="files" element={<FileManager />} />+ <Route path="ftp" element={<FTPServer />} />+ <Route path="ftp/:tab" element={<FTPServer />} />+ </Route>+ <Route element={<TabGroupLayout tabs={MONITOR_TABS} />}>+ <Route path="monitoring" element={<Monitoring />} />+ <Route path="monitoring/:tab" element={<Monitoring />} />+ <Route path="status-pages" element={<StatusPages />} />+ </Route><Route path="gpu" element={<GpuMonitor />} />- <Route path="dynamic-dns" element={<DynamicDns />} /><Route path="backups" element={<Backups />} /><Route path="backups/:tab" element={<Backups />} /><Route path="cron" element={<CronJobs />} />diff --git a/frontend/src/components/Sidebar.jsx b/frontend/src/components/Sidebar.jsxindex 8f3539b8..1b6ddf23 100644--- a/frontend/src/components/Sidebar.jsx+++ b/frontend/src/components/Sidebar.jsx@@ -178,13 +178,19 @@ const Sidebar = ({ mobileOpen = false, isMobile = false, onMobileClose = () => {const visibleSubs = hasChildren? item.subItems.filter(sub => !sub.requiresCondition || conditions[sub.requiresCondition]): [];+ // Items can claim extra active paths (e.g. Servers stays lit across its+ // Agent Fleet / Fleet Monitor / Cloud / Config Templates tabs) so the+ // highlight doesn't drop when a sub-tab lives on its own route.+ const groupActive = item.matchPrefixes?.some(+ (p) => location.pathname === p || location.pathname.startsWith(p + '/')+ );return (<React.Fragment key={item.id}><div className={`nav-item-row ${hasChildren ? 'has-children' : ''}`}><NavLinkto={item.route}- className={({ isActive }) => `nav-item ${isActive ? 'active' : ''}`}+ className={({ isActive }) => `nav-item ${isActive || groupActive ? 'active' : ''}`}end={item.end || hasChildren}><svg className="nav-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor"diff --git a/frontend/src/components/sidebarItems.js b/frontend/src/components/sidebarItems.jsindex 353b8f4c..e5878825 100644--- a/frontend/src/components/sidebarItems.js+++ b/frontend/src/components/sidebarItems.js@@ -1,3 +1,14 @@+import { SERVER_TABS } from './servers/serverTabs';+import { DOMAIN_TABS } from './domains/domainTabs';+import { SERVICE_TABS } from './services/serviceTabs';+import { FILE_TABS } from './files/fileTabs';+import { MONITOR_TABS } from './monitoring/monitorTabs';+import { MARKET_TABS } from './marketplace/marketTabs';++// Path prefixes for a tab group, used to keep the group's sidebar item lit+// across all its tabs (e.g. Servers stays active on /fleet, /cloud, …).+const groupPrefixes = (tabs) => tabs.map((t) => t.to);+// Sidebar navigation items definition// Items with subItems render as collapsible groups (collapsed by default)// The 'dashboard' item is always visible and cannot be hidden@@ -30,6 +41,9 @@ export const SIDEBAR_ITEMS = [id: 'servers',label: 'Servers',route: '/servers',+ // Keep "Servers" lit across the whole tab group (Agent Fleet, Fleet+ // Monitor, Cloud Servers, Config Templates) — see serverTabs.jsx.+ matchPrefixes: groupPrefixes(SERVER_TABS),category: 'infrastructure',icon: '<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"/>'},@@ -41,6 +55,7 @@ export const SIDEBAR_ITEMS = [id: 'domains',label: 'Domains',route: '/domains',+ matchPrefixes: groupPrefixes(DOMAIN_TABS),category: 'infrastructure',icon: '<circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/>'},@@ -51,15 +66,6 @@ export const SIDEBAR_ITEMS = [category: 'infrastructure',icon: '<rect x="16" y="16" width="6" height="6" rx="1"/><rect x="2" y="16" width="6" height="6" rx="1"/><rect x="9" y="2" width="6" height="6" rx="1"/><path d="M5 16v-3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v3"/><path d="M12 12V8"/>'},- {- // Dynamic DNS lives under Infrastructure next to Domains/DNS — it keeps a- // DNS A-record pointed at a changing public IP via a token-authed update URL.- id: 'dynamic-dns',- label: 'Dynamic DNS',- route: '/dynamic-dns',- category: 'infrastructure',- icon: '<path d="M4.9 19.1C1 15.2 1 8.8 4.9 4.9"/><path d="M7.8 16.2c-2.3-2.3-2.3-6.1 0-8.5"/><circle cx="12" cy="12" r="2"/><path d="M16.2 7.8c2.3 2.3 2.3 6.1 0 8.5"/><path d="M19.1 4.9C23 8.8 23 15.2 19.1 19.1"/>'- },{// Redesign: Services uses the top-bar layout (REDESIGN_MAP §6 decision 3).// New Service / Templates / Deploy Activity now live in the page's top@@ -68,6 +74,7 @@ export const SIDEBAR_ITEMS = [id: 'services',label: 'Services',route: '/services',+ matchPrefixes: groupPrefixes(SERVICE_TABS),category: 'infrastructure',icon: '<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/>'},@@ -115,6 +122,7 @@ export const SIDEBAR_ITEMS = [id: 'files',label: 'Files',route: '/files',+ matchPrefixes: groupPrefixes(FILE_TABS),category: 'operations',icon: '<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>'},@@ -125,6 +133,7 @@ export const SIDEBAR_ITEMS = [id: 'monitoring',label: 'Monitoring',route: '/monitoring',+ matchPrefixes: groupPrefixes(MONITOR_TABS),category: 'operations',icon: '<path d="M22 12h-4l-3 9L9 3l-3 9H2"/>'},@@ -191,6 +200,7 @@ export const SIDEBAR_ITEMS = [id: 'marketplace',label: 'Marketplace',route: '/marketplace',+ matchPrefixes: groupPrefixes(MARKET_TABS),category: 'system',icon: '<circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/><path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/>'}diff --git a/frontend/src/hooks/useTopbarActions.js b/frontend/src/hooks/useTopbarActions.jsnew file mode 100644index 00000000..8bf14fb0--- /dev/null+++ b/frontend/src/hooks/useTopbarActions.js@@ -0,0 +1,27 @@+import { useEffect } from 'react';+import { useOutletContext } from 'react-router-dom';++// Publish a page's top-bar actions into the enclosing TabGroupLayout header.+// Pages in a tab group render no PageTopbar of their own, so the shared layout+// shows their actions instead.+//+// Pass a RENDER THUNK that returns the action node — `() => (<Button…/>)` — not+// the node itself. The thunk is invoked inside the effect (after render), so it+// can safely reference handlers declared anywhere in the component without+// hitting the temporal dead zone. (A raw node is still accepted for+// convenience.) `deps` are the reactive values the node reads (e.g.+// [loading, isAdmin]); the node/thunk itself is intentionally not a dependency.+// No-op when rendered outside a tab group (e.g. a page reused as a plain route).+export function useTopbarActions(actions, deps = []) {+ const ctx = useOutletContext();+ const setTopbarActions = ctx?.setTopbarActions;++ useEffect(() => {+ if (!setTopbarActions) return undefined;+ setTopbarActions(typeof actions === 'function' ? actions() : actions);+ return () => setTopbarActions(null);+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [setTopbarActions, ...deps]);+}++export default useTopbarActions;diff --git a/frontend/src/layouts/TabGroupLayout.jsx b/frontend/src/layouts/TabGroupLayout.jsxnew file mode 100644index 00000000..89e54f39--- /dev/null+++ b/frontend/src/layouts/TabGroupLayout.jsx@@ -0,0 +1,47 @@+import { useState, useMemo } from 'react';+import { Outlet, useLocation } from 'react-router-dom';+import { PageTopbar } from '@/components/ds';++// Generic shell for a PageTopbar tab group (Servers, Domains, Services, Files,+// Monitoring, Marketplace, …). A parent route renders the PageTopbar + routed+// sub-nav ONCE and swaps only the content below, so the tabs behave like real+// tabs — no full-page remount — and the matching sidebar item stays lit (see+// sidebarItems.js `matchPrefixes`). Child pages render no top bar of their own;+// they publish their own top-bar actions via the useTopbarActions() hook.+//+// <Route element={<TabGroupLayout tabs={DOMAIN_TABS} />}>+// <Route path="domains" element={<Domains />} />+// <Route path="dns" element={<DNSZones />} />+// <Route path="ssl" element={<SSLCertificates />} />+// </Route>+function matchTab(tab, path) {+ if (tab.end) return path === tab.to;+ // Segment-aware so "/fleet" doesn't swallow "/fleet-monitor".+ return path === tab.to || path.startsWith(tab.to + '/');+}++export default function TabGroupLayout({ tabs }) {+ const location = useLocation();+ const [actions, setActions] = useState(null);++ // Title + icon mirror the active tab so the header always matches the lit+ // sub-nav item.+ const active = useMemo(+ () => tabs.find((t) => matchTab(t, location.pathname)) || tabs[0],+ [tabs, location.pathname]+ );++ return (+ <div className="page-container page-container--full-bleed sk-tabgroup">+ <PageTopbar+ icon={active.icon}+ title={active.label}+ tabs={tabs}+ actions={actions}+ />+ <div className="sk-tabgroup__content">+ <Outlet context={{ setTopbarActions: setActions }} />+ </div>+ </div>+ );+}diff --git a/frontend/src/pages/AgentFleet.jsx b/frontend/src/pages/AgentFleet.jsxindex 31fea016..83bb8941 100644--- a/frontend/src/pages/AgentFleet.jsx+++ b/frontend/src/pages/AgentFleet.jsx@@ -1,6 +1,6 @@import React, { useState, useEffect, useCallback } from 'react';+import { useTopbarActions } from '@/hooks/useTopbarActions';import {- Users,Shield,Activity,Download,@@ -29,8 +29,7 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Badge } from '@/components/ui/badge';import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';-import { PageTopbar, MetricCard, Pill, Gauge } from '@/components/ds';-import { SERVER_TABS } from '../components/servers/serverTabs';+import { MetricCard, Pill, Gauge } from '@/components/ds';const AgentFleet = () => {const [activeTab, setActiveTab] = useState('dashboard');@@ -55,6 +54,16 @@ const AgentFleet = () => {fetchData();}, [activeTab]);+ // Publish the Refresh button to the shared tab-group top bar; re-registers+ // on `loading` so the spinner/disabled state stays in sync.+ useTopbarActions(() =>+ <Button size="sm" onClick={fetchData} disabled={loading}>+ <RefreshCw size={18} className={loading ? 'animate-spin' : ''} />+ Refresh+ </Button>,+ [loading]+ );+const fetchData = async () => {setLoading(true);try {@@ -195,21 +204,7 @@ const AgentFleet = () => {};return (- <div className="page-container">- <PageTopbar- icon={<Users size={18} />}- title="Agent Fleet"- tabs={SERVER_TABS}- actions={(- <>- <Button size="sm" onClick={fetchData} disabled={loading}>- <RefreshCw size={18} className={loading ? 'animate-spin' : ''} />- Refresh- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner"><Tabs value={activeTab} onValueChange={setActiveTab}><TabsList>{[diff --git a/frontend/src/pages/CloudProvision.jsx b/frontend/src/pages/CloudProvision.jsxindex 28afc141..f4821488 100644--- a/frontend/src/pages/CloudProvision.jsx+++ b/frontend/src/pages/CloudProvision.jsx@@ -1,4 +1,5 @@import React, { useState, useEffect, useCallback } from 'react';+import { useTopbarActions } from '@/hooks/useTopbarActions';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { useAuth } from '../contexts/AuthContext';@@ -10,8 +11,6 @@ import { Input } from '@/components/ui/input';import { Badge } from '@/components/ui/badge';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';import { Cloud, Server } from 'lucide-react';-import { PageTopbar } from '@/components/ds';-import { SERVER_TABS } from '../components/servers/serverTabs';const CloudProvision = () => {const toast = useToast();@@ -47,6 +46,17 @@ const CloudProvision = () => {useEffect(() => { loadData(); }, [loadData]);+ // Publish the admin actions to the shared tab-group top bar.+ useTopbarActions(() =>+ user?.is_admin ? (+ <>+ <Button size="sm" variant="outline" onClick={() => setShowCreateProvider(true)}>Add Provider</Button>+ <Button size="sm" onClick={() => setShowCreateServer(true)}>New Server</Button>+ </>+ ) : null,+ [user?.is_admin]+ );+const handleCreateProvider = async () => {try {await api.createCloudProvider(providerForm);@@ -91,26 +101,10 @@ const CloudProvision = () => {return 'warning';};- if (loading) return <div className="page-container"><Spinner /></div>;+ if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;return (- <div className="page-container cloud-provision-page">- <PageTopbar- icon={<Cloud size={18} />}- title="Cloud Provisioning"- tabs={SERVER_TABS}- actions={(- <>- {user?.is_admin && (- <>- <Button size="sm" variant="outline" onClick={() => setShowCreateProvider(true)}>Add Provider</Button>- <Button size="sm" onClick={() => setShowCreateServer(true)}>New Server</Button>- </>- )}- </>- )}- />-+ <div className="sk-tabgroup__inner cloud-provision-page"><Tabs defaultValue="servers"><TabsList><TabsTrigger value="servers">Servers</TabsTrigger>diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsxindex 3f765b50..64778ddd 100644--- a/frontend/src/pages/DNSZones.jsx+++ b/frontend/src/pages/DNSZones.jsx@@ -1,7 +1,6 @@import React, { useState, useEffect, useCallback } from 'react';-import { Globe, Network } from 'lucide-react';-import { PageTopbar } from '@/components/ds';-import { DOMAIN_TABS } from '../components/domains/domainTabs';+import { Globe } from 'lucide-react';+import { useTopbarActions } from '@/hooks/useTopbarActions';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { useAuth } from '../contexts/AuthContext';@@ -173,20 +172,17 @@ const DNSZones = () => {}};- if (loading) return <div className="page-container"><Spinner /></div>;+ useTopbarActions(() =>+ user?.is_admin && (+ <Button size="sm" onClick={() => setShowCreateZone(true)}>Add Zone</Button>+ ),+ [user?.is_admin],+ );- return (- <div className="page-container dns-zones-page">- <PageTopbar- icon={<Network size={18} />}- title="DNS Zones"- meta={`${zones.length} zone${zones.length !== 1 ? 's' : ''}`}- tabs={DOMAIN_TABS}- actions={user?.is_admin && (- <Button size="sm" onClick={() => setShowCreateZone(true)}>Add Zone</Button>- )}- />+ if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;+ return (+ <div className="sk-tabgroup__inner dns-zones-page"><div className="dns-layout"><div className="dns-zones-list">{zones.map(zone => (diff --git a/frontend/src/pages/Deployments.jsx b/frontend/src/pages/Deployments.jsxindex 50da9f54..b8b1d47c 100644--- a/frontend/src/pages/Deployments.jsx+++ b/frontend/src/pages/Deployments.jsx@@ -15,8 +15,7 @@ import {import api from '../services/api';import { StatStrip, Stat } from '../components/StatCard';import { Button } from '@/components/ui/button';-import { PageTopbar } from '@/components/ds';-import { SERVICE_TABS } from '../components/services/serviceTabs';+import { useTopbarActions } from '@/hooks/useTopbarActions';const STATUS_COLORS = {pending: { bg: 'var(--surface-3)', fg: 'var(--text-faint)', icon: Clock },@@ -136,36 +135,32 @@ const Deployments = () => {return counts;}, [jobs]);- return (- <div className="page-container deployments-page">- <PageTopbar- icon={<Activity size={18} />}- title="Deployment Activity"- tabs={SERVICE_TABS}- actions={(- <>- <Button variant="outline" size="sm" asChild>- <Link to="/services/new">- <GitBranch size={16} />- New Service- </Link>- </Button>- <Button- variant={autoRefresh ? 'default' : 'outline'}- size="sm"- onClick={() => setAutoRefresh((v) => !v)}- title="Auto-refresh every 3s"- >- <RefreshCw size={16} className={autoRefresh ? 'spin' : ''} />- {autoRefresh ? 'Live' : 'Paused'}- </Button>- <Button variant="outline" size="sm" onClick={loadJobs}>- <RefreshCw size={16} /> Refresh- </Button>- </>- )}- />+ useTopbarActions(() =>+ <>+ <Button variant="outline" size="sm" asChild>+ <Link to="/services/new">+ <GitBranch size={16} />+ New Service+ </Link>+ </Button>+ <Button+ variant={autoRefresh ? 'default' : 'outline'}+ size="sm"+ onClick={() => setAutoRefresh((v) => !v)}+ title="Auto-refresh every 3s"+ >+ <RefreshCw size={16} className={autoRefresh ? 'spin' : ''} />+ {autoRefresh ? 'Live' : 'Paused'}+ </Button>+ <Button variant="outline" size="sm" onClick={loadJobs}>+ <RefreshCw size={16} /> Refresh+ </Button>+ </>,+ [autoRefresh]+ );+ return (+ <div className="sk-tabgroup__inner deployments-page"><StatStrip ariaLabel="Deployment summary"><Stat label="Running" value={summary.running} state={summary.running > 0 ? 'info' : undefined} /><Stat label="Succeeded" value={summary.succeeded} state={summary.succeeded > 0 ? 'success' : undefined} />diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsxindex 94af5938..8cdc9210 100644--- a/frontend/src/pages/Domains.jsx+++ b/frontend/src/pages/Domains.jsx@@ -14,8 +14,8 @@ import { Checkbox } from '@/components/ui/checkbox';import {Select, SelectTrigger, SelectContent, SelectItem, SelectValue,} from '@/components/ui/select';-import { PageTopbar, MetricCard, SegControl, Pill, Drawer } from '@/components/ds';-import { DOMAIN_TABS } from '../components/domains/domainTabs';+import { MetricCard, SegControl, Pill, Drawer } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import RegistrarPortfolio from '../components/domains/RegistrarPortfolio';const Domains = () => {@@ -225,24 +225,20 @@ const Domains = () => {: filter === 'issues' ? !d.ssl_enabled : true));- return (- <div className="page-container domains-page">- <PageTopbar- icon={<Globe size={18} />}- title="Domains"- tabs={DOMAIN_TABS}- actions={(- <>- <Button variant="outline" size="sm" onClick={loadData}>- <RefreshCw size={15} /> Check DNS- </Button>- <Button size="sm" onClick={() => setShowAddModal(true)}>- <Plus size={15} /> Add domain- </Button>- </>- )}- />+ useTopbarActions(() =>+ <>+ <Button variant="outline" size="sm" onClick={loadData}>+ <RefreshCw size={15} /> Check DNS+ </Button>+ <Button size="sm" onClick={() => setShowAddModal(true)}>+ <Plus size={15} /> Add domain+ </Button>+ </>,+ [],+ );+ return (+ <div className="sk-tabgroup__inner domains-page"><RegistrarPortfolio />{error && (diff --git a/frontend/src/pages/Downloads.jsx b/frontend/src/pages/Downloads.jsxindex 5a2ada7b..35c3d58e 100644--- a/frontend/src/pages/Downloads.jsx+++ b/frontend/src/pages/Downloads.jsx@@ -1,9 +1,7 @@import React, { useState, useEffect } from 'react';-import { Download } from 'lucide-react';import api from '../services/api';import { Button } from '@/components/ui/button';-import { PageTopbar } from '@/components/ds';-import { MARKET_TABS } from '../components/marketplace/marketTabs';+import { useTopbarActions } from '@/hooks/useTopbarActions';// Platform icons as SVG componentsconst LinuxIcon = () => (@@ -140,10 +138,19 @@ function Downloads() {}};+ useTopbarActions(() =>+ <>+ <Button size="sm" variant="outline" onClick={fetchVersionInfo}>+ <RefreshIcon />+ Refresh+ </Button>+ </>,+ [],+ );+if (loading) {return (- <div className="page-container downloads-page">- <PageTopbar icon={<Download size={18} />} title="Downloads" tabs={MARKET_TABS} />+ <div className="sk-tabgroup__inner downloads-page"><div className="loading-container"><div className="loading-spinner"></div><p>Loading version information...</p>@@ -153,21 +160,7 @@ function Downloads() {}return (- <div className="page-container downloads-page">- <PageTopbar- icon={<Download size={18} />}- title="Downloads"- tabs={MARKET_TABS}- actions={(- <>- <Button size="sm" variant="outline" onClick={fetchVersionInfo}>- <RefreshIcon />- Refresh- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner downloads-page">{error && (<div className="alert alert-error"><p>{error}</p>diff --git a/frontend/src/pages/FTPServer.jsx b/frontend/src/pages/FTPServer.jsxindex ee9d10e4..6b1f9ac4 100644--- a/frontend/src/pages/FTPServer.jsx+++ b/frontend/src/pages/FTPServer.jsx@@ -4,9 +4,9 @@ import {Cable, KeyRound, Ban, Check, Trash2, RefreshCw, X,} from 'lucide-react';import useTabParam from '../hooks/useTabParam';+import { useTopbarActions } from '@/hooks/useTopbarActions';import { api } from '../services/api';-import { PageTopbar, MetricCard, Pill } from '@/components/ds';-import { FILE_TABS } from '../components/files/fileTabs';+import { MetricCard, Pill } from '@/components/ds';import { useToast } from '../contexts/ToastContext';import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';@@ -231,6 +231,55 @@ function FTPServer() {setShowPasswordModal(true);};+ const isInstalled = status?.any_installed;+ const isRunning = status?.any_running;++ useTopbarActions(() =>+ <>+ {!isInstalled ? (+ <Button onClick={() => setShowInstallModal(true)}>+ Install FTP Server+ </Button>+ ) : (+ <>+ <Button+ variant="outline"+ onClick={handleTestConnection}+ disabled={actionLoading}+ >+ Test Connection+ </Button>+ {isRunning ? (+ <>+ <Button+ variant="outline"+ onClick={() => handleServiceAction('restart')}+ disabled={actionLoading}+ >+ Restart+ </Button>+ <Button+ variant="destructive"+ onClick={() => handleServiceAction('stop')}+ disabled={actionLoading}+ >+ Stop+ </Button>+ </>+ ) : (+ <Button+ onClick={() => handleServiceAction('start')}+ disabled={actionLoading}+ >+ Start+ </Button>+ )}+ </>+ )}+ </>,+ [isInstalled, isRunning, actionLoading],+ );+if (loading) {return (<div className="page-loading">@@ -239,8 +288,6 @@ function FTPServer() {);}- const isInstalled = status?.any_installed;- const isRunning = status?.any_running;const activeServer = status?.active_server;const disabledUsers = users.filter((user) => !user.is_active).length;const ftpPort = config?.settings@@ -248,57 +295,7 @@ function FTPServer() {: null;return (- <div className="page-container ftp-server">- <PageTopbar- icon={<Network size={18} />}- title="FTP Server"- tabs={FILE_TABS}- actions={(- <>- {!isInstalled ? (- <Button onClick={() => setShowInstallModal(true)}>- Install FTP Server- </Button>- ) : (- <>- <Button- variant="outline"- onClick={handleTestConnection}- disabled={actionLoading}- >- Test Connection- </Button>- {isRunning ? (- <>- <Button- variant="outline"- onClick={() => handleServiceAction('restart')}- disabled={actionLoading}- >- Restart- </Button>- <Button- variant="destructive"- onClick={() => handleServiceAction('stop')}- disabled={actionLoading}- >- Stop- </Button>- </>- ) : (- <Button- onClick={() => handleServiceAction('start')}- disabled={actionLoading}- >- Start- </Button>- )}- </>- )}- </>- )}- />-+ <div className="sk-tabgroup__inner ftp-server">{!isInstalled ? (<EmptyStatesize="lg"diff --git a/frontend/src/pages/FileManager.jsx b/frontend/src/pages/FileManager.jsxindex 534b2c48..a0e9aeba 100644--- a/frontend/src/pages/FileManager.jsx+++ b/frontend/src/pages/FileManager.jsx@@ -16,8 +16,6 @@ import { useSearchParams } from 'react-router-dom';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';-import { PageTopbar } from '@/components/ds';-import { FILE_TABS } from '../components/files/fileTabs';import FolderTree from '../components/file-manager/FolderTree';import FileCard from '../components/file-manager/FileCard';@@ -804,7 +802,7 @@ function FileManager() {// ─── render ──────────────────────────────────────────return (<div- className={`page-container page-container--full-bleed file-manager-page file-manager fullscreen ${sidebarVisible ? 'sidebar-open' : ''} view-${viewMode} grid-${gridSize} ${selectMode ? 'select-mode' : ''}`}+ className={`sk-tabgroup__fill file-manager-page file-manager fullscreen ${sidebarVisible ? 'sidebar-open' : ''} view-${viewMode} grid-${gridSize} ${selectMode ? 'select-mode' : ''}`}onDragEnter={handleDragEnter}onDragOver={handleDragOver}onDragLeave={handleDragLeave}@@ -818,13 +816,6 @@ function FileManager() {onChange={handleUploadInput}/>- <PageTopbar- icon={<FolderOpen size={18} />}- title="Files"- meta={isRemote ? target.name : 'panel host'}- tabs={FILE_TABS}- />-{isRemote && (<div className="file-manager-target-banner">Browsing on <strong>{target.name}</strong> — read/write only.diff --git a/frontend/src/pages/FleetMonitor.jsx b/frontend/src/pages/FleetMonitor.jsxindex 12f013d3..0a70052c 100644--- a/frontend/src/pages/FleetMonitor.jsx+++ b/frontend/src/pages/FleetMonitor.jsx@@ -1,4 +1,5 @@import React, { useState, useEffect, useMemo } from 'react';+import { useTopbarActions } from '@/hooks/useTopbarActions';import {Activity,AlertTriangle,@@ -24,8 +25,7 @@ import { useToast } from '../contexts/ToastContext';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';-import { PageTopbar, Pill } from '@/components/ds';-import { SERVER_TABS } from '../components/servers/serverTabs';+import { Pill } from '@/components/ds';const CHART_COLORS = ['#6366f1', '#ec4899', '#14b8a6', '#f59e0b',@@ -54,6 +54,16 @@ const FleetMonitor = () => {const [loading, setLoading] = useState(true);const { addToast } = useToast();+ // Publish the Refresh button to the shared tab-group top bar; re-registers+ // on `loading` so the spinner/disabled state stays in sync.+ useTopbarActions(() =>+ <Button size="sm" onClick={fetchTabData} disabled={loading}>+ <RefreshCw size={18} className={loading ? 'animate-spin' : ''} />+ Refresh+ </Button>,+ [loading]+ );+// Overview stateconst [heatmapData, setHeatmapData] = useState([]);@@ -234,21 +244,7 @@ const FleetMonitor = () => {};return (- <div className="page-container">- <PageTopbar- icon={<Activity size={18} />}- title="Fleet Monitor"- tabs={SERVER_TABS}- actions={(- <>- <Button size="sm" onClick={fetchTabData} disabled={loading}>- <RefreshCw size={18} className={loading ? 'animate-spin' : ''} />- Refresh- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner"><Tabs value={activeTab} onValueChange={setActiveTab}><TabsList>{[diff --git a/frontend/src/pages/Marketplace.jsx b/frontend/src/pages/Marketplace.jsxindex 56518822..7838d165 100644--- a/frontend/src/pages/Marketplace.jsx+++ b/frontend/src/pages/Marketplace.jsx@@ -13,7 +13,6 @@ import {PackageCheck,Plug,PlugZap,- Puzzle,Search,ServerCog,ShieldCheck,@@ -30,8 +29,7 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Badge } from '@/components/ui/badge';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';-import { PageTopbar } from '@/components/ds';-import { MARKET_TABS } from '../components/marketplace/marketTabs';+import { useTopbarActions } from '@/hooks/useTopbarActions';const CATEGORIES = ['ai', 'monitoring', 'security', 'deployment', 'integration', 'ui', 'utility'];@@ -261,7 +259,17 @@ const Marketplace = () => {return 'outline';};- if (loading) return <div className="page-container"><Spinner /></div>;+ useTopbarActions(() =>+ <>+ <Button variant="outline" size="sm" onClick={openZipInstaller}>+ <UploadCloud aria-hidden="true" />+ Import ZIP+ </Button>+ </>,+ [],+ );++ if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;const installedIds = new Set(myExtensions.map((extension) => String(extension.extension_id)));const localCatalogEntries = builtins.map(getLocalCatalogEntry);@@ -283,21 +291,7 @@ const Marketplace = () => {const hasFilters = Boolean(search.trim() || category);return (- <div className="page-container marketplace-page">- <PageTopbar- icon={<Puzzle size={18} />}- title="Marketplace"- tabs={MARKET_TABS}- actions={(- <>- <Button variant="outline" size="sm" onClick={openZipInstaller}>- <UploadCloud aria-hidden="true" />- Import ZIP- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner marketplace-page"><StatStrip ariaLabel="Marketplace summary"><Stat label="Catalog" value={availableCount} /><Stat label="Local Entries" value={builtins.length} />diff --git a/frontend/src/pages/Monitoring.jsx b/frontend/src/pages/Monitoring.jsxindex 3996d796..756f5029 100644--- a/frontend/src/pages/Monitoring.jsx+++ b/frontend/src/pages/Monitoring.jsx@@ -9,8 +9,8 @@ import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';import { Switch } from '@/components/ui/switch';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';-import { PageTopbar, MetricCard, Pill, Gauge } from '@/components/ds';-import { MONITOR_TABS } from '../components/monitoring/monitorTabs';+import { MetricCard, Pill, Gauge } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import {Activity,Bell,@@ -291,47 +291,45 @@ const Monitoring = () => {}));};+ useTopbarActions(() =>+ (+ <>+ <Button size="sm" variant="outline" onClick={loadData}>+ <RefreshCw size={16} />+ Refresh+ </Button>+ <Button+ size="sm"+ variant={status?.enabled ? 'destructive' : 'default'}+ onClick={handleToggleMonitoring}+ >+ {status?.enabled ? (+ <>+ <Activity size={16} />+ Stop Monitoring+ </>+ ) : (+ <>+ <PlayCircle size={16} />+ Start Monitoring+ </>+ )}+ </Button>+ </>+ ),+ [status?.enabled]+ );+if (loading) {return (- <div className="page-container monitoring-page">+ <div className="sk-tabgroup__inner monitoring-page"><EmptyState loading size="lg" title="Loading monitoring data" /></div>);}return (- <div className="page-container monitoring-page">- <PageTopbar- icon={<Activity size={18} />}- title="Monitoring"- tabs={MONITOR_TABS}- actions={(- <>- <Button size="sm" variant="outline" onClick={loadData}>- <RefreshCw size={16} />- Refresh- </Button>- <Button- size="sm"- variant={status?.enabled ? 'destructive' : 'default'}- onClick={handleToggleMonitoring}- >- {status?.enabled ? (- <>- <Activity size={16} />- Stop Monitoring- </>- ) : (- <>- <PlayCircle size={16} />- Start Monitoring- </>- )}- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner monitoring-page">{error && (<div className="alert alert-danger">{error}diff --git a/frontend/src/pages/NewService.jsx b/frontend/src/pages/NewService.jsxindex 7c089d57..fdc6de59 100644--- a/frontend/src/pages/NewService.jsx+++ b/frontend/src/pages/NewService.jsx@@ -10,7 +10,6 @@ import {Link2,Lock,Package,- Plus,RefreshCw,Rocket,Search,@@ -22,8 +21,7 @@ import {import { SiGithub } from 'react-icons/si';import api from '../services/api';import { useToast } from '../contexts/ToastContext';-import { PageTopbar } from '@/components/ds';-import { SERVICE_TABS } from '../components/services/serviceTabs';+import { useTopbarActions } from '@/hooks/useTopbarActions';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';@@ -386,22 +384,18 @@ const NewService = () => {}}- return (- <div className="page-container new-service-page">- <PageTopbar- icon={<Plus size={18} />}- title="New Service"- tabs={SERVICE_TABS}- actions={(- <Button type="button" variant="outline" size="sm" asChild>- <Link to="/settings/connections">- <Link2 size={16} />- Connections- </Link>- </Button>- )}- />+ useTopbarActions(() =>+ <Button type="button" variant="outline" size="sm" asChild>+ <Link to="/settings/connections">+ <Link2 size={16} />+ Connections+ </Link>+ </Button>,+ []+ );+ return (+ <div className="sk-tabgroup__inner new-service-page"><div className="new-service-page__method-grid" aria-label="Service source options"><buttonclassName={`new-service-page__method-card ${sourceMode === 'github' ? 'new-service-page__method-card--on' : ''}`}diff --git a/frontend/src/pages/SSLCertificates.jsx b/frontend/src/pages/SSLCertificates.jsxindex bbdcb197..86baa550 100644--- a/frontend/src/pages/SSLCertificates.jsx+++ b/frontend/src/pages/SSLCertificates.jsx@@ -5,8 +5,8 @@ import {Settings, Download} from 'lucide-react';import api from '../services/api';-import { PageTopbar, Pill } from '@/components/ds';-import { DOMAIN_TABS } from '../components/domains/domainTabs';+import { Pill } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import { useToast } from '../contexts/ToastContext';import { useConfirm } from '../hooks/useConfirm';import EmptyState from '../components/EmptyState';@@ -166,10 +166,43 @@ const SSLCertificates = () => {}}+ const certificates = status?.certificates || [];+ const expiringSoon = status?.expiring_soon || [];+ const certbotInstalled = status?.certbot_installed ?? false;++ useTopbarActions(() =>+ <>+ <Button+ variant="outline"+ size="sm"+ onClick={handleSetupAutoRenewal}+ disabled={actionLoading || !certbotInstalled}+ title="Configure automatic renewal via systemd or cron"+ >+ <Settings size={15} />+ Auto-Renew+ </Button>+ {certificates.length > 0 && (+ <Button variant="outline" size="sm" onClick={handleRenewAll} disabled={actionLoading}>+ <RefreshCw size={15} />+ Renew All+ </Button>+ )}+ <Button variant="outline" size="sm" onClick={loadData}>+ <RefreshCw size={15} />+ Refresh+ </Button>+ <Button size="sm" onClick={() => setShowObtainModal(true)} disabled={!certbotInstalled}>+ <Plus size={15} />+ New Certificate+ </Button>+ </>,+ [actionLoading, certbotInstalled, certificates.length],+ );+if (loading) {return (- <div className="page-container ssl-page">- <PageTopbar icon={<Lock size={18} />} title="SSL Certificates" tabs={DOMAIN_TABS} />+ <div className="sk-tabgroup__inner ssl-page"><div className="ssl-status-bar">{[1, 2, 3].map(i => (<div key={i} className="ssl-status-item">@@ -196,46 +229,8 @@ const SSLCertificates = () => {);}- const certificates = status?.certificates || [];- const expiringSoon = status?.expiring_soon || [];- const certbotInstalled = status?.certbot_installed ?? false;-return (- <div className="page-container ssl-page">- <PageTopbar- icon={<Lock size={18} />}- title="SSL Certificates"- tabs={DOMAIN_TABS}- actions={(- <>- <Button- variant="outline"- size="sm"- onClick={handleSetupAutoRenewal}- disabled={actionLoading || !certbotInstalled}- title="Configure automatic renewal via systemd or cron"- >- <Settings size={15} />- Auto-Renew- </Button>- {certificates.length > 0 && (- <Button variant="outline" size="sm" onClick={handleRenewAll} disabled={actionLoading}>- <RefreshCw size={15} />- Renew All- </Button>- )}- <Button variant="outline" size="sm" onClick={loadData}>- <RefreshCw size={15} />- Refresh- </Button>- <Button size="sm" onClick={() => setShowObtainModal(true)} disabled={!certbotInstalled}>- <Plus size={15} />- New Certificate- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner ssl-page">{/* Status Cards */}<div className="ssl-status-bar"><div className="ssl-status-item">diff --git a/frontend/src/pages/SecretsWebhooks.jsx b/frontend/src/pages/SecretsWebhooks.jsxindex ad64a191..21d7c522 100644--- a/frontend/src/pages/SecretsWebhooks.jsx+++ b/frontend/src/pages/SecretsWebhooks.jsx@@ -23,7 +23,7 @@ const formatDate = (d) => (d ? new Date(d).toLocaleString() : '—');export default function SecretsWebhooks() {const { tab } = useParams();const navigate = useNavigate();- const { toast } = useToast();+ const toast = useToast();const activeTab = VALID_TABS.includes(tab) ? tab : 'vaults';const [vaults, setVaults] = useState([]);diff --git a/frontend/src/pages/ServerTemplates.jsx b/frontend/src/pages/ServerTemplates.jsxindex f2137c29..a9ff7f38 100644--- a/frontend/src/pages/ServerTemplates.jsx+++ b/frontend/src/pages/ServerTemplates.jsx@@ -1,13 +1,12 @@import React, { useState, useEffect, useCallback } from 'react';+import { useTopbarActions } from '@/hooks/useTopbarActions';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 { LayoutTemplate, FileCog } from 'lucide-react';-import { PageTopbar } from '@/components/ds';-import { SERVER_TABS } from '../components/servers/serverTabs';+import { LayoutTemplate } from 'lucide-react';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';@@ -127,25 +126,18 @@ const ServerTemplates = () => {general: 'General', web: 'Web Server', database: 'Database', mail: 'Mail Server', custom: 'Custom'};- if (loading) return <div className="page-container"><Spinner /></div>;+ // Publish the admin "Create Template" action to the shared tab-group top bar.+ useTopbarActions(() =>+ user?.is_admin ? (+ <Button size="sm" onClick={() => setShowCreateModal(true)}>Create Template</Button>+ ) : null,+ [user?.is_admin]+ );- return (- <div className="page-container server-templates-page">- <PageTopbar- icon={<FileCog size={18} />}- title="Server Templates"- tabs={SERVER_TABS}- actions={(- <>- {user?.is_admin && (- <Button size="sm" onClick={() => setShowCreateModal(true)}>- Create Template- </Button>- )}- </>- )}- />+ if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;+ return (+ <div className="sk-tabgroup__inner server-templates-page">{compliance && (<div className="compliance-bar"><div className="compliance-bar__stats">diff --git a/frontend/src/pages/Servers.jsx b/frontend/src/pages/Servers.jsxindex ff758d2d..7acee396 100644--- a/frontend/src/pages/Servers.jsx+++ b/frontend/src/pages/Servers.jsx@@ -12,8 +12,6 @@ import {XCircle,} from 'lucide-react';import api from '../services/api';-import { PageTopbar } from '@/components/ds';-import { SERVER_TABS } from '../components/servers/serverTabs';import { useToast } from '../contexts/ToastContext';import { ConfirmDialog } from '../components/ConfirmDialog';import EmptyState from '../components/EmptyState';@@ -221,7 +219,7 @@ const Servers = () => {if (loading) {return (- <div className="page-container servers-page servers-page--loading">+ <div className="servers-page servers-page--loading"><div className="servers-loading-card"><ServerIcon /><span>Scanning fleet...</span>@@ -235,12 +233,7 @@ const Servers = () => {const someVisibleSelected = visibleIds.some(id => selectedIds.has(id));return (- <div className="page-container page-container--full-bleed servers-page servers-page--ops">- <PageTopbar- icon={<ServerLucideIcon size={18} />}- title="Servers"- tabs={SERVER_TABS}- />+ <div className="servers-page servers-page--ops"><div className="servers-ops-workspace"><aside className="servers-fleet-rail"><section className="servers-rail-section servers-rail-section--health">diff --git a/frontend/src/pages/Services.jsx b/frontend/src/pages/Services.jsxindex 5a92f571..6a324176 100644--- a/frontend/src/pages/Services.jsx+++ b/frontend/src/pages/Services.jsx@@ -1,12 +1,12 @@import React, { useState, useEffect, useMemo } from 'react';import { useNavigate, Link } from 'react-router-dom';-import { Box, Layers, Plus, Activity, Square, Clock, Play, RotateCw, GitBranch, Github, FolderOpen, FileArchive } from 'lucide-react';+import { Layers, Plus, Activity, Square, Clock, Play, RotateCw, GitBranch, Github, FolderOpen, FileArchive } from 'lucide-react';import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { getServiceType, getStatusConfig, formatRelativeTime } from '../utils/serviceTypes';import EmptyState from '../components/EmptyState';-import { PageTopbar, MetricCard, Pill, SegControl } from '@/components/ds';-import { SERVICE_TABS } from '../components/services/serviceTabs';+import { MetricCard, Pill, SegControl } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Checkbox } from '@/components/ui/checkbox';@@ -133,29 +133,24 @@ const Services = () => {return { total: apps.length, running, stopped, topType, recentDeploy };}, [apps]);+ useTopbarActions(() =>+ <>+ <Button size="sm" asChild>+ <Link to="/services/new">+ <Plus size={16} />+ New Service+ </Link>+ </Button>+ </>,+ []+ );+if (loading) {return <div className="loading">Loading services...</div>;}return (- <div className="page-container services-page">- <PageTopbar- icon={<Box size={18} />}- title="Services"- meta={`${stats.total} services · ${stats.running} live`}- tabs={SERVICE_TABS}- actions={(- <>- <Button size="sm" asChild>- <Link to="/services/new">- <Plus size={16} />- New Service- </Link>- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner services-page">{/* Summary */}{apps.length > 0 && (<div className="svc-kpis">diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsxindex 6e09af6c..108261f0 100644--- a/frontend/src/pages/StatusPages.jsx+++ b/frontend/src/pages/StatusPages.jsx@@ -9,14 +9,13 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';-import { PageTopbar, Pill } from '@/components/ds';-import { MONITOR_TABS } from '../components/monitoring/monitorTabs';+import { Pill } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import {Activity,CheckCircle2,Copy,ExternalLink,- Globe,Globe2,PlayCircle,Plus,@@ -300,30 +299,28 @@ const StatusPages = () => {}};- if (loading) return <div className="page-container"><Spinner /></div>;-- return (- <div className="page-container status-pages-page">- <PageTopbar- icon={<Globe size={18} />}- title="Status Pages"- tabs={MONITOR_TABS}- actions={(- <>- <Button size="sm" variant="outline" onClick={loadPages}>- <RefreshCw size={16} />- Refresh- </Button>- {isAdmin && (- <Button size="sm" onClick={() => setShowCreatePage(true)}>- <Plus size={16} />- Create Page- </Button>- )}- </>+ useTopbarActions(() =>+ (+ <>+ <Button size="sm" variant="outline" onClick={loadPages}>+ <RefreshCw size={16} />+ Refresh+ </Button>+ {isAdmin && (+ <Button size="sm" onClick={() => setShowCreatePage(true)}>+ <Plus size={16} />+ Create Page+ </Button>)}- />+ </>+ ),+ [isAdmin]+ );++ if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;+ return (+ <div className="sk-tabgroup__inner status-pages-page"><div className="status-layout"><aside className="status-pages-list" aria-label="Status pages">{pages.map((page) => (diff --git a/frontend/src/pages/Templates.jsx b/frontend/src/pages/Templates.jsxindex 9eb52770..f07e5203 100644--- a/frontend/src/pages/Templates.jsx+++ b/frontend/src/pages/Templates.jsx@@ -11,8 +11,7 @@ import api from '../services/api';import { useToast } from '../contexts/ToastContext';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';-import { PageTopbar } from '@/components/ds';-import { SERVICE_TABS } from '../components/services/serviceTabs';+import { useTopbarActions } from '@/hooks/useTopbarActions';import EmptyState from '../components/EmptyState';// Featured templates (curated list)@@ -315,38 +314,34 @@ const Templates = () => {const visibleCategories = showAllCategories ? categories : categories.slice(0, 10);const hiddenCategoryCount = Math.max(categories.length - visibleCategories.length, 0);+ useTopbarActions(() =>+ <div className="search-box">+ <Search size={18} className="search-icon" />+ <Input+ type="text"+ placeholder="Search templates..."+ value={searchQuery}+ onChange={(e) => setSearchQueryFilter(e.target.value)}+ />+ {searchQuery && (+ <Button variant="ghost" size="icon" className="search-clear" onClick={() => setSearchQueryFilter('')}>+ <X size={16} />+ </Button>+ )}+ </div>,+ [searchQuery]+ );+if (loading) {return (- <div className="page-container">+ <div className="sk-tabgroup__inner"><EmptyState loading title="Loading templates" /></div>);}return (- <div className="page-container templates-page">- <PageTopbar- icon={<LayoutTemplate size={18} />}- title="App Templates"- tabs={SERVICE_TABS}- actions={(- <div className="search-box">- <Search size={18} className="search-icon" />- <Input- type="text"- placeholder="Search templates..."- value={searchQuery}- onChange={(e) => setSearchQueryFilter(e.target.value)}- />- {searchQuery && (- <Button variant="ghost" size="icon" className="search-clear" onClick={() => setSearchQueryFilter('')}>- <X size={16} />- </Button>- )}- </div>- )}- />-+ <div className="sk-tabgroup__inner templates-page">{/* Results and Filters */}<div className="templates-results-header"><span className="results-count">diff --git a/frontend/src/pages/WordPress.jsx b/frontend/src/pages/WordPress.jsxindex 0619d6d3..47112ece 100644--- a/frontend/src/pages/WordPress.jsx+++ b/frontend/src/pages/WordPress.jsx@@ -7,8 +7,8 @@ import ResourceGate from '../components/ResourceGate';import Spinner from '../components/Spinner';import EmptyState from '../components/EmptyState';import { Globe, ChevronRight, Search } from 'lucide-react';-import { PageTopbar, Pill, SegControl, ServiceTile } from '@/components/ds';-import { WORDPRESS_TABS } from '../components/wordpress/wordpressTabs';+import { Pill, SegControl, ServiceTile } from '@/components/ds';+import { useTopbarActions } from '@/hooks/useTopbarActions';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';@@ -139,10 +139,23 @@ function WordPress() {}};+ useTopbarActions(() =>+ <>+ <Button variant="outline" size="sm" onClick={() => setShowImportModal(true)}>+ <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>+ Import Site+ </Button>+ <Button size="sm" onClick={() => setShowCreateModal(true)}>+ <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>+ Create Site+ </Button>+ </>,+ []+ );+if (loading) {return (- <div className="page-container wordpress-page">- <PageTopbar icon={<Globe size={18} />} title="WordPress" tabs={WORDPRESS_TABS} />+ <div className="sk-tabgroup__inner wordpress-page"><div className="wp-sites-grid">{[1, 2, 3].map(i => (<div key={i} className="wp-site-card-skeleton">@@ -174,7 +187,7 @@ function WordPress() {// Lite tier with no sites -> resource gateif (sites.length === 0 && isLiteTier) {return (- <div className="page-container wordpress-page">+ <div className="sk-tabgroup__inner wordpress-page"><ResourceGate feature="wordpress_create"><div /></ResourceGate>@@ -183,34 +196,7 @@ function WordPress() {}return (- <div className="page-container wordpress-page">- <PageTopbar- icon={<Globe size={18} />}- title="WordPress"- meta={sites.length > 0 && (- <>- {sites.length} site{sites.length === 1 ? '' : 's'}- {' · '}- <span className="wp-list__meta-running">- {sites.filter(s => s.status === 'running').length} running- </span>- </>- )}- tabs={WORDPRESS_TABS}- actions={(- <>- <Button variant="outline" size="sm" onClick={() => setShowImportModal(true)}>- <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>- Import Site- </Button>- <Button size="sm" onClick={() => setShowCreateModal(true)}>- <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>- Create Site- </Button>- </>- )}- />-+ <div className="sk-tabgroup__inner wordpress-page">{createdCreds && (<div className="wp-creds-banner"><div className="wp-creds-banner-text">diff --git a/frontend/src/pages/WordPressProjects.jsx b/frontend/src/pages/WordPressProjects.jsxindex 4f1dc942..b8235f7c 100644--- a/frontend/src/pages/WordPressProjects.jsx+++ b/frontend/src/pages/WordPressProjects.jsx@@ -1,8 +1,6 @@import React, { useState, useEffect } from 'react';import { useNavigate } from 'react-router-dom';import { ExternalLink, Plus, GitBranch, Layers } from 'lucide-react';-import { PageTopbar } from '@/components/ds';-import { WORDPRESS_TABS } from '../components/wordpress/wordpressTabs';import wordpressApi from '../services/wordpress';import { useToast } from '../contexts/ToastContext';import EmptyState from '../components/EmptyState';@@ -36,9 +34,7 @@ const WordPressProjects = () => {}return (- <div className="page-container wp-projects-page">- <PageTopbar icon={<GitBranch size={18} />} title="Pipeline" tabs={WORDPRESS_TABS} />-+ <div className="sk-tabgroup__inner wp-projects-page">{projects.length === 0 ? (<EmptyStatesize="lg"diff --git a/frontend/src/styles/layout/_main-content.scss b/frontend/src/styles/layout/_main-content.scssindex c0be0280..b177e575 100644--- a/frontend/src/styles/layout/_main-content.scss+++ b/frontend/src/styles/layout/_main-content.scss@@ -77,6 +77,56 @@}}+// Tab group shell (Servers / Domains-style route groups). A parent layout+// renders the PageTopbar + routed sub-nav once (see layouts/ServersLayout.jsx)+// and swaps only the content below, so switching tabs feels like real tabs+// instead of a full-page remount. The shell is full-bleed so the header pins+// to the very top and never shifts between tabs.+.sk-tabgroup {+ height: 100%;+ min-height: 0;+ display: flex;+ flex-direction: column;++ > .sk-topbar {+ flex-shrink: 0;+ padding: 10px $space-4;+ margin: 0;++ // Match the 18px header icon the per-page top bars used to render.+ .sk-topbar__ico svg { width: 18px; height: 18px; }+ }++ &__content {+ flex: 1;+ min-height: 0;+ display: flex;+ flex-direction: column;+ overflow-y: auto;++ // Full-bleed pages (Servers ops, File Manager) fill the region edge-to-+ // edge and manage their own internal scroll. Centered pages instead+ // wrap their content in .sk-tabgroup__inner (below).+ > .servers-page--ops,+ > .sk-tabgroup__fill { flex: 1; min-height: 0; }+ }++ // Centered pages (Agent Fleet, Fleet Monitor, Cloud Servers, Config+ // Templates) keep their max-width framing inside the full-bleed shell.+ &__inner {+ width: 100%;+ max-width: 1400px;+ margin-inline: auto;+ padding: $space-6 $space-6 $space-10;+ }++ @media (max-width: $breakpoint-md) {+ > .sk-topbar { padding: 10px $space-3; }++ &__inner { padding: $space-4 $space-4 $space-8; }+ }+}+// Page Header (shared base).page-header {display: flex;diff --git a/frontend/src/styles/pages/_servers.scss b/frontend/src/styles/pages/_servers.scssindex c1d488c5..97d8b584 100644--- a/frontend/src/styles/pages/_servers.scss+++ b/frontend/src/styles/pages/_servers.scss@@ -2833,12 +2833,9 @@margin: 0;padding: $space-3;display: flex;- flex-direction: column; // top bar stacks above the ops workspace (redesign)+ flex-direction: column; // fills the shared tab-group content regionbackground: transparent;- // PageTopbar sits flush at the top of the full-bleed ops layout.- > .sk-topbar { padding-left: $space-2; padding-right: $space-2; margin-bottom: $space-3; }-.servers-ops-workspace {flex: 1;min-height: 0;