diff --git a/src/components/ServerDetailChart.tsx b/src/components/ServerDetailChart.tsx index 8d10873..9f9630b 100644 --- a/src/components/ServerDetailChart.tsx +++ b/src/components/ServerDetailChart.tsx @@ -76,6 +76,12 @@ export default function ServerDetailChart({ return ; } + const { online } = formatNezhaInfo(nezhaWsData.now, server); + + if (!online) { + return ; + } + return (
diff --git a/src/components/ServerDetailOverview.tsx b/src/components/ServerDetailOverview.tsx index a3c706c..82ebf60 100644 --- a/src/components/ServerDetailOverview.tsx +++ b/src/components/ServerDetailOverview.tsx @@ -91,19 +91,19 @@ export default function ServerDetailOverview({ {online && ( - -
-

- {t("serverDetail.uptime")} -

-
- {" "} - {online ? (uptime / 86400).toFixed(0) : "N/A"}{" "} - {t("serverDetail.days")} -
-
-
-
+ +
+

+ {t("serverDetail.uptime")} +

+
+ {" "} + {online ? (uptime / 86400).toFixed(0) : "N/A"}{" "} + {t("serverDetail.days")} +
+
+
+ )} {version && ( @@ -130,34 +130,32 @@ export default function ServerDetailOverview({ )} + {mem_total ? ( + + +
+

+ {t("serverDetail.mem")} +

+
{formatBytes(mem_total)}
+
+
+
+ ) : null} + {disk_total ? ( + + +
+

+ {t("serverDetail.disk")} +

+
{formatBytes(disk_total)}
+
+
+
+ ) : null} - {mem_total ? ( - -
-

- {t("serverDetail.mem")} -

-
{formatBytes(mem_total)}
-
-
-
) : null} - - - - {disk_total ? ( - -
-

- {t("serverDetail.disk")} -

-
{formatBytes(disk_total)}
-
-
-
) : null} - - - {country_code && ( @@ -231,34 +229,42 @@ export default function ServerDetailOverview({ {net_out_transfer ? ( - -
-

- {t("serverDetail.upload")} -

- {net_out_transfer ? ( -
{formatBytes(net_out_transfer)}
- ) : ( -
{t("serverDetail.unknown")}
- )} -
-
-
- ): null} - {net_in_transfer ? ( - -
-

- {t("serverDetail.download")} -

- {net_in_transfer ? ( -
{formatBytes(net_in_transfer)}
- ) : ( -
{t("serverDetail.unknown")}
- )} -
-
-
): null} + +
+

+ {t("serverDetail.upload")} +

+ {net_out_transfer ? ( +
+ {" "} + {formatBytes(net_out_transfer)}{" "} +
+ ) : ( +
{t("serverDetail.unknown")}
+ )} +
+
+ + ) : null} + {net_in_transfer ? ( + + +
+

+ {t("serverDetail.download")} +

+ {net_in_transfer ? ( +
+ {" "} + {formatBytes(net_in_transfer)}{" "} +
+ ) : ( +
{t("serverDetail.unknown")}
+ )} +
+
+
+ ) : null}
{server?.state.temperatures && server?.state.temperatures.length > 0 && (
diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 6e42e7a..a77e9a8 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -7,7 +7,9 @@ export function cn(...inputs: ClassValue[]) { } export function formatNezhaInfo(now: number, serverInfo: NezhaServer) { - const lastActiveTime = serverInfo.last_active.startsWith("000") ? 0 : parseISOTimestamp(serverInfo.last_active); + const lastActiveTime = serverInfo.last_active.startsWith("000") + ? 0 + : parseISOTimestamp(serverInfo.last_active); return { ...serverInfo, cpu: serverInfo.state.cpu || 0,