From 62eb5637394ba780d899c69f6287fda34d0a3b6e Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Wed, 10 Apr 2019 19:53:53 +0200 Subject: [PATCH 1/3] redirect to / after login --- js/components/Login.js | 45 ++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/js/components/Login.js b/js/components/Login.js index f447f90..868b920 100644 --- a/js/components/Login.js +++ b/js/components/Login.js @@ -1,17 +1,9 @@ -import { - Container, - Card, - CardBody, - Form, - FormGroup, - Label, - Input, - Button -} from 'reactstrap'; -import React from 'react'; -import { connect } from 'react-redux'; +import {Card, CardBody, Container, Form, FormGroup, Input, Label} from 'reactstrap'; +import React from 'react'; +import {connect} from 'react-redux'; +import Router from 'next/router'; -import { login } from '../api'; +import {login, verifyCredentials} from '../api'; export function Login(props) { return ( @@ -65,6 +57,22 @@ const VisibleLoginErrorList = connect( mapStateToErrorMessages )(LoginErrorList); +class LoginSuccessRedirectComponent extends React.Component { + render() { + if (this.props.isSignedIn) { + Router.push('/'); + } + return null; + } +} + +const mapLoginState = (state) => { + const {isSignedIn} = state.userinfo; + return {isSignedIn}; +}; + +const LoginSuccessRedirect = connect(mapLoginState)(LoginSuccessRedirectComponent); + class LoginForm extends React.Component { constructor(props) { @@ -76,9 +84,15 @@ class LoginForm extends React.Component { }; } + tryLogin(event) { + event.preventDefault(); + login(this.state.email, this.state.password); + verifyCredentials(); + } + render() { return ( -
+ @@ -87,8 +101,9 @@ class LoginForm extends React.Component { - + + ); } From 22c7e1384c9b14b6b79a2ab2b6d6f6f1db3b1d62 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Wed, 10 Apr 2019 23:56:57 +0200 Subject: [PATCH 2/3] Remove one line of nonsense --- js/components/Login.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/components/Login.js b/js/components/Login.js index 868b920..2d883e0 100644 --- a/js/components/Login.js +++ b/js/components/Login.js @@ -87,7 +87,6 @@ class LoginForm extends React.Component { tryLogin(event) { event.preventDefault(); login(this.state.email, this.state.password); - verifyCredentials(); } render() { From 99df57ecf1e341823e5610dbc6a130eab3f00c8e Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Thu, 11 Apr 2019 09:37:10 +0200 Subject: [PATCH 3/3] Remove unused import --- js/components/Login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/Login.js b/js/components/Login.js index 2d883e0..bfa99e4 100644 --- a/js/components/Login.js +++ b/js/components/Login.js @@ -3,7 +3,7 @@ import React from 'react'; import {connect} from 'react-redux'; import Router from 'next/router'; -import {login, verifyCredentials} from '../api'; +import {login} from '../api'; export function Login(props) { return (