From 69eb5cc7bef686ce4dc9f65ebd7ac8adff4ca79f Mon Sep 17 00:00:00 2001 From: Toba Ojo Date: Mon, 22 Sep 2025 09:26:45 +0100 Subject: [PATCH] added NPED cat sorting --- .env | 5 +- public/NPED_Cat_A.svg | 30 ++++++ public/NPED_Cat_B.svg | 31 ++++++ public/NPED_Cat_C.svg | 29 ++++++ src/App.tsx | 3 +- .../CameraSettings/CameraSettings.tsx | 1 - .../BearerType/BearerTypeFields.tsx | 5 +- .../Channel1-JSON/ChannelFields.tsx | 10 +- .../SettingForms/components/FormToggle.tsx | 2 +- .../SightingModal/SightingModal.tsx | 35 +++++++ src/components/SightingsWidget/InfoBar.tsx | 7 +- .../SightingsWidget/SightingWidget.tsx | 96 +++++++++++++------ .../SightingsWidget/SightingWidgetDetails.tsx | 1 - src/components/UI/Header.tsx | 2 +- src/types/types.ts | 1 + 15 files changed, 212 insertions(+), 46 deletions(-) create mode 100644 public/NPED_Cat_A.svg create mode 100644 public/NPED_Cat_B.svg create mode 100644 public/NPED_Cat_C.svg diff --git a/.env b/.env index eac479f..a8fa5c2 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ VITE_BASEURL=http://192.168.75.11/ -VITE_CAM_BASE=http://100.72.72.70:8080 +VITE_CAM_BASE=http://100.113.222.39 VITE_FOLKESTONE_BASE=http://100.116.253.81 VITE_TESTURL=http://100.82.205.44/SightingListRear/sightingSummary?mostRecentRef=-1 VITE_OUTSIDE_BASEURL=http://100.82.205.44/api @@ -17,4 +17,5 @@ VITE_AGX_FRONT_BASE=http://100.72.72.70:8080/ VITE_LOCAL=http://10.42.0.1:8080/SightingListRear/sightingSummary?mostRecentRef= VITE_LOCAL_FRONT=http://10.42.0.1:8080/SightingListFront/sightingSummary?mostRecentRef= -VITE_LOCAL_BASE=http://10.42.0.1:8080/ \ No newline at end of file +VITE_LOCAL_BASE=http://10.42.0.1:8080/ +VITE_LOCAL_BASE_NEW=http://100.113.222.39 \ No newline at end of file diff --git a/public/NPED_Cat_A.svg b/public/NPED_Cat_A.svg new file mode 100644 index 0000000..a080097 --- /dev/null +++ b/public/NPED_Cat_A.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/NPED_Cat_B.svg b/public/NPED_Cat_B.svg new file mode 100644 index 0000000..5df57f8 --- /dev/null +++ b/public/NPED_Cat_B.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/NPED_Cat_C.svg b/public/NPED_Cat_C.svg new file mode 100644 index 0000000..c894378 --- /dev/null +++ b/public/NPED_Cat_C.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/App.tsx b/src/App.tsx index 6e6c017..e835576 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import Container from "./components/UI/Container"; import Dashboard from "./pages/Dashboard"; -import { Route, Routes } from "react-router"; +import { Navigate, Route, Routes } from "react-router"; import FrontCamera from "./pages/FrontCamera"; import RearCamera from "./pages/RearCamera"; import SystemSettings from "./pages/SystemSettings"; @@ -19,6 +19,7 @@ function App() { } /> } /> } /> + } /> diff --git a/src/components/CameraSettings/CameraSettings.tsx b/src/components/CameraSettings/CameraSettings.tsx index 9036679..3b0faf5 100644 --- a/src/components/CameraSettings/CameraSettings.tsx +++ b/src/components/CameraSettings/CameraSettings.tsx @@ -13,7 +13,6 @@ const CameraSettings = ({ title, side }: { title: string; side: string }) => { updateCameraConfigError, } = useFetchCameraConfig(side); console.log(updateCameraConfigError); - console.log(isPending); return ( diff --git a/src/components/SettingForms/BearerType/BearerTypeFields.tsx b/src/components/SettingForms/BearerType/BearerTypeFields.tsx index 1985f8f..0bff67f 100644 --- a/src/components/SettingForms/BearerType/BearerTypeFields.tsx +++ b/src/components/SettingForms/BearerType/BearerTypeFields.tsx @@ -1,5 +1,4 @@ import { Field, useFormikContext } from "formik"; - import FormToggle from "../components/FormToggle"; export const ValuesComponent = () => { @@ -11,13 +10,13 @@ const BearerTypeFields = () => { return (
-
+
diff --git a/src/components/SettingForms/Channel1-JSON/ChannelFields.tsx b/src/components/SettingForms/Channel1-JSON/ChannelFields.tsx index efe63ed..0cffccb 100644 --- a/src/components/SettingForms/Channel1-JSON/ChannelFields.tsx +++ b/src/components/SettingForms/Channel1-JSON/ChannelFields.tsx @@ -18,7 +18,7 @@ const ChannelFields = () => { type="text" id="backoffice" placeholder="https://www.backoffice.com" - className="p-1.5 border border-gray-400 rounded-lg" + className="p-1.5 border border-gray-400 rounded-lg w-full md:w-60" /> @@ -28,7 +28,7 @@ const ChannelFields = () => { type="text" id="username" placeholder="Back office username" - className="p-1.5 border border-gray-400 rounded-lg" + className="p-1.5 border border-gray-400 rounded-lg w-full md:w-60" /> @@ -38,7 +38,7 @@ const ChannelFields = () => { type={showPwd ? "text" : "password"} id="password" placeholder="Back office password" - className="p-1.5 border border-gray-400 rounded-lg" + className="p-1.5 border border-gray-400 rounded-lg w-full md:w-60" /> { name={"connectTimeoutSeconds"} type="number" id="connectTimeoutSeconds" - className="p-1.5 border border-gray-400 rounded-lg" + className="p-1.5 border border-gray-400 rounded-lg w-full md:w-60" /> @@ -63,7 +63,7 @@ const ChannelFields = () => { type="number" id="readTimeoutSeconds" placeholder="https://example.com" - className="p-1.5 border border-gray-400 rounded-lg" + className="p-1.5 border border-gray-400 rounded-lg w-full md:w-60" />
diff --git a/src/components/SettingForms/components/FormToggle.tsx b/src/components/SettingForms/components/FormToggle.tsx index 5a31f58..555560f 100644 --- a/src/components/SettingForms/components/FormToggle.tsx +++ b/src/components/SettingForms/components/FormToggle.tsx @@ -2,7 +2,7 @@ import { Field } from "formik"; const FormToggle = ({ name, label }: { name: string; label?: string }) => { return ( -