From 45f2f8f336c48cc1d1ae3d843d61e091bb654e38 Mon Sep 17 00:00:00 2001 From: Yarmo Mackenbach Date: Sun, 14 Mar 2021 18:53:35 +0100 Subject: [PATCH] Improve menu --- routes/main.js | 32 +++++++++++++++--------------- views/about.pug | 26 +------------------------ views/blog.pug | 40 +++++++++----------------------------- views/blogroll.pug | 9 +-------- views/contact.pug | 9 +-------- views/feeds.pug | 14 +------------ views/foss.pug | 7 +------ views/music.pug | 11 +---------- views/notes.pug | 18 +---------------- views/now.pug | 9 +-------- views/partials/nav.pug | 36 ++++++++++++++++++++++++++++++++++ views/pgp.pug | 9 +-------- views/post.pug | 10 +--------- views/projects.pug | 6 +----- views/projects_details.pug | 7 +------ views/reply.pug | 5 +---- views/uses.pug | 9 +-------- views/vinyl.pug | 10 +--------- views/work.pug | 26 +------------------------ 19 files changed, 77 insertions(+), 216 deletions(-) create mode 100644 views/partials/nav.pug diff --git a/routes/main.js b/routes/main.js index 893b603..5a722be 100644 --- a/routes/main.js +++ b/routes/main.js @@ -7,52 +7,52 @@ const util = require('../server/util') router.param('slug', mw.getPostBySlug) router.get('/', mw.getBlogPosts, (req, res) => { - res.render('blog', { title: 'Blog — yarmo.eu' }) + res.render('blog', { title: 'Blog — yarmo.eu', nav1: 'blog', nav2: 'posts' }) }) router.get('/blog', mw.getBlogPosts, (req, res) => { - res.render('blog', { title: 'Blog — yarmo.eu' }) + res.render('blog', { title: 'Blog — yarmo.eu', nav1: 'blog', nav2: 'posts' }) }) router.get('/blog/:s', (req, res) => { res.redirect(`/post/${req.params.s}`) }) router.get('/notes', mw.getNotes, (req, res) => { - res.render('notes', { title: 'Notes — yarmo.eu' }) + res.render('notes', { title: 'Notes — yarmo.eu', nav1: 'blog', nav2: 'notes' }) }) router.get('/notes/:s', (req, res) => { res.redirect(`/post/${req.params.s}`) }) router.get('/post/:slug', (req, res) => { - res.render('post', { title: `${res.locals.post.title} — yarmo.eu` }) + res.render('post', { title: `${res.locals.post.title} — yarmo.eu`, nav1: 'blog', nav2: '' }) }) router.get('/blogroll', (req, res) => { - res.render('blogroll', { title: 'Blogroll — yarmo.eu' }) + res.render('blogroll', { title: 'Blogroll — yarmo.eu', nav1: 'blog', nav2: 'blogroll' }) }) router.get('/feeds', (req, res) => { - res.render('feeds', { title: 'Feeds — yarmo.eu' }) + res.render('feeds', { title: 'Feeds — yarmo.eu', nav1: 'blog', nav2: 'feeds' }) }) router.get('/about', (req, res) => { - res.render('about', { title: 'About me — yarmo.eu' }) + res.render('about', { title: 'About me — yarmo.eu', nav1: 'about', nav2: 'about' }) }) router.get('/work', (req, res) => { - res.render('work', { title: 'Work — yarmo.eu' }) -}) -router.get('/contact', (req, res) => { - res.render('contact', { title: 'Contact — yarmo.eu' }) + res.render('work', { title: 'Work — yarmo.eu', nav1: 'about', nav2: 'work' }) }) router.get('/now', (req, res) => { - res.render('now', { title: 'Now — yarmo.eu' }) + res.render('now', { title: 'Now — yarmo.eu', nav1: 'about', nav2: 'now' }) }) router.get('/uses', (req, res) => { - res.render('uses', { title: 'Uses — yarmo.eu' }) + res.render('uses', { title: 'Uses — yarmo.eu', nav1: 'about', nav2: 'uses' }) }) router.get('/music', (req, res) => { - res.render('music', { title: 'Music — yarmo.eu' }) + res.render('music', { title: 'Music — yarmo.eu', nav1: 'about', nav2: 'music' }) }) router.get('/vinyl', mw.getVinyl, (req, res) => { - res.render('vinyl', { title: 'Vinyl — yarmo.eu' }) + res.render('vinyl', { title: 'Vinyl — yarmo.eu', nav1: 'about', nav2: 'music' }) }) router.get('/pgp', (req, res) => { - res.render('pgp', { title: 'PGP — yarmo.eu' }) + res.render('pgp', { title: 'PGP — yarmo.eu', nav1: 'about', nav2: 'pgp' }) +}) +router.get('/contact', (req, res) => { + res.render('contact', { title: 'Contact — yarmo.eu', nav1: 'contact', nav2: '' }) }) module.exports = router diff --git a/views/about.pug b/views/about.pug index fb8d3ab..cf2e413 100644 --- a/views/about.pug +++ b/views/about.pug @@ -1,31 +1,7 @@ extends templates/main block content - header - h1 - | About Me - nav - | >> - a(href="/about") about me - nav - | Go to: - a(href="/") blog - | | - a(href="/notes") notes - | | - a(href="/feeds") feeds - | | - a(href="/now") now - | | - a(href="/uses") uses - | | - a(href="/work") work - | | - a(href="/music") music - | | - a(href="/pgp") PGP - | | - a(href="/contact") contact + include partials/nav main diff --git a/views/blog.pug b/views/blog.pug index e3cb2a2..fde1181 100644 --- a/views/blog.pug +++ b/views/blog.pug @@ -9,35 +9,13 @@ mixin entry(item) time(datetime=item['date']).dt-published !{item['date_formatted']} block content - .h-card - header - //nav - a(href="/about") about me - | > blog - h1 - | Yarmo's blog - nav - | >> - a(href="/") blog - nav - | Go to: - a(href="/about") about me - | | - a(href="/notes") notes - | | - a(href="/blogroll") blogroll - | | - a(href="/feeds") feeds - | | - a(href="/contact") contact - | | - a(href="https://yarmo.live") live streaming + include partials/nav + + main - main - - div(style="display:none") - include id - - .longform_list.h-feed - each item in blogPosts - +entry(item) + div(style="display:none") + include id + + .longform_list.h-feed + each item in blogPosts + +entry(item) diff --git a/views/blogroll.pug b/views/blogroll.pug index a70c017..f607457 100644 --- a/views/blogroll.pug +++ b/views/blogroll.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | Blogroll - nav - | >> - a(href="/about") about me - | > - a(href="/blogroll") blogroll + include partials/nav main a(href="https://ar.al/") Aral Balkan diff --git a/views/contact.pug b/views/contact.pug index 0ce2ce4..cd56b5e 100644 --- a/views/contact.pug +++ b/views/contact.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | Contact me - nav - | >> - a(href="/about") about me - | > - a(href="/contact") contact + include partials/nav main h2 >> Online presence diff --git a/views/feeds.pug b/views/feeds.pug index 8ee8fbc..92ca9ae 100644 --- a/views/feeds.pug +++ b/views/feeds.pug @@ -1,19 +1,7 @@ extends templates/main block content - header - h1 - | Feeds - nav - | >> - a(href="/feeds") feeds - nav - | Go to: - a(href="/about") about me - | | - a(href="/blog") blog - | | - a(href="/notes") notes + include partials/nav main ul diff --git a/views/foss.pug b/views/foss.pug index 994a26e..5f28fd3 100644 --- a/views/foss.pug +++ b/views/foss.pug @@ -9,12 +9,7 @@ mixin foss_contribution($item) | !{$item['title']} block content - header - nav - a(href="/about") about me - | > foss - h1 - | FOSS + include partials/nav main h2 >> VCS accounts diff --git a/views/music.pug b/views/music.pug index 5ccfbb0..1d61d39 100644 --- a/views/music.pug +++ b/views/music.pug @@ -1,16 +1,7 @@ extends templates/main block content - header - h1 Yarmo's music - nav - | >> - a(href="/about") about me - | > - a(href="/music") music - nav - | Go to: - a(href="/vinyl") vinyl + include partials/nav main h3 Instruments diff --git a/views/notes.pug b/views/notes.pug index f903143..e59ddda 100644 --- a/views/notes.pug +++ b/views/notes.pug @@ -9,23 +9,7 @@ mixin entry(item) time(datetime=item['date']).dt-published !{item['date_formatted']} block content - header - //nav - a(href="/about") about me - | > notes - h1 Yarmo's notes - nav - | >> - a(href="/notes") notes - nav - | Go to: - a(href="/about") about me - | | - a(href="/") blog - | | - a(href="/feeds") feeds - | | - a(href="/contact") contact + include partials/nav main .longform_list diff --git a/views/now.pug b/views/now.pug index 4cd6887..8fc8818 100644 --- a/views/now.pug +++ b/views/now.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | Now - nav - | >> - a(href="/about") about me - | > - a(href="/now") now + include partials/nav main h3 Working on diff --git a/views/partials/nav.pug b/views/partials/nav.pug new file mode 100644 index 0000000..83c7d05 --- /dev/null +++ b/views/partials/nav.pug @@ -0,0 +1,36 @@ +header + h1 + | yarmo.eu + nav + a(href="/")= nav1=="blog" ? "|BLOG|" : "blog" + | · + a(href="/about")= nav1=="about" ? "|ABOUT|" : "about" + | · + a(href="/contact")= nav1=="contact" ? "|CONTACT|" : "contact" + | · + a(href="https://yarmo.live") live streaming + + if nav1 == "blog" + nav + | >> + a(href="/")= nav2=="posts" ? "|POSTS|" : "posts" + | · + a(href="/notes")= nav2=="notes" ? "|NOTES|" : "notes" + | · + a(href="/feeds")= nav2=="feeds" ? "|FEEDS|" : "feeds" + | · + a(href="/blogroll")= nav2=="blogroll" ? "|BLOGROLL|" : "blogroll" + else if nav1 == "about" + nav + | >> + a(href="/about")= nav2=="about" ? "|ABOUT|" : "about" + | · + a(href="/now")= nav2=="now" ? "|NOW|" : "now" + | · + a(href="/uses")= nav2=="uses" ? "|USES|" : "uses" + | · + a(href="/work")= nav2=="work" ? "|WORK|" : "work" + | · + a(href="/music")= nav2=="music" ? "|MUSIC|" : "music" + | · + a(href="/pgp")= nav2=="pgp" ? "|PGP|" : "pgp" \ No newline at end of file diff --git a/views/pgp.pug b/views/pgp.pug index 7304740..e1cfedd 100644 --- a/views/pgp.pug +++ b/views/pgp.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | PGP public key - nav - | >> - a(href="/about") about me - | > - a(href="/pgp") pgp + include partials/nav main h3#pgp-fingerprint Fingerprint diff --git a/views/post.pug b/views/post.pug index eca6937..baa34a1 100644 --- a/views/post.pug +++ b/views/post.pug @@ -35,15 +35,7 @@ mixin discussionLink(item) a(href=item) !{item} block content - header - nav - | >> - if post.type == 'blog' - a(href="/") blog - if post.type == 'note' - a(href="/notes") notes - | > - a(href=post.url)= post.slug + include partials/nav main article.longform.h-entry diff --git a/views/projects.pug b/views/projects.pug index 24e48c6..7be3426 100644 --- a/views/projects.pug +++ b/views/projects.pug @@ -8,11 +8,7 @@ mixin entry($item) | Status: !{$item['status']} block content - header - nav - a(href="/about") about me - | > projects - h1 Yarmo's projects + include partials/nav main .longform_list diff --git a/views/projects_details.pug b/views/projects_details.pug index cbc58ba..7e90028 100644 --- a/views/projects_details.pug +++ b/views/projects_details.pug @@ -6,12 +6,7 @@ mixin webmention($item) | by !{$item['author_name']} on !{$item['date']} at !{$item['time']} block content - header - nav - a(href="/about") about me - | > - a(href="/projects") projects - | > !{$project['slug']} + include partials/nav main article.longform diff --git a/views/reply.pug b/views/reply.pug index 688e35a..6819077 100644 --- a/views/reply.pug +++ b/views/reply.pug @@ -31,10 +31,7 @@ mixin webmention($item) | at !{$item['time']} UTC block content - header - nav - a(href="/about") about me - | > !{$reply['slug']} + include partials/nav main article.longform.h-entry diff --git a/views/uses.pug b/views/uses.pug index 2bc3547..86a5fc3 100644 --- a/views/uses.pug +++ b/views/uses.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | Uses - nav - | >> - a(href="/about") about me - | > - a(href="/uses") uses + include partials/nav main h2 Hardware diff --git a/views/vinyl.pug b/views/vinyl.pug index 0231c92..561ee7b 100644 --- a/views/vinyl.pug +++ b/views/vinyl.pug @@ -5,15 +5,7 @@ mixin entry(item) p !{item['artist']} - !{item['title']} (!{item['year']}) block content - header - h1 Yarmo's vinyl collection - nav - | >> - a(href="/about") about me - | > - a(href="/music") music - | > - a(href="/vinyl") vinyl + include partials/nav main .list diff --git a/views/work.pug b/views/work.pug index de0952d..8c8fabb 100644 --- a/views/work.pug +++ b/views/work.pug @@ -1,14 +1,7 @@ extends templates/main block content - header - h1 - | Work - nav - | >> - a(href="/about") about me - | > - a(href="/work") work + include partials/nav main h2 >> Open Source developer @@ -18,20 +11,3 @@ block content | Currently working on a(href="https://keyoxide.org") Keyoxide | . - - h3 VCS accounts - .wrapper-table - table - tbody - tr - td Codeberg - td - a(href="https://codeberg.org/yarmo" rel="me") @yarmo - tr - td GitLab - td - a(href="https://gitlab.com/yarmo" rel="me") @yarmo - tr - td Github - td - a(href="https://github.com/YarmoM" rel="me") @YarmoM