fix(renderfixes): some strange rendering fixes that should have been caught long time ago

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

@@ -23,6 +23,7 @@ import { Button } from "@/components/ui/button";
 import { getSettings } from "@/utils/querys/settings";
 import { toast } from "sonner";
 import axios from "axios";
+import { useEffect } from "react";
 //import { useState } from "react";
 
 export type Servers = {
@@ -46,14 +47,35 @@ export default function ServerPage() {
         getServers(token ?? "")
     );
 
-    const adminModule = modules.filter((n) => n.name === "admin");
+    // const adminModule = modules.filter((n) => n.name === "admin");
-    const userLevel =
+    // const userLevel =
-        user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) ||
+    //     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: "/" });
+    //     console.log("Something failed");
-    }
+    //     //router.navigate({ to: "/" });
+    // }
+
+    useEffect(() => {
+        if (!user || modules.length === 0) return;
+
+        const adminModule = modules.find((n) => n.name === "admin");
+        if (!adminModule) {
+            console.log("no module loaded");
+            //router.navigate({ to: "/" });
+            return;
+        }
+
+        const userLevel =
+            user?.roles?.filter((r) => r.module_id === adminModule.module_id) ||
+            [];
+
+        if (!adminModule.roles?.includes(userLevel[0]?.role)) {
+            console.log("Something failed");
+            //router.navigate({ to: "/" });
+        }
+    }, [modules, user, router]);
 
     if (isError) {
         return <div>{JSON.stringify(error)}</div>;

frontend/src/components/admin/settings/SettingsPage.tsx

@@ -1,12 +1,19 @@
-import {LstCard} from "@/components/extendedUI/LstCard";
+import { LstCard } from "@/components/extendedUI/LstCard";
-import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
+import {
-import {useSessionStore} from "@/lib/store/sessionStore";
+    Table,
-import {useModuleStore} from "@/lib/store/useModuleStore";
+    TableBody,
-import {useQuery} from "@tanstack/react-query";
+    TableCell,
-import {useRouter} from "@tanstack/react-router";
+    TableHead,
-import {ChangeSetting} from "./SettingForm";
+    TableHeader,
-import {getSettings} from "@/utils/querys/settings";
+    TableRow,
-import {Skeleton} from "@/components/ui/skeleton";
+} from "@/components/ui/table";
+import { useSessionStore } from "@/lib/store/sessionStore";
+import { useModuleStore } from "@/lib/store/useModuleStore";
+import { useQuery } from "@tanstack/react-query";
+import { useRouter } from "@tanstack/react-router";
+import { ChangeSetting } from "./SettingForm";
+import { getSettings } from "@/utils/querys/settings";
+import { Skeleton } from "@/components/ui/skeleton";
 
 export type Settings = {
     settings_id?: string;
@@ -16,18 +23,22 @@ export type Settings = {
 };
 
 export default function SettingsPage() {
-    const {user, token} = useSessionStore();
+    const { user, token } = useSessionStore();
-    const {modules} = useModuleStore();
+    const { modules } = useModuleStore();
     const router = useRouter();
 
     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: "/" });
     }
 
-    const {data, isError, error, isLoading} = useQuery(getSettings(token ?? ""));
+    const { data, isError, error, isLoading } = useQuery(
+        getSettings(token ?? "")
+    );
 
     // if (isLoading) {
     //     return <div>Loading.....</div>;
@@ -51,32 +62,38 @@ export default function SettingsPage() {
                     <>
                         <TableBody>
                             {Array(10)
-                            .fill(0)
+                                .fill(0)
-                            .map((_, i) => (
+                                .map((_, i) => (
-                                <TableRow key={i}>
+                                    <TableRow key={i}>
-                                    <TableCell className="font-medium">
+                                        <TableCell className="font-medium">
-                                        <Skeleton className="h-4" />
+                                            <Skeleton className="h-4" />
-                                    </TableCell>
+                                        </TableCell>
-                                    <TableCell>
+                                        <TableCell>
-                                        <Skeleton className="h-4" />
+                                            <Skeleton className="h-4" />
-                                    </TableCell>
+                                        </TableCell>
-                                    <TableCell>
+                                        <TableCell>
-                                        <Skeleton className="h-4" />
+                                            <Skeleton className="h-4" />
-                                    </TableCell>
+                                        </TableCell>
-                                    <TableCell>
+                                        <TableCell>
-                                        <Skeleton className="h-4" />
+                                            <Skeleton className="h-4" />
-                                    </TableCell>
+                                        </TableCell>
-                                </TableRow>
+                                    </TableRow>
-                            ))}
+                                ))}
                         </TableBody>
                     </>
                 ) : (
                     <TableBody>
                         {data?.map((setting: Settings) => (
                             <TableRow key={setting.settings_id}>
-                                <TableCell className="font-medium">{setting.name}</TableCell>
+                                <TableCell className="font-medium">
-                                <TableCell className="font-medium">{setting.value}</TableCell>
+                                    {setting.name}
-                                <TableCell className="font-medium">{setting.description}</TableCell>
+                                </TableCell>
+                                <TableCell className="font-medium">
+                                    {setting.value}
+                                </TableCell>
+                                <TableCell className="font-medium">
+                                    {setting.description}
+                                </TableCell>
                                 <TableCell className="font-medium">
                                     <ChangeSetting setting={setting} />
                                 </TableCell>

frontend/src/components/production/ocp/OcpPage.tsx

@@ -15,6 +15,7 @@ import {
 export default function OCPPage() {
     const { settings } = useSettingStore();
 
+    if (settings.length === 0) return;
     let server = settings.filter((n) => n.name === "server");
 
     return (
@@ -68,7 +69,7 @@ export default function OCPPage() {
                         direction="vertical"
                         autoSaveId="ocpPage"
                     >
-                        {server[0]?.value === "usday1vms006" && (
+                        {server[0].value === "usday1vms006" && (
                             <ResizablePanel className="max-h-[300px]">
                                 <WrapperManualTrigger />
                             </ResizablePanel>

frontend/src/components/providers/Providers.tsx

@@ -20,6 +20,7 @@ export const SessionProvider = ({
     useEffect(() => {
         fetchModules();
         fetchSettings();
+        console.log("settings grab ran");
         fetchUserRoles();
         fetchSubModules();
     }, []);

frontend/src/components/ui/calendar.tsx

@@ -1,73 +1,208 @@
 import * as React from "react"
-import { ChevronLeft, ChevronRight } from "lucide-react"
+import {
-import { DayPicker } from "react-day-picker"
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+} from "lucide-react"
+import { DayButton, DayPicker, getDefaultClassNames } from "react-day-picker"
 
 import { cn } from "@/lib/utils"
-import { buttonVariants } from "@/components/ui/button"
+import { Button, buttonVariants } from "@/components/ui/button"
 
 function Calendar({
   className,
   classNames,
   showOutsideDays = true,
+  captionLayout = "label",
+  buttonVariant = "ghost",
+  formatters,
+  components,
   ...props
-}: React.ComponentProps<typeof DayPicker>) {
+}: React.ComponentProps<typeof DayPicker> & {
+  buttonVariant?: React.ComponentProps<typeof Button>["variant"]
+}) {
+  const defaultClassNames = getDefaultClassNames()
+
   return (
     <DayPicker
       showOutsideDays={showOutsideDays}
-      className={cn("p-3", className)}
+      className={cn(
+        "bg-background group/calendar p-3 [--cell-size:--spacing(8)] [[data-slot=card-content]_&]:bg-transparent [[data-slot=popover-content]_&]:bg-transparent",
+        String.raw`rtl:**:[.rdp-button\_next>svg]:rotate-180`,
+        String.raw`rtl:**:[.rdp-button\_previous>svg]:rotate-180`,
+        className
+      )}
+      captionLayout={captionLayout}
+      formatters={{
+        formatMonthDropdown: (date) =>
+          date.toLocaleString("default", { month: "short" }),
+        ...formatters,
+      }}
       classNames={{
-        months: "flex flex-col sm:flex-row gap-2",
+        root: cn("w-fit", defaultClassNames.root),
-        month: "flex flex-col gap-4",
+        months: cn(
-        caption: "flex justify-center pt-1 relative items-center w-full",
+          "flex gap-4 flex-col md:flex-row relative",
-        caption_label: "text-sm font-medium",
+          defaultClassNames.months
-        nav: "flex items-center gap-1",
-        nav_button: cn(
-          buttonVariants({ variant: "outline" }),
-          "size-7 bg-transparent p-0 opacity-50 hover:opacity-100"
         ),
-        nav_button_previous: "absolute left-1",
+        month: cn("flex flex-col w-full gap-4", defaultClassNames.month),
-        nav_button_next: "absolute right-1",
+        nav: cn(
-        table: "w-full border-collapse space-x-1",
+          "flex items-center gap-1 w-full absolute top-0 inset-x-0 justify-between",
-        head_row: "flex",
+          defaultClassNames.nav
-        head_cell:
+        ),
-          "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
+        button_previous: cn(
-        row: "flex w-full mt-2",
+          buttonVariants({ variant: buttonVariant }),
-        cell: cn(
+          "size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
-          "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-range-end)]:rounded-r-md",
+          defaultClassNames.button_previous
-          props.mode === "range"
+        ),
-            ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
+        button_next: cn(
-            : "[&:has([aria-selected])]:rounded-md"
+          buttonVariants({ variant: buttonVariant }),
+          "size-(--cell-size) aria-disabled:opacity-50 p-0 select-none",
+          defaultClassNames.button_next
+        ),
+        month_caption: cn(
+          "flex items-center justify-center h-(--cell-size) w-full px-(--cell-size)",
+          defaultClassNames.month_caption
+        ),
+        dropdowns: cn(
+          "w-full flex items-center text-sm font-medium justify-center h-(--cell-size) gap-1.5",
+          defaultClassNames.dropdowns
+        ),
+        dropdown_root: cn(
+          "relative has-focus:border-ring border border-input shadow-xs has-focus:ring-ring/50 has-focus:ring-[3px] rounded-md",
+          defaultClassNames.dropdown_root
+        ),
+        dropdown: cn("absolute inset-0 opacity-0", defaultClassNames.dropdown),
+        caption_label: cn(
+          "select-none font-medium",
+          captionLayout === "label"
+            ? "text-sm"
+            : "rounded-md pl-2 pr-1 flex items-center gap-1 text-sm h-8 [&>svg]:text-muted-foreground [&>svg]:size-3.5",
+          defaultClassNames.caption_label
+        ),
+        table: "w-full border-collapse",
+        weekdays: cn("flex", defaultClassNames.weekdays),
+        weekday: cn(
+          "text-muted-foreground rounded-md flex-1 font-normal text-[0.8rem] select-none",
+          defaultClassNames.weekday
+        ),
+        week: cn("flex w-full mt-2", defaultClassNames.week),
+        week_number_header: cn(
+          "select-none w-(--cell-size)",
+          defaultClassNames.week_number_header
+        ),
+        week_number: cn(
+          "text-[0.8rem] select-none text-muted-foreground",
+          defaultClassNames.week_number
         ),
         day: cn(
-          buttonVariants({ variant: "ghost" }),
+          "relative w-full h-full p-0 text-center [&:first-child[data-selected=true]_button]:rounded-l-md [&:last-child[data-selected=true]_button]:rounded-r-md group/day aspect-square select-none",
-          "size-8 p-0 font-normal aria-selected:opacity-100"
+          defaultClassNames.day
         ),
-        day_range_start:
+        range_start: cn(
-          "day-range-start aria-selected:bg-primary aria-selected:text-primary-foreground",
+          "rounded-l-md bg-accent",
-        day_range_end:
+          defaultClassNames.range_start
-          "day-range-end aria-selected:bg-primary aria-selected:text-primary-foreground",
+        ),
-        day_selected:
+        range_middle: cn("rounded-none", defaultClassNames.range_middle),
-          "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
+        range_end: cn("rounded-r-md bg-accent", defaultClassNames.range_end),
-        day_today: "bg-accent text-accent-foreground",
+        today: cn(
-        day_outside:
+          "bg-accent text-accent-foreground rounded-md data-[selected=true]:rounded-none",
-          "day-outside text-muted-foreground aria-selected:text-muted-foreground",
+          defaultClassNames.today
-        day_disabled: "text-muted-foreground opacity-50",
+        ),
-        day_range_middle:
+        outside: cn(
-          "aria-selected:bg-accent aria-selected:text-accent-foreground",
+          "text-muted-foreground aria-selected:text-muted-foreground",
-        day_hidden: "invisible",
+          defaultClassNames.outside
+        ),
+        disabled: cn(
+          "text-muted-foreground opacity-50",
+          defaultClassNames.disabled
+        ),
+        hidden: cn("invisible", defaultClassNames.hidden),
         ...classNames,
       }}
       components={{
-        IconLeft: ({ className, ...props }) => (
+        Root: ({ className, rootRef, ...props }) => {
-          <ChevronLeft className={cn("size-4", className)} {...props} />
+          return (
-        ),
+            <div
-        IconRight: ({ className, ...props }) => (
+              data-slot="calendar"
-          <ChevronRight className={cn("size-4", className)} {...props} />
+              ref={rootRef}
-        ),
+              className={cn(className)}
+              {...props}
+            />
+          )
+        },
+        Chevron: ({ className, orientation, ...props }) => {
+          if (orientation === "left") {
+            return (
+              <ChevronLeftIcon className={cn("size-4", className)} {...props} />
+            )
+          }
+
+          if (orientation === "right") {
+            return (
+              <ChevronRightIcon
+                className={cn("size-4", className)}
+                {...props}
+              />
+            )
+          }
+
+          return (
+            <ChevronDownIcon className={cn("size-4", className)} {...props} />
+          )
+        },
+        DayButton: CalendarDayButton,
+        WeekNumber: ({ children, ...props }) => {
+          return (
+            <td {...props}>
+              <div className="flex size-(--cell-size) items-center justify-center text-center">
+                {children}
+              </div>
+            </td>
+          )
+        },
+        ...components,
       }}
       {...props}
     />
   )
 }
 
-export { Calendar }
+function CalendarDayButton({
+  className,
+  day,
+  modifiers,
+  ...props
+}: React.ComponentProps<typeof DayButton>) {
+  const defaultClassNames = getDefaultClassNames()
+
+  const ref = React.useRef<HTMLButtonElement>(null)
+  React.useEffect(() => {
+    if (modifiers.focused) ref.current?.focus()
+  }, [modifiers.focused])
+
+  return (
+    <Button
+      ref={ref}
+      variant="ghost"
+      size="icon"
+      data-day={day.date.toLocaleDateString()}
+      data-selected-single={
+        modifiers.selected &&
+        !modifiers.range_start &&
+        !modifiers.range_end &&
+        !modifiers.range_middle
+      }
+      data-range-start={modifiers.range_start}
+      data-range-end={modifiers.range_end}
+      data-range-middle={modifiers.range_middle}
+      className={cn(
+        "data-[selected-single=true]:bg-primary data-[selected-single=true]:text-primary-foreground data-[range-middle=true]:bg-accent data-[range-middle=true]:text-accent-foreground data-[range-start=true]:bg-primary data-[range-start=true]:text-primary-foreground data-[range-end=true]:bg-primary data-[range-end=true]:text-primary-foreground group-data-[focused=true]/day:border-ring group-data-[focused=true]/day:ring-ring/50 dark:hover:text-accent-foreground flex aspect-square size-auto w-full min-w-(--cell-size) flex-col gap-1 leading-none font-normal group-data-[focused=true]/day:relative group-data-[focused=true]/day:z-10 group-data-[focused=true]/day:ring-[3px] data-[range-end=true]:rounded-md data-[range-end=true]:rounded-r-md data-[range-middle=true]:rounded-none data-[range-start=true]:rounded-md data-[range-start=true]:rounded-l-md [&>span]:text-xs [&>span]:opacity-70",
+        defaultClassNames.day,
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { Calendar, CalendarDayButton }

frontend/src/components/ui/card.tsx

@@ -19,7 +19,10 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
       data-slot="card-header"
-      className={cn("flex flex-col gap-1.5 px-6", className)}
+      className={cn(
+        "@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
+        className
+      )}
       {...props}
     />
   )
@@ -45,6 +48,19 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
   )
 }
 
+function CardAction({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-action"
+      className={cn(
+        "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
 function CardContent({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
@@ -59,10 +75,18 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
       data-slot="card-footer"
-      className={cn("flex items-center px-6", className)}
+      className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
       {...props}
     />
   )
 }
 
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardAction,
+  CardDescription,
+  CardContent,
+}

frontend/src/lib/store/useSettings.ts

@@ -1,9 +1,8 @@
 import axios from "axios";
-import {create} from "zustand";
+import { create } from "zustand";
 
 interface SettingState {
     settings: any[];
-
     fetchSettings: () => Promise<void>;
     setSettings: (settings: any[]) => void;
 }
@@ -13,17 +12,17 @@ interface FetchModulesResponse {
 
 export const useSettingStore = create<SettingState>()((set) => ({
     settings: [],
-    setSettings: (settings) => set({settings}),
+    setSettings: (settings) => set({ settings }),
     fetchSettings: async () => {
         try {
             //const response = await axios.get<{data: Setting[]}>(`${process.env.NEXT_PUBLIC_URL}/api/settings/client`);
             const response = await axios.get(`/api/server/settings`, {});
             const data: FetchModulesResponse = response.data; //await response.json();
             //console.log(data);
-            set({settings: data.data});
+            set({ settings: data.data });
         } catch (error) {
             console.error("Failed to fetch settings:", error);
-            set({settings: []});
+            set({ settings: [] });
         }
     },
 }));

frontend/src/utils/formStuff/index.tsx

@@ -2,12 +2,13 @@ import { createFormHook, createFormHookContexts } from "@tanstack/react-form";
 import { InputField } from "./options/InputField";
 import { SubmitButton } from "./options/submitButton";
 import { SelectField } from "./options/selectorField";
+import { CheckboxField } from "./options/checkbox";
 
 export const { fieldContext, useFieldContext, formContext, useFormContext } =
     createFormHookContexts();
 
 export const { useAppForm } = createFormHook({
-    fieldComponents: { InputField, SelectField },
+    fieldComponents: { InputField, SelectField, CheckboxField },
     formComponents: { SubmitButton },
     fieldContext,
     formContext,