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.

fix(ui): retint Agent Fleet + Fleet Monitor to design tokens (S8.0)

Juan Denise0e660087ea6
diff --git a/frontend/src/pages/AgentFleet.jsx b/frontend/src/pages/AgentFleet.jsx
index 0422a567..3495e789 100644
--- a/frontend/src/pages/AgentFleet.jsx
+++ b/frontend/src/pages/AgentFleet.jsx
@@ -27,12 +27,11 @@ import {
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { useAuth } from '../contexts/AuthContext';
-import { StatCard, StatsGrid } from '../components/StatCard';
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 } from '@/components/ds';
+import { PageTopbar, MetricCard, Pill, Gauge } from '@/components/ds';
import { SERVER_TABS } from '../components/servers/serverTabs';
const AgentFleet = () => {
@@ -186,15 +185,15 @@ const AgentFleet = () => {
}
};
- const rolloutStatusVariant = (status) => {
+ const rolloutPillKind = (status) => {
const map = {
- running: 'info',
- completed: 'success',
- failed: 'destructive',
- cancelled: 'warning',
- pending: 'secondary'
+ running: 'cyan',
+ completed: 'green',
+ failed: 'red',
+ cancelled: 'amber',
+ pending: 'gray'
};
- return map[status] || 'secondary';
+ return map[status] || 'gray';
};
return (
@@ -241,12 +240,12 @@ const AgentFleet = () => {
{/* ==================== Dashboard ==================== */}
{activeTab === 'dashboard' && health && (
<div className="space-y-6">
- <StatsGrid>
- <StatCard icon={Server} iconVariant="backups" label="Total Agents" value={health.total_servers} />
- <StatCard icon={CheckCircle} iconVariant="apps" label="Online" value={health.online_servers} />
- <StatCard icon={AlertCircle} iconVariant="alerts" label="Offline" value={health.offline_servers} />
- <StatCard icon={Zap} iconVariant="schedules" label="Success Rate" value={`${health.command_success_rate}%`} />
- </StatsGrid>
+ <div className="fleet-kpis">
+ <MetricCard icon={<Server size={16} />} tone="accent" label="Total Agents" value={health.total_servers} />
+ <MetricCard icon={<CheckCircle size={16} />} tone="green" label="Online" value={health.online_servers} />
+ <MetricCard icon={<AlertCircle size={16} />} tone="red" label="Offline" value={health.offline_servers} />
+ <MetricCard icon={<Zap size={16} />} tone="cyan" label="Success Rate" value={`${health.command_success_rate}%`} />
+ </div>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
<div className="card">
@@ -259,30 +258,20 @@ const AgentFleet = () => {
<span className="text-gray-600">Overall Uptime</span>
<span className="font-semibold text-green-600">{health.uptime_percentage?.toFixed(2)}%</span>
</div>
- <div className="w-full bg-gray-200 rounded-full h-2">
- <div
- className="bg-green-600 h-2 rounded-full"
- style={{ width: `${health.uptime_percentage}%` }}
- ></div>
- </div>
+ <Gauge value={health.uptime_percentage} color="var(--green)" />
<div className="flex justify-between items-center mt-6">
<span className="text-gray-600">Avg Heartbeat Latency</span>
<span className="font-semibold">{health.avg_heartbeat_latency} ms</span>
</div>
- <div className="w-full bg-gray-200 rounded-full h-2">
- <div
- className="bg-blue-600 h-2 rounded-full"
- style={{ width: `${Math.min(100, health.avg_heartbeat_latency / 2)}%` }}
- ></div>
- </div>
+ <Gauge value={Math.min(100, health.avg_heartbeat_latency / 2)} color="var(--cyan)" />
{health.queued_commands > 0 && (
- <div className="flex justify-between items-center mt-4 p-3 bg-yellow-50 rounded-lg">
- <span className="text-yellow-700 flex items-center gap-2">
+ <div className="fleet-warnrow mt-4">
+ <span className="flex items-center gap-2">
<Clock size={16} /> Queued Commands
</span>
- <span className="font-semibold text-yellow-700">{health.queued_commands}</span>
+ <span className="font-semibold">{health.queued_commands}</span>
</div>
)}
</div>
@@ -301,12 +290,7 @@ const AgentFleet = () => {
<span>v{version}</span>
<span className="text-gray-500">{count} agents ({(count / health.total_servers * 100).toFixed(0)}%)</span>
</div>
- <div className="w-full bg-gray-200 rounded-full h-2">
- <div
- className="bg-indigo-600 h-2 rounded-full"
- style={{ width: `${count / health.total_servers * 100}%` }}
- ></div>
- </div>
+ <Gauge value={count / health.total_servers * 100} color="var(--accent-bright)" />
</div>
))}
{Object.keys(health.version_distribution || {}).length === 0 && (
@@ -345,17 +329,14 @@ const AgentFleet = () => {
<tr key={v.id}>
<td className="font-semibold">v{v.version}</td>
<td>
- <Badge variant={v.channel === 'stable' ? 'success' : 'warning'}>
- {v.channel}
- </Badge>
+ <Pill kind={v.channel === 'stable' ? 'green' : 'amber'}>{v.channel}</Pill>
</td>
<td>{new Date(v.published_at).toLocaleDateString()}</td>
<td>{v.min_panel_version || 'Any'} - {v.max_panel_version || 'Latest'}</td>
<td>
- <span className={`flex items-center gap-1 ${v.is_active ? 'text-green-600' : 'text-gray-400'}`}>
- {v.is_active ? <CheckCircle size={14} /> : <Clock size={14} />}
+ <Pill kind={v.is_active ? 'green' : 'gray'}>
{v.is_active ? 'Active' : 'Inactive'}
- </span>
+ </Pill>
</td>
<td className="actions">
<Button variant="ghost" size="sm" title="Edit"><RefreshCw size={14} /></Button>
@@ -474,12 +455,11 @@ const AgentFleet = () => {
<td>{r.strategy}</td>
<td>
<div className="flex items-center gap-3">
- <div className="w-24 bg-gray-200 rounded-full h-2">
- <div
- className={`h-2 rounded-full ${r.status === 'failed' ? 'bg-red-500' : r.status === 'completed' ? 'bg-green-500' : 'bg-blue-500'}`}
- style={{ width: `${r.total_servers > 0 ? (r.processed_servers / r.total_servers * 100) : 0}%` }}
- ></div>
- </div>
+ <Gauge
+ className="w-24"
+ value={r.total_servers > 0 ? (r.processed_servers / r.total_servers * 100) : 0}
+ color={r.status === 'failed' ? 'var(--red)' : r.status === 'completed' ? 'var(--green)' : 'var(--accent-bright)'}
+ />
<span className="text-sm text-gray-500">
{r.processed_servers}/{r.total_servers}
{r.failed_servers > 0 && (
@@ -489,9 +469,7 @@ const AgentFleet = () => {
</div>
</td>
<td>
- <Badge variant={rolloutStatusVariant(r.status)}>
- {r.status}
- </Badge>
+ <Pill kind={rolloutPillKind(r.status)}>{r.status}</Pill>
</td>
<td className="text-sm">{r.started_at ? new Date(r.started_at).toLocaleString() : '-'}</td>
<td className="actions">
@@ -597,13 +575,13 @@ const AgentFleet = () => {
<div key={agent.agent_id} className="card p-4 flex flex-col justify-between">
<div>
<div className="flex justify-between items-start mb-2">
- <div className="bg-blue-100 p-2 rounded text-blue-600">
+ <div className="fleet-ico">
<Server size={20} />
</div>
{agent.is_registered ? (
- <Badge variant="success">Registered</Badge>
+ <Pill kind="green">Registered</Pill>
) : (
- <Badge variant="warning">New</Badge>
+ <Pill kind="amber">New</Pill>
)}
</div>
<h3 className="font-bold">{agent.hostname}</h3>
@@ -639,7 +617,7 @@ const AgentFleet = () => {
</div>
))}
{discoveredAgents.length === 0 && !isScanning && (
- <div className="col-span-full py-12 text-center card bg-gray-50">
+ <div className="col-span-full py-12 text-center card">
<Search size={48} className="mx-auto text-gray-300 mb-4" />
<p className="text-gray-500">No agents discovered yet. Start a scan to find agents on your local network.</p>
</div>
@@ -706,8 +684,8 @@ const AgentFleet = () => {
{/* ==================== Diagnostics Modal ==================== */}
{diagnostics && (
- <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50" onClick={() => setDiagnostics(null)}>
- <div className="bg-white rounded-lg shadow-xl w-full max-w-2xl max-h-[80vh] overflow-y-auto m-4" onClick={e => e.stopPropagation()}>
+ <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60" onClick={() => setDiagnostics(null)}>
+ <div className="fleet-modal w-full max-w-2xl max-h-[80vh] overflow-y-auto m-4" onClick={e => e.stopPropagation()}>
<div className="p-6 border-b flex justify-between items-center">
<h2 className="text-lg font-semibold">
Agent Diagnostics - {diagnostics.server_name}
@@ -765,19 +743,19 @@ const AgentFleet = () => {
<div>
<h3 className="font-semibold mb-3">Command Stats (24h)</h3>
<div className="grid grid-cols-4 gap-3">
- <div className="text-center p-3 bg-gray-50 rounded">
+ <div className="fleet-statbox">
<div className="text-lg font-bold">{diagnostics.commands_24h.total}</div>
<div className="text-xs text-gray-500">Total</div>
</div>
- <div className="text-center p-3 bg-green-50 rounded">
+ <div className="fleet-statbox is-green">
<div className="text-lg font-bold text-green-600">{diagnostics.commands_24h.success}</div>
<div className="text-xs text-gray-500">Success</div>
</div>
- <div className="text-center p-3 bg-red-50 rounded">
+ <div className="fleet-statbox is-red">
<div className="text-lg font-bold text-red-600">{diagnostics.commands_24h.failed}</div>
<div className="text-xs text-gray-500">Failed</div>
</div>
- <div className="text-center p-3 bg-yellow-50 rounded">
+ <div className="fleet-statbox is-amber">
<div className="text-lg font-bold text-yellow-600">{diagnostics.commands_24h.timeout}</div>
<div className="text-xs text-gray-500">Timeout</div>
</div>
@@ -785,10 +763,10 @@ const AgentFleet = () => {
</div>
{diagnostics.queued_commands > 0 && (
- <div className="p-3 bg-yellow-50 border border-yellow-200 rounded-lg flex items-center gap-2">
- <Clock size={16} className="text-yellow-600" />
- <span className="text-sm text-yellow-700">
- {diagnostics.queued_commands} commands queued for delivery
+ <div className="fleet-warnrow">
+ <span className="flex items-center gap-2">
+ <Clock size={16} />
+ <span className="text-sm">{diagnostics.queued_commands} commands queued for delivery</span>
</span>
</div>
)}
@@ -797,7 +775,7 @@ const AgentFleet = () => {
<h3 className="font-semibold mb-3">Recent Sessions</h3>
<div className="space-y-2 max-h-48 overflow-y-auto">
{diagnostics.recent_sessions.map(session => (
- <div key={session.id} className="flex justify-between items-center text-sm p-2 bg-gray-50 rounded">
+ <div key={session.id} className="fleet-statrow flex justify-between items-center text-sm p-2 rounded">
<div className="flex items-center gap-2">
{session.is_active ? (
<Wifi size={14} className="text-green-500" />
diff --git a/frontend/src/pages/FleetMonitor.jsx b/frontend/src/pages/FleetMonitor.jsx
index b596c856..5c820394 100644
--- a/frontend/src/pages/FleetMonitor.jsx
+++ b/frontend/src/pages/FleetMonitor.jsx
@@ -24,8 +24,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 { Badge } from '@/components/ui/badge';
-import { PageTopbar } from '@/components/ds';
+import { PageTopbar, Pill } from '@/components/ds';
import { SERVER_TABS } from '../components/servers/serverTabs';
const CHART_COLORS = [
@@ -44,10 +43,10 @@ const METRIC_LABELS = {
const heatColor = (value) => {
if (value == null) return 'var(--card-bg)';
- if (value >= 90) return '#ef4444';
+ if (value >= 90) return 'var(--red)';
if (value >= 75) return '#f97316';
- if (value >= 50) return '#eab308';
- return '#22c55e';
+ if (value >= 50) return 'var(--amber)';
+ return 'var(--green)';
};
const FleetMonitor = () => {
@@ -320,9 +319,7 @@ const FleetMonitor = () => {
{server.containers ?? '-'}
</div>
<div className="fleet-heatmap__cell">
- <Badge variant={server.status === 'online' ? 'success' : 'destructive'}>
- {server.status}
- </Badge>
+ <Pill kind={server.status === 'online' ? 'green' : 'red'}>{server.status}</Pill>
</div>
</div>
))}
@@ -337,10 +334,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: '#22c55e' }}></span> 0-50%</span>
- <span className="flex items-center gap-1"><span className="inline-block w-3 h-3 rounded" style={{ backgroundColor: '#eab308' }}></span> 50-75%</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: '#ef4444' }}></span> 90-100%</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>
</div>
</div>
)}
@@ -492,14 +489,12 @@ const FleetMonitor = () => {
<td className="font-mono">{a.value}%</td>
<td className="font-mono">{a.threshold}%</td>
<td>
- <Badge variant={a.severity === 'critical' ? 'destructive' : 'warning'}>
- {a.severity}
- </Badge>
+ <Pill kind={a.severity === 'critical' ? 'red' : 'amber'}>{a.severity}</Pill>
</td>
<td>
- <Badge variant={a.status === 'active' ? 'destructive' : a.status === 'acknowledged' ? 'warning' : 'success'}>
+ <Pill kind={a.status === 'active' ? 'red' : a.status === 'acknowledged' ? 'amber' : 'green'}>
{a.status}
- </Badge>
+ </Pill>
</td>
<td className="text-sm">{new Date(a.created_at).toLocaleString()}</td>
<td className="actions">
@@ -653,9 +648,9 @@ const FleetMonitor = () => {
<td className="font-mono">{a.stddev}</td>
<td className="font-mono font-bold">{a.z_score}</td>
<td>
- <Badge variant={a.direction === 'high' ? 'destructive' : 'info'}>
+ <Pill kind={a.direction === 'high' ? 'red' : 'cyan'}>
{a.direction === 'high' ? 'Unusually High' : 'Unusually Low'}
- </Badge>
+ </Pill>
</td>
</tr>
))}
@@ -701,15 +696,15 @@ const FleetMonitor = () => {
{forecast && !forecast.error && (
<div className="space-y-6">
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
- <div className="p-4 bg-gray-50 rounded-lg text-center">
+ <div className="fleet-statbox p-4">
<div className="text-sm text-gray-500">Current</div>
<div className="text-2xl font-bold">{forecast.current_value}%</div>
</div>
- <div className="p-4 bg-gray-50 rounded-lg text-center">
+ <div className="fleet-statbox p-4">
<div className="text-sm text-gray-500">Growth Rate</div>
<div className="text-2xl font-bold">{forecast.growth_rate_per_day}%/day</div>
</div>
- <div className="p-4 bg-gray-50 rounded-lg text-center">
+ <div className="fleet-statbox p-4">
<div className="text-sm text-gray-500">Trend</div>
<div className={`text-2xl font-bold ${forecast.trend === 'increasing' ? 'text-red-600' : forecast.trend === 'decreasing' ? 'text-green-600' : ''}`}>
{forecast.trend}
@@ -719,7 +714,7 @@ const FleetMonitor = () => {
{forecast.predictions && (
<div className="grid grid-cols-2 gap-4">
- <div className={`p-4 rounded-lg border ${forecast.predictions.days_to_90pct === 0 ? 'border-red-300 bg-red-50' : 'border-yellow-300 bg-yellow-50'}`}>
+ <div className={`fleet-predbox ${forecast.predictions.days_to_90pct === 0 ? 'is-red' : 'is-amber'}`}>
<div className="text-sm font-medium">Reaches 90%</div>
<div className="text-lg font-bold">
{forecast.predictions.date_90pct || 'N/A'}
@@ -728,7 +723,7 @@ const FleetMonitor = () => {
)}
</div>
</div>
- <div className={`p-4 rounded-lg border ${forecast.predictions.days_to_100pct === 0 ? 'border-red-300 bg-red-50' : 'border-red-200 bg-red-50'}`}>
+ <div className="fleet-predbox is-red">
<div className="text-sm font-medium">Reaches 100%</div>
<div className="text-lg font-bold">
{forecast.predictions.date_100pct || 'N/A'}
@@ -748,8 +743,8 @@ const FleetMonitor = () => {
<YAxis stroke="var(--text-secondary)" fontSize={12} unit="%" domain={[0, 100]} />
<Tooltip contentStyle={{ backgroundColor: 'var(--card-bg)', border: '1px solid var(--border-color)' }} />
<Legend />
- <Line type="monotone" dataKey="actual" stroke="#6366f1" strokeWidth={2} dot={false} name="Actual" />
- <Line type="monotone" dataKey="trend" stroke="#ef4444" strokeWidth={2} strokeDasharray="5 5" dot={false} name="Trend" />
+ <Line type="monotone" dataKey="actual" stroke="var(--accent-bright)" strokeWidth={2} dot={false} name="Actual" />
+ <Line type="monotone" dataKey="trend" stroke="var(--red)" strokeWidth={2} strokeDasharray="5 5" dot={false} name="Trend" />
</LineChart>
</ResponsiveContainer>
)}
@@ -757,7 +752,7 @@ const FleetMonitor = () => {
)}
{forecast?.error && (
- <div className="p-4 bg-yellow-50 border border-yellow-200 rounded text-yellow-700 text-sm">
+ <div className="fleet-warnrow text-sm">
{forecast.error}
</div>
)}
@@ -815,13 +810,13 @@ const FleetMonitor = () => {
{searchResults.map((r, i) => (
<tr key={i}>
<td className="font-semibold">{r.server_name}</td>
- <td><Badge variant="secondary">{r.match_type}</Badge></td>
+ <td><Pill kind="gray" dot={false}>{r.match_type}</Pill></td>
<td>{r.match_name}</td>
<td className="text-sm text-gray-500">{r.match_detail}</td>
<td>
- <Badge variant={r.status === 'online' || r.status === 'running' ? 'success' : 'destructive'}>
+ <Pill kind={r.status === 'online' || r.status === 'running' ? 'green' : 'red'}>
{r.status}
- </Badge>
+ </Pill>
</td>
</tr>
))}
diff --git a/frontend/src/styles/base/_utilities.scss b/frontend/src/styles/base/_utilities.scss
index b1d89cf0..1bcd7fc5 100644
--- a/frontend/src/styles/base/_utilities.scss
+++ b/frontend/src/styles/base/_utilities.scss
@@ -136,6 +136,10 @@
.text-green-600 { color: $success; }
.text-red-600 { color: $danger; }
.text-green-400 { color: $success; }
+.text-green-500 { color: $success; }
+.text-red-500 { color: $danger; }
+.text-yellow-600 { color: $warning; }
+.text-yellow-700 { color: $warning; }
.font-medium { font-weight: 500; }
.font-semibold { font-weight: 600; }
.font-bold { font-weight: 700; }
diff --git a/frontend/src/styles/pages/_fleet-monitor.scss b/frontend/src/styles/pages/_fleet-monitor.scss
index cae4548f..f33079a8 100644
--- a/frontend/src/styles/pages/_fleet-monitor.scss
+++ b/frontend/src/styles/pages/_fleet-monitor.scss
@@ -1,7 +1,77 @@
// ============================================
-// FLEET MONITOR PAGE
+// FLEET PAGES (Agent Fleet + Fleet Monitor)
// ============================================
+// KPI strip (MetricCard grid) on the Agent Fleet dashboard
+.fleet-kpis {
+ display: grid;
+ grid-template-columns: repeat(4, 1fr);
+ gap: $space-3;
+
+ @media (max-width: $breakpoint-md) {
+ grid-template-columns: repeat(2, 1fr);
+ }
+}
+
+// Amber warning row (queued commands, forecast errors)
+.fleet-warnrow {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: $space-2;
+ padding: $space-3;
+ background: $warning-bg;
+ border: 1px solid $warning-border;
+ border-radius: $radius-md;
+ color: $warning;
+ font-size: $font-size-sm;
+}
+
+// Accent-washed icon chip (discovery cards)
+.fleet-ico {
+ display: inline-flex;
+ padding: $space-2;
+ border-radius: $radius-md;
+ background: var(--accent-bg);
+ color: var(--accent-bright);
+}
+
+// Small centered stat box (diagnostics, forecast)
+.fleet-statbox {
+ padding: $space-3;
+ background: $bg-elevated;
+ border: 1px solid $border-subtle;
+ border-radius: $radius-md;
+ text-align: center;
+
+ &.is-green { background: $success-bg; border-color: $success-border; }
+ &.is-red { background: $danger-bg; border-color: $danger-border; }
+ &.is-amber { background: $warning-bg; border-color: $warning-border; }
+}
+
+.fleet-statrow {
+ background: $bg-elevated;
+ border: 1px solid $border-subtle;
+}
+
+// Capacity-forecast prediction tiles
+.fleet-predbox {
+ padding: $space-4;
+ border-radius: $radius-lg;
+ border: 1px solid $border-default;
+
+ &.is-red { background: $danger-bg; border-color: $danger-border; }
+ &.is-amber { background: $warning-bg; border-color: $warning-border; }
+}
+
+// Diagnostics overlay panel (token home for the old bg-white modal)
+.fleet-modal {
+ background: $bg-elevated;
+ border: 1px solid $border-default;
+ border-radius: $radius-lg;
+ box-shadow: var(--shadow-lg);
+}
+
.fleet-heatmap {
width: 100%;