added save and load endpoints

Reviewed-on: #12

README.md

@@ -1,77 +1,116 @@
-# Mav Mobile Ui
+# Mav Mobile UI
 
 This is a React-based web application built with Vite (react and typescript).
 
-
-
 ## Getting started
 
 ### Prerequisites
+
 - Node.js (v18 or higher recommended)
 - Yarn (v1.22+) (https://yarnpkg.com/)
 
 ### Installation
+
 ```bash
 git clone https://mavportal.com/TobaOjo/Mav-Mobile-UI.git
 cd Mav-Mobile-UI
 yarn install
 ```
+
 ### Running Locally
+
 ```bash
 yarn dev
 ```
+
 The app will be available at `http://localhost:5173`.
 
-
 To run on locally on other devices
+
 ```bash
 yarn dev --host
 ```
-The app will be available at the exposed addresses to access e.g. http://192.168.0.123:5173/Mobile
+
+The app will be available at the exposed addresses to access e.g. http://1xx.xxx.x.xxx:<PORT>/Mobile
 
 ## Tech Stack
+
 - **React** – UI library
 - **Vite** – Build tool
 - **Yarn** – Package manager
 
-
-
 ## Configuration
+
 Create a `.env` file to access the Mav Mobile box in unit 5 for or for any environment-specific settings:
+
 ```env
-VITE_AGX_BOX_URL=http://100.118.196.113:8080
+VITE_AGX_BOX_URL=http://1xx.xxx.xxx.xxx:<PORT>
 ```
 
-## 🧪 Development
+## Development
+
 ### Linting & Formatting
+
 ```bash
 yarn lint
 yarn format
 ```
 
 ### Testing
+
 (Currently not implemented – consider adding Jest or Vitest)
 
-## 🚢 Deployment
+## Deployment
+
 To build for production:
+Navigate to the Mav-Mobile-UI folder
+
+```bash
+cd Mav-Mobile-UI
+```
+
+**Delete** the local .env (Production will use its own domain)
+
+run
+
 ```bash
 yarn build
 ```
 
-Navigate to your Mav-Mobile-UI folder
+- Navigate to your Mav-Mobile-UI folder
-Select the Dist folder 
+- Select the Dist folder
-Compress to (ZIP)
+- Compress to (ZIP)
-Log into box on Moba using Session > SSH and putting IP in Remote Host. 
+- Log into box on Moba using Session > SSH and putting IP in Remote Host.
-Creds are mav:mav
+- Creds are mav:mav
-Drag and drop dist.zip into file explorer menu on left hand side (has to be named dist.zip exactly).
+- Drag and drop dist.zip into file explorer menu on left hand side (has to be named dist.zip exactly).
-Run command 
+- Run command
+
 ```bash
 sudo ./integrate-web-ui.sh
 ```
+
 Run
 
 ```bash
 sudo nano web-static/index.html
 ```
 
+- add the following between the lines </body> & </html>
 
+```js
+<foot>
+<script>
+      if (window.location.pathname !== "/Mobile") {
+          window.location.replace(window.location.origin + "/Mobile");
+      }
+</script>
+</foot>
+```
+
+- Run
+
+```bash
+sudo reboot
+```
+
+It should come back up all working

src/components/PopupSettings/NPEDCategoryPopup.tsx

@@ -0,0 +1,73 @@
+import Card from "../UI/Card";
+import CardHeader from "../UI/CardHeader";
+import NPEDCatToggle from "../SettingForms/NPED/NPEDCatToggle";
+import FormGroup from "../SettingForms/components/FormGroup";
+import { Form, Formik } from "formik";
+import { useIntegrationsContext } from "../../context/IntegrationsContext";
+import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
+import type { CategoryPopups } from "../../types/types";
+import { toast } from "sonner";
+
+const NPEDCategoryPopup = () => {
+  const { state, dispatch } = useIntegrationsContext();
+  const { mutation } = useCameraBlackboard();
+
+  const isCatAEnabled = state?.iscatEnabled?.catA;
+  const isCatBEnabled = state?.iscatEnabled?.catB;
+  const isCatCEnabled = state?.iscatEnabled?.catC;
+  const isCatDEnabled = state?.iscatEnabled?.catD;
+
+  const initialValues = {
+    catA: isCatAEnabled ?? true,
+    catB: isCatBEnabled ?? true,
+    catC: isCatCEnabled ?? true,
+    catD: isCatDEnabled ?? false,
+  };
+
+  const handleSubmit = async (values: CategoryPopups) => {
+    const result = await mutation.mutateAsync({
+      operation: "INSERT",
+      value: values,
+      path: "CategoryPopup",
+    });
+
+    await mutation.mutateAsync({
+      operation: "SAVE",
+      path: "",
+      value: null
+    })
+    if (result?.reason === "OK") toast.success("Pop up settings saved");
+    dispatch({ type: "NPEDCATENABLED", payload: values });
+  };
+
+  return (
+    <Card className="p-4">
+      <CardHeader title={"Alert Pop ups"} />
+      <p className="italic my-2">Allows alerts to pop up to user.</p>
+      <Formik initialValues={initialValues} onSubmit={handleSubmit}>
+        <Form className="flex flex-col space-y-5 px-2">
+          <FormGroup>
+            <NPEDCatToggle name={"catA"} label="NPED Category A" />
+          </FormGroup>
+          <FormGroup>
+            <NPEDCatToggle name={"catB"} label="NPED Category B" />
+          </FormGroup>
+          <FormGroup>
+            <NPEDCatToggle name={"catC"} label="NPED Category C" />
+          </FormGroup>
+          <FormGroup>
+            <NPEDCatToggle name={"catD"} label="NPED Category D" />
+          </FormGroup>
+          <button
+            type="submit"
+            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+          >
+            Save
+          </button>
+        </Form>
+      </Formik>
+    </Card>
+  );
+};
+
+export default NPEDCategoryPopup;

src/components/SessionForm/SessionCard.tsx

@@ -62,7 +62,11 @@ const SessionCard = () => {
       path: "sessionStats",
       value: dedupedSightings,
     });
-
+    await mutation.mutateAsync({
+      operation: "SAVE",
+      path: "",
+      value: null,
+    });
     if (result.reason === "OK") toast.success("Session saved");
   };
 

src/components/SettingForms/Channel1-JSON/ChannelFields.tsx

@@ -234,7 +234,7 @@ const ChannelFields = ({ touched, isSubmitting, format }: ChannelFieldsProps) =>
 
           <button
             type="submit"
-            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+            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"
           >
             {isSubmitting ? "Saving..." : "Save Changes"}
           </button>

src/components/SettingForms/NPED/NPEDCard.tsx

@@ -6,7 +6,7 @@ import NPEDIcon from "/NPED.svg";
 const NPEDCard = () => {
   return (
     <Card className="p-4">
-      <CardHeader title={"NPED Config"} img={NPEDIcon} />
+      <CardHeader title={"NPED"} img={NPEDIcon} />
       <NPEDFields />
     </Card>
   );

src/components/SettingForms/NPED/NPEDCatToggle.tsx

@@ -0,0 +1,22 @@
+import { Field } from "formik";
+
+type NPEDToggleProps = {
+  name: string;
+  label: string;
+};
+
+const NPEDCatToggle = ({ name, label }: NPEDToggleProps) => {
+  return (
+    <label className="flex items-center gap-3 cursor-pointer select-none w-full justify-between">
+      <span className="text-lg">{label}</span>
+      <Field id={name} type="checkbox" name={name} className="sr-only peer" />
+      <div
+        className="relative w-10 h-5 rounded-full bg-gray-300 transition peer-checked:bg-blue-500 after:content-[''] 
+      after:absolute after:top-0.5 after:left-0.5 after:w-4 after:h-4 after:rounded-full after:bg-white after:shadow after:transition 
+      after:duration-300 peer-checked:after:translate-x-5"
+      />
+    </label>
+  );
+};
+
+export default NPEDCatToggle;

src/components/SettingForms/NPED/NPEDFields.tsx

@@ -13,20 +13,18 @@ const NPEDFields = () => {
   const [showPwd, setShowPwd] = useState(false);
   const { signIn, signOut } = useNPEDAuth();
 
-  const initialValues = state.npedUser
+  const username = state.npedUser?.propUsername?.value;
-    ? {
+  const password = state.npedUser?.propPassword?.value;
-        username: state.npedUser?.propUsername?.value,
+  const clientId = state.npedUser?.propClientID?.value;
-        password: state.npedUser?.propPassword?.value,
+  const frontId = "NPED";
-        clientId: state.npedUser?.propClientID?.value,
+  const rearId = "NPED";
-        frontId: "NPED",
+
-        rearId: "NPED",
+  const initialValues = {
-      }
+    username: username ?? "",
-    : {
+    password: password ?? "",
-        username: "",
+    clientId: clientId ?? "",
-        password: "",
+    frontId: frontId,
-        clientId: "",
+    rearId: rearId,
-        frontId: "NPED",
-        rearId: "NPED",
   };
 
   const handleSubmit = async (values: NPEDFieldType) => {
@@ -100,17 +98,18 @@ const NPEDFields = () => {
               className="p-1.5 border border-gray-400 rounded-lg"
             />
           </FormGroup>
+
           {!state.npedUser?.propClientID?.value ? (
             <button
               type="submit"
-              className="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"
+              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"
             >
               {isSubmitting ? "Logging in..." : "Login"}
             </button>
           ) : (
             <button
               type="button"
-              className="w-1/4  border-red-700 bg-red-800 text-white font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
+              className="w-full md:w-1/4  border-red-700 bg-red-800 text-white font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
               onClick={handleLogoutClick}
             >
               Logout

src/components/SettingForms/NPED/NPEDHotlist.tsx

@@ -47,7 +47,7 @@ const NPEDHotlist = () => {
             />
             <button
               type="submit"
-              className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+              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"
               // disabled={errors ? true : false}
             >
               Upload

src/components/SettingForms/Sound/SoundSettingsFields.tsx

@@ -39,6 +39,11 @@ const SoundSettingsFields = () => {
       path: "soundSettings",
       value: updatedValues,
     });
+    await mutation.mutateAsync({
+      operation: "SAVE",
+      path: "",
+      value: null,
+    });
     if (result.reason !== "OK") {
       toast.error("Cannot update sound settings");
     } else {
@@ -139,7 +144,7 @@ const SoundSettingsFields = () => {
           </div>
           <button
             type="submit"
-            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+            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"
           >
             Save Settings
           </button>

src/components/SettingForms/Sound/SoundUpload.tsx

@@ -46,7 +46,11 @@ const SoundUpload = () => {
     if (result.reason !== "OK") {
       toast.error("Cannot update sound settings");
     }
-
+    await mutation.mutateAsync({
+      operation: "SAVE",
+      path: "",
+      value: null,
+    });
     dispatch({ type: "ADD", payload: values });
   };
 
@@ -96,7 +100,7 @@ const SoundUpload = () => {
           {errors.soundFile && <p className="text-red-500 text-sm mt-1">Not an mp3 file</p>}
           <button
             type="submit"
-            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 mt-[5%]"
+            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 mt-[5%]"
             disabled={errors.soundFile ? true : false}
           >
             Upload

src/components/SettingForms/System/SystemConfigFields.tsx

@@ -5,6 +5,8 @@ import { timezones } from "./timezones";
 import SystemFileUpload from "./SystemFileUpload";
 import type { SystemValues, SystemValuesErrors } from "../../../types/types";
 import { useDNSSettings, useSystemConfig } from "../../../hooks/useSystemConfig";
+import { ValidateIPaddress } from "../../../utils/utils";
+import { toast } from "sonner";
 
 const SystemConfigFields = () => {
   const { saveSystemSettings, systemSettingsData, saveSystemSettingsLoading } = useSystemConfig();
@@ -35,6 +37,14 @@ const SystemConfigFields = () => {
     if (!values.timeZone) errors.timeZone = "Required";
     if (isNaN(interval) || interval <= 0) errors.sntpInterval = "Cannot be less than 0";
     if (!values.sntpServer) errors.sntpServer = "Required";
+    const invalidPrimary = ValidateIPaddress(values.serverPrimary);
+    const invalidSecondary = ValidateIPaddress(values.serverSecondary);
+
+    if (invalidPrimary || invalidSecondary) {
+      toast.error(invalidPrimary || invalidSecondary, {
+        id: "invalid-ip",
+      });
+    }
     return errors;
   };
 
@@ -52,7 +62,7 @@ const SystemConfigFields = () => {
       onSubmit={handleSubmit}
       validate={validateValues}
       enableReinitialize
-      validateOnChange
+      validateOnChange={false}
       validateOnBlur
     >
       {({ values, errors, touched, isSubmitting }) => (
@@ -157,7 +167,7 @@ const SystemConfigFields = () => {
           </FormGroup>
           <button
             type="submit"
-            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+            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"
             disabled={isSubmitting}
           >
             {saveSystemSettingsLoading ? "Saving..." : "Save System Settings"}

src/components/SettingForms/System/SystemFileUpload.tsx

@@ -52,7 +52,7 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
       </FormGroup>
       <button
         type="button"
-        className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 disabled:opacity-50 disabled:cursor-not-allowed"
+        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 disabled:opacity-50 disabled:cursor-not-allowed"
         disabled={!selectedFile}
         onClick={handleFileUploadClick}
       >

src/components/SettingForms/WiFi&Modem/ModemCard.tsx

@@ -6,7 +6,6 @@ const ModemCard = () => {
   return (
     <Card className="p-4">
       <CardHeader title={"Modem"} />
-
       <ModemSettings />
     </Card>
   );

src/components/SettingForms/WiFi&Modem/ModemSettings.tsx

@@ -6,6 +6,8 @@ import { useEffect, useState } from "react";
 import ModemToggle from "./ModemToggle";
 import { faEyeSlash, faEye } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { ValidateIPaddress } from "../../../utils/utils";
+import { toast, Toaster } from "sonner";
 
 const ModemSettings = () => {
   const [showSettings, setShowSettings] = useState(false);
@@ -16,6 +18,8 @@ const ModemSettings = () => {
   const username = modemQuery?.data?.propUsername.value;
   const password = modemQuery?.data?.propPassword?.value;
   const mode = modemQuery?.data?.propMode?.value;
+  const serverPrimary = modemQuery?.data?.propNameServerPrimary?.value;
+  const serverSecondary = modemQuery?.data?.propNameServerSecondary?.value;
 
   useEffect(() => {
     setShowSettings(mode === "AUTO");
@@ -26,9 +30,19 @@ const ModemSettings = () => {
     username: username ?? "",
     password: password ?? "",
     authenticationType: "PAP",
+    serverPrimary: serverPrimary ?? "",
+    serverSecondary: serverSecondary ?? "",
   };
 
   const handleSubmit = async (values: ModemSettingsType) => {
+    const invalidPrimary = ValidateIPaddress(values.serverPrimary);
+    const invalidSecondary = ValidateIPaddress(values.serverSecondary);
+    if (invalidPrimary || invalidSecondary) {
+      toast.error(invalidPrimary || invalidSecondary, {
+        id: "invalid-ip",
+      });
+      return;
+    }
     const modemConfig = {
       id: "ModemAndWifiManager-modem",
       fields: [
@@ -49,9 +63,24 @@ const ModemSettings = () => {
           property: "propMode",
           value: showSettings ? "AUTO" : "MANUAL",
         },
+        {
+          property: "propNameServerPrimary",
+          value: values.serverPrimary,
+        },
+        {
+          property: "propNameServerSecondary",
+          value: values.serverSecondary,
+        },
       ],
     };
-    await modemMutation.mutateAsync(modemConfig);
+
+    const response = await modemMutation.mutateAsync(modemConfig);
+
+    if (!response?.id) {
+      toast.success("Modem settings updated successfully", {
+        id: "modemSettings",
+      });
+    }
   };
 
   return (
@@ -107,9 +136,33 @@ const ModemSettings = () => {
                     />
                   </div>
                 </FormGroup>
+                <FormGroup>
+                  <label htmlFor="serverPrimary" className="font-medium whitespace-nowrap md:w-2/3">
+                    Name server primary
+                  </label>
+                  <Field
+                    placeholder="Enter Server primary"
+                    name="serverPrimary"
+                    id="serverPrimary"
+                    type="text"
+                    className="p-1.5 border border-gray-400 rounded-lg"
+                  />
+                </FormGroup>
+                <FormGroup>
+                  <label htmlFor="serverSecondary" className="font-medium whitespace-nowrap md:w-2/3">
+                    Name server secondary
+                  </label>
+                  <Field
+                    placeholder="Enter Server secondary"
+                    name="serverSecondary"
+                    id="serverSecondary"
+                    type="text"
+                    className="p-1.5 border border-gray-400 rounded-lg"
+                  />
+                </FormGroup>
                 <FormGroup>
                   <label htmlFor="password" className="font-medium whitespace-nowrap md:w-2/3">
-                    Password
+                    Authentication Type
                   </label>
                   <Field
                     name="authenticationType"
@@ -125,13 +178,14 @@ const ModemSettings = () => {
             )}
             <button
               type="submit"
-              className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+              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"
             >
               {isSubmitting || modemMutation.isPending ? "Saving..." : "Save Modem settings"}
             </button>
           </Form>
         )}
       </Formik>
+      <Toaster />
     </>
   );
 };

src/components/SightingModal/SightingModal.tsx

@@ -21,10 +21,11 @@ type SightingModalProps = {
 
 const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }: SightingModalProps) => {
   const { dispatch } = useAlertHitContext();
+
   const { query, mutation } = useCameraBlackboard();
 
   const hotlistNames = getHotlistName(sighting?.metadata?.hotlistMatches);
-  const handleAcknowledgeButton = () => {
+  const handleAcknowledgeButton = async () => {
     try {
       if (!sighting) {
         toast.error("Cannot add sighting to alert list");
@@ -32,17 +33,27 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
         return;
       }
       if (!query.data.alertHistory) {
-        mutation.mutate({
+        await mutation.mutateAsync({
           operation: "INSERT",
           path: "alertHistory",
           value: [sighting],
         });
+        await mutation.mutateAsync({
+          operation: "SAVE",
+          path: "",
+          value: null,
+        });
       } else {
-        mutation.mutate({
+        await mutation.mutateAsync({
           operation: "APPEND",
           path: "alertHistory",
           value: sighting,
         });
+        await mutation.mutateAsync({
+          operation: "SAVE",
+          path: "",
+          value: null,
+        });
         toast.success("Sighting Successfully added to alert list");
       }
 
@@ -160,23 +171,24 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                   <dd className="font-medium text-2xl">{sighting?.seenCount ?? "-"}</dd>
                 </div>
 
-                {sighting?.make && (
+                {sighting?.make && sighting.make.trim() && sighting.make.toLowerCase() !== "disabled" && (
                   <div>
                     <dt className="text-gray-300">Make</dt>
-                    <dd className="font-medium text-2xl">{sighting?.make ?? "-"}</dd>
+                    <dd className="font-medium text-2xl">{sighting.make}</dd>
                   </div>
                 )}
-                {sighting?.model ||
+
-                  (!sighting?.model.trim() && (
+                {sighting?.model && sighting.model.trim() && sighting.model.toLowerCase() !== "disabled" && (
                   <div>
                     <dt className="text-gray-300">Model</dt>
-                      <dd className="font-medium text-2xl">{sighting?.model ?? "-"}</dd>
+                    <dd className="font-medium text-2xl">{sighting.model}</dd>
                   </div>
-                  ))}
+                )}
-                {sighting?.color && (
+
+                {sighting?.color && sighting.color.trim() && sighting.color.toLowerCase() !== "disabled" && (
                   <div className="sm:col-span-2">
                     <dt className="text-gray-300">Colour</dt>
-                    <dd className="font-medium text-2xl">{sighting?.color ?? "-"}</dd>
+                    <dd className="font-medium text-2xl">{sighting.color}</dd>
                   </div>
                 )}
 

src/components/SightingsWidget/SightingWidget.tsx

@@ -68,6 +68,11 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
   const hasAutoOpenedRef = useRef(false);
   const npedRef = useRef(false);
 
+  const isCatAEnabled = integrationState?.iscatEnabled?.catA;
+  const isCatBEnabled = integrationState?.iscatEnabled?.catB;
+  const isCatCEnabled = integrationState?.iscatEnabled?.catC;
+  const isCatDEnabled = integrationState?.iscatEnabled?.catD;
+
   const enqueue = useCallback((sighting: SightingType, kind: HitKind) => {
     const id = sighting.vrm ?? sighting.ref;
     if (processedRefs.current.has(id)) return;
@@ -118,7 +123,11 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
       if (processedRefs.current.has(id)) continue;
       const isHotlistHit = checkIsHotListHit(sighting);
       const npedcategory = sighting?.metadata?.npedJSON?.["NPED CATEGORY"];
-      const isNPED = npedcategory === "A" || npedcategory === "B" || npedcategory === "C";
+      const isNPED =
+        (npedcategory === "A" && isCatAEnabled) ||
+        (npedcategory === "B" && isCatBEnabled) ||
+        (npedcategory === "C" && isCatCEnabled) ||
+        (npedcategory === "D" && isCatDEnabled);
 
       if (isNPED || isHotlistHit) {
         enqueue(sighting, isNPED ? "NPED" : "HOTLIST"); // enqueue ONLY
@@ -148,7 +157,8 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
       const isNPEDHitA = cat === "A";
       const isNPEDHitB = cat === "B";
       const isNPEDHitC = cat === "C";
-      return isNPEDHitA || isNPEDHitB || isNPEDHitC;
+      const isNPEDHitD = cat === "D";
+      return isNPEDHitA || isNPEDHitB || isNPEDHitC || isNPEDHitD;
     });
     const firstHot = rows?.find((r) => {
       const isHotListHit = checkIsHotListHit(r);

src/components/UI/Header.tsx

@@ -1,15 +1,26 @@
 import { Link } from "react-router";
 import Logo from "/MAV.svg";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faGear, faHome, faListCheck, faMaximize, faMinimize, faRotate } from "@fortawesome/free-solid-svg-icons";
+import {
+  faBars,
+  faGear,
+  faHome,
+  faListCheck,
+  faMaximize,
+  faMinimize,
+  faRotate,
+} from "@fortawesome/free-solid-svg-icons";
 import { useState } from "react";
 import SoundBtn from "./SoundBtn";
 import { useIntegrationsContext } from "../../context/IntegrationsContext";
 
 export default function Header() {
   const [isFullscreen, setIsFullscreen] = useState(false);
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
   const { state } = useIntegrationsContext();
 
+  const toggleMenu = () => setIsMenuOpen(!isMenuOpen);
+
   const sessionStarted = state.sessionStarted;
 
   const sessionPaused = state.sessionPaused;
@@ -36,7 +47,7 @@ export default function Header() {
         </Link>
       </div>
       <div className="flex flex-col lg:flex-row items-center space-x-24 justify-items-center">
-        <div className="flex flex-row lg:flex-row space-x-2">
+        <div className="flex flex-row lg:flex-row space-x-2 mx-10 p-2 md:p-0 items-center">
           {sessionStarted && sessionPaused ? (
             <p className="text-gray-400 font-bold">Session Paused</p>
           ) : (
@@ -44,7 +55,7 @@ export default function Header() {
           )}
         </div>
 
-        <div className="flex flex-row space-x-8">
+        <div className="flex flex-row space-x-6 md:space-x-8 items-center">
           <Link to={"/"}>
             <FontAwesomeIcon className="text-white" icon={faHome} size="2x" />
           </Link>
@@ -59,15 +70,35 @@ export default function Header() {
             <FontAwesomeIcon icon={faRotate} size="2x" />
           </div>
           <SoundBtn />
-          <Link to={"/session-settings"}>
+          <div className="md:hidden">
+            <FontAwesomeIcon icon={faBars} size="2x" onClick={toggleMenu} />
+          </div>
+
+          <Link className="hidden md:flex" to={"/session-settings"}>
             <FontAwesomeIcon className="text-white" icon={faListCheck} size="2x" />
           </Link>
 
-          <Link to={"/system-settings"}>
+          <Link className="hidden md:flex" to={"/system-settings"}>
             <FontAwesomeIcon className="text-white" icon={faGear} size="2x" />
           </Link>
         </div>
       </div>
+      {isMenuOpen && (
+        <div className="md:hidden">
+          <ul className="flex flex-row gap-5">
+            <li onClick={() => setIsMenuOpen(false)}>
+              <Link to={"/session-settings"}>
+                <FontAwesomeIcon className="text-white" icon={faListCheck} size="2x" />
+              </Link>
+            </li>
+            <li onClick={() => setIsMenuOpen(false)}>
+              <Link to={"/system-settings"}>
+                <FontAwesomeIcon className="text-white" icon={faGear} size="2x" />
+              </Link>
+            </li>
+          </ul>
+        </div>
+      )}
     </div>
   );
 }

src/components/UI/SoundBtn.tsx

@@ -16,6 +16,11 @@ const SoundBtn = () => {
       path: "soundEnabled",
       value: { enabled: newEnabled },
     });
+    await mutation.mutateAsync({
+      operation: "SAVE",
+      path: "",
+      value: null,
+    });
   };
   useEffect(() => {
     setEnabled(query?.data?.soundEnabled?.enabled);
@@ -23,10 +28,7 @@ const SoundBtn = () => {
 
   return (
     <button onClick={handleClick}>
-      <FontAwesomeIcon
+      <FontAwesomeIcon icon={enabled ? faVolumeHigh : faVolumeXmark} size="2x" />
-        icon={enabled ? faVolumeHigh : faVolumeXmark}
-        size="2x"
-      />
     </button>
   );
 };

src/context/providers/IntegrationsContextProvider.tsx

@@ -12,17 +12,44 @@ export const IntegrationsProvider = ({ children }: IntegrationsProviderType) =>
   const { mutation } = useCameraBlackboard();
 
   useEffect(() => {
+    let isMounted = true;
+
     const fetchData = async () => {
+      try {
+        await mutation.mutateAsync({
+          operation: "Load",
+          path: "",
+          value: null,
+        });
         const result = await mutation.mutateAsync({
           operation: "VIEW",
           path: "sessionStats",
         });
-      if (!result.result || typeof result.result === "string") return;
 
-      dispatch({ type: "UPDATE", payload: result?.result });
+        if (!isMounted) return;
+
+        const catResult = await mutation.mutateAsync({
+          operation: "VIEW",
+          path: "CategoryPopup",
+        });
+
+        if (!isMounted) return;
+        if (!result?.result || typeof result.result === "string") return;
+
+        dispatch({ type: "UPDATE", payload: result.result });
+        dispatch({ type: "NPEDCATENABLED", payload: catResult.result });
+      } catch (error) {
+        console.error("Error in fetchData:", error);
+      }
     };
+
     fetchData();
+
+    return () => {
+      isMounted = false;
+    };
   }, []);
+
   return (
     <IntegrationsContext.Provider
       value={{

src/context/providers/SoundContextProvider.tsx

@@ -20,6 +20,11 @@ const SoundContextProvider = ({ children }: SoundContextProviderProps) => {
         operation: "VIEW",
         path: "soundSettings",
       });
+      await mutation.mutateAsync({
+        operation: "LOAD",
+        path: "",
+        value: null,
+      });
 
       if (!result.result || typeof result.result !== "object") {
         dispatch({ type: "UPDATE", payload: state });

src/context/reducers/IntegrationsContextReducer.ts

@@ -6,6 +6,12 @@ export const initialState = {
   sessionPaused: false,
   savedSightings: [],
   npedUser: null,
+  iscatEnabled: {
+    catA: true,
+    catB: true,
+    catC: true,
+    catD: false,
+  },
 };
 
 export function reducer(state: NPEDSTATE, action: NPEDACTION) {
@@ -40,6 +46,11 @@ export function reducer(state: NPEDSTATE, action: NPEDACTION) {
         ...state,
         sessionList: action.payload,
       };
+    case "NPEDCATENABLED":
+      return {
+        ...state,
+        iscatEnabled: action.payload,
+      };
     default:
       return { ...state };
   }

src/hooks/useCameraZoom.ts

@@ -11,7 +11,6 @@ const getCameraMode = async (options: { camera: string }) => {
 };
 
 const updateCameraMode = async (options: { camera: string; mode: string }) => {
-  console.log(options);
   const dayNightPayload = {
     id: options.camera,
     fields: [

src/index.css

@@ -33,7 +33,7 @@ body {
 }
 
 .arrow-outline path {
-  stroke: black; /* outline color */
+  stroke: black;
-  stroke-width: 20px; /* thickness of outline (tweak this) */
+  stroke-width: 20px;
   stroke-linejoin: round;
 }

src/pages/SystemSettings.tsx

@@ -10,6 +10,7 @@ import { Toaster } from "sonner";
 import { useNPEDAuth } from "../hooks/useNPEDAuth";
 import SoundSettingsCard from "../components/SettingForms/Sound/SoundSettingsCard";
 import SoundUploadCard from "../components/SettingForms/Sound/SoundUploadCard";
+import NPEDCategoryPopup from "../components/PopupSettings/NPEDCategoryPopup";
 
 const SystemSettings = () => {
   useNPEDAuth();
@@ -21,7 +22,7 @@ const SystemSettings = () => {
           <Tab>System</Tab>
           <Tab>Output</Tab>
           <Tab>Integrations</Tab>
-          <Tab>WiFi and Modem</Tab>
+          <Tab>WiFi & Modem</Tab>
           <Tab>Sound</Tab>
         </TabList>
         <TabPanel>
@@ -38,6 +39,7 @@ const SystemSettings = () => {
           <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">
             <NPEDCard />
             <NPEDHotlistCard />
+            <NPEDCategoryPopup />
           </div>
         </TabPanel>
         <TabPanel>

src/types/types.ts

@@ -282,7 +282,7 @@ export type CameraConfig = {
 export type CameraBlackBoardOptions = {
   operation?: string;
   path?: string;
-  value?: object | string | number | (string | number)[];
+  value?: object | string | number | (string | number)[] | null;
 };
 
 export type CameraBlackboardResponse = {
@@ -403,6 +403,8 @@ export type ModemSettingsType = {
   username: string;
   password: string;
   authenticationType: string;
+  serverPrimary: string;
+  serverSecondary: string;
 };
 
 export type HitKind = "NPED" | "HOTLIST";
@@ -421,6 +423,7 @@ export type NPEDSTATE = {
   sessionPaused: boolean;
   savedSightings: DedupedSightings;
   npedUser: NPEDUser;
+  iscatEnabled: CategoryPopups;
 };
 
 export type NPEDACTION = {
@@ -428,3 +431,10 @@ export type NPEDACTION = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload: any;
 };
+
+export type CategoryPopups = {
+  catA: boolean;
+  catB: boolean;
+  catC: boolean;
+  catD: boolean;
+};

src/utils/utils.ts

@@ -184,3 +184,14 @@ export const reverseZoomMapping = (magnification: string) => {
       break;
   }
 };
+
+export const ValidateIPaddress = (value: string | undefined) => {
+  if (!value) return;
+
+  const regex =
+    /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/;
+
+  if (!regex.test(value)) {
+    return "Invalid IP address format";
+  }
+};