Skip to content

Commit df219f6

Browse files
committed
Logout button is working on all pages
1 parent 62f2be6 commit df219f6

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

controllers/homeRoutes.js

+15-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ router.get("/", withAuth, async (req, res) => {
1414
res.render("dashboard", {
1515
posts,
1616
//pass data into page
17-
logged_in: req.session.logged_in,
17+
logged_in: true,
1818
username: req.session.username,
1919
email: req.session.email,
2020
// page information
@@ -42,6 +42,19 @@ router.get("/register", (req, res) => {
4242
});
4343
});
4444

45-
// ! FRONT END PAGE ROUTES HERE
45+
// * Route for /home
46+
router.get("/home", (req, res) => {
47+
console.info(`${req.method} request received for homepage`);
48+
if (!req.session.logged_in) {
49+
res.redirect("/login");
50+
} else {
51+
res.render("home", {
52+
email: req.session.email,
53+
logged_in: true,
54+
username: req.session.username,
55+
title: "Home",
56+
});
57+
}
58+
});
4659

4760
module.exports = router;

views/home.handlebars

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
homepage

views/layouts/main.handlebars

-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
<h1>Tech Blog | {{title}}</h1>
2121
</header>
2222

23-
{{#if logged_in}}
2423
{{>main-menu}}
25-
{{/if}}
2624

2725
{{{body}}}
2826

29-
3027
{{#if logged_in}}
3128
<script src="/js/logout.js"></script>
3229
{{/if}}

views/partials/main-menu.handlebars

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{{! MAIN NAVBAR }}
22
<nav>
33

4+
<a href="/home">Homepage</a>
45
<a href="/">Dashboard</a>
5-
<a href="" id="logout">Logout</a>
66

7-
<p>Welcome, {{user.username}}</p>
7+
{{#if logged_in}}
8+
<a href="" id="logout">Logout</a>
9+
{{/if}}
10+
<p>Welcome, {{username}}</p>
811

912
</nav>

views/register.handlebars

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<button class="btn btn-primary" type="submit">Register</button>
2323
</div>
2424
</form>
25-
<p>Already a Member?</p><a href="/login"><button>Login</button></a>
25+
<p>Already a Member?</p><a href="/login"><button
26+
class="btn btn-primary"
27+
>Login</button></a>
2628

2729
<script src="/js/register.js"></script>

0 commit comments

Comments
 (0)