From f940bcdc9df2d3e9989d49feae88036a6f8c7013 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Sun, 23 Mar 2025 10:59:23 -0500
Subject: [PATCH] fix(serverlist): corrected the time by removing teh Z at the
 end of the time

---
 .../components/admin/servers/ServerPage.tsx   | 206 ++++++++++--------
 1 file changed, 112 insertions(+), 94 deletions(-)

diff --git a/frontend/src/components/admin/servers/ServerPage.tsx b/frontend/src/components/admin/servers/ServerPage.tsx
index c7fd1be..3f9bafa 100644
--- a/frontend/src/components/admin/servers/ServerPage.tsx
+++ b/frontend/src/components/admin/servers/ServerPage.tsx
@@ -1,108 +1,126 @@
-import {LstCard} from "@/components/extendedUI/LstCard";
-
-import {Skeleton} from "@/components/ui/skeleton";
-import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
-import {useSessionStore} from "@/lib/store/sessionStore";
-import {useModuleStore} from "@/lib/store/useModuleStore";
-import {getServers} from "@/utils/querys/servers";
-import {useQuery} from "@tanstack/react-query";
-import {useRouter} from "@tanstack/react-router";
-import {format} from "date-fns";
+import { LstCard } from "@/components/extendedUI/LstCard";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import { useSessionStore } from "@/lib/store/sessionStore";
+import { useModuleStore } from "@/lib/store/useModuleStore";
+import { getServers } from "@/utils/querys/servers";
+import { useQuery } from "@tanstack/react-query";
+import { useRouter } from "@tanstack/react-router";
+import { format } from "date-fns";
 import UpdateServer from "./UpdateServer";
-import {adminUrlCheck} from "@/utils/adminUrlCheck";
+import { adminUrlCheck } from "@/utils/adminUrlCheck";
 import RestartServer from "./RestartServer";
 import StopServer from "./StopServer";
 import StartServer from "./StartServer";
+import { formatInTimeZone } from "date-fns-tz";
 
 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 <div>{JSON.stringify(error)}</div>;
-    }
-    return (
-        <LstCard className="m-2 flex place-content-center w-dvh">
-            <Table>
-                <TableHeader>
-                    <TableRow>
-                        <TableHead>Name</TableHead>
-                        <TableHead>Server</TableHead>
-                        <TableHead>PlantToken</TableHead>
-                        <TableHead>IP Address</TableHead>
-                        <TableHead>Date Last updated</TableHead>
-                        <TableHead>Update Server</TableHead>
-                    </TableRow>
-                </TableHeader>
-                {isLoading ? (
-                    <>
-                        <TableBody>
-                            {Array(10)
-                            .fill(0)
-                            .map((_, i) => (
-                                <TableRow key={i}>
-                                    <TableCell className="font-medium">
-                                        <Skeleton className="h-4" />
-                                    </TableCell>
-                                    <TableCell>
-                                        <Skeleton className="h-4" />
-                                    </TableCell>
-                                    <TableCell>
-                                        <Skeleton className="h-4" />
-                                    </TableCell>
-                                    <TableCell>
-                                        <Skeleton className="h-4" />
-                                    </TableCell>
-                                </TableRow>
-                            ))}
-                        </TableBody>
-                    </>
-                ) : (
-                    <TableBody>
-                        {data?.map((server: Servers) => (
-                            <TableRow key={server.server_id}>
-                                <TableCell className="font-medium">{server.sName}</TableCell>
-                                <TableCell className="font-medium">{server.serverDNS}</TableCell>
-                                <TableCell className="font-medium">{server.plantToken}</TableCell>
-                                <TableCell className="font-medium">{server.idAddress}</TableCell>
-                                <TableCell className="font-medium">
-                                    {format(server.lastUpdated, "MM/dd/yyyy hh:mm")}
-                                </TableCell>
-                                <TableCell className="font-medium">
-                                    {adminUrlCheck() && (
-                                        <div className="flex flex-row">
-                                            <UpdateServer server={server} token={token as string} />
-                                            <StartServer />
-                                            <StopServer />
-                                            <RestartServer />
-                                        </div>
-                                    )}
-                                </TableCell>
-                            </TableRow>
-                        ))}
-                    </TableBody>
-                )}
-            </Table>
-        </LstCard>
-    );
+  if (isError) {
+    return <div>{JSON.stringify(error)}</div>;
+  }
+
+  console.log(data);
+  return (
+    <LstCard className="m-2 flex place-content-center w-dvh">
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>Name</TableHead>
+            <TableHead>Server</TableHead>
+            <TableHead>PlantToken</TableHead>
+            <TableHead>IP Address</TableHead>
+            <TableHead>Date Last updated</TableHead>
+            <TableHead>Update Server</TableHead>
+          </TableRow>
+        </TableHeader>
+        {isLoading ? (
+          <>
+            <TableBody>
+              {Array(10)
+                .fill(0)
+                .map((_, i) => (
+                  <TableRow key={i}>
+                    <TableCell className="font-medium">
+                      <Skeleton className="h-4" />
+                    </TableCell>
+                    <TableCell>
+                      <Skeleton className="h-4" />
+                    </TableCell>
+                    <TableCell>
+                      <Skeleton className="h-4" />
+                    </TableCell>
+                    <TableCell>
+                      <Skeleton className="h-4" />
+                    </TableCell>
+                  </TableRow>
+                ))}
+            </TableBody>
+          </>
+        ) : (
+          <TableBody>
+            {data?.map((server: Servers) => {
+              const strippedDate = server.lastUpdated.replace("Z", ""); // Remove Z
+              const formattedDate = format(strippedDate, "MM/dd/yyyy hh:mm a");
+              return (
+                <TableRow key={server.server_id}>
+                  <TableCell className="font-medium">{server.sName}</TableCell>
+                  <TableCell className="font-medium">
+                    {server.serverDNS}
+                  </TableCell>
+                  <TableCell className="font-medium">
+                    {server.plantToken}
+                  </TableCell>
+                  <TableCell className="font-medium">
+                    {server.idAddress}
+                  </TableCell>
+                  <TableCell className="font-medium">{formattedDate}</TableCell>
+                  <TableCell className="font-medium">
+                    {adminUrlCheck() && (
+                      <div className="flex flex-row">
+                        <UpdateServer server={server} token={token as string} />
+                        <StartServer />
+                        <StopServer />
+                        <RestartServer />
+                      </div>
+                    )}
+                  </TableCell>
+                </TableRow>
+              );
+            })}
+          </TableBody>
+        )}
+      </Table>
+    </LstCard>
+  );
 }