theoludwig/FunctionProject
Archived
1
1
Fork 0
Code Pull Requests Actions Releases Activity

Hotfix: withoutAuth + ajustements UserContext

Browse Source
This commit is contained in:
Divlo
2020-04-08 15:26:18 +02:00
parent 5d048f3010
commit ca0c77a522
7 changed files with 75 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
website/pages/login.js
View File

@ -5,13 +5,14 @@ import htmlParser from 'html-react-parser';
import Loader from '../components/Loader';
import HeadTag from '../components/HeadTag';
import { UserContext } from '../contexts/UserContext';
import redirect from '../utils/redirect';
import '../public/css/pages/register-login.css';
const Login = () => {
const router = useRouter();
const [inputState, setInputState] = useState({});
const { loginUser, messageLogin, loginLoading } = useContext(UserContext);
const router = useRouter();
const [inputState, setInputState] = useState({});
const { loginUser, messageLogin, loginLoading, isAuth } = useContext(UserContext);
const handleChange = (event) => {
const inputStateNew = { ...inputState };
@ -19,9 +20,14 @@ const Login = () => {
setInputState(inputStateNew);
}
const handleSubmit = (event) => {
const handleSubmit = async (event) => {
event.preventDefault();
loginUser(inputState);
if (!isAuth) {
const loginObject = await loginUser(inputState);
if (loginObject.isSuccess) {
redirect({}, `/profile/${loginObject.newUser.name}`);
}
}
}
return (

6
website/pages/profile/[name].js
View File

@ -21,7 +21,7 @@ const Profile = (props) => {
const publicationDate = `${('0'+createdAt.getDate()).slice(-2)}/${('0'+(createdAt.getMonth()+1)).slice(-2)}/${createdAt.getFullYear()}`;
const { isAuth, user, logoutUser } = useContext(UserContext);
const [isOpen, setIsOpen] = useState(false);
const [isOpen, setIsOpen] = useState(false);
let defaultInputState = {};
if (isAuth) {
@ -81,7 +81,7 @@ const Profile = (props) => {
<FontAwesomeIcon icon={faTimes} style={{ width: '1.5rem', color: 'red' }} />
</span>
<h2 className="text-center">Éditer le profil</h2>
<p className="text-center"><em>(Vous devrez vous reconnecter après la sauvegarde) <br/> Si vous changez votre adresse email, vous devrez la confirmer (vérifier vos emails).</em></p>
<p className="text-center"><em>(Vous devrez vous reconnecter après la sauvegarde) <br/> Si vous changez votre adresse email, vous devrez la confirmer comme à l'inscription (vérifier vos emails).</em></p>
</div>
</div>
</div>
@ -110,7 +110,7 @@ const Profile = (props) => {
<div className="form-group">
<label className="form-label" htmlFor="logo">Logo <em>(400x400 recommandé)</em> :</label>
<br/>
<p style={{ margin: 0 }}><em>Si aucun fichier est choisi, le logo ne sera pas modifié.</em></p>
<input onChange={handleChange} accept="image/jpeg,image/jpg,image/png,image/gif" type="file" name="logo" id="logo" />
</div>

5
website/pages/register.js
View File

@ -2,8 +2,9 @@ import { Fragment, useState } from 'react';
import htmlParser from 'html-react-parser';
import Loader from '../components/Loader';
import HeadTag from '../components/HeadTag';
import '../public/css/pages/register-login.css';
import api from '../utils/api';
import withoutAuth from '../hoc/withoutAuth';
import '../public/css/pages/register-login.css';
const Register = () => {
@ -76,4 +77,4 @@ const Register = () => {
</Fragment>
);
}
export default Register;
export default withoutAuth(Register);