diff --git a/config/constants.js b/config/constants.js index eb6f29a..73012bc 100644 --- a/config/constants.js +++ b/config/constants.js @@ -3,7 +3,6 @@ const dir = { data: "_data", includes: "_includes", input: "src", - layouts: "_layouts", output: "dist", }; diff --git a/src/_layouts/base.html b/src/_includes/layouts/base.html similarity index 100% rename from src/_layouts/base.html rename to src/_includes/layouts/base.html diff --git a/src/_layouts/catalogue-item.html b/src/_includes/layouts/catalogue-item.html similarity index 80% rename from src/_layouts/catalogue-item.html rename to src/_includes/layouts/catalogue-item.html index da5e187..724147b 100644 --- a/src/_layouts/catalogue-item.html +++ b/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 %} + + {% include "svgs/link.svg" %}{{ linkTitle }} + + {% endif %} diff --git a/src/_layouts/catalogue-type.html b/src/_includes/layouts/catalogue-type.html similarity index 97% rename from src/_layouts/catalogue-type.html rename to src/_includes/layouts/catalogue-type.html index f1ba78c..1ba9545 100644 --- a/src/_layouts/catalogue-type.html +++ b/src/_includes/layouts/catalogue-type.html @@ -1,5 +1,5 @@ --- -layout: base +layout: "layouts/base" pagination: data: collections.catalogueByType size: 1 diff --git a/src/_layouts/catalogue.html b/src/_includes/layouts/catalogue.html similarity index 96% rename from src/_layouts/catalogue.html rename to src/_includes/layouts/catalogue.html index fe0da8b..52f5bcc 100644 --- a/src/_layouts/catalogue.html +++ b/src/_includes/layouts/catalogue.html @@ -1,5 +1,5 @@ --- -layout: base +layout: "layouts/base" permalink: /catalogue/index.html title: Catalogue --- diff --git a/src/_layouts/post.html b/src/_includes/layouts/post.html similarity index 95% rename from src/_layouts/post.html rename to src/_includes/layouts/post.html index c994ae8..ac3290b 100644 --- a/src/_layouts/post.html +++ b/src/_includes/layouts/post.html @@ -1,5 +1,5 @@ --- -layout: base +layout: "layouts/base" ---
diff --git a/src/_layouts/tag.html b/src/_includes/layouts/tag.html similarity index 93% rename from src/_layouts/tag.html rename to src/_includes/layouts/tag.html index 206f190..7aab684 100644 --- a/src/_layouts/tag.html +++ b/src/_includes/layouts/tag.html @@ -1,5 +1,5 @@ --- -layout: base +layout: "layouts/base" pagination: data: collections.postsByTag size: 1 diff --git a/src/_layouts/tags.html b/src/_includes/layouts/tags.html similarity index 95% rename from src/_layouts/tags.html rename to src/_includes/layouts/tags.html index c76a662..4b37292 100644 --- a/src/_layouts/tags.html +++ b/src/_includes/layouts/tags.html @@ -1,5 +1,5 @@ --- -layout: base +layout: "layouts/base" permalink: /tags/index.html title: All tags --- diff --git a/src/_layouts/book.html b/src/_layouts/book.html deleted file mode 100644 index 3d5851f..0000000 --- a/src/_layouts/book.html +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: "catalogue-item" -eleventyComputed: - tertiary: "

by {{ author }}

" ---- - -{{ content | safe }} diff --git a/src/_layouts/comic.html b/src/_layouts/comic.html deleted file mode 100644 index a859e51..0000000 --- a/src/_layouts/comic.html +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: "catalogue-item" -eleventyComputed: - subtitle: "{{ author }} ({{ year }})" ---- - -{{ content | safe }} diff --git a/src/_layouts/game.html b/src/_layouts/game.html deleted file mode 100644 index cbb614f..0000000 --- a/src/_layouts/game.html +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: "catalogue-item" -eleventyComputed: - subtitle: "{{ year }}" ---- - -{{ content | safe }} diff --git a/src/_layouts/podcast.html b/src/_layouts/podcast.html deleted file mode 100644 index ee73110..0000000 --- a/src/_layouts/podcast.html +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: "catalogue-item" ---- - -{{ content | safe }} - - {% include "svgs/link.svg" %} -Listen to the podcast diff --git a/src/content/catalogue/books/books.11tydata.js b/src/content/catalogue/books/books.11tydata.js new file mode 100644 index 0000000..c6cf783 --- /dev/null +++ b/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", +}; diff --git a/src/content/catalogue/books/books.json b/src/content/catalogue/books/books.json deleted file mode 100644 index ffea3d2..0000000 --- a/src/content/catalogue/books/books.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "book", - "tags": "book", - "permalink": "catalogue/books/{{ page.fileSlug }}/index.html" -} diff --git a/src/content/catalogue/catalogue.json b/src/content/catalogue/catalogue.json index 86c3ad0..be23766 100644 --- a/src/content/catalogue/catalogue.json +++ b/src/content/catalogue/catalogue.json @@ -1,5 +1,5 @@ { - "layout": "catalogue", + "layout": "layouts/catalogue", "tags": "catalogue", "permalink": "catalogue/index.html" } diff --git a/src/content/catalogue/comics/comics.11tydata.js b/src/content/catalogue/comics/comics.11tydata.js new file mode 100644 index 0000000..96728c9 --- /dev/null +++ b/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})`, + }, +}; diff --git a/src/content/catalogue/comics/comics.json b/src/content/catalogue/comics/comics.json deleted file mode 100644 index 03e5d19..0000000 --- a/src/content/catalogue/comics/comics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "comic", - "tags": "comic", - "permalink": "catalogue/comics/{{ page.fileSlug }}/index.html" -} diff --git a/src/content/catalogue/comics/monstress-image-1.md b/src/content/catalogue/comics/monstress-image-1.md index bdece9e..2b0ab3b 100644 --- a/src/content/catalogue/comics/monstress-image-1.md +++ b/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! diff --git a/src/content/catalogue/comics/monstress-the-blood-image-comics-2.md b/src/content/catalogue/comics/monstress-the-blood-image-comics-2.md index 6edbd8d..501fe44 100644 --- a/src/content/catalogue/comics/monstress-the-blood-image-comics-2.md +++ b/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. diff --git a/src/content/catalogue/comics/the-monster-sisters-orca-books.md b/src/content/catalogue/comics/the-monster-sisters-orca-books.md index ea64bd5..76894e6 100644 --- a/src/content/catalogue/comics/the-monster-sisters-orca-books.md +++ b/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"] --- diff --git a/src/content/catalogue/games/games.11tydata.js b/src/content/catalogue/games/games.11tydata.js new file mode 100644 index 0000000..24cc184 --- /dev/null +++ b/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, + }, +}; diff --git a/src/content/catalogue/games/games.json b/src/content/catalogue/games/games.json deleted file mode 100644 index 804c430..0000000 --- a/src/content/catalogue/games/games.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "game", - "tags": "game", - "permalink": "catalogue/games/{{ page.fileSlug }}/index.html" -} diff --git a/src/content/catalogue/podcasts/podcasts.11tydata.js b/src/content/catalogue/podcasts/podcasts.11tydata.js new file mode 100644 index 0000000..a3032a7 --- /dev/null +++ b/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", +}; diff --git a/src/content/catalogue/podcasts/podcasts.json b/src/content/catalogue/podcasts/podcasts.json deleted file mode 100644 index 50a4f48..0000000 --- a/src/content/catalogue/podcasts/podcasts.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "podcast", - "tags": "podcast", - "permalink": "catalogue/podcasts/{{ page.fileSlug }}/index.html" -} diff --git a/src/content/pages/404.html b/src/content/pages/404.html index 715e757..2cdc034 100644 --- a/src/content/pages/404.html +++ b/src/content/pages/404.html @@ -1,6 +1,4 @@ --- -title: 404 -layout: base permalink: /404.html youtube: true --- diff --git a/src/content/pages/about.md b/src/content/pages/about.md index 5ee2e9d..8e6ddfa 100644 --- a/src/content/pages/about.md +++ b/src/content/pages/about.md @@ -1,5 +1,4 @@ --- -layout: base permalink: /about/index.html title: About --- diff --git a/src/content/pages/blogroll.html b/src/content/pages/blogroll.html index 3b28505..abb4d4a 100644 --- a/src/content/pages/blogroll.html +++ b/src/content/pages/blogroll.html @@ -1,5 +1,4 @@ --- -layout: base permalink: /blogroll/index.html title: Blogroll --- diff --git a/src/content/pages/colophon.md b/src/content/pages/colophon.md index 97de657..1676f71 100644 --- a/src/content/pages/colophon.md +++ b/src/content/pages/colophon.md @@ -1,5 +1,4 @@ --- -layout: base permalink: /colophon/index.html title: Colophon --- diff --git a/src/content/pages/index.html b/src/content/pages/index.html index a6c1a7a..d9a06a2 100644 --- a/src/content/pages/index.html +++ b/src/content/pages/index.html @@ -1,5 +1,4 @@ --- -layout: base permalink: / --- diff --git a/src/content/pages/links.md b/src/content/pages/links.md index 3f5acdc..9390e16 100644 --- a/src/content/pages/links.md +++ b/src/content/pages/links.md @@ -1,5 +1,4 @@ --- -layout: base permalink: /links/index.html title: Links --- diff --git a/src/content/pages/now.html b/src/content/pages/now.html index 79f71cb..29a96d6 100644 --- a/src/content/pages/now.html +++ b/src/content/pages/now.html @@ -1,5 +1,4 @@ --- -layout: base permalink: /now/index.html title: /now --- diff --git a/src/content/pages/pages.json b/src/content/pages/pages.json new file mode 100644 index 0000000..3d02c7f --- /dev/null +++ b/src/content/pages/pages.json @@ -0,0 +1,3 @@ +{ + "layout": "layouts/base" +} diff --git a/src/content/pages/posts.html b/src/content/pages/posts.html index 573757b..c1a4701 100644 --- a/src/content/pages/posts.html +++ b/src/content/pages/posts.html @@ -1,6 +1,5 @@ --- permalink: /posts/index.html -layout: base title: Posts --- diff --git a/src/content/pages/styleguide.html b/src/content/pages/styleguide.html index 0adb895..826d437 100644 --- a/src/content/pages/styleguide.html +++ b/src/content/pages/styleguide.html @@ -1,5 +1,4 @@ --- -layout: base permalink: /styleguide/index.html title: Styleguide --- diff --git a/src/content/pages/uses.md b/src/content/pages/uses.md index 357f840..ad889d2 100644 --- a/src/content/pages/uses.md +++ b/src/content/pages/uses.md @@ -1,5 +1,4 @@ --- -layout: base permalink: /uses/index.html title: /uses --- diff --git a/src/content/posts/posts.json b/src/content/posts/posts.json index 9ef5221..2f42ba1 100644 --- a/src/content/posts/posts.json +++ b/src/content/posts/posts.json @@ -1,5 +1,5 @@ { - "layout": "post", + "layout": "layouts/post", "tags": "post", "permalink": "posts/{{ page.fileSlug }}/index.html" }