- Enhance layout and responsiveness of camera components

- update system health hook for periodic refetching

src/app/reducers/cameraFeedReducer.ts

@@ -12,12 +12,23 @@ export const initialState: CameraFeedState = {
       { name: "Region 1", brushColour: "#ff0000" },
       { name: "Region 2", brushColour: "#00ff00" },
       { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Region 5", brushColour: "#fc35db" },
     ],
     B: [
       { name: "Region 1", brushColour: "#ff0000" },
       { name: "Region 2", brushColour: "#00ff00" },
+      { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Region 5", brushColour: "#fc35db" },
+    ],
+    C: [
+      { name: "Region 1", brushColour: "#ff0000" },
+      { name: "Region 2", brushColour: "#00ff00" },
+      { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Region 5", brushColour: "#fc35db" },
     ],
-    C: [{ name: "Region 1", brushColour: "#ff0000" }],
   },
 
   selectedRegionIndex: 0,

src/features/cameras/components/CameraGrid.tsx

@@ -9,7 +9,7 @@ const CameraGrid = () => {
   const [tabIndex, setTabIndex] = useState(0);
 
   return (
-    <div className="grid grid-cols-1 md:grid-cols-5 md:grid-rows-5 max-h-screen">
+    <div className="flex flex-col gap-4 p-4 md:grid md:grid-cols-5 md:grid-rows-5 md:max-h-screen md:gap-0 md:p-0">
       <VideoFeedGridPainter />
       <CameraSettings tabIndex={tabIndex} setTabIndex={setTabIndex} />
       <PlatePatch />

src/features/cameras/components/CameraSettings/CameraSettings.tsx

@@ -10,7 +10,7 @@ type CameraSettingsProps = {
 
 const CameraSettings = ({ tabIndex, setTabIndex }: CameraSettingsProps) => {
   return (
-    <Card className="p-4 col-span-3 row-span-5 col-start-3 md:col-span-3 md:row-span-5 max-h-screen overflow-auto">
+    <Card className="p-4 w-full overflow-auto md:col-span-2 md:row-span-5 md:col-start-4 md:row-start-1">
       <Tabs
         selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none rounded-sm mb-1"
         className="react-tabs"

src/features/cameras/components/CameraSettings/ColourPicker.tsx

@@ -10,6 +10,7 @@ const ColourPicker = ({ colour, setColour }: ColourPickerProps) => {
       name=""
       id=""
       value={colour}
+      disabled
       onChange={(e) => setColour(e.target.value)}
       className="h-8 w-8 p-0 rounded-md border border-slate-500 cursor-pointer"
     />

src/features/cameras/components/CameraSettings/RegionSelector.tsx

@@ -1,6 +1,7 @@
-import type { PaintedCell, Region } from "../../../../types/types";
+import type { ColourData, PaintedCell, Region } from "../../../../types/types";
 import ColourPicker from "./ColourPicker";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
+import { useColourDectection } from "../../hooks/useColourDetection";
 
 type RegionSelectorProps = {
   regions: Region[];
@@ -10,19 +11,14 @@ type RegionSelectorProps = {
 };
 
 const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: RegionSelectorProps) => {
-  const { dispatch } = useCameraFeedContext();
+  const { colourMutation } = useColourDectection();
+  const { state, dispatch } = useCameraFeedContext();
+  const paintedCells = state.paintedCells[cameraFeedID];
+
   const handleChange = (e: { target: { value: string } }) => {
     dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: e.target.value } });
   };
 
-  const handleAddRegionClick = () => {
-    const regionName = `Region ${regions.length + 1}`;
-    dispatch({
-      type: "ADD_NEW_REGION",
-      payload: { cameraFeedID: cameraFeedID, regionName: regionName, brushColour: "#ffffff" },
-    });
-  };
-
   const handleResetRegion = () => {
     dispatch({
       type: "RESET_PAINTED_CELLS",
@@ -30,13 +26,6 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
     });
   };
 
-  const handleRemoveClick = () => {
-    dispatch({
-      type: "REMOVE_REGION",
-      payload: { cameraFeedID: cameraFeedID, regionName: regions[selectedRegionIndex].name },
-    });
-  };
-
   const handleModeChange = (newMode: string) => {
     dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: newMode } });
   };
@@ -54,6 +43,53 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
     });
   };
 
+  const handleSaveclick = () => {
+    const regions: ColourData[] = [];
+    const test = Array.from(paintedCells.entries());
+    const region1 = test.filter(([, cell]) => cell.region.name === "Region 1");
+    const region2 = test.filter(([, cell]) => cell.region.name === "Region 2");
+    const region3 = test.filter(([, cell]) => cell.region.name === "Region 3");
+    const region4 = test.filter(([, cell]) => cell.region.name === "Region 4");
+    const region5 = test.filter(([, cell]) => cell.region.name === "Region 5");
+    const region1Data = {
+      id: 1,
+      cells: region1.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
+    };
+    const region2Data = {
+      id: 2,
+      cells: region2.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
+    };
+    const region3Data = {
+      id: 3,
+      cells: region3.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
+    };
+    const region4Data = {
+      id: 4,
+      cells: region4.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
+    };
+    const region5Data = {
+      id: 5,
+      cells: region5.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
+    };
+    if (region1Data.cells.length > 0) {
+      regions.push(region1Data);
+    }
+    if (region2Data.cells.length > 0) {
+      regions.push(region2Data);
+    }
+    if (region3Data.cells.length > 0) {
+      regions.push(region3Data);
+    }
+    if (region4Data.cells.length > 0) {
+      regions.push(region4Data);
+    }
+    if (region5Data.cells.length > 0) {
+      regions.push(region5Data);
+    }
+
+    colourMutation.mutate({ cameraFeedID, regions: regions });
+  };
+
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 md:grid-rows-2 gap-4">
       <div className="p-2 border border-gray-600 rounded-lg flex flex-col">
@@ -103,7 +139,7 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
               <label
                 htmlFor={inputId}
                 key={region.name}
-                className={`items-center p-4 m-4 rounded-xl border flex flex-row justify-between
+                className={`items-center p-4 m-1 rounded-xl border flex flex-row justify-between
                   ${isSelected ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"} hover:bg-[#202b36] hover:cursor-pointer`}
               >
                 <div className="flex flex-row gap-4 items-center">
@@ -121,24 +157,22 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
                   <span className="text-xl">{region.name}</span>
                 </div>
                 <ColourPicker colour={region.brushColour} setColour={(c: string) => handleRegionColourChange(idx, c)} />
-                <p className="text-slate-400">{region.brushColour}</p>
+                <div></div>
               </label>
             );
           })}
         </>
-        <div className=" mx-auto flex flex-row gap-4  mt-4">
-          <button className="border border-blue-900 bg-blue-700 px-4 rounded-md" onClick={handleAddRegionClick}>
-            Add Region
-          </button>
-          <button className="border border-red-900 px-4 rounded-md" onClick={handleRemoveClick}>
-            Remove Region
-          </button>
-        </div>
       </div>
 
       <div className="p-2 border border-gray-600 rounded-lg flex flex-col md:col-span-2 h-50">
         <div className="flex flex-col">
           <h2 className="text-2xl mb-2">Actions</h2>
+          <button
+            onClick={handleSaveclick}
+            className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full md:w-[40%] hover:bg-blue-700 hover:cursor-pointer"
+          >
+            Save Region
+          </button>
           <button
             onClick={handleResetRegion}
             className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-[40%] hover:bg-red-700 hover:cursor-pointer"

src/features/cameras/components/PlatePatch/SightingPatch.tsx

@@ -6,7 +6,7 @@ import SightingExitTable from "./SightingExitTable";
 
 const PlatePatch = () => {
   return (
-    <Card className="md:row-start-4 md:col-span-2 p-4 h-[190%]">
+    <Card className="p-4 w-full md:w-[95%] md:row-start-4 md:col-span-3 md:h-[190%]">
       <CardHeader title="Entry / Exit" />
       <Tabs>
         <TabList>

src/features/cameras/components/Video/VideoFeedGridPainter.tsx

@@ -3,12 +3,14 @@ import { Stage, Layer, Image, Shape } from "react-konva";
 import type { KonvaEventObject } from "konva/lib/Node";
 import { useCreateVideoSnapshot } from "../../hooks/useGetvideoSnapshots";
 
-import Card from "../../../../ui/Card";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 
-const rows = 40;
+const BACKEND_WIDTH = 640;
+const BACKEND_HEIGHT = 360;
+const BACKEND_CELL_SIZE = 16;
+
+const rows = 22.5;
 const cols = 40;
-const size = 20;
 const gap = 0;
 
 const VideoFeedGridPainter = () => {
@@ -19,9 +21,12 @@ const VideoFeedGridPainter = () => {
   const selectedRegionIndex = state.selectedRegionIndex;
   const mode = state.modeByCamera[cameraFeedID];
   const { latestBitmapRef, isloading } = useCreateVideoSnapshot();
-  const [stageSize, setStageSize] = useState({ width: 740, height: 460 });
+  const [stageSize, setStageSize] = useState({ width: BACKEND_WIDTH, height: BACKEND_HEIGHT });
   const isDrawingRef = useRef(false);
 
+  const currentScale = stageSize.width / BACKEND_WIDTH;
+  const size = BACKEND_CELL_SIZE * currentScale;
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const paintLayerRef = useRef<any>(null);
 
@@ -60,7 +65,7 @@ const VideoFeedGridPainter = () => {
 
     if (existing && existing.colour === currentColour) return;
 
-    map.set(key, { colour: currentColour });
+    map.set(key, { colour: currentColour, region: activeRegion });
 
     paintLayerRef.current?.batchDraw();
   };
@@ -87,25 +92,25 @@ const VideoFeedGridPainter = () => {
     const handleResize = () => {
       const width = window.innerWidth;
 
-      const aspectRatio = 740 / 460;
-      const newWidth = width * 0.39;
+      const aspectRatio = BACKEND_WIDTH / BACKEND_HEIGHT;
+      const newWidth = width * 0.55;
       const newHeight = newWidth / aspectRatio;
       setStageSize({ width: newWidth, height: newHeight });
     };
+
     handleResize();
     window.addEventListener("resize", handleResize);
 
     return () => window.removeEventListener("resize", handleResize);
   }, []);
 
-  if (image === null || isloading)
-    return (
-      <Card className="row-span-3 col-span-2 rounded-lg p-4 w-full">
-        <span className="text-slate-500">Loading Video feed…</span>
-      </Card>
-    );
+  if (image === null || isloading) return <span className="text-slate-500">Loading Video feed…</span>;
   return (
-    <div className="mt-4.5 row-span-1 col-span-2">
+    <div
+      className={`w-full md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
+        mode === "eraser" ? "hover:cursor-pointer" : ""
+      }`}
+    >
       <Stage
         width={stageSize.width}
         height={stageSize.height}

src/features/cameras/hooks/useColourDetection.ts

@@ -0,0 +1,24 @@
+import { useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { ColourDetectionPayload } from "../../../types/types";
+
+const sendColourDetectionData = async (colourData: ColourDetectionPayload) => {
+  const regions = {
+    regions: colourData.regions,
+  };
+  const response = await fetch(`${CAMBASE}/TargetDetectionColour${colourData.cameraFeedID}-region-update`, {
+    method: "POST",
+    body: JSON.stringify(regions),
+  });
+  if (!response.ok) throw new Error("Cannot send data to colour detection endpoint");
+  return response.json();
+};
+
+export const useColourDectection = () => {
+  const colourMutation = useMutation({
+    mutationKey: ["colour detection"],
+    mutationFn: (colourData: ColourDetectionPayload) => sendColourDetectionData(colourData),
+  });
+
+  return { colourMutation };
+};

src/features/dashboard/components/DashboardGrid.tsx

@@ -1,8 +1,8 @@
 import type { SystemHealthStatus } from "../../../types/types";
 import { useGetSystemHealth } from "../hooks/useGetSystemHealth";
-import CameraStatus from "./CameraStatus";
-import SystemOverview from "./SystemOverview";
-import SystemStatusCard from "./SystemStatusCard";
+import CameraStatus from "./cameraStatus/CameraStatus";
+import SystemHealthCard from "./systemHealth/SystemHealthCard";
+import SystemStatusCard from "./systemStatus/SystemStatusCard";
 
 const DashboardGrid = () => {
   const { query } = useGetSystemHealth();
@@ -37,7 +37,7 @@ const DashboardGrid = () => {
   return (
     <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2">
       <SystemStatusCard />
-      <SystemOverview
+      <SystemHealthCard
         startTime={startTime}
         uptime={uptime}
         statuses={statuses}

src/features/dashboard/components/cameraStatus/CameraStatus.tsx

@@ -1,7 +1,7 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import Card from "../../../ui/Card";
-import StatusIndicators from "../../../ui/StatusIndicators";
-import { capitalize } from "../../../utils/utils";
+import type { SystemHealthStatus } from "../../../../types/types";
+import Card from "../../../../ui/Card";
+import StatusIndicators from "../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../utils/utils";
 import CameraStatusGridItem from "./CameraStatusGridItem";
 
 type CameraStatusProps = {

src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
-import type { SystemHealthStatus } from "../../../types/types";
-import { capitalize } from "../../../utils/utils";
-import SystemHealthModal from "./systemHealthModal/SystemHealthModal";
+import type { SystemHealthStatus } from "../../../../types/types";
+import { capitalize } from "../../../../utils/utils";
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
 
 type CameraStatusGridItemProps = {
   title: string;

src/features/dashboard/components/statusGridItem/StatusGridItem.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import type { SystemHealthStatus } from "../../../../types/types";
 import StatusIndicators from "../../../../ui/StatusIndicators";
 import { capitalize } from "../../../../utils/utils";
-import SystemHealthModal from "../systemHealthModal/SystemHealthModal";
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
 
 type StatusGridItemProps = {
   title: string;

src/features/dashboard/components/systemHealth/SystemHealth.tsx

@@ -1,5 +1,5 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import StatusGridItem from "./statusGridItem/StatusGridItem";
+import type { SystemHealthStatus } from "../../../../types/types";
+import StatusGridItem from "../statusGridItem/StatusGridItem";
 
 type SystemHealthProps = {
   startTime: string;
@@ -38,7 +38,7 @@ const SystemHealth = ({ startTime, uptime, statuses, isLoading, isError, dateUpd
     return <span className="text-slate-500">Loading system health…</span>;
   }
   return (
-    <div className="h-100 md:h-75 overflow-y-auto flex flex-col gap-4">
+    <div className="relative h-100 md:h-75 overflow-y-auto flex flex-col gap-4">
       <div className="p-2 border-b border-gray-600 grid grid-cols-2 justify-between">
         <div className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241]">
           <h3 className="text-lg">Start Time</h3> <span className="text-slate-300">{startTime}</span>
@@ -50,8 +50,8 @@ const SystemHealth = ({ startTime, uptime, statuses, isLoading, isError, dateUpd
       <div className="overflow-auto gap-4">
         <StatusGridItem title={"Modules"} statusCategory={categoryDefault} />
       </div>
-      <div className="border-t border-gray-500">
-        <small className="italic text-gray-400">{`Last refeshed ${updatedDate}`}</small>
+      <div className="absolute bottom-0 left-0 border-t border-gray-500 w-full">
+        <small className="italic text-gray-400 ">{`Last refeshed ${updatedDate}`}</small>
       </div>
     </div>
   );

src/features/dashboard/components/systemHealth/SystemHealthCard.tsx

@@ -1,9 +1,9 @@
 import { faArrowsRotate } from "@fortawesome/free-solid-svg-icons";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
 
 import SystemHealth from "./SystemHealth";
-import type { SystemHealthStatus } from "../../../types/types";
+import type { SystemHealthStatus } from "../../../../types/types";
 
 type SystemOverviewProps = {
   startTime: string;
@@ -15,7 +15,7 @@ type SystemOverviewProps = {
   refetch: () => void;
 };
 
-const SystemOverview = ({
+const SystemHealthCard = ({
   startTime,
   uptime,
   statuses,
@@ -39,4 +39,4 @@ const SystemOverview = ({
   );
 };
 
-export default SystemOverview;
+export default SystemHealthCard;

src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx

@@ -1,8 +1,8 @@
-import type { SystemHealthStatus } from "../../../../types/types";
-import Badge from "../../../../ui/Badge";
-import ModalComponent from "../../../../ui/ModalComponent";
-import StatusIndicators from "../../../../ui/StatusIndicators";
-import { capitalize } from "../../../../utils/utils";
+import type { SystemHealthStatus } from "../../../../../types/types";
+import Badge from "../../../../../ui/Badge";
+import ModalComponent from "../../../../../ui/ModalComponent";
+import StatusIndicators from "../../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../../utils/utils";
 
 type SystemHealthModalProps = {
   isSystemHealthModalOpen: boolean;

src/features/dashboard/components/systemStatus/StatusItems/DownloadLogButton.tsx

@@ -0,0 +1,50 @@
+import { faDownload } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useDownloadLogFiles } from "../../../hooks/useDownloadLogFiles";
+import { toast } from "sonner";
+
+const DownloadLogButton = () => {
+  const { downloadLogFilesQuery } = useDownloadLogFiles();
+  const isLoading = downloadLogFilesQuery?.isFetching;
+
+  const handleDownloadClick = async () => {
+    try {
+      const blob = await downloadLogFilesQuery?.refetch().then((res) => res.data);
+      if (!blob) {
+        throw new Error("No log file data received");
+      }
+      const url = window.URL.createObjectURL(new Blob([blob]));
+      const link = document.createElement("a");
+      if (!link) {
+        throw new Error("Failed to create download link");
+      } else {
+        link.href = url;
+        link.setAttribute("download", "FlexiAI-0.log");
+        document.body.appendChild(link);
+        link.click();
+        link.parentNode?.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }
+    } catch (error: unknown) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+      toast.error(errorMessage);
+    }
+  };
+
+  return (
+    <button
+      className="p-3 border border-gray-700 rounded-lg hover:bg-[#233241] hover:cursor-pointer"
+      onClick={handleDownloadClick}
+    >
+      <div className="flex flex-row gap-2 items-center">
+        <span className="font-bold text-xl bg-slate-700 p-1 px-2 rounded-md">
+          <FontAwesomeIcon icon={faDownload} />
+        </span>
+        <p className="text-lg">{"Download Log Files"}</p>
+      </div>
+      <p className="text-slate-400 italic text-start">{isLoading ? "Downloading..." : "View logs"}</p>
+    </button>
+  );
+};
+
+export default DownloadLogButton;

src/features/dashboard/components/systemStatus/StatusItems/StatusReads.tsx

@@ -0,0 +1,48 @@
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faChartSimple } from "@fortawesome/free-solid-svg-icons";
+
+type StatusReadsProps = {
+  reads: {
+    totalPending: number;
+    totalActive: number;
+    totalSent: number;
+    totalReceived: number;
+    totalLost: number;
+    sanityCheck: boolean;
+    sanityCheckFormula: string;
+  };
+  isReadsLoading?: boolean;
+};
+
+const StatusReads = ({ reads, isReadsLoading }: StatusReadsProps) => {
+  const totalPending = reads?.totalPending ?? 0;
+  const totalActive = reads?.totalActive ?? 0;
+  const totalSent = reads?.totalSent ?? 0;
+  const totalLost = reads?.totalLost ?? 0;
+  const totalReceived = reads?.totalReceived ?? 0;
+
+  if (isReadsLoading) {
+    return <p className="text-slate-400">Loading reads…</p>;
+  }
+  return (
+    <div className="p-3 border border-gray-700 rounded-lg hover:bg-[#233241]">
+      <div className="flex flex-row gap-2 items-center">
+        <span className="font-bold text-xl bg-slate-700 p-1 px-2 rounded-md">
+          <FontAwesomeIcon icon={faChartSimple} />
+        </span>
+
+        <p className="text-lg">Reads</p>
+      </div>
+
+      <div className="text-slate-400 mt-1">
+        Pending: <span className="text-yellow-500">{totalPending}</span> | Active:{" "}
+        <span className="text-cyan-500">{totalActive}</span> | Lost: <span className="text-red-500">{totalLost}</span>
+        <br />
+        Sent / Received: <span className="text-blue-500">{totalSent}</span> |{" "}
+        <span className="text-green-500">{totalReceived}</span>
+      </div>
+    </div>
+  );
+};
+
+export default StatusReads;

src/features/dashboard/components/systemStatus/SystemStatusCard.tsx

@@ -1,13 +1,23 @@
-import { useInfoSocket } from "../../../app/context/WebSocketContext";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
-import StatusItemCPU from "./StatusItems/StatusItemCPU";
+import { useEffect } from "react";
+import { useInfoSocket } from "../../../../app/context/WebSocketContext";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
+import DownloadLogButton from "./StatusItems/DownloadLogButton";
 import StatusItemLocal from "./StatusItems/StatusItemLocal";
-import StatusItemThreads from "./StatusItems/StatusItemThreads";
 import StatusItemUTC from "./StatusItems/StatusItemUTC";
+import StatusReads from "./StatusItems/StatusReads";
+import { useGetStore } from "../../hooks/useGetStore";
 
 const SystemStatusCard = () => {
   const { data: stats } = useInfoSocket();
+  const { storeQuery } = useGetStore();
+
+  const reads = storeQuery?.data;
+  const isReadsLoading = storeQuery.isFetching;
+
+  useEffect(() => {
+    storeQuery.refetch();
+  }, [reads]);
 
   return (
     <Card className="p-4">
@@ -16,8 +26,8 @@ const SystemStatusCard = () => {
         <div className="grid grid-cols-2 grid-rows-2 gap-4 col-span-2">
           <StatusItemUTC statusInfoItem={stats["system-clock-utc"]} description={"UTC Time"} />
           <StatusItemLocal statusInfoItem={stats["system-clock-local"]} description={"Local Time"} />
-          <StatusItemCPU statusInfoItem={stats["memory-cpu-status"]} description={"CPU"} />
-          <StatusItemThreads statusInfoItem={stats["thread-count"]} description={"Threads"} />
+          <DownloadLogButton />
+          <StatusReads reads={reads} isReadsLoading={isReadsLoading} />
         </div>
       ) : (
         <span className="text-slate-500">Loading system status…</span>

src/features/dashboard/hooks/useDownloadLogFiles.ts

@@ -0,0 +1,20 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+
+const getDownloadLogFiles = async () => {
+  const response = await fetch(`${CAMBASE}/LogView/download?filename=FlexiAI-0.log`);
+  if (!response.ok) {
+    throw new Error("Failed to download log files");
+  }
+  return response.blob();
+};
+
+export const useDownloadLogFiles = () => {
+  const downloadLogFilesQuery = useQuery({
+    queryKey: ["downloadLogFiles"],
+    queryFn: getDownloadLogFiles,
+    enabled: false,
+  });
+
+  return { downloadLogFilesQuery };
+};

src/features/dashboard/hooks/useGetStore.ts

@@ -0,0 +1,19 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+
+const getStoreData = async () => {
+  const response = await fetch(`${CAMBASE}/Store0/diagnostics-json`);
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+export const useGetStore = () => {
+  const storeQuery = useQuery({
+    queryKey: ["storeData"],
+    queryFn: getStoreData,
+    // refetchInterval: 10 * 60 * 1000,
+  });
+  return { storeQuery };
+};

src/features/dashboard/hooks/useGetSystemHealth.ts

@@ -11,6 +11,7 @@ export const useGetSystemHealth = () => {
   const query = useQuery({
     queryKey: ["fetchSystemData"],
     queryFn: fetchData,
+    refetchInterval: 300000,
   });
   return { query };
 };

src/features/settings/components/Settings.tsx

@@ -0,0 +1,25 @@
+import { Tabs, Tab, TabList, TabPanel } from "react-tabs";
+import "react-tabs/style/react-tabs.css";
+import Card from "../../../ui/Card";
+import SystemConfig from "./SystemConfig";
+import CardHeader from "../../../ui/CardHeader";
+
+const Settings = () => {
+  return (
+    <div>
+      <Tabs>
+        <TabList>
+          <Tab>Systems</Tab>
+        </TabList>
+        <TabPanel>
+          <Card className="p-4">
+            <CardHeader title="System Configuration" />
+            <SystemConfig />
+          </Card>
+        </TabPanel>
+      </Tabs>
+    </div>
+  );
+};
+
+export default Settings;

src/features/settings/components/SystemConfig.tsx

@@ -0,0 +1,133 @@
+import { Formik, Form, Field } from "formik";
+import { useSystemSettings } from "../hooks/useSystemSettings";
+import type { SystemSettings } from "../../../types/types";
+import { toast } from "sonner";
+
+const SystemConfig = () => {
+  const { systemSettingsQuery, systemSettingsMutation } = useSystemSettings();
+
+  const timeZoneOptions = systemSettingsQuery?.data?.propLocalTimeZone?.accepted;
+  const timeZoneOpts = timeZoneOptions?.split(",").map((option: string) => option.trim().replace(/\[|\]/g, ""));
+  const timeSourceOptions = systemSettingsQuery?.data?.propTimeSource?.accepted;
+  const timeSourceOpts = timeSourceOptions?.split(",").map((option: string) => option.trim().replace(/\[|\]/g, ""));
+  const deviceName = systemSettingsQuery?.data?.propDeviceName?.value;
+  const timeZone = systemSettingsQuery?.data?.propLocalTimeZone?.value;
+  const SNTPServer = systemSettingsQuery?.data?.propSNTPServer?.value;
+  const SNTPInterval = systemSettingsQuery?.data?.propSNTPIntervalMinutes?.value;
+  const timeSource = systemSettingsQuery?.data?.propTimeSource?.value;
+  // const primaryServer = systemSettingsQuery?.data?.propPrimaryDNSServer?.value;
+  // const secondaryServer = systemSettingsQuery?.data?.propSecondaryDNSServer?.value;
+
+  const initialValues = {
+    deviceName: deviceName ?? "",
+    timeZone: timeZone ?? "",
+    localTimeZone: timeZone ?? "",
+    SNTPServer: SNTPServer ?? "",
+    SNTPInterval: SNTPInterval ?? 60,
+    SNTPIntervalMinutes: SNTPInterval ?? 60,
+    primaryServer: "",
+    secondaryServer: "",
+    timeSource: timeSource ?? "",
+  };
+
+  const handleSubmit = async (values: SystemSettings) => {
+    const result = await systemSettingsMutation.mutateAsync(values);
+    console.log(result);
+    if (result.id) {
+      toast.success("System settings updated successfully");
+    }
+  };
+
+  return (
+    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
+      <Form>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="deviceName">Device Name</label>
+          <Field
+            name="deviceName"
+            type="text"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+            placeholder="Enter device name"
+            autoComplete="off"
+          />
+        </div>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="timeZone">Timezone</label>
+          <Field
+            name="timeZone"
+            as="select"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
+            autoComplete="off"
+          >
+            {timeZoneOpts?.map((option: string) => (
+              <option key={option} value={option}>
+                {option}
+              </option>
+            ))}
+          </Field>
+        </div>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="timeSource">Time Source</label>
+          <Field
+            name="timeSource"
+            as="select"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
+            autoComplete="off"
+          >
+            {timeSourceOpts?.map((option: string) => (
+              <option key={option} value={option}>
+                {option}
+              </option>
+            ))}
+          </Field>
+        </div>
+
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="SNTPServer">SNTP Server</label>
+          <Field
+            name="SNTPServer"
+            type="text"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+            placeholder="Enter SNTP server"
+            autoComplete="off"
+          />
+        </div>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="SNTPInterval">SNTP Interval</label>
+          <Field
+            name="SNTPInterval"
+            type="number"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+            placeholder="Enter SNTP interval"
+            autoComplete="off"
+          />
+        </div>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="primaryServer">Primary DNS Server</label>
+          <Field
+            name="primaryServer"
+            type="text"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+            placeholder="Enter primary DNS server"
+            autoComplete="off"
+          />
+        </div>
+        <div className="flex flex-row justify-between items-center mb-4">
+          <label htmlFor="secondaryServer">Secondary DNS Server</label>
+          <Field
+            name="secondaryServer"
+            type="text"
+            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+            placeholder="Enter secondary DNS server"
+            autoComplete="off"
+          />
+        </div>
+        <button type="submit" className="px-4 py-2 bg-green-700 text-white rounded-lg">
+          Save Settings
+        </button>
+      </Form>
+    </Formik>
+  );
+};
+
+export default SystemConfig;

src/features/settings/hooks/useSystemSettings.ts

@@ -0,0 +1,54 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { SystemSettings } from "../../../types/types";
+const camBase = import.meta.env.MODE !== "development" ? CAMBASE : "";
+
+const fetchSystemSettings = async () => {
+  const response = await fetch(`${camBase}/api/fetch-config?id=GLOBAL--Device`);
+  if (!response.ok) {
+    throw new Error("Failed to fetch system settings");
+  }
+  return response.json();
+};
+
+const postSystemSettings = async (settings: SystemSettings) => {
+  const systemSettingConfig = {
+    id: "GLOBAL--Device",
+    fields: [
+      { property: "propDeviceName", value: settings.deviceName },
+      { property: "propSNTPServer", value: settings.SNTPServer },
+      {
+        property: "propSNTPIntervalMinutes",
+        value: Number(settings.SNTPIntervalMinutes),
+      },
+      { property: "propLocalTimeZone", value: settings.localTimeZone },
+      { property: "propTimeSource", value: settings.timeSource },
+    ],
+  };
+
+  const response = await fetch(`${camBase}/api/update-config`, {
+    method: "POST",
+    body: JSON.stringify(systemSettingConfig),
+    headers: {
+      "Content-Type": "application/json",
+    },
+  });
+  if (!response.ok) {
+    throw new Error("Failed to update system settings");
+  }
+  return response.json();
+};
+
+export const useSystemSettings = () => {
+  const systemSettingsQuery = useQuery({
+    queryKey: ["systemSettings"],
+    queryFn: fetchSystemSettings,
+  });
+
+  const systemSettingsMutation = useMutation({
+    mutationKey: ["updateSystemSettings"],
+    mutationFn: postSystemSettings,
+  });
+
+  return { systemSettingsQuery, systemSettingsMutation };
+};

src/routes/__root.tsx

@@ -2,12 +2,14 @@ import { createRootRoute, Outlet } from "@tanstack/react-router";
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
 import Header from "../ui/Header";
 import Footer from "../ui/Footer";
+import { Toaster } from "sonner";
 
 const RootLayout = () => (
   <>
     <Header />
     <main className="p-4 min-h-screen">
       <Outlet />
+      <Toaster />
     </main>
     <Footer />
     <TanStackRouterDevtools position="bottom-right" />

src/routes/baywatch.tsx

@@ -1,6 +1,5 @@
 import { createFileRoute } from "@tanstack/react-router";
 import CameraGrid from "../features/cameras/components/CameraGrid";
-import { Toaster } from "sonner";
 
 export const Route = createFileRoute("/baywatch")({
   component: RouteComponent,
@@ -10,7 +9,6 @@ function RouteComponent() {
   return (
     <div>
       <CameraGrid />
-      <Toaster />
     </div>
   );
 }

src/routes/index.tsx

@@ -6,9 +6,5 @@ export const Route = createFileRoute("/")({
 });
 
 function HomePage() {
-  return (
-    <div>
-      <DashboardGrid />
-    </div>
-  );
+  return <DashboardGrid />;
 }

src/routes/settings.tsx

@@ -1,9 +1,14 @@
-import { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute } from "@tanstack/react-router";
+import Settings from "../features/settings/components/Settings";
 
-export const Route = createFileRoute('/settings')({
+export const Route = createFileRoute("/settings")({
   component: RouteComponent,
-})
+});
 
 function RouteComponent() {
-  return <div>Hello "/settings"!</div>
+  return (
+    <div>
+      <Settings />
+    </div>
+  );
 }

src/types/types.ts

@@ -76,6 +76,7 @@ export type OutputDataResponse = {
 
 export type PaintedCell = {
   colour: string;
+  region: Region;
 };
 
 export type DispatcherConfig = {
@@ -164,3 +165,23 @@ export type DecodeReading = {
   firstSeenTimeHumane: string;
   lastSeenTimeHumane: string;
 };
+
+export type ColourData = {
+  id: string | number;
+  cells: number[][];
+};
+
+export type ColourDetectionPayload = {
+  cameraFeedID: "A" | "B" | "C";
+  regions: ColourData[];
+};
+
+export type SystemSettings = {
+  deviceName: string;
+  localTimeZone: string;
+  timeSource: string;
+  SNTPServer: string;
+  SNTPIntervalMinutes: number;
+  primaryServer?: string;
+  secondaryServer?: string;
+};

src/utils/utils.ts

@@ -9,3 +9,12 @@ export const convertObjtoArray = (obj: Record<string, SystemHealthStatus[]>) =>
   const statusCategoryArray = Object.entries(obj);
   return statusCategoryArray;
 };
+
+// const data = {
+//   camera: cameraFeedID,
+//   cells: Array.from(paintedCells.entries()).map(([key, cell]) => ({
+//     position: key,
+//     ...cell,
+//     region: regions[selectedRegionIndex]?.name || "Unnamed",
+//   })),
+// };

vite.config.ts

@@ -13,4 +13,12 @@ export default defineConfig({
     react(),
     tailwindcss(),
   ],
+  server: {
+    proxy: {
+      "/api": {
+        target: "http://100.115.125.56",
+        changeOrigin: true,
+      },
+    },
+  },
 });