fill color changed to pink and removed blue color

This commit is contained in:
AmitChauhan63390
2024-11-16 16:43:38 +05:30
parent 0b933c3fee
commit 2a0c03d503
2 changed files with 369 additions and 249 deletions

View File

@@ -1,155 +1,197 @@
import axios from 'axios'; import axios from "axios";
import { useState, useContext, useEffect } from 'react'; import { useState, useContext, useEffect } from "react";
import { useNavigate, Link } from 'react-router-dom'; import { useNavigate, Link } from "react-router-dom";
import { AuthContext } from '../context/auth'; import { AuthContext } from "../context/auth";
import { import {
Box, Box,
Typography, Typography,
TextField, TextField,
Button, Button,
CircularProgress, CircularProgress,
} from '@mui/material'; } from "@mui/material";
import { useGlobalInfoStore } from "../context/globalInfo"; import { useGlobalInfoStore } from "../context/globalInfo";
import { apiUrl } from "../apiConfig"; import { apiUrl } from "../apiConfig";
const Login = () => { const Login = () => {
const [form, setForm] = useState({ const [form, setForm] = useState({
email: '', email: "",
password: '', password: "",
}); });
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { notify } = useGlobalInfoStore(); const { notify } = useGlobalInfoStore();
const { email, password } = form; const { email, password } = form;
const { state, dispatch } = useContext(AuthContext); const { state, dispatch } = useContext(AuthContext);
const { user } = state; const { user } = state;
const navigate = useNavigate(); const navigate = useNavigate();
useEffect(() => { useEffect(() => {
if (user) { if (user) {
navigate('/'); navigate("/");
} }
}, [user, navigate]); }, [user, navigate]);
const handleChange = (e: any) => { const handleChange = (e: any) => {
const { name, value } = e.target; const { name, value } = e.target;
setForm({ ...form, [name]: value }); setForm({ ...form, [name]: value });
}; };
const submitForm = async (e: any) => { const submitForm = async (e: any) => {
e.preventDefault(); e.preventDefault();
setLoading(true); setLoading(true);
try { try {
const { data } = await axios.post(`${apiUrl}/auth/login`, { email, password }); const { data } = await axios.post(`${apiUrl}/auth/login`, {
dispatch({ type: 'LOGIN', payload: data }); email,
notify('success', 'Welcome to Maxun!'); password,
window.localStorage.setItem('user', JSON.stringify(data)); });
navigate('/'); dispatch({ type: "LOGIN", payload: data });
} catch (err: any) { notify("success", "Welcome to Maxun!");
notify('error', err.response.data || 'Login Failed. Please try again.'); window.localStorage.setItem("user", JSON.stringify(data));
setLoading(false); navigate("/");
} } catch (err: any) {
}; notify("error", err.response.data || "Login Failed. Please try again.");
setLoading(false);
}
};
return ( return (
<Box <Box
sx={{ sx={{
display: 'flex', display: "flex",
flexDirection: 'column', flexDirection: "column",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
backgroundColor: '#f5f5f5', backgroundColor: "#f5f5f5",
height: "calc(100vh - 64px)",
}} height: "calc(100vh - 64px)",
}}
>
<Box
component="form"
onSubmit={submitForm}
sx={{
textAlign: "center",
maxWidth: 400,
width: "100%",
backgroundColor: "#fff",
padding: 3,
borderRadius: 4,
boxShadow: "0px 2px 4px rgba(0, 0, 0, 0.1)",
display: "flex",
flexDirection: "column",
}}
>
<Typography variant="h4" gutterBottom color={"#ff00c3"}>
Welcome Back!
</Typography>
<TextField
fullWidth
label="Email"
name="email"
value={email}
onChange={handleChange}
margin="normal"
variant="outlined"
required
sx={{
// Styles for the input root
"& .MuiOutlinedInput-root": {
backgroundColor: email ? "#ffe6f9" : "#ffffff", // Pinkish fill when email has value, white otherwise
"& fieldset": {
borderColor: "#ff33cc", // Pink border color
},
"&:hover fieldset": {
borderColor: "#ff33cc", // Pink border on hover
},
"&.Mui-focused fieldset": {
borderColor: "#ff33cc", // Pink border when focused
},
},
// Styles for autofill state
"& input:-webkit-autofill": {
WebkitBoxShadow: "0 0 0 1000px #ffe6f9 inset", // Pinkish autofill background
WebkitTextFillColor: "#000", // Black text color in autofill
transition: "background-color 5000s ease-in-out 0s",
},
// Styles for the label (legend)
"& .MuiInputLabel-root": {
color: email ? "#ff33cc" : "#000000", // Pink label when filled, black otherwise
},
"& .MuiInputLabel-root.Mui-focused": {
color: "#ff33cc", // Pink label when focused
},
}}
/>
<TextField
fullWidth
label="Password"
name="password"
type="password"
value={password}
onChange={handleChange}
margin="normal"
variant="outlined"
required
sx={{
// Styles for the input root
"& .MuiOutlinedInput-root": {
backgroundColor: password ? "#ffe6f9" : "#ffffff", // Pinkish fill when email has value, white otherwise
"& fieldset": {
borderColor: "#ff33cc", // Pink border color
},
"&:hover fieldset": {
borderColor: "#ff33cc", // Pink border on hover
},
"&.Mui-focused fieldset": {
borderColor: "#ff33cc", // Pink border when focused
},
},
// Styles for autofill state
"& input:-webkit-autofill": {
WebkitBoxShadow: "0 0 0 1000px #ffe6f9 inset", // Pinkish autofill background
WebkitTextFillColor: "#000", // Black text color in autofill
transition: "background-color 5000s ease-in-out 0s",
},
// Styles for the label (legend)
"& .MuiInputLabel-root": {
color: password ? "#ff33cc" : "#000000", // Pink label when filled, black otherwise
},
"& .MuiInputLabel-root.Mui-focused": {
color: "#ff33cc", // Pink label when focused
},
}}
/>
<Button
type="submit"
fullWidth
variant="contained"
color="primary"
sx={{ mt: 2, mb: 2 }}
disabled={loading || !email || !password}
> >
<Box component="form" onSubmit={submitForm} sx={{ textAlign: 'center',maxWidth: 400, width: '100%', backgroundColor: '#fff', padding: 3, borderRadius: 4,boxShadow: '0px 2px 4px rgba(0, 0, 0, 0.1)', display: 'flex', flexDirection: 'column' }}> {loading ? (
<Typography variant="h4" gutterBottom color={"#ff00c3"}> <>
Welcome Back! <CircularProgress size={20} sx={{ mr: 2 }} />
</Typography> Loading
<TextField </>
fullWidth ) : (
label="Email" "Login"
name="email" )}
value={email} </Button>
onChange={handleChange}
margin="normal"
variant="outlined"
required
sx={{
'& .MuiOutlinedInput-root': {
backgroundColor: email ? '#ffe6f9' : '#ffffff',
// backgroundColor: ' #ffe6f9', // Change fill color here
'& fieldset': {
borderColor: '#ff33cc', // Border color (optional)
},
'&:hover fieldset': {
borderColor: '#ff33cc', // Hover border color (optional)
},
'&.Mui-focused fieldset': {
borderColor: '#ff33cc', // Focus border color (optional)
},
},
}}
/>
<TextField
fullWidth
label="Password"
name="password"
type="password"
value={password}
onChange={handleChange}
margin="normal"
variant="outlined"
required
sx={{
'& .MuiOutlinedInput-root': {
backgroundColor: password ? '#ffe6f9' : '#ffffff',
// backgroundColor: ' #ffe6f9', // Change fill color here
'& fieldset': {
borderColor: '#ff33cc', // Border color (optional)
},
'&:hover fieldset': {
borderColor: '#ff33cc', // Hover border color (optional)
},
'&.Mui-focused fieldset': {
borderColor: '#ff33cc', // Focus border color (optional)
},
},
}}
/>
<Button <Typography variant="body2" align="center">
type="submit" Dont have an account?{" "}
fullWidth <Link to="/register" style={{ textDecoration: "none" }}>
variant="contained" Register
color="primary" </Link>
sx={{ mt: 2, mb: 2 }} </Typography>
disabled={loading || !email || !password} </Box>
> </Box>
{loading ? ( );
<>
<CircularProgress size={20} sx={{ mr: 2 }} />
Loading
</>
) : (
'Login'
)}
</Button>
<Typography variant="body2" align="center">
Dont have an account?{' '}
<Link to="/register" style={{ textDecoration: 'none'}}>
Register
</Link>
</Typography>
</Box>
</Box>
);
}; };
export default Login; export default Login;

View File

@@ -1,124 +1,202 @@
import { useState, useContext, useEffect } from 'react'; import { useState, useContext, useEffect } from "react";
import { useNavigate, Link } from 'react-router-dom'; import { useNavigate, Link } from "react-router-dom";
import axios from 'axios'; import axios from "axios";
import { AuthContext } from '../context/auth'; import { AuthContext } from "../context/auth";
import { TextField, Button, CircularProgress, Typography, Box, Container } from '@mui/material'; import {
TextField,
Button,
CircularProgress,
Typography,
Box,
Container,
} from "@mui/material";
import { useGlobalInfoStore } from "../context/globalInfo"; import { useGlobalInfoStore } from "../context/globalInfo";
import { apiUrl } from "../apiConfig"; import { apiUrl } from "../apiConfig";
const Register = () => { const Register = () => {
const [form, setForm] = useState({ const [form, setForm] = useState({
email: '', email: "",
password: '', password: "",
}); });
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { notify } = useGlobalInfoStore(); const { notify } = useGlobalInfoStore();
const { email, password } = form; const { email, password } = form;
const { state, dispatch } = useContext(AuthContext); const { state, dispatch } = useContext(AuthContext);
const { user } = state; const { user } = state;
const navigate = useNavigate(); const navigate = useNavigate();
useEffect(() => { useEffect(() => {
if (user !== null) navigate('/'); if (user !== null) navigate("/");
}, [user, navigate]); }, [user, navigate]);
const handleChange = (e: any) => { const handleChange = (e: any) => {
const { name, value } = e.target; const { name, value } = e.target;
setForm({ ...form, [name]: value }); setForm({ ...form, [name]: value });
}; };
const submitForm = async (e: any) => { const submitForm = async (e: any) => {
e.preventDefault(); e.preventDefault();
setLoading(true); setLoading(true);
try { try {
const { data } = await axios.post(`${apiUrl}/auth/register`, { const { data } = await axios.post(`${apiUrl}/auth/register`, {
email, email,
password, password,
}); });
dispatch({ dispatch({
type: 'LOGIN', type: "LOGIN",
payload: data, payload: data,
}); });
notify('success', 'Welcome to Maxun!'); notify("success", "Welcome to Maxun!");
window.localStorage.setItem('user', JSON.stringify(data)); window.localStorage.setItem("user", JSON.stringify(data));
navigate('/'); navigate("/");
} catch (err: any) { } catch (err: any) {
notify('error', err.response.data || 'Registration Failed. Please try again.'); notify(
} finally { "error",
setLoading(false); err.response.data || "Registration Failed. Please try again."
} );
}; } finally {
setLoading(false);
}
};
return ( return (
<Box <Box
sx={{ sx={{
display: 'flex', display: "flex",
flexDirection: 'column', flexDirection: "column",
alignItems: 'center', alignItems: "center",
justifyContent: 'center', justifyContent: "center",
height: "calc(100vh - 64px)",
backgroundColor: "#f5f5f5",
height: "calc(100vh - 64px)", }}
backgroundColor: '#f5f5f5', >
}} <Box
component="form"
onSubmit={submitForm}
sx={{
textAlign: "center",
maxWidth: 400,
width: "100%",
backgroundColor: "#fff",
padding: 3,
borderRadius: 4,
boxShadow: "0px 2px 4px rgba(0, 0, 0, 0.1)",
display: "flex",
flexDirection: "column",
}}
>
<Typography variant="h4" gutterBottom color={"#ff00c3"}>
Create an account
</Typography>
<TextField
margin="normal"
required
fullWidth
id="email"
label="Email Address"
name="email"
value={email}
onChange={handleChange}
autoComplete="email"
sx={{
// Styles for the input root
"& .MuiOutlinedInput-root": {
backgroundColor: email ? "#ffe6f9" : "#ffffff", // Pinkish fill when email has value, white otherwise
"& fieldset": {
borderColor: "#ff33cc", // Pink border color
},
"&:hover fieldset": {
borderColor: "#ff33cc", // Pink border on hover
},
"&.Mui-focused fieldset": {
borderColor: "#ff33cc", // Pink border when focused
},
},
// Styles for autofill state
"& input:-webkit-autofill": {
WebkitBoxShadow: "0 0 0 1000px #ffe6f9 inset", // Pinkish autofill background
WebkitTextFillColor: "#000", // Black text color in autofill
transition: "background-color 5000s ease-in-out 0s",
},
// Styles for the label (legend)
"& .MuiInputLabel-root": {
color: email ? "#ff33cc" : "#000000", // Pink label when filled, black otherwise
},
"& .MuiInputLabel-root.Mui-focused": {
color: "#ff33cc", // Pink label when focused
},
}}
/>
<TextField
margin="normal"
required
fullWidth
name="password"
label="Password"
type="password"
id="password"
value={password}
onChange={handleChange}
autoComplete="current-password"
sx={{
// Styles for the input root
"& .MuiOutlinedInput-root": {
backgroundColor: password ? "#ffe6f9" : "#ffffff", // Pinkish fill when email has value, white otherwise
"& fieldset": {
borderColor: "#ff33cc", // Pink border color
},
"&:hover fieldset": {
borderColor: "#ff33cc", // Pink border on hover
},
"&.Mui-focused fieldset": {
borderColor: "#ff33cc", // Pink border when focused
},
},
// Styles for autofill state
"& input:-webkit-autofill": {
WebkitBoxShadow: "0 0 0 1000px #ffe6f9 inset", // Pinkish autofill background
WebkitTextFillColor: "#000", // Black text color in autofill
transition: "background-color 5000s ease-in-out 0s",
},
// Styles for the label (legend)
"& .MuiInputLabel-root": {
color: password ? "#ff33cc" : "#000000", // Pink label when filled, black otherwise
},
"& .MuiInputLabel-root.Mui-focused": {
color: "#ff33cc", // Pink label when focused
},
}}
/>
<Button
type="submit"
fullWidth
variant="contained"
color="primary"
sx={{ mt: 3, mb: 2 }}
disabled={loading || !email || !password}
> >
{loading ? (
<Box component="form" onSubmit={submitForm} sx={{ textAlign: 'center',maxWidth: 400, width: '100%', backgroundColor: '#fff', padding: 3, borderRadius: 4,boxShadow: '0px 2px 4px rgba(0, 0, 0, 0.1)', display: 'flex', flexDirection: 'column' }}> <>
<Typography variant="h4" gutterBottom color={'#ff00c3'}> <CircularProgress size={20} sx={{ mr: 2 }} />
Create an account Loading
</Typography> </>
<TextField ) : (
margin="normal" "Register"
required )}
fullWidth </Button>
id="email" <Typography variant="body2" align="center">
label="Email Address" Already have an account?{" "}
name="email" <Link to="/login" style={{ textDecoration: "none" }}>
value={email} Login
onChange={handleChange} </Link>
autoComplete="email" </Typography>
/> </Box>
<TextField </Box>
margin="normal" );
required
fullWidth
name="password"
label="Password"
type="password"
id="password"
value={password}
onChange={handleChange}
autoComplete="current-password"
/>
<Button
type="submit"
fullWidth
variant="contained"
color="primary"
sx={{ mt: 3, mb: 2 }}
disabled={loading || !email || !password}
>
{loading ? (
<>
<CircularProgress size={20} sx={{ mr: 2 }} />
Loading
</>
) : (
'Register'
)}
</Button>
<Typography variant="body2" align="center">
Already have an account?{' '}
<Link to="/login" style={{ textDecoration: 'none' }}>
Login
</Link>
</Typography>
</Box>
</Box>
);
}; };
export default Register; export default Register;