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

Reviewed-on: #14

src/components/PopupSettings/NPEDCategoryPopup.tsx

@@ -6,6 +6,7 @@ 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();
@@ -24,11 +25,18 @@ const NPEDCategoryPopup = () => {
   };
 
   const handleSubmit = async (values: CategoryPopups) => {
-    await mutation.mutateAsync({
+    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 });
   };
 

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/NPEDFields.tsx

@@ -102,14 +102,14 @@ const NPEDFields = () => {
           {!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

@@ -167,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/ModemSettings.tsx

@@ -178,7 +178,7 @@ 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>

src/components/SightingModal/SightingModal.tsx

@@ -25,7 +25,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
   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");
@@ -33,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");
       }
 

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

@@ -16,6 +16,11 @@ export const IntegrationsProvider = ({ children }: IntegrationsProviderType) =>
 
     const fetchData = async () => {
       try {
+        await mutation.mutateAsync({
+          operation: "Load",
+          path: "",
+          value: null,
+        });
         const result = await mutation.mutateAsync({
           operation: "VIEW",
           path: "sessionStats",

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/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

@@ -22,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>

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 = {