Skip to content

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

refactor: migrate pages to shared primitives and add lint guardrails

Juan Denise9083da18998
diff --git a/frontend/eslint.config.js b/frontend/eslint.config.js
index bb580128..3a30377c 100644
--- a/frontend/eslint.config.js
+++ b/frontend/eslint.config.js
@@ -32,6 +32,23 @@ export default [
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
'react/prop-types': 'off',
'no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+
+ // Discourage inline styles — prefer SCSS classes and shared components.
+ 'no-restricted-syntax': [
+ 'warn',
+ {
+ selector: 'JSXAttribute[name.name="style"]',
+ message: 'Inline styles are discouraged. Use SCSS classes or a shared primitive instead.',
+ },
+ {
+ selector: 'JSXOpeningElement[name.name="button"]',
+ message: 'Use the shared Button component (or IconButton for icon-only actions).',
+ },
+ {
+ selector: 'JSXOpeningElement[name.name="div"] > JSXAttribute[name.name="className"] > Literal[value=/\\bcard\\b/]',
+ message: 'Use the shared Card component instead of the legacy .card class.',
+ },
+ ],
},
settings: {
react: { version: 'detect' },
diff --git a/frontend/src/components/CopyButton.jsx b/frontend/src/components/CopyButton.jsx
new file mode 100644
index 00000000..4780d8ed
--- /dev/null
+++ b/frontend/src/components/CopyButton.jsx
@@ -0,0 +1,52 @@
+import React, { useState, useCallback } from 'react';
+import { Copy, Check } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { cn } from '@/lib/utils';
+
+/**
+ * Copy-to-clipboard button with built-in success feedback.
+ *
+ * <CopyButton value={apiKey} label="Copy API key" />
+ * <CopyButton value={command} size="sm" variant="outline">Copy</CopyButton>
+ */
+export function CopyButton({
+ value,
+ label = 'Copy',
+ copiedLabel = 'Copied!',
+ size = 'icon',
+ variant = 'ghost',
+ className,
+ children,
+ onCopy,
+ timeout = 2000,
+}) {
+ const [copied, setCopied] = useState(false);
+
+ const handleCopy = useCallback(async () => {
+ try {
+ await navigator.clipboard.writeText(String(value));
+ setCopied(true);
+ onCopy?.(value);
+ setTimeout(() => setCopied(false), timeout);
+ } catch {
+ // Ignore copy errors; caller can handle via onCopy if needed.
+ }
+ }, [value, onCopy, timeout]);
+
+ return (
+ <Button
+ type="button"
+ size={size}
+ variant={variant}
+ className={cn('copy-button', copied && 'is-copied', className)}
+ onClick={handleCopy}
+ aria-label={copied ? copiedLabel : label}
+ title={copied ? copiedLabel : label}
+ >
+ {copied ? <Check size={14} /> : <Copy size={14} />}
+ {children && <span className="copy-button__label">{copied ? copiedLabel : children}</span>}
+ </Button>
+ );
+}
+
+export default CopyButton;
diff --git a/frontend/src/components/ErrorState.jsx b/frontend/src/components/ErrorState.jsx
new file mode 100644
index 00000000..402b19d8
--- /dev/null
+++ b/frontend/src/components/ErrorState.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { AlertTriangle, RefreshCw } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+
+/**
+ * Consistent error state for pages and panels. Shows an icon, title, message,
+ * and optional retry action.
+ *
+ * <ErrorState
+ * title="Failed to load servers"
+ * message="The backend returned an error. Please try again."
+ * onRetry={loadData}
+ * />
+ */
+export function ErrorState({ title = 'Something went wrong', message, onRetry, className = '' }) {
+ return (
+ <div className={`sk-error-state ${className}`.trim()}>
+ <div className="sk-error-state__icon">
+ <AlertTriangle size={32} />
+ </div>
+ <h3 className="sk-error-state__title">{title}</h3>
+ {message && <p className="sk-error-state__message">{message}</p>}
+ {onRetry && (
+ <Button variant="outline" size="sm" onClick={onRetry}>
+ <RefreshCw size={14} /> Try again
+ </Button>
+ )}
+ </div>
+ );
+}
+
+export default ErrorState;
diff --git a/frontend/src/components/SearchFilterBar.jsx b/frontend/src/components/SearchFilterBar.jsx
new file mode 100644
index 00000000..8b6d1ca3
--- /dev/null
+++ b/frontend/src/components/SearchFilterBar.jsx
@@ -0,0 +1,97 @@
+import React from 'react';
+import { Search, X } from 'lucide-react';
+import { Input } from '@/components/ui/input';
+import { Button } from '@/components/ui/button';
+import { cn } from '@/lib/utils';
+
+/**
+ * Reusable search + filter + sort bar for list pages.
+ *
+ * <SearchFilterBar
+ * search={searchTerm}
+ * onSearch={setSearchTerm}
+ * filters={[
+ * { key: 'all', label: 'All' },
+ * { key: 'active', label: 'Active' },
+ * ]}
+ * activeFilter={filter}
+ * onFilterChange={setFilter}
+ * />
+ */
+export function SearchFilterBar({
+ search = '',
+ onSearch,
+ placeholder = 'Search...',
+ filters = [],
+ activeFilter,
+ onFilterChange,
+ sortOptions = [],
+ sort,
+ onSortChange,
+ className,
+}) {
+ return (
+ <div className={cn('sk-search-filter-bar', className)}>
+ <div className="sk-search-filter-bar__search">
+ <Search size={16} className="sk-search-filter-bar__search-icon" />
+ <Input
+ type="text"
+ value={search}
+ onChange={(e) => onSearch?.(e.target.value)}
+ placeholder={placeholder}
+ className="sk-search-filter-bar__input"
+ />
+ {search && (
+ <Button
+ type="button"
+ size="icon"
+ variant="ghost"
+ className="sk-search-filter-bar__clear"
+ onClick={() => onSearch?.('')}
+ aria-label="Clear search"
+ title="Clear search"
+ >
+ <X size={14} />
+ </Button>
+ )}
+ </div>
+
+ {filters.length > 0 && (
+ <div className="sk-search-filter-bar__filters" role="group" aria-label="Filters">
+ {filters.map((filter) => (
+ <button
+ key={filter.key}
+ type="button"
+ className={cn(
+ 'sk-search-filter-bar__chip',
+ activeFilter === filter.key && 'is-active'
+ )}
+ onClick={() => onFilterChange?.(filter.key)}
+ >
+ {filter.label}
+ {filter.count != null && (
+ <span className="sk-search-filter-bar__count">{filter.count}</span>
+ )}
+ </button>
+ ))}
+ </div>
+ )}
+
+ {sortOptions.length > 0 && (
+ <div className="sk-search-filter-bar__sort">
+ <select
+ value={sort}
+ onChange={(e) => onSortChange?.(e.target.value)}
+ aria-label="Sort by"
+ >
+ {sortOptions.map((option) => (
+ <option key={option.key} value={option.key}>{option.label}</option>
+ ))}
+ </select>
+ </div>
+ )}
+ </div>
+ );
+}
+
+export default SearchFilterBar;
diff --git a/frontend/src/pages/AgentFleet.jsx b/frontend/src/pages/AgentFleet.jsx
index 83bb8941..0d7fb06a 100644
--- a/frontend/src/pages/AgentFleet.jsx
+++ b/frontend/src/pages/AgentFleet.jsx
@@ -47,7 +47,7 @@ const AgentFleet = () => {
const [rolloutStrategy, setRolloutStrategy] = useState('all');
const [rolloutBatchSize, setRolloutBatchSize] = useState(5);
const [rolloutDelay, setRolloutDelay] = useState(10);
- const { addToast } = useToast();
+ const toast = useToast();
const { user } = useAuth();
useEffect(() => {
@@ -95,7 +95,7 @@ const AgentFleet = () => {
}
} catch (error) {
console.error('Error fetching fleet data:', error);
- addToast('Error', 'Failed to fetch fleet data', 'error');
+ toast.error('Failed to fetch fleet data');
} finally {
setLoading(false);
}
@@ -104,13 +104,13 @@ const AgentFleet = () => {
const startDiscovery = async () => {
setIsScanning(true);
try {
- addToast('Discovery', 'Scanning network for agents...', 'info');
+ toast.info('Scanning network for agents...');
await api.startDiscovery(10);
const data = await api.getDiscoveredAgents();
setDiscoveredAgents(data);
- addToast('Success', `Discovered ${data.length} agents`, 'success');
+ toast.success(`Discovered ${data.length} agents`);
} catch (error) {
- addToast('Error', 'Discovery scan failed', 'error');
+ toast.error('Discovery scan failed');
} finally {
setIsScanning(false);
}
@@ -119,33 +119,33 @@ const AgentFleet = () => {
const approveAgent = async (serverId) => {
try {
await api.approveRegistration(serverId);
- addToast('Success', 'Agent registration approved', 'success');
+ toast.success('Agent registration approved');
fetchData();
} catch (error) {
- addToast('Error', 'Failed to approve agent', 'error');
+ toast.error('Failed to approve agent');
}
};
const rejectAgent = async (serverId) => {
try {
await api.rejectRegistration(serverId);
- addToast('Success', 'Agent registration rejected', 'success');
+ toast.success('Agent registration rejected');
fetchData();
} catch (error) {
- addToast('Error', 'Failed to reject agent', 'error');
+ toast.error('Failed to reject agent');
}
};
const triggerUpgrade = async () => {
if (!selectedVersion) {
- addToast('Error', 'Select a target version', 'error');
+ toast.error('Select a target version');
return;
}
try {
if (rolloutStrategy === 'all') {
await api.upgradeFleet([], selectedVersion);
- addToast('Success', 'Upgrade triggered for all online agents', 'success');
+ toast.success('Upgrade triggered for all online agents');
} else {
const data = {
version_id: selectedVersion,
@@ -154,31 +154,31 @@ const AgentFleet = () => {
delay_minutes: rolloutDelay
};
await api.startRollout(data);
- addToast('Success', 'Staged rollout started', 'success');
+ toast.success('Staged rollout started');
}
fetchData();
} catch (error) {
- addToast('Error', 'Failed to trigger upgrade', 'error');
+ toast.error('Failed to trigger upgrade');
}
};
const cancelRollout = async (rolloutId) => {
try {
await api.cancelRollout(rolloutId);
- addToast('Success', 'Rollout cancelled', 'success');
+ toast.success('Rollout cancelled');
fetchData();
} catch (error) {
- addToast('Error', 'Failed to cancel rollout', 'error');
+ toast.error('Failed to cancel rollout');
}
};
const retryCommand = async (commandId) => {
try {
await api.retryCommand(commandId);
- addToast('Success', 'Command retry triggered', 'success');
+ toast.success('Command retry triggered');
fetchData();
} catch (error) {
- addToast('Error', 'Failed to retry command', 'error');
+ toast.error('Failed to retry command');
}
};
@@ -188,7 +188,7 @@ const AgentFleet = () => {
setDiagnostics(data);
setDiagnosticsServerId(serverId);
} catch (error) {
- addToast('Error', 'Failed to load diagnostics', 'error');
+ toast.error('Failed to load diagnostics');
}
};
diff --git a/frontend/src/pages/Applications.jsx b/frontend/src/pages/Applications.jsx
index 2060d4d8..835ec761 100644
--- a/frontend/src/pages/Applications.jsx
+++ b/frontend/src/pages/Applications.jsx
@@ -11,8 +11,8 @@ import { useConfirm } from '../hooks/useConfirm';
import { ConfirmDialog } from '../components/ConfirmDialog';
import { getServiceType, getStatusConfig } from '../utils/serviceTypes';
import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { PageTopbar, MetricCard, Pill, SegControl, Gauge } from '@/components/ds';
+import { PageTopbar, MetricCard, Pill, Gauge } from '@/components/ds';
+import SearchFilterBar from '../components/SearchFilterBar';
// statusInfo.dotClass → ds Pill kind
const STATUS_PILL = {
@@ -174,27 +174,18 @@ const Applications = () => {
<div className="apps-list-card">
<div className="apps-list-head">
- <SegControl
- value={statusFilter}
- onChange={setStatusFilter}
- options={[
- { value: 'all', label: 'All', count: stats.total },
- { value: 'running', label: 'Running', count: stats.running },
- { value: 'stopped', label: 'Stopped', count: stats.stopped },
+ <SearchFilterBar
+ search={searchTerm}
+ onSearch={setSearchTerm}
+ placeholder="Search apps..."
+ filters={[
+ { key: 'all', label: 'All', count: stats.total },
+ { key: 'running', label: 'Running', count: stats.running },
+ { key: 'stopped', label: 'Stopped', count: stats.stopped },
]}
+ activeFilter={statusFilter}
+ onFilterChange={setStatusFilter}
/>
- <div className="apps-search">
- <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
- <circle cx="11" cy="11" r="8"/>
- <line x1="21" y1="21" x2="16.65" y2="16.65"/>
- </svg>
- <Input
- type="text"
- placeholder="Search apps..."
- value={searchTerm}
- onChange={(e) => setSearchTerm(e.target.value)}
- />
- </div>
</div>
{filteredApps.length === 0 ? (
diff --git a/frontend/src/pages/CloudProvision.jsx b/frontend/src/pages/CloudProvision.jsx
index f4821488..c2d3f5e4 100644
--- a/frontend/src/pages/CloudProvision.jsx
+++ b/frontend/src/pages/CloudProvision.jsx
@@ -3,7 +3,7 @@ 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 PageLoader from '../components/PageLoader';
import ConfirmDialog from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
import { Button } from '@/components/ui/button';
@@ -101,7 +101,7 @@ const CloudProvision = () => {
return 'warning';
};
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
return (
<div className="sk-tabgroup__inner cloud-provision-page">
diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsx
index 64778ddd..e81b374a 100644
--- a/frontend/src/pages/DNSZones.jsx
+++ b/frontend/src/pages/DNSZones.jsx
@@ -4,7 +4,7 @@ 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 PageLoader from '../components/PageLoader';
import EmptyState from '../components/EmptyState';
import ConfirmDialog from '../components/ConfirmDialog';
import { Button } from '@/components/ui/button';
@@ -179,7 +179,7 @@ const DNSZones = () => {
[user?.is_admin],
);
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
return (
<div className="sk-tabgroup__inner dns-zones-page">
diff --git a/frontend/src/pages/Docker.jsx b/frontend/src/pages/Docker.jsx
index 5a8957bb..f358ed02 100644
--- a/frontend/src/pages/Docker.jsx
+++ b/frontend/src/pages/Docker.jsx
@@ -878,18 +878,21 @@ const ContainersTab = ({ onStatsChange }) => {
onChange={(e) => setSearchTerm(e.target.value)}
/>
{searchTerm && (
- <button className="lv-search-field-clear" onClick={() => setSearchTerm('')} title="Clear search">
+ <Button size="icon" variant="ghost" className="lv-search-field-clear" onClick={() => setSearchTerm('')} title="Clear search" aria-label="Clear search">
<X size={11} />
- </button>
+ </Button>
)}
</div>
- <button
+ <Button
+ size="icon"
+ variant="ghost"
className="lv-icon-btn"
onClick={loadContainers}
title="Refresh"
+ aria-label="Refresh containers"
>
<RefreshCw size={13} className={loading ? 'spinning' : ''} />
- </button>
+ </Button>
</div>
</div>
diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsx
index 8cdc9210..b3d2fdee 100644
--- a/frontend/src/pages/Domains.jsx
+++ b/frontend/src/pages/Domains.jsx
@@ -14,7 +14,7 @@ import { Checkbox } from '@/components/ui/checkbox';
import {
Select, SelectTrigger, SelectContent, SelectItem, SelectValue,
} from '@/components/ui/select';
-import { MetricCard, SegControl, Pill, Drawer } from '@/components/ds';
+import { MetricCard, SegControl, Pill, Drawer, DataTable } from '@/components/ds';
import { useTopbarActions } from '@/hooks/useTopbarActions';
import RegistrarPortfolio from '../components/domains/RegistrarPortfolio';
@@ -244,7 +244,7 @@ const Domains = () => {
{error && (
<div className="error-banner">
{error}
- <button onClick={() => setError('')} style={{ float: 'right', background: 'none', border: 'none', cursor: 'pointer' }}>×</button>
+ <button type="button" className="error-banner__close" onClick={() => setError('')} aria-label="Dismiss error">×</button>
</div>
)}
@@ -283,46 +283,58 @@ const Domains = () => {
<div className="dom-empty">No domains match this filter.</div>
) : (
<div className="dom-card">
- <table className="sk-dtable">
- <thead>
- <tr>
- <th>Domain</th>
- <th>Linked site</th>
- <th>SSL</th>
- <th>Auto-renew</th>
- <th>Status</th>
- <th style={{ width: 30 }} />
- </tr>
- </thead>
- <tbody>
- {shown.map(d => (
- <tr key={d.id} className="is-clickable" onClick={() => setDrawerDomain(d)}>
- <td>
- <div className="sk-cell-name">
- <span className="dom-fav"><Globe size={15} /></span>
- <span>
- {d.name}
- {d.is_primary && <span className="dom-primary">Primary</span>}
- </span>
- </div>
- </td>
- <td>
- {d.application_id
- ? <span className="sk-tag">{getAppName(d.application_id)}</span>
- : <span className="dom-dash">—</span>}
- </td>
- <td>{sslPill(d)}</td>
- <td>
- {d.ssl_enabled
- ? (d.ssl_auto_renew ? <Pill kind="green">on</Pill> : <Pill kind="gray">off</Pill>)
- : <span className="dom-dash">—</span>}
- </td>
- <td><Pill kind={d.ssl_enabled ? 'green' : 'amber'}>{d.ssl_enabled ? 'active' : 'unconfigured'}</Pill></td>
- <td><ChevronRight size={16} className="dom-chev" /></td>
- </tr>
- ))}
- </tbody>
- </table>
+ <DataTable
+ tableClassName="sk-dtable"
+ sortable={false}
+ data={shown}
+ keyField="id"
+ onRowClick={setDrawerDomain}
+ columns={[
+ {
+ key: 'name',
+ header: 'Domain',
+ render: (d) => (
+ <div className="sk-cell-name">
+ <span className="dom-fav"><Globe size={15} /></span>
+ <span>
+ {d.name}
+ {d.is_primary && <span className="dom-primary">Primary</span>}
+ </span>
+ </div>
+ ),
+ },
+ {
+ key: 'site',
+ header: 'Linked site',
+ render: (d) => (
+ d.application_id
+ ? <span className="sk-tag">{getAppName(d.application_id)}</span>
+ : <span className="dom-dash">—</span>
+ ),
+ },
+ { key: 'ssl', header: 'SSL', render: sslPill },
+ {
+ key: 'autoRenew',
+ header: 'Auto-renew',
+ render: (d) => (
+ d.ssl_enabled
+ ? (d.ssl_auto_renew ? <Pill kind="green">on</Pill> : <Pill kind="gray">off</Pill>)
+ : <span className="dom-dash">—</span>
+ ),
+ },
+ {
+ key: 'status',
+ header: 'Status',
+ render: (d) => <Pill kind={d.ssl_enabled ? 'green' : 'amber'}>{d.ssl_enabled ? 'active' : 'unconfigured'}</Pill>,
+ },
+ {
+ key: 'chevron',
+ header: '',
+ width: 30,
+ render: () => <ChevronRight size={16} className="dom-chev" />,
+ },
+ ]}
+ />
</div>
)}
</div>
diff --git a/frontend/src/pages/DynamicDns.jsx b/frontend/src/pages/DynamicDns.jsx
index a98f0473..5e8fe730 100644
--- a/frontend/src/pages/DynamicDns.jsx
+++ b/frontend/src/pages/DynamicDns.jsx
@@ -1,13 +1,14 @@
import { useState, useEffect, useCallback } from 'react';
-import { Network, Copy, Check, AlertTriangle } from 'lucide-react';
+import { Network, AlertTriangle } from 'lucide-react';
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
-import Spinner from '../components/Spinner';
+import PageLoader from '../components/PageLoader';
import EmptyState from '../components/EmptyState';
import ConfirmDialog from '../components/ConfirmDialog';
+import { FormField } from '../components/FormField';
+import CopyButton from '../components/CopyButton';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
import {
Select,
SelectTrigger,
@@ -18,22 +19,8 @@ import {
// One-time token callout — the token is only returned once on create/regenerate.
const TokenCallout = ({ host, onDismiss }) => {
- const toast = useToast();
- const [copied, setCopied] = useState(null);
-
const updateUrl = `${window.location.origin}/api/v1/ddns/update?token=${host.token}`;
- async function copy(text, key) {
- try {
- await navigator.clipboard.writeText(text);
- setCopied(key);
- toast.success('Copied to clipboard');
- setTimeout(() => setCopied(null), 1500);
- } catch {
- toast.error('Copy failed — copy it manually');
- }
- }
-
return (
<div className="ddns-token-callout">
<div className="ddns-token-callout__head">
@@ -49,17 +36,13 @@ const TokenCallout = ({ host, onDismiss }) => {
<div className="ddns-token-callout__row">
<span className="ddns-token-callout__label">Token</span>
<code className="ddns-token-callout__value">{host.token}</code>
- <Button variant="outline" size="sm" onClick={() => copy(host.token, 'token')}>
- {copied === 'token' ? <Check size={14} /> : <Copy size={14} />}
- </Button>
+ <CopyButton value={host.token} label="Copy token" size="sm" variant="outline" />
</div>
<div className="ddns-token-callout__row">
<span className="ddns-token-callout__label">Update URL</span>
<code className="ddns-token-callout__value">{updateUrl}</code>
- <Button variant="outline" size="sm" onClick={() => copy(updateUrl, 'url')}>
- {copied === 'url' ? <Check size={14} /> : <Copy size={14} />}
- </Button>
+ <CopyButton value={updateUrl} label="Copy URL" size="sm" variant="outline" />
</div>
</div>
);
@@ -148,7 +131,7 @@ const DynamicDns = () => {
}
}
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
return (
<div className="sk-tabgroup__inner ddns-page">
@@ -165,10 +148,9 @@ const DynamicDns = () => {
update URL. The token is shown once after creation.
</p>
- <div className="form-group">
- <Label>Zone</Label>
+ <FormField label="Zone">
<Select value={form.zone_id} onValueChange={(v) => setForm({ ...form, zone_id: v })}>
- <SelectTrigger>
+ <SelectTrigger id="ddns-zone">
<SelectValue placeholder={zones.length ? 'Select a zone' : 'No zones available'} />
</SelectTrigger>
<SelectContent>
@@ -177,25 +159,25 @@ const DynamicDns = () => {
))}
</SelectContent>
</Select>
- </div>
+ </FormField>
- <div className="form-group">
- <Label>Record name</Label>
+ <FormField label="Record name" htmlFor="ddns-record">
<Input
+ id="ddns-record"
value={form.record_name}
onChange={(e) => setForm({ ...form, record_name: e.target.value })}
placeholder="home (or @ for the apex)"
/>
- </div>
+ </FormField>
- <div className="form-group">
- <Label>Label (optional)</Label>
+ <FormField label="Label (optional)" htmlFor="ddns-label" hint="e.g. Home office router">
<Input
+ id="ddns-label"
value={form.label}
onChange={(e) => setForm({ ...form, label: e.target.value })}
placeholder="e.g. Home office router"
/>
- </div>
+ </FormField>
<Button onClick={handleCreate} disabled={creating || zones.length === 0}>
{creating ? 'Creating…' : 'Create host'}
diff --git a/frontend/src/pages/FleetMonitor.jsx b/frontend/src/pages/FleetMonitor.jsx
index 0a70052c..a79829d3 100644
--- a/frontend/src/pages/FleetMonitor.jsx
+++ b/frontend/src/pages/FleetMonitor.jsx
@@ -52,7 +52,7 @@ const heatColor = (value) => {
const FleetMonitor = () => {
const [activeTab, setActiveTab] = useState('overview');
const [loading, setLoading] = useState(true);
- const { addToast } = useToast();
+ const toast = useToast();
// Publish the Refresh button to the shared tab-group top bar; re-registers
// on `loading` so the spinner/disabled state stays in sync.
@@ -142,7 +142,7 @@ const FleetMonitor = () => {
const data = await api.getFleetComparison(selectedServers, compMetric, compPeriod);
setCompData(data);
} catch (e) {
- addToast('Error', 'Failed to load comparison data', 'error');
+ toast.error('Failed to load comparison data');
} finally {
setLoading(false);
}
@@ -153,7 +153,7 @@ const FleetMonitor = () => {
const data = await api.getCapacityForecast(serverId || forecastServer, forecastMetric);
setForecast(data);
} catch (e) {
- addToast('Error', 'Failed to load forecast', 'error');
+ toast.error('Failed to load forecast');
}
};
@@ -164,7 +164,7 @@ const FleetMonitor = () => {
const data = await api.searchFleet(searchQuery, searchType);
setSearchResults(data);
} catch (e) {
- addToast('Error', 'Search failed', 'error');
+ toast.error('Search failed');
} finally {
setLoading(false);
}
@@ -175,7 +175,7 @@ const FleetMonitor = () => {
await api.acknowledgeFleetAlert(id);
fetchTabData();
} catch (e) {
- addToast('Error', 'Failed to acknowledge alert', 'error');
+ toast.error('Failed to acknowledge alert');
}
};
@@ -184,17 +184,17 @@ const FleetMonitor = () => {
await api.resolveFleetAlert(id);
fetchTabData();
} catch (e) {
- addToast('Error', 'Failed to resolve alert', 'error');
+ toast.error('Failed to resolve alert');
}
};
const saveThreshold = async () => {
try {
await api.createFleetThreshold(newThreshold);
- addToast('Success', 'Threshold saved', 'success');
+ toast.success('Threshold saved');
fetchTabData();
} catch (e) {
- addToast('Error', 'Failed to save threshold', 'error');
+ toast.error('Failed to save threshold');
}
};
@@ -203,7 +203,7 @@ const FleetMonitor = () => {
await api.deleteFleetThreshold(id);
fetchTabData();
} catch (e) {
- addToast('Error', 'Failed to delete threshold', 'error');
+ toast.error('Failed to delete threshold');
}
};
@@ -239,7 +239,7 @@ const FleetMonitor = () => {
a.click();
URL.revokeObjectURL(url);
} catch (e) {
- addToast('Error', 'Export failed', 'error');
+ toast.error('Export failed');
}
};
diff --git a/frontend/src/pages/Marketplace.jsx b/frontend/src/pages/Marketplace.jsx
index 7838d165..1ef883b1 100644
--- a/frontend/src/pages/Marketplace.jsx
+++ b/frontend/src/pages/Marketplace.jsx
@@ -22,7 +22,7 @@ import {
} from 'lucide-react';
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
-import Spinner from '../components/Spinner';
+import PageLoader from '../components/PageLoader';
import EmptyState from '../components/EmptyState';
import { StatStrip, Stat } from '../components/StatCard';
import { Button } from '@/components/ui/button';
@@ -269,7 +269,7 @@ const Marketplace = () => {
[],
);
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
const installedIds = new Set(myExtensions.map((extension) => String(extension.extension_id)));
const localCatalogEntries = builtins.map(getLocalCatalogEntry);
diff --git a/frontend/src/pages/ServerTemplates.jsx b/frontend/src/pages/ServerTemplates.jsx
index a9ff7f38..e0dd1435 100644
--- a/frontend/src/pages/ServerTemplates.jsx
+++ b/frontend/src/pages/ServerTemplates.jsx
@@ -3,7 +3,7 @@ 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 PageLoader from '../components/PageLoader';
import ConfirmDialog from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
import { LayoutTemplate } from 'lucide-react';
@@ -134,7 +134,7 @@ const ServerTemplates = () => {
[user?.is_admin]
);
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
return (
<div className="sk-tabgroup__inner server-templates-page">
diff --git a/frontend/src/pages/Servers.jsx b/frontend/src/pages/Servers.jsx
index 7acee396..4dc28a5b 100644
--- a/frontend/src/pages/Servers.jsx
+++ b/frontend/src/pages/Servers.jsx
@@ -17,6 +17,7 @@ import { ConfirmDialog } from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
+import { DataTable } from '@/components/ds';
const Servers = () => {
const [servers, setServers] = useState([]);
@@ -284,9 +285,9 @@ const Servers = () => {
<Folder size={14} />
Groups
</span>
- <button type="button" onClick={() => setShowGroupModal(true)}>
+ <Button type="button" variant="ghost" size="sm" onClick={() => setShowGroupModal(true)}>
Manage
- </button>
+ </Button>
</div>
<div className="servers-group-nav">
{groupFilters.map(filter => (
@@ -339,8 +340,10 @@ const Servers = () => {
<strong>{filteredServers.length}</strong>
<span>{filteredServers.length === 1 ? 'server' : 'servers'}</span>
{hasActiveFilters && (
- <button
+ <Button
type="button"
+ variant="ghost"
+ size="sm"
className="servers-clear-filters"
onClick={() => {
setSelectedGroup('all');
@@ -349,7 +352,7 @@ const Servers = () => {
}}
>
Clear filters
- </button>
+ </Button>
)}
</div>
</div>
@@ -398,41 +401,41 @@ const Servers = () => {
/>
) : (
<div className="servers-table-wrap">
- <table className="servers-table">
- <thead>
- <tr>
- <th className="col-check">
- <input
- type="checkbox"
- aria-label="Select all visible servers"
- checked={allVisibleSelected}
- ref={el => { if (el) el.indeterminate = someVisibleSelected && !allVisibleSelected; }}
- onChange={() => toggleSelectAll(visibleIds)}
- />
- </th>
- <th>Server</th>
- <th>Status</th>
- <th>Group</th>
- <th>OS · Agent</th>
- <th>Telemetry</th>
- <th>Last seen</th>
- <th className="col-actions" aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {filteredServers.map(server => (
- <ServerRow
- key={server.id}
- server={server}
- selected={selectedIds.has(server.id)}
- onToggle={() => toggleSelect(server.id)}
- onPing={() => handlePingServer(server.id)}
- onDelete={() => setDeleteTarget(server)}
- onCopyInstall={() => handleCopyInstall(server)}
+ <DataTable
+ tableClassName="servers-table"
+ sortable={false}
+ columns={[
+ { key: 'select', header: (
+ <input
+ type="checkbox"
+ aria-label="Select all visible servers"
+ checked={allVisibleSelected}
+ ref={el => { if (el) el.indeterminate = someVisibleSelected && !allVisibleSelected; }}
+ onChange={() => toggleSelectAll(visibleIds)}
/>
- ))}
- </tbody>
- </table>
+ ), className: 'col-check' },
+ { key: 'server', header: 'Server' },
+ { key: 'status', header: 'Status' },
+ { key: 'group', header: 'Group' },
+ { key: 'os', header: 'OS · Agent' },
+ { key: 'telemetry', header: 'Telemetry' },
+ { key: 'lastSeen', header: 'Last seen' },
+ { key: 'actions', header: '', className: 'col-actions' },
+ ]}
+ data={filteredServers}
+ keyField="id"
+ renderRow={(server, { key }) => (
+ <ServerRow
+ key={key}
+ server={server}
+ selected={selectedIds.has(server.id)}
+ onToggle={() => toggleSelect(server.id)}
+ onPing={() => handlePingServer(server.id)}
+ onDelete={() => setDeleteTarget(server)}
+ onCopyInstall={() => handleCopyInstall(server)}
+ />
+ )}
+ />
</div>
)}
</main>
@@ -495,7 +498,7 @@ const formatLastSeen = (timestamp) => {
const clamp = (v) => Math.min(100, Math.max(0, Number(v) || 0));
-const ServerRow = ({ server, selected, onToggle, onPing, onDelete, onCopyInstall }) => {
+const ServerRow = ({ server, selected, onToggle, onPing, onDelete, onCopyInstall, className = '', onClick }) => {
const [menuPos, setMenuPos] = useState(null);
const triggerRef = useRef(null);
const menuRef = useRef(null);
@@ -546,7 +549,10 @@ const ServerRow = ({ server, selected, onToggle, onPing, onDelete, onCopyInstall
const hasMetrics = server.metrics && status === 'online';
return (
- <tr className={`server-row server-row--${status} ${selected ? 'is-selected' : ''}`}>
+ <tr
+ className={`server-row server-row--${status} ${selected ? 'is-selected' : ''} ${className}`.trim()}
+ onClick={onClick}
+ >
<td className="col-check">
<input
type="checkbox"
diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsx
index 108261f0..7432709a 100644
--- a/frontend/src/pages/StatusPages.jsx
+++ b/frontend/src/pages/StatusPages.jsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { useAuth } from '../contexts/AuthContext';
-import Spinner from '../components/Spinner';
+import PageLoader from '../components/PageLoader';
import ConfirmDialog from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
import { Button } from '@/components/ui/button';
@@ -317,7 +317,7 @@ const StatusPages = () => {
[isAdmin]
);
- if (loading) return <div className="sk-tabgroup__inner"><Spinner /></div>;
+ if (loading) return <PageLoader />;
return (
<div className="sk-tabgroup__inner status-pages-page">
diff --git a/frontend/src/pages/Terminal.jsx b/frontend/src/pages/Terminal.jsx
index fec494e2..5761267e 100644
--- a/frontend/src/pages/Terminal.jsx
+++ b/frontend/src/pages/Terminal.jsx
@@ -12,7 +12,6 @@ import LogContent from '../components/log-viewer/LogContent';
import { formatBytes, logKindFromPath } from '../components/log-viewer/logHelpers';
import { Pill, PageTopbar } from '../components/ds';
import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
import {
FileText, Clock, AlertCircle, Search, X, RefreshCw, AlertTriangle, Activity,
Play, Square, RotateCw, Terminal as TerminalIcon, Server as ServerIcon,
@@ -1012,9 +1011,9 @@ const ProcessesTab = () => {
<span className={`lv-pulse ${autoRefresh ? 'on' : ''}`} />
<span>Live</span>
</button>
- <button className="lv-icon-btn" onClick={() => loadProcesses()} title="Refresh">
+ <Button size="icon" variant="ghost" className="lv-icon-btn" onClick={() => loadProcesses()} title="Refresh" aria-label="Refresh processes">
<RefreshCw size={13} className={loading ? 'spinning' : ''} />
- </button>
+ </Button>
</div>
</div>