From fb60751c1d0741afc4e0b394a461e23532766ec2 Mon Sep 17 00:00:00 2001 From: Courtneyc1 <126171978+courtneyc1@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:46:10 -0500 Subject: [PATCH] merge changes for AuthLogin with master --- frontend/src/pages/AuthLogin/AuthLogin.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/pages/AuthLogin/AuthLogin.tsx b/frontend/src/pages/AuthLogin/AuthLogin.tsx index e874e010f..078f5e9cc 100644 --- a/frontend/src/pages/AuthLogin/AuthLogin.tsx +++ b/frontend/src/pages/AuthLogin/AuthLogin.tsx @@ -1,10 +1,11 @@ import { AlertTitle } from '@mui/material'; import React, { useEffect, useState } from 'react'; -import { Link } from 'react-router-dom'; import { AuthForm } from 'components'; -import { Button } from '@trussworks/react-uswds'; import { useAuthContext } from 'context'; import { Alert } from '@mui/material'; +import { Button } from '@trussworks/react-uswds'; +import { Box, Link, Typography } from '@mui/material'; +import { RegisterForm } from 'components/Register/RegisterForm'; import { Authenticator, ThemeProvider, @@ -29,7 +30,7 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({ }) => { const { apiPost, refreshUser } = useAuthContext(); const [errors, setErrors] = useState({}); - + const [open, setOpen] = useState(false); // Once a user signs in, call refreshUser() so that the callback is called and the user gets signed in. const { authStatus } = useAuthenticator((context) => [context.isPending]); useEffect(() => { @@ -151,13 +152,13 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({

Welcome to Crossfeed

{errors.global &&

{errors.global}

} -
New to Crossfeed? Register with Login.gov
- {open && } + {open && }