Finish úptime display

This commit is contained in:
headlessdev
2025-04-26 15:38:39 +02:00
parent a84a985645
commit 00a628031e
4 changed files with 126 additions and 21 deletions

View File

@@ -28,7 +28,7 @@ export async function GET() {
cpuUsage: server.cpuUsage ? parseInt(server.cpuUsage) : 0,
ramUsage: server.ramUsage ? parseInt(server.ramUsage) : 0,
diskUsage: server.diskUsage ? parseInt(server.diskUsage) : 0,
uptime: server.uptime ? parseInt(server.uptime) : 0
uptime: server.uptime || ""
}));
return NextResponse.json(monitoringData)

View File

@@ -99,7 +99,7 @@ interface Server {
diskUsage: number;
history?: ServerHistory;
port: number;
uptime: number;
uptime: string;
}
interface GetServersResponse {
@@ -1027,7 +1027,7 @@ export default function Dashboard() {
<StatusIndicator isOnline={server.online} />
{server.online && server.uptime && (
<span className="text-xs text-muted-foreground mt-1">
{server.online ? `since ${server.uptime}` : 'offline'}
since {server.uptime}
</span>
)}
</div>

View File

@@ -56,6 +56,7 @@ interface Server {
diskUsage: number;
history?: ServerHistory;
port: number;
uptime?: string;
}
interface GetServersResponse {
@@ -439,8 +440,13 @@ export default function ServerDetail() {
</div>
</div>
{server.monitoring && (
<div className="absolute top-0 right-4">
<div className="absolute top-0 right-4 flex flex-col items-end">
<StatusIndicator isOnline={server.online} />
{server.online && server.uptime && (
<span className="text-xs text-muted-foreground mt-1 w-max text-right whitespace-nowrap">
since {server.uptime}
</span>
)}
</div>
)}
</CardHeader>
@@ -600,7 +606,14 @@ export default function ServerDetail() {
</NextLink>
</div>
{hostedVM.monitoring && (
<StatusIndicator isOnline={hostedVM.online} />
<div className="flex flex-col items-end">
<StatusIndicator isOnline={hostedVM.online} />
{hostedVM.online && hostedVM.uptime && (
<span className="text-xs text-muted-foreground mt-1 w-max text-right whitespace-nowrap">
since {hostedVM.uptime}
</span>
)}
</div>
)}
</div>