From 8785c3d23b43908f4d9726bdef50f47032ba77ff Mon Sep 17 00:00:00 2001
From: Devin Haska <2636402+wonderfulfrog@users.noreply.github.com>
Date: Fri, 24 Jan 2025 13:56:57 -0800
Subject: [PATCH] feat: reorganize watching section

---
 eleventy.config.js                            |  6 +++++
 src/pages/books/index.html                    |  2 +-
 src/pages/books/tags.html                     |  2 +-
 src/pages/games/index.html                    |  2 +-
 src/pages/games/tags.html                     |  2 +-
 src/pages/watching/index.html                 |  8 +++---
 .../movies.html => movies/favourites.html}    |  2 +-
 src/pages/watching/movies/recent.html         | 25 +++++++++++++++++++
 src/pages/watching/movies/tag.html            | 15 +++++++++++
 src/pages/watching/movies/tags.html           | 19 ++++++++++++++
 src/pages/watching/recent/movies.html         | 12 ---------
 src/pages/watching/recent/shows.html          | 12 ---------
 .../shows.html => shows/favourites.html}      |  2 +-
 src/pages/watching/shows/recent.html          | 25 +++++++++++++++++++
 src/pages/watching/shows/tag.html             | 15 +++++++++++
 src/pages/watching/shows/tags.html            | 19 ++++++++++++++
 16 files changed, 134 insertions(+), 34 deletions(-)
 rename src/pages/watching/{favourites/movies.html => movies/favourites.html} (84%)
 create mode 100644 src/pages/watching/movies/recent.html
 create mode 100644 src/pages/watching/movies/tag.html
 create mode 100644 src/pages/watching/movies/tags.html
 delete mode 100644 src/pages/watching/recent/movies.html
 delete mode 100644 src/pages/watching/recent/shows.html
 rename src/pages/watching/{favourites/shows.html => shows/favourites.html} (84%)
 create mode 100644 src/pages/watching/shows/recent.html
 create mode 100644 src/pages/watching/shows/tag.html
 create mode 100644 src/pages/watching/shows/tags.html

diff --git a/eleventy.config.js b/eleventy.config.js
index ef714b8..4824391 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -44,6 +44,12 @@ export default function (eleventyConfig) {
   eleventyConfig.addCollection("gamesByTag", (collection) =>
     collectionByTag(collection, "game"),
   );
+  eleventyConfig.addCollection("showsByTag", (collection) =>
+    collectionByTag(collection, "tv"),
+  );
+  eleventyConfig.addCollection("moviesByTag", (collection) =>
+    collectionByTag(collection, "movie"),
+  );
 
   // 	--------------------- Custom Filters -----------------------
   eleventyConfig.addFilter("allTagCounts", allTagCounts);
diff --git a/src/pages/books/index.html b/src/pages/books/index.html
index 17ed024..daf37ec 100644
--- a/src/pages/books/index.html
+++ b/src/pages/books/index.html
@@ -16,7 +16,7 @@ permalink: "books/index.html"
     <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
         {% for tag in tags %}
             <li>
-                <a class="[ button ]" href="/books/tag/{{ tag.tag | slugify }}">
+                <a class="[ button ]" href="tag/{{ tag.tag | slugify }}">
                     {% include "svgs/frame.svg" %}
                 {{ tag.tag }}</a>
             </li>
diff --git a/src/pages/books/tags.html b/src/pages/books/tags.html
index 40570a2..7646bc0 100644
--- a/src/pages/books/tags.html
+++ b/src/pages/books/tags.html
@@ -10,7 +10,7 @@ permalink: "books/tags/index.html"
     <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
         {% for tag in tags %}
             <li>
-                <a class="[ button ]" href="/books/tag/{{ tag.tag | slugify }}">
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
                     {% include "svgs/frame.svg" %}
                 {{ tag.tag }}</a>
             </li>
diff --git a/src/pages/games/index.html b/src/pages/games/index.html
index 7b8e84a..1db6701 100644
--- a/src/pages/games/index.html
+++ b/src/pages/games/index.html
@@ -18,7 +18,7 @@ permalink: "games/index.html"
     <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
         {% for tag in tags %}
             <li>
-                <a class="[ button ]" href="/games/tag/{{ tag.tag | slugify }}">
+                <a class="[ button ]" href="tag/{{ tag.tag | slugify }}">
                     {% include "svgs/frame.svg" %}
                 {{ tag.tag }}</a>
             </li>
diff --git a/src/pages/games/tags.html b/src/pages/games/tags.html
index aae0c43..4f176e8 100644
--- a/src/pages/games/tags.html
+++ b/src/pages/games/tags.html
@@ -10,7 +10,7 @@ permalink: "games/tags/index.html"
     <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
         {% for tag in tags %}
             <li>
-                <a class="[ button ]" href="/games/tag/{{ tag.tag | slugify }}">
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
                     {% include "svgs/frame.svg" %}
                 {{ tag.tag }}</a>
             </li>
diff --git a/src/pages/watching/index.html b/src/pages/watching/index.html
index 5efcf71..1100350 100644
--- a/src/pages/watching/index.html
+++ b/src/pages/watching/index.html
@@ -12,19 +12,19 @@ permalink: "watching/index.html"
     <h1>Watching</h1>
     <p>A collection of movies and shows I've seen. I tend to watch more movies than shows these days.</p>
     <h2>
-        <a href="recent/movies">Recent movies</a>
+        <a href="movies/recent">Recent movies</a>
     </h2>
     {{ grid(movies) }}
     <h2>
-        <a href="recent/shows">Recent shows</a>
+        <a href="shows/recent">Recent shows</a>
     </h2>
     {{ grid(shows) }}
     <h2>
-        <a href="favourites/movies">Favourite movies</a>
+        <a href="movies/favourites">Favourite movies</a>
     </h2>
     {{ grid(favouriteMovies) }}
     <h2>
-        <a href="favourites/shows">Favourite shows</a>
+        <a href="shows/favourites">Favourite shows</a>
     </h2>
     {{ grid(favouriteShows) }}
 </section>
diff --git a/src/pages/watching/favourites/movies.html b/src/pages/watching/movies/favourites.html
similarity index 84%
rename from src/pages/watching/favourites/movies.html
rename to src/pages/watching/movies/favourites.html
index 43c21db..0ea6afc 100644
--- a/src/pages/watching/favourites/movies.html
+++ b/src/pages/watching/movies/favourites.html
@@ -1,6 +1,6 @@
 ---
 title: Favourite movies
-permalink: "watching/favourites/movies/index.html"
+permalink: "watching/movies/favourites/index.html"
 ---
 
 {% from "macros/media-grid.njk" import grid %}
diff --git a/src/pages/watching/movies/recent.html b/src/pages/watching/movies/recent.html
new file mode 100644
index 0000000..b286662
--- /dev/null
+++ b/src/pages/watching/movies/recent.html
@@ -0,0 +1,25 @@
+---
+title: Recent movies
+permalink: "watching/movies/recent/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set data = collections.movie | reverse %}
+{% set tags = collections.movie | allTagCounts(["movie"]) | limit(5) %}
+<section class="flow">
+    <h1>Recent movies</h1>
+    <p>A collection of movies I've seen recently.</p>
+    <h2>
+        <a href="../tags">Tags</a>
+    </h2>
+    <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
+        {% for tag in tags %}
+            <li>
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
+                    {% include "svgs/frame.svg" %}
+                {{ tag.tag }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+    {{ grid(data) }}
+</section>
diff --git a/src/pages/watching/movies/tag.html b/src/pages/watching/movies/tag.html
new file mode 100644
index 0000000..a492a9a
--- /dev/null
+++ b/src/pages/watching/movies/tag.html
@@ -0,0 +1,15 @@
+---
+pagination:
+  data: collections.moviesByTag
+  size: 1
+  alias: tag
+permalink: "watching/movies/tag/{{ tag | slugify }}/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set data = collections.moviesByTag[tag] %}
+<header class="flow flow-space-1">
+    <h1>Movies</h1>
+    <p class="text-fadeText flow-space-0.25">Tagged with "{{ tag }}"</p>
+</header>
+{{ grid(data) }}
diff --git a/src/pages/watching/movies/tags.html b/src/pages/watching/movies/tags.html
new file mode 100644
index 0000000..6588db4
--- /dev/null
+++ b/src/pages/watching/movies/tags.html
@@ -0,0 +1,19 @@
+---
+title: Tagged in Movies
+permalink: "watching/movies/tags/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set tags = collections.movie | allTagCounts(["movie"]) %}
+<section class="flow">
+    <h1>Tagged in Movies</h1>
+    <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
+        {% for tag in tags %}
+            <li>
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
+                    {% include "svgs/frame.svg" %}
+                {{ tag.tag }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+</section>
diff --git a/src/pages/watching/recent/movies.html b/src/pages/watching/recent/movies.html
deleted file mode 100644
index 856a9bc..0000000
--- a/src/pages/watching/recent/movies.html
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Recent movies
-permalink: "watching/recent/movies/index.html"
----
-
-{% from "macros/media-grid.njk" import grid %}
-{% set data = collections.movie | reverse %}
-<section class="flow">
-    <h1>Recent movies</h1>
-    <p>A collection of movies I've seen recently.</p>
-    {{ grid(data) }}
-</section>
diff --git a/src/pages/watching/recent/shows.html b/src/pages/watching/recent/shows.html
deleted file mode 100644
index 1d5f7e8..0000000
--- a/src/pages/watching/recent/shows.html
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Recent shows
-permalink: "watching/recent/shows/index.html"
----
-
-{% from "macros/media-grid.njk" import grid %}
-{% set data = collections.tv | reverse %}
-<section class="flow">
-    <h1>Recent shows</h1>
-    <p>A collection of shows I've seen recently.</p>
-    {{ grid(data) }}
-</section>
diff --git a/src/pages/watching/favourites/shows.html b/src/pages/watching/shows/favourites.html
similarity index 84%
rename from src/pages/watching/favourites/shows.html
rename to src/pages/watching/shows/favourites.html
index 6d15a08..8ace608 100644
--- a/src/pages/watching/favourites/shows.html
+++ b/src/pages/watching/shows/favourites.html
@@ -1,6 +1,6 @@
 ---
 title: Favourite shows
-permalink: "watching/favourites/shows/index.html"
+permalink: "watching/shows/favourites/index.html"
 ---
 
 {% from "macros/media-grid.njk" import grid %}
diff --git a/src/pages/watching/shows/recent.html b/src/pages/watching/shows/recent.html
new file mode 100644
index 0000000..a254b38
--- /dev/null
+++ b/src/pages/watching/shows/recent.html
@@ -0,0 +1,25 @@
+---
+title: Recent shows
+permalink: "watching/shows/recent/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set data = collections.tv | reverse %}
+{% set tags = collections.tv | allTagCounts(["tv"]) | limit(5) %}
+<section class="flow">
+    <h1>Recent shows</h1>
+    <p>A collection of shows I've seen recently.</p>
+    <h2>
+        <a href="../tags">Tags</a>
+    </h2>
+    <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
+        {% for tag in tags %}
+            <li>
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
+                    {% include "svgs/frame.svg" %}
+                {{ tag.tag }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+    {{ grid(data) }}
+</section>
diff --git a/src/pages/watching/shows/tag.html b/src/pages/watching/shows/tag.html
new file mode 100644
index 0000000..e7150cc
--- /dev/null
+++ b/src/pages/watching/shows/tag.html
@@ -0,0 +1,15 @@
+---
+pagination:
+  data: collections.showsByTag
+  size: 1
+  alias: tag
+permalink: "watching/shows/tag/{{ tag | slugify }}/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set data = collections.showsByTag[tag] %}
+<header class="flow flow-space-1">
+    <h1>Shows</h1>
+    <p class="text-fadeText flow-space-0.25">Tagged with "{{ tag }}"</p>
+</header>
+{{ grid(data) }}
diff --git a/src/pages/watching/shows/tags.html b/src/pages/watching/shows/tags.html
new file mode 100644
index 0000000..e630dd9
--- /dev/null
+++ b/src/pages/watching/shows/tags.html
@@ -0,0 +1,19 @@
+---
+title: Tagged in Shows
+permalink: "watching/shows/tags/index.html"
+---
+
+{% from "macros/media-grid.njk" import grid %}
+{% set tags = collections.tv | allTagCounts(["tv"]) %}
+<section class="flow">
+    <h1>Tagged in Shows</h1>
+    <ul class="[ categories ] [ cluster list-none p-0 line-height-m ]">
+        {% for tag in tags %}
+            <li>
+                <a class="[ button ]" href="../tag/{{ tag.tag | slugify }}">
+                    {% include "svgs/frame.svg" %}
+                {{ tag.tag }}</a>
+            </li>
+        {% endfor %}
+    </ul>
+</section>