navbar

webdev410 · webdev410 · commit 3f2d7a21f515 · 2021-08-27T19:21:15.000-07:00
diff --git a/controllers/homeRoutes.js b/controllers/homeRoutes.js
@@ -2,23 +2,20 @@ const router = require("express").Router();
 const { Post, User } = require("../models");
 const withAuth = require("../utils/auth");
 
-router.get("/", withAuth, async (req, res) => {
+router.get("/", async (req, res) => {
   try {
     // gets all posts to display on the page
     const postData = await Post.findAll({
       attributes: ["title", "text", "createdAt"],
     });
 
     const posts = postData.map((post) => post.get({ plain: true }));
-
-    res.render("dashboard", {
+    res.render("home", {
       posts,
-      //pass data into page
-      logged_in: true,
-      username: req.session.username,
+      logged_in: req.session.logged_in,
       email: req.session.email,
-      // page information
-      title: "Dashboard",
+      username: req.session.username,
+      title: "Home",
     });
   } catch (err) {
     res.status(500).json(err);
@@ -42,17 +39,27 @@ router.get("/register", (req, res) => {
   });
 });
 
-// * Route for /home
-router.get("/home", (req, res) => {
-  console.info(`${req.method} request received for homepage`);
+// * Route for /dash
+router.get("/dashboard", async (req, res) => {
+  console.info(`${req.method} request received for dashboard`);
+  // gets all posts to display on the page
+  const postData = await Post.findAll({
+    attributes: ["title", "text", "createdAt"],
+  });
+
+  const posts = postData.map((post) => post.get({ plain: true }));
+
   if (!req.session.logged_in) {
     res.redirect("/login");
   } else {
-    res.render("home", {
-      email: req.session.email,
+    res.render("dashboard", {
+      posts,
+      //pass data into page
       logged_in: true,
       username: req.session.username,
-      title: "Home",
+      email: req.session.email,
+      // page information
+      title: "Dashboard",
     });
   }
 });
diff --git a/views/dashboard.handlebars b/views/dashboard.handlebars
@@ -1,3 +1 @@
-<h2>dash</h2>
-
-{{>posts}}
+<h2>dash</h2>
diff --git a/views/home.handlebars b/views/home.handlebars
@@ -1 +1,4 @@
-homepage
+homepage
+
+
+{{>posts}}
diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
@@ -16,9 +16,6 @@
 </head>
 
 <body>
-    <header>
-        <h1>Tech Blog | {{title}}</h1>
-    </header>
 
     {{>main-menu}}
 
diff --git a/views/partials/main-menu.handlebars b/views/partials/main-menu.handlebars
@@ -1,12 +1,41 @@
-{{! MAIN NAVBAR }}
-<nav>
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <a class="navbar-brand" href="/">Tech Blog</a>
+  <button
+    class="navbar-toggler"
+    type="button"
+    data-toggle="collapse"
+    data-target="#navbarText"
+    aria-controls="navbarText"
+    aria-expanded="false"
+    aria-label="Toggle navigation"
+  >
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarText">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item">
+        <a class="nav-link" href="/">Home</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="/dashboard">Dashboard</a>
+      </li>
 
-  <a href="/home">Homepage</a>
-  <a href="/">Dashboard</a>
+    </ul>
+    {{#if logged_in}}
+      <span class="navbar-text">
+        Welcome,
+        {{username}}
+      </span>
+    {{/if}}
+    {{#if logged_in}}
 
-  {{#if logged_in}}
-    <a href="" id="logout">Logout</a>
-  {{/if}}
-  <p>Welcome, {{username}}</p>
+      <a class="nav-link" href="" id="logout">Logout</a>
 
+    {{else}}
+
+      <a class="nav-link" href="/login">Login</a>
+
+    {{/if}}
+
+  </div>
 </nav>
