Refactored routing components for better organization and maintainability

Refactor camera feed handling to support dynamic camera IDs and improve context management
Merge pull request 'more accurate system status' (#25 ) from bugfix/dashboard into develop
2025-12-17 16:07:01 +00:00 · 2025-12-17 14:19:23 +00:00 · 2025-12-17 09:46:26 +00:00 · 2025-12-17 09:44:14 +00:00 · 2025-12-12 12:18:17 +00:00 · 2025-12-12 08:33:36 +00:00
47 changed files with 1048 additions and 396 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "bayiq-ui",
  "private": true,
-  "version": "0.0.0",
+  "version": "1.0.1",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/src/app/config/cameraConfig.ts
+++ b/src/app/config/cameraConfig.ts
@@ -0,0 +1,12 @@
+// Camera configuration - add more cameras here as needed
+export const CAMERA_IDS = ["A", "B", "C"] as const;
+
+export type CameraID = (typeof CAMERA_IDS)[number];
+
+export const DEFAULT_REGIONS = [
+  { name: "Bay 1", brushColour: "#ff0000" },
+  { name: "Bay 2", brushColour: "#00ff00" },
+  { name: "Bay 3", brushColour: "#0400ff" },
+  { name: "Bay 4", brushColour: "#ffff00" },
+  { name: "Bay 5", brushColour: "#fc35db" },
+];
--- a/src/app/config/wsconfig.ts
+++ b/src/app/config/wsconfig.ts
@@ -1,5 +1,10 @@
+import { CAMBASE_WS } from "../../utils/config";
+
 export const wsConfig = {
-  infoBar: "ws://100.115.125.56/websocket-infobar",
+  infoBar: `${CAMBASE_WS}/websocket-infobar`,
+  cameraFeedA: `${CAMBASE_WS}/websocket-CameraA-live-video`,
+  cameraFeedB: `${CAMBASE_WS}/websocket-CameraB-live-video`,
+  cameraFeedC: `${CAMBASE_WS}/websocket-CameraC-live-video`,
 };

 export type SocketKey = keyof typeof wsConfig;
--- a/src/app/context/WebSocketContext.ts
+++ b/src/app/context/WebSocketContext.ts
@@ -1,15 +1,23 @@
 import { createContext, useContext } from "react";
 import { ReadyState } from "react-use-websocket";
-import type { InfoBarData } from "../../types/types";
+import type { CameraZoomData, InfoBarData } from "../../types/types";

 type InfoSocketState = {
  data: InfoBarData | null;
  readyState: ReadyState;
  sendJson: (msg: unknown) => void;
+  send?: (msg: string) => void;
+};
+
+type CameraSocketState = {
+  data: CameraZoomData | null;
+  readyState: ReadyState;
+  send: (msg: string) => void;
 };

 export type WebSocketConextValue = {
  info: InfoSocketState;
+  cameraFeed: CameraSocketState;
 };

 export const WebsocketContext = createContext<WebSocketConextValue | null>(null);
@@ -21,3 +29,4 @@ const useWebSocketContext = () => {
 };

 export const useInfoSocket = () => useWebSocketContext().info;
+export const useCameraFeedSocket = () => useWebSocketContext().cameraFeed;
--- a/src/app/providers/CameraFeedProvider.tsx
+++ b/src/app/providers/CameraFeedProvider.tsx
@@ -3,13 +3,12 @@ import { CameraFeedContext } from "../context/CameraFeedContext";
 import { initialState, reducer } from "../reducers/cameraFeedReducer";
 import { useBlackBoard } from "../../hooks/useBlackBoard";
 import type { CameraFeedState } from "../../types/types";
-import { useCameraZoom } from "../../features/cameras/hooks/useCameraZoom";
+
+import { CAMERA_IDS } from "../config/cameraConfig";
+import CameraZoomFetcher from "./CameraZoomFetcher";

 export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
  const { blackboardMutation } = useBlackBoard();
-  const { cameraZoomQuery: cameraZoomQueryA } = useCameraZoom("A");
-  const { cameraZoomQuery: cameraZoomQueryB } = useCameraZoom("B");
-  const { cameraZoomQuery: cameraZoomQueryC } = useCameraZoom("C");

  const [state, dispatch] = useReducer(reducer, initialState);

@@ -23,53 +22,25 @@ export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
      const cameraFeedData: CameraFeedState = result.result;
      const recontructedState = {
        ...cameraFeedData,
-        paintedCells: {
-          A: new Map(cameraFeedData.paintedCells.A),
-          B: new Map(cameraFeedData.paintedCells.B),
-          C: new Map(cameraFeedData.paintedCells.C),
+        paintedCells: CAMERA_IDS.reduce(
+          (acc, id) => {
+            acc[id] = new Map(cameraFeedData.paintedCells[id]);
+            return acc;
          },
+          {} as typeof cameraFeedData.paintedCells,
+        ),
      };
      dispatch({ type: "SET_CAMERA_FEED_DATA", cameraState: recontructedState });
    };
    fetchBlackBoardData();
  }, []);

-  useEffect(() => {
-    const fetchZoomLevels = async () => {
-      const [resultA, resultB, resultC] = await Promise.all([
-        cameraZoomQueryA.refetch(),
-        cameraZoomQueryB.refetch(),
-        cameraZoomQueryC.refetch(),
-      ]);
-
-      console.log(resultA?.data);
-      const zoomLevelAnumber = parseFloat(resultA.data?.propPhysCurrent?.value);
-      const zoomLevelBnumber = parseFloat(resultB.data?.propPhysCurrent?.value);
-      const zoomLevelCnumber = parseFloat(resultC.data?.propPhysCurrent?.value);
-
-      if (resultA.data) {
-        dispatch({
-          type: "SET_ZOOM_LEVEL",
-          payload: { cameraFeedID: "A", zoomLevel: zoomLevelAnumber },
-        });
-      }
-
-      if (resultB.data) {
-        dispatch({
-          type: "SET_ZOOM_LEVEL",
-          payload: { cameraFeedID: "B", zoomLevel: zoomLevelBnumber },
-        });
-      }
-
-      if (resultC.data) {
-        dispatch({
-          type: "SET_ZOOM_LEVEL",
-          payload: { cameraFeedID: "C", zoomLevel: zoomLevelCnumber },
-        });
-      }
-    };
-    fetchZoomLevels();
-  }, []);
-
-  return <CameraFeedContext.Provider value={{ state, dispatch }}>{children}</CameraFeedContext.Provider>;
+  return (
+    <CameraFeedContext.Provider value={{ state, dispatch }}>
+      {CAMERA_IDS.map((cameraId) => (
+        <CameraZoomFetcher key={cameraId} cameraId={cameraId} dispatch={dispatch} />
+      ))}
+      {children}
+    </CameraFeedContext.Provider>
+  );
 };
--- a/src/app/providers/CameraZoomFetcher.tsx
+++ b/src/app/providers/CameraZoomFetcher.tsx
@@ -0,0 +1,31 @@
+import { useEffect } from "react";
+import { useCameraZoom } from "../../features/cameras/hooks/useCameraZoom";
+import type { CameraFeedAction } from "../../types/types";
+import type { CameraID } from "../config/cameraConfig";
+
+type CameraZoomFetcherProps = {
+  cameraId: CameraID;
+  dispatch: (action: CameraFeedAction) => void;
+};
+
+const CameraZoomFetcher = ({ cameraId, dispatch }: CameraZoomFetcherProps) => {
+  const { cameraZoomQuery } = useCameraZoom(cameraId);
+
+  useEffect(() => {
+    const fetchZoomLevel = async () => {
+      const result = await cameraZoomQuery.refetch();
+      if (result.data && typeof result.data.zoomLevel === "number") {
+        dispatch({
+          type: "SET_ZOOM_LEVEL",
+          payload: { cameraFeedID: cameraId, zoomLevel: result.data.zoomLevel },
+        });
+      }
+    };
+
+    fetchZoomLevel();
+  }, [cameraId, cameraZoomQuery, dispatch]);
+
+  return null;
+};
+
+export default CameraZoomFetcher;
--- a/src/app/providers/WebSocketProvider.tsx
+++ b/src/app/providers/WebSocketProvider.tsx
@@ -2,15 +2,29 @@ import { useEffect, useMemo, useState, type ReactNode } from "react";
 import { WebsocketContext, type WebSocketConextValue } from "../context/WebSocketContext";
 import useWebSocket from "react-use-websocket";
 import { wsConfig } from "../config/wsconfig";
-import type { InfoBarData } from "../../types/types";
+import type { CameraZoomData, InfoBarData } from "../../types/types";
+import { CAMERA_IDS } from "../config/cameraConfig";
+import { CAMBASE_WS } from "../../utils/config";
+import { useCameraFeedContext } from "../context/CameraFeedContext";

 type WebSocketProviderProps = {
  children: ReactNode;
 };

 export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
+  const { state } = useCameraFeedContext();
  const [systemData, setSystemData] = useState<InfoBarData | null>(null);
+  const [socketData, setSocketData] = useState<CameraZoomData | null>(null);
  const infoSocket = useWebSocket(wsConfig.infoBar, { share: true, shouldReconnect: () => true });
+  const sockets = CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = `${CAMBASE_WS}/websocket-Camera${id}-live-video`;
+      return acc;
+    },
+    {} as Record<string, string>,
+  );
+  const cameraFeedID = state.cameraFeedID;
+  const cameraFeed = useWebSocket(sockets[cameraFeedID], { share: true, shouldReconnect: () => true });

  useEffect(() => {
    async function parseData() {
@@ -19,9 +33,15 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
        const data = JSON.parse(text);
        setSystemData(data);
      }
+      if (cameraFeed.lastMessage) {
+        const message = cameraFeed.lastMessage;
+        const data = await message?.data.text();
+        const parsedData: CameraZoomData = JSON.parse(data || "");
+        setSocketData(parsedData);
+      }
    }
    parseData();
-  }, [infoSocket.lastMessage]);
+  }, [cameraFeed.lastMessage, infoSocket.lastMessage]);

  const value = useMemo<WebSocketConextValue>(
    () => ({
@@ -30,8 +50,21 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
        readyState: infoSocket.readyState,
        sendJson: infoSocket.sendJsonMessage,
      },
+      cameraFeed: {
+        data: socketData,
+        readyState: cameraFeed.readyState,
+
+        send: cameraFeed.sendMessage,
+      },
    }),
-    [infoSocket.readyState, infoSocket.sendJsonMessage, systemData],
+    [
+      cameraFeed.readyState,
+      cameraFeed.sendMessage,
+      infoSocket.readyState,
+      infoSocket.sendJsonMessage,
+      socketData,
+      systemData,
+    ],
  );

  return <WebsocketContext.Provider value={value}>{children}</WebsocketContext.Provider>;
--- a/src/app/reducers/cameraFeedReducer.ts
+++ b/src/app/reducers/cameraFeedReducer.ts
@@ -1,47 +1,38 @@
 import type { CameraFeedAction, CameraFeedState, PaintedCell } from "../../types/types";
+import { CAMERA_IDS, DEFAULT_REGIONS, type CameraID } from "../config/cameraConfig";

 export const initialState: CameraFeedState = {
-  cameraFeedID: "A",
-  paintedCells: {
-    A: new Map<string, PaintedCell>(),
-    B: new Map<string, PaintedCell>(),
-    C: new Map<string, PaintedCell>(),
+  cameraFeedID: CAMERA_IDS[0],
+  paintedCells: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = new Map<string, PaintedCell>();
+      return acc;
    },
-  regionsByCamera: {
-    A: [
-      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Bay 5", brushColour: "#fc35db" },
-    ],
-    B: [
-      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Bay 5", brushColour: "#fc35db" },
-    ],
-    C: [
-      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Bay 5", brushColour: "#fc35db" },
-    ],
+    {} as Record<string, Map<string, PaintedCell>>,
+  ),
+  regionsByCamera: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = DEFAULT_REGIONS;
+      return acc;
    },
+    {} as Record<string, { name: string; brushColour: string }[]>,
+  ),

  selectedRegionIndex: 0,
-  modeByCamera: {
-    A: "painter",
-    B: "painter",
-    C: "painter",
+  modeByCamera: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = "painter";
+      return acc;
    },
-  zoomLevel: {
-    A: 1,
-    B: 1,
-    C: 1,
+    {} as Record<CameraID, string>,
+  ),
+  zoomLevel: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = 1;
+      return acc;
    },
+    {} as Record<CameraID, number>,
+  ),
 };

 export function reducer(state: CameraFeedState, action: CameraFeedAction) {
--- a/src/features/cameras/components/CameraGrid.tsx
+++ b/src/features/cameras/components/CameraGrid.tsx
@@ -12,7 +12,7 @@ const CameraGrid = () => {

  return (
    <>
-      <div className="grid grid-cols-1 md:grid-cols-3 md:gap-4 p-4 h-screen max-h-screen">
+      <div className="grid grid-cols-1 md:grid-cols-3 md:gap-4 p-4">
        <div className="col-span-2 flex flex-col gap-4">
          <div className="">
            <VideoFeedGridPainter />
--- a/src/features/cameras/components/CameraSettings/CameraPanel.tsx
+++ b/src/features/cameras/components/CameraSettings/CameraPanel.tsx
@@ -28,6 +28,7 @@ const CameraPanel = ({ tabIndex, isResetAllModalOpen, handleClose, setIsResetMod
          return "B";
        case 2:
          return "C";
+        //Add more cases if more cameras are added
        default:
          return "A";
      }
--- a/src/features/cameras/components/CameraSettings/CameraSettings.tsx
+++ b/src/features/cameras/components/CameraSettings/CameraSettings.tsx
@@ -2,6 +2,7 @@ import Card from "../../../../ui/Card";
 import { Tab, Tabs, TabList, TabPanel } from "react-tabs";
 import "react-tabs/style/react-tabs.css";
 import CameraPanel from "./CameraPanel";
+import { CAMERA_IDS } from "../../../../app/config/cameraConfig";

 type CameraSettingsProps = {
  setTabIndex: (tabIndex: number) => void;
@@ -12,48 +13,33 @@ type CameraSettingsProps = {
 };

 const CameraSettings = ({
-  tabIndex,
  setTabIndex,
  isResetAllModalOpen,
  handleClose,
  setIsResetModalOpen,
 }: CameraSettingsProps) => {
  return (
-    <Card className="p-4 w-full h-full max-h-screen">
+    <Card className="p-4 w-full h-full ">
      <Tabs
        selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none rounded-sm mb-1"
        className="react-tabs"
        onSelect={(index) => setTabIndex(index)}
      >
        <TabList>
-          <Tab>Camera A</Tab>
-          <Tab>Camera B</Tab>
-          <Tab>Camera C</Tab>
+          {CAMERA_IDS.map((id) => (
+            <Tab key={id}>Camera {id}</Tab>
+          ))}
        </TabList>
-        <TabPanel>
+        {CAMERA_IDS.map((id, index) => (
+          <TabPanel key={id}>
            <CameraPanel
-            tabIndex={tabIndex}
-            isResetAllModalOpen={isResetAllModalOpen}
-            handleClose={handleClose}
-            setIsResetModalOpen={setIsResetModalOpen}
-          />
-        </TabPanel>
-        <TabPanel>
-          <CameraPanel
-            tabIndex={tabIndex}
-            isResetAllModalOpen={isResetAllModalOpen}
-            handleClose={handleClose}
-            setIsResetModalOpen={setIsResetModalOpen}
-          />
-        </TabPanel>
-        <TabPanel>
-          <CameraPanel
-            tabIndex={tabIndex}
+              tabIndex={index}
              isResetAllModalOpen={isResetAllModalOpen}
              handleClose={handleClose}
              setIsResetModalOpen={setIsResetModalOpen}
            />
          </TabPanel>
+        ))}
      </Tabs>
    </Card>
  );
--- a/src/features/cameras/components/CameraSettings/RegionSelector.tsx
+++ b/src/features/cameras/components/CameraSettings/RegionSelector.tsx
@@ -4,12 +4,14 @@ import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext"
 import { useColourDectection } from "../../hooks/useColourDetection";
 import { useBlackBoard } from "../../../../hooks/useBlackBoard";
 import { toast } from "sonner";
+import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext";
+import type { CameraID } from "../../../../app/config/cameraConfig";

 type RegionSelectorProps = {
  regions: Region[];
  selectedRegionIndex: number;
  mode: string;
-  cameraFeedID: "A" | "B" | "C";
+  cameraFeedID: CameraID;
  isResetAllModalOpen: boolean;
  handleClose: () => void;
  setIsResetModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
@@ -28,6 +30,28 @@ const RegionSelector = ({
  const { state, dispatch } = useCameraFeedContext();
  const { blackboardMutation } = useBlackBoard();
  const paintedCells = state.paintedCells[cameraFeedID];
+  const cameraSocket = useCameraFeedSocket();
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraSocket;
+      case "B":
+        return cameraSocket;
+      case "C":
+        return cameraSocket;
+    }
+  };
+
+  const socket = getCurrentSocket();
+
+  const getMagnificationLevel = () => {
+    const test = socket?.data;
+    if (!socket?.data) return null;
+    console.log(test);
+    if (!test || !test.magnificationLevel) return "1x";
+    return test?.magnificationLevel;
+  };

  const handleChange = (e: { target: { value: string } }) => {
    dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: e.target.value } });
@@ -79,12 +103,12 @@ const RegionSelector = ({

  const handleSaveclick = () => {
    const regions: ColourData[] = [];
-    const test = Array.from(paintedCells.entries());
-    const region1 = test.filter(([, cell]) => cell.region.name === "Bay 1");
-    const region2 = test.filter(([, cell]) => cell.region.name === "Bay 2");
-    const region3 = test.filter(([, cell]) => cell.region.name === "Bay 3");
-    const region4 = test.filter(([, cell]) => cell.region.name === "Bay 4");
-    const region5 = test.filter(([, cell]) => cell.region.name === "Bay 5");
+    const paintedCellsArray = Array.from(paintedCells.entries());
+    const region1 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 1");
+    const region2 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 2");
+    const region3 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 3");
+    const region4 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 4");
+    const region5 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 5");
    const region1Data = {
      id: 1,
      cells: region1.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
@@ -123,7 +147,7 @@ const RegionSelector = ({

    colourMutation.mutate({ cameraFeedID, regions: regions });

-    // Convert Map to plain object for blackboard
+    // Convert map to plain object for blackboard
    const serializableState = {
      ...state,
      paintedCells: {
@@ -137,7 +161,7 @@ const RegionSelector = ({
  };

  return (
-    <div className="flex flex-col gap-4 max-h-[50%]">
+    <div className="flex flex-col gap-4 h-full overflow-y-auto mt-[5%]">
      <div className="flex flex-col md:flex-row gap-3">
        <div className="p-2 border border-gray-600 rounded-lg flex flex-col h-[10%] w-full">
          <h2 className="text-2xl mb-2">Tools</h2>
@@ -174,6 +198,45 @@ const RegionSelector = ({
              />
              <span className="text-xl">Erase mode</span>
            </label>
+            <label
+              htmlFor="magnifyMode"
+              className={`p-4 border rounded-lg  mb-2
+            ${mode === "magnify" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
+            hover:bg-[#202b36] hover:cursor-pointer`}
+            >
+              <input
+                id="magnifyMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "magnify"}
+                value="magnify"
+                className="sr-only"
+              />
+              <div className="flex flex-col space-y-3">
+                <span className="text-xl">Magnifier</span>
+                {mode === "magnify" && <small className={`text-gray-400 italic`}>Use mouse to magnify the image</small>}
+              </div>
+            </label>
+            <label
+              htmlFor="zoomMode"
+              className={`p-4 border rounded-lg  mb-2
+            ${mode === "zoom" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
+            hover:bg-[#202b36] hover:cursor-pointer`}
+            >
+              <input
+                id="zoomMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "zoom"}
+                value="zoom"
+                className="sr-only"
+              />
+              <div className="flex flex-col space-y-3">
+                <span className="text-xl">Digital Zoom mode</span>
+                <pre className="text-xs text-gray-400">{`Current Zoom: ${getMagnificationLevel()}`}</pre>
+                {mode === "zoom" && <small className={`text-gray-400 italic`}>Click image to digitally zoom</small>}
+              </div>
+            </label>
          </div>
        </div>

@@ -214,10 +277,16 @@ const RegionSelector = ({
            })}
          </>
          <div className="flex flex-col gap-4  mt-4">
-            <button className="border border-blue-900 bg-blue-700 px-4 py-1 rounded-md" onClick={handleAddRegionClick}>
+            <button
+              className="border border-blue-900 bg-blue-700 px-4 py-1 rounded-md hover:bg-blue-800 hover:cursor-pointer"
+              onClick={handleAddRegionClick}
+            >
              Add Bay
            </button>
-            <button className="border border-red-900 bg-red-700 px-4 py-1 rounded-md" onClick={handleRemoveClick}>
+            <button
+              className="border border-red-900 bg-red-700 px-4 py-1 rounded-md hover:bg-red-800 hover:cursor-pointer"
+              onClick={handleRemoveClick}
+            >
              Remove Bay
            </button>
          </div>
@@ -226,22 +295,25 @@ const RegionSelector = ({

      <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
        <h2 className="text-2xl mb-2">Actions</h2>
-        <div className="flex flex-col md:flex-row mx-auto gap-4 justify-center">
+        <div className="flex flex-col gap-4 justify-center">
+          <div className="grid grid-cols-2 gap-2">
            <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-full hover:bg-blue-700 hover:cursor-pointer"
+              className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full 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-full hover:bg-red-700 hover:cursor-pointer"
+              className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full hover:bg-red-700 hover:cursor-pointer"
            >
              Reset Region
            </button>
+          </div>
+
          <button
            onClick={openResetModal}
-            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-full hover:bg-red-700 hover:cursor-pointer"
+            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full hover:bg-red-700 hover:cursor-pointer"
          >
            Reset All
          </button>
--- a/src/features/cameras/components/CameraSettings/cameraControls/CameraControls.tsx
+++ b/src/features/cameras/components/CameraSettings/cameraControls/CameraControls.tsx
@@ -1,10 +1,11 @@
+import type { CameraID } from "../../../../../app/config/cameraConfig";
 import { useCameraFeedContext } from "../../../../../app/context/CameraFeedContext";
 import SliderComponent from "../../../../../ui/SliderComponent";
 import { useCameraZoom } from "../../../hooks/useCameraZoom";
 import { useDebouncedCallback } from "use-debounce";

 type CameraControlsProps = {
-  cameraFeedID: "A" | "B" | "C";
+  cameraFeedID: CameraID;
 };

 const CameraControls = ({ cameraFeedID }: CameraControlsProps) => {
@@ -29,7 +30,7 @@ const CameraControls = ({ cameraFeedID }: CameraControlsProps) => {
  };

  return (
-    <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
+    <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full mt-[5%]">
      <h2 className="text-2xl mb-4">Camera {cameraFeedID}</h2>
      <div className="w-[70%] ">
        <label htmlFor="zoom">Zoom {zoomLevel} </label>
--- a/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
@@ -1,19 +1,31 @@
+import { useState } from "react";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import type { DecodeReading } from "../../../../types/types";
 import { useSightingEntryAndExit } from "../../hooks/useSightingEntryAndExit";

+import PlatePatchModal from "./platePatchModal/PlatePatchModal";
+
 const SightingEntryTable = () => {
  const { state } = useCameraFeedContext();
+  const [isPlatePatchModalOpen, setIsPlatePatchModalOpen] = useState(false);
+  const [currentPatch, setCurrentPatch] = useState<DecodeReading | null>(null);
  const cameraFeedID = state.cameraFeedID;
  const { entryQuery } = useSightingEntryAndExit(cameraFeedID);

  const isLoading = entryQuery?.isFetching;
  const readings = entryQuery?.data?.decodes;

+  const handleRowClick = (reading: DecodeReading) => {
+    setCurrentPatch(reading);
+    setIsPlatePatchModalOpen(true);
+  };
+
  if (isLoading) return <span className="text-slate-500">Loading Sighting data…</span>;
  return (
+    <>
      <div className="border border-gray-600 rounded-lg m-2">
-      <div className="overflow-y-auto ">
+        {/* Desktop Table */}
+        <div className="hidden md:block overflow-y-auto">
          <table className="w-full text-left text-sm">
            <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
              <tr>
@@ -26,7 +38,11 @@ const SightingEntryTable = () => {
            </thead>
            <tbody className="divide-y divide-gray-700">
              {readings?.map((reading: DecodeReading) => (
-              <tr className="hover:bg-gray-800/30 transition-colors" key={reading?.id}>
+                <tr
+                  className="hover:bg-gray-800/30 transition-colors hover:cursor-pointer"
+                  key={reading?.id}
+                  onClick={() => handleRowClick(reading)}
+                >
                  <td className="px-4 py-3 font-mono font-semibold text-blue-400 text-lg">{reading?.vrm}</td>
                  <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
                  <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
@@ -37,7 +53,44 @@ const SightingEntryTable = () => {
            </tbody>
          </table>
        </div>
+
+        {/* Mobile */}
+        <div className="md:hidden overflow-y-auto space-y-3 p-3">
+          {readings?.map((reading: DecodeReading) => (
+            <div
+              key={reading?.id}
+              className="bg-gray-800/30 rounded-lg p-4 space-y-2 border border-gray-700 hover:border-gray-600 transition-colors"
+              onClick={() => handleRowClick(reading)}
+            >
+              <div className="flex justify-between items-start">
+                <span className="font-mono font-semibold text-blue-400 text-xl">{reading?.vrm}</span>
+                <span className="text-gray-400 text-sm">Bay {reading?.laneID}</span>
              </div>
+              <div className="flex justify-between text-sm">
+                <span className="text-gray-400">Seen Count:</span>
+                <span className="text-gray-300 font-semibold">{reading?.seenCount}</span>
+              </div>
+              <div className="pt-2 border-t border-gray-700 space-y-1 text-xs">
+                <div className="flex justify-between">
+                  <span className="text-gray-500">First Seen:</span>
+                  <span className="text-gray-400">{reading?.firstSeenTimeHumane}</span>
+                </div>
+                <div className="flex justify-between">
+                  <span className="text-gray-500">Last Seen:</span>
+                  <span className="text-gray-400">{reading?.lastSeenTimeHumane}</span>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+      <PlatePatchModal
+        isPlatePatchModalOpen={isPlatePatchModalOpen}
+        handleClose={() => setIsPlatePatchModalOpen(false)}
+        currentPatch={currentPatch}
+        direction={"entry"}
+      />
+    </>
  );
 };

--- a/src/features/cameras/components/PlatePatch/SightingExitTable.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingExitTable.tsx
@@ -1,8 +1,12 @@
+import { useState } from "react";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import type { DecodeReading } from "../../../../types/types";
 import { useSightingEntryAndExit } from "../../hooks/useSightingEntryAndExit";
+import PlatePatchModal from "./platePatchModal/PlatePatchModal";

 const SightingExitTable = () => {
+  const [isPlatePatchModalOpen, setIsPlatePatchModalOpen] = useState(false);
+  const [currentPatch, setCurrentPatch] = useState<DecodeReading | null>(null);
  const { state } = useCameraFeedContext();
  const cameraFeedID = state.cameraFeedID;
  const { exitQuery } = useSightingEntryAndExit(cameraFeedID);
@@ -10,10 +14,17 @@ const SightingExitTable = () => {
  const isLoading = exitQuery?.isFetching;
  const readings = exitQuery?.data?.decodes;

+  const handleRowClick = (reading: DecodeReading) => {
+    setCurrentPatch(reading);
+    setIsPlatePatchModalOpen(true);
+  };
+
  if (isLoading) return <span className="text-slate-500">Loading Sighting data…</span>;
  return (
-    <div className="border border-gray-600 rounded-lg overflow-hidden m-2">
-      <div className="overflow-y-auto ">
+    <>
+      <div className="border border-gray-600 rounded-lg m-2">
+        {/* Desktop Table */}
+        <div className="hidden md:block overflow-y-auto">
          <table className="w-full text-left text-sm">
            <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
              <tr>
@@ -26,7 +37,11 @@ const SightingExitTable = () => {
            </thead>
            <tbody className="divide-y divide-gray-700">
              {readings?.map((reading: DecodeReading) => (
-              <tr className="hover:bg-gray-800/30 transition-colors" key={reading?.id}>
+                <tr
+                  className="hover:bg-gray-800/30 transition-colors hover:cursor-pointer"
+                  key={reading?.id}
+                  onClick={() => handleRowClick(reading)}
+                >
                  <td className="px-4 py-3 font-mono font-semibold text-red-400 text-lg">{reading?.vrm}</td>
                  <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
                  <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
@@ -37,7 +52,44 @@ const SightingExitTable = () => {
            </tbody>
          </table>
        </div>
+
+        {/* Mobile Cards */}
+        <div className="md:hidden overflow-y-auto space-y-3 p-3">
+          {readings?.map((reading: DecodeReading) => (
+            <div
+              key={reading?.id}
+              className="bg-gray-800/30 rounded-lg p-4 space-y-2 border border-gray-700 hover:border-gray-600 transition-colors"
+              onClick={() => handleRowClick(reading)}
+            >
+              <div className="flex justify-between items-start">
+                <span className="font-mono font-semibold text-red-400 text-xl">{reading?.vrm}</span>
+                <span className="text-gray-400 text-sm">Bay {reading?.laneID}</span>
              </div>
+              <div className="flex justify-between text-sm">
+                <span className="text-gray-400">Seen Count:</span>
+                <span className="text-gray-300 font-semibold">{reading?.seenCount}</span>
+              </div>
+              <div className="pt-2 border-t border-gray-700 space-y-1 text-xs">
+                <div className="flex justify-between">
+                  <span className="text-gray-500">First Seen:</span>
+                  <span className="text-gray-400">{reading?.firstSeenTimeHumane}</span>
+                </div>
+                <div className="flex justify-between">
+                  <span className="text-gray-500">Last Seen:</span>
+                  <span className="text-gray-400">{reading?.lastSeenTimeHumane}</span>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+      <PlatePatchModal
+        isPlatePatchModalOpen={isPlatePatchModalOpen}
+        handleClose={() => setIsPlatePatchModalOpen(false)}
+        currentPatch={currentPatch}
+        direction={"exit"}
+      />
+    </>
  );
 };

--- a/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModal.tsx
+++ b/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModal.tsx
@@ -0,0 +1,20 @@
+import type { DecodeReading } from "../../../../../types/types";
+import ModalComponent from "../../../../../ui/ModalComponent";
+import PlatePatchModalContent from "./PlatePatchModalContent";
+
+type PlatePatchModalProps = {
+  isPlatePatchModalOpen: boolean;
+  handleClose: () => void;
+  currentPatch: DecodeReading | null;
+  direction?: "entry" | "exit";
+};
+
+const PlatePatchModal = ({ isPlatePatchModalOpen, handleClose, currentPatch, direction }: PlatePatchModalProps) => {
+  return (
+    <ModalComponent isModalOpen={isPlatePatchModalOpen} close={handleClose}>
+      <PlatePatchModalContent currentPatch={currentPatch} direction={direction} />
+    </ModalComponent>
+  );
+};
+
+export default PlatePatchModal;
--- a/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModalContent.tsx
+++ b/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModalContent.tsx
@@ -0,0 +1,64 @@
+import type { DecodeReading } from "../../../../../types/types";
+
+type PlatePatchModalContentProps = {
+  currentPatch: DecodeReading | null;
+  direction?: "entry" | "exit";
+};
+
+const PlatePatchModalContent = ({ currentPatch, direction }: PlatePatchModalContentProps) => {
+  const imageSrc = `data:image/png;base64,${currentPatch?.plate || ""}`;
+  const imageUrl = currentPatch ? imageSrc : "";
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between border-b border-gray-600 pb-3">
+        <h2
+          className={`font-mono font-bold text-3xl tracking-wide
+          ${direction === "entry" ? "text-blue-400" : "text-red-400"}`}
+        >
+          {currentPatch?.vrm}
+        </h2>
+        <span
+          className={`px-3 py-1 rounded-full text-xs font-semibold uppercase
+          ${direction === "entry" ? "bg-blue-500/20 text-blue-400" : "bg-red-500/20 text-red-400"}`}
+        >
+          {direction === "entry" ? "Entry" : "Exit"}
+        </span>
+      </div>
+
+      <div className="border border-gray-600 rounded-2xl">
+        <div className="flex  bg-gray-800/50 rounded-lg p-4">
+          <img
+            src={imageUrl}
+            alt={`${direction === "entry" ? "Entry" : "Exit"} Image for ${currentPatch?.vrm || "N/A"}`}
+            className="rounded-lg border border-gray-600 max-w-full h-auto shadow-lg"
+          />
+        </div>
+
+        <div className="grid grid-cols-2 gap-4 bg-gray-800/30 rounded-lg p-4">
+          <div className="space-y-1">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Bay ID</p>
+            <p className="text-gray-200 font-semibold text-lg">{currentPatch?.laneID || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Seen Count</p>
+            <p className="text-gray-200 font-semibold text-lg">{currentPatch?.seenCount || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1 col-span-2">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">First Seen</p>
+            <p className="text-gray-300 text-sm">{currentPatch?.firstSeenTimeHumane || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1 col-span-2">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Last Seen</p>
+            <p className="text-gray-300 text-sm">{currentPatch?.lastSeenTimeHumane || "N/A"}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PlatePatchModalContent;
--- a/src/features/cameras/components/Video/VideoFeedGridPainter.tsx
+++ b/src/features/cameras/components/Video/VideoFeedGridPainter.tsx
@@ -2,8 +2,11 @@ import { useEffect, useRef, useState, type RefObject } from "react";
 import { Stage, Layer, Image, Shape } from "react-konva";
 import type { KonvaEventObject } from "konva/lib/Node";
 import { useCreateVideoSnapshot } from "../../hooks/useGetvideoSnapshots";
-
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
+import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext";
+import { ReadyState } from "react-use-websocket";
+import { toast } from "sonner";
+import type { CameraID } from "../../../../app/config/cameraConfig";

 const BACKEND_WIDTH = 640;
 const BACKEND_HEIGHT = 360;
@@ -23,12 +26,54 @@ const VideoFeedGridPainter = () => {
  const { latestBitmapRef, isloading } = useCreateVideoSnapshot();
  const [stageSize, setStageSize] = useState({ width: BACKEND_WIDTH, height: BACKEND_HEIGHT });
  const isDrawingRef = useRef(false);
+  const [scale, setScale] = useState(1);
+  const [position, setPosition] = useState({ x: 0, y: 0 });
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const stageRef = useRef<any>(null);
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const paintLayerRef = useRef<any>(null);

  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);
+  const cameraSocket = useCameraFeedSocket();
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraSocket;
+      case "B":
+        return cameraSocket;
+      case "C":
+        return cameraSocket;
+    }
+  };
+
+  const handleZoomClick = (e: KonvaEventObject<MouseEvent>, cameraFeedID: CameraID) => {
+    if (mode !== "zoom") return;
+    const socket = getCurrentSocket();
+    const stage = e.target.getStage();
+    const coords = stage?.getPointerPosition();
+    if (!coords || !socket) return;
+
+    const newX = coords.x / stageSize.width;
+    const newY = coords.y / stageSize.height;
+
+    // Check if WebSocket is connected
+    if (socket.readyState !== ReadyState.OPEN) {
+      toast.error(`Camera ${cameraFeedID} WebSocket is not connected`);
+      return;
+    }
+
+    try {
+      socket.send(`ZOOM=${newX.toFixed(2)},${newY.toFixed(2)}`);
+    } catch (error) {
+      console.error("WebSocket send error:", error);
+      toast.error(`Failed to send command to Camera ${cameraFeedID}`);
+    }
+  };

  const draw = (bmp: RefObject<ImageBitmap | null>): ImageBitmap | null => {
    if (!bmp || !bmp.current) {
@@ -60,6 +105,7 @@ const VideoFeedGridPainter = () => {
        map.delete(key);
        paintLayerRef.current?.batchDraw();
      }
+
      return;
    }

@@ -71,14 +117,14 @@ const VideoFeedGridPainter = () => {
  };

  const handleStageMouseDown = (e: KonvaEventObject<MouseEvent>) => {
-    if (!regions[selectedRegionIndex]) return;
+    if (!regions[selectedRegionIndex] || mode === "magnify" || mode === "zoom") return;
    isDrawingRef.current = true;
    const pos = e.target.getStage()?.getPointerPosition();
    if (pos) paintCell(pos.x, pos.y);
  };

  const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => {
-    if (!isDrawingRef.current) return;
+    if (!isDrawingRef.current || mode === "magnify") return;
    if (!regions[selectedRegionIndex]) return;
    const pos = e.target.getStage()?.getPointerPosition();
    if (pos) paintCell(pos.x, pos.y);
@@ -88,6 +134,38 @@ const VideoFeedGridPainter = () => {
    isDrawingRef.current = false;
  };

+  const handleMouseEnter = () => {
+    if (mode !== "magnify") return;
+    setScale(2);
+  };
+  const handleMouseLeave = () => {
+    document.body.style.cursor = "default";
+    setScale(1);
+    setPosition({ x: 0, y: 0 });
+  };
+  const handleMouseMove = (e: KonvaEventObject<MouseEvent>) => {
+    if (scale === 1) return;
+
+    const stage = e.target.getStage();
+    if (!stage) return;
+
+    const pointerPosition = stage.getPointerPosition();
+    if (!pointerPosition) return;
+
+    const newX = stageSize.width / 2 - pointerPosition.x * scale;
+    const newY = stageSize.height / 2 - pointerPosition.y * scale;
+
+    const maxX = 0;
+    const minX = stageSize.width - stageSize.width * scale;
+    const maxY = 0;
+    const minY = stageSize.height - stageSize.height * scale;
+
+    setPosition({
+      x: Math.max(minX, Math.min(maxX, newX)),
+      y: Math.max(minY, Math.min(maxY, newY)),
+    });
+  };
+
  useEffect(() => {
    const handleResize = () => {
      const width = window.innerWidth;
@@ -112,25 +190,39 @@ const VideoFeedGridPainter = () => {

  if (image === null || isloading) return <span className="text-slate-500">Loading Video feed…</span>;
  return (
-    <div
-      className={`w-full md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
-        mode === "eraser" ? "hover:cursor-pointer" : ""
-      }`}
-    >
+    <div>
      <Stage
+        ref={stageRef}
        width={stageSize.width}
        height={stageSize.height}
        onMouseDown={handleStageMouseDown}
        onMouseMove={handleStageMouseMove}
        onMouseUp={handleStageMouseUp}
        onMouseLeave={handleStageMouseUp}
-        className="max-w-[55%]"
+        className={`max-w-[55%] md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
+          mode === "eraser" ? "hover:cursor-pointer" : ""
+        } ${mode === "zoom" ? "hover:cursor-zoom-in" : ""}`}
      >
-        <Layer>
-          <Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />
+        <Layer
+          scaleX={scale}
+          scaleY={scale}
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+          onMouseMove={handleMouseMove}
+          x={position.x}
+          y={position.y}
+        >
+          <Image
+            image={image}
+            width={stageSize.width}
+            height={stageSize.height}
+            classname={"rounded-lg"}
+            onClick={(e) => handleZoomClick(e, cameraFeedID)}
+          />
        </Layer>

        <Layer ref={paintLayerRef} opacity={0.6}>
+          {mode === "painter" || mode === "eraser" ? (
            <Shape
              sceneFunc={(ctx, shape) => {
                const cells = paintedCells;
@@ -154,6 +246,7 @@ const VideoFeedGridPainter = () => {
              width={stageSize.width}
              height={stageSize.height}
            />
+          ) : null}
        </Layer>
      </Stage>
    </div>
--- a/src/features/cameras/hooks/useCameraZoom.ts
+++ b/src/features/cameras/hooks/useCameraZoom.ts
@@ -1,6 +1,7 @@
 import { useQuery, useMutation } from "@tanstack/react-query";
 import { CAMBASE } from "../../../utils/config";
 import type { CameraZoomConfig } from "../../../types/types";
+import type { CameraID } from "../../../app/config/cameraConfig";

 const fetchZoomLevel = async (cameraFeedID: string) => {
  const response = await fetch(`${CAMBASE}/api/fetch-config?id=Camera${cameraFeedID}-onvif-controller`);
@@ -34,7 +35,7 @@ const postZoomLevel = async (zoomConfig: CameraZoomConfig) => {
  return response.json();
 };

-export const useCameraZoom = (cameraFeedID: "A" | "B" | "C") => {
+export const useCameraZoom = (cameraFeedID: CameraID) => {
  const cameraZoomQuery = useQuery({
    queryKey: ["cameraZoom", cameraFeedID],
    queryFn: () => fetchZoomLevel(cameraFeedID),
--- a/src/features/cameras/hooks/useGetVideoFeed.ts
+++ b/src/features/cameras/hooks/useGetVideoFeed.ts
@@ -1,7 +1,8 @@
 import { useQuery } from "@tanstack/react-query";
 import { CAMBASE } from "../../../utils/config";
+import type { CameraID } from "../../../app/config/cameraConfig";

-const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
+const targetDectionFeed = async (cameraFeedID: CameraID | null) => {
  const response = await fetch(`${CAMBASE}/TargetDetectionColour${cameraFeedID}-preview`, {
    signal: AbortSignal.timeout(300000),
    cache: "no-store",
@@ -12,12 +13,31 @@ const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
  return response.blob();
 };

-export const useGetVideoFeed = (cameraFeedID: "A" | "B" | "C" | null) => {
-  const videoQuery = useQuery({
+const getVideoFeed = async (cameraFeedID: CameraID | null) => {
+  const response = await fetch(`${CAMBASE}/Camera${cameraFeedID}-preview`, {
+    signal: AbortSignal.timeout(300000),
+    cache: "no-store",
+  });
+  if (!response.ok) {
+    throw new Error(`Cannot reach endpoint (${response.status})`);
+  }
+  return response.blob();
+};
+
+export const useGetVideoFeed = (cameraFeedID: CameraID | null, mode: string) => {
+  const targetDetectionQuery = useQuery({
    queryKey: ["getfeed", cameraFeedID],
-    queryFn: () => getfeed(cameraFeedID),
+    queryFn: () => targetDectionFeed(cameraFeedID),
    refetchInterval: 500,
+    enabled: mode !== "magnify" && mode !== "zoom",
  });

-  return { videoQuery };
+  const videoFeedQuery = useQuery({
+    queryKey: ["videoQuery", cameraFeedID, mode],
+    queryFn: () => getVideoFeed(cameraFeedID),
+    refetchInterval: 500,
+    enabled: mode === "magnify" || mode === "zoom",
+  });
+
+  return { targetDetectionQuery, videoFeedQuery };
 };
--- a/src/features/cameras/hooks/useGetvideoSnapshots.ts
+++ b/src/features/cameras/hooks/useGetvideoSnapshots.ts
@@ -5,18 +5,30 @@ import { useCameraFeedContext } from "../../../app/context/CameraFeedContext";
 export const useCreateVideoSnapshot = () => {
  const { state } = useCameraFeedContext();
  const cameraFeedID = state?.cameraFeedID;
+  const mode = state.modeByCamera[cameraFeedID];
  const latestBitmapRef = useRef<ImageBitmap | null>(null);
-  const { videoQuery } = useGetVideoFeed(cameraFeedID);
+  const { targetDetectionQuery, videoFeedQuery } = useGetVideoFeed(cameraFeedID, mode);

-  const snapShot = videoQuery?.data;
-  const isloading = videoQuery.isPending;
+  let snapShot = targetDetectionQuery?.data;
+  const isloading = targetDetectionQuery.isPending;
+
+  const videoSnapShot = videoFeedQuery?.data;
+  const isVideoLoading = videoFeedQuery.isPending;
+
+  if ((isVideoLoading === false && videoSnapShot && mode === "magnify") || mode === "zoom") {
+    snapShot = videoSnapShot;
+  }

  useEffect(() => {
    async function createBitmap() {
      if (!snapShot) return;

      try {
-        const bitmap = await createImageBitmap(snapShot);
+        const bitmap = await createImageBitmap(snapShot, {
+          resizeWidth: 720,
+          resizeHeight: 1080,
+          resizeQuality: "high",
+        });
        if (!bitmap) return;
        latestBitmapRef.current = bitmap;
      } catch (error) {
--- a/src/features/dashboard/components/DashboardGrid.tsx
+++ b/src/features/dashboard/components/DashboardGrid.tsx
@@ -3,6 +3,7 @@ import { useGetSystemHealth } from "../hooks/useGetSystemHealth";
 import CameraStatus from "./cameraStatus/CameraStatus";
 import SystemHealthCard from "./systemHealth/SystemHealthCard";
 import SystemStatusCard from "./systemStatus/SystemStatusCard";
+import { CAMERA_IDS } from "../../../app/config/cameraConfig";

 const DashboardGrid = () => {
  const { query } = useGetSystemHealth();
@@ -26,16 +27,14 @@ const DashboardGrid = () => {
      channelA: [],
      channelB: [],
      channelC: [],
+      // todo: check if more cameras will be added later
      default: [],
    },
  );

-  const categoryA = statusCategories?.channelA ?? [];
-  const categoryB = statusCategories?.channelB ?? [];
-  const categoryC = statusCategories?.channelC ?? [];
-
  return (
    <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2 gap-4">
+      <div className="grid grid-cols-1 md:grid-rows-0 md:grid-cols-2 gap-4 md:col-span-2">
        <SystemStatusCard />
        <SystemHealthCard
          startTime={startTime}
@@ -46,10 +45,17 @@ const DashboardGrid = () => {
          dateUpdatedAt={dateUpdatedAt}
          refetch={refetch}
        />
-      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-3 gap-x-4">
-        <CameraStatus title="Camera A" category={categoryA} isError={isError} />
-        <CameraStatus title="Camera B" category={categoryB} isError={isError} />
-        <CameraStatus title="Camera C" category={categoryC} isError={isError} />
+      </div>
+
+      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-[repeat(3,1fr)] gap-x-4">
+        {CAMERA_IDS.map((cameraID) => (
+          <CameraStatus
+            key={cameraID}
+            title={`Camera ${cameraID}`}
+            category={statusCategories?.[`channel${cameraID}`] ?? []}
+            isError={isError}
+          />
+        ))}
      </div>
    </div>
  );
--- a/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
@@ -11,10 +11,14 @@ type CameraStatusProps = {
 };

 const CameraStatus = ({ title, category, isError }: CameraStatusProps) => {
-  const isAllGood = category && category.length > 0 && category.every((status) => status.tags.includes("RUNNING"));
-  // check if some are down
-  // check if all are down
-  //check if offline
+  const isAllGood =
+    category &&
+    category.length > 0 &&
+    category.every((status) => {
+      const allowedTags = ["RUNNING", "VIDEO-PLAYING"];
+      return status.tags.every((tag) => allowedTags.includes(tag));
+    });
+
  return (
    <Card className="p-4">
      <div className="border-b border-gray-600">
--- a/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
@@ -1,7 +1,8 @@
 import { useState } from "react";
 import type { SystemHealthStatus } from "../../../../types/types";
-import { capitalize } from "../../../../utils/utils";
+
 import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
+import Badge from "../../../../ui/Badge";

 type CameraStatusGridItemProps = {
  title: string;
@@ -10,7 +11,14 @@ type CameraStatusGridItemProps = {

 const CameraStatusGridItem = ({ title, statusCategory }: CameraStatusGridItemProps) => {
  const [isOpen, setIsOpen] = useState(false);
-  const isAllGood = statusCategory?.every((status) => status.tags.includes("RUNNING"));
+  const isAllGood = statusCategory?.every((status) => {
+    const allowedTags = ["RUNNING", "VIDEO-PLAYING"];
+    return status.tags.every((tag) => allowedTags.includes(tag));
+  });
+
+  const downItems = statusCategory?.filter((status) => {
+    return status.tags.some((tag) => tag !== "RUNNING" && tag !== "VIDEO-PLAYING");
+  });

  const handleClick = () => {
    setIsOpen(false);
@@ -21,8 +29,21 @@ const CameraStatusGridItem = ({ title, statusCategory }: CameraStatusGridItemPro
        className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241] hover:cursor-pointer m-2 h-70"
        onClick={() => setIsOpen(true)}
      >
-        <h3 className="text-lg flex flex-row items-center">{capitalize(title)}</h3>
-        <p className="text-sm text-slate-300">{isAllGood ? "Click to view module status" : "Some systems down"}</p>
+        <p className="text-sm text-slate-300">
+          {isAllGood ? (
+            "Click to view module status"
+          ) : (
+            <>
+              <ul>
+                {downItems.map((item) => (
+                  <li key={item.id} className="flex justify-between mb-2">
+                    <span>{item.id}</span> <Badge text={item.tags[0]} />
+                  </li>
+                ))}
+              </ul>
+            </>
+          )}
+        </p>
      </div>
      <SystemHealthModal
        isSystemHealthModalOpen={isOpen}
--- a/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
+++ b/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
@@ -21,7 +21,7 @@ const StatusGridItem = ({ title, statusCategory }: StatusGridItemProps) => {
  return (
    <>
      <div
-        className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241] hover:cursor-pointer"
+        className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241] hover:cursor-pointer"
        onClick={() => setIsOpen(true)}
      >
        <h3 className="text-lg flex flex-row items-center">
--- a/src/features/dashboard/components/systemHealth/SystemHealth.tsx
+++ b/src/features/dashboard/components/systemHealth/SystemHealth.tsx
@@ -39,11 +39,11 @@ const SystemHealth = ({ startTime, uptime, statuses, isLoading, isError, dateUpd
  }
  return (
    <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]">
+      <div className="p-2 border-b border-gray-600 grid grid-cols-1 md:grid-cols-2 gap-2 justify-between">
+        <div className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241]">
          <h3 className="text-lg">Start Time</h3> <span className="text-slate-300">{startTime}</span>
        </div>
-        <div className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241]">
+        <div className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241]">
          <h3 className="text-lg">Up Time</h3> <span className="text-slate-300">{uptime}</span>
        </div>
      </div>
--- a/src/features/output/components/BearerTypeFields.tsx
+++ b/src/features/output/components/BearerTypeFields.tsx
@@ -4,7 +4,7 @@ import type { FormTypes } from "../../../types/types";
 const BearerTypeFields = () => {
  useFormikContext<FormTypes>();
  return (
-    <div className="flex flex-row justify-between">
+    <div className="flex flex-col md:flex-row space-y-4  justify-between">
      <label htmlFor="format" className="text-xl">
        Format
      </label>
--- a/src/features/output/components/ChannelCard.tsx
+++ b/src/features/output/components/ChannelCard.tsx
@@ -10,7 +10,7 @@ const ChannelCard = () => {
  const { bearerQuery } = useGetBearerConfig(values?.format?.toLowerCase() || "json");
  const outputData = bearerQuery?.data;
  return (
-    <Card className="p-4 h-150 md:h-full">
+    <Card className="p-4 h-full">
      <CardHeader title={`Channel (${values?.format})`} />
      <ChannelFields
        errors={errors}
--- a/src/features/output/components/ChannelFields.tsx
+++ b/src/features/output/components/ChannelFields.tsx
@@ -52,7 +52,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
    <div className="flex flex-col gap-4 p-4">
      {values.format.toLowerCase() !== "ftp" ? (
        <>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="backoffice" className="block mb-2 font-medium">
              Back Office URL
            </label>
@@ -64,7 +64,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="username" className="block mb-2 font-medium">
              Username
            </label>
@@ -76,7 +76,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="password">Password</label>
            <Field
              name={"password"}
@@ -86,7 +86,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="readTimeoutSeconds">Read Timeout Seconds</label>
            <Field
              name={"readTimeoutSeconds"}
@@ -96,7 +96,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400  rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="connectTimeoutSeconds">Connect Timeout Seconds</label>
            <Field
              name={"connectTimeoutSeconds"}
@@ -105,7 +105,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="overviewQuality">Overview quality and scale</label>
            <Field
              name={"overviewQuality"}
@@ -118,7 +118,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              <option value={"LOW"}>Low</option>
            </Field>
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="cropSizeFactor">Crop Size Factor</label>
            <Field
              name={"cropSizeFactor"}
@@ -138,7 +138,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <h2 className="font-bold">{values.format} Constants</h2>
              </div>

-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="SCID">Source ID / Camera ID</label>
                <Field
                  name={"SCID"}
@@ -150,7 +150,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                  } rounded-lg w-full md:w-60`}
                />
              </div>
-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="timestampSource">Timestamp Source</label>
                <Field
                  name={"timestampSource"}
@@ -162,7 +162,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                  <option value={"LOCAL"}>Local</option>
                </Field>
              </div>
-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="GPSFormat">GPS Format</label>
                <Field
                  name={"GPSFormat"}
@@ -182,7 +182,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <div className="border-b border-gray-500 my-3">
                  <h2 className="font-bold">{values.format} Constants</h2>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="FFID">Feed ID / Force ID</label>
                  <Field
                    name={"FFID"}
@@ -194,7 +194,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="SCID">Source ID / Camera ID</label>
                  <Field
                    name={"SCID"}
@@ -206,7 +206,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="timestampSource">Timestamp Source</label>
                  <Field
                    name={"timestampSource"}
@@ -218,7 +218,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    <option value={"LOCAL"}>Local</option>
                  </Field>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="GPSFormat">GPS Format</label>
                  <Field
                    name={"GPSFormat"}
@@ -235,7 +235,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <div className="border-b border-gray-500 my-3">
                  <h2 className="font-bold">{values.format} Lane ID Config</h2>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="LID1">Lane ID 1 (Camera A)</label>
                  <Field
                    name={"LID1"}
@@ -247,7 +247,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="LID2">Lane ID 2 (Camera B)</label>
                  <Field
                    name={"LID2"}
@@ -272,7 +272,10 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                  {values?.customFields?.map((_, index) => {
                    // if (!field.value) return null;
                    return (
-                      <div key={index} className="flex flex-row justify-between items-center mb-4 gap-2">
+                      <div
+                        key={index}
+                        className="flex flex-col md:flex-row space-y-4 md:space-y-0 justify-between items-center mb-4 gap-2"
+                      >
                        <Field
                          name={`customFields.${index}.label`}
                          className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
@@ -287,10 +290,11 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                      </div>
                    );
                  })}
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                    <button
                      type="button"
                      onClick={() => arrayHelpers.push({ label: "", value: "" })}
-                    className={`mr-2 border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer ${values?.customFields && values?.customFields?.length >= 6 ? "opacity-50 cursor-not-allowed" : ""}`}
+                      className={`border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer ${values?.customFields && values?.customFields?.length >= 6 ? "opacity-50 cursor-not-allowed" : ""}`}
                      disabled={values?.customFields && values?.customFields?.length >= 6}
                    >
                      Add Custom Field
@@ -304,6 +308,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                        Remove Custom Field
                      </button>
                    )}
+                  </div>
                </>
              )}
            </FieldArray>
--- a/src/features/output/components/OSDFields.tsx
+++ b/src/features/output/components/OSDFields.tsx
@@ -34,7 +34,7 @@ const OSDFields = ({ isOSDLoading }: OSDFieldsProps) => {
              <OSDFieldToggle key={key} value={key} label={key.replace("include", "Include ")} />
            ))}
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="overlayPosition">Overlay Position</label>
            <Field
              as="select"
@@ -45,7 +45,7 @@ const OSDFields = ({ isOSDLoading }: OSDFieldsProps) => {
              <option value="Bottom">Bottom</option>
            </Field>
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="OSDTimestampFormat">OSD Timestamp Format</label>
            <Field
              as="select"
--- a/src/features/settings/components/SystemConfig.tsx
+++ b/src/features/settings/components/SystemConfig.tsx
@@ -65,8 +65,8 @@ const SystemConfig = () => {
  return (
    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
      {({ values }) => (
-        <Form>
-          <div className="flex flex-row justify-between items-center mb-4">
+        <Form className="flex flex-col space-y-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="deviceName">Device Name</label>
            <Field
              name="deviceName"
@@ -76,7 +76,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="timeZone">Timezone</label>
            <Field
              name="timeZone"
@@ -91,7 +91,7 @@ const SystemConfig = () => {
              ))}
            </Field>
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="timeSource">Time Source</label>
            <Field
              name="timeSource"
@@ -106,8 +106,7 @@ const SystemConfig = () => {
              ))}
            </Field>
          </div>
-
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="SNTPServer">SNTP Server</label>
            <Field
              name="SNTPServer"
@@ -117,7 +116,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="SNTPInterval">SNTP Interval</label>
            <Field
              name="SNTPInterval"
@@ -127,7 +126,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="subnetMask">Subnet Mask</label>
            <Field
              name="subnetMask"
@@ -137,7 +136,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="ipAddress">IP Address</label>
            <Field
              name="ipAddress"
@@ -147,7 +146,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="gateway">Gateway</label>
            <Field
              name="gateway"
@@ -157,7 +156,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="primaryServer">Primary DNS Server</label>
            <Field
              name="primaryServer"
@@ -167,7 +166,7 @@ const SystemConfig = () => {
              autoComplete="off"
            />
          </div>
-          <div className="flex flex-row justify-between items-center mb-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="secondaryServer">Secondary DNS Server</label>
            <Field
              name="secondaryServer"
@@ -220,7 +219,7 @@ const SystemConfig = () => {
          </div>
          <button
            type="submit"
-            className="px-4 py-2 bg-green-700 text-white rounded-lg hover:bg-green-800 hover:cursor-pointer"
+            className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
            disabled={isLoading}
          >
            {isLoading ? "Saving..." : "Save Settings"}
--- a/src/hooks/useGetVersions.ts
+++ b/src/hooks/useGetVersions.ts
@@ -0,0 +1,17 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../utils/config";
+
+const fetchVersions = async () => {
+  const response = await fetch(`${CAMBASE}/api/versions`);
+  if (!response.ok) throw new Error("Cannot get Versions");
+  return response.json();
+};
+
+export const useGetVersions = () => {
+  const versionsQuery = useQuery({
+    queryKey: ["getversions"],
+    queryFn: fetchVersions,
+  });
+
+  return { versionsQuery };
+};
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,7 +6,10 @@ import { AppProviders } from "./app/providers/AppProviders";
 import "./index.css";
 import Modal from "react-modal";

-const router = createRouter({ routeTree });
+const router = createRouter({
+  routeTree,
+  basepath: "/bayiq",
+});

 Modal.setAppElement("#root");

--- a/src/routeTree.gen.ts
+++ b/src/routeTree.gen.ts
@@ -11,7 +11,7 @@
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as SettingsRouteImport } from './routes/settings'
 import { Route as OutputRouteImport } from './routes/output'
-import { Route as BaywatchRouteImport } from './routes/baywatch'
+import { Route as CamerasRouteImport } from './routes/cameras'
 import { Route as AboutRouteImport } from './routes/about'
 import { Route as IndexRouteImport } from './routes/index'

@@ -25,9 +25,9 @@ const OutputRoute = OutputRouteImport.update({
  path: '/output',
  getParentRoute: () => rootRouteImport,
 } as any)
-const BaywatchRoute = BaywatchRouteImport.update({
-  id: '/baywatch',
-  path: '/baywatch',
+const CamerasRoute = CamerasRouteImport.update({
+  id: '/cameras',
+  path: '/cameras',
  getParentRoute: () => rootRouteImport,
 } as any)
 const AboutRoute = AboutRouteImport.update({
@@ -44,14 +44,14 @@ const IndexRoute = IndexRouteImport.update({
 export interface FileRoutesByFullPath {
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
 export interface FileRoutesByTo {
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
@@ -59,22 +59,22 @@ export interface FileRoutesById {
  __root__: typeof rootRouteImport
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
 export interface FileRouteTypes {
  fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: '/' | '/about' | '/baywatch' | '/output' | '/settings'
+  fullPaths: '/' | '/about' | '/cameras' | '/output' | '/settings'
  fileRoutesByTo: FileRoutesByTo
-  to: '/' | '/about' | '/baywatch' | '/output' | '/settings'
-  id: '__root__' | '/' | '/about' | '/baywatch' | '/output' | '/settings'
+  to: '/' | '/about' | '/cameras' | '/output' | '/settings'
+  id: '__root__' | '/' | '/about' | '/cameras' | '/output' | '/settings'
  fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
  IndexRoute: typeof IndexRoute
  AboutRoute: typeof AboutRoute
-  BaywatchRoute: typeof BaywatchRoute
+  CamerasRoute: typeof CamerasRoute
  OutputRoute: typeof OutputRoute
  SettingsRoute: typeof SettingsRoute
 }
@@ -95,11 +95,11 @@ declare module '@tanstack/react-router' {
      preLoaderRoute: typeof OutputRouteImport
      parentRoute: typeof rootRouteImport
    }
-    '/baywatch': {
-      id: '/baywatch'
-      path: '/baywatch'
-      fullPath: '/baywatch'
-      preLoaderRoute: typeof BaywatchRouteImport
+    '/cameras': {
+      id: '/cameras'
+      path: '/cameras'
+      fullPath: '/cameras'
+      preLoaderRoute: typeof CamerasRouteImport
      parentRoute: typeof rootRouteImport
    }
    '/about': {
@@ -122,7 +122,7 @@ declare module '@tanstack/react-router' {
 const rootRouteChildren: RootRouteChildren = {
  IndexRoute: IndexRoute,
  AboutRoute: AboutRoute,
-  BaywatchRoute: BaywatchRoute,
+  CamerasRoute: CamerasRoute,
  OutputRoute: OutputRoute,
  SettingsRoute: SettingsRoute,
 }
--- a/src/routes/baywatch.tsx
+++ b/src/routes/baywatch.tsx
@@ -1,14 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
 import CameraGrid from "../features/cameras/components/CameraGrid";

-export const Route = createFileRoute("/baywatch")({
+export const Route = createFileRoute("/cameras")({
  component: RouteComponent,
 });

 function RouteComponent() {
-  return (
-    <div>
-      <CameraGrid />
-    </div>
-  );
+  return <CameraGrid />;
 }
--- a/src/routes/output.tsx
+++ b/src/routes/output.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/output")({
 });

 function RouteComponent() {
-  return (
-    <div>
-      <OutputForms />
-    </div>
-  );
+  return <OutputForms />;
 }
--- a/src/routes/settings.tsx
+++ b/src/routes/settings.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/settings")({
 });

 function RouteComponent() {
-  return (
-    <div>
-      <Settings />
-    </div>
-  );
+  return <Settings />;
 }
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -1,3 +1,5 @@
+import type { CameraID } from "../app/config/cameraConfig";
+
 export type WebSocketContextValue = {
  connected: boolean;
  send?: (msg: unknown) => void;
@@ -11,6 +13,10 @@ export type InfoBarData = {
  "thread-count": string;
 };

+export type CameraZoomData = {
+  magnificationLevel: string;
+};
+
 export type StatusIndicator = "neutral-quaternary" | "dark" | "info" | "success" | "warning" | "danger";
 export type Region = {
  name: string;
@@ -124,57 +130,42 @@ export type OptionalBOF2LaneIDs = {
 };

 export type CameraFeedState = {
-  cameraFeedID: "A" | "B" | "C";
-  paintedCells: {
-    A: Map<string, PaintedCell>;
-    B: Map<string, PaintedCell>;
-    C: Map<string, PaintedCell>;
-  };
-  regionsByCamera: {
-    A: Region[];
-    B: Region[];
-    C: Region[];
-  };
+  cameraFeedID: CameraID;
+  paintedCells: Record<CameraID, Map<string, PaintedCell>>;
+
+  regionsByCamera: Record<CameraID, Region[]>;
  selectedRegionIndex: number;
-  modeByCamera: {
-    A: string;
-    B: string;
-    C: string;
-  };
+  modeByCamera: Record<CameraID, string>;

  tabIndex?: number;
-  zoomLevel: {
-    A: number;
-    B: number;
-    C: number;
-  };
+  zoomLevel: Record<CameraID, number>;
 };

 export type CameraFeedAction =
  | {
      type: "SET_CAMERA_FEED";
-      payload: "A" | "B" | "C";
+      payload: CameraID;
    }
  | {
      type: "CHANGE_MODE";
-      payload: { cameraFeedID: "A" | "B" | "C"; mode: string };
+      payload: { cameraFeedID: CameraID; mode: string };
    }
  | { type: "SET_SELECTED_REGION_INDEX"; payload: number }
  | {
      type: "SET_SELECTED_REGION_COLOUR";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string; newColour: string };
+      payload: { cameraFeedID: CameraID; regionName: string; newColour: string };
    }
  | {
      type: "ADD_NEW_REGION";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string; brushColour: string };
+      payload: { cameraFeedID: CameraID; regionName: string; brushColour: string };
    }
  | {
      type: "REMOVE_REGION";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string };
+      payload: { cameraFeedID: CameraID; regionName: string };
    }
  | {
      type: "RESET_PAINTED_CELLS";
-      payload: { cameraFeedID: "A" | "B" | "C"; paintedCells: Map<string, PaintedCell> };
+      payload: { cameraFeedID: CameraID; paintedCells: Map<string, PaintedCell> };
    }
  | {
      type: "SET_CAMERA_FEED_DATA";
@@ -185,7 +176,7 @@ export type CameraFeedAction =
    }
  | {
      type: "SET_ZOOM_LEVEL";
-      payload: { cameraFeedID: "A" | "B" | "C"; zoomLevel: number };
+      payload: { cameraFeedID: CameraID; zoomLevel: number };
    };

 export type DecodeReading = {
@@ -198,6 +189,7 @@ export type DecodeReading = {
  duplicate?: true;
  firstSeenTimeHumane: string;
  lastSeenTimeHumane: string;
+  plate?: string;
 };

 export type ColourData = {
@@ -206,7 +198,7 @@ export type ColourData = {
 };

 export type ColourDetectionPayload = {
-  cameraFeedID: "A" | "B" | "C";
+  cameraFeedID: CameraID;
  regions: ColourData[];
 };

@@ -238,3 +230,16 @@ export type BlackBoardOptions = {
 };

 export type CameraZoomConfig = { cameraFeedID: string; zoomLevel: number };
+
+export type versionInfo = {
+  version: string;
+  revision: string;
+  buildtime: string;
+  appname: string;
+  MAC: string;
+  timeStamp: number;
+  UUID: string;
+  proquint: string;
+  "Serial No.": string;
+  "Model No.": string;
+};
--- a/src/ui/DevModal.tsx
+++ b/src/ui/DevModal.tsx
@@ -0,0 +1,76 @@
+import type { versionInfo } from "../types/types";
+import ModalComponent from "./ModalComponent";
+
+type DevModalProps = {
+  isDevModalOpen: boolean;
+  handleClose: () => void;
+  data: versionInfo;
+};
+
+const DevModal = ({ isDevModalOpen, handleClose, data }: DevModalProps) => {
+  const uiName = __APP_NAME__;
+  const uiVersion = __APP_VERSION__;
+  const commitID = __GIT_COMMIT__;
+  const commitTimeStamp = __GIT_TIMESTAMP__;
+
+  return (
+    <ModalComponent isModalOpen={isDevModalOpen} close={handleClose}>
+      <div className="space-y-6">
+        <div className="border-b border-gray-600 pb-3">
+          <h2 className="text-2xl font-bold text-gray-100">System Information</h2>
+          <p className="text-sm text-gray-400 mt-1">Application version details</p>
+        </div>
+        <div className="space-y-3">
+          <h3 className="text-sm font-semibold text-gray-400 uppercase tracking-wide">Frontend (UI)</h3>
+          <div className="bg-gray-800/50 rounded-lg p-4 space-y-3">
+            <div className="flex justify-between items-center border-b border-gray-700 pb-2">
+              <span className="text-gray-400 text-sm">Name</span>
+              <span className="text-gray-200 font-mono font-semibold">{uiName}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Version</span>
+              <span className="text-gray-200 font-mono font-semibold">{uiVersion}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Revision (Commit ID)</span>
+              <span className="bg-[#233241] p-2 rounded-md text-gray-200 font-mono text-sm">{commitID}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Build Time</span>
+              <span className="text-gray-200 font-mono text-sm">{commitTimeStamp}</span>
+            </div>
+          </div>
+        </div>
+        <div className="space-y-3">
+          <h3 className="text-sm font-semibold text-gray-400 uppercase tracking-wide">Backend</h3>
+          <div className="bg-gray-800/50 rounded-lg p-4 space-y-3">
+            <div className="flex justify-between items-center border-b border-gray-700 pb-2">
+              <span className="text-gray-400 text-sm"> Name</span>
+              <span className="text-gray-200 font-mono font-semibold">{data?.appname || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center pb-2">
+              <span className="text-gray-400 text-sm">Version</span>
+              <span className="text-gray-200 font-mono font-semibold">{data?.version || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center  pb-2">
+              <span className="text-gray-400 text-sm">Revision (Commit ID)</span>
+              <span className="bg-[#233241] p-2 rounded-md text-gray-200 font-mono text-sm">
+                {data?.revision || "N/A"}
+              </span>
+            </div>
+            <div className="flex justify-between items-center  pb-2">
+              <span className="text-gray-400 text-sm">Build Time</span>
+              <span className="text-gray-200 font-mono text-sm">{data?.buildtime || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">MAC Address</span>
+              <span className="text-gray-200 font-mono text-sm">{data?.MAC || "N/A"}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
+
+export default DevModal;
--- a/src/ui/Footer.tsx
+++ b/src/ui/Footer.tsx
@@ -1,11 +1,25 @@
+import { useState } from "react";
 import Logo from "/MAV.svg";
+import DevModal from "./DevModal";
+import { useGetVersions } from "../hooks/useGetVersions";

 const Footer = () => {
+  const [isDevModalOpen, setDevModalOpen] = useState(false);
+  const { versionsQuery } = useGetVersions();
+
+  const versionData = versionsQuery?.data;
+
+  const handleClick = () => {
+    setDevModalOpen(true);
+  };
  return (
+    <>
      <footer className="bg-gray-900 border-t border-gray-700 text-white py-5 text-left p-8 h-30 mt-5 flex flex-col space-y-4 ">
-      <img src={Logo} alt="Logo" width={100} height={100} />
+        <img src={Logo} alt="Logo" width={100} height={100} onClick={handleClick} />
        <p className="text-sm">{new Date().getFullYear()} MAV Systems &copy; All rights reserved.</p>
      </footer>
+      <DevModal isDevModalOpen={isDevModalOpen} handleClose={() => setDevModalOpen(false)} data={versionData} />
+    </>
  );
 };

--- a/src/ui/Header.tsx
+++ b/src/ui/Header.tsx
@@ -1,15 +1,29 @@
+import { useState } from "react";
 import { Link } from "@tanstack/react-router";
 import Logo from "/MAV.svg";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faBars } from "@fortawesome/free-solid-svg-icons";

 const Header = () => {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const toggleMenu = () => {
+    setIsMenuOpen(!isMenuOpen);
+  };
  return (
-    <header className="bg-[#253445] p-4 flex border-b border-gray-500 justify-between items-center">
+    <nav className="bg-[#253445] p-4 flex border-b border-gray-500 justify-between items-center md:flex-row flex-col">
+      <div className="flex flex-row justify-between w-full items-center">
        <div className="w-28">
-        <Link to={"/"}>
+          <Link to={"/"} onClick={() => setIsMenuOpen(false)}>
            <img src={Logo} alt="Logo" width={150} height={150} />
          </Link>
        </div>
-      <div className="flex gap-4 text-lg items-center">
+
+        <div className="hover:cursor-pointer md:hidden" onClick={toggleMenu}>
+          <FontAwesomeIcon icon={faBars} />
+        </div>
+      </div>
+
+      <div className="md:flex hidden gap-4 text-lg items-center">
        <Link
          to="/"
          className="[&.active]:font-bold [&.active]:bg-gray-700 p-2 rounded-lg flex items-center gap-2 hover:bg-gray-700"
@@ -19,7 +33,7 @@ const Header = () => {
        </Link>

        <Link
-          to="/baywatch"
+          to="/cameras"
          className="[&.active]:font-bold [&.active]:bg-gray-700 p-2 rounded-lg flex items-center gap-2 hover:bg-gray-700"
        >
          Cameras
@@ -37,7 +51,26 @@ const Header = () => {
          Settings
        </Link>
      </div>
-    </header>
+      {/* mobile menu */}
+      {isMenuOpen && (
+        <div className="md:hidden flex flex-col w-full mt-4 gap-4 text-lg items-end">
+          <Link to="/" className="" onClick={toggleMenu}>
+            {/* <FontAwesomeIcon icon={faGaugeHigh} /> */}
+            Dashboard
+          </Link>
+          <Link to="/cameras" className="" onClick={toggleMenu}>
+            {/* <FontAwesomeIcon icon={faGaugeHigh} /> */}
+            Cameras
+          </Link>
+          <Link to="/output" className="" onClick={toggleMenu}>
+            Output
+          </Link>
+          <Link to="/settings" className="" onClick={toggleMenu}>
+            Settings
+          </Link>
+        </div>
+      )}
+    </nav>
  );
 };

--- a/src/ui/ModalComponent.tsx
+++ b/src/ui/ModalComponent.tsx
@@ -23,6 +23,14 @@ const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) =
        },
      }}
    >
+      <div className="flex justify-end">
+        <button
+          onClick={close}
+          className="bg-gray-700 hover:bg-gray-600 text-white font-bold py-2 px-4 rounded-lg mb-4 hover:cursor-pointer"
+        >
+          Close
+        </button>
+      </div>
      {children}
    </Modal>
  );
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -1 +1,9 @@
-export const CAMBASE = import.meta.env.VITE_BASEURL;
+export const cambase = import.meta.env.VITE_BASEURL;
+
+export const CAMBASEWS = import.meta.env.VITE_BASE_WS;
+
+const environment = import.meta.env.MODE;
+
+export const CAMBASE = environment === "development" ? cambase : window.location.origin;
+
+export const CAMBASE_WS = environment === "development" ? CAMBASEWS : window.location.origin.replace(/^http/, "ws");
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -0,0 +1,6 @@
+/// <reference types="vite/client" />
+
+declare const __APP_NAME__: string;
+declare const __APP_VERSION__: string;
+declare const __GIT_COMMIT__: string;
+declare const __GIT_TIMESTAMP__: string;
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -2,13 +2,38 @@ import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { tanstackRouter } from "@tanstack/router-plugin/vite";
+import pkg from "./package.json";
+import { execSync } from "child_process";
+
+const gitCommitHash = (() => {
+  try {
+    return execSync("git rev-parse --short HEAD").toString().trim();
+  } catch {
+    return "unknown";
+  }
+})();
+
+const gitCommitTimeStamp = (() => {
+  try {
+    return execSync("git log -1 --format=%cd --date=iso").toString().trim();
+  } catch {
+    return "unknown";
+  }
+})();

 // https://vite.dev/config/
 export default defineConfig({
+  base: "/bayiq",
+  define: {
+    __APP_NAME__: JSON.stringify(pkg.name),
+    __APP_VERSION__: JSON.stringify(pkg.version),
+    __GIT_COMMIT__: JSON.stringify(gitCommitHash),
+    __GIT_TIMESTAMP__: JSON.stringify(gitCommitTimeStamp),
+  },
  plugins: [
    tanstackRouter({
      target: "react",
-      autoCodeSplitting: true,
+      autoCodeSplitting: false,
    }),
    react(),
    tailwindcss(),
@@ -21,4 +46,11 @@ export default defineConfig({
      },
    },
  },
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks: undefined,
+      },
+    },
+  },
 });
Author	SHA1	Message	Date
Toba Ojo	dab49fd99c	Refactored routing components for better organization and maintainability	2025-12-17 16:07:01 +00:00
Toba Ojo	775fce7900	Refactor camera feed handling to support dynamic camera IDs and improve context management	2025-12-17 14:19:23 +00:00
TobaOjo	cc8b3a5691	Merge pull request 'more accurate system status' (#25 ) from bugfix/dashboard into develop Reviewed-on: #25	2025-12-17 09:46:26 +00:00
Toba Ojo	71ce2a9f91	- removed console.log - fixed issue for more extensive check into tags to be more accurate	2025-12-17 09:44:14 +00:00
Toba Ojo	3fbafbbcc7	- minor bugfixes - added developer modal for viewing app data	2025-12-12 12:18:17 +00:00
TobaOjo	b38fbe132b	Merge pull request 'develop' (#24 ) from develop into main Reviewed-on: #24	2025-12-12 08:33:36 +00:00
TobaOjo	9489fe2d6a	Merge branch 'main' into develop	2025-12-12 08:33:27 +00:00
Toba Ojo	3353ad6f8b	- updated paths and code splitting config	2025-12-12 08:32:06 +00:00
Toba Ojo	d1995f0a9f	- updated main endpoint end point and added flexibility for camera navigation	2025-12-11 10:52:13 +00:00
Toba Ojo	e395777ae9	- added modal for entry and exit sightings and plate patches	2025-12-10 22:32:30 +00:00
TobaOjo	ba93753df7	Merge pull request 'feature/ws-Camera' (#23 ) from feature/ws-Camera into develop Reviewed-on: #23	2025-12-10 14:09:24 +00:00
Toba Ojo	eb45eabde9	- improved magnification level text - removed magnification level	2025-12-10 14:08:44 +00:00
Toba Ojo	10e2644666	- improved zoom while clicking on on image to zoom	2025-12-10 13:09:07 +00:00
Toba Ojo	0ff43d975d	- added digital zoom functionality on fixed location via web sockets	2025-12-10 10:30:32 +00:00
TobaOjo	f0f311f316	Merge pull request 'develop' (#22 ) from develop into main Reviewed-on: #22	2025-12-09 15:54:52 +00:00
Toba Ojo	c73c5f4187	- adjusted button on settings	2025-12-09 15:53:20 +00:00
TobaOjo	0378667fe3	Merge pull request '- Enhanced responsiveness and layout adjustments across various components' (#21 ) from enhancement/responsive into develop Reviewed-on: #21	2025-12-09 14:09:06 +00:00
Toba Ojo	632962aeaf	- Enhanced responsiveness and layout adjustments across various components	2025-12-09 14:07:51 +00:00
TobaOjo	e6f4131c1e	Merge pull request 'Add zoom mode functionality and refactor video feed hooks' (#20 ) from feature/digitalZoom into develop Reviewed-on: #20	2025-12-09 13:04:10 +00:00
TobaOjo	06fe99b550	Merge branch 'develop' into feature/digitalZoom	2025-12-09 13:04:03 +00:00
TobaOjo	328c61cf98	Merge pull request '- implement camera zoom controls and state management' (#19 ) from feature/cameraControls-2 into develop Reviewed-on: #19	2025-12-09 13:03:42 +00:00
Toba Ojo	c6a336389b	Add zoom mode functionality and refactor video feed hooks - Implemented zoom mode in RegionSelector for digital zooming. - Updated VideoFeedGridPainter to handle zoom interactions. - Refactored useGetVideoFeed to support target detection and video feed queries based on mode. - Enhanced useCreateVideoSnapshot to manage snapshots during zoom mode.	2025-12-09 12:39:03 +00:00