diff --git a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx index ed991228..c7b37a07 100644 --- a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx +++ b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx @@ -1,4 +1,5 @@ import { useTypedDispatch } from '@Store/hooks'; +import { useNavigate } from 'react-router-dom'; import { FlexColumn, FlexRow } from '@Components/common/Layouts'; import { Button } from '@Components/RadixComponents/Button'; import Image from '@Components/RadixComponents/Image'; @@ -12,6 +13,7 @@ import { slideVariants } from '@Constants/animations'; export default function SignInOverlay() { const dispatch = useTypedDispatch(); + const navigate = useNavigate(); return (
Project Creator
- @@ -48,7 +57,14 @@ export default function SignInOverlay() { >
Drone Operator
- diff --git a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx index 72738505..f8da99c3 100644 --- a/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx +++ b/src/frontend/src/modules/user-auth-module/src/components/Authentication/Login/index.tsx @@ -11,7 +11,7 @@ import { Button } from '@Components/RadixComponents/Button'; import Icon from '@Components/common/Icon'; import { Flex, FlexRow } from '@Components/common/Layouts'; import Person from '@Assets/images/person.svg'; -import { useTypedDispatch } from '@Store/hooks'; +import { useTypedDispatch, useTypedSelector } from '@Store/hooks'; import { signInGoogle, signInUser } from '@Services/common'; import { setUserState } from '@UserModule/store/actions/user'; import googleIcon from '@Assets/images/google-icon.svg'; @@ -32,6 +32,7 @@ export default function Login() { const handleShow = () => { return setShowPassword(prev => !prev); }; + const signInAs = useTypedSelector(state => state.common.signInAs); const { mutate, isLoading } = useMutation({ mutationFn: signInUser, @@ -72,7 +73,7 @@ export default function Login() { " > -

Sign In

+

Sign In - {signInAs}

{/* google login button */}