Minor changes (#53)

* Remove notification icon * Fix password hiding * Fix add address button size * Temp disable delete button * Remove unused import
GenerateNU · Dec 8, 2023 · 1e20e6f · 1e20e6f
1 parent 76ae35a
commit 1e20e6f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/frontend/src/components/Navbar/Navbar.tsx b/frontend/src/components/Navbar/Navbar.tsx
@@ -1,7 +1,6 @@
 import { Fab, Link } from "@mui/material";
 import { useState } from "react";
 import NavDropDown from "./Dropdown/NavDropDown";
-import NotifactionIcon from "../../assets/navbar/notifaction.png";
 import ProfileIcon from "../../assets/navbar/profile.png";
 import { useStateSelector } from "../../hooks/use-redux";
 import router from "../../router";
@@ -30,9 +29,7 @@ export default function NavBar() {
                 Create a Job
               </Link>
             )}
-            <Fab size="small" className="!shadow-none !bg-transparent">
-              <img className="h-6" src={NotifactionIcon} />
-            </Fab>
+
             <Fab
               size="small"
               className="!shadow-none !bg-transparent"

diff --git a/frontend/src/components/Profile/EditAddresses.tsx b/frontend/src/components/Profile/EditAddresses.tsx
@@ -14,7 +14,7 @@ export default function EditAddresses(props: {
   saveEdit: (body: Partial<User>) => void;
 }) {
   const [currentAddresses, setCurrentAddresses] = React.useState<Address[]>(
-    props.addresses ? props.addresses.map((a: Address) => ({ ...a })) : [],
+    props.addresses ? props.addresses.map((a: Address) => ({ ...a })) : []
   );
 
   const section: string = "addresses";
@@ -94,7 +94,7 @@ export default function EditAddresses(props: {
         <div className="flex h-full flex-col items-center justify-center">
           <div className=" py-8">
             <StyledButton
-              size={"sm"}
+              size={"md"}
               color={"seconday"}
               type="submit"
               onClick={() => {
@@ -123,7 +123,7 @@ export default function EditAddresses(props: {
         display={currentAddresses[props.index]?.name || "Add New Address"}
         onChange={(delta: number) => {
           props.setSection(
-            props.index + delta === currentAddresses.length ? section : "",
+            props.index + delta === currentAddresses.length ? section : ""
           );
           props.setIndex(props.index + delta);
         }}

diff --git a/frontend/src/components/Registration/TextQuestion.tsx b/frontend/src/components/Registration/TextQuestion.tsx
@@ -5,9 +5,11 @@ import { TextField } from "@mui/material";
 export default function TextQuestion({
   question,
   control,
+  password,
 }: {
   question: FormQuestion;
   control: Control;
+  password?: boolean;
 }) {
   return (
     <Controller
@@ -25,6 +27,7 @@ export default function TextQuestion({
                 ? control.getFieldState(question.key).error?.message
                 : " "
             }
+            type={password ? "password" : "text"}
             onChange={(e) => onChange(e.target.value)}
             label={question.prompt}
             variant="outlined"

diff --git a/frontend/src/pages/Profile.tsx b/frontend/src/pages/Profile.tsx
@@ -29,7 +29,7 @@ function Profile(props: { state: UserSliceState }) {
   const { addError, setOpen } = useApiError();
   const dispatch = useDispatch();
   const [pageStatus, setPageStatus] = React.useState<PageStatus>(
-    PageStatus.Loading,
+    PageStatus.Loading
   );
   const [addressIndex, setAddressIndex] = React.useState(0);
   const [printerIndex, setPrinterIndex] = React.useState(0);
@@ -70,7 +70,7 @@ function Profile(props: { state: UserSliceState }) {
             csrfToken: props.state.csrfToken,
             ssoAccessToken: props.state.ssoAccessToken,
             user: user,
-          }),
+          })
         );
         setSectionEdit("");
       })
@@ -118,6 +118,7 @@ function Profile(props: { state: UserSliceState }) {
       <div className="flex h-full flex-row justify-between items-center pb-2">
         <div>Deactivate Account</div>
         <StyledButton
+          disabled
           size={"sm"}
           color={"delete"}
           onClick={() => {

diff --git a/frontend/src/pages/Registration.tsx b/frontend/src/pages/Registration.tsx
@@ -26,7 +26,7 @@ import { useApiError } from "../hooks/use-api-error.tsx";
 
 const producerQuestions = allQuestions.sections;
 const designerQuestions = allQuestions.sections.filter(
-  (section) => section.userType?.toLowerCase() !== "producer",
+  (section) => section.userType?.toLowerCase() !== "producer"
 );
 
 const QuestionForm = () => {
@@ -49,10 +49,10 @@ const QuestionForm = () => {
   const [login] = authApi.useLoginMutation();
   const dispatch = useStateDispatch();
   const [totalSections, setTotalSections] = useState<number>(
-    allQuestions.sections.length,
+    allQuestions.sections.length
   );
   const [questions, setQuestions] = useState<FormSection[]>(
-    allQuestions.sections,
+    allQuestions.sections
   );
 
   const { addError, setOpen } = useApiError();
@@ -216,6 +216,15 @@ const QuestionForm = () => {
                       control={control}
                     />
                   );
+                case "password":
+                  return (
+                    <TextQuestion
+                      key={question.key + "master"}
+                      question={question}
+                      control={control}
+                      password
+                    />
+                  );
                 case "dropdown":
                   return (
                     <DropdownQuestion

diff --git a/frontend/src/utilities/FormQuestions/registration.ts b/frontend/src/utilities/FormQuestions/registration.ts
@@ -93,7 +93,7 @@ export const allQuestions: MultiForm = {
           questions: [
             {
               prompt: "Password",
-              format: "text",
+              format: "password",
               key: "password",
               rules: {
                 required: true,