big stuffs here

3 files changed, 11 insertions, 8 deletions

diff --git a/client/src/components/App.js b/client/src/components/App.js
index 270e199..b903a4b 100644
--- a/client/src/components/App.js
+++ b/client/src/components/App.js
@@ -5,6 +5,7 @@ import fetch from 'node-fetch';
 import NavigationBar from './navigation/NavigationBar';
 import ServerSelection from '../pages/ServerSelection';
 import ManageServer from '../pages/ManageServer';
+import CommandsList from '../pages/CommandsList';
 
 export default class App extends Component {
     state = {
@@ -22,7 +23,7 @@ export default class App extends Component {
             this.setState({
                 loading: false,
                 user: res
-            })
+            });
         })
         .catch(() => this.setState({ loading: false }));
     }
@@ -32,7 +33,7 @@ export default class App extends Component {
             return(
                 <React.Fragment>
                     <div className="container">
-                        <h1>Loading...</h1>
+                        <NavigationBar user="Loading" />
                     </div>
                 </React.Fragment>
             );
@@ -48,8 +49,9 @@ export default class App extends Component {
                             
                             <br />
                             
-                            <Route exact path="/" render={(props) => <ServerSelection {...props} user={this.state.user} /> } />
+                            <Route exact path="/dashboard" render={(props) => <ServerSelection {...props} user={this.state.user} /> } />
                             <Route exact path="/server/:id" render={(props) => <ManageServer {...props} user={this.state.user} /> } />
+                            <Route exact  path="/commands" render={(props) => <CommandsList {...props} user={this.state.user} /> } />
                             
                             <br />
                         </div>
diff --git a/client/src/components/navigation/NavigationBar.js b/client/src/components/navigation/NavigationBar.js
index 0b90958..f0d522a 100644
--- a/client/src/components/navigation/NavigationBar.js
+++ b/client/src/components/navigation/NavigationBar.js
@@ -13,17 +13,19 @@ export default class NavigationBar extends Component {
     
     render() {
         return(
-            <Navbar bg="dark" className="dark-navbar" expand="lg">
+            <Navbar bg="light" className="dark-navbar" expand="lg">
                 <Navbar.Brand>Aki Dashboard</Navbar.Brand>
                 <Navbar.Toggle aria-controls="basic-navbar-nav" />
                 <Navbar.Collapse id="basic-navbar-nav">
                     <Nav className="mr-auto">
                         <Nav.Link href="/">Home</Nav.Link>
-                        <Nav.Link href="/">Server Selection</Nav.Link>
+                        <Nav.Link href="/dashboard">Dashboard</Nav.Link>
+                        <Nav.Link href="/commands">Commands</Nav.Link>
                     </Nav>
                     <NavDropdown title={<img
                         src={`https://cdn.discordapp.com/avatars/${this.props.user.id}/${this.props.user.avatar}.png?size=32`}
-                        alt="Discord profile picture" className="user-icon-image" />}
+                        alt=""
+                        className="user-icon-image" />}
                         id="basic=nav-dropdown">
                         <NavDropdown.Item href="http://localhost:8088/oauth/logout">{`Logout (${this.props.user.username})`}</NavDropdown.Item>
                     </NavDropdown>
diff --git a/client/src/components/selection/ServerCard.js b/client/src/components/selection/ServerCard.js
index 9357374..2d0af93 100644
--- a/client/src/components/selection/ServerCard.js
+++ b/client/src/components/selection/ServerCard.js
@@ -1,8 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { MDBBtn, MDBCard, MDBCardBody, MDBCardTitle, MDBCol } from 'mdbreact';
-import { Card, Col, Button, CardColumns } from 'react-bootstrap';
+import { Card, Button } from 'react-bootstrap';
 
 export default class ServerCard extends Component {
     render() {