From a5dee582236d3c1ab581b63fd463439a4d9e8176 Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Sun, 30 Mar 2025 10:11:29 -0500 Subject: [PATCH] refactor(server): removed console logs --- .../components/admin/servers/ServerPage.tsx | 214 ++++++++++-------- 1 file changed, 115 insertions(+), 99 deletions(-) diff --git a/frontend/src/components/admin/servers/ServerPage.tsx b/frontend/src/components/admin/servers/ServerPage.tsx index 4b8eaa3..1eec491 100644 --- a/frontend/src/components/admin/servers/ServerPage.tsx +++ b/frontend/src/components/admin/servers/ServerPage.tsx @@ -1,12 +1,12 @@ import { LstCard } from "@/components/extendedUI/LstCard"; import { Skeleton } from "@/components/ui/skeleton"; import { - Table, - TableBody, - TableCell, - TableHead, - TableHeader, - TableRow, + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, } from "@/components/ui/table"; import { useSessionStore } from "@/lib/store/sessionStore"; import { useModuleStore } from "@/lib/store/useModuleStore"; @@ -21,105 +21,121 @@ import StopServer from "./StopServer"; import StartServer from "./StartServer"; export type Servers = { - server_id?: string; - sName?: string; - serverDNS?: string; - plantToken?: string; - idAddress: string; - lastUpdated: string; - isUpgrading: boolean; + server_id?: string; + sName?: string; + serverDNS?: string; + plantToken?: string; + idAddress: string; + lastUpdated: string; + isUpgrading: boolean; }; export default function ServerPage() { - const { user, token } = useSessionStore(); - const { modules } = useModuleStore(); - const router = useRouter(); + const { user, token } = useSessionStore(); + const { modules } = useModuleStore(); + const router = useRouter(); - const { data, isError, error, isLoading } = useQuery(getServers(token ?? "")); + const { data, isError, error, isLoading } = useQuery( + getServers(token ?? "") + ); - const adminModule = modules.filter((n) => n.name === "admin"); - const userLevel = - user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || []; + const adminModule = modules.filter((n) => n.name === "admin"); + const userLevel = + user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || + []; - if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) { - router.navigate({ to: "/" }); - } + if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) { + router.navigate({ to: "/" }); + } - if (isError) { - return
{JSON.stringify(error)}
; - } + if (isError) { + return
{JSON.stringify(error)}
; + } - console.log(data); - return ( - - - - - Name - Server - PlantToken - IP Address - Date Last updated - Update Server - - - {isLoading ? ( - <> - - {Array(10) - .fill(0) - .map((_, i) => ( - - - - - - - - - - - - - - - ))} - - - ) : ( - - {data?.map((server: Servers) => { - const strippedDate = server.lastUpdated.replace("Z", ""); // Remove Z - const formattedDate = format(strippedDate, "MM/dd/yyyy hh:mm a"); - return ( - - {server.sName} - - {server.serverDNS} - - - {server.plantToken} - - - {server.idAddress} - - {formattedDate} - - {adminUrlCheck() && ( -
- - - - -
- )} -
-
- ); - })} -
- )} -
-
- ); + //console.log(data); + return ( + + + + + Name + Server + PlantToken + IP Address + Date Last updated + Update Server + + + {isLoading ? ( + <> + + {Array(10) + .fill(0) + .map((_, i) => ( + + + + + + + + + + + + + + + ))} + + + ) : ( + + {data?.map((server: Servers) => { + const strippedDate = server.lastUpdated.replace( + "Z", + "" + ); // Remove Z + const formattedDate = format( + strippedDate, + "MM/dd/yyyy hh:mm a" + ); + return ( + + + {server.sName} + + + {server.serverDNS} + + + {server.plantToken} + + + {server.idAddress} + + + {formattedDate} + + + {adminUrlCheck() && ( +
+ + + + +
+ )} +
+
+ ); + })} +
+ )} +
+
+ ); }