Skip to content

enable enter key submission on login #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angela-lee1 merged 6 commits into from
May 28, 2025
Merged

enable enter key submission on login #1933

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c75265
enable enter key submission on login
angela-lee1 May 18, 2025
ae66eb9
Merge branch 'development' into enable-enter-key-submission-on-login-…
trillium May 20, 2025
bb893cd
wrap FormControl with form
angela-lee1 May 20, 2025
2338d09
Merge branch 'development' into enable-enter-key-submission-on-login-…
angela-lee1 May 20, 2025
c640e14
Merge remote-tracking branch 'origin/enable-enter-key-submission-on-l…
angela-lee1 May 20, 2025
cf47f3c
Merge branch 'development' into enable-enter-key-submission-on-login-…
trillium May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions client/src/components/auth/Auth.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ import { Redirect } from 'react-router-dom';
import { useHistory } from 'react-router-dom';
import { checkUser, checkAuth } from '../../services/user.service';
import { authLevelRedirect } from '../../utils/authUtils';
import {
Typography,
Button,
FormControl,
Box,
TextField
} from '@mui/material';
import { Typography, Button, FormControl, Box, TextField } from '@mui/material';

import useAuth from '../../hooks/useAuth';
import '../../sass/AdminLogin.scss';
Expand Down Expand Up @@ -107,33 +101,37 @@ const Auth = () => {
<div className="flex-container">
<div className="adminlogin-container">
<div className="adminlogin-headers">
<Typography variant="h3" sx={{fontSize:'2.8em'}}>Welcome Back!</Typography>
<Typography variant="h3" sx={{ fontSize: '2.8em' }}>
Welcome Back!
</Typography>
</div>
<FormControl
<form
onSubmit={handleLogin}
className="form-check-in"
autoComplete="off"
>
<div className="form-row">
<div className="form-input-text">
<Box className="form-row">
<Box className="form-input-text">
<FormControl>
<div className="form-row">
<div className="form-input-text">
<Box className="form-row">
<Box className="form-input-text">
<TextField
label = "Enter your email address:"
type="email"
name="email"
placeholder="Email Address"
required="required"
onChange={handleInputChange}
aria-label="Email Address"
data-test="input-email"
autoComplete="email"
/>
</Box>
label="Enter your email address:"
type="email"
name="email"
placeholder="Email Address"
required="required"
onChange={handleInputChange}
aria-label="Email Address"
data-test="input-email"
autoComplete="email"
/>
</Box>
</Box>
</div>
</div>
</div>
</FormControl>
</FormControl>
</form>

<div
className="adminlogin-warning"
Expand All @@ -149,7 +147,7 @@ const Auth = () => {
className="login-button"
data-test="login-btn"
disabled={isDisabled}
sx={{color: 'black'}}
sx={{ color: 'black' }}
>
LOGIN
</Button>
Expand Down
Loading