11 Commits

Author SHA1 Message Date
6a99a15342 Merge branch 'develop' into feature/setupPage 2025-12-23 14:42:47 +00:00
8dac436831 Merge pull request 'feature/modals' (#3) from feature/modals into develop
Reviewed-on: #3
2025-12-23 14:40:00 +00:00
73c67ad992 - implement setup page with video feed and preview functionality 2025-12-23 14:36:16 +00:00
9394793669 feat: update modal and sighting components for improved layout and timestamp display 2025-12-23 12:41:25 +00:00
3b7487da09 feat: add modal component for sighting details with content display
- Implemented ModalComponent for reusable modal functionality.
- Created SightingItemModal to manage modal state and display sighting details.
- Developed SightingModalContent to render sighting information including video feed and metadata.
2025-12-23 10:37:02 +00:00
a299960dfb Merge pull request 'feature/sightingStackList' (#2) from feature/sightingStackList into develop
Reviewed-on: #2
2025-12-23 09:00:58 +00:00
4a7fb58411 - changed font colour 2025-12-23 08:59:55 +00:00
ef5f07de0a Refactor SightingItem to display time since sighting; add timeAgo utility function 2025-12-23 08:58:08 +00:00
70083d9c60 Add CameraSettings context and provider; integrate into AppProviders and VideoFeed 2025-12-22 16:10:34 +00:00
6879e30b9c Add PlateRead component and integrate it into the Dashboard; refactor VideoFeed and SightingStack for improved layout 2025-12-22 14:09:30 +00:00
c2f55898fe Merge pull request 'feature/videofeed' (#1) from feature/videofeed into develop
Reviewed-on: #1
2025-12-22 12:30:26 +00:00
26 changed files with 888 additions and 719 deletions

View File

@@ -22,6 +22,7 @@
"react": "^19.2.0", "react": "^19.2.0",
"react-dom": "^19.2.0", "react-dom": "^19.2.0",
"react-konva": "^19.2.1", "react-konva": "^19.2.1",
"react-modal": "^3.16.3",
"tailwindcss": "^4.1.18" "tailwindcss": "^4.1.18"
}, },
"devDependencies": { "devDependencies": {
@@ -30,6 +31,7 @@
"@types/node": "^24.10.1", "@types/node": "^24.10.1",
"@types/react": "^19.2.5", "@types/react": "^19.2.5",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@types/react-modal": "^3.16.3",
"@vitejs/plugin-react": "^5.1.1", "@vitejs/plugin-react": "^5.1.1",
"eslint": "^9.39.1", "eslint": "^9.39.1",
"eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-hooks": "^7.0.1",

View File

@@ -0,0 +1,16 @@
import { createContext, useContext } from "react";
import type { CameraSettings, CameraSettingsAction } from "../../utils/types";
type CameraSettingsContextType = {
state: CameraSettings;
dispatch: (state: CameraSettingsAction) => void;
};
export const CameraSettingsContext = createContext<CameraSettingsContextType | null>(null);
export const useCameraSettingsContext = () => {
const context = useContext(CameraSettingsContext);
if (!context) {
throw new Error("useCameraSettingsContext must be used within a CameraSettingsProvider");
}
return context;
};

View File

@@ -1,8 +1,13 @@
import { type PropsWithChildren } from "react"; import { type PropsWithChildren } from "react";
import { QueryProvider } from "./QueryProvider"; import { QueryProvider } from "./QueryProvider";
import CameraSettingsProvider from "./CameraSettingsProvider";
const AppProviders = ({ children }: PropsWithChildren) => { const AppProviders = ({ children }: PropsWithChildren) => {
return <QueryProvider>{children}</QueryProvider>; return (
<QueryProvider>
<CameraSettingsProvider>{children}</CameraSettingsProvider>
</QueryProvider>
);
}; };
export default AppProviders; export default AppProviders;

View File

@@ -0,0 +1,11 @@
import { CameraSettingsContext } from "../context/CameraSettingsContext";
import { useReducer, type ReactNode } from "react";
import { initialState, cameraSettingsReducer } from "../reducers/cameraSettingsReducer";
const CameraSettingsProvider = ({ children }: { children: ReactNode }) => {
const [state, dispatch] = useReducer(cameraSettingsReducer, initialState);
return <CameraSettingsContext.Provider value={{ state, dispatch }}>{children}</CameraSettingsContext.Provider>;
};
export default CameraSettingsProvider;

View File

@@ -0,0 +1,23 @@
import type { CameraSettings, CameraSettingsAction } from "../../utils/types";
export const initialState: CameraSettings = {
mode: 0,
imageSize: { width: 1280, height: 960 },
};
export const cameraSettingsReducer = (state: CameraSettings, action: CameraSettingsAction) => {
switch (action.type) {
case "SET_MODE":
return {
...state,
mode: action.payload,
};
case "SET_IMAGE_SIZE":
return {
...state,
imageSize: action.payload,
};
default:
return state;
}
};

View File

@@ -0,0 +1,38 @@
import Modal from "react-modal";
type ModalComponentProps = {
isModalOpen: boolean;
children: React.ReactNode;
close: () => void;
};
const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) => {
return (
<Modal
isOpen={isModalOpen}
onRequestClose={close}
className="bg-[#1e2a38] p-6 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[60%] z-100 overflow-y-auto border border-gray-600 max-h-[90%]"
overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100"
closeTimeoutMS={200}
style={{
overlay: {
transition: "opacity 200ms ease-in-out",
},
content: {
transition: "all 200ms ease-in-out",
},
}}
>
<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>
);
};
export default ModalComponent;

View File

@@ -1,14 +1,22 @@
import PlateRead from "./components/plateRead/PlateRead";
import SightingStack from "./components/sightingStack/SightingStack"; import SightingStack from "./components/sightingStack/SightingStack";
import VideoFeed from "./components/videoFeed/VideoFeed"; import VideoFeed from "./components/videoFeed/VideoFeed";
import { useSightingList } from "./hooks/useSightingList"; import { useSightingList } from "./hooks/useSightingList";
import { useCameraSettingsContext } from "../../app/context/CameraSettingsContext";
const Dashboard = () => { const Dashboard = () => {
const { sightingList, isLoading } = useSightingList(); const { sightingList, isLoading } = useSightingList();
const { state: cameraSettings } = useCameraSettingsContext();
const size = cameraSettings.imageSize;
const mostRecent = sightingList[0]; const mostRecent = sightingList[0];
return ( return (
<div className="grid gird-cols-1 md:grid-cols-2 gap-20"> <div className="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-5">
<VideoFeed mostRecentSighting={mostRecent} isLoading={isLoading} /> <div>
<VideoFeed mostRecentSighting={mostRecent} isLoading={isLoading} size={size} />
<PlateRead sighting={mostRecent} />
</div>
<SightingStack sightings={sightingList} /> <SightingStack sightings={sightingList} />
</div> </div>
); );

View File

@@ -41,7 +41,7 @@ const NumberPlate = ({ vrm, motion, size }: NumberPlateProps) => {
return ( return (
<div <div
className={`relative ${options.plateWidth} ${options.borderWidth} border-black rounded-xl text-nowrap className={`relative ${options.plateWidth} ${options.borderWidth} border-black rounded-xl text-nowrap
text-black px-6 py-2 text-monospace font-mono flex items-center justify-center text-black px-6 py-2 text-monospace flex items-center justify-center
${motion ? "bg-yellow-400" : "bg-white"}`} ${motion ? "bg-yellow-400" : "bg-white"}`}
> >
<div> <div>

View File

@@ -0,0 +1,55 @@
import type { SightingType } from "../../../../utils/types";
import Card from "../../../../components/ui/Card";
import CardHeader from "../../../../components/CardHeader";
type PlateReadProps = {
sighting: SightingType;
};
const PlateRead = ({ sighting }: PlateReadProps) => {
const vrm = sighting?.vrm;
const region = sighting?.laneID;
const timestamp = sighting?.timeStamp;
const seenCount = sighting?.seenCount;
const radarSpeed = sighting?.radarSpeed;
const motion = sighting?.motion;
const countryCode = sighting?.countryCode;
const plateColorUrl = sighting?.plateUrlColour;
if (!sighting) return <div>No sighting data available.</div>;
return (
<Card className="p-4 w-full">
<CardHeader title="Plate Read" />
<dl className="grid grid-cols-[auto_1fr] gap-x-4 gap-y-2 text-sm">
<dt className="font-semibold text-gray-200">VRM:</dt>
<dd>{vrm}</dd>
<dt className="font-semibold text-gray-200">Region:</dt>
<dd>{region}</dd>
<dt className="font-semibold text-gray-200">Timestamp:</dt>
<dd>{timestamp}</dd>
<dt className="font-semibold text-gray-200">Seen Count:</dt>
<dd>{seenCount}</dd>
<dt className="font-semibold text-gray-200">Radar Speed:</dt>
<dd>{radarSpeed} mph</dd>
<dt className="font-semibold text-gray-200">Motion:</dt>
<dd>{motion}</dd>
<dt className="font-semibold text-gray-200">Country Code:</dt>
<dd>{countryCode}</dd>
<dt className="font-semibold text-gray-200">Plate Image:</dt>
<dd>
<a href={plateColorUrl} target="_blank" rel="noopener noreferrer" className="text-blue-600 hover:underline">
View Image
</a>
</dd>
</dl>
</Card>
);
};
export default PlateRead;

View File

@@ -1,22 +1,37 @@
import type { SightingType } from "../../../../utils/types"; import type { SightingType } from "../../../../utils/types";
import { timeAgo } from "../../../../utils/utils";
import NumberPlate from "../platePatch/NumberPlate"; import NumberPlate from "../platePatch/NumberPlate";
type SightingItemProps = { type SightingItemProps = {
sighting: SightingType; sighting: SightingType;
onOpenModal: () => void;
}; };
const SightingItem = ({ sighting }: SightingItemProps) => { const SightingItem = ({ sighting, onOpenModal }: SightingItemProps) => {
console.log(sighting);
const motion = sighting.motion.toLowerCase() === "away" ? true : false; const motion = sighting.motion.toLowerCase() === "away" ? true : false;
return ( const timeStamp = timeAgo(sighting.timeStampMillis);
<div className="flex flex-row items-center border p-2 mb-2 rounded-lg border-gray-500 justify-between hover:bg-[#233241] hover:cursor-pointer">
<div>
<div>Ref: {sighting.ref}</div>
<div>vrm: {sighting.vrm}</div>
</div>
<NumberPlate vrm={sighting.vrm} motion={motion} size="md" /> return (
</div> <>
<div
className="flex flex-row items-center border p-2 mb-2 rounded-lg border-gray-500 justify-between hover:bg-[#233241] hover:cursor-pointer"
onClick={onOpenModal}
>
<div>
<div>
<span className="font-light border bg-blue-400 text-blue-800 px-2 rounded">{timeStamp}</span>
</div>
<div className="text-xl">
<span className="font-semibold text-gray-200">{sighting.vrm}</span>
</div>
</div>
{window.innerWidth > 768 ? (
<NumberPlate vrm={sighting.vrm} motion={motion} size="md" />
) : (
<NumberPlate vrm={sighting.vrm} motion={motion} size="sm" />
)}
</div>
</>
); );
}; };

View File

@@ -1,19 +1,38 @@
import { useState } from "react";
import CardHeader from "../../../../components/CardHeader"; import CardHeader from "../../../../components/CardHeader";
import Card from "../../../../components/ui/Card"; import Card from "../../../../components/ui/Card";
import type { SightingType } from "../../../../utils/types"; import type { SightingType } from "../../../../utils/types";
import SightingItem from "./SightingItem"; import SightingItem from "./SightingItem";
import SightingItemModal from "./sightingItemModal/SightingItemModal";
type SightingStackProps = { type SightingStackProps = {
sightings: SightingType[]; sightings: SightingType[];
}; };
const SightingStack = ({ sightings }: SightingStackProps) => { const SightingStack = ({ sightings }: SightingStackProps) => {
const [isSightingModalOpen, setIsSightingModalOpen] = useState(false);
const [currentSighting, setCurrentSighting] = useState<SightingType | null>(null);
const handleOpenModal = (sighting: SightingType | null) => {
if (!sighting) return;
setCurrentSighting(sighting);
setIsSightingModalOpen(true);
};
return ( return (
<Card className="p-4 w-full"> <>
<CardHeader title="Sightings" /> <Card className="p-4 w-full h-full">
{sightings.map((sighting) => ( <CardHeader title="Live Sightings" />
<SightingItem key={sighting.ref} sighting={sighting} /> <div className="md:h-[65%]">
))} {sightings.map((sighting) => (
</Card> <SightingItem key={sighting.ref} sighting={sighting} onOpenModal={() => handleOpenModal(sighting)} />
))}
</div>
</Card>
<SightingItemModal
isOpen={isSightingModalOpen}
close={() => setIsSightingModalOpen(false)}
sighting={currentSighting}
/>
</>
); );
}; };

View File

@@ -0,0 +1,18 @@
import ModalComponent from "../../../../../components/ui/ModalComponent";
import type { SightingType } from "../../../../../utils/types";
import SightingModalContent from "./SightingModalContent";
type SightingItemModalProps = {
isOpen: boolean;
close: () => void;
sighting: SightingType | null;
};
const SightingItemModal = ({ isOpen, close, sighting }: SightingItemModalProps) => {
return (
<ModalComponent isModalOpen={isOpen} close={close}>
<SightingModalContent sighting={sighting} />
</ModalComponent>
);
};
export default SightingItemModal;

View File

@@ -0,0 +1,61 @@
import { useCameraSettingsContext } from "../../../../../app/context/CameraSettingsContext";
import type { SightingType } from "../../../../../utils/types";
import { timeAgo } from "../../../../../utils/utils";
import NumberPlate from "../../platePatch/NumberPlate";
import VideoFeed from "../../videoFeed/VideoFeed";
type SightingModalContentProps = {
sighting: SightingType | null;
};
const SightingModalContent = ({ sighting }: SightingModalContentProps) => {
const { state: cameraSettings } = useCameraSettingsContext();
const size = cameraSettings.imageSize;
const modalImageSize = { width: size.width / 1.5, height: size.height / 1.5 };
const timeStamp = timeAgo(sighting?.timeStampMillis ?? null);
return (
<div>
{sighting ? (
<>
<div className="flex flex-row items-center justify-between mb-6 border-b border-gray-600">
<h2 className="text-2xl font-bold">Sighting Details</h2>
<NumberPlate vrm={sighting.vrm} motion={sighting.motion.toLowerCase() === "away"} size="md" />
</div>
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
<div className="lg:col-span-2">
<VideoFeed mostRecentSighting={sighting} isLoading={false} size={modalImageSize} isModal={true} />
</div>
<div className="space-y-4 border p-4 rounded-lg border-gray-600">
<div>
<p className="text-md text-gray-300">VRM</p>
<p className="text-lg font-semibold">{sighting.vrm}</p>
</div>
<div>
<p className="text-md text-gray-300">Seen</p>
<p className="text-md">{timeStamp}</p>
</div>
<div>
<p className="text-md text-gray-300">Timestamp</p>
<p className="text-md">{new Date(sighting.timeStampMillis).toLocaleString()}</p>
</div>
<div>
<p className="text-md text-gray-300">Motion</p>
<p className="text-lg font-semibold">{sighting.motion}</p>
</div>
<div>
<p className="text-md text-gray-300">Radar Speed</p>
<p className="text-lg font-semibold">{sighting.radarSpeed} mph</p>
</div>
</div>
</div>
</>
) : (
<p className="text-gray-300">No sighting data available.</p>
)}
</div>
);
};
export default SightingModalContent;

View File

@@ -0,0 +1,42 @@
import { useState } from "react";
import { Text, Group, Rect } from "react-konva";
type VideoButtonProps = {
x?: number;
y?: number;
onClick?: () => void;
text?: string;
};
const VideoButton = ({ x, y, onClick, text }: VideoButtonProps) => {
const [isHovered, setIsHovered] = useState(false);
return (
<Group
x={x}
y={y}
onClick={onClick}
onMouseEnter={(e) => {
setIsHovered(true);
const container = e.target.getStage()?.container();
if (container) container.style.cursor = "pointer";
}}
onMouseLeave={(e) => {
setIsHovered(false);
const container = e.target.getStage()?.container();
if (container) container.style.cursor = "default";
}}
>
<Rect
width={100}
height={35}
fill={isHovered ? "#2563eb" : "#3b82f6"}
cornerRadius={8}
shadowBlur={isHovered ? 10 : 5}
shadowOpacity={0.3}
/>
<Text text={text} fontSize={14} fill="white" width={100} height={35} align="center" verticalAlign="middle" />
</Group>
);
};
export default VideoButton;

View File

@@ -1,28 +1,42 @@
import { Stage, Layer, Image, Rect } from "react-konva"; import { Stage, Layer, Image, Rect, Text } from "react-konva";
import type { SightingType } from "../../../../utils/types"; import type { SightingType } from "../../../../utils/types";
import { useCreateVideoSnapshot } from "../../hooks/useCreateVideoSnapshot"; import { useCreateVideoSnapshot } from "../../hooks/useCreateVideoSnapshot";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useCameraSettingsContext } from "../../../../app/context/CameraSettingsContext";
type VideoFeedProps = { type VideoFeedProps = {
mostRecentSighting: SightingType; mostRecentSighting: SightingType;
isLoading: boolean; isLoading: boolean;
size: { width: number; height: number };
modeSetting?: number;
isModal?: boolean;
}; };
const VideoFeed = ({ mostRecentSighting, isLoading }: VideoFeedProps) => { const VideoFeed = ({ mostRecentSighting, isLoading, size, modeSetting, isModal = false }: VideoFeedProps) => {
const [size, setSize] = useState<{ width: number; height: number }>({ width: 1280, height: 960 }); console.log(size);
const [mode, setMode] = useState<number>(0); const { state: cameraSettings, dispatch } = useCameraSettingsContext();
const contextMode = cameraSettings.mode;
const [localMode, setLocalMode] = useState(0);
const mode = isModal ? localMode : contextMode;
const { image, plateRect, plateTrack } = useCreateVideoSnapshot(mostRecentSighting); const { image, plateRect, plateTrack } = useCreateVideoSnapshot(mostRecentSighting);
const handleModeChange = (newMode: number) => { const handleModeChange = (newMode: number) => {
if (newMode > 2) setMode(0); if (modeSetting) return;
else setMode(newMode);
const nextMode = newMode > 2 ? 0 : newMode;
if (isModal) {
setLocalMode(nextMode);
} else {
dispatch({ type: "SET_MODE", payload: nextMode });
}
}; };
useEffect(() => { useEffect(() => {
const updateSize = () => { const updateSize = () => {
const width = window.innerWidth * 0.5; const width = window.innerWidth * 0.48;
const height = (width * 3) / 4; const height = (width * 2) / 3;
setSize({ width, height }); dispatch({ type: "SET_IMAGE_SIZE", payload: { width, height } });
}; };
updateSize(); updateSize();
window.addEventListener("resize", updateSize); window.addEventListener("resize", updateSize);
@@ -35,20 +49,22 @@ const VideoFeed = ({ mostRecentSighting, isLoading }: VideoFeedProps) => {
<div className="w-[70%] mt-[2%]"> <div className="w-[70%] mt-[2%]">
<Stage width={size.width} height={size.height} onClick={() => handleModeChange(mode + 1)}> <Stage width={size.width} height={size.height} onClick={() => handleModeChange(mode + 1)}>
<Layer> <Layer>
<Image {image && (
image={image} <Image
height={size.height} image={image}
width={size.width} height={size.height}
onMouseEnter={(e) => { width={size.width}
const container = e.target.getStage()?.container(); onMouseEnter={(e) => {
if (container) container.style.cursor = "pointer"; const container = e.target.getStage()?.container();
}} if (container) container.style.cursor = "pointer";
onMouseLeave={(e) => { }}
const container = e.target.getStage()?.container(); onMouseLeave={(e) => {
if (container) container.style.cursor = "default"; const container = e.target.getStage()?.container();
}} if (container) container.style.cursor = "default";
cornerRadius={10} }}
/> cornerRadius={10}
/>
)}
</Layer> </Layer>
{plateRect && mode === 1 && ( {plateRect && mode === 1 && (
<Layer> <Layer>
@@ -59,7 +75,7 @@ const VideoFeed = ({ mostRecentSighting, isLoading }: VideoFeedProps) => {
height={plateRect?.[3] * size.height} height={plateRect?.[3] * size.height}
stroke="blue" stroke="blue"
strokeWidth={4} strokeWidth={4}
zIndex={1} cornerRadius={5}
/> />
</Layer> </Layer>
)} )}
@@ -75,11 +91,28 @@ const VideoFeed = ({ mostRecentSighting, isLoading }: VideoFeedProps) => {
height={rect[3] * size.height} height={rect[3] * size.height}
stroke="red" stroke="red"
strokeWidth={2} strokeWidth={2}
zIndex={1} cornerRadius={5}
/> />
))} ))}
</Layer> </Layer>
)} )}
<Layer>
<Rect
x={5}
y={0.955 * size.height}
width={size.width * 0.35}
height={30}
fill="rgba(255, 255, 255, 0.45)"
cornerRadius={5}
/>
<Text
text={`Overlay Mode: ${mode === 0 ? "None" : mode === 1 ? "Plate Highlight" : "Plate Track"}`}
x={10}
y={0.96 * size.height}
fontSize={16}
fill="#000000"
/>
</Layer>
</Stage> </Stage>
</div> </div>
); );

View File

@@ -1,16 +1,24 @@
import { useRef } from "react"; import { useRef } from "react";
import type { SightingType } from "../../../utils/types"; import type { SightingType } from "../../../utils/types";
export const useCreateVideoSnapshot = (mostRecentSighting: SightingType) => { export const useCreateVideoSnapshot = (mostRecentSighting: SightingType | null) => {
const latestBitMapRef = useRef<ImageBitmap | null>(null); const latestBitMapRef = useRef<ImageBitmap | null>(null);
if (!mostRecentSighting) {
return {
snapshotUrl: null,
latestBitMapRef: null,
image: null,
plateRect: null,
plateTrack: null,
};
}
const snapshotUrl = mostRecentSighting?.overviewUrl; const snapshotUrl = mostRecentSighting?.overviewUrl;
const image = new Image(); const image = new Image();
image.src = snapshotUrl; image.src = snapshotUrl;
console.log(mostRecentSighting);
const plateRect = mostRecentSighting?.overviewPlateRect; const plateRect = mostRecentSighting?.overviewPlateRect;
const plateTrack = mostRecentSighting?.plateTrack; const plateTrack = mostRecentSighting?.plateTrack;

View File

@@ -16,7 +16,7 @@ export const useVideoFeed = () => {
const videoFeedQuery = useQuery({ const videoFeedQuery = useQuery({
queryKey: ["videoFeed"], queryKey: ["videoFeed"],
queryFn: () => fetchVideoFeed(currentRefId.current), queryFn: () => fetchVideoFeed(currentRefId.current),
refetchInterval: 1000, refetchInterval: 400,
refetchOnWindowFocus: false, refetchOnWindowFocus: false,
retry: false, retry: false,
staleTime: 0, staleTime: 0,

View File

@@ -0,0 +1,11 @@
import VideoFeedSetup from "./components/videofeed/VideoFeedSetup";
const Setup = () => {
return (
<div className="grid grid-cols-1 md:grid-cols-2 gap-2 md:gap-5">
<VideoFeedSetup />
</div>
);
};
export default Setup;

View File

@@ -0,0 +1,41 @@
import { Stage, Layer, Image } from "react-konva";
import { useCreateVideoPreviewSnapshot } from "../../hooks/useCreatePreviewImage";
import { useEffect, type RefObject } from "react";
import { useCameraSettingsContext } from "../../../../app/context/CameraSettingsContext";
const VideoFeedSetup = () => {
const { latestBitmapRef, isLoading } = useCreateVideoPreviewSnapshot();
const { state, dispatch } = useCameraSettingsContext();
const size = state.imageSize;
const draw = (bmp: RefObject<ImageBitmap | null>): ImageBitmap | null => {
if (!bmp || !bmp.current) {
return null;
}
const image = bmp.current;
return image;
};
const image = draw(latestBitmapRef);
useEffect(() => {
const updateSize = () => {
const width = window.innerWidth * 0.48;
const height = (width * 2) / 3;
dispatch({ type: "SET_IMAGE_SIZE", payload: { width, height } });
};
updateSize();
window.addEventListener("resize", updateSize);
return () => window.removeEventListener("resize", updateSize);
}, []);
if (isLoading) return <>Loading...</>;
return (
<div className="mt-[1%]">
<Stage width={size.width} height={size.height}>
<Layer>{image && <Image image={image} height={size.height} width={size.width} cornerRadius={10} />}</Layer>
</Stage>
</div>
);
};
export default VideoFeedSetup;

View File

@@ -0,0 +1,25 @@
import { useEffect, useRef } from "react";
import { useVideoPreview } from "./useVideoPreview";
export const useCreateVideoPreviewSnapshot = () => {
const { videoPreviewQuery } = useVideoPreview();
const latestBitmapRef = useRef<ImageBitmap | null>(null);
const isLoading = videoPreviewQuery?.isPending;
const imageBlob = videoPreviewQuery?.data;
useEffect(() => {
async function createImageBitmapFromBlob() {
if (!imageBlob) return;
try {
const bitmap = await createImageBitmap(imageBlob);
latestBitmapRef.current = bitmap;
} catch (error) {
console.log(error);
}
}
createImageBitmapFromBlob();
}, [imageBlob]);
return { latestBitmapRef, isLoading, imageURL: imageBlob ? URL.createObjectURL(imageBlob) : null };
};

View File

@@ -0,0 +1,19 @@
import { useQuery } from "@tanstack/react-query";
import { cambase } from "../../../app/config";
const fetchVideoPreview = async () => {
const response = await fetch(`${cambase}/Colour-preview`);
if (!response.ok) {
throw new Error("Failed to fetch video preview");
}
return response.blob();
};
export const useVideoPreview = () => {
const videoPreviewQuery = useQuery({
queryKey: ["videoPreview"],
queryFn: fetchVideoPreview,
refetchInterval: 100,
});
return { videoPreviewQuery };
};

View File

@@ -4,12 +4,13 @@ import "./index.css";
import { RouterProvider, createRouter } from "@tanstack/react-router"; import { RouterProvider, createRouter } from "@tanstack/react-router";
import { routeTree } from "./routeTree.gen.ts"; import { routeTree } from "./routeTree.gen.ts";
import AppProviders from "./app/providers/AppProviders.tsx"; import AppProviders from "./app/providers/AppProviders.tsx";
import Modal from "react-modal";
const router = createRouter({ const router = createRouter({
routeTree, routeTree,
basepath: "/aiq-lite", basepath: "/aiq-lite",
}); });
Modal.setAppElement("#root");
declare module "@tanstack/react-router" { declare module "@tanstack/react-router" {
interface Register { interface Register {
router: typeof router; router: typeof router;

View File

@@ -1,9 +1,10 @@
import { createFileRoute } from "@tanstack/react-router"; import { createFileRoute } from "@tanstack/react-router";
import Setup from "../features/setup/Setup";
export const Route = createFileRoute("/setup")({ export const Route = createFileRoute("/setup")({
component: RouteComponent, component: RouteComponent,
}); });
function RouteComponent() { function RouteComponent() {
return <div className="">Hello "/setup"!</div>; return <Setup />;
} }

View File

@@ -51,3 +51,17 @@ export type NpedJSON = {
vrm: string; vrm: string;
"INSURANCE STATUS": string; "INSURANCE STATUS": string;
}; };
export type CameraSettings = {
mode: number;
imageSize: { width: number; height: number };
};
export type CameraSettingsAction =
| {
type: "SET_MODE";
payload: number;
}
| {
type: "SET_IMAGE_SIZE";
payload: { width: number; height: number };
};

View File

@@ -4,3 +4,21 @@ export const formatNumberPlate = (plate: string) => {
const formattedPlate = splittedPlate?.join(""); const formattedPlate = splittedPlate?.join("");
return formattedPlate; return formattedPlate;
}; };
export const timeAgo = (timestampmili: number | null) => {
if (timestampmili === null) return "unknown";
const diffMs = Date.now() - new Date(timestampmili).getTime();
const diffMins = Math.floor(diffMs / 60000);
if (diffMins < 60) {
if (diffMins < 1) {
return "just now";
}
return `${diffMins === 1 ? "1 minute" : diffMins + " minutes"} ago`;
} else {
const diffHours = Math.floor(diffMins / 60);
if (diffHours < 1) {
return "just now";
}
return `${diffHours === 1 ? "1 hour" : diffHours + " hours"} ago`;
}
};

1021
yarn.lock

File diff suppressed because it is too large Load Diff