From 539594cf7038b5ac4323e58339a90160e46a02e5 Mon Sep 17 00:00:00 2001 From: mohammedsalah7 Date: Mon, 8 Nov 2021 16:27:47 +0200 Subject: [PATCH] edit style login component #64 --- client/src/assets/Iconfacebook.png | Bin 0 -> 2827 bytes client/src/assets/Icongoogle.png | Bin 0 -> 3010 bytes client/src/components/Navbar/index.js | 12 ++--- client/src/components/login/index.jsx | 73 ++++++++++++++++---------- 4 files changed, 51 insertions(+), 34 deletions(-) create mode 100644 client/src/assets/Iconfacebook.png create mode 100644 client/src/assets/Icongoogle.png diff --git a/client/src/assets/Iconfacebook.png b/client/src/assets/Iconfacebook.png new file mode 100644 index 0000000000000000000000000000000000000000..aa21d3a28effc2afb02971a77c2f3909069255f3 GIT binary patch literal 2827 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 literal 0 HcmV?d00001 diff --git a/client/src/assets/Icongoogle.png b/client/src/assets/Icongoogle.png new file mode 100644 index 0000000000000000000000000000000000000000..79ee307f949027be75dac0edc093e1da7fba20c9 GIT binary patch literal 3010 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 - {' '} - {/* */} - {/* */} - - {/* */} + + + {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