- added OSD configuration components and hooks for managing overlay settings

- adjusted card spacing

src/app/reducers/cameraFeedReducer.ts

@@ -9,25 +9,25 @@ export const initialState: CameraFeedState = {
   },
   regionsByCamera: {
     A: [
-      { name: "Region 1", brushColour: "#ff0000" },
+      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
+      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
+      { name: "Bay 5", brushColour: "#fc35db" },
     ],
     B: [
-      { name: "Region 1", brushColour: "#ff0000" },
+      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
+      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
+      { name: "Bay 5", brushColour: "#fc35db" },
     ],
     C: [
-      { name: "Region 1", brushColour: "#ff0000" },
+      { name: "Bay 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
+      { name: "Bay 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
+      { name: "Bay 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
+      { name: "Bay 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
+      { name: "Bay 5", brushColour: "#fc35db" },
     ],
   },
 

src/features/cameras/components/CameraGrid.tsx

@@ -9,10 +9,16 @@ const CameraGrid = () => {
   const [tabIndex, setTabIndex] = useState(0);
 
   return (
-    <div className="flex flex-col gap-4 p-4 md:grid md:grid-cols-5 md:grid-rows-5 md:max-h-screen md:gap-0 md:p-0">
+    <div className="grid grid-cols-1 md:grid-cols-3 gap-4 p-4 h-screen max-h-screen overflow-hidden">
-      <VideoFeedGridPainter />
+      <div className="col-span-2 flex flex-col gap-4">
+        <div className="shrink-0">
+          <VideoFeedGridPainter />
+        </div>
+        <div className="flex-1 overflow-hidden">
+          <PlatePatch />
+        </div>
+      </div>
       <CameraSettings tabIndex={tabIndex} setTabIndex={setTabIndex} />
-      <PlatePatch />
     </div>
   );
 };

src/features/cameras/components/CameraSettings/CameraSettings.tsx

@@ -10,7 +10,7 @@ type CameraSettingsProps = {
 
 const CameraSettings = ({ tabIndex, setTabIndex }: CameraSettingsProps) => {
   return (
-    <Card className="p-4 w-full overflow-auto md:col-span-2 md:row-span-5 md:col-start-4 md:row-start-1">
+    <Card className="p-4 w-full h-full max-h-screen ">
       <Tabs
         selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none rounded-sm mb-1"
         className="react-tabs"

src/features/cameras/components/CameraSettings/RegionSelector.tsx

@@ -43,14 +43,29 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
     });
   };
 
+  const handleAddRegionClick = () => {
+    const regionName = `Bay ${regions.length + 1}`;
+    dispatch({
+      type: "ADD_NEW_REGION",
+      payload: { cameraFeedID: cameraFeedID, regionName: regionName, brushColour: "#ffffff" },
+    });
+  };
+
+  const handleRemoveClick = () => {
+    dispatch({
+      type: "REMOVE_REGION",
+      payload: { cameraFeedID: cameraFeedID, regionName: regions[selectedRegionIndex].name },
+    });
+  };
+
   const handleSaveclick = () => {
     const regions: ColourData[] = [];
     const test = Array.from(paintedCells.entries());
-    const region1 = test.filter(([, cell]) => cell.region.name === "Region 1");
+    const region1 = test.filter(([, cell]) => cell.region.name === "Bay 1");
-    const region2 = test.filter(([, cell]) => cell.region.name === "Region 2");
+    const region2 = test.filter(([, cell]) => cell.region.name === "Bay 2");
-    const region3 = test.filter(([, cell]) => cell.region.name === "Region 3");
+    const region3 = test.filter(([, cell]) => cell.region.name === "Bay 3");
-    const region4 = test.filter(([, cell]) => cell.region.name === "Region 4");
+    const region4 = test.filter(([, cell]) => cell.region.name === "Bay 4");
-    const region5 = test.filter(([, cell]) => cell.region.name === "Region 5");
+    const region5 = test.filter(([, cell]) => cell.region.name === "Bay 5");
     const region1Data = {
       id: 1,
       cells: region1.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
@@ -91,91 +106,105 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
   };
 
   return (
-    <div className="grid grid-cols-1 md:grid-cols-2 md:grid-rows-2 gap-4">
+    <div className="flex flex-col gap-4 max-h-[50%]">
-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col">
+      <div className="flex flex-row gap-3">
-        <h2 className="text-2xl mb-2">Tools</h2>
+        <div className="p-2 border border-gray-600 rounded-lg flex flex-col h-50 w-full">
-        <div className="flex flex-col">
+          <h2 className="text-2xl mb-2">Tools</h2>
-          <label
+          <div className="flex flex-col">
-            htmlFor="paintMode"
+            <label
-            className={`p-4 border rounded-lg  mb-2
+              htmlFor="paintMode"
+              className={`p-4 border rounded-lg  mb-2
             ${mode === "painter" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
             hover:bg-[#202b36] hover:cursor-pointer`}
-          >
+            >
-            <input
+              <input
-              id="paintMode"
+                id="paintMode"
-              type="radio"
+                type="radio"
-              onChange={handleChange}
+                onChange={handleChange}
-              checked={mode === "painter"}
+                checked={mode === "painter"}
-              value="painter"
+                value="painter"
-              className="sr-only"
+                className="sr-only"
-            />
+              />
-            <span className="text-xl">Paint mode</span>
+              <span className="text-xl">Paint mode</span>
-          </label>
+            </label>
-          <label
+            <label
-            htmlFor="eraseMode"
+              htmlFor="eraseMode"
-            className={`p-4 border rounded-lg  mb-2
+              className={`p-4 border rounded-lg  mb-2
             ${mode === "eraser" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
             hover:bg-[#202b36] hover:cursor-pointer`}
-          >
+            >
-            <input
+              <input
-              id="eraseMode"
+                id="eraseMode"
-              type="radio"
+                type="radio"
-              onChange={handleChange}
+                onChange={handleChange}
-              checked={mode === "eraser"}
+                checked={mode === "eraser"}
-              value={"eraser"}
+                value={"eraser"}
-              className="sr-only"
+                className="sr-only"
-            />
+              />
-            <span className="text-xl">Erase mode</span>
+              <span className="text-xl">Erase mode</span>
-          </label>
+            </label>
+          </div>
+        </div>
+
+        <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
+          <h2 className="text-2xl mb-2">Bay Select</h2>
+          <>
+            {regions?.map((region, idx) => {
+              const isSelected = selectedRegionIndex === idx;
+              const inputId = `region-${idx}`;
+              return (
+                <label
+                  htmlFor={inputId}
+                  key={region.name}
+                  className={`items-center p-4 m-1 rounded-xl border flex flex-row justify-between
+                  ${isSelected ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"} hover:bg-[#202b36] hover:cursor-pointer`}
+                >
+                  <div className="flex flex-row gap-4 items-center">
+                    <input
+                      type="radio"
+                      checked={isSelected}
+                      id={inputId}
+                      name="region"
+                      className="sr-only"
+                      onChange={() => {
+                        handleModeChange("painter");
+                        handleRegionSelect(idx);
+                      }}
+                    />
+                    <span className="text-xl">{region.name}</span>
+                  </div>
+                  <ColourPicker
+                    colour={region.brushColour}
+                    setColour={(c: string) => handleRegionColourChange(idx, c)}
+                  />
+                  <div></div>
+                </label>
+              );
+            })}
+          </>
+          <div className="flex flex-col gap-4  mt-4">
+            <button className="border border-blue-900 bg-blue-700 px-4 py-1 rounded-md" onClick={handleAddRegionClick}>
+              Add Bay
+            </button>
+            <button className="border border-red-900 bg-red-700 px-4 py-1 rounded-md" onClick={handleRemoveClick}>
+              Remove Bay
+            </button>
+          </div>
         </div>
       </div>
-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col">
-        <h2 className="text-2xl mb-2">Region Select</h2>
-        <>
-          {regions?.map((region, idx) => {
-            const isSelected = selectedRegionIndex === idx;
-            const inputId = `region-${idx}`;
-            return (
-              <label
-                htmlFor={inputId}
-                key={region.name}
-                className={`items-center p-4 m-1 rounded-xl border flex flex-row justify-between
-                  ${isSelected ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"} hover:bg-[#202b36] hover:cursor-pointer`}
-              >
-                <div className="flex flex-row gap-4 items-center">
-                  <input
-                    type="radio"
-                    checked={isSelected}
-                    id={inputId}
-                    name="region"
-                    className="sr-only"
-                    onChange={() => {
-                      handleModeChange("painter");
-                      handleRegionSelect(idx);
-                    }}
-                  />
-                  <span className="text-xl">{region.name}</span>
-                </div>
-                <ColourPicker colour={region.brushColour} setColour={(c: string) => handleRegionColourChange(idx, c)} />
-                <div></div>
-              </label>
-            );
-          })}
-        </>
-      </div>
 
-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col md:col-span-2 h-50">
+      <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
-        <div className="flex flex-col">
+        <h2 className="text-2xl mb-2">Actions</h2>
-          <h2 className="text-2xl mb-2">Actions</h2>
+        <div className="flex flex-col md:flex-row mx-auto gap-4 justify-center">
           <button
             onClick={handleSaveclick}
-            className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full md:w-[40%] hover:bg-blue-700 hover:cursor-pointer"
+            className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full md:w-full hover:bg-blue-700 hover:cursor-pointer"
           >
             Save Region
           </button>
           <button
             onClick={handleResetRegion}
-            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-[40%] hover:bg-red-700 hover:cursor-pointer"
+            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-full hover:bg-red-700 hover:cursor-pointer"
           >
             Reset Region
           </button>

src/features/cameras/components/PlatePatch/SightingEntryTable.tsx

@@ -18,7 +18,7 @@ const SightingEntryTable = () => {
           <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
             <tr>
               <th className="px-4 py-3 font-semibold">VRM</th>
-              <th className="px-4 py-3 font-semibold">Lane ID</th>
+              <th className="px-4 py-3 font-semibold">Bay ID</th>
               <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
               <th className="px-4 py-3 font-semibold">First Seen</th>
               <th className="px-4 py-3 font-semibold">Last Seen</th>

src/features/cameras/components/PlatePatch/SightingExitTable.tsx

@@ -18,7 +18,7 @@ const SightingExitTable = () => {
           <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
             <tr>
               <th className="px-4 py-3 font-semibold">VRM</th>
-              <th className="px-4 py-3 font-semibold">Lane ID</th>
+              <th className="px-4 py-3 font-semibold">Bay ID</th>
               <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
               <th className="px-4 py-3 font-semibold">First Seen</th>
               <th className="px-4 py-3 font-semibold">Last Seen</th>

src/features/cameras/components/PlatePatch/SightingPatch.tsx

@@ -6,9 +6,9 @@ import SightingExitTable from "./SightingExitTable";
 
 const PlatePatch = () => {
   return (
-    <Card className="p-4 w-full md:w-[95%] md:row-start-4 md:col-span-3 md:h-[190%]">
+    <Card className="p-4 w-full max-h-[600px] overflow-hidden flex flex-col">
       <CardHeader title="Entry / Exit" />
-      <Tabs>
+      <Tabs defaultIndex={1} className="flex-1 overflow-hidden flex flex-col">
         <TabList>
           <Tab>Entry Sightings</Tab>
           <Tab>Exit Sightings</Tab>

src/features/cameras/components/Video/VideoFeedGridPainter.tsx

@@ -93,7 +93,7 @@ const VideoFeedGridPainter = () => {
       const width = window.innerWidth;
 
       const aspectRatio = BACKEND_WIDTH / BACKEND_HEIGHT;
-      const newWidth = width * 0.55;
+      const newWidth = width * 0.6;
       const newHeight = newWidth / aspectRatio;
       setStageSize({ width: newWidth, height: newHeight });
     };
@@ -118,6 +118,7 @@ const VideoFeedGridPainter = () => {
         onMouseMove={handleStageMouseMove}
         onMouseUp={handleStageMouseUp}
         onMouseLeave={handleStageMouseUp}
+        className="max-w-[55%]"
       >
         <Layer>
           <Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />

src/features/dashboard/components/DashboardGrid.tsx

@@ -35,7 +35,7 @@ const DashboardGrid = () => {
   const categoryC = statusCategories?.channelC ?? [];
 
   return (
-    <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2">
+    <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2 gap-4">
       <SystemStatusCard />
       <SystemHealthCard
         startTime={startTime}
@@ -46,7 +46,7 @@ const DashboardGrid = () => {
         dateUpdatedAt={dateUpdatedAt}
         refetch={refetch}
       />
-      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-3">
+      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-3 gap-x-4">
         <CameraStatus title="Camera A" category={categoryA} isError={isError} />
         <CameraStatus title="Camera B" category={categoryB} isError={isError} />
         <CameraStatus title="Camera C" category={categoryC} isError={isError} />

src/features/output/components/ChannelCard.tsx

@@ -21,7 +21,7 @@ const ChannelCard = () => {
       />
       <button
         type="submit"
-        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"
+        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"
       >
         {"Save Changes"}
       </button>

src/features/output/components/ChannelFields.tsx

@@ -159,7 +159,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                   className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
                 >
                   <option value={"UTC"}>UTC</option>
-                  <option value={"local"}>Local</option>
+                  <option value={"LOCAL"}>Local</option>
                 </Field>
               </div>
               <div className="flex flex-row justify-between">
@@ -269,24 +269,29 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
             <FieldArray name="customFields">
               {(arrayHelpers) => (
                 <>
-                  {values?.customFields?.map((_, index) => (
+                  {values?.customFields?.map((_, index) => {
-                    <div key={index} className="flex flex-row justify-between items-center mb-4">
+                    // if (!field.value) return null;
-                      <label htmlFor={`customFields.${index}`} className="mr-2">
+                    return (
-                        Custom Field {index + 1}
+                      <div key={index} className="flex flex-row justify-between items-center mb-4 gap-2">
-                      </label>
+                        <Field
-                      <Field
+                          name={`customFields.${index}.label`}
-                        name={`customFields.${index}`}
+                          className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-                        key={index}
+                          placeholder={`Custom Field ${index + 1} Label`}
-                        className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+                        />
-                        placeholder={`Enter Custom Field ${index + 1}`}
+                        <Field
-                        autoComplete="off"
+                          name={`customFields.${index}.value`}
-                      />
+                          className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-                    </div>
+                          placeholder={`Custom Field ${index + 1} Value`}
-                  ))}
+                          autoComplete="off"
+                        />
+                      </div>
+                    );
+                  })}
                   <button
                     type="button"
-                    onClick={() => arrayHelpers.push("")}
+                    onClick={() => arrayHelpers.push({ label: "", value: "" })}
-                    className="mr-2 border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer"
+                    className={`mr-2 border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer ${values?.customFields && values?.customFields?.length >= 6 ? "opacity-50 cursor-not-allowed" : ""}`}
+                    disabled={values?.customFields && values?.customFields?.length >= 6}
                   >
                     Add Custom Field
                   </button>

src/features/output/components/OSDFieldToggle.tsx

@@ -0,0 +1,27 @@
+import { Field } from "formik";
+
+type OSDFieldToggleProps = {
+  value: string;
+  label: string;
+};
+
+const OSDFieldToggle = ({ value, label }: OSDFieldToggleProps) => {
+  const spacesWords = (label: string) => {
+    if (label.includes("VRM")) return label.replace("VRM", " VRM");
+    return label.replace(/([A-Z])/g, " $1").trim();
+  };
+
+  return (
+    <label className="flex items-center gap-3 cursor-pointer select-none w-full justify-between">
+      <span className="text-lg">{spacesWords(label)}</span>
+      <Field id={value} type="checkbox" name={value} 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 OSDFieldToggle;

src/features/output/components/OSDFields.tsx

@@ -0,0 +1,70 @@
+import { Field, useFormikContext } from "formik";
+import { useOSDConfig } from "../hooks/useOSDConfig";
+import OSDFieldToggle from "./OSDFieldToggle";
+import type { OSDConfigFields } from "../../../types/types";
+
+type OSDFieldsProps = {
+  isOSDLoading: boolean;
+};
+
+const OSDFields = ({ isOSDLoading }: OSDFieldsProps) => {
+  const { osdMutation } = useOSDConfig();
+  const { values } = useFormikContext<OSDConfigFields>();
+
+  const includeKeys = Object.keys(values as OSDConfigFields).filter((value) => value.includes("include"));
+
+  const handleSubmit = async (values: OSDConfigFields) => {
+    const result = await osdMutation.mutateAsync(values);
+    console.log(result);
+  };
+
+  if (isOSDLoading) {
+    return <div>Loading OSD Options...</div>;
+  }
+
+  return (
+    <div>
+      <div className="flex flex-col space-y-4">
+        <div className="p-4 border border-gray-600 rounded-lg flex flex-col space-y-4">
+          <h2 className="text-2xl mb-4">OSD Options</h2>
+          <div className="flex flex-col space-y-4">
+            {includeKeys.map((key) => (
+              <OSDFieldToggle key={key} value={key} label={key.replace("include", "Include ")} />
+            ))}
+          </div>
+          <div className="flex flex-row justify-between">
+            <label htmlFor="overlayPosition">Overlay Position</label>
+            <Field
+              as="select"
+              name="overlayPosition"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+            >
+              <option value="Top">Top</option>
+              <option value="Bottom">Bottom</option>
+            </Field>
+          </div>
+          <div className="flex flex-row justify-between">
+            <label htmlFor="OSDTimestampFormat">OSD Timestamp Format</label>
+            <Field
+              as="select"
+              name="OSDTimestampFormat"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+            >
+              <option value="UTC">UTC</option>
+              <option value="LOCAL">Local</option>
+            </Field>
+          </div>
+          <button
+            type="button"
+            onClick={() => handleSubmit(values)}
+            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"
+          >
+            Submit
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default OSDFields;

src/features/output/components/OSDOptionsCard.tsx

@@ -0,0 +1,18 @@
+import Card from "../../../ui/Card";
+import CardHeader from "../../../ui/CardHeader";
+import OSDFields from "./OSDFields";
+
+type OSDOptionsCardProps = {
+  isOSDLoading: boolean;
+};
+
+const OSDOptionsCard = ({ isOSDLoading }: OSDOptionsCardProps) => {
+  return (
+    <Card className="p-4 flex-1">
+      <CardHeader title="OSD Payload Options" />
+      <OSDFields isOSDLoading={isOSDLoading} />
+    </Card>
+  );
+};
+
+export default OSDOptionsCard;

src/features/output/components/OutputForms.tsx

@@ -5,12 +5,26 @@ import type { BearerTypeFields, FormTypes, OptionalBOF2Constants, OptionalUTMCCo
 import { usePostBearerConfig } from "../hooks/useBearer";
 import { useDispatcherConfig } from "../hooks/useDispatcherConfig";
 import { useOptionalConstants } from "../hooks/useOptionalConstants";
+import { useCustomFields } from "../hooks/useCustomFields";
+import OSDOptionsCard from "./OSDOptionsCard";
+import { useOSDConfig } from "../hooks/useOSDConfig";
 
 const OutputForms = () => {
   const { bearerMutation } = usePostBearerConfig();
   const { dispatcherQuery, dispatcherMutation } = useDispatcherConfig();
+  const { customFieldsQuery, customFieldsMutation } = useCustomFields();
+  const { osdQuery } = useOSDConfig();
 
   const isLoading = dispatcherQuery?.isLoading;
+  const isOSDLoading = osdQuery?.isLoading;
+
+  const includeVRM = osdQuery?.data?.propIncludeVRM?.value.toLowerCase() === "true";
+  const includeMotion = osdQuery?.data?.propIncludeMotion?.value.toLowerCase() === "true";
+  const includeTimeStamp = osdQuery?.data?.propIncludeTimestamp?.value.toLowerCase() === "true";
+  const includeCameraName = osdQuery?.data?.propIncludeCameraName?.value.toLowerCase() === "true";
+  const overlayPosition = osdQuery?.data?.propOverlayPosition?.value;
+  const OSDTimestampFormat = osdQuery?.data?.propTimestampFormat?.value;
+  console.log(includeVRM);
   const format = dispatcherQuery?.data?.propFormat?.value;
   const { optionalConstantsQuery, optionalConstantsMutation } = useOptionalConstants(format?.toLowerCase());
   const FFID = optionalConstantsQuery?.data?.propFeedIdentifier?.value;
@@ -18,6 +32,29 @@ const OutputForms = () => {
   const timestampSource = optionalConstantsQuery?.data?.propTimeZoneType?.value;
   const gpsFormat = optionalConstantsQuery?.data?.propGpsFormat?.value;
 
+  const customFieldLabel1 = customFieldsQuery?.data?.propCustomFieldName1?.value;
+  const customFieldLabel2 = customFieldsQuery?.data?.propCustomFieldName2?.value;
+  const customFieldLabel3 = customFieldsQuery?.data?.propCustomFieldName3?.value;
+  const customFieldLabel4 = customFieldsQuery?.data?.propStringName4?.value;
+  const customFieldLabel5 = customFieldsQuery?.data?.propStringName5?.value;
+  const customFieldLabel6 = customFieldsQuery?.data?.propStringName6?.value;
+
+  const customFieldValues1 = customFieldsQuery?.data?.propCustomFieldValue1?.value;
+  const customFieldValues2 = customFieldsQuery?.data?.propCustomFieldValue2?.value;
+  const customFieldValues3 = customFieldsQuery?.data?.propCustomFieldValue3?.value;
+  const customFieldValues4 = customFieldsQuery?.data?.propStringValue4?.value;
+  const customFieldValues5 = customFieldsQuery?.data?.propStringValue5?.value;
+  const customFieldValues6 = customFieldsQuery?.data?.propStringValue6?.value;
+
+  const initialCustomFields = [
+    { label: customFieldLabel1 || "", value: customFieldValues1 || "" },
+    { label: customFieldLabel2 || "", value: customFieldValues2 || "" },
+    { label: customFieldLabel3 || "", value: customFieldValues3 || "" },
+    { label: customFieldLabel4 || "", value: customFieldValues4 || "" },
+    { label: customFieldLabel5 || "", value: customFieldValues5 || "" },
+    { label: customFieldLabel6 || "", value: customFieldValues6 || "" },
+  ].filter((field) => field.label && field.value);
+
   const inititalValues: FormTypes = {
     format: format ?? "JSON",
     enabled: true,
@@ -43,7 +80,15 @@ const OutputForms = () => {
     // ftp - fields
 
     //custom fields
-    customFields: [],
+    customFields: initialCustomFields,
+
+    // OSD Options
+    includeVRM: includeVRM ?? false,
+    includeMotion: includeMotion ?? false,
+    includeTimeStamp: includeTimeStamp ?? false,
+    includeCameraName: includeCameraName ?? false,
+    overlayPosition: overlayPosition ?? "Top",
+    OSDTimestampFormat: OSDTimestampFormat ?? "UTC",
   };
 
   const handleSubmit = async (values: FormTypes) => {
@@ -89,6 +134,11 @@ const OutputForms = () => {
         await optionalConstantsMutation.mutateAsync(optionalUTMCFields);
       }
     }
+    if (values.customFields && values.customFields.length > 0) {
+      const customFields = [...values.customFields];
+
+      await customFieldsMutation.mutateAsync(customFields);
+    }
   };
 
   if (isLoading) {
@@ -97,8 +147,11 @@ const OutputForms = () => {
 
   return (
     <Formik initialValues={inititalValues} onSubmit={handleSubmit} enableReinitialize>
-      <Form className="grid grid-cols-1 md:grid-cols-2">
+      <Form className="grid grid-cols-1 md:grid-cols-2 gap-4 h-[50%]">
-        <BearerTypeCard />
+        <div>
+          <BearerTypeCard />
+          <OSDOptionsCard isOSDLoading={isOSDLoading} />
+        </div>
         <ChannelCard />
       </Form>
     </Formik>

src/features/output/hooks/useCustomFields.ts

@@ -0,0 +1,65 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { CustomFieldConfig } from "../../../types/types";
+
+const fetchCustomFields = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=SightingAmmend0-custom-fields`);
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+const postCustomFields = async (customFieldConfig: CustomFieldConfig[]) => {
+  const fields = [];
+
+  for (const customField of customFieldConfig) {
+    if (customField.value)
+      if (customFieldConfig.indexOf(customField) > 2) {
+        fields.push({
+          property: `propStringName${customFieldConfig.indexOf(customField) + 1}`,
+          value: customField.label,
+        });
+        fields.push({
+          property: `propStringValue${customFieldConfig.indexOf(customField) + 1}`,
+          value: customField.value,
+        });
+      } else {
+        fields.push(
+          {
+            property: `propCustomFieldName${customFieldConfig.indexOf(customField) + 1}`,
+            value: customField.label,
+          },
+          {
+            property: `propCustomFieldValue${customFieldConfig.indexOf(customField) + 1}`,
+            value: customField.value,
+          },
+        );
+      }
+  }
+  const customFieldConfigPayload = {
+    id: "SightingAmmend0-custom-fields",
+    fields,
+  };
+
+  const response = await fetch(`${CAMBASE}/api/update-config`, {
+    method: "POST",
+    body: JSON.stringify(customFieldConfigPayload),
+  });
+  if (!response.ok) throw new Error("Network response was not ok");
+  return response.json();
+};
+
+export const useCustomFields = () => {
+  const customFieldsQuery = useQuery({
+    queryKey: ["customFields"],
+    queryFn: fetchCustomFields,
+  });
+
+  const customFieldsMutation = useMutation({
+    mutationKey: ["customFieldsMutation"],
+    mutationFn: postCustomFields,
+  });
+
+  return { customFieldsQuery, customFieldsMutation };
+};

src/features/output/hooks/useOSDConfig.ts

@@ -0,0 +1,53 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { OSDConfigFields } from "../../../types/types";
+
+const fetchOSDConfig = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=SightingAmmend0-overlay`);
+
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+const postOSDConfig = async (data: OSDConfigFields) => {
+  const fields = [
+    { property: "propIncludeVRM", value: data.includeVRM },
+    { property: "propIncludeMotion", value: data.includeMotion },
+    { property: "propIncludeTimestamp", value: data.includeTimeStamp },
+    { property: "propIncludeCameraName", value: data.includeCameraName },
+    { property: "propOverlayPosition", value: data.overlayPosition },
+    { property: "propTimestampFormat", value: data.OSDTimestampFormat },
+  ];
+
+  const osdConfigPayload = {
+    id: "SightingAmmend0-overlay",
+    fields: fields,
+  };
+
+  console.log(osdConfigPayload);
+  const response = await fetch(`${CAMBASE}/api/update-config`, {
+    method: "POST",
+    body: JSON.stringify(osdConfigPayload),
+  });
+
+  if (!response.ok) {
+    throw new Error("Failed to post OSD Config");
+  }
+  return response.json();
+};
+
+export const useOSDConfig = () => {
+  const osdQuery = useQuery({
+    queryKey: ["osdConfig"],
+    queryFn: fetchOSDConfig,
+  });
+
+  const osdMutation = useMutation({
+    mutationFn: postOSDConfig,
+    mutationKey: ["postOSDConfig"],
+  });
+
+  return { osdQuery, osdMutation };
+};

src/features/settings/components/SystemConfig.tsx

@@ -1,11 +1,15 @@
 import { Formik, Form, Field, FieldArray } from "formik";
 import { useSystemSettings } from "../hooks/useSystemSettings";
-import type { SystemSettings } from "../../../types/types";
+import type { NetworkConfig, SystemSettings } from "../../../types/types";
 import { toast } from "sonner";
+import { useGetNetworkConfig } from "../hooks/useGetNetworkConfig";
 
 const SystemConfig = () => {
   const { systemSettingsQuery, systemSettingsMutation } = useSystemSettings();
+  const { networkConfigQuery, networkConfigMutation } = useGetNetworkConfig();
 
+  const isLoading = networkConfigMutation?.isPending || networkConfigMutation?.isPending;
+  const isGettingLoading = systemSettingsQuery?.isLoading || networkConfigQuery?.isLoading;
   const timeZoneOptions = systemSettingsQuery?.data?.propLocalTimeZone?.accepted;
   const timeZoneOpts = timeZoneOptions?.split(",").map((option: string) => option.trim().replace(/\[|\]/g, ""));
   const timeSourceOptions = systemSettingsQuery?.data?.propTimeSource?.accepted;
@@ -15,8 +19,11 @@ const SystemConfig = () => {
   const SNTPServer = systemSettingsQuery?.data?.propSNTPServer?.value;
   const SNTPInterval = systemSettingsQuery?.data?.propSNTPIntervalMinutes?.value;
   const timeSource = systemSettingsQuery?.data?.propTimeSource?.value;
-  // const primaryServer = systemSettingsQuery?.data?.propPrimaryDNSServer?.value;
+  const primaryServer = networkConfigQuery?.data?.propNameServerPrimary?.value;
-  // const secondaryServer = systemSettingsQuery?.data?.propSecondaryDNSServer?.value;
+  const secondaryServer = networkConfigQuery?.data?.propNameServerSecondary?.value;
+  const ipAddress = networkConfigQuery?.data?.propHost?.value;
+  const subnetMask = networkConfigQuery?.data?.propNetmask?.value;
+  const gateway = networkConfigQuery?.data?.propGateway?.value;
 
   const initialValues = {
     deviceName: deviceName ?? "",
@@ -25,22 +32,36 @@ const SystemConfig = () => {
     SNTPServer: SNTPServer ?? "",
     SNTPInterval: SNTPInterval ?? 60,
     SNTPIntervalMinutes: SNTPInterval ?? 60,
-    primaryServer: "",
+    primaryServer: primaryServer ?? "",
-    secondaryServer: "",
+    secondaryServer: secondaryServer ?? "",
     timeSource: timeSource ?? "",
+    ipAddress: ipAddress ?? "",
+    subnetMask: subnetMask ?? "",
+    gateway: gateway ?? "",
     customFields: [],
   };
 
-  const handleSubmit = async (values: SystemSettings) => {
+  const handleSubmit = async (values: SystemSettings & NetworkConfig) => {
     const result = await systemSettingsMutation.mutateAsync(values);
+    const networkResult = await networkConfigMutation.mutateAsync({
+      ipAddress: values.ipAddress,
+      subnetMask: values.subnetMask,
+      gateway: values.gateway,
+      primaryServer: values.primaryServer,
+      secondaryServer: values.secondaryServer,
+    });
 
-    if (result.id) {
+    if (result.id && networkResult.id) {
       toast.success("System settings updated successfully");
     } else {
       toast.error("Failed to update system settings");
     }
   };
 
+  if (isGettingLoading) {
+    return <div>Loading...</div>;
+  }
+
   return (
     <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
       {({ values }) => (
@@ -106,6 +127,36 @@ const SystemConfig = () => {
               autoComplete="off"
             />
           </div>
+          <div className="flex flex-row justify-between items-center mb-4">
+            <label htmlFor="subnetMask">Subnet Mask</label>
+            <Field
+              name="subnetMask"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter subnet mask"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-row justify-between items-center mb-4">
+            <label htmlFor="ipAddress">IP Address</label>
+            <Field
+              name="ipAddress"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter IP address"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-row justify-between items-center mb-4">
+            <label htmlFor="gateway">Gateway</label>
+            <Field
+              name="gateway"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter gateway"
+              autoComplete="off"
+            />
+          </div>
           <div className="flex flex-row justify-between items-center mb-4">
             <label htmlFor="primaryServer">Primary DNS Server</label>
             <Field
@@ -133,7 +184,7 @@ const SystemConfig = () => {
             <FieldArray name="customFields">
               {(arrayHelpers) => (
                 <>
-                  {values.customFields.map((field, index) => (
+                  {values.customFields.map((_, index) => (
                     <div key={index} className="flex flex-row justify-between items-center mb-4">
                       <label htmlFor={`customFields.${index}`} className="mr-2">
                         Custom Field {index + 1}
@@ -167,8 +218,12 @@ const SystemConfig = () => {
               )}
             </FieldArray>
           </div>
-          <button type="submit" className="px-4 py-2 bg-green-700 text-white rounded-lg">
+          <button
-            Save Settings
+            type="submit"
+            className="px-4 py-2 bg-green-700 text-white rounded-lg hover:bg-green-800 hover:cursor-pointer"
+            disabled={isLoading}
+          >
+            {isLoading ? "Saving..." : "Save Settings"}
           </button>
         </Form>
       )}

src/features/settings/hooks/useGetNetworkConfig.ts

@@ -0,0 +1,49 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { NetworkConfig } from "../../../types/types";
+
+const fetchNetworkConfig = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=GLOBAL--NetworkConfig`);
+  if (!response.ok) throw new Error("Network response was not ok");
+  return response.json();
+};
+
+const postNetworkConfig = async (networkConfig: NetworkConfig) => {
+  const fields = [
+    { property: "propNetmask", value: networkConfig.subnetMask },
+    { property: "propHost", value: networkConfig.ipAddress },
+    { property: "propGateway", value: networkConfig.gateway },
+  ];
+
+  if (networkConfig.primaryServer !== undefined) {
+    fields.push({ property: "propNameServerPrimary", value: networkConfig.primaryServer });
+  }
+  if (networkConfig.secondaryServer !== undefined) {
+    fields.push({ property: "propNameServerSecondary", value: networkConfig.secondaryServer });
+  }
+  const networkConfigPayload = {
+    id: "GLOBAL--NetworkConfig",
+    fields,
+  };
+
+  const respones = await fetch(`${CAMBASE}/api/update-config?id=GLOBAL--NetworkConfig`, {
+    method: "POST",
+    body: JSON.stringify(networkConfigPayload),
+  });
+  if (!respones.ok) throw new Error("Network response was not ok");
+  return respones.json();
+};
+
+export const useGetNetworkConfig = () => {
+  const networkConfigQuery = useQuery({
+    queryKey: ["networkConfig"],
+    queryFn: fetchNetworkConfig,
+  });
+
+  const networkConfigMutation = useMutation({
+    mutationKey: ["networkConfigMutation"],
+    mutationFn: postNetworkConfig,
+  });
+
+  return { networkConfigQuery, networkConfigMutation };
+};

src/types/types.ts

@@ -56,8 +56,13 @@ export type OptionalLaneIDs = {
   LID3?: string;
 };
 
+export type CustomField = {
+  label: string;
+  value: string;
+};
+
 export type CustomFields = {
-  customFields?: string[];
+  customFields?: CustomField[];
 };
 
 export type InitialValuesFormErrors = {
@@ -68,7 +73,16 @@ export type InitialValuesFormErrors = {
   readTimeoutSeconds?: string;
 };
 
-export type FormTypes = BearerTypeFields & OptionalConstants & OptionalLaneIDs & CustomFields;
+export type OSDConfigFields = {
+  includeVRM: boolean;
+  includeMotion: boolean;
+  includeTimeStamp: boolean;
+  includeCameraName: boolean;
+  overlayPosition: "Top" | "Bottom" | "Left" | "Right";
+  OSDTimestampFormat: "UTC" | "LOCAL";
+};
+
+export type FormTypes = BearerTypeFields & OptionalConstants & OptionalLaneIDs & CustomFields & OSDConfigFields;
 type FieldProperty = {
   datatype: string;
   value: string;
@@ -186,6 +200,17 @@ export type SystemSettings = {
   timeSource: string;
   SNTPServer: string;
   SNTPIntervalMinutes: number;
+};
+
+export type NetworkConfig = {
+  ipAddress: string;
+  subnetMask: string;
+  gateway: string;
   primaryServer?: string;
   secondaryServer?: string;
 };
+
+export type CustomFieldConfig = {
+  label: string;
+  value: string;
+};

src/ui/Card.tsx

@@ -10,7 +10,7 @@ const Card = ({ children, className }: CardProps) => {
   return (
     <div
       className={clsx(
-        "bg-[#253445] rounded-lg mt-4 mx-2 shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
+        "bg-[#253445] rounded-lg mt-4  shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
         className,
       )}
     >