From 71512a1294279a8df7856a40fa3ed8a2177d41e2 Mon Sep 17 00:00:00 2001
From: mcarre20 <marlycarre@gmail.com>
Date: Mon, 11 Sep 2023 20:17:40 -0400
Subject: [PATCH 1/2] update create home function value

---
 .../src/pages/Admin/home/CreateNewHome.js     | 82 ++++++++++++++-----
 1 file changed, 62 insertions(+), 20 deletions(-)

diff --git a/frontend/front/src/pages/Admin/home/CreateNewHome.js b/frontend/front/src/pages/Admin/home/CreateNewHome.js
index 546c299c..2e25263e 100644
--- a/frontend/front/src/pages/Admin/home/CreateNewHome.js
+++ b/frontend/front/src/pages/Admin/home/CreateNewHome.js
@@ -1,28 +1,40 @@
-import { Box, Button, TextField, Typography } from "@mui/material";
+import { Alert, Box, Button, TextField, Typography } from "@mui/material";
 import { Controller, useForm } from "react-hook-form";
 
-import React from "react";
+import React, { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-
-import { withAdminPrefix, ADMIN_HOME } from "../../../routing/routes";
+import { useCreateHomeMutation } from "../../../api/apiSlice";
+import { ADMIN_HOME, withAdminPrefix } from "../../../routing/routes";
 
 const CreateNewHome = () => {
   const navigate = useNavigate();
-  const { handleSubmit, control } = useForm({
+  const { handleSubmit, control, reset } = useForm({
     defaultValues: {
-      streetNumber: "",
-      address: "",
-      zipCode: "",
+      street_number: "",
+      street_name: "",
+      unit_number: "",
       city: "",
+      state: "",
+      zip_code: "",
     },
   });
 
-  const onSubmit = (data) => console.log(data);
+  const [createHome, { isLoading, isSuccess, isError }] =
+    useCreateHomeMutation();
 
+  const onSubmit = async (data) => {
+    createHome({ home: data });
+  };
   const handleCancel = () => {
     navigate(withAdminPrefix(ADMIN_HOME));
   };
 
+  useEffect(() => {
+    if (isSuccess) {
+      reset();
+    }
+  }, [isSuccess, reset]);
+
   return (
     <Box
       display="flex"
@@ -36,66 +48,96 @@ const CreateNewHome = () => {
         </Box>
         <form onSubmit={handleSubmit(onSubmit)}>
           <Controller
-            name={"streetNumber"}
+            name="street_number"
             control={control}
             render={({ field: { onChange, value } }) => (
               <TextField
                 onChange={onChange}
                 value={value}
-                label={"Street Number"}
+                label="Street Number"
                 variant="standard"
                 sx={{ width: "95%", mx: 2, mt: 3 }}
               />
             )}
           />
           <Controller
-            name={"address"}
+            name="street_name"
             control={control}
             render={({ field: { onChange, value } }) => (
               <TextField
                 onChange={onChange}
                 value={value}
-                label={"Address"}
+                label="Street Name"
                 variant="standard"
                 sx={{ width: "95%", mx: 2, mt: 3 }}
               />
             )}
           />
           <Controller
-            name={"zipCode"}
+            name="unit_number"
             control={control}
             render={({ field: { onChange, value } }) => (
               <TextField
                 onChange={onChange}
                 value={value}
-                label={"Zip Code"}
+                label="Unit Number"
                 variant="standard"
                 sx={{ width: "95%", mx: 2, mt: 3 }}
               />
             )}
           />
-
           <Controller
-            name={"city"}
+            name="city"
             control={control}
             render={({ field: { onChange, value } }) => (
               <TextField
                 onChange={onChange}
                 value={value}
-                label={"City"}
+                label="City"
                 variant="standard"
                 sx={{ width: "95%", mx: 2, mt: 3 }}
               />
             )}
           />
-
+          <Controller
+            name="state"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <TextField
+                onChange={onChange}
+                value={value}
+                label="State"
+                variant="standard"
+                sx={{ width: "95%", mx: 2, mt: 3 }}
+              />
+            )}
+          />
+          <Controller
+            name="zip_code"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <TextField
+                onChange={onChange}
+                value={value}
+                label="Zip Code"
+                variant="standard"
+                sx={{ width: "95%", mx: 2, mt: 3 }}
+              />
+            )}
+          />
+          {isError && (
+            <Alert severity="error" sx={{ my: 1 }}>
+              Error Saving home
+            </Alert>
+          )}
           <Box pt={5} textAlign="right">
             <Button
               variant="outlined"
               sx={{ ml: 2 }}
               onClick={handleSubmit(onSubmit)}
+              disabled={isLoading ? true : false}
             >
-              Create
+              {isLoading ? "Saving" : "Save"}
             </Button>
             <Button
               variant="outlined"

From ca25f439ba6eb89bd4075b301173b5528973aa52 Mon Sep 17 00:00:00 2001
From: mcarre20 <marlycarre@gmail.com>
Date: Mon, 16 Oct 2023 21:03:51 -0400
Subject: [PATCH 2/2] remove assignment request feature

---
 frontend/front/src/pages/Surveyor/account/Account.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/front/src/pages/Surveyor/account/Account.js b/frontend/front/src/pages/Surveyor/account/Account.js
index d7242d57..1bb20ddc 100644
--- a/frontend/front/src/pages/Surveyor/account/Account.js
+++ b/frontend/front/src/pages/Surveyor/account/Account.js
@@ -1,11 +1,11 @@
 import { Box, Button, Stack } from "@mui/material";
 
-import AccountDetail from "./AccountDetail";
-import { BackButton } from "../Components/BackButton";
-import ContainerTitle from "../../Admin/component/ContainerTitle";
-import { Link } from "react-router-dom";
 import React from "react";
 import { useSelector } from "react-redux";
+import { Link } from "react-router-dom";
+import ContainerTitle from "../../Admin/component/ContainerTitle";
+import { BackButton } from "../Components/BackButton";
+import AccountDetail from "./AccountDetail";
 
 const Account = () => {
   const { firstName, lastName, email, address, phoneNumber } = useSelector(
@@ -29,12 +29,16 @@ const Account = () => {
               Edit
             </Button>
           </Box>
+          {/*
           <Box p={1} sx={{ borderBottom: "1px dashed grey" }} />
           <Box display="flex" mt={3} mb={2} px={2}>
+            
+            --Feature will not implemented on backend
             <Button variant="contained" disabled={true}>
               Request New Assignment
             </Button>
           </Box>
+  */}
         </Stack>
       </ContainerTitle>
     </>