diff --git a/content b/content index 03dbafe..e63c74e 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 03dbafe2b60845c65f2107b394ce1a4154ae5a29 +Subproject commit e63c74e63eeff064d31f08ad3d3f1039f909ac18 diff --git a/public/css/styles.css b/public/css/styles.css index 951db84..bbe6d16 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -287,6 +287,7 @@ } .dropbtn { display: inline-block; + cursor: pointer; } .dropdown-content { display: none; diff --git a/src/css/submenu.css b/src/css/submenu.css index 8dd6dd0..1e74bed 100644 --- a/src/css/submenu.css +++ b/src/css/submenu.css @@ -5,6 +5,7 @@ .dropbtn { display: inline-block; + cursor: pointer; } .dropdown-content { diff --git a/src/routes/about.js b/src/routes/about.js index a9f1d69..e5cc365 100644 --- a/src/routes/about.js +++ b/src/routes/about.js @@ -1,9 +1,5 @@ // src/routes/about.js const express = require("express"); const router = express.Router(); -const markdownPage = require("../utils/markdownPage"); -const constructionPage = require("../utils/constructionPage"); -markdownPage("/about/me", "about-me"); -constructionPage("/about/blog", "About this blog"); module.exports = router; diff --git a/src/utils/baseContext.js b/src/utils/baseContext.js index a2665d5..d9b41f1 100644 --- a/src/utils/baseContext.js +++ b/src/utils/baseContext.js @@ -12,7 +12,7 @@ navLinks: [ { href: "/", label: "Home" }, { - href: "/about", + // href: "/about", label: "About", submenu: [ { href: "/about/me", label: "About Me" }, diff --git a/src/utils/constructionPage.js b/src/utils/constructionPage.js deleted file mode 100644 index 3a24d1e..0000000 --- a/src/utils/constructionPage.js +++ /dev/null @@ -1,14 +0,0 @@ -// src/utils/constructionPage.js -const express = require("express"); -const router = express.Router(); -const getBaseContext = require("../utils/baseContext"); - -const constructionPage = async (path, title) => { - router.get(path, async (req, res) => { - const context = await getBaseContext({ - title, - }); - res.render("pages/construction.handlebars", context); - }); -}; -module.exports = constructionPage; diff --git a/src/utils/markdownPage.js b/src/utils/markdownPage.js deleted file mode 100644 index 574c135..0000000 --- a/src/utils/markdownPage.js +++ /dev/null @@ -1,38 +0,0 @@ -// src/utils/markdownPage.js -const express = require("express"); -const router = express.Router(); -const getBaseContext = require("../utils/baseContext"); - -const fs = require("fs/promises"); -const path = require("path"); -const matter = require("gray-matter"); -const { marked } = require("marked"); - -const markdownPage = async ( - routePath, - markdownFile = "page", - handlebarsFile = "page" -) => { - router.get(routePath, async (req, res, next) => { - try { - const filePath = path.join( - __dirname, - `../../content/pages/${markdownFile}.md` - ); - const fileContent = await fs.readFile(filePath, "utf8"); - const { data: frontmatter, content } = matter(fileContent); - const htmlContent = marked(content); - - const context = await getBaseContext({ - title: frontmatter.title, - content: htmlContent, - }); - - res.render(`pages/${handlebarsFile}`, context); - } catch (err) { - err.statusCode = 500; - next(err); - } - }); -}; -module.exports = markdownPage; diff --git a/src/views/partials/headers.handlebars b/src/views/partials/headers.handlebars index 0b9f332..26666ae 100644 --- a/src/views/partials/headers.handlebars +++ b/src/views/partials/headers.handlebars @@ -7,7 +7,11 @@ {{#each navLinks}} {{#if submenu}}