Skip to content

Commit 38cf12a

Browse files
authored
Merge pull request #1848 from hollydo/authToMui
Changed Auth.js to MUI
2 parents 189fb23 + 3c162f5 commit 38cf12a

File tree

1 file changed

+28
-16
lines changed

1 file changed

+28
-16
lines changed

client/src/components/auth/Auth.jsx

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ import { Redirect } from 'react-router-dom';
33
import { useHistory } from 'react-router-dom';
44
import { checkUser, checkAuth } from '../../services/user.service';
55
import { authLevelRedirect } from '../../utils/authUtils';
6+
import {
7+
Typography,
8+
Button,
9+
FormControl,
10+
Box,
11+
TextField
12+
} from '@mui/material';
613

714
import useAuth from '../../hooks/useAuth';
815
import '../../sass/AdminLogin.scss';
@@ -100,29 +107,33 @@ const Auth = () => {
100107
<div className="flex-container">
101108
<div className="adminlogin-container">
102109
<div className="adminlogin-headers">
103-
<h3>Welcome Back!</h3>
110+
<Typography variant="h3" sx={{fontSize:'2.8em'}}>Welcome Back!</Typography>
104111
</div>
105-
<form
112+
<FormControl
106113
onSubmit={handleLogin}
107114
className="form-check-in"
108115
autoComplete="off"
109116
>
110117
<div className="form-row">
111118
<div className="form-input-text">
112-
<label htmlFor="email">Enter your email address:</label>
113-
<input
114-
type="email"
115-
name="email"
116-
placeholder="Email Address"
117-
onChange={handleInputChange}
118-
aria-label="Email Address"
119-
data-test="input-email"
120-
autoComplete="email"
121-
required="required"
122-
/>
119+
<Box className="form-row">
120+
<Box className="form-input-text">
121+
<TextField
122+
label = "Enter your email address:"
123+
type="email"
124+
name="email"
125+
placeholder="Email Address"
126+
required="required"
127+
onChange={handleInputChange}
128+
aria-label="Email Address"
129+
data-test="input-email"
130+
autoComplete="email"
131+
/>
132+
</Box>
133+
</Box>
123134
</div>
124135
</div>
125-
</form>
136+
</FormControl>
126137

127138
<div
128139
className="adminlogin-warning"
@@ -132,15 +143,16 @@ const Auth = () => {
132143
</div>
133144

134145
<div className="form-input-button">
135-
<button
146+
<Button
136147
type="submit"
137148
onClick={handleLogin}
138149
className="login-button"
139150
data-test="login-btn"
140151
disabled={isDisabled}
152+
sx={{color: 'black'}}
141153
>
142154
LOGIN
143-
</button>
155+
</Button>
144156
</div>
145157
</div>
146158
</div>

0 commit comments

Comments
 (0)