parent
8fdf0680ba
commit
c1444da64f
|
|
@ -52,7 +52,6 @@ class Layout extends Component {
|
||||||
loggedIn: CurrentUserStore.isLoggedIn(),
|
loggedIn: CurrentUserStore.isLoggedIn(),
|
||||||
admin: CurrentUserStore.isAdmin(),
|
admin: CurrentUserStore.isAdmin(),
|
||||||
name: CurrentUserStore.getName(),
|
name: CurrentUserStore.getName(),
|
||||||
loginFailed: CurrentUserStore.isLoginFailed(),
|
|
||||||
version: Layout.defaultVersion,
|
version: Layout.defaultVersion,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -79,7 +78,6 @@ class Layout extends Component {
|
||||||
...this.state,
|
...this.state,
|
||||||
loggedIn: CurrentUserStore.isLoggedIn(),
|
loggedIn: CurrentUserStore.isLoggedIn(),
|
||||||
admin: CurrentUserStore.isAdmin(),
|
admin: CurrentUserStore.isAdmin(),
|
||||||
loginFailed: CurrentUserStore.isLoginFailed(),
|
|
||||||
name: CurrentUserStore.getName(),
|
name: CurrentUserStore.getName(),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
@ -88,7 +86,7 @@ class Layout extends Component {
|
||||||
showSettings = () => this.setState({...this.state, showSettings: true});
|
showSettings = () => this.setState({...this.state, showSettings: true});
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {name, admin, version, loggedIn, showSettings, loginFailed} = this.state;
|
const {name, admin, version, loggedIn, showSettings} = this.state;
|
||||||
const {classes} = this.props;
|
const {classes} = this.props;
|
||||||
const theme = this.state.darkTheme ? darkTheme : lightTheme;
|
const theme = this.state.darkTheme ? darkTheme : lightTheme;
|
||||||
return (
|
return (
|
||||||
|
|
@ -105,7 +103,7 @@ class Layout extends Component {
|
||||||
<main className={classes.content}>
|
<main className={classes.content}>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path="/login" render={() =>
|
<Route exact path="/login" render={() =>
|
||||||
(loggedIn ? (<Redirect to="/"/>) : (<Login loginFailed={loginFailed}/>))}/>
|
(loggedIn ? (<Redirect to="/"/>) : (<Login/>))}/>
|
||||||
{(loggedIn || getToken() != null) ? null : <Redirect to="/login"/>}
|
{(loggedIn || getToken() != null) ? null : <Redirect to="/login"/>}
|
||||||
<Route exact path="/" component={Messages}/>
|
<Route exact path="/" component={Messages}/>
|
||||||
<Route exact path="/messages/:id" component={Messages}/>
|
<Route exact path="/messages/:id" component={Messages}/>
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,7 @@ export function login(username, password) {
|
||||||
snack(`A client named '${name}' was created for your session.`);
|
snack(`A client named '${name}' was created for your session.`);
|
||||||
setAuthorizationToken(resp.data.token);
|
setAuthorizationToken(resp.data.token);
|
||||||
GlobalAction.initialLoad();
|
GlobalAction.initialLoad();
|
||||||
}).catch(() => {
|
}).catch(() => snack('Login failed'));
|
||||||
snack('Login failed');
|
|
||||||
dispatcher.dispatch({type: 'LOGIN_FAILED'});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Log the user out. */
|
/** Log the user out. */
|
||||||
|
|
|
||||||
|
|
@ -2,17 +2,11 @@ import React, {Component} from 'react';
|
||||||
import Button from 'material-ui/Button';
|
import Button from 'material-ui/Button';
|
||||||
import Grid from 'material-ui/Grid';
|
import Grid from 'material-ui/Grid';
|
||||||
import TextField from 'material-ui/TextField';
|
import TextField from 'material-ui/TextField';
|
||||||
import Typography from 'material-ui/Typography';
|
|
||||||
import Container from '../component/Container';
|
import Container from '../component/Container';
|
||||||
import * as UserAction from '../actions/UserAction';
|
import * as UserAction from '../actions/UserAction';
|
||||||
import DefaultPage from '../component/DefaultPage';
|
import DefaultPage from '../component/DefaultPage';
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
|
|
||||||
class Login extends Component {
|
class Login extends Component {
|
||||||
static propTypes = {
|
|
||||||
loginFailed: PropTypes.bool.isRequired,
|
|
||||||
};
|
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
this.state = {username: '', password: ''};
|
this.state = {username: '', password: ''};
|
||||||
|
|
@ -28,7 +22,6 @@ class Login extends Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {username, password} = this.state;
|
const {username, password} = this.state;
|
||||||
const {loginFailed} = this.props;
|
|
||||||
return (
|
return (
|
||||||
<DefaultPage title="Login" maxWidth={250} hideButton={true}>
|
<DefaultPage title="Login" maxWidth={250} hideButton={true}>
|
||||||
<Grid item xs={12} style={{textAlign: 'center'}}>
|
<Grid item xs={12} style={{textAlign: 'center'}}>
|
||||||
|
|
@ -42,7 +35,6 @@ class Login extends Component {
|
||||||
style={{marginTop: 15, marginBottom: 5}} onClick={this.login}>
|
style={{marginTop: 15, marginBottom: 5}} onClick={this.login}>
|
||||||
Login
|
Login
|
||||||
</Button>
|
</Button>
|
||||||
{loginFailed && <Typography>Login Failed</Typography>}
|
|
||||||
</form>
|
</form>
|
||||||
</Container>
|
</Container>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,6 @@ class CurrentUserStore extends EventEmitter {
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
this.currentUser = null;
|
this.currentUser = null;
|
||||||
this.loginFailed = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
isLoginFailed() {
|
|
||||||
return this.loginFailed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
get() {
|
get() {
|
||||||
|
|
@ -35,14 +30,9 @@ class CurrentUserStore extends EventEmitter {
|
||||||
|
|
||||||
handle(data) {
|
handle(data) {
|
||||||
if (data.type === 'REMOVE_CURRENT_USER') {
|
if (data.type === 'REMOVE_CURRENT_USER') {
|
||||||
this.loginFailed = false;
|
|
||||||
this.set(null);
|
this.set(null);
|
||||||
} else if (data.type === 'SET_CURRENT_USER') {
|
} else if (data.type === 'SET_CURRENT_USER') {
|
||||||
this.loginFailed = false;
|
|
||||||
this.set(data.payload);
|
this.set(data.payload);
|
||||||
} else if (data.type === 'LOGIN_FAILED') {
|
|
||||||
this.loginFailed = true;
|
|
||||||
this.emit('change');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue