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 remaining tables/forms and clean Terminal inline styles

Juan Denis58b6b831c125
diff --git a/frontend/src/pages/Backups.jsx b/frontend/src/pages/Backups.jsx
index 801ebab0..6d158037 100644
--- a/frontend/src/pages/Backups.jsx
+++ b/frontend/src/pages/Backups.jsx
@@ -6,6 +6,7 @@ import { useToast } from '../contexts/ToastContext';
import { useConfirm } from '../hooks/useConfirm';
import { ConfirmDialog } from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
+import { FormField, FormRow } from '../components/FormField';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Textarea } from '@/components/ui/textarea';
@@ -649,8 +650,7 @@ const Backups = () => {
</div>
<div className="card-body">
<form onSubmit={handleSaveStorageConfig}>
- <div className="form-group">
- <label>Storage Provider</label>
+ <FormField label="Storage Provider" hint="S3-Compatible works with AWS S3, MinIO and Wasabi.">
<SegControl
value={storageForm.provider}
onChange={(provider) => setStorageForm({...storageForm, provider})}
@@ -660,137 +660,136 @@ const Backups = () => {
{ value: 'b2', label: 'Backblaze B2' },
]}
/>
- <span className="form-help">S3-Compatible works with AWS S3, MinIO and Wasabi.</span>
- </div>
+ </FormField>
{storageForm.provider === 's3' && (
<div className="storage-provider-config">
<h4>S3-Compatible Storage</h4>
- <div className="form-row">
- <div className="form-group">
- <label>Bucket Name</label>
+ <FormRow>
+ <FormField label="Bucket Name" htmlFor="s3-bucket">
<Input
+ id="s3-bucket"
type="text"
value={storageForm.s3.bucket}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, bucket: e.target.value}})}
placeholder="my-backup-bucket"
required
/>
- </div>
- <div className="form-group">
- <label>Region</label>
+ </FormField>
+ <FormField label="Region" htmlFor="s3-region">
<Input
+ id="s3-region"
type="text"
value={storageForm.s3.region}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, region: e.target.value}})}
placeholder="us-east-1"
/>
- </div>
- </div>
- <div className="form-row">
- <div className="form-group">
- <label>Access Key</label>
+ </FormField>
+ </FormRow>
+ <FormRow>
+ <FormField label="Access Key" htmlFor="s3-access-key">
<Input
+ id="s3-access-key"
type="text"
value={storageForm.s3.access_key}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, access_key: e.target.value}})}
placeholder="AKIA..."
required
/>
- </div>
- <div className="form-group">
- <label>Secret Key</label>
+ </FormField>
+ <FormField label="Secret Key" htmlFor="s3-secret-key">
<Input
+ id="s3-secret-key"
type="password"
value={storageForm.s3.secret_key}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, secret_key: e.target.value}})}
required
/>
- </div>
- </div>
- <div className="form-row">
- <div className="form-group">
- <label>Custom Endpoint URL <span className="form-help-inline">(optional, for MinIO/Wasabi)</span></label>
+ </FormField>
+ </FormRow>
+ <FormRow>
+ <FormField label="Custom Endpoint URL" htmlFor="s3-endpoint" hint="Optional, for MinIO/Wasabi">
<Input
+ id="s3-endpoint"
type="text"
value={storageForm.s3.endpoint_url}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, endpoint_url: e.target.value}})}
placeholder="https://s3.example.com"
/>
- </div>
- <div className="form-group">
- <label>Path Prefix</label>
+ </FormField>
+ <FormField label="Path Prefix" htmlFor="s3-path-prefix">
<Input
+ id="s3-path-prefix"
type="text"
value={storageForm.s3.path_prefix}
onChange={(e) => setStorageForm({...storageForm, s3: {...storageForm.s3, path_prefix: e.target.value}})}
placeholder="serverkit-backups"
/>
- </div>
- </div>
+ </FormField>
+ </FormRow>
</div>
)}
{storageForm.provider === 'b2' && (
<div className="storage-provider-config">
<h4>Backblaze B2</h4>
- <div className="form-row">
- <div className="form-group">
- <label>Bucket Name</label>
+ <FormRow>
+ <FormField label="Bucket Name" htmlFor="b2-bucket">
<Input
+ id="b2-bucket"
type="text"
value={storageForm.b2.bucket}
onChange={(e) => setStorageForm({...storageForm, b2: {...storageForm.b2, bucket: e.target.value}})}
placeholder="my-backup-bucket"
required
/>
- </div>
- <div className="form-group">
- <label>S3-Compatible Endpoint URL</label>
+ </FormField>
+ <FormField label="S3-Compatible Endpoint URL" htmlFor="b2-endpoint">
<Input
+ id="b2-endpoint"
type="text"
value={storageForm.b2.endpoint_url}
onChange={(e) => setStorageForm({...storageForm, b2: {...storageForm.b2, endpoint_url: e.target.value}})}
placeholder="https://s3.us-west-004.backblazeb2.com"
required
/>
- </div>
- </div>
- <div className="form-row">
- <div className="form-group">
- <label>Application Key ID</label>
+ </FormField>
+ </FormRow>
+ <FormRow>
+ <FormField label="Application Key ID" htmlFor="b2-key-id">
<Input
+ id="b2-key-id"
type="text"
value={storageForm.b2.key_id}
onChange={(e) => setStorageForm({...storageForm, b2: {...storageForm.b2, key_id: e.target.value}})}
required
/>
- </div>
- <div className="form-group">
- <label>Application Key</label>
+ </FormField>
+ <FormField label="Application Key" htmlFor="b2-app-key">
<Input
+ id="b2-app-key"
type="password"
value={storageForm.b2.application_key}
onChange={(e) => setStorageForm({...storageForm, b2: {...storageForm.b2, application_key: e.target.value}})}
required
/>
- </div>
- </div>
- <div className="form-group">
- <label>Path Prefix</label>
+ </FormField>
+ </FormRow>
+ <FormField label="Path Prefix" htmlFor="b2-path-prefix">
<Input
+ id="b2-path-prefix"
type="text"
value={storageForm.b2.path_prefix}
onChange={(e) => setStorageForm({...storageForm, b2: {...storageForm.b2, path_prefix: e.target.value}})}
placeholder="serverkit-backups"
/>
- </div>
+ </FormField>
</div>
)}
{storageForm.provider !== 'local' && (
<>
- <div className="form-group">
+ <FormField>
<label className="checkbox-label">
<input
type="checkbox"
@@ -799,9 +798,9 @@ const Backups = () => {
/>
<span>Auto-upload new backups to remote storage</span>
</label>
- </div>
+ </FormField>
- <div className="form-group">
+ <FormField>
<label className="checkbox-label">
<input
type="checkbox"
@@ -810,7 +809,7 @@ const Backups = () => {
/>
<span>Keep local copy after uploading</span>
</label>
- </div>
+ </FormField>
</>
)}
@@ -845,7 +844,7 @@ const Backups = () => {
</div>
<div className="card-body">
<form onSubmit={handleSaveConfig}>
- <div className="form-group">
+ <FormField>
<label className="checkbox-label">
<input
type="checkbox"
@@ -854,19 +853,18 @@ const Backups = () => {
/>
<span>Enable Scheduled Backups</span>
</label>
- </div>
+ </FormField>
- <div className="form-group">
- <label>Retention Period (days)</label>
+ <FormField label="Retention Period (days)" htmlFor="retention-days" hint="Backups older than this will be deleted during cleanup">
<Input
+ id="retention-days"
type="number"
value={configForm.retention_days}
onChange={(e) => setConfigForm({...configForm, retention_days: parseInt(e.target.value)})}
min="1"
max="365"
/>
- <span className="form-help">Backups older than this will be deleted during cleanup</span>
- </div>
+ </FormField>
<div className="form-actions">
<Button type="submit">Save Settings</Button>
diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsx
index e81b374a..f2ed1710 100644
--- a/frontend/src/pages/DNSZones.jsx
+++ b/frontend/src/pages/DNSZones.jsx
@@ -7,9 +7,10 @@ import { useAuth } from '../contexts/AuthContext';
import PageLoader from '../components/PageLoader';
import EmptyState from '../components/EmptyState';
import ConfirmDialog from '../components/ConfirmDialog';
+import { FormField, FormRow } from '../components/FormField';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
+import { DataTable } from '@/components/ds';
import {
Select,
SelectTrigger,
@@ -215,37 +216,34 @@ const DNSZones = () => {
)}
</div>
</div>
- <table className="sk-dtable dns-records-table">
- <thead>
- <tr>
- <th>Type</th>
- <th>Name</th>
- <th>Content</th>
- <th>TTL</th>
- <th>Priority</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- {records.map(rec => (
- <tr key={rec.id}>
- <td><span className={`dns-rtype dns-rtype--${(rec.record_type || '').toLowerCase()}`}>{rec.record_type}</span></td>
- <td>{rec.name}</td>
- <td className="sk-cell-mono">{rec.content}</td>
- <td>{rec.ttl}</td>
- <td>{rec.priority || '-'}</td>
- <td>
- {user?.is_admin && (
- <Button variant="destructive" size="sm" onClick={() => handleDeleteRecord(rec.id)}>Delete</Button>
- )}
- </td>
- </tr>
- ))}
- {records.length === 0 && (
- <tr><td colSpan={6} className="text-center text-muted">No records</td></tr>
- )}
- </tbody>
- </table>
+ <DataTable
+ tableClassName="sk-dtable dns-records-table"
+ sortable={false}
+ data={records}
+ keyField="id"
+ emptyTitle="No records"
+ emptyMessage="This zone has no DNS records yet."
+ columns={[
+ {
+ key: 'type',
+ header: 'Type',
+ render: (rec) => <span className={`dns-rtype dns-rtype--${(rec.record_type || '').toLowerCase()}`}>{rec.record_type}</span>,
+ },
+ { key: 'name', header: 'Name' },
+ { key: 'content', header: 'Content', render: (rec) => <span className="sk-cell-mono">{rec.content}</span> },
+ { key: 'ttl', header: 'TTL' },
+ { key: 'priority', header: 'Priority', render: (rec) => rec.priority || '-' },
+ {
+ key: 'actions',
+ header: '',
+ render: (rec) => (
+ user?.is_admin && (
+ <Button variant="destructive" size="sm" onClick={() => handleDeleteRecord(rec.id)}>Delete</Button>
+ )
+ ),
+ },
+ ]}
+ />
</div>
)}
</div>
@@ -258,14 +256,12 @@ const DNSZones = () => {
<button className="modal-close" onClick={() => setShowCreateZone(false)}>&times;</button>
</div>
<div className="modal-body">
- <div className="form-group">
- <Label>Domain</Label>
- <Input value={zoneForm.domain} onChange={e => setZoneForm({...zoneForm, domain: e.target.value})} placeholder="example.com" />
- </div>
- <div className="form-group">
- <Label>Provider</Label>
+ <FormField label="Domain" htmlFor="zone-domain">
+ <Input id="zone-domain" value={zoneForm.domain} onChange={e => setZoneForm({...zoneForm, domain: e.target.value})} placeholder="example.com" />
+ </FormField>
+ <FormField label="Provider">
<Select value={zoneForm.provider} onValueChange={v => setZoneForm({...zoneForm, provider: v})}>
- <SelectTrigger>
+ <SelectTrigger id="zone-provider">
<SelectValue />
</SelectTrigger>
<SelectContent>
@@ -275,7 +271,7 @@ const DNSZones = () => {
<SelectItem value="digitalocean">DigitalOcean</SelectItem>
</SelectContent>
</Select>
- </div>
+ </FormField>
{zoneForm.provider !== 'manual' && (() => {
const cfg = PROVIDER_CONFIG[zoneForm.provider];
return (
@@ -283,19 +279,16 @@ const DNSZones = () => {
{cfg.helpText && (
<p className="text-muted text-sm">{cfg.helpText}</p>
)}
- <div className="form-group">
- <Label>{cfg.zoneLabel}</Label>
- <Input value={zoneForm.provider_zone_id} onChange={e => setZoneForm({...zoneForm, provider_zone_id: e.target.value})} placeholder={cfg.zonePlaceholder} />
- </div>
- <div className="form-group">
- <Label>{cfg.tokenLabel}</Label>
- <Input type="password" value={zoneForm.api_token} onChange={e => setZoneForm({...zoneForm, api_token: e.target.value})} placeholder={cfg.tokenPlaceholder} />
- </div>
+ <FormField label={cfg.zoneLabel} htmlFor="zone-provider-zone-id">
+ <Input id="zone-provider-zone-id" value={zoneForm.provider_zone_id} onChange={e => setZoneForm({...zoneForm, provider_zone_id: e.target.value})} placeholder={cfg.zonePlaceholder} />
+ </FormField>
+ <FormField label={cfg.tokenLabel} htmlFor="zone-api-token">
+ <Input id="zone-api-token" type="password" value={zoneForm.api_token} onChange={e => setZoneForm({...zoneForm, api_token: e.target.value})} placeholder={cfg.tokenPlaceholder} />
+ </FormField>
{cfg.extraFields?.map(field => (
- <div className="form-group" key={field.key}>
- <Label>{field.label}</Label>
- <Input type={field.type} value={zoneForm[field.key] || ''} onChange={e => setZoneForm({...zoneForm, [field.key]: e.target.value})} placeholder={field.placeholder} />
- </div>
+ <FormField key={field.key} label={field.label} htmlFor={`zone-${field.key}`}>
+ <Input id={`zone-${field.key}`} type={field.type} value={zoneForm[field.key] || ''} onChange={e => setZoneForm({...zoneForm, [field.key]: e.target.value})} placeholder={field.placeholder} />
+ </FormField>
))}
</>
);
@@ -317,37 +310,32 @@ const DNSZones = () => {
<button className="modal-close" onClick={() => setShowCreateRecord(false)}>&times;</button>
</div>
<div className="modal-body">
- <div className="form-group">
- <Label>Type</Label>
+ <FormField label="Type">
<Select value={recordForm.record_type} onValueChange={v => setRecordForm({...recordForm, record_type: v})}>
- <SelectTrigger>
+ <SelectTrigger id="record-type">
<SelectValue />
</SelectTrigger>
<SelectContent>
{RECORD_TYPES.map(t => <SelectItem key={t} value={t}>{t}</SelectItem>)}
</SelectContent>
</Select>
- </div>
- <div className="form-group">
- <Label>Name</Label>
- <Input value={recordForm.name} onChange={e => setRecordForm({...recordForm, name: e.target.value})} placeholder="@ or subdomain" />
- </div>
- <div className="form-group">
- <Label>Content</Label>
- <Input value={recordForm.content} onChange={e => setRecordForm({...recordForm, content: e.target.value})} placeholder="IP address or hostname" />
- </div>
- <div className="form-row">
- <div className="form-group">
- <Label>TTL</Label>
- <Input type="number" value={recordForm.ttl} onChange={e => setRecordForm({...recordForm, ttl: parseInt(e.target.value) || 3600})} />
- </div>
+ </FormField>
+ <FormField label="Name" htmlFor="record-name">
+ <Input id="record-name" value={recordForm.name} onChange={e => setRecordForm({...recordForm, name: e.target.value})} placeholder="@ or subdomain" />
+ </FormField>
+ <FormField label="Content" htmlFor="record-content">
+ <Input id="record-content" value={recordForm.content} onChange={e => setRecordForm({...recordForm, content: e.target.value})} placeholder="IP address or hostname" />
+ </FormField>
+ <FormRow>
+ <FormField label="TTL" htmlFor="record-ttl">
+ <Input id="record-ttl" type="number" value={recordForm.ttl} onChange={e => setRecordForm({...recordForm, ttl: parseInt(e.target.value) || 3600})} />
+ </FormField>
{(recordForm.record_type === 'MX' || recordForm.record_type === 'SRV') && (
- <div className="form-group">
- <Label>Priority</Label>
- <Input type="number" value={recordForm.priority || ''} onChange={e => setRecordForm({...recordForm, priority: parseInt(e.target.value) || null})} />
- </div>
+ <FormField label="Priority" htmlFor="record-priority">
+ <Input id="record-priority" type="number" value={recordForm.priority || ''} onChange={e => setRecordForm({...recordForm, priority: parseInt(e.target.value) || null})} />
+ </FormField>
)}
- </div>
+ </FormRow>
</div>
<div className="modal-footer">
<Button variant="outline" onClick={() => setShowCreateRecord(false)}>Cancel</Button>
diff --git a/frontend/src/pages/DynamicDns.jsx b/frontend/src/pages/DynamicDns.jsx
index 5e8fe730..bca18d2a 100644
--- a/frontend/src/pages/DynamicDns.jsx
+++ b/frontend/src/pages/DynamicDns.jsx
@@ -7,6 +7,7 @@ import EmptyState from '../components/EmptyState';
import ConfirmDialog from '../components/ConfirmDialog';
import { FormField } from '../components/FormField';
import CopyButton from '../components/CopyButton';
+import { DataTable } from '@/components/ds';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import {
@@ -189,56 +190,55 @@ const DynamicDns = () => {
{/* Hosts table */}
<div className="ddns-hosts">
- <table className="sk-dtable ddns-hosts__table">
- <thead>
- <tr>
- <th>Hostname</th>
- <th>Last IP</th>
- <th>Last update</th>
- <th>Status</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- {hosts.map((host) => (
- <tr key={host.id}>
- <td>
- <div className="ddns-hosts__name">
- <strong>{host.hostname || host.record_name}</strong>
- {host.label && <span className="text-muted">{host.label}</span>}
- </div>
- </td>
- <td className="sk-cell-mono">{host.last_ip || '—'}</td>
- <td>
- {host.last_update_at
- ? new Date(host.last_update_at).toLocaleString()
- : 'Never'}
- </td>
- <td>
+ <DataTable
+ tableClassName="sk-dtable ddns-hosts__table"
+ sortable={false}
+ data={hosts}
+ keyField="id"
+ emptyState={<EmptyState icon={Network} title="No dynamic DNS hosts yet" />}
+ columns={[
+ {
+ key: 'hostname',
+ header: 'Hostname',
+ render: (host) => (
+ <div className="ddns-hosts__name">
+ <strong>{host.hostname || host.record_name}</strong>
+ {host.label && <span className="text-muted">{host.label}</span>}
+ </div>
+ ),
+ },
+ { key: 'lastIp', header: 'Last IP', render: (host) => <span className="sk-cell-mono">{host.last_ip || '—'}</span> },
+ {
+ key: 'lastUpdate',
+ header: 'Last update',
+ render: (host) => (host.last_update_at ? new Date(host.last_update_at).toLocaleString() : 'Never'),
+ },
+ {
+ key: 'status',
+ header: 'Status',
+ render: (host) => (
+ <>
<span className={`status-dot status-dot--${host.enabled ? 'success' : 'danger'}`} />
{host.enabled ? 'Enabled' : 'Disabled'}
- </td>
- <td>
- <div className="ddns-hosts__actions">
- <Button variant="outline" size="sm" onClick={() => handleRegenerate(host)}>
- Regenerate token
- </Button>
- <Button variant="destructive" size="sm" onClick={() => setDeleteConfirm(host)}>
- Delete
- </Button>
- </div>
- </td>
- </tr>
- ))}
- {hosts.length === 0 && (
- <tr>
- <td colSpan={5}>
- <EmptyState icon={Network} title="No dynamic DNS hosts yet" />
- </td>
- </tr>
- )}
- </tbody>
- </table>
+ </>
+ ),
+ },
+ {
+ key: 'actions',
+ header: '',
+ render: (host) => (
+ <div className="ddns-hosts__actions">
+ <Button variant="outline" size="sm" onClick={() => handleRegenerate(host)}>
+ Regenerate token
+ </Button>
+ <Button variant="destructive" size="sm" onClick={() => setDeleteConfirm(host)}>
+ Delete
+ </Button>
+ </div>
+ ),
+ },
+ ]}
+ />
</div>
</div>
diff --git a/frontend/src/pages/Email.jsx b/frontend/src/pages/Email.jsx
index 9070ee01..be602e26 100644
--- a/frontend/src/pages/Email.jsx
+++ b/frontend/src/pages/Email.jsx
@@ -9,7 +9,7 @@ import ConfirmDialog from '../components/ConfirmDialog';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
-import { Pill, MetricCard, PageTopbar } from '@/components/ds';
+import { Pill, MetricCard, PageTopbar, DataTable } from '@/components/ds';
const VALID_TABS = ['status', 'domains', 'accounts', 'aliases', 'forwarding', 'dns-providers', 'spam', 'webmail', 'queue'];
@@ -598,45 +598,45 @@ function Email() {
<EmptyState icon={Globe} title="No domains configured" />
) : (
<div className="email-table-card">
- <table className="sk-dtable">
- <thead>
- <tr>
- <th>Domain</th>
- <th>Mailboxes</th>
- <th>Aliases</th>
- <th>DKIM</th>
- <th>SPF</th>
- <th>DMARC</th>
- <th>Status</th>
- <th />
- </tr>
- </thead>
- <tbody>
- {domains.map(d => (
- <tr key={d.id}>
- <td>
- <div className="sk-cell-name">
- <span className="email-fav"><Globe size={15} /></span>
- {d.name}
- </div>
- </td>
- <td className="sk-cell-mono">{d.accounts_count}</td>
- <td className="sk-cell-mono">{d.aliases_count}</td>
- <td>{dnsPill(d.dkim_public_key)}</td>
- <td>{dnsPill(d.spf_record)}</td>
- <td>{dnsPill(d.dmarc_record)}</td>
- <td><Pill kind={d.is_active ? 'green' : 'gray'}>{d.is_active ? 'active' : 'inactive'}</Pill></td>
- <td>
- <div className="email-row-actions">
- <Button size="sm" variant="outline" onClick={() => handleVerifyDNS(d.id)} disabled={actionLoading}>Verify DNS</Button>
- {d.dns_provider_id && <Button size="sm" onClick={() => handleDeployDNS(d.id)} disabled={actionLoading}>Deploy DNS</Button>}
- <Button size="sm" variant="destructive" onClick={() => handleDeleteDomain(d.id, d.name)}>Delete</Button>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
+ <DataTable
+ tableClassName="sk-dtable"
+ sortable={false}
+ data={domains}
+ keyField="id"
+ columns={[
+ {
+ key: 'domain',
+ header: 'Domain',
+ render: (d) => (
+ <div className="sk-cell-name">
+ <span className="email-fav"><Globe size={15} /></span>
+ {d.name}
+ </div>
+ ),
+ },
+ { key: 'accounts', header: 'Mailboxes', render: (d) => <span className="sk-cell-mono">{d.accounts_count}</span> },
+ { key: 'aliases', header: 'Aliases', render: (d) => <span className="sk-cell-mono">{d.aliases_count}</span> },
+ { key: 'dkim', header: 'DKIM', render: (d) => dnsPill(d.dkim_public_key) },
+ { key: 'spf', header: 'SPF', render: (d) => dnsPill(d.spf_record) },
+ { key: 'dmarc', header: 'DMARC', render: (d) => dnsPill(d.dmarc_record) },
+ {
+ key: 'status',
+ header: 'Status',
+ render: (d) => <Pill kind={d.is_active ? 'green' : 'gray'}>{d.is_active ? 'active' : 'inactive'}</Pill>,
+ },
+ {
+ key: 'actions',
+ header: '',
+ render: (d) => (
+ <div className="email-row-actions">
+ <Button size="sm" variant="outline" onClick={() => handleVerifyDNS(d.id)} disabled={actionLoading}>Verify DNS</Button>
+ {d.dns_provider_id && <Button size="sm" onClick={() => handleDeployDNS(d.id)} disabled={actionLoading}>Deploy DNS</Button>}
+ <Button size="sm" variant="destructive" onClick={() => handleDeleteDomain(d.id, d.name)}>Delete</Button>
+ </div>
+ ),
+ },
+ ]}
+ />
</div>
)}
</div>
diff --git a/frontend/src/pages/FleetMonitor.jsx b/frontend/src/pages/FleetMonitor.jsx
index a79829d3..9ca9888a 100644
--- a/frontend/src/pages/FleetMonitor.jsx
+++ b/frontend/src/pages/FleetMonitor.jsx
@@ -41,11 +41,20 @@ const METRIC_LABELS = {
network_tx: 'Network TX'
};
+const heatLevel = (value) => {
+ if (value == null) return 'empty';
+ if (value >= 90) return 'critical';
+ if (value >= 75) return 'high';
+ if (value >= 50) return 'medium';
+ return 'low';
+};
+
const heatColor = (value) => {
- if (value == null) return 'var(--card-bg)';
- if (value >= 90) return 'var(--red)';
- if (value >= 75) return '#f97316';
- if (value >= 50) return 'var(--amber)';
+ const level = heatLevel(value);
+ if (level === 'empty') return 'var(--card-bg)';
+ if (level === 'critical') return 'var(--red)';
+ if (level === 'high') return '#f97316';
+ if (level === 'medium') return 'var(--amber)';
return 'var(--green)';
};
@@ -291,22 +300,19 @@ const FleetMonitor = () => {
)}
</div>
<div
- className="fleet-heatmap__cell"
- style={{ backgroundColor: heatColor(server.cpu), color: server.cpu >= 75 ? '#fff' : 'inherit' }}
+ className={`fleet-heatmap__cell is-${heatLevel(server.cpu)}`}
title={`CPU: ${server.cpu ?? 'N/A'}%`}
>
{server.cpu != null ? `${server.cpu}%` : '-'}
</div>
<div
- className="fleet-heatmap__cell"
- style={{ backgroundColor: heatColor(server.memory), color: server.memory >= 75 ? '#fff' : 'inherit' }}
+ className={`fleet-heatmap__cell is-${heatLevel(server.memory)}`}
title={`Memory: ${server.memory ?? 'N/A'}%`}
>
{server.memory != null ? `${server.memory}%` : '-'}
</div>
<div
- className="fleet-heatmap__cell"
- style={{ backgroundColor: heatColor(server.disk), color: server.disk >= 75 ? '#fff' : 'inherit' }}
+ className={`fleet-heatmap__cell is-${heatLevel(server.disk)}`}
title={`Disk: ${server.disk ?? 'N/A'}%`}
>
{server.disk != null ? `${server.disk}%` : '-'}
@@ -330,10 +336,10 @@ const FleetMonitor = () => {
</div>
<div className="flex gap-3 items-center text-sm text-gray-500">
<span>Legend:</span>
- <span className="flex items-center gap-1"><span className="inline-block w-3 h-3 rounded" style={{ backgroundColor: 'var(--green)' }}></span> 0-50%</span>
- <span className="flex items-center gap-1"><span className="inline-block w-3 h-3 rounded" style={{ backgroundColor: 'var(--amber)' }}></span> 50-75%</span>
- <span className="flex items-center gap-1"><span className="inline-block w-3 h-3 rounded" style={{ backgroundColor: '#f97316' }}></span> 75-90%</span>
- <span className="flex items-center gap-1"><span className="inline-block w-3 h-3 rounded" style={{ backgroundColor: 'var(--red)' }}></span> 90-100%</span>
+ <span className="flex items-center gap-1"><span className="fleet-heatmap__legend-dot is-low"></span> 0-50%</span>
+ <span className="flex items-center gap-1"><span className="fleet-heatmap__legend-dot is-medium"></span> 50-75%</span>
+ <span className="flex items-center gap-1"><span className="fleet-heatmap__legend-dot is-high"></span> 75-90%</span>
+ <span className="flex items-center gap-1"><span className="fleet-heatmap__legend-dot is-critical"></span> 90-100%</span>
</div>
</div>
)}
diff --git a/frontend/src/pages/Terminal.jsx b/frontend/src/pages/Terminal.jsx
index 5761267e..a3cebf4d 100644
--- a/frontend/src/pages/Terminal.jsx
+++ b/frontend/src/pages/Terminal.jsx
@@ -598,9 +598,9 @@ const JournalTab = () => {
if (unavailable) {
return (
<div className="lv-page">
- <div className="lv-empty-hint" style={{ minHeight: 400 }}>
+ <div className="lv-empty-hint is-tall">
<AlertCircle size={48} />
- <h3 style={{ margin: 0, color: 'var(--text-primary)' }}>System Logs Unavailable</h3>
+ <h3 className="lv-empty-hint__title">System Logs Unavailable</h3>
<p>
No system log source was found. Neither <code>journalctl</code>,
<code> /var/log/syslog</code>, nor the Windows Event Log are available.
@@ -653,14 +653,13 @@ const JournalTab = () => {
<div className="lv-layout">
<div className="lv-sidebar">
<div className="lv-sidebar-header">
- <div className="lv-search">
+ <div className="lv-search has-no-icon">
<input
type="text"
value={unitInput}
onChange={(e) => setUnitInput(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && applyUnitInput()}
placeholder="Type unit name…"
- style={{ paddingLeft: 8 }}
/>
</div>
<button className="lv-icon-btn" onClick={applyUnitInput} title="Apply unit filter">
@@ -671,18 +670,17 @@ const JournalTab = () => {
<div className="lv-sidebar-body">
<div className="lv-group">
<button
- className={`lv-file ${!unit ? 'active' : ''}`}
- onClick={clearUnit}
- style={{ gridTemplateColumns: '8px 1fr', gridTemplateAreas: '"dot name" "dot name"' }}
- >
+ className={`lv-file lv-file--compact ${!unit ? 'active' : ''}`}
+ onClick={clearUnit}
+ >
<span className="lv-file-dot" />
<span className="lv-file-name">All services</span>
</button>
</div>
<div className="lv-group">
- <div className="lv-group-header" style={{ cursor: 'default' }}>
- <span style={{ width: 12 }} />
+ <div className="lv-group-header is-static">
+ <span className="lv-group-header__spacer" />
<span>Common units</span>
<span className="lv-group-count">{filteredUnits.length}</span>
</div>
@@ -690,16 +688,15 @@ const JournalTab = () => {
{filteredUnits.map(u => (
<button
key={u.id}
- className={`lv-file ${unit === u.id ? 'active' : ''}`}
+ className={`lv-file lv-file--compact ${unit === u.id ? 'active' : ''}}`}
onClick={() => pickUnit(u.id)}
- style={{ gridTemplateColumns: '8px 1fr', gridTemplateAreas: '"dot name" "dot name"' }}
>
<span className={`lv-file-dot kind-${u.kind}`} />
<span className="lv-file-name">{u.label}</span>
</button>
))}
{filteredUnits.length === 0 && (
- <div className="lv-empty-hint" style={{ padding: 12 }}>
+ <div className="lv-empty-hint is-compact">
<p>No matching units.</p>
</div>
)}
@@ -708,17 +705,16 @@ const JournalTab = () => {
{isJournalctl && (
<div className="lv-group">
- <div className="lv-group-header" style={{ cursor: 'default' }}>
- <span style={{ width: 12 }} />
+ <div className="lv-group-header is-static">
+ <span className="lv-group-header__spacer" />
<span>Priority</span>
</div>
<div className="lv-group-files">
{PRIORITY_OPTIONS.map(opt => (
<button
key={opt.value}
- className={`lv-file ${priority === opt.value ? 'active' : ''}`}
+ className={`lv-file lv-file--compact ${priority === opt.value ? 'active' : ''}`}
onClick={() => { setPriority(opt.value); setTimeout(loadJournalLogs, 0); }}
- style={{ gridTemplateColumns: '8px 1fr', gridTemplateAreas: '"dot name" "dot name"' }}
>
<span className="lv-file-dot" style={{ background: priorityColor(opt.value) }} />
<span className="lv-file-name">{opt.label}</span>
@@ -1020,15 +1016,14 @@ const ProcessesTab = () => {
<div className="proc-layout">
<aside className="proc-sidebar">
<div className="lv-sidebar-header">
- <span className="lv-header-label" style={{ paddingLeft: 8 }}>Users</span>
+ <span className="lv-header-label is-indented">Users</span>
</div>
<div className="lv-sidebar-body">
<button
className={`lv-file ${!userFilter ? 'active' : ''}`}
onClick={() => setUserFilter(null)}
- style={{ gridTemplateColumns: '8px 1fr auto', gridTemplateAreas: '"dot name size" "dot name size"' }}
>
- <span className="lv-file-dot" style={{ background: 'var(--accent)' }} />
+ <span className="lv-file-dot is-accent" />
<span className="lv-file-name">All users</span>
<span className="lv-file-size">{processes.length}</span>
</button>
@@ -1037,7 +1032,6 @@ const ProcessesTab = () => {
key={user}
className={`lv-file ${userFilter === user ? 'active' : ''}`}
onClick={() => setUserFilter(user)}
- style={{ gridTemplateColumns: '8px 1fr auto', gridTemplateAreas: '"dot name size" "dot name size"' }}
>
<span className="lv-file-dot" style={{ background: hashColor(user) }} />
<span className="lv-file-name">{user}</span>
@@ -1051,7 +1045,7 @@ const ProcessesTab = () => {
{loading ? (
<div className="lv-content-loading">Loading processes…</div>
) : filtered.length === 0 ? (
- <div className="lv-empty-hint" style={{ minHeight: 320 }}>
+ <div className="lv-empty-hint is-medium">
<p>No processes match your filters.</p>
</div>
) : (
@@ -1142,7 +1136,7 @@ const ProcessesTab = () => {
<div className="preview-drawer-backdrop" onClick={() => setSelectedProcess(null)} />
<aside className="preview-drawer">
<header className="preview-drawer-header">
- <Activity size={20} style={{ color: 'var(--accent-primary)' }} />
+ <Activity size={20} className="is-accent" />
<div className="preview-drawer-title">
<h3>{selectedProcess.name}</h3>
<p className="preview-drawer-path">PID {selectedProcess.pid} · {selectedProcess.user}</p>
@@ -1193,10 +1187,10 @@ const ProcessesTab = () => {
<AlertTriangle size={14} /> Force kill (SIGKILL)
</button>
</div>
- <div className="preview-drawer-body" style={{ padding: 16 }}>
+ <div className="preview-drawer-body is-padded">
{selectedProcess.command && (
<>
- <div className="meta-label" style={{ marginBottom: 6 }}>Command</div>
+ <div className="meta-label is-spaced">Command</div>
<pre className="proc-command">{selectedProcess.command}</pre>
</>
)}
@@ -1419,7 +1413,7 @@ const ServicesTab = () => {
</button>
))}
</div>
- <div className="lv-search-field" style={{ minWidth: 260 }}>
+ <div className="lv-search-field is-wide">
<Search size={13} className="lv-search-field-icon" />
<input
type="text"
@@ -1436,9 +1430,9 @@ const ServicesTab = () => {
</div>
{loading ? (
- <div className="lv-content-loading" style={{ minHeight: 320 }}>Loading services…</div>
+ <div className="lv-content-loading is-medium">Loading services…</div>
) : filtered.length === 0 ? (
- <div className="lv-empty-hint" style={{ minHeight: 320 }}>
+ <div className="lv-empty-hint is-medium">
<p>{services.length === 0 ? 'No services found.' : 'No services match the current filters.'}</p>
</div>
) : (
@@ -1520,7 +1514,7 @@ const ServicesTab = () => {
<div className="preview-drawer-backdrop" onClick={closeServiceDrawer} />
<aside className="preview-drawer">
<header className="preview-drawer-header">
- <span className={`svc-status-dot status-${statusKind(selectedService.status)}`} style={{ width: 12, height: 12 }} />
+ <span className={`svc-status-dot status-${statusKind(selectedService.status)} is-large`} />
<div className="preview-drawer-title">
<h3>{selectedService.name}</h3>
<p className="preview-drawer-path">
diff --git a/frontend/src/styles/pages/_fleet-monitor.scss b/frontend/src/styles/pages/_fleet-monitor.scss
index f33079a8..55208278 100644
--- a/frontend/src/styles/pages/_fleet-monitor.scss
+++ b/frontend/src/styles/pages/_fleet-monitor.scss
@@ -124,11 +124,30 @@
font-weight: 500;
font-variant-numeric: tabular-nums;
transition: background-color 0.3s;
+ background: var(--card-bg);
+
+ &.is-empty { background: var(--card-bg); color: inherit; }
+ &.is-low { background: var(--green); color: inherit; }
+ &.is-medium { background: var(--amber); color: inherit; }
+ &.is-high { background: #f97316; color: #fff; }
+ &.is-critical { background: var(--red); color: #fff; }
}
&__label {
text-align: center;
}
+
+ &__legend-dot {
+ display: inline-block;
+ width: 12px;
+ height: 12px;
+ border-radius: $radius-sm;
+
+ &.is-low { background: var(--green); }
+ &.is-medium { background: var(--amber); }
+ &.is-high { background: #f97316; }
+ &.is-critical { background: var(--red); }
+ }
}
@media (max-width: $breakpoint-md) {
diff --git a/frontend/src/styles/pages/_terminal.scss b/frontend/src/styles/pages/_terminal.scss
index 1c15ad90..2eb23ba7 100644
--- a/frontend/src/styles/pages/_terminal.scss
+++ b/frontend/src/styles/pages/_terminal.scss
@@ -228,6 +228,8 @@ $lk-default: #646b7a;
letter-spacing: 0.08em;
font-weight: $font-weight-semibold;
color: var(--text-ghost);
+
+ &.is-indented { padding-left: 8px; }
}
.lv-header-hint {
@@ -387,6 +389,8 @@ $lk-default: #646b7a;
background: var(--surface);
}
}
+
+ &.has-no-icon input { padding-left: 8px; }
}
.lv-sidebar-body {
@@ -411,6 +415,17 @@ $lk-default: #646b7a;
svg { opacity: 0.6; }
p { margin: 0; font-size: $font-size-sm; }
+
+ &.is-compact { padding: 12px; }
+ &.is-medium { min-height: 320px; }
+ &.is-tall { min-height: 400px; }
+
+ &__title {
+ margin: 0;
+ color: var(--text-primary);
+ font-size: $font-size-lg;
+ font-weight: $font-weight-semibold;
+ }
}
// ─── Rail group (mono eyebrow header) ─────────────────
@@ -435,6 +450,9 @@ $lk-default: #646b7a;
letter-spacing: 0.1em;
cursor: pointer;
border-radius: $radius-sm;
+
+ &.is-static { cursor: default; }
+ &__spacer { width: 12px; }
@include transition(color);
&:hover { background: transparent; color: var(--text-faint); }
@@ -490,6 +508,13 @@ $lk-default: #646b7a;
.lv-file-name { color: var(--text); font-weight: $font-weight-medium; }
}
+
+ &--compact {
+ grid-template-columns: 8px 1fr;
+ grid-template-areas:
+ 'dot name'
+ 'dot name';
+ }
}
.lv-file-dot {
@@ -499,6 +524,7 @@ $lk-default: #646b7a;
border-radius: 50%;
background: $lk-default;
+ &.is-accent { background: var(--accent); }
&.kind-error { background: $lk-error; }
&.kind-access { background: $lk-access; }
&.kind-nginx { background: $lk-nginx; }
@@ -608,6 +634,8 @@ $lk-default: #646b7a;
min-width: 220px;
@include transition(all);
+ &.is-wide { min-width: 260px; }
+
&:focus-within {
border-color: var(--accent-dim);
background: var(--surface);
@@ -842,6 +870,8 @@ $lk-default: #646b7a;
padding: $space-8;
p { margin: 0; max-width: 360px; line-height: 1.5; }
+
+ &.is-medium { min-height: 320px; }
}
.lv-lines {
@@ -1248,6 +1278,7 @@ $lk-default: #646b7a;
background: var(--text-ghost);
flex-shrink: 0;
+ &.is-large { width: 12px; height: 12px; }
&.status-running { background: var(--green); box-shadow: 0 0 0 3px fade($success, 18%); }
&.status-failed { background: var(--red); box-shadow: 0 0 0 3px fade($danger, 18%); }
&.status-stopped { background: var(--text-ghost); }