Remove system_info card from overview and update status badge

This commit is contained in:
Tola Leng
2025-07-01 18:47:36 +07:00
parent 30bba14e37
commit 48ddc2b4c6
6 changed files with 33 additions and 77 deletions
@@ -10,7 +10,7 @@ export const OSTypeIcon = ({ osType, className = "h-4 w-4" }: OSTypeIconProps) =
const getOSIcon = (os: string) => { const getOSIcon = (os: string) => {
const osLower = os.toLowerCase(); const osLower = os.toLowerCase();
if (osLower.includes('linux') || osLower.includes('ubuntu') || osLower.includes('centos')) { if (osLower.includes('linux') || osLower.includes('ubuntu') || osLower.includes('centos') || osLower.includes('debian')) {
return <Server className={className} />; return <Server className={className} />;
} else if (osLower.includes('windows')) { } else if (osLower.includes('windows')) {
return <Monitor className={className} />; return <Monitor className={className} />;
@@ -203,47 +203,6 @@ export const ServerMetricsOverview = ({ server }: ServerMetricsOverviewProps) =>
icon={HardDrive} icon={HardDrive}
color={theme === 'dark' ? "#f59e0b" : "#d97706"} color={theme === 'dark' ? "#f59e0b" : "#d97706"}
/> />
{/* System Info Card */}
<Card className="relative overflow-hidden bg-gradient-to-br from-card/80 via-card to-card/60 border border-border/60 shadow-lg hover:shadow-xl hover:border-border/80 transition-all duration-300 backdrop-blur-sm group xl:col-span-2">
<div className="absolute inset-0 bg-gradient-to-br from-transparent via-white/[0.02] to-white/[0.05] opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
<CardHeader className="pb-3 relative">
<CardTitle className="flex items-center gap-3 text-sm font-semibold">
<div className="p-2.5 rounded-xl bg-purple-500/15 shadow-sm ring-1 ring-white/10 transition-all duration-300 group-hover:scale-110" style={{ boxShadow: '0 4px 12px rgba(168, 85, 247, 0.2)' }}>
<Info className="h-4 w-4 text-purple-500" />
</div>
<span className="text-foreground/90">System Information</span>
</CardTitle>
</CardHeader>
<CardContent className="space-y-3 relative">
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 text-xs">
<div className="space-y-3">
<div className="bg-muted/20 rounded-lg p-3">
<span className="text-muted-foreground block mb-1">Operating System:</span>
<div className="font-semibold text-foreground">{server.os_type}</div>
</div>
<div className="bg-muted/20 rounded-lg p-3">
<span className="text-muted-foreground block mb-1">Hostname:</span>
<div className="font-mono text-xs text-foreground break-all">{server.hostname}</div>
</div>
</div>
<div className="space-y-3">
<div className="bg-muted/20 rounded-lg p-3">
<span className="text-muted-foreground block mb-1">IP Address:</span>
<div className="font-mono text-xs text-foreground">{server.ip_address}</div>
</div>
{server.system_info && (
<div className="bg-muted/20 rounded-lg p-3">
<span className="text-muted-foreground block mb-1">System Details:</span>
<div className="font-mono text-[10px] text-foreground/80 line-clamp-3 leading-relaxed" title={server.system_info}>
{server.system_info}
</div>
</div>
)}
</div>
</div>
</CardContent>
</Card>
</div> </div>
); );
}; };
@@ -17,32 +17,32 @@ export const ServerStatsCards = ({ stats }: ServerStatsCardsProps) => {
value: stats.total, value: stats.total,
icon: Server, icon: Server,
gradient: theme === 'dark' gradient: theme === 'dark'
? "linear-gradient(135deg, rgba(139, 69, 19, 0.8) 0%, rgba(160, 82, 45, 0.6) 100%)" ? "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, rgba(160, 82, 45, 0.6) 100%)"
: "linear-gradient(135deg, #8b4513 0%, #a0522d 100%)" : "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, #a0522d 100%)"
}, },
{ {
title: "ONLINE SERVERS", title: "ONLINE SERVERS",
value: stats.online, value: stats.online,
icon: Activity, icon: Activity,
gradient: theme === 'dark' gradient: theme === 'dark'
? "linear-gradient(135deg, rgba(67, 160, 71, 0.8) 0%, rgba(102, 187, 106, 0.6) 100%)" ? "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, rgba(102, 187, 106, 0.6) 100%)"
: "linear-gradient(135deg, #43a047 0%, #66bb6a 100%)" : "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, #66bb6a 100%)"
}, },
{ {
title: "OFFLINE SERVERS", title: "OFFLINE SERVERS",
value: stats.offline, value: stats.offline,
icon: Power, icon: Power,
gradient: theme === 'dark' gradient: theme === 'dark'
? "linear-gradient(135deg, rgba(229, 57, 53, 0.8) 0%, rgba(239, 83, 80, 0.6) 100%)" ? "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, rgba(239, 83, 80, 0.6) 100%)"
: "linear-gradient(135deg, #e53935 0%, #ef5350 100%)" : "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, #ef5350 100%)"
}, },
{ {
title: "WARNING SERVERS", title: "WARNING SERVERS",
value: stats.warning, value: stats.warning,
icon: AlertTriangle, icon: AlertTriangle,
gradient: theme === 'dark' gradient: theme === 'dark'
? "linear-gradient(135deg, rgba(255, 152, 0, 0.8) 0%, rgba(255, 183, 77, 0.6) 100%)" ? "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, rgba(255, 183, 77, 0.6) 100%)"
: "linear-gradient(135deg, #ff9800 0%, #ffb74d 100%)" : "linear-gradient(135deg, rgba(65, 59, 55, 0.8) 0%, #ffb74d 100%)"
} }
]; ];
@@ -62,7 +62,7 @@ export const ServerStatsCards = ({ stats }: ServerStatsCardsProps) => {
<div className="absolute inset-0 z-0 opacity-10"> <div className="absolute inset-0 z-0 opacity-10">
<div className="w-full h-full" <div className="w-full h-full"
style={{ style={{
backgroundImage: `linear-gradient(#fff 1px, transparent 1px), backgroundImage: `linear-gradient(#000 1px, transparent 1px),
linear-gradient(90deg, #fff 1px, transparent 1px)`, linear-gradient(90deg, #fff 1px, transparent 1px)`,
backgroundSize: '20px 20px' backgroundSize: '20px 20px'
}} }}
@@ -2,7 +2,7 @@
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
interface ServerStatusBadgeProps { interface ServerStatusBadgeProps {
status: 'up' | 'down' | 'warning'; status: 'up' | 'down' | 'warning' | 'paused';
} }
export const ServerStatusBadge = ({ status }: ServerStatusBadgeProps) => { export const ServerStatusBadge = ({ status }: ServerStatusBadgeProps) => {
@@ -11,22 +11,27 @@ export const ServerStatusBadge = ({ status }: ServerStatusBadgeProps) => {
case 'up': case 'up':
return { return {
label: 'Online', label: 'Online',
className: 'bg-green-100 text-green-800 border-green-200' className: 'bg-green-600 text-green-100 border-green-200'
}; };
case 'down': case 'down':
return { return {
label: 'Offline', label: 'Offline',
className: 'bg-red-100 text-red-800 border-red-200' className: 'bg-red-600 text-red-100 border-red-200'
}; };
case 'warning': case 'warning':
return { return {
label: 'Warning', label: 'Warning',
className: 'bg-yellow-100 text-yellow-800 border-yellow-200' className: 'bg-yellow-600 text-yellow-800 border-yellow-200'
};
case 'paused':
return {
label: 'Paused',
className: 'bg-gray-600 text-gray-100 border-gray-200'
}; };
default: default:
return { return {
label: 'Unknown', label: 'Unknown',
className: 'bg-gray-100 text-gray-800 border-gray-200' className: 'bg-gray-600 text-gray-100 border-gray-200'
}; };
} }
}; };
@@ -119,7 +119,6 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
<TableHead>Memory</TableHead> <TableHead>Memory</TableHead>
<TableHead>Disk</TableHead> <TableHead>Disk</TableHead>
<TableHead>Uptime</TableHead> <TableHead>Uptime</TableHead>
<TableHead>Docker</TableHead>
<TableHead>Last Checked</TableHead> <TableHead>Last Checked</TableHead>
<TableHead className="text-right">Actions</TableHead> <TableHead className="text-right">Actions</TableHead>
</TableRow> </TableRow>
@@ -136,7 +135,7 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
<TableCell> <TableCell>
<div> <div>
<div className="font-medium">{server.name}</div> <div className="font-medium">{server.name}</div>
<div className="text-sm text-muted-foreground">{server.hostname}</div>
</div> </div>
</TableCell> </TableCell>
<TableCell> <TableCell>
@@ -161,7 +160,8 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
value={cpuUsage} value={cpuUsage}
className="h-2" className="h-2"
indicatorClassName={ indicatorClassName={
cpuUsage > 80 ? "bg-red-500" : cpuUsage > 90 ? "bg-red-00" :
cpuUsage > 75 ? "bg-orange-500" :
cpuUsage > 60 ? "bg-yellow-500" : "bg-green-500" cpuUsage > 60 ? "bg-yellow-500" : "bg-green-500"
} }
/> />
@@ -170,8 +170,8 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
<TableCell> <TableCell>
<div className="space-y-1 min-w-[120px]"> <div className="space-y-1 min-w-[120px]">
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span>{serverService.formatBytes(server.ram_used)}</span>
<span className="text-muted-foreground">{memoryUsage.toFixed(1)}%</span> <span className="text-muted-foreground">{memoryUsage.toFixed(1)}%</span>
<span>{serverService.formatBytes(server.ram_total)}</span>
</div> </div>
<Progress <Progress
value={memoryUsage} value={memoryUsage}
@@ -186,8 +186,8 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
<TableCell> <TableCell>
<div className="space-y-1 min-w-[120px]"> <div className="space-y-1 min-w-[120px]">
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span>{serverService.formatBytes(server.disk_used)}</span>
<span className="text-muted-foreground">{diskUsage.toFixed(1)}%</span> <span className="text-muted-foreground">{diskUsage.toFixed(1)}%</span>
<span>{serverService.formatBytes(server.disk_total)}</span>
</div> </div>
<Progress <Progress
value={diskUsage} value={diskUsage}
@@ -202,18 +202,7 @@ export const ServerTable = ({ servers, isLoading, onRefresh }: ServerTableProps)
<TableCell> <TableCell>
<div className="text-sm">{server.uptime}</div> <div className="text-sm">{server.uptime}</div>
</TableCell> </TableCell>
<TableCell>
{server.docker === 'true' ? (
<Badge variant="secondary" className="text-xs">
<Activity className="h-3 w-3 mr-1" />
Enabled
</Badge>
) : (
<Badge variant="outline" className="text-xs">
Disabled
</Badge>
)}
</TableCell>
<TableCell> <TableCell>
<div className="text-sm text-muted-foreground"> <div className="text-sm text-muted-foreground">
{new Date(server.last_checked).toLocaleString()} {new Date(server.last_checked).toLocaleString()}
+7 -4
View File
@@ -10,7 +10,7 @@ import { Header } from "@/components/dashboard/Header";
import { serverService } from "@/services/serverService"; import { serverService } from "@/services/serverService";
import { authService } from "@/services/authService"; import { authService } from "@/services/authService";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { ArrowLeft, Server } from "lucide-react"; import { ArrowLeft, Server, Database } from "lucide-react";
import { ServerMetricsCharts } from "@/components/servers/ServerMetricsCharts"; import { ServerMetricsCharts } from "@/components/servers/ServerMetricsCharts";
import { ServerMetricsOverview } from "@/components/servers/ServerMetricsOverview"; import { ServerMetricsOverview } from "@/components/servers/ServerMetricsOverview";
import { ServerHistoryCharts } from "@/components/servers/ServerHistoryCharts"; import { ServerHistoryCharts } from "@/components/servers/ServerHistoryCharts";
@@ -126,7 +126,7 @@ const ServerDetail = () => {
</div> </div>
<div className="flex items-center gap-3 mb-2"> <div className="flex items-center gap-3 mb-2">
<div className="h-8 w-8 rounded bg-primary/10 flex items-center justify-center"> <div className="h-8 w-8 rounded bg-primary/10 flex items-center justify-center">
<Server className="h-4 w-4 text-primary" /> <Database className="h-4 w-4 text-primary" />
</div> </div>
<h1 className="text-2xl font-bold text-foreground"> <h1 className="text-2xl font-bold text-foreground">
{server?.name || 'Server Detail'} {server?.name || 'Server Detail'}
@@ -135,11 +135,14 @@ const ServerDetail = () => {
<p className={`text-muted-foreground mt-1 sm:mt-2 transition-all duration-300 ${sidebarCollapsed ? 'text-base sm:text-lg' : 'text-sm sm:text-base'}`}> <p className={`text-muted-foreground mt-1 sm:mt-2 transition-all duration-300 ${sidebarCollapsed ? 'text-base sm:text-lg' : 'text-sm sm:text-base'}`}>
Monitor server performance metrics and system health Monitor server performance metrics and system health
{server && ( {server && (
<span className="block text-xs text-muted-foreground/70 mt-1"> <span className="block text-xs text-foreground/80 mt-1">
{server.hostname} {server.ip_address} {server.os_type} {server.hostname} {server.ip_address} {server.os_type} {server.system_info}
</span> </span>
)} )}
</p> </p>
</div> </div>
</div> </div>
</div> </div>