darby3 · darby3 · Nov 1, 2024 · Nov 1, 2024 · Nov 1, 2024 · Nov 1, 2024
diff --git a/.eleventy.js b/.eleventy.js
@@ -1,31 +1,19 @@
-const handlebarsPlugin = require("@11ty/eleventy-plugin-handlebars");
-
 module.exports = async function(eleventyConfig) {
-	eleventyConfig.addPlugin(handlebarsPlugin);
-
-  // Add a filter using the Config API
-  // eleventyConfig.addFilter( "myFilter", function() {});
-
   // Universal Shortcodes (Adds to Liquid, Nunjucks, Handlebars)
-  eleventyConfig.addShortcode("whichPartial", function(data) {
-    console.dir(data);
-    return `${data}`;
+  eleventyConfig.addShortcode("assetDepth", function() {
+    const fileName = this.page.filePathStem.split('/').pop();
+    return (fileName === 'index') ? '.' : '..';
   });
 
   // Copy assets.
   eleventyConfig.addPassthroughCopy("src/site/images");
   eleventyConfig.addPassthroughCopy("src/site/assets");
+  eleventyConfig.addPassthroughCopy("src/site/**/*.css");
+  eleventyConfig.addPassthroughCopy("src/site/**/*.js");
   eleventyConfig.addPassthroughCopy({
     "src/site/favico": "/"
   });
 
-  // Need to manually add watch targets? The CSS wasn't actually
-  // copying/reloading without this.
-  // TODO: Maybe instead of having 11ty copy assets into place, I should just
-  //       have my watch process do it, instead?
-  eleventyConfig.setUseGitIgnore(false);
-  eleventyConfig.addWatchTarget("src/site/assets");
-
   // Return Config object.
   return {
     dir: {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@11ty/eleventy": "^3.0.0",
-    "@11ty/eleventy-plugin-handlebars": "^1.0.0"
+    "@11ty/eleventy": "^3.0.0"
   }
 }
diff --git a/src/site/_includes/bottombar.hbs b/src/site/_includes/bottombar.hbs
diff --git a/src/site/_includes/bottombar.njk b/src/site/_includes/bottombar.njk
@@ -0,0 +1,5 @@
+<!-- Bottom Bar -->
+
+<div id="bottombar">
+    <p>a <a href="https://namingthingsishard.blog/">Naming Things Is Hard</a> thing</p>
+</div>
diff --git a/src/site/_includes/end.njk b/src/site/_includes/end.njk
@@ -0,0 +1,15 @@
+<script src="/assets/js/core/core.js" type="module"></script>
+
+{% if scripts %}
+  <!-- Custom scripts -->
+  {% for script in scripts %}
+    <script src="/assets/js/{{ script }}" type="module"></script>
+  {% endfor %}
+{% endif %}
+
+{% if lscripts %}
+  <!-- Custom local stylesheets -->
+  {% for script in lscripts %}
+    <script src="{% assetDepth %}/assets/{{ script }}" type="module"></script>
+  {% endfor %}
+{% endif %}
diff --git a/src/site/_includes/footer-contents.hbs b/src/site/_includes/footer-contents.hbs
diff --git a/src/site/_includes/header-contents.hbs → src/site/_includes/head.njk b/src/site/_includes/header-contents.hbs → src/site/_includes/head.njk
@@ -4,24 +4,23 @@
 <meta name="description" content="">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
-{{!-- Icons --}}
+{# Icons #}
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
 <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
 <link rel="manifest" href="/site.webmanifest">
 
-{{!--
-<!-- Google Font: Titillium -->
-<link href='https://fonts.googleapis.com/css?family=Titillium+Web:400,200,200italic,300,300italic,400italic,600,600italic,700,900,700italic' rel='stylesheet' type='text/css'>
---}}
-
-{{!-- Stylesheets --}}
-<!-- Main stylesheet -->
+{# Stylesheets #}
 <link rel="stylesheet" href="/assets/css/core/core.css">
 
-{{#if styles}}
-<!-- Custom stylesheets -->
-{{#each styles}}
-<link rel="stylesheet" href="/assets/css/{{ this }}">
-{{/each}}
-{{/if}}
+{% if styles %}
+  {% for sheet in styles %}
+    <link rel="stylesheet" href="/assets/css/{{ sheet }}">
+  {% endfor %}
+{% endif %}
+
+{% if lstyles %}
+  {% for sheet in lstyles %}
+    <link rel="stylesheet" href="{% assetDepth %}/assets/{{ sheet }}">
+  {% endfor %}
+{% endif %}
diff --git a/src/site/_includes/topbar.hbs b/src/site/_includes/topbar.hbs
diff --git a/src/site/_includes/topbar.njk b/src/site/_includes/topbar.njk
@@ -0,0 +1,5 @@
+<!-- Top Bar -->
+
+<div id="topbar">
+    <p>Welcome to a Next Page project</p>
+</div>
diff --git a/src/site/_layouts/base.njk b/src/site/_layouts/base.njk
@@ -0,0 +1,22 @@
+<!doctype html>
+<html class="no-js" lang="en">
+  <head>
+    {% block head %}
+      {% include "head.njk" %}
+    {% endblock %}
+  </head>
+
+  <body>
+    {% block header %}{% endblock %}
+
+    {% block content %}
+      {{ content | safe }}
+    {% endblock %}
+
+    {% block footer %}{% endblock %}
+
+    {% block end %}
+      {% include "end.njk" %}
+    {% endblock %}
+  </body>
+</html>
diff --git a/src/site/_layouts/main.hbs b/src/site/_layouts/main.hbs