Merge branch 'uroybd-dynamic-include'

.eleventy.js

@@ -11,6 +11,9 @@ const { headerToId, namedHeadingsFilter } = require("./src/helpers/utils");
 const tagRegex = /(^|\s|\>)(#[^\s!@#$%^&*()=+\.,\[{\]};:'"?><]+)(?!([^<]*>))/g;
 
 module.exports = function (eleventyConfig) {
+  eleventyConfig.setLiquidOptions({
+    dynamicPartials: true,
+  });
   let markdownLib = markdownIt({
     breaks: true,
     html: true,

plugin-info.json

@@ -45,6 +45,7 @@
             "src/site/_data/versionednotes.js",
             "src/site/_data/meta.js",
             "src/site/_data/filetree.js",
+            "src/site/_data/dynamics.js",
             "src/site/img/outgoing.svg",
             "src/helpers/constants.js",
             "src/helpers/utils.js",
@@ -56,4 +57,4 @@
             "src/site/_data/eleventyComputed.js",
             "src/site/graph.njk"
         ]
-}
+}

src/site/_data/dynamics.js

@@ -0,0 +1,44 @@
+const fsFileTree = require("fs-file-tree");
+
+const BASE_PATH = "src/site/_includes/components/user"
+const STYLE_PATH = "src/site/styles/user"
+const NAMESPACES = ["index", "notes", "common"];
+const SLOTS = ["header", "afterContent", "footer"]
+
+const generateComponentPaths = async (namespace) => {
+    const data = {};
+    for (let index = 0; index < SLOTS.length; index++) {
+        const slot = SLOTS[index];
+        try {
+            const tree = await fsFileTree(`${BASE_PATH}/${namespace}/${slot}`);
+            let comps = Object.keys(tree).filter((p) => p.indexOf(".njk") != -1).map((p) => `components/user/${namespace}/${slot}/${p}`);
+            comps.sort()
+            data[slot] = comps;
+        } catch {
+            data[slot] = [];
+        }
+    }
+    return data;
+}
+
+const generateStylesPaths = async () => {
+    try {
+        const tree = await fsFileTree(`${STYLE_PATH}`);
+        let comps = Object.keys(tree).map((p) => `/styles/user/${p}`.replace('.scss', '.css'));
+        comps.sort()
+        return comps
+    } catch {
+        return [];
+    }
+}
+
+
+module.exports = async () => {
+    const data = {};
+    for (let index = 0; index < NAMESPACES.length; index++) {
+        const ns = NAMESPACES[index];
+        data[ns] = await generateComponentPaths(ns);
+    }
+    data['styles'] = await generateStylesPaths()
+    return data;
+}

src/site/_includes/components/pageheader.njk

@@ -29,6 +29,9 @@
 {%endif%}
 
 <link href="/styles/custom-style.css" rel="stylesheet">
+{%- for style in dynamics.styles -%}
+<link href="{{style}}" rel="stylesheet">
+{%- endfor -%}
 
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

src/site/_includes/layouts/note.njk

@@ -38,8 +38,20 @@ permalink: "notes/{{ page.fileSlug | slugify }}/"
             </div>
           {% endif %}
         </div>
+      {% for imp in dynamics.common.header %}
+        {% include imp %}
+      {% endfor %}
+      {% for imp in dynamics.notes.header %}
+        {% include imp %}
+      {% endfor %}
       </header>
       {{ content | hideDataview | link | taggify | highlight | safe}}
+      {% for imp in dynamics.common.afterContent %}
+        {% include imp %}
+      {% endfor %}
+      {% for imp in dynamics.notes.afterContent %}
+        {% include imp %}
+      {% endfor %}
     </main>
 
     {% if settings.dgShowBacklinks === true or settings.dgShowLocalGraph === true or settings.dgShowToc === true%}
@@ -50,5 +62,11 @@ permalink: "notes/{{ page.fileSlug | slugify }}/"
       {%include "components/linkPreview.njk"%}
     {% endif %}
     {% include "components/references.njk" %}
+    {% for imp in dynamics.common.footer %}
+      {% include imp %}
+    {% endfor %}
+    {% for imp in dynamics.notes.footer %}
+      {% include imp %}
+    {% endfor %}
   </body>
 </html>

src/site/index.njk

@@ -33,10 +33,22 @@
           </div>
         {% endif %}
       </div>
+      {% for imp in dynamics.common.header %}
+        {% include imp %}
+      {% endfor %}
+      {% for imp in dynamics.index.header %}
+        {% include imp %}
+      {% endfor %}
       </header>
       {%- for garden in collections.gardenEntry -%}
         {{garden.templateContent | hideDataview | link | taggify | highlight | safe }}
       {%- endfor -%}
+      {% for imp in dynamics.common.afterContent %}
+        {% include imp %}
+      {% endfor %}
+      {% for imp in dynamics.index.afterContent %}
+        {% include imp %}
+      {% endfor %}
     </main>
 
     {% if settings.dgShowBacklinks === true or settings.dgShowLocalGraph === true or settings.dgShowToc === true%}
@@ -46,5 +58,11 @@
     {% if settings.dgLinkPreview === true %}
       {%include "components/linkPreview.njk"%}
     {% endif %}
+    {% for imp in dynamics.common.footer %}
+      {% include imp %}
+    {% endfor %}
+    {% for imp in dynamics.index.footer %}
+      {% include imp %}
+    {% endfor %}
     </body>
   </html>