cowch/lstV2
1
0
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix(serverlist): corrected the time by removing teh Z at the end of the time

Browse Source
This commit is contained in:
cowchmonkey@gmail.com
2025-03-23 10:59:23 -05:00
parent 2ae3c8ba59
commit f940bcdc9d
1 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
frontend/src/components/admin/servers/ServerPage.tsx
View File

@@ -1,18 +1,25 @@
import {LstCard} from "@/components/extendedUI/LstCard"; import { LstCard } from "@/components/extendedUI/LstCard";
import { Skeleton } from "@/components/ui/skeleton";
import {Skeleton} from "@/components/ui/skeleton"; import {
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table"; Table,
import {useSessionStore} from "@/lib/store/sessionStore"; TableBody,
import {useModuleStore} from "@/lib/store/useModuleStore"; TableCell,
import {getServers} from "@/utils/querys/servers"; TableHead,
import {useQuery} from "@tanstack/react-query"; TableHeader,
import {useRouter} from "@tanstack/react-router"; TableRow,
import {format} from "date-fns"; } 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 UpdateServer from "./UpdateServer";
import {adminUrlCheck} from "@/utils/adminUrlCheck"; import { adminUrlCheck } from "@/utils/adminUrlCheck";
import RestartServer from "./RestartServer"; import RestartServer from "./RestartServer";
import StopServer from "./StopServer"; import StopServer from "./StopServer";
import StartServer from "./StartServer"; import StartServer from "./StartServer";
import { formatInTimeZone } from "date-fns-tz";
export type Servers = { export type Servers = {
server_id?: string; server_id?: string;
@@ -25,22 +32,25 @@ export type Servers = {
}; };
export default function ServerPage() { export default function ServerPage() {
const {user, token} = useSessionStore(); const { user, token } = useSessionStore();
const {modules} = useModuleStore(); const { modules } = useModuleStore();
const router = useRouter(); 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 adminModule = modules.filter((n) => n.name === "admin");
const userLevel = user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || []; const userLevel =
user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || [];
if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) { if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) {
router.navigate({to: "/"}); router.navigate({ to: "/" });
} }
if (isError) { if (isError) {
return <div>{JSON.stringify(error)}</div>; return <div>{JSON.stringify(error)}</div>;
} }
console.log(data);
return ( return (
<LstCard className="m-2 flex place-content-center w-dvh"> <LstCard className="m-2 flex place-content-center w-dvh">
<Table> <Table>
@@ -79,15 +89,22 @@ export default function ServerPage() {
</> </>
) : ( ) : (
<TableBody> <TableBody>
{data?.map((server: Servers) => ( {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}> <TableRow key={server.server_id}>
<TableCell className="font-medium">{server.sName}</TableCell> <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"> <TableCell className="font-medium">
{format(server.lastUpdated, "MM/dd/yyyy hh:mm")} {server.serverDNS}
</TableCell> </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"> <TableCell className="font-medium">
{adminUrlCheck() && ( {adminUrlCheck() && (
<div className="flex flex-row"> <div className="flex flex-row">
@@ -99,7 +116,8 @@ export default function ServerPage() {
)} )}
</TableCell> </TableCell>
</TableRow> </TableRow>
))} );
})}
</TableBody> </TableBody>
)} )}
</Table> </Table>