Merged in feature/wifiandmodem (pull request #5)

Feature/wifiandmodem

.env

@@ -1,5 +1,5 @@
 VITE_BASEURL=http://192.168.75.11/
-VITE_CAM_BASE=http://100.72.72.70:8080
+VITE_CAM_BASE=http://100.118.196.113:8080
 VITE_FOLKESTONE_BASE=http://100.116.253.81
 VITE_TESTURL=http://100.82.205.44/SightingListRear/sightingSummary?mostRecentRef=-1
 VITE_OUTSIDE_BASEURL=http://100.82.205.44

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

@@ -1,96 +1,13 @@
 import Card from "../../UI/Card";
 import CardHeader from "../../UI/CardHeader";
-import { useState } from "react";
+import ModemSettings from "./ModemSettings";
-import FormGroup from "../components/FormGroup";
 
 const ModemCard = () => {
-  const [apn, setApn] = useState("");
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-  const [authType, setAuthType] = useState("PAP");
-
   return (
-    // TODO: Add switch for Auto vs Manual settings
     <Card className="p-4">
       <CardHeader title={"Modem"} />
-      <div className="flex flex-col gap-4 px-2">
+
-        <FormGroup>
+      <ModemSettings />
-          <label
-            htmlFor="apn"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            APN
-          </label>
-          <input
-            id="apn"
-            name="apn"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg flex-1 md:w-2/3"
-            placeholder="Enter APN"
-            value={apn}
-            onChange={(e) => setApn(e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <label
-            htmlFor="modemUsername"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            Username
-          </label>
-          <input
-            id="modemUsername"
-            name="modemUsername"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg flex-1 md:w-2/3"
-            placeholder="Enter Username"
-            value={username}
-            onChange={(e) => setUsername(e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <label
-            htmlFor="modemPassword"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            Password
-          </label>
-          <input
-            id="modemPassword"
-            name="modemPassword"
-            type="password"
-            className="p-2 border border-gray-400 rounded-lg flex-1 md:w-2/3"
-            placeholder="Enter Password"
-            value={password}
-            onChange={(e) => setPassword(e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <label
-            htmlFor="authType"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            Authentication Type
-          </label>
-          <select
-            id="authType"
-            name="authType"
-            className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 md:w-2/3"
-            value={authType}
-            onChange={(e) => setAuthType(e.target.value)}
-          >
-            <option value="PAP">PAP</option>
-            <option value="CHAP">CHAP</option>
-            <option value="None">None</option>
-          </select>
-        </FormGroup>
-        <button
-          className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
-          //onClick={() => handleModemSave(apn, username, password, authType)}
-        >
-          Save Modem Settings
-        </button>
-      </div>
     </Card>
   );
 };

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

@@ -0,0 +1,148 @@
+import { Formik, Form, Field } from "formik";
+import FormGroup from "../components/FormGroup";
+import type { ModemSettingsType } from "../../../types/types";
+import { useWifiAndModem } from "../../../hooks/useCameraWifiandModem";
+import { useEffect, useState } from "react";
+import ModemToggle from "./ModemToggle";
+import { toast } from "sonner";
+
+const ModemSettings = () => {
+  const [showSettings, setShowSettings] = useState(false);
+  const { modemQuery, modemMutation } = useWifiAndModem();
+
+  const apn = modemQuery?.data?.propAPN?.value;
+  const username = modemQuery?.data?.propUsername.value;
+  const password = modemQuery?.data?.propPassword?.value;
+  const mode = modemQuery?.data?.propMode?.value;
+
+  useEffect(() => {
+    setShowSettings(mode === "AUTO");
+  }, [mode]);
+
+  const inititalValues = {
+    apn: apn ?? "",
+    username: username ?? "",
+    password: password ?? "",
+    authenticationType: "PAP",
+  };
+
+  const handleSubmit = (values: ModemSettingsType) => {
+    const modemConfig = {
+      id: "ModemAndWifiManager-modem",
+      fields: [
+        {
+          property: "propAPN",
+          value: values.apn,
+        },
+        {
+          property: "propPassword",
+          value: values.password,
+        },
+        {
+          property: "propUsername",
+          value: values.username,
+        },
+
+        {
+          property: "propMode",
+          value: showSettings ? "AUTO" : "MANUAL",
+        },
+      ],
+    };
+    modemMutation.mutate(modemConfig);
+    if (modemMutation.error) {
+      toast.error("Failed to update modem settings");
+      return;
+    }
+    toast.success("Modem settings updated");
+  };
+
+  return (
+    <>
+      <ModemToggle
+        showSettings={showSettings}
+        onShowSettings={setShowSettings}
+      />
+      {!showSettings && (
+        <Formik
+          initialValues={inititalValues}
+          onSubmit={handleSubmit}
+          enableReinitialize
+        >
+          <Form className="flex flex-col space-y-5 px-2">
+            <FormGroup>
+              <label
+                htmlFor="apn"
+                className="font-medium whitespace-nowrap md:w-2/3"
+              >
+                APN
+              </label>
+              <Field
+                placeholder="Enter APN"
+                name="apn"
+                id="apn"
+                type="text"
+                className="p-1.5 border border-gray-400 rounded-lg"
+              />
+            </FormGroup>
+            <FormGroup>
+              <label
+                htmlFor="username"
+                className="font-medium whitespace-nowrap md:w-2/3"
+              >
+                Username
+              </label>
+              <Field
+                placeholder="Enter Username"
+                name="username"
+                id="username"
+                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
+              </label>
+              <Field
+                placeholder="Enter Password"
+                name="password"
+                id="password"
+                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
+              </label>
+              <Field
+                name="authenticationType"
+                as="select"
+                className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 w-2/3"
+              >
+                <option value="PAP">PAP</option>
+                <option value="CHAP">CHAP</option>
+                <option value="none">None</option>
+              </Field>
+            </FormGroup>
+            <button
+              type="submit"
+              className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+            >
+              Save Modem settings
+            </button>
+          </Form>
+        </Formik>
+      )}
+    </>
+  );
+};
+
+export default ModemSettings;

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

@@ -0,0 +1,30 @@
+type ModemToggleProps = {
+  showSettings: boolean;
+  onShowSettings: (showSettings: boolean) => void;
+};
+
+const ModemToggle = ({ showSettings, onShowSettings }: ModemToggleProps) => {
+  return (
+    <div className=" text-xl items-center m-2">
+      <label className="flex flex-row space-x-2 items-center w-[70%] md:w-[50%]">
+        <span>Automatically set</span>
+        <input
+          name="advancedSettings"
+          type="checkbox"
+          checked={showSettings}
+          onChange={(e) => onShowSettings(e.target.checked)}
+          id="advancedSettings"
+          className="sr-only peer"
+          value=""
+        />
+        <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"
+        ></div>
+      </label>
+    </div>
+  );
+};
+
+export default ModemToggle;

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

@@ -1,78 +1,12 @@
 import Card from "../../UI/Card";
 import CardHeader from "../../UI/CardHeader";
-import { useState } from "react";
+import WiFiSettingsForm from "./WiFiSettingsForm";
-import FormGroup from "../components/FormGroup";
 
 const WiFiCard = () => {
-  const [ssid, setSsid] = useState("");
-  const [password, setPassword] = useState("");
-  const [encryption, setEncryption] = useState("WPA2");
-
   return (
     <Card className="p-4">
       <CardHeader title={"WiFi"} />
-      <div className="flex flex-col gap-4 px-2">
+      <WiFiSettingsForm />
-        <FormGroup>
-          <label
-            htmlFor="ssid"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            SSID
-          </label>
-          <input
-            id="ssid"
-            name="ssid"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg flex-1 md:w-2/3"
-            placeholder="Enter SSID"
-            value={ssid}
-            onChange={(e) => setSsid(e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <label
-            htmlFor="password"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            Password
-          </label>
-          <input
-            id="password"
-            name="password"
-            type="password"
-            className="p-2 border border-gray-400 rounded-lg flex-1 md:w-2/3"
-            placeholder="Enter Password"
-            value={password}
-            onChange={(e) => setPassword(e.target.value)}
-          />
-        </FormGroup>
-        <FormGroup>
-          <label
-            htmlFor="encryption"
-            className="font-medium whitespace-nowrap md:w-2/3"
-          >
-            WPA/Encryption Type
-          </label>
-          <select
-            id="encryption"
-            name="encryption"
-            className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 md:w-2/3"
-            value={encryption}
-            onChange={(e) => setEncryption(e.target.value)}
-          >
-            <option value="WPA2">WPA2</option>
-            <option value="WPA3">WPA3</option>
-            <option value="WEP">WEP</option>
-            <option value="None">None</option>
-          </select>
-        </FormGroup>
-        <button
-          className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
-          //onClick={() => handleWiFiSave(ssid, password, encryption)}
-        >
-          Save WiFi Settings
-        </button>
-      </div>
     </Card>
   );
 };

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

@@ -0,0 +1,111 @@
+import { Field, Form, Formik } from "formik";
+import FormGroup from "../components/FormGroup";
+import type { WifiSettingValues } from "../../../types/types";
+import { useWifiAndModem } from "../../../hooks/useCameraWifiandModem";
+import { toast } from "sonner";
+
+const WiFiSettingsForm = () => {
+  const { wifiQuery, wifiMutation } = useWifiAndModem();
+
+  const wifiSSID = wifiQuery?.data?.propSSID?.value;
+  const wifiPassword = wifiQuery?.data?.propPassword?.value;
+
+  const initialValues = {
+    ssid: wifiSSID ?? "",
+    password: wifiPassword ?? "",
+    encryption: "WPA2",
+  };
+
+  const handleSubmit = (values: WifiSettingValues) => {
+    const wifiConfig = {
+      id: "ModemAndWifiManager-wifi",
+      fields: [
+        {
+          property: "propSSID",
+          value: values.ssid,
+        },
+        {
+          property: "propPassword",
+          value: values.password,
+        },
+      ],
+    };
+
+    wifiMutation.mutate(wifiConfig);
+    //todo: check what response is
+    if (wifiMutation.error) {
+      toast.error("Failed to update WiFi settings");
+      return;
+    }
+    toast.success("WiFi settings updated");
+  };
+  return (
+    <Formik
+      initialValues={initialValues}
+      onSubmit={handleSubmit}
+      enableReinitialize
+    >
+      {() => (
+        <Form className="flex flex-col space-y-5 px-2">
+          <FormGroup>
+            <label
+              htmlFor="ssid"
+              className="font-medium whitespace-nowrap md:w-2/3"
+            >
+              SSID
+            </label>
+            <Field
+              id="ssid"
+              name="ssid"
+              type="text"
+              className="p-1.5 border border-gray-400 rounded-lg"
+              placeholder="Enter SSID"
+            />
+          </FormGroup>
+          <FormGroup>
+            <label
+              htmlFor="password"
+              className="font-medium whitespace-nowrap md:w-2/3"
+            >
+              Password
+            </label>
+            <Field
+              id="password"
+              name="password"
+              type="password"
+              className="p-1.5 border border-gray-400 rounded-lg"
+              placeholder="Enter Password"
+            />
+          </FormGroup>
+          <FormGroup>
+            <label
+              htmlFor="encryption"
+              className="font-medium whitespace-nowrap md:w-2/3"
+            >
+              WPA/Encryption Type
+            </label>
+            <Field
+              id="encryption"
+              name="encryption"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 w-2/3"
+              as="select"
+            >
+              <option value="WPA2">WPA2</option>
+              <option value="WPA3">WPA3</option>
+              <option value="WEP">WEP</option>
+              <option value="None">None</option>
+            </Field>
+          </FormGroup>
+          <button
+            type="submit"
+            className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+          >
+            Save WiFi settings
+          </button>
+        </Form>
+      )}
+    </Formik>
+  );
+};
+
+export default WiFiSettingsForm;

src/components/UI/Header.tsx

@@ -32,7 +32,7 @@ export default function Header() {
   };
 
   return (
-    <div className="relative bg-[#253445] border-b border-gray-500 items-center mx-auto px-2 sm:px-6 lg:px-8 p-4 flex flex-col md:flex-row justify-between mb-7">
+    <div className="relative bg-[#253445] border-b border-gray-500 items-center mx-auto px-2 sm:px-6 lg:px-8 p-4 flex flex-col md:flex-row justify-between mb-7 space-y-6 md:space-y-0">
       <div className="w-30">
         <Link to={"/"}>
           <img src={Logo} alt="Logo" width={150} height={150} />

src/hooks/useCameraWifiandModem.ts

@@ -0,0 +1,83 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAM_BASE } from "../utils/config";
+import type { ModemConfig, WifiConfig } from "../types/types";
+
+const getWiFiSettings = async () => {
+  const response = await fetch(
+    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-wifi`
+  );
+  if (!response.ok) {
+    throw new Error("Cannot fetch Wifi settings");
+  }
+  return response.json();
+};
+
+const updateWifiSettings = async (wifiConfig: WifiConfig) => {
+  const response = await fetch(
+    `${CAM_BASE}/api/update-config?id=ModemAndWifiManager-wifi`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(wifiConfig),
+    }
+  );
+  if (!response.ok) {
+    throw new Error("Cannot update wifi settings");
+  }
+  return response.json();
+};
+
+const getModemSettings = async () => {
+  const response = await fetch(
+    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-modem`
+  );
+  if (!response.ok) {
+    throw new Error("Cannot fetch modem settings");
+  }
+  return response.json();
+};
+
+const updateModemSettings = async (modemConfig: ModemConfig) => {
+  const response = await fetch(
+    `${CAM_BASE}/api/update-config?id=ModemAndWifiManager-modem`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(modemConfig),
+    }
+  );
+  if (!response.ok) {
+    throw new Error("cannot update modem settings");
+  }
+  return response.json();
+};
+
+export const useWifiAndModem = () => {
+  const wifiQuery = useQuery({
+    queryKey: ["getWifiSettings"],
+    queryFn: getWiFiSettings,
+  });
+
+  const wifiMutation = useMutation({
+    mutationKey: ["updateWifiSettings"],
+    mutationFn: (wifiConfig: WifiConfig) => updateWifiSettings(wifiConfig),
+    onError: (error) => console.log(error),
+  });
+
+  const modemQuery = useQuery({
+    queryKey: ["getModemSettings"],
+    queryFn: getModemSettings,
+  });
+
+  const modemMutation = useMutation({
+    mutationKey: ["updateModemSettings"],
+    mutationFn: (modemConfig: ModemConfig) => updateModemSettings(modemConfig),
+  });
+
+  return {
+    wifiQuery,
+    wifiMutation,
+    modemQuery,
+    modemMutation,
+  };
+};

src/types/types.ts

@@ -262,6 +262,30 @@ export type ZoomLevel = {
   level?: number;
 };
 
+export type WifiSettingValues = {
+  ssid: string;
+  password: string;
+  encryption: string;
+};
+export type ModemConfigPayload = {
+  property: string;
+  value: string;
+};
+export type WifiConfigPayload = {
+  property: string;
+  value: string;
+};
+
+export type WifiConfig = {
+  id: string;
+  fields: WifiConfigPayload[];
+};
+
+export type ModemConfig = {
+  id: string;
+  fields: ModemConfigPayload[];
+};
+
 export type ZoomInOptions = {
   camera: string;
   multiplier: number;
@@ -270,3 +294,10 @@ export type ZoomInOptions = {
 export type zoomConfig = {
   camera: string;
 };
+
+export type ModemSettingsType = {
+  apn: string;
+  username: string;
+  password: string;
+  authenticationType: string;
+};