Fixed navbar and some other issues

elevenpassin · Dec 26, 2017 · 311ff6c · 311ff6c
1 parent c2df622
commit 311ff6c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -5,11 +5,14 @@ import './App.css';
 
 import { Route } from 'react-router-dom';
 
-import Account from './pages/Account.jsx';
-
+// Components
 import Blogposts from './components/Blogposts.jsx';
 import Navbar from './components/Navbar.jsx';
 
+// Pages
+import Signin from './pages/Signin.jsx';
+import Dashboard from './pages/Dashboard.jsx';
+
 class App extends Component {
   constructor(props) {
     super(props);
@@ -36,7 +39,7 @@ class App extends Component {
         </header>
         <Route exact path="/" component={Blogposts} />
         <Route exact path="/account" render={(props) => (
-          this.state.auth === false ? <Account setAuth={this.setAuth} {...props} /> : null
+          this.state.auth === false ? <Signin setAuth={this.setAuth} {...props} /> : <Dashboard />
         )} />
       </div>
     );

diff --git a/client/src/components/Navbar.jsx b/client/src/components/Navbar.jsx
@@ -23,8 +23,11 @@ export default class Navbar extends Component {
     if (e.key === "signout") {
       this.props.setAuth(false);
       this.props.history.push('/');
+      this.setState({ current: '/' });
+    } else {
+      this.setState({ current: e.key });
     }
-    this.setState({ current: e.key });
+
   }
 
   render() {
@@ -52,7 +55,9 @@ export default class Navbar extends Component {
                 </Link>
               </Menu.Item>
               <Menu.Item key="signout" >
+                <Link to={"/"}>
                   Sign out
+                </Link>
               </Menu.Item>
             </SubMenu>
           ) : (

diff --git a/client/src/pages/Dashboard.jsx b/client/src/pages/Dashboard.jsx
@@ -0,0 +1,11 @@
+import React, { Component } from 'react'
+
+export default class Dashboard extends Component {
+  render() {
+    return (
+      <div>
+        Dashboard goes here
+      </div>
+    )
+  }
+}
diff --git a/client/src/pages/Account.jsx → client/src/pages/Signin.jsx b/client/src/pages/Account.jsx → client/src/pages/Signin.jsx