Merge branch 'Bradley'

src/pages/Dashboard.tsx

@@ -6,11 +6,10 @@ import { SightingFeedProvider } from "../context/providers/SightingFeedProvider"
 
 const Dashboard = () => {
   return (
-    <div className="mx-auto grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-2 gap-2 px-2 sm:px-4 lg:px-0 w-full">
+    <div className="mx-auto grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-2 gap-2 px-1 sm:px-2 lg:px-0 w-full">
       <SightingFeedProvider
         url={
-          "http://100.82.205.44/SightingListFront/sightingSummary?mostRecentRef="
-          // "http://100.116.253.81/mergedHistory/sightingSummary?mostRecentRef="
+          "http://192.168.75.11/SightingListFront/sightingSummary?mostRecentRef="
         }
         side="Front"
       >
@@ -19,7 +18,7 @@ const Dashboard = () => {
       </SightingFeedProvider>
 
       <SightingFeedProvider
-        url="http://100.82.205.44/SightingListRear/sightingSummary?mostRecentRef="
+        url="http://192.168.75.11/SightingListRear/sightingSummary?mostRecentRef="
         side="Rear"
       >
         <RearCameraOverviewCard className="order-2" />

src/pages/FrontCamera.tsx

@@ -18,7 +18,7 @@ const FrontCamera = () => {
     >
       <OverviewVideoContainer
         title={"Front Camera"}
-        side="TargetDetectionFront"
+        side="CameraFront"
         settingsPage={true}
       />
       <CameraSettings title="Front Camera Settings" />

src/pages/RearCamera.tsx

@@ -19,7 +19,7 @@ const RearCamera = () => {
       <CameraSettings title="Rear Camera Settings" />
       <OverviewVideoContainer
         title={"Rear Camera"}
-        side={"TargetDetectionRear"}
+        side={"CameraRear"}
         settingsPage={true}
       />
       <Toaster />

src/pages/Session.tsx

@@ -0,0 +1,13 @@
+import HitSearchCard from "../components/SessionForm/HitSearchCard.tsx";
+import SessionCard from "../components/SessionForm/SessionCard.tsx";
+
+const Session = () => {
+  return (
+    <div className="mx-auto grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-2 gap-2 px-1 sm:px-2 lg:px-0 w-full">
+      <HitSearchCard />
+      <SessionCard />
+    </div>
+  );
+};
+
+export default Session;

src/pages/SystemSettings.tsx

@@ -3,6 +3,9 @@ import "react-tabs/style/react-tabs.css";
 import NPEDCard from "../components/SettingForms/NPED/NPEDCard";
 import SettingForms from "../components/SettingForms/SettingForms/SettingForms";
 import NPEDHotlistCard from "../components/SettingForms/NPED/NPEDHotlistCard";
+import WiFiCard from "../components/SettingForms/WiFi&Modem/WiFiCard";
+import ModemCard from "../components/SettingForms/WiFi&Modem/ModemCard";
+import SystemCard from "../components/SettingForms/System/SystemCard";
 import { Toaster } from "sonner";
 import { useNPEDAuth } from "../hooks/useNPEDAuth";
 
@@ -13,9 +16,16 @@ const SystemSettings = () => {
     <div className="m-4">
       <Tabs selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none">
         <TabList>
+          <Tab>System</Tab>
           <Tab>Output</Tab>
           <Tab>Integrations</Tab>
+          <Tab>WiFi and Modem</Tab>
         </TabList>
+          <TabPanel>
+          <div className="flex flex-col space-y-3">
+            <SystemCard />
+          </div>
+        </TabPanel>
         <TabPanel>
           <div className="flex flex-col space-y-3">
             <SettingForms />
@@ -27,6 +37,12 @@ const SystemSettings = () => {
             <NPEDHotlistCard />
           </div>
         </TabPanel>
+        <TabPanel>
+          <div className="mx-auto grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-2 gap-4 px-2 sm:px-4 lg:px-0 w-full">
+            <WiFiCard />
+            <ModemCard />
+          </div>
+        </TabPanel>
       </Tabs>
       <Toaster />
     </div>