diff --git a/client/src/assets/Iconfacebook.png b/client/src/assets/Iconfacebook.png new file mode 100644 index 0000000..aa21d3a Binary files /dev/null and b/client/src/assets/Iconfacebook.png differ diff --git a/client/src/assets/Icongoogle.png b/client/src/assets/Icongoogle.png new file mode 100644 index 0000000..79ee307 Binary files /dev/null and b/client/src/assets/Icongoogle.png differ diff --git a/client/src/components/Navbar/index.js b/client/src/components/Navbar/index.js index 6a65b19..7c17076 100644 --- a/client/src/components/Navbar/index.js +++ b/client/src/components/Navbar/index.js @@ -24,9 +24,9 @@ function NavBar() { top: '50%', left: '50%', transform: 'translate(-50%, -50%)', - width: 800, + width: 650, bgcolor: 'background.paper', - // border: '2px solid #000', + borderRadius: 3, boxShadow: 24, p: 4, }; @@ -72,11 +72,9 @@ function NavBar() { marginRight: '30px', alignSelf: 'center', backgroundColor: '#3781CB', color: '#FFFFFF', textTransform: 'none', }} > - {' '} - {/* */} - {/* */} - - {/* */} + + + {logged ? ( diff --git a/client/src/components/login/index.jsx b/client/src/components/login/index.jsx index 0ba8c97..9c38b30 100644 --- a/client/src/components/login/index.jsx +++ b/client/src/components/login/index.jsx @@ -1,17 +1,15 @@ /* eslint-disable no-unused-vars */ -/* eslint-disable no-console */ import { useState } from 'react'; import { Grid, Paper, Avatar, TextField, Button, Typography, } from '@mui/material'; import { useHistory, Link } from 'react-router-dom'; -import FormControlLabel from '@mui/material/FormControlLabel'; -import Checkbox from '@mui/material/Checkbox'; import PropTypes from 'prop-types'; import axios from 'axios'; +import Facebook from '../../assets/Iconfacebook.png'; +import Google from '../../assets/Icongoogle.png'; const Login = ({ handleClose, setLogged }) => { - // console.log(handleClose); const history = useHistory(); const [data, setData] = useState({ email: '', password: '' }); const [error, setError] = useState({ email: false, password: false }); @@ -21,21 +19,42 @@ const Login = ({ handleClose, setLogged }) => { const { email, password } = data; const marginBtm = { marginBottom: 10 }; - const avatarStyle = { backgroundColor: '#1bbd7e' }; const btnstyle = { margin: '8px 0', backgroundColor: '#CBA41B', }; - const btnTopstyle = { + const loginWithSocialMedia = { margin: '8px ', backgroundColor: '#2E72DB', + display: 'flex', + flexDirection: 'row', + justifyContent: 'space-between', + textTransform: 'none', }; - const box = { - border: '1px solid red', + const loginWithEmail = { width: '50%', display: 'flex', flexDirection: 'column', + }; + const Container = { + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + boxShadow: 'none', + + }; + const containerBtn = { + width: '90%', + display: 'flex', + alignItems: 'center', + + }; + const avatar = { + borderRadius: 0, + width: '30px', + height: '30px', + }; const handleError = (callback) => { @@ -57,7 +76,6 @@ const Login = ({ handleClose, setLogged }) => { }; const handleSubmit = (e) => { - // console.log('yes'); e.preventDefault(); handleError(() => { axios.post('/api/v1/user/login', { @@ -76,24 +94,28 @@ const Login = ({ handleClose, setLogged }) => { }; return ( - +

Welcome Back

- - - - - + + + OR + + + { placeholder="Enter password" type="password" name="password" - fullWidth required error={!!error.password} onChange={handleChange} @@ -121,17 +142,15 @@ const Login = ({ handleClose, setLogged }) => { {LoginError} - {/* */} - {/* */} - - - Forgot password ? - - + {/* */} + + Forgot password ? + + {/* */} Do you have an account ? - + Sign Up