Revert "Easy access profile"

Author: mmgoodnow

package.json

@@ -12,7 +12,6 @@
     "query-string": "^6.4.2",
     "react": "^16.8.6",
     "react-bootstrap": "^1.0.0-beta.5",
-    "react-date-picker": "^7.5.0",
     "react-dom": "^16.8.1",
     "react-icons": "^3.5.0",
     "react-modal": "^3.8.1",

src/components/GlobalNavbar.js

@@ -1,7 +1,5 @@
 import React from "react";
 import {Link} from "react-router-dom";
-import DropdownButton from 'react-bootstrap/DropdownButton'
-import Dropdown from 'react-bootstrap/Dropdown'
 
 const GlobalNavbar = ({username: name, isAdmin}) => <nav className="navbar navbar-expand-md navbar-light bg-light mb-3">
   <div className="container">
@@ -12,14 +10,12 @@ const GlobalNavbar = ({username: name, isAdmin}) => <nav className="navbar navba
       <li className="nav-item"><Link className="nav-link" to="/providers"> Providers</Link></li>
     </ul>
     <div className="navbar-nav flex-grow-1"/>
-    {username && <ul className="navbar-nav mr-auto">
-      <li className="nav-item">
-        <DropdownButton id="dropdown-basic-button" title="Jose">
-          <Dropdown.Item href="profile">Profile</Dropdown.Item>
-        </DropdownButton></li>
+    {name && <ul className="navbar-nav mr-auto">
+      {isAdmin && <li className="nav-item"><Link className="nav-link" to="/admin"> Admin</Link></li>}
+      <li className="nav-item"><Link className="nav-link" to="/profile">{name}</Link></li>
       <li className="nav-item"><Link className="nav-link" to="/logout">Logout</Link></li>
-      </ul>}
-    {!username && <ul className="navbar-nav mr-auto">
+    </ul>}
+    {!name && <ul className="navbar-nav mr-auto">
       <li className="nav-item"><Link className="nav-link" to="/login">Login</Link></li>
       <li className="nav-item"><Link className="nav-link" to="/register">Register</Link></li>
     </ul>}

src/components/Login.js

@@ -13,7 +13,7 @@ const Login = ({setUser, location, history}) =>
         UserService.getInstance().login(values.email, values.password)
           .then((user) => {
             setUser(user);
-            history.push("/profile");
+            history.push("/home");
           })
           .catch(err => {
             if (err instanceof HttpError && err.response.status === 401) {