refactor(frontend): added date-fns into the frontend

frontend/package-lock.json

@@ -28,6 +28,7 @@
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
                 "date-fns": "^4.1.0",
+                "date-fns-tz": "^3.2.0",
                 "dotenv": "^16.4.7",
                 "hono": "^4.7.5",
                 "js-cookie": "^3.0.5",
@@ -3775,6 +3776,15 @@
                 "url": "https://github.com/sponsors/kossnocorp"
             }
         },
+        "node_modules/date-fns-tz": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-3.2.0.tgz",
+            "integrity": "sha512-sg8HqoTEulcbbbVXeg84u5UnlsQa8GS5QXMqjjYIhS4abEVVKIUwe0/l/UhrZdKaL/W5eWZNlbTeEIiOXTcsBQ==",
+            "license": "MIT",
+            "peerDependencies": {
+                "date-fns": "^3.0.0 || ^4.0.0"
+            }
+        },
         "node_modules/debug": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",

frontend/package.json

@@ -32,6 +32,7 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "date-fns": "^4.1.0",
+        "date-fns-tz": "^3.2.0",
         "dotenv": "^16.4.7",
         "hono": "^4.7.5",
         "js-cookie": "^3.0.5",

frontend/src/components/admin/servers/ServerPage.tsx

@@ -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 {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;
@@ -25,22 +32,25 @@ export type Servers = {
 };
 
 export default function ServerPage() {
-    const {user, token} = useSessionStore();
+  const { user, token } = useSessionStore();
-    const {modules} = useModuleStore();
+  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 userLevel =
+    user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || [];
 
   if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) {
-        router.navigate({to: "/"});
+    router.navigate({ to: "/" });
   }
 
   if (isError) {
     return <div>{JSON.stringify(error)}</div>;
   }
+
+  console.log(data);
   return (
     <LstCard className="m-2 flex place-content-center w-dvh">
       <Table>
@@ -79,15 +89,22 @@ export default function ServerPage() {
           </>
         ) : (
           <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}>
                   <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")}
+                    {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">
@@ -99,7 +116,8 @@ export default function ServerPage() {
                     )}
                   </TableCell>
                 </TableRow>
-                        ))}
+              );
+            })}
           </TableBody>
         )}
       </Table>

frontend/src/components/auth/LoginForm.tsx

@@ -1,15 +1,15 @@
-import {useSessionStore} from "../../lib/store/sessionStore";
+import { useSessionStore } from "../../lib/store/sessionStore";
-import {LstCard} from "../extendedUI/LstCard";
+import { LstCard } from "../extendedUI/LstCard";
-import {CardHeader} from "../ui/card";
+import { CardHeader } from "../ui/card";
-import {toast} from "sonner";
+import { toast } from "sonner";
-import {z} from "zod";
+import { z } from "zod";
-import {useRouter} from "@tanstack/react-router";
+import { useRouter } from "@tanstack/react-router";
-import {Controller, useForm} from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
-import {zodResolver} from "@hookform/resolvers/zod";
+import { zodResolver } from "@hookform/resolvers/zod";
-import {Label} from "../ui/label";
+import { Label } from "../ui/label";
-import {Input} from "../ui/input";
+import { Input } from "../ui/input";
-import {Checkbox} from "../ui/checkbox";
+import { Checkbox } from "../ui/checkbox";
-import {Button} from "../ui/button";
+import { Button } from "../ui/button";
 
 const FormSchema = z.object({
   username: z.string().min(1, "You must enter a valid username"),
@@ -18,7 +18,7 @@ const FormSchema = z.object({
 });
 
 const LoginForm = () => {
-    const {setSession} = useSessionStore();
+  const { setSession } = useSessionStore();
   const rememeberMe = localStorage.getItem("rememberMe") === "true";
   const username = localStorage.getItem("username") || "";
   const router = useRouter();
@@ -26,7 +26,7 @@ const LoginForm = () => {
     register,
     handleSubmit,
     control,
-        formState: {errors},
+    formState: { errors },
   } = useForm<z.infer<typeof FormSchema>>({
     resolver: zodResolver(FormSchema),
     defaultValues: {
@@ -54,7 +54,10 @@ const LoginForm = () => {
         headers: {
           "Content-Type": "application/json",
         },
-                body: JSON.stringify({username: value.username, password: value.password}),
+        body: JSON.stringify({
+          username: value.username,
+          password: value.password,
+        }),
       });
 
       const data = await response.json();
@@ -63,18 +66,18 @@ const LoginForm = () => {
       // localStorage.setItem("auth_token", data.data.token);
       if (data.success) {
         const prod = btoa(`${value.username.toLowerCase()}:${value.password}`);
-                const prodUser = {...data.user, prod: prod};
+        const prodUser = { ...data.user, prod: prod };
 
         setSession(prodUser, data.token);
         toast.success(`You are logged in as ${data.user.username}`);
-                router.navigate({to: "/"});
+        router.navigate({ to: "/" });
       }
 
       if (!data.success) {
         toast.error(`${data.message}`);
       }
 
-            console.log(data);
+      //console.log(data);
     } catch (err) {
       toast.error("Invalid credentials");
     }
@@ -100,7 +103,11 @@ const LoginForm = () => {
               className={errors.username ? "border-red-500" : ""}
               aria-invalid={!!errors.username}
             />
-                        {errors.username && <p className="text-red-500 text-sm mt-1">{errors.username.message}</p>}
+            {errors.username && (
+              <p className="text-red-500 text-sm mt-1">
+                {errors.username.message}
+              </p>
+            )}
           </div>
           <div>
             <>
@@ -113,13 +120,17 @@ const LoginForm = () => {
                 className={errors.password ? "border-red-500" : ""}
                 aria-invalid={!!errors.password}
               />
-                            {errors.password && <p className="text-red-500 text-sm mt-1">{errors.password.message}</p>}
+              {errors.password && (
+                <p className="text-red-500 text-sm mt-1">
+                  {errors.password.message}
+                </p>
+              )}
             </>
           </div>
           <div className="flex justify-between pt-2">
             <div className="flex">
               <Controller
-                                render={({field}) => (
+                render={({ field }) => (
                   <>
                     <Checkbox
                       id="remember"

package.json

@@ -32,7 +32,7 @@
     }
   },
   "admConfig": {
-    "build": 47,
+    "build": 48,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

server/services/auth/routes/user/getUserRoles.ts

@@ -1,10 +1,7 @@
 import { z, createRoute, OpenAPIHono } from "@hono/zod-openapi";
-import { apiHit } from "../../../../globalUtils/apiHits.js";
 import jwt from "jsonwebtoken";
-
 import type { CustomJwtPayload } from "../../../../types/jwtToken.js";
 import { authMiddleware } from "../../middleware/authMiddleware.js";
-import hasCorrectRole from "../../middleware/roleCheck.js";
 import { roleCheck } from "../../controllers/userRoles/getUserAccess.js";
 
 const { verify } = jwt;
@@ -16,10 +13,10 @@ const responseSchema = z.object({
 
 app.openapi(
   createRoute({
-    tags: ["Auth:user"],
+    tags: ["auth:user"],
     summary: "returns the users access",
     method: "get",
-    path: "/getAccess",
+    path: "/getuseraccess",
     middleware: [authMiddleware],
     responses: {
       200: {

server/services/sqlServer/prodSqlServer.ts

@@ -1,68 +1,126 @@
 import sql from "mssql";
-import {prodSqlConfig} from "./utils/prodServerConfig.js";
+import { prodSqlConfig } from "./utils/prodServerConfig.js";
-import {createLog} from "../logger/logger.js";
+import { createLog } from "../logger/logger.js";
-import {db} from "../../../database/dbclient.js";
+import { db } from "../../../database/dbclient.js";
-import {settings} from "../../../database/schema/settings.js";
+import { settings } from "../../../database/schema/settings.js";
-import {eq} from "drizzle-orm";
+import { eq } from "drizzle-orm";
-import {installed} from "../../index.js";
+import { installed } from "../../index.js";
-import {checkHostnamePort} from "../../globalUtils/pingServer.js";
+import { checkHostnamePort } from "../../globalUtils/pingServer.js";
 
 let pool: any;
 let connected: boolean = false;
 export const initializeProdPool = async () => {
   if (!installed) {
-        createLog("info", "lst", "sqlProd", "The server was not installed will reconnect in 5 seconds");
+    createLog(
+      "info",
+      "lst",
+      "sqlProd",
+      "The server was not installed will reconnect in 5 seconds"
+    );
     setTimeout(() => {
       initializeProdPool();
     }, 5 * 1000);
 
-        return {success: false, message: "The server is not installed."};
+    return { success: false, message: "The server is not installed." };
   }
-    const dbServer = await db.select().from(settings).where(eq(settings.name, "dbServer"));
+  const dbServer = await db
+    .select()
+    .from(settings)
+    .where(eq(settings.name, "dbServer"));
   const serverUp = await checkHostnamePort(`${dbServer[0].value}:1433`);
 
   if (!serverUp) {
-        createLog("error", "lst", "server", `The sql ${dbServer[0].value} is not reachable`);
+    createLog(
-        return {success: false, message: `The sql ${dbServer[0].value} is not reachable`};
+      "error",
+      "lst",
+      "server",
+      `The sql ${dbServer[0].value} is not reachable`
+    );
+    return {
+      success: false,
+      message: `The sql ${dbServer[0].value} is not reachable`,
+    };
   }
 
   // make sure the server is not set to localhost this will prevent some weird issues later but can be localhost on the dev
-    const serverLoc = await db.select().from(settings).where(eq(settings.name, "dbServer"));
+  const serverLoc = await db
-    if (serverLoc[0].value === "localhost" && process.env.NODE_ENV !== "development") {
+    .select()
-        createLog("error", "lst", "sqlProd", "The server is set to localhost, and you are not in development mode.");
+    .from(settings)
-        return {success: false, message: "The server is set to localhost, and you are not in development mode."};
+    .where(eq(settings.name, "dbServer"));
+  if (
+    serverLoc[0].value === "localhost" &&
+    process.env.NODE_ENV !== "development"
+  ) {
+    createLog(
+      "error",
+      "lst",
+      "sqlProd",
+      "The server is set to localhost, and you are not in development mode."
+    );
+    return {
+      success: false,
+      message:
+        "The server is set to localhost, and you are not in development mode.",
+    };
   }
 
   // if you were restarting from the endpoint you get this lovely error
   if (connected) {
     createLog("error", "lst", "sqlProd", "There is already a connection.");
-        return {success: false, message: "There is already a connection."};
+    return { success: false, message: "There is already a connection." };
   }
   try {
     const config = await prodSqlConfig();
     pool = await sql.connect(config!);
 
-        createLog("info", "lst", "sqlProd", `Connected to ${config?.server}, and looking at ${config?.database}`);
+    createLog(
+      "info",
+      "lst",
+      "sqlProd",
+      `Connected to ${config?.server}, and looking at ${config?.database}`
+    );
     connected = true;
-        return {success: true, message: "The sql server connection has been closed"};
+    return {
-    } catch (error) {
+      success: true,
-        createLog("error", "lst", "sqlProd", `${JSON.stringify(error)}, "There was an error connecting to the pool."`);
+      message: "The sql server connection has been closed",
-        throw new Error("There was an error closing the sql connection");
+    };
-    }
-};
-
-export const closePool = async () => {
-    try {
-        await pool.close();
-        createLog("info", "lst", "sqlProd", "Connection pool closed");
-        connected = false;
-        return {success: true, message: "The sql server connection has been closed"};
   } catch (error) {
     createLog(
       "error",
       "lst",
       "sqlProd",
-            `${JSON.stringify(error)},  "There was an error closing the sql connection"`
+      `${JSON.stringify(error)}, "There was an error connecting to the pool."`
+    );
+    throw new Error("There was an error closing the sql connection");
+  }
+};
+
+export const closePool = async () => {
+  if (!connected) {
+    createLog(
+      "error",
+      "lst",
+      "sqlProd",
+      "There is no connection a connection."
+    );
+    return { success: false, message: "There is already a connection." };
+  }
+  try {
+    await pool.close();
+    createLog("info", "lst", "sqlProd", "Connection pool closed");
+    connected = false;
+    return {
+      success: true,
+      message: "The sql server connection has been closed",
+    };
+  } catch (error) {
+    createLog(
+      "error",
+      "lst",
+      "sqlProd",
+      `${JSON.stringify(
+        error
+      )},  "There was an error closing the sql connection"`
     );
     throw new Error("There was an error closing the sql connection");
   }
@@ -72,22 +130,44 @@ export async function query(queryToRun: string, name: string) {
   /**
    * Just an extra catch incase someone tried to run a query while we were not connected to the server or sql server
    */
-    const dbServer = await db.select().from(settings).where(eq(settings.name, "dbServer"));
+  const dbServer = await db
+    .select()
+    .from(settings)
+    .where(eq(settings.name, "dbServer"));
   const serverUp = await checkHostnamePort(`${dbServer[0].value}:1433`);
 
   if (!serverUp) {
-        createLog("error", "lst", "server", `The sql ${dbServer[0].value} is not reachable`);
+    createLog(
-        return {success: false, message: `The sql ${dbServer[0].value} is not reachable`};
+      "error",
+      "lst",
+      "server",
+      `The sql ${dbServer[0].value} is not reachable`
+    );
+    return {
+      success: false,
+      message: `The sql ${dbServer[0].value} is not reachable`,
+    };
   }
 
   if (!connected) {
-        createLog("error", "lst", "server", `The sql ${dbServer[0].value} is not connected`);
+    createLog(
-        return {success: false, message: `The sql ${dbServer[0].value} is not not connected`};
+      "error",
+      "lst",
+      "server",
+      `The sql ${dbServer[0].value} is not connected`
+    );
+    return {
+      success: false,
+      message: `The sql ${dbServer[0].value} is not not connected`,
+    };
   }
   /**
    * We no longer need to send over the plant token change as we do it inside the query function.
    */
-    const plantToken = await db.select().from(settings).where(eq(settings.name, "plantToken"));
+  const plantToken = await db
+    .select()
+    .from(settings)
+    .where(eq(settings.name, "plantToken"));
   const query = queryToRun.replaceAll("test1", plantToken[0].value);
 
   try {
@@ -96,12 +176,19 @@ export async function query(queryToRun: string, name: string) {
     return result.recordset;
   } catch (error: any) {
     if (error.code === "ETIMEOUT") {
-            createLog("error", "lst", "sqlProd", `${JSON.stringify(error)}, ${name} did not run due to a timeout.`);
+      createLog(
+        "error",
+        "lst",
+        "sqlProd",
+        `${JSON.stringify(error)}, ${name} did not run due to a timeout.`
+      );
       throw new Error(`${name} query did not run due to a timeout.`);
     }
 
     if (error.code === "EREQUEST") {
-            throw new Error(`${name} encoutnered an error ${error.originalError.info.message}`);
+      throw new Error(
+        `${name} encoutnered an error ${error.originalError.info.message}`
+      );
     }
 
     //console.log(error.originalError.info.message);