Merge branch 'development' into lucie-1699-eventform-mui

hackforla · Feb 7, 2025 · e533d65 · e533d65
2 parents ee5c537 + 38cf12a
commit e533d65
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/client/src/components/auth/Auth.jsx b/client/src/components/auth/Auth.jsx
@@ -3,6 +3,13 @@ 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 useAuth from '../../hooks/useAuth';
 import '../../sass/AdminLogin.scss';
@@ -100,29 +107,33 @@ const Auth = () => {
     <div className="flex-container">
       <div className="adminlogin-container">
         <div className="adminlogin-headers">
-          <h3>Welcome Back!</h3>
+        <Typography variant="h3" sx={{fontSize:'2.8em'}}>Welcome Back!</Typography>
         </div>
-        <form
+        <FormControl
           onSubmit={handleLogin}
           className="form-check-in"
           autoComplete="off"
         >
           <div className="form-row">
             <div className="form-input-text">
-              <label htmlFor="email">Enter your email address:</label>
-              <input
-                type="email"
-                name="email"
-                placeholder="Email Address"
-                onChange={handleInputChange}
-                aria-label="Email Address"
-                data-test="input-email"
-                autoComplete="email"
-                required="required"
-              />
+            <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>
+                </Box>
             </div>
           </div>
-        </form>
+        </FormControl>
 
         <div
           className="adminlogin-warning"
@@ -132,15 +143,16 @@ const Auth = () => {
         </div>
 
         <div className="form-input-button">
-          <button
+          <Button
             type="submit"
             onClick={handleLogin}
             className="login-button"
             data-test="login-btn"
             disabled={isDisabled}
+            sx={{color: 'black'}}
           >
             LOGIN
-          </button>
+          </Button>
         </div>
       </div>
     </div>