Fix merge issues and change layout of NavBar

2026-03-10 21:25:04 +00:00 · 2019-12-04 16:57:56 -05:00
parent 374c4d45b0
commit 4e5b100968
2 changed files with 18 additions and 112 deletions
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -46,6 +46,11 @@ export class Navbar extends Component {
              Profile
            </Button>
          )}
+          {authenticated && (
+            <Button component={Link} to="/dm">
+              DMs
+            </Button>
+          )}
          {!authenticated && (
            <Button component={Link} to="/login">
              Login
@@ -62,7 +67,7 @@ export class Navbar extends Component {
            </Button>
          )}
          {authenticated && (
-            <Button component={Link} to="/logout">
+            <Button style={{position: "absolute", right: 30}} component={Link} to="/logout">
              Logout
            </Button>
          )}