Merge branch 'master' of github.com:YutHelloWorld/vortex-react

Author: Sven

src/layouts/components/Navbar.js

@@ -17,6 +17,12 @@ export default class CustomNavbar extends Component {
       isOpen: !this.state.isOpen
     })
   }
+
+  signOut = () => {
+    this.props.signOut()
+    localStorage.setItem('LoginState', 'false')
+  }
+
   render() {
     return (
       <Navbar color="faded" light toggleable>
@@ -29,7 +35,7 @@ export default class CustomNavbar extends Component {
             <NavLink to="/elapse" tag={Link}>Elapse</NavLink>
             <NavLink to="/route/8080" tag={Link}>Route</NavLink>
             <NavLink to="/pageNotFound" tag={Link}>404</NavLink>
-            <NavLink href="javascript:;" onClick={this.props.signOut}>Sign out</NavLink>
+            <NavLink href="javascript:;" onClick={this.signOut}>Sign out</NavLink>
             <NavLink href="https://github.com/YutHelloWorld/vortex-react">Github</NavLink>
           </Nav>
         </Collapse>

src/routes/Login/components/Login.js

@@ -7,23 +7,20 @@ export default class Login extends Component {
   static propTypes = {
     authenticateWithCb: PropTypes.func.isRequired,
     location: PropTypes.object.isRequired,
-  }
-
-  state = {
-    redirectToReferrer: false
+    isAuthenticated: PropTypes.bool.isRequired,
   }
 
   login = () => {
     this.props.authenticateWithCb(() => {
-      this.setState({ redirectToReferrer: true })
+      localStorage.setItem('LoginState', 'true')
     })
   }
 
   render() {
     const { from } = this.props.location.state || { from: { pathname: '/' } }
-    const { redirectToReferrer } = this.state
+    const { isAuthenticated } = this.props
 
-    if (redirectToReferrer) {
+    if (isAuthenticated) {
       return (
         <Redirect to={from} />
       )

src/routes/Login/containers/LoginContainer.js

@@ -3,7 +3,7 @@ import Login from '../components/Login'
 import { authenticateWithCb } from 'store/fakeAuth'
 
 const mapStateToProps = (state) => ({
-
+  isAuthenticated: state.isAuthenticated
 })
 
 const mapDispatchToProps = {

src/store/fakeAuth.js

@@ -25,7 +25,8 @@ const ACTION_HANDLERS = {
   [SIGN_OUT]: state => false,
 }
 
-const initialState = false
+const initialState = !(localStorage.getItem('LoginState') == null ||
+  localStorage.getItem('LoginState') === 'false')
 
 export default function (state = initialState, action) {
   const handler = ACTION_HANDLERS[action.type]