diff --git a/js/api.js b/js/api.js index d178f70..7877298 100644 --- a/js/api.js +++ b/js/api.js @@ -20,8 +20,7 @@ const actiontypes_userinfo = { 'LOGIN' : 'LOGIN', 'LOGIN_RESULT_SUCCESS' : 'LOGIN_RESULT_SUCCESS', 'LOGIN_RESULT_ERROR' : 'LOGIN_RESULT_ERROR', - 'GREET' : 'GREET', - + 'CLEAR_ERRORS' : 'CLEAR_ERRORS', 'LOGOUT' : 'LOGOUT', @@ -38,7 +37,6 @@ const actiontypes_userinfo = { const defaultstate_userinfo = { isSignedIn : false, - wasGreeted : false, username : null, error : false, errorMessages : [], @@ -216,7 +214,6 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => { case actiontypes_userinfo.LOGIN_RESULT_SUCCESS: return Object.assign({}, state, { isSignedIn : true, - wasGreeted : false, error : false, errorMessages : [], username : action.parameters.username, @@ -238,10 +235,6 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => { __store.dispatch({ type : actiontypes_userinfo.CLEAR }); }); return Object.assign({}, state, {}); - case actiontypes_userinfo.GREET: - return Object.assign({}, state, { - wasGreeted : true, - }); case actiontypes_userinfo.STORE_AUTH_HEADERS: return Object.assign({}, state, { accesstoken : action.parameters.accesstoken, @@ -403,14 +396,6 @@ export function login(email, password) { }); } -export function greet() { - __store.dispatch({ - type: actiontypes_userinfo.GREET, - parameters: {}, - state: __store.getState() - }); -} - export function logout() { __store.dispatch({ type : actiontypes_userinfo.LOGOUT, diff --git a/js/components/Navigation.js b/js/components/Navigation.js index a1bbb77..b9d0775 100644 --- a/js/components/Navigation.js +++ b/js/components/Navigation.js @@ -13,8 +13,7 @@ import { import { connect } from 'react-redux'; import React from 'react'; -import {greet, logout} from '../api'; -import {notify} from "react-notify-toast"; +import { logout } from '../api'; export class TurniereNavigation extends React.Component { @@ -68,12 +67,7 @@ function Betabadge() { class InvisibleLoginLogoutButtons extends React.Component { render() { - const {isSignedIn, username, wasGreeted} = this.props; - - if (isSignedIn && !wasGreeted) { - notify.show('Willkommen, ' + username + '!', 'success', 3000); - greet(); - } + const { isSignedIn, username } = this.props; if(isSignedIn) { return ( @@ -94,8 +88,8 @@ class InvisibleLoginLogoutButtons extends React.Component { } const mapStateToLoginLogoutButtonProperties = (state) => { - const {isSignedIn, username, wasGreeted} = state.userinfo; - return {isSignedIn, username, wasGreeted}; + const { isSignedIn, username } = state.userinfo; + return { isSignedIn, username }; }; const LoginLogoutButtons = connect(