Merge pull request 'develop' (#24) from develop into main

Reviewed-on: #24
2025-12-12 08:33:36 +00:00
parent f0f311f316 9489fe2d6a
commit b38fbe132b
17 changed files with 447 additions and 127 deletions
--- 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,25 @@
 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;
+  cameraFeedA: CameraSocketState;
+  cameraFeedB: CameraSocketState;
+  cameraFeedC: CameraSocketState;
 };

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

 export const useInfoSocket = () => useWebSocketContext().info;
+export const useCameraFeedASocket = () => useWebSocketContext().cameraFeedA;
+export const useCameraFeedBSocket = () => useWebSocketContext().cameraFeedB;
+export const useCameraFeedCSocket = () => useWebSocketContext().cameraFeedC;
--- a/src/app/providers/CameraFeedProvider.tsx
+++ b/src/app/providers/CameraFeedProvider.tsx
@@ -42,7 +42,6 @@ export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
        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);
--- a/src/app/providers/WebSocketProvider.tsx
+++ b/src/app/providers/WebSocketProvider.tsx
@@ -2,7 +2,7 @@ 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";

 type WebSocketProviderProps = {
  children: ReactNode;
@@ -10,7 +10,11 @@ type WebSocketProviderProps = {

 export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
  const [systemData, setSystemData] = useState<InfoBarData | null>(null);
+  const [socketData, setSocketData] = useState<CameraZoomData | null>(null);
  const infoSocket = useWebSocket(wsConfig.infoBar, { share: true, shouldReconnect: () => true });
+  const cameraFeedASocket = useWebSocket(wsConfig.cameraFeedA, { share: true, shouldReconnect: () => true });
+  const cameraFeedBSocket = useWebSocket(wsConfig.cameraFeedB, { share: true, shouldReconnect: () => true });
+  const cameraFeedCSocket = useWebSocket(wsConfig.cameraFeedC, { share: true, shouldReconnect: () => true });

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

  const value = useMemo<WebSocketConextValue>(
    () => ({
@@ -30,8 +45,37 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
        readyState: infoSocket.readyState,
        sendJson: infoSocket.sendJsonMessage,
      },
+      cameraFeedA: {
+        data: socketData,
+        readyState: cameraFeedASocket.readyState,
+
+        send: cameraFeedASocket.sendMessage,
+      },
+      cameraFeedB: {
+        data: socketData,
+        readyState: cameraFeedBSocket.readyState,
+
+        send: cameraFeedBSocket.sendMessage,
+      },
+      cameraFeedC: {
+        data: socketData,
+        readyState: cameraFeedCSocket.readyState,
+
+        send: cameraFeedCSocket.sendMessage,
+      },
    }),
-    [infoSocket.readyState, infoSocket.sendJsonMessage, systemData],
+    [
+      cameraFeedASocket.readyState,
+      cameraFeedASocket.sendMessage,
+      cameraFeedBSocket.readyState,
+      cameraFeedBSocket.sendMessage,
+      cameraFeedCSocket.readyState,
+      cameraFeedCSocket.sendMessage,
+      infoSocket.readyState,
+      infoSocket.sendJsonMessage,
+      socketData,
+      systemData,
+    ],
  );

  return <WebsocketContext.Provider value={value}>{children}</WebsocketContext.Provider>;
--- a/src/features/cameras/components/CameraSettings/RegionSelector.tsx
+++ b/src/features/cameras/components/CameraSettings/RegionSelector.tsx
@@ -4,6 +4,11 @@ import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext"
 import { useColourDectection } from "../../hooks/useColourDetection";
 import { useBlackBoard } from "../../../../hooks/useBlackBoard";
 import { toast } from "sonner";
+import {
+  useCameraFeedASocket,
+  useCameraFeedBSocket,
+  useCameraFeedCSocket,
+} from "../../../../app/context/WebSocketContext";

 type RegionSelectorProps = {
  regions: Region[];
@@ -28,6 +33,30 @@ const RegionSelector = ({
  const { state, dispatch } = useCameraFeedContext();
  const { blackboardMutation } = useBlackBoard();
  const paintedCells = state.paintedCells[cameraFeedID];
+  const cameraASocket = useCameraFeedASocket();
+  const cameraBSocket = useCameraFeedBSocket();
+  const cameraCSocket = useCameraFeedCSocket();
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraASocket;
+      case "B":
+        return cameraBSocket;
+      case "C":
+        return cameraCSocket;
+    }
+  };
+
+  const socket = getCurrentSocket();
+
+  const getMagnificationLevel = () => {
+    const test = socket.data;
+    if (!socket.data) return null;
+
+    if (!test || !test.magnificationLevel) return "0x";
+    return test?.magnificationLevel;
+  };

  const handleChange = (e: { target: { value: string } }) => {
    dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: e.target.value } });
@@ -123,7 +152,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: {
@@ -174,6 +203,25 @@ 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
@@ -189,10 +237,9 @@ const RegionSelector = ({
                className="sr-only"
              />
              <div className="flex flex-col space-y-3">
-                <span className="text-xl">Enlarge image</span>
-                {mode === "zoom" && (
-                  <small className={`text-gray-400 italic`}>Use mouse to digitally zoom in and out</small>
-                )}
+                <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>
@@ -235,10 +282,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>
--- a/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
@@ -1,17 +1,28 @@
+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">
        {/* Desktop Table */}
        <div className="hidden md:block overflow-y-auto">
@@ -27,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>
@@ -39,12 +54,13 @@ const SightingEntryTable = () => {
          </table>
        </div>

-      {/* Mobile Cards */}
+        {/* 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>
@@ -68,6 +84,13 @@ const SightingEntryTable = () => {
          ))}
        </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,8 +14,14 @@ 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 m-2">
        {/* Desktop Table */}
        <div className="hidden md:block overflow-y-auto">
@@ -27,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>
@@ -45,6 +59,7 @@ const SightingExitTable = () => {
            <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>
@@ -68,6 +83,13 @@ const SightingExitTable = () => {
          ))}
        </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,14 @@ 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 {
+  useCameraFeedASocket,
+  useCameraFeedBSocket,
+  useCameraFeedCSocket,
+} from "../../../../app/context/WebSocketContext";
+import { ReadyState } from "react-use-websocket";
+import { toast } from "sonner";

 const BACKEND_WIDTH = 640;
 const BACKEND_HEIGHT = 360;
@@ -25,14 +31,54 @@ const VideoFeedGridPainter = () => {
  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 cameraASocket = useCameraFeedASocket();
+  const cameraBSocket = useCameraFeedBSocket();
+  const cameraCSocket = useCameraFeedCSocket();
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraASocket;
+      case "B":
+        return cameraBSocket;
+      case "C":
+        return cameraCSocket;
+    }
+  };
+
+  const handleZoomClick = (e: KonvaEventObject<MouseEvent>, cameraFeedID: "A" | "B" | "C") => {
+    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) {
@@ -64,6 +110,7 @@ const VideoFeedGridPainter = () => {
        map.delete(key);
        paintLayerRef.current?.batchDraw();
      }
+
      return;
    }

@@ -75,14 +122,14 @@ const VideoFeedGridPainter = () => {
  };

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

  const handleMouseEnter = () => {
-    if (mode !== "zoom") return;
+    if (mode !== "magnify") return;
    setScale(2);
  };
  const handleMouseLeave = () => {
@@ -170,7 +217,13 @@ const VideoFeedGridPainter = () => {
          x={position.x}
          y={position.y}
        >
-          <Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />
+          <Image
+            image={image}
+            width={stageSize.width}
+            height={stageSize.height}
+            classname={"rounded-lg"}
+            onClick={(e) => handleZoomClick(e, cameraFeedID)}
+          />
        </Layer>

        <Layer ref={paintLayerRef} opacity={0.6}>
--- a/src/features/cameras/hooks/useGetVideoFeed.ts
+++ b/src/features/cameras/hooks/useGetVideoFeed.ts
@@ -28,14 +28,14 @@ export const useGetVideoFeed = (cameraFeedID: "A" | "B" | "C" | null, mode: stri
    queryKey: ["getfeed", cameraFeedID],
    queryFn: () => targetDectionFeed(cameraFeedID),
    refetchInterval: 500,
-    enabled: mode !== "zoom",
+    enabled: mode !== "magnify" && mode !== "zoom",
  });

  const videoFeedQuery = useQuery({
    queryKey: ["videoQuery", cameraFeedID, mode],
    queryFn: () => getVideoFeed(cameraFeedID),
    refetchInterval: 500,
-    enabled: mode === "zoom",
+    enabled: mode === "magnify" || mode === "zoom",
  });

  return { targetDetectionQuery, videoFeedQuery };
--- a/src/features/cameras/hooks/useGetvideoSnapshots.ts
+++ b/src/features/cameras/hooks/useGetvideoSnapshots.ts
@@ -15,7 +15,7 @@ export const useCreateVideoSnapshot = () => {
  const videoSnapShot = videoFeedQuery?.data;
  const isVideoLoading = videoFeedQuery.isPending;

-  if (isVideoLoading === false && videoSnapShot && mode === "zoom") {
+  if ((isVideoLoading === false && videoSnapShot && mode === "magnify") || mode === "zoom") {
    snapShot = videoSnapShot;
  }

--- 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/types/types.ts
+++ b/src/types/types.ts
@@ -11,6 +11,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;
@@ -198,6 +202,7 @@ export type DecodeReading = {
  duplicate?: true;
  firstSeenTimeHumane: string;
  lastSeenTimeHumane: string;
+  plate?: string;
 };

 export type ColourData = {
--- a/src/ui/ModalComponent.tsx
+++ b/src/ui/ModalComponent.tsx
@@ -26,7 +26,7 @@ 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"
+          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>
--- 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/vite.config.ts
+++ b/vite.config.ts
@@ -5,10 +5,11 @@ import { tanstackRouter } from "@tanstack/router-plugin/vite";

 // https://vite.dev/config/
 export default defineConfig({
+  base: "/bayiq",
  plugins: [
    tanstackRouter({
      target: "react",
-      autoCodeSplitting: true,
+      autoCodeSplitting: false,
    }),
    react(),
    tailwindcss(),
@@ -21,4 +22,11 @@ export default defineConfig({
      },
    },
  },
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks: undefined,
+      },
+    },
+  },
 });