feat: simplify layout structure

config/constants.js

@@ -3,7 +3,6 @@ const dir = {
   data: "_data",
   includes: "_includes",
   input: "src",
-  layouts: "_layouts",
   output: "dist",
 };
 

src/_includes/layouts/catalogue-item.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 imageAlt: ""
 imageCaption: ""
 ---
@@ -27,4 +27,9 @@ imageCaption: ""
     {% from "macros/date.njk" import format %}
     {{ format(date) }}
     {% block content %}{{ content | safe }}{% endblock %}
+    {% if url %}
+        <a href="{{ url }}" class="[ flex mt-1 items-center gap-0.5 ]" target="_blank" rel="external noreferrer noopener">
+            {% include "svgs/link.svg" %}{{ linkTitle }}
+        </a>
+    {% endif %}
 </article>

src/_includes/layouts/catalogue-type.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 pagination:
     data: collections.catalogueByType
     size: 1

src/_includes/layouts/catalogue.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 permalink: /catalogue/index.html
 title: Catalogue
 ---

src/_includes/layouts/post.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 ---
 
 <article class="[ flow ]">

src/_includes/layouts/tag.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 pagination:
     data: collections.postsByTag
     size: 1

src/_includes/layouts/tags.html

@@ -1,5 +1,5 @@
 ---
-layout: base
+layout: "layouts/base"
 permalink: /tags/index.html
 title: All tags
 ---

src/_layouts/book.html

@@ -1,7 +0,0 @@
----
-layout: "catalogue-item"
-eleventyComputed:
-    tertiary: "<p> <span class=\"[ text-fadeText ]\">by</span> {{ author }}</p>"
----
-
-{{ content | safe }}

src/_layouts/comic.html

@@ -1,7 +0,0 @@
----
-layout: "catalogue-item"
-eleventyComputed:
-    subtitle: "{{ author }} ({{ year }})"
----
-
-{{ content | safe }}

src/_layouts/game.html

@@ -1,7 +0,0 @@
----
-layout: "catalogue-item"
-eleventyComputed:
-    subtitle: "{{ year }}"
----
-
-{{ content | safe }}

src/_layouts/podcast.html

@@ -1,11 +0,0 @@
----
-layout: "catalogue-item"
----
-
-{{ content | safe }}
-<a href="{{ url }}"
-   class="[ flex mt-1 items-center gap-0.5 ]"
-   target="_blank"
-   rel="external noreferrer noopener">
-    {% include "svgs/link.svg" %}
-Listen to the podcast</a>

src/content/catalogue/books/books.11tydata.js

@@ -0,0 +1,6 @@
+module.exports = {
+  layout: "layouts/catalogue-item",
+  tags: "book",
+  permalink: "catalogue/books/{{ page.fileSlug }}/index.html",
+  linkTitle: "View book details",
+};

src/content/catalogue/books/books.json

@@ -1,5 +0,0 @@
-{
-  "layout": "book",
-  "tags": "book",
-  "permalink": "catalogue/books/{{ page.fileSlug }}/index.html"
-}

src/content/catalogue/catalogue.json

@@ -1,5 +1,5 @@
 {
-  "layout": "catalogue",
+  "layout": "layouts/catalogue",
   "tags": "catalogue",
   "permalink": "catalogue/index.html"
 }

src/content/catalogue/comics/comics.11tydata.js

@@ -0,0 +1,8 @@
+module.exports = {
+  layout: "layouts/catalogue-item",
+  tags: "game",
+  permalink: "catalogue/comics/{{ page.fileSlug }}/index.html",
+  eleventyComputed: {
+    subtitle: (data) => `${data.author} (${data.year})`,
+  },
+};

src/content/catalogue/comics/comics.json

@@ -1,5 +0,0 @@
-{
-  "layout": "comic",
-  "tags": "comic",
-  "permalink": "catalogue/comics/{{ page.fileSlug }}/index.html"
-}

src/content/catalogue/comics/monstress-image-1.md

@@ -7,6 +7,7 @@ year: 2017
 image: https://cdn.wonderfulfrog.com/monstress-vol-1.jpeg
 rating: 3
 date: 2021-09-19T07:28:12.065Z
+tags: ["fantasy"]
 ---
 
 The first 75% of the volume is quite confusing. It’s like reading the second or third volume in a series without reading the first. I get starting with a mystery as a hook, but when every second word is something new, I get confused!

src/content/catalogue/comics/monstress-the-blood-image-comics-2.md

@@ -8,6 +8,7 @@ image: https://cdn.wonderfulfrog.com/monstress-vol-2-tp_77ea1f170a.jpg
 isbn: 9781534300415
 rating: 3
 date: 2021-09-20T00:22:01.235Z
+tags: ["fantasy"]
 ---
 
 I love the cast of the story. We are introduced to some new characters with a heavy nautical theme. Old Tooth the shark-person looks straight out of the 90s (remember Street Sharks?). The artwork continues to be the main selling point for me.

src/content/catalogue/comics/the-monster-sisters-orca-books.md

@@ -7,4 +7,5 @@ isbn: 9781459822290
 rating: 4
 image: https://cdn.wonderfulfrog.com/the-monster-sisters-vol-2.jpg
 date: 2021-09-11
+tags: ["adventure"]
 ---

src/content/catalogue/games/games.11tydata.js

@@ -0,0 +1,8 @@
+module.exports = {
+  layout: "layouts/catalogue-item",
+  tags: "game",
+  permalink: "catalogue/games/{{ page.fileSlug }}/index.html",
+  eleventyComputed: {
+    subtitle: (data) => data.year,
+  },
+};

src/content/catalogue/games/games.json

@@ -1,5 +0,0 @@
-{
-  "layout": "game",
-  "tags": "game",
-  "permalink": "catalogue/games/{{ page.fileSlug }}/index.html"
-}

src/content/catalogue/podcasts/podcasts.11tydata.js

@@ -0,0 +1,6 @@
+module.exports = {
+  layout: "layouts/catalogue-item",
+  tags: "podcast",
+  permalink: "catalogue/podcasts/{{ page.fileSlug }}/index.html",
+  linkTitle: "Listen to the podcast",
+};

src/content/catalogue/podcasts/podcasts.json

@@ -1,5 +0,0 @@
-{
-  "layout": "podcast",
-  "tags": "podcast",
-  "permalink": "catalogue/podcasts/{{ page.fileSlug }}/index.html"
-}

src/content/pages/404.html

@@ -1,6 +1,4 @@
 ---
-title: 404
-layout: base
 permalink: /404.html
 youtube: true
 ---

src/content/pages/about.md

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /about/index.html
 title: About
 ---

src/content/pages/blogroll.html

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /blogroll/index.html
 title: Blogroll
 ---

src/content/pages/colophon.md

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /colophon/index.html
 title: Colophon
 ---

src/content/pages/index.html

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /
 ---
 

src/content/pages/links.md

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /links/index.html
 title: Links
 ---

src/content/pages/now.html

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /now/index.html
 title: /now
 ---

src/content/pages/pages.json

@@ -0,0 +1,3 @@
+{
+  "layout": "layouts/base"
+}

src/content/pages/posts.html

@@ -1,6 +1,5 @@
 ---
 permalink: /posts/index.html
-layout: base
 title: Posts
 ---
 

src/content/pages/styleguide.html

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /styleguide/index.html
 title: Styleguide
 ---

src/content/pages/uses.md

@@ -1,5 +1,4 @@
 ---
-layout: base
 permalink: /uses/index.html
 title: /uses
 ---

src/content/posts/posts.json

@@ -1,5 +1,5 @@
 {
-  "layout": "post",
+  "layout": "layouts/post",
   "tags": "post",
   "permalink": "posts/{{ page.fileSlug }}/index.html"
 }