diff --git a/src/actions/SlackAuthAction.js b/src/actions/SlackAuthAction.js index f827e81a2..a01b762a2 100644 --- a/src/actions/SlackAuthAction.js +++ b/src/actions/SlackAuthAction.js @@ -1,5 +1,5 @@ import makeActionCreator from '../utils/actions'; -import { push } from 'react-router-redux'; +import { replace } from 'react-router-redux'; import { client } from 'utils/ApiClient'; import auth from 'utils/auth'; @@ -25,7 +25,7 @@ export function slackAuthAsync(code) { auth.setToken(data.data.accessToken); dispatch(updateUser(data.data.user)); dispatch(updateTeam(data.data.team)); - dispatch(push('/dashboard')); + dispatch(replace('/dashboard')); }) // .catch((err) => { // dispatch(push('/error')); diff --git a/src/actions/UserActions.js b/src/actions/UserActions.js index 1ccb4c47a..3f7ae3606 100644 --- a/src/actions/UserActions.js +++ b/src/actions/UserActions.js @@ -1,5 +1,15 @@ +import { push } from 'react-router-redux'; +import auth from 'utils/auth'; + import makeActionCreator from '../utils/actions'; export const UPDATE_USER = 'UPDATE_USER'; export const updateUser = makeActionCreator(UPDATE_USER, 'user'); + +export function logoutUser() { + return (dispatch) => { + auth.logout(); + dispatch(push('/')); + }; +}; diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js index e8e149e0b..e0e07f5ec 100644 --- a/src/components/Layout/Layout.js +++ b/src/components/Layout/Layout.js @@ -1,6 +1,8 @@ import React from 'react'; import { connect } from 'react-redux'; +import HeaderMenu from './components/HeaderMenu'; + import styles from './Layout.scss'; class Layout extends React.Component { @@ -13,9 +15,9 @@ class Layout extends React.Component {