colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove login failed event 

It got replaced by a snack.
This commit is contained in:
Jannis Mattheis 2018-03-31 18:58:32 +02:00 committed by Jannis Mattheis
parent 8fdf0680ba
commit c1444da64f
4 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/Layout.js
View File

@ -52,7 +52,6 @@ class Layout extends Component {
loggedIn: CurrentUserStore.isLoggedIn(),
admin: CurrentUserStore.isAdmin(),
name: CurrentUserStore.getName(),
loginFailed: CurrentUserStore.isLoginFailed(),
version: Layout.defaultVersion,
};
@ -79,7 +78,6 @@ class Layout extends Component {
...this.state,
loggedIn: CurrentUserStore.isLoggedIn(),
admin: CurrentUserStore.isAdmin(),
loginFailed: CurrentUserStore.isLoginFailed(),
name: CurrentUserStore.getName(),
});
};
@ -88,7 +86,7 @@ class Layout extends Component {
showSettings = () => this.setState({...this.state, showSettings: true});
render() {
const {name, admin, version, loggedIn, showSettings, loginFailed} = this.state;
const {name, admin, version, loggedIn, showSettings} = this.state;
const {classes} = this.props;
const theme = this.state.darkTheme ? darkTheme : lightTheme;
return (
@ -105,7 +103,7 @@ class Layout extends Component {
<main className={classes.content}>
<Switch>
<Route exact path="/login" render={() =>
(loggedIn ? (<Redirect to="/"/>) : (<Login loginFailed={loginFailed}/>))}/>
(loggedIn ? (<Redirect to="/"/>) : (<Login/>))}/>
{(loggedIn || getToken() != null) ? null : <Redirect to="/login"/>}
<Route exact path="/" component={Messages}/>
<Route exact path="/messages/:id" component={Messages}/>

5
ui/src/actions/UserAction.js
View File

@ -23,10 +23,7 @@ export function login(username, password) {
snack(`A client named '${name}' was created for your session.`);
setAuthorizationToken(resp.data.token);
GlobalAction.initialLoad();
}).catch(() => {
snack('Login failed');
dispatcher.dispatch({type: 'LOGIN_FAILED'});
});
}).catch(() => snack('Login failed'));
}
/** Log the user out. */

8
ui/src/pages/Login.js
View File

@ -2,17 +2,11 @@ import React, {Component} from 'react';
import Button from 'material-ui/Button';
import Grid from 'material-ui/Grid';
import TextField from 'material-ui/TextField';
import Typography from 'material-ui/Typography';
import Container from '../component/Container';
import * as UserAction from '../actions/UserAction';
import DefaultPage from '../component/DefaultPage';
import PropTypes from 'prop-types';
class Login extends Component {
static propTypes = {
loginFailed: PropTypes.bool.isRequired,
};
constructor() {
super();
this.state = {username: '', password: ''};
@ -28,7 +22,6 @@ class Login extends Component {
render() {
const {username, password} = this.state;
const {loginFailed} = this.props;
return (
<DefaultPage title="Login" maxWidth={250} hideButton={true}>
<Grid item xs={12} style={{textAlign: 'center'}}>
@ -42,7 +35,6 @@ class Login extends Component {
style={{marginTop: 15, marginBottom: 5}} onClick={this.login}>
Login
</Button>
{loginFailed && <Typography>Login Failed</Typography>}
</form>
</Container>
</Grid>

10
ui/src/stores/CurrentUserStore.js
View File

@ -5,11 +5,6 @@ class CurrentUserStore extends EventEmitter {
constructor() {
super();
this.currentUser = null;
this.loginFailed = false;
}
isLoginFailed() {
return this.loginFailed;
}
get() {
@ -35,14 +30,9 @@ class CurrentUserStore extends EventEmitter {
handle(data) {
if (data.type === 'REMOVE_CURRENT_USER') {
this.loginFailed = false;
this.set(null);
} else if (data.type === 'SET_CURRENT_USER') {
this.loginFailed = false;
this.set(data.payload);
} else if (data.type === 'LOGIN_FAILED') {
this.loginFailed = true;
this.emit('change');
}
}
}