From 1534a6acb7882527149314957ad2d89ae06eecda Mon Sep 17 00:00:00 2001 From: Connor Bechthold Date: Sun, 4 Feb 2024 19:35:22 -0500 Subject: [PATCH 1/5] bedazzling changes --- frontend/public/favicon.ico | Bin 3870 -> 15406 bytes frontend/public/index.html | 5 ++--- frontend/public/logo192.png | Bin 5347 -> 0 bytes frontend/public/logo512.png | Bin 9664 -> 0 bytes frontend/public/manifest.json | 10 ---------- frontend/src/components/auth/TwoFa.tsx | 7 ++++++- .../src/components/common/NavigationBar.tsx | 2 +- frontend/src/components/forms/CreateLog.tsx | 5 +++-- frontend/src/components/forms/EditLog.tsx | 5 +++-- frontend/src/components/forms/Login.tsx | 7 +++++++ frontend/src/components/forms/Signup.tsx | 7 +++++++ frontend/src/components/forms/ViewLog.tsx | 3 +-- .../pages/Auth/ResetPasswordPage.tsx | 7 +++++++ .../pages/Auth/VerificationPage.tsx | 9 +++++++-- frontend/src/images/show-logo-colour.png | Bin 0 -> 29564 bytes .../{SHOW-Logo.png => show-logo-white.png} | Bin 16 files changed, 44 insertions(+), 23 deletions(-) delete mode 100644 frontend/public/logo192.png delete mode 100644 frontend/public/logo512.png create mode 100644 frontend/src/images/show-logo-colour.png rename frontend/src/images/{SHOW-Logo.png => show-logo-white.png} (100%) diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index a11777cc471a4344702741ab1c8a588998b1311a..d9bb8a5cafa2290a5bb356cde937f049c9a8d825 100644 GIT binary patch literal 15406 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 ZpXGej+0^d|uO}n$WCWg!z@v=7zX4s6@38;? literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ diff --git a/frontend/public/index.html b/frontend/public/index.html index aa069f27..da33adf4 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -7,9 +7,8 @@ - - React App + SHOW Resident Management diff --git a/frontend/public/logo192.png b/frontend/public/logo192.png deleted file mode 100644 index fc44b0a3796c0e0a64c3d858ca038bd4570465d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5347 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index 080d6c77..1f2f141f 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -6,16 +6,6 @@ "src": "favicon.ico", "sizes": "64x64 32x32 24x24 16x16", "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" } ], "start_url": ".", diff --git a/frontend/src/components/auth/TwoFa.tsx b/frontend/src/components/auth/TwoFa.tsx index 6a7572d5..816bcb30 100644 --- a/frontend/src/components/auth/TwoFa.tsx +++ b/frontend/src/components/auth/TwoFa.tsx @@ -8,6 +8,7 @@ import { Spinner, Text, VStack, + Image } from "@chakra-ui/react"; import authAPIClient from "../../APIClients/AuthAPIClient"; import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants"; @@ -15,6 +16,7 @@ import { HOME_PAGE } from "../../constants/Routes"; import AuthContext from "../../contexts/AuthContext"; import CreateToast from "../common/Toasts"; import { isErrorResponse } from "../../helper/error"; +import SHOW_LOGO from "../../images/show-logo-colour.png"; type TwoFaProps = { email: string; @@ -93,7 +95,10 @@ const TwoFa = ({ justifyContent="center" alignItems="center" > - + + + + One last step! In order to protect your account, please enter the 6 digit diff --git a/frontend/src/components/common/NavigationBar.tsx b/frontend/src/components/common/NavigationBar.tsx index 7833d46a..cc081f6e 100644 --- a/frontend/src/components/common/NavigationBar.tsx +++ b/frontend/src/components/common/NavigationBar.tsx @@ -22,7 +22,7 @@ import { import authAPIClient from "../../APIClients/AuthAPIClient"; import AuthContext from "../../contexts/AuthContext"; -import SHOW_LOGO from "../../images/SHOW-Logo.png"; +import SHOW_LOGO from "../../images/show-logo-white.png"; const NavigationBar = (): React.ReactElement => { const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext); diff --git a/frontend/src/components/forms/CreateLog.tsx b/frontend/src/components/forms/CreateLog.tsx index 8e54bc92..4cde80b4 100644 --- a/frontend/src/components/forms/CreateLog.tsx +++ b/frontend/src/components/forms/CreateLog.tsx @@ -332,9 +332,9 @@ const CreateLog = ({ getRecords, countRecords, setUserPageNum }: Props): React.R - + - + Add Log Record @@ -453,6 +453,7 @@ const CreateLog = ({ getRecords, countRecords, setUserPageNum }: Props): React.R onChange={handleNotesChange} placeholder="Enter log notes here..." resize="vertical" + rows={6} /> Notes are required. diff --git a/frontend/src/components/forms/EditLog.tsx b/frontend/src/components/forms/EditLog.tsx index 181d70f5..e8d7565a 100644 --- a/frontend/src/components/forms/EditLog.tsx +++ b/frontend/src/components/forms/EditLog.tsx @@ -259,9 +259,9 @@ const EditLog = ({ return ( <> - + - + Edit Log Record @@ -393,6 +393,7 @@ const EditLog = ({ onChange={handleNotesChange} placeholder="Enter log notes here..." resize="vertical" + rows={6} /> Notes are required. diff --git a/frontend/src/components/forms/Login.tsx b/frontend/src/components/forms/Login.tsx index a40e3d8e..e0629575 100644 --- a/frontend/src/components/forms/Login.tsx +++ b/frontend/src/components/forms/Login.tsx @@ -8,6 +8,7 @@ import { FormErrorMessage, Input, Spinner, + Image } from "@chakra-ui/react"; import { useHistory } from "react-router-dom"; import authAPIClient from "../../APIClients/AuthAPIClient"; @@ -17,6 +18,7 @@ import AuthContext from "../../contexts/AuthContext"; import { isAuthErrorResponse, isErrorResponse } from "../../helper/error"; import UserAPIClient from "../../APIClients/UserAPIClient"; import { UserStatus } from "../../types/UserTypes"; +import SHOW_LOGO from "../../images/show-logo-colour.png"; type CredentialsProps = { email: string; @@ -159,6 +161,11 @@ const Login = ({ alignItems="center" gap="28px" > + + + + + Log In diff --git a/frontend/src/components/forms/Signup.tsx b/frontend/src/components/forms/Signup.tsx index bf5a3d97..8048f090 100644 --- a/frontend/src/components/forms/Signup.tsx +++ b/frontend/src/components/forms/Signup.tsx @@ -9,6 +9,7 @@ import { Input, Spinner, Text, + Image } from "@chakra-ui/react"; import authAPIClient from "../../APIClients/AuthAPIClient"; import { HOME_PAGE, LOGIN_PAGE } from "../../constants/Routes"; @@ -17,6 +18,7 @@ import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants"; import { isAuthErrorResponse, isErrorResponse } from "../../helper/error"; import UserAPIClient from "../../APIClients/UserAPIClient"; import { UserStatus } from "../../types/UserTypes"; +import SHOW_LOGO from "../../images/show-logo-colour.png"; type SignupProps = { email: string; @@ -212,6 +214,11 @@ const Signup = ({ alignItems="center" gap="28px" > + + + + + Sign Up diff --git a/frontend/src/components/forms/ViewLog.tsx b/frontend/src/components/forms/ViewLog.tsx index 835a1d85..bdab1c8d 100644 --- a/frontend/src/components/forms/ViewLog.tsx +++ b/frontend/src/components/forms/ViewLog.tsx @@ -56,10 +56,9 @@ const ViewLog = ({ isOpen={isOpen} scrollBehavior="inside" onClose={toggleClose} - size="xl" > - + View Log Record diff --git a/frontend/src/components/pages/Auth/ResetPasswordPage.tsx b/frontend/src/components/pages/Auth/ResetPasswordPage.tsx index 68944c99..8c8a038c 100644 --- a/frontend/src/components/pages/Auth/ResetPasswordPage.tsx +++ b/frontend/src/components/pages/Auth/ResetPasswordPage.tsx @@ -9,10 +9,12 @@ import { Input, Spinner, Text, + Image } from "@chakra-ui/react"; import AuthAPIClient from "../../../APIClients/AuthAPIClient"; import { isErrorResponse } from "../../../helper/error"; import { LOGIN_PAGE } from "../../../constants/Routes"; +import SHOW_LOGO from "../../../images/show-logo-colour.png"; const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; @@ -80,6 +82,11 @@ const ResetPasswordPage = (): React.ReactElement => { alignItems="center" gap="28px" > + + + + + {!emailSent ? ( <> diff --git a/frontend/src/components/pages/Auth/VerificationPage.tsx b/frontend/src/components/pages/Auth/VerificationPage.tsx index 6d2bc309..b698fc6b 100644 --- a/frontend/src/components/pages/Auth/VerificationPage.tsx +++ b/frontend/src/components/pages/Auth/VerificationPage.tsx @@ -1,12 +1,13 @@ import React, { useState, useContext } from "react"; import { useHistory } from "react-router-dom"; -import { Box, Button, Flex, Spinner, Text } from "@chakra-ui/react"; +import { Box, Button, Flex, Spinner, Text, Image } from "@chakra-ui/react"; import CreateToast from "../../common/Toasts"; import AuthContext from "../../../contexts/AuthContext"; import { HOME_PAGE } from "../../../constants/Routes"; import AUTHENTICATED_USER_KEY from "../../../constants/AuthConstants"; import { AuthenticatedUser } from "../../../types/AuthTypes"; import AuthAPIClient from "../../../APIClients/AuthAPIClient"; +import SHOW_LOGO from "../../../images/show-logo-colour.png"; const VerificationPage = (): React.ReactElement => { const newToast = CreateToast(); @@ -25,7 +26,7 @@ const VerificationPage = (): React.ReactElement => { setIsVerifyLoading(false); newToast( "Not Verified", - "Please check your email for the verification email.", + "Please check your email for the verification link.", "error", ); } else { @@ -75,6 +76,10 @@ const VerificationPage = (): React.ReactElement => { alignItems="center" gap="28px" > + + + + Verification diff --git a/frontend/src/images/show-logo-colour.png b/frontend/src/images/show-logo-colour.png new file mode 100644 index 0000000000000000000000000000000000000000..b2660a431f61d09f4a6470ad722c868f5d06dc1e GIT binary patch literal 29564 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 X3EN34+zd7`6HZA^UA98n{OkV#C6r?i literal 0 HcmV?d00001 diff --git a/frontend/src/images/SHOW-Logo.png b/frontend/src/images/show-logo-white.png similarity index 100% rename from frontend/src/images/SHOW-Logo.png rename to frontend/src/images/show-logo-white.png From e0a090132934ac3c56bd4f212523b6f1e9c8c79f Mon Sep 17 00:00:00 2001 From: Connor Bechthold Date: Sun, 4 Feb 2024 19:45:42 -0500 Subject: [PATCH 2/5] run ze linter --- frontend/src/components/auth/TwoFa.tsx | 4 ++-- frontend/src/components/forms/Login.tsx | 4 ++-- frontend/src/components/forms/Signup.tsx | 4 ++-- frontend/src/components/forms/ViewLog.tsx | 6 +----- frontend/src/components/pages/Auth/ResetPasswordPage.tsx | 4 ++-- frontend/src/components/pages/Auth/VerificationPage.tsx | 5 +++-- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/auth/TwoFa.tsx b/frontend/src/components/auth/TwoFa.tsx index 816bcb30..916ea46d 100644 --- a/frontend/src/components/auth/TwoFa.tsx +++ b/frontend/src/components/auth/TwoFa.tsx @@ -8,7 +8,7 @@ import { Spinner, Text, VStack, - Image + Image, } from "@chakra-ui/react"; import authAPIClient from "../../APIClients/AuthAPIClient"; import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants"; @@ -97,7 +97,7 @@ const TwoFa = ({ > - + One last step! diff --git a/frontend/src/components/forms/Login.tsx b/frontend/src/components/forms/Login.tsx index e0629575..4cf51aa9 100644 --- a/frontend/src/components/forms/Login.tsx +++ b/frontend/src/components/forms/Login.tsx @@ -8,7 +8,7 @@ import { FormErrorMessage, Input, Spinner, - Image + Image, } from "@chakra-ui/react"; import { useHistory } from "react-router-dom"; import authAPIClient from "../../APIClients/AuthAPIClient"; @@ -163,7 +163,7 @@ const Login = ({ > - + diff --git a/frontend/src/components/forms/Signup.tsx b/frontend/src/components/forms/Signup.tsx index 8048f090..bb25f9e3 100644 --- a/frontend/src/components/forms/Signup.tsx +++ b/frontend/src/components/forms/Signup.tsx @@ -9,7 +9,7 @@ import { Input, Spinner, Text, - Image + Image, } from "@chakra-ui/react"; import authAPIClient from "../../APIClients/AuthAPIClient"; import { HOME_PAGE, LOGIN_PAGE } from "../../constants/Routes"; @@ -216,7 +216,7 @@ const Signup = ({ > - + diff --git a/frontend/src/components/forms/ViewLog.tsx b/frontend/src/components/forms/ViewLog.tsx index bdab1c8d..38351211 100644 --- a/frontend/src/components/forms/ViewLog.tsx +++ b/frontend/src/components/forms/ViewLog.tsx @@ -52,11 +52,7 @@ const ViewLog = ({ return ( <> - + View Log Record diff --git a/frontend/src/components/pages/Auth/ResetPasswordPage.tsx b/frontend/src/components/pages/Auth/ResetPasswordPage.tsx index 8c8a038c..e7a7d07f 100644 --- a/frontend/src/components/pages/Auth/ResetPasswordPage.tsx +++ b/frontend/src/components/pages/Auth/ResetPasswordPage.tsx @@ -9,7 +9,7 @@ import { Input, Spinner, Text, - Image + Image, } from "@chakra-ui/react"; import AuthAPIClient from "../../../APIClients/AuthAPIClient"; import { isErrorResponse } from "../../../helper/error"; @@ -84,7 +84,7 @@ const ResetPasswordPage = (): React.ReactElement => { > - + {!emailSent ? ( diff --git a/frontend/src/components/pages/Auth/VerificationPage.tsx b/frontend/src/components/pages/Auth/VerificationPage.tsx index b698fc6b..3d96d57c 100644 --- a/frontend/src/components/pages/Auth/VerificationPage.tsx +++ b/frontend/src/components/pages/Auth/VerificationPage.tsx @@ -78,8 +78,9 @@ const VerificationPage = (): React.ReactElement => { > - - + + {" "} + Verification From 8df00e8361f475efc4f0a46d1577275c35fff8c4 Mon Sep 17 00:00:00 2001 From: Connor Bechthold Date: Sun, 4 Feb 2024 20:59:13 -0500 Subject: [PATCH 3/5] remove first and last name from sign up page --- backend/app/resources/create_user_dto.py | 6 -- backend/app/resources/register_user_dto.py | 6 -- frontend/src/APIClients/AuthAPIClient.ts | 4 +- frontend/src/components/forms/Signup.tsx | 79 +------------------ .../src/components/pages/Auth/SignupPage.tsx | 6 -- 5 files changed, 5 insertions(+), 96 deletions(-) diff --git a/backend/app/resources/create_user_dto.py b/backend/app/resources/create_user_dto.py index 0d49f34e..037ded7b 100644 --- a/backend/app/resources/create_user_dto.py +++ b/backend/app/resources/create_user_dto.py @@ -1,17 +1,11 @@ class CreateUserDTO: def __init__(self, **kwargs): - self.first_name = kwargs.get("first_name") - self.last_name = kwargs.get("last_name") self.email = kwargs.get("email") self.role = kwargs.get("role") self.password = kwargs.get("password") def validate(self): error_list = [] - if type(self.first_name) is not str: - error_list.append("The first_name supplied is not a string.") - if type(self.last_name) is not str: - error_list.append("The last_name supplied is not a string.") if type(self.email) is not str: error_list.append("The email supplied is not a string.") if type(self.role) is not str: diff --git a/backend/app/resources/register_user_dto.py b/backend/app/resources/register_user_dto.py index a663d627..af994611 100644 --- a/backend/app/resources/register_user_dto.py +++ b/backend/app/resources/register_user_dto.py @@ -1,16 +1,10 @@ class RegisterUserDTO: def __init__(self, **kwargs): - self.first_name = kwargs.get("first_name") - self.last_name = kwargs.get("last_name") self.email = kwargs.get("email") self.password = kwargs.get("password") def validate(self): error_list = [] - if type(self.first_name) is not str: - error_list.append("The first_name supplied is not a string.") - if type(self.last_name) is not str: - error_list.append("The last_name supplied is not a string.") if type(self.email) is not str: error_list.append("The email supplied is not a string.") if type(self.password) is not str: diff --git a/frontend/src/APIClients/AuthAPIClient.ts b/frontend/src/APIClients/AuthAPIClient.ts index 7d0f8801..1d3c9075 100644 --- a/frontend/src/APIClients/AuthAPIClient.ts +++ b/frontend/src/APIClients/AuthAPIClient.ts @@ -96,15 +96,13 @@ const logout = async (userId: number | undefined): Promise => { }; const register = async ( - firstName: string, - lastName: string, email: string, password: string, ): Promise => { try { const { data } = await baseAPIClient.post( "/auth/register", - { firstName, lastName, email, password }, + { email, password }, { withCredentials: true }, ); return data; diff --git a/frontend/src/components/forms/Signup.tsx b/frontend/src/components/forms/Signup.tsx index bb25f9e3..0818d5df 100644 --- a/frontend/src/components/forms/Signup.tsx +++ b/frontend/src/components/forms/Signup.tsx @@ -23,10 +23,6 @@ import SHOW_LOGO from "../../images/show-logo-colour.png"; type SignupProps = { email: string; setEmail: (email: string) => void; - firstName: string; - setFirstName: (firstName: string) => void; - lastName: string; - setLastName: (lastName: string) => void; password: string; setPassword: (password: string) => void; toggle: boolean; @@ -38,10 +34,6 @@ const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; const Signup = ({ email, setEmail, - firstName, - setFirstName, - lastName, - setLastName, password, setPassword, toggle, @@ -49,9 +41,6 @@ const Signup = ({ }: SignupProps): React.ReactElement => { const [signupClicked, setSignupClicked] = useState(false); - const [firstNameError, setFirstNameError] = useState(false); - const [lastNameError, setLastNameError] = useState(false); - const [emailError, setEmailError] = useState(false); const [emailErrorStr, setEmailErrorStr] = useState(""); @@ -62,33 +51,7 @@ const Signup = ({ const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext); const history = useHistory(); - - const handleFirstNameChange = (e: React.ChangeEvent) => { - const inputValue = e.target.value as string; - setFirstName(inputValue); - - if (signupClicked) { - if (inputValue.length === 0) { - setFirstNameError(true); - } else { - setFirstNameError(false); - } - } - }; - - const handleLastNameChange = (e: React.ChangeEvent) => { - const inputValue = e.target.value as string; - setLastName(inputValue); - - if (signupClicked) { - if (inputValue.length === 0) { - setLastNameError(true); - } else { - setLastNameError(false); - } - } - }; - + const handleEmailChange = (e: React.ChangeEvent) => { const inputValue = e.target.value as string; setEmail(inputValue); @@ -126,17 +89,7 @@ const Signup = ({ const onSignupClick = async () => { setSignupClicked(true); - if (firstNameError || lastNameError || emailError || generalError) { - return; - } - - if (firstName.length === 0) { - setFirstNameError(true); - return; - } - - if (lastName.length === 0) { - setLastNameError(true); + if (emailError || generalError) { return; } @@ -171,14 +124,12 @@ const Signup = ({ setIsLoading(false); } else if (res === UserStatus.INVITED) { const registerResponse = await authAPIClient.register( - firstName, - lastName, email, password, ); if (isAuthErrorResponse(registerResponse)) { - setEmailErrorStr(registerResponse.errMessage); - setEmailError(true); + setGeneralErrorStr(registerResponse.errMessage); + setGeneralError(true); setIsLoading(false); } else { const { requiresTwoFa, authUser } = registerResponse; @@ -222,28 +173,6 @@ const Signup = ({ Sign Up - - - - First name is required. - - - - - - Last name is required. - - { const [toggle, setToggle] = useState(true); - const [firstName, setFirstName] = useState(""); - const [lastName, setLastName] = useState(""); const [email, setEmail] = useState(""); const [password, setPassword] = useState(""); @@ -14,10 +12,6 @@ const SignupPage = (): React.ReactElement => { Date: Sun, 4 Feb 2024 21:49:31 -0500 Subject: [PATCH 4/5] nav bar automatic dropdown --- frontend/src/components/common/NavigationBar.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/common/NavigationBar.tsx b/frontend/src/components/common/NavigationBar.tsx index cc081f6e..2c497b0a 100644 --- a/frontend/src/components/common/NavigationBar.tsx +++ b/frontend/src/components/common/NavigationBar.tsx @@ -9,6 +9,7 @@ import { MenuButton, MenuItem, MenuList, + useDisclosure, } from "@chakra-ui/react"; import { @@ -26,6 +27,7 @@ import SHOW_LOGO from "../../images/show-logo-white.png"; const NavigationBar = (): React.ReactElement => { const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext); + const { isOpen, onOpen, onClose } = useDisclosure() const history = useHistory(); const navigateToHome = () => history.push(HOME_PAGE); @@ -96,16 +98,17 @@ const NavigationBar = (): React.ReactElement => { {authenticatedUser?.role === "Admin" && ( - + Admin Controls - {isMenuOpen && ( - + Employee Directory @@ -114,7 +117,6 @@ const NavigationBar = (): React.ReactElement => { Tags - )} )} From e0a7187f83fda23791c8f3eaaff2aa20b7e5a342 Mon Sep 17 00:00:00 2001 From: Connor Bechthold Date: Sun, 4 Feb 2024 21:51:24 -0500 Subject: [PATCH 5/5] run ze linter again --- .../src/components/common/NavigationBar.tsx | 25 +++++++++++-------- frontend/src/components/forms/Signup.tsx | 7 ++---- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/common/NavigationBar.tsx b/frontend/src/components/common/NavigationBar.tsx index 2c497b0a..dde2e3f8 100644 --- a/frontend/src/components/common/NavigationBar.tsx +++ b/frontend/src/components/common/NavigationBar.tsx @@ -27,7 +27,7 @@ import SHOW_LOGO from "../../images/show-logo-white.png"; const NavigationBar = (): React.ReactElement => { const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext); - const { isOpen, onOpen, onClose } = useDisclosure() + const { isOpen, onOpen, onClose } = useDisclosure(); const history = useHistory(); const navigateToHome = () => history.push(HOME_PAGE); @@ -108,15 +108,20 @@ const NavigationBar = (): React.ReactElement => { > Admin Controls - - - Employee Directory - - - Sign In Logs - - Tags - + + + Employee Directory + + + Sign In Logs + + Tags + )} diff --git a/frontend/src/components/forms/Signup.tsx b/frontend/src/components/forms/Signup.tsx index 0818d5df..300ecfdd 100644 --- a/frontend/src/components/forms/Signup.tsx +++ b/frontend/src/components/forms/Signup.tsx @@ -51,7 +51,7 @@ const Signup = ({ const { authenticatedUser, setAuthenticatedUser } = useContext(AuthContext); const history = useHistory(); - + const handleEmailChange = (e: React.ChangeEvent) => { const inputValue = e.target.value as string; setEmail(inputValue); @@ -123,10 +123,7 @@ const Signup = ({ setGeneralErrorStr("This email address is already active. Log in now!"); setIsLoading(false); } else if (res === UserStatus.INVITED) { - const registerResponse = await authAPIClient.register( - email, - password, - ); + const registerResponse = await authAPIClient.register(email, password); if (isAuthErrorResponse(registerResponse)) { setGeneralErrorStr(registerResponse.errMessage); setGeneralError(true);