From 04794e084229aa7ccc19a6b4a28bf5042ca464f7 Mon Sep 17 00:00:00 2001 From: Rik Berkelder Date: Wed, 29 Jan 2025 23:56:59 +0100 Subject: [PATCH] redo navigation somewhat --- content/layouts/base.njk | 90 ++++++++++++++++++---------------------- package.json | 5 ++- 2 files changed, 43 insertions(+), 52 deletions(-) diff --git a/content/layouts/base.njk b/content/layouts/base.njk index d6f3765..7d000fc 100644 --- a/content/layouts/base.njk +++ b/content/layouts/base.njk @@ -1,13 +1,4 @@ ----js -{ - nav: [ - {title: "Mastodon", url: "https://dook.business/@RikSolo"}, - {title: "Instagram", url: "https://instagram.com/rikberkelder"} - ] -} ---- - -{% macro navItem(title, url, hyphen, target='_self') %} +{% macro navItem(title, url, hyphen=true, target='_self') %} {{title}} {% if hyphen %} - {% endif %} @@ -17,51 +8,50 @@ - - - - - + + + + + - - - - - - + + + + + + - {% if title %}{{title}} | {% endif %}Rik Berkelder - - - -
-
- -
- {% for ni in collections.page %} - {{navItem(ni.data.title, ni.data.permalink, not loop.last )}} - {% endfor %} -
-
- | - {% for ni in nav %} - {{navItem(ni.title, ni.url, not loop.last , '_blank')}} - {% endfor %} -
-
- | - {{navItem("RBLicht", "https://rblicht.nl", true, '_blank')}} - {{navItem("RBSolutions", "https://rbsolutions.cc", false, '_blank')}} -
+ {% if title %}{{title}} | {% endif %}Rik Berkelder + + +
+
+ +
+ {{navItem("Home", "/")}} + {{navItem("Blog", "/blog")}} + {{navItem("Contact", "/contact")}} +
+
+ | + {{navItem("Mastodon", "https://dook.business/@RikSolo")}} + {{navItem("Instagram", "https://instagram.com/RikBerkelder", false)}} +
+
+ | + {{navItem("RBLicht", "https://rblicht.nl", true, '_blank')}} + {{navItem("RBSolutions", "https://rbsolutions.cc", false, '_blank')}}
- {{content | safe}}
- - + {{content | safe}} + +
+ + \ No newline at end of file diff --git a/package.json b/package.json index 49e6fa4..79443bd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "version": "1.0.0", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "serve": "npx @11ty/eleventy --serve" }, "keywords": [], "author": "", @@ -15,4 +16,4 @@ "luxon": "^3.5.0", "sass": "^1.83.4" } -} +} \ No newline at end of file