improvement: add navlink into navbar

src/App.js

@@ -4,7 +4,7 @@ import { Container } from 'reactstrap';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import './App.css';
 import Routes from './Routes';
-import NavBar from './components/NavBar';
+import NavBar from './containers/NavBar';
 import Footer from './components/Footer';
 
 

src/containers/NavBar.js

@@ -4,6 +4,8 @@ import { connect } from 'react-redux';
 import { userActions } from '../_actions';
 import {
   Container,
+  Row,
+  NavLink,
   Collapse,
   Navbar,
   NavbarBrand,
@@ -72,17 +74,30 @@ class NavBar extends Component {
           >
 
             <Nav className="ml-auto" navbar>
-              <NavItem>
+
-                {
+              {
-                  this.props.loggedIn ? (
+                this.props.loggedIn ? (
-                    <Button
+                  <Row>
-                      onClick={this.closeNavbar}
+
-                      tag={Link}
+                    <NavItem>
-                      to="/logout"
+                      <NavLink tag={Link} to='/admin/'>Tickets</NavLink>
-                    >
+                    </NavItem>
-                      Logout
+
-                  </Button>
+                    <NavItem>
-                  ) : (
+                      <NavLink tag={Link} to='/admin/settings'>Settings</NavLink>
+                    </NavItem>
+
+                    <NavItem>
+                      <Button
+                        onClick={this.closeNavbar}
+                        tag={Link}
+                        to="/logout"
+                      >
+                        Logout
+                      </Button>
+                    </NavItem>
+                  </Row>) : (
+                    <NavItem>
                       <Button
                         onClick={this.closeNavbar}
                         tag={Link}
@@ -90,9 +105,12 @@ class NavBar extends Component {
                       >
                         Login <img src={logo} alt="admin login"></img>
                       </Button>
-                    )
+                    </NavItem>
-                }
+
-              </NavItem>
+                  )
+              }
+
+
             </Nav>
           </Collapse>
         </Container>
@@ -114,4 +132,4 @@ const mapDispatchToProps = (dispatch) => {
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps) (NavBar);
+export default connect(mapStateToProps, mapDispatchToProps)(NavBar);