Merge branch 'main' into remove-references

bloom-works · Aug 29, 2023 · e6e8403 · e6e8403
2 parents 82ecfe0 + 3abd505
commit e6e8403
Show file tree

Hide file tree

Showing 33 changed files with 67 additions and 794 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -33,9 +33,6 @@ module.exports = function (eleventyConfig) {
   // https://www.11ty.dev/docs/data-deep-merge/
   eleventyConfig.setDataDeepMerge(true);
 
-  // Alias `layout: post` to `layout: layouts/post.njk`
-  eleventyConfig.addLayoutAlias('post', 'layouts/post.njk');
-
   eleventyConfig.addFilter('readableDate', dateObj => {
     return DateTime.fromJSDate(dateObj, { zone: 'utc' }).toFormat('dd LLL yyyy');
   });
@@ -61,9 +58,16 @@ module.exports = function (eleventyConfig) {
 
   eleventyConfig.addFilter('filterTagList', tags => {
     // should match the list in tags.njk
-    return (tags || []).filter(tag => ['all', 'nav', 'post', 'posts'].indexOf(tag) === -1);
+    return (tags || []).filter(tag => ['all', 'nav'].indexOf(tag) === -1);
   })
 
+  // Create a collection for sections in alphabetical title order
+  eleventyConfig.addCollection('sections', function (collection) {
+    return collection.getFilteredByTag('section').sort((a, b) => {
+      return a.data.title.localeCompare(b.data.title);
+    });
+  });
+
   // Create an array of all tags
   eleventyConfig.addCollection('tagList', function (collection) {
     const tagSet = new Set();

diff --git a/README.md b/README.md
@@ -33,6 +33,21 @@ This uses whatever NPM and Node version you have installed on your machine, and
 1. View the site in your browser at [http://localhost:8080](http://localhost:8080)
 
 From here, changes to files will rebuild the site.
+
+## Editing Instructions
+
+### Adding a Section
+
+To add a new section to the site:
+
+1. Add a new Markdown file to the `sections` folder (example: `sections/my-new-section.md`)
+1. At the top of the file, add two lines with `---` and between those two lines put:
+    - `layout: layouts/section`
+    - `title: My New Section's Title`
+1. Add content below the second `---`
+
+Feel free to look at any of the existing sections as a starting point.
+
 ## Checking code before PR
 ### Running Linters
 1. Navigate to the base of this repo

diff --git a/_data/metadata.json b/_data/metadata.json
@@ -1,18 +1,9 @@
 {
   "title": "Bloom Works Guides",
   "url": "https://bloomworks.digital/",
+  "guide": "Bloom Works Guides Template",
   "googlesitevertification" : "",
   "language": "en",
   "robots": "index, follow",
-  "description": "Guides from Bloom Works",
-  "feed": {
-    "subtitle": "Guides from Bloom Works",
-    "filename": "feed.xml",
-    "path": "/feed/feed.xml",
-    "id": "https://text11ty.pages.dev/"
-  },
-  "jsonfeed": {
-    "path": "/feed/feed.json",
-    "url": "https://text11ty.pages.dev/feed/feed.json"
-  }
+  "description": "Guides from Bloom Works"
 }
diff --git a/_includes/components/PageHeader.js b/_includes/components/PageHeader.js
@@ -1,12 +1,11 @@
 // Strip whitespace
 const { html } = require('common-tags');
 
-function renderPageHeader (subhead, title) {
+function renderPageHeader (title) {
   return html`
     <header role="banner" class="page-header">
       <div class="l-wrapper">
         <h1>
-          ${subhead ? `<span>${subhead}</span>` : ''}
           <span class="sr-only">: </span>
           ${title}
         </h1>

diff --git a/_includes/layouts/content.njk b/_includes/layouts/content.njk
@@ -1,4 +1,4 @@
-{% PageHeader subhead, title %}
+{% PageHeader title %}
 
 <main{% if templateClass %} class="{{ templateClass }}"{% endif %} id="content">
   <div class="l-wrapper">

diff --git a/_includes/layouts/navigation.njk b/_includes/layouts/navigation.njk
@@ -9,7 +9,7 @@
       <div class="nav-meta">
         <a href="https://bloomworks.digital" aria-label="Bloom Works Logo" class="nav-home">
           {% include "bloom-logo-graphic.svg" %}
-          <strong> {{ guide }}</strong>
+          <strong> {{ metadata.guide }}</strong>
         </a>
       </div>
       <button class="nav-button" data-nav-button="search">
@@ -34,9 +34,9 @@
   </header>
   <section class="dialog-body">
     <ol>
-      {% for chapter in collections[tags] %}
+      {% for section in collections.sections %}
         <li>
-          <a href="{{ chapter.page.url }}">{% if chapter.data.subhead %}{{ chapter.data.subhead }}: {% endif %}{{ chapter.data.title }}</a>
+          <a href="{{ section.page.url }}">{{ section.data.title }}</a>
         </li>
       {% endfor %}
     </ol>

diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
diff --git a/_includes/layouts/section.njk b/_includes/layouts/section.njk
@@ -0,0 +1,4 @@
+---
+tags: section
+---
+{% include "layouts/base.njk" %}
diff --git a/_includes/postslist.njk b/_includes/postslist.njk
diff --git a/about/index.md b/about/index.md
diff --git a/archive.njk b/archive.njk
diff --git a/components/page-header.md b/components/page-header.md
@@ -6,4 +6,4 @@ title: "About the Playbook"
 {% include "layouts/head.njk" %}
 {% include "layouts/seo.njk" %}
 {% include "layouts/css.njk" %}
-{%- PageHeader subhead, title -%}
+{%- PageHeader title -%}
diff --git a/feed/feed.njk b/feed/feed.njk
diff --git a/feed/htaccess.njk b/feed/htaccess.njk
diff --git a/feed/json.njk b/feed/json.njk
diff --git a/google6392df0c2099b010.html b/google6392df0c2099b010.html
diff --git a/img/.gitkeep b/img/.gitkeep
diff --git a/index.njk b/index.njk
@@ -1,11 +1,6 @@
 ---
-layout: layouts/base.njk
-eleventyNavigation:
-  key: Home
-  order: 1
-guide: Bloom Works Guides
-title: Page Title
-subhead: Subhead
+layout: layouts/base
+title: Home
 ---
 
 <h1>Heading 1</h1>

diff --git a/posts/eleventy.md b/posts/eleventy.md
diff --git a/posts/hosting.md b/posts/hosting.md
diff --git a/posts/install.md b/posts/install.md
diff --git a/posts/markdown.md b/posts/markdown.md
diff --git a/posts/postingan.md b/posts/postingan.md
diff --git a/posts/posts.json b/posts/posts.json