diff --git a/src/_includes/macros/catalogue.njk b/src/_includes/macros/catalogue.njk
new file mode 100644
index 0000000..559da34
--- /dev/null
+++ b/src/_includes/macros/catalogue.njk
@@ -0,0 +1,14 @@
+{% macro list(posts) %}
+
+{% endmacro %}
+
diff --git a/src/_includes/macros/posts.njk b/src/_includes/macros/posts.njk
index 35d700a..ab75ce7 100644
--- a/src/_includes/macros/posts.njk
+++ b/src/_includes/macros/posts.njk
@@ -11,4 +11,3 @@
{% endfor %}
{% endmacro %}
-
diff --git a/src/catalogue-type.html b/src/catalogue-type.html
index 1ba9545..7485d3b 100644
--- a/src/catalogue-type.html
+++ b/src/catalogue-type.html
@@ -12,6 +12,7 @@ eleventyComputed:
title: Catalogue - {{ type | pluralize | capitalize }}
---
+{% from "macros/catalogue.njk" import list %}
{{ type | pluralize | capitalize }}
{% set catalogueTypes = collections.catalogueByType | keys %}
@@ -22,5 +23,12 @@ eleventyComputed:
{% endfor %}
-{% set items = collections.catalogueByType[ type ] | reverse %}
-{% include "partials/catalogue.html" %}
+{% set itemsByYear = collections.catalogueByType[type] | organizeByDate %}
+{% set years = itemsByYear | keys | sort("desc") %}
+
+ {% for year in years %}
+ {% set itemsInYear = itemsByYear[year] %}
+ {{ year }}
+ {{ list(itemsInYear) }}
+ {% endfor %}
+
diff --git a/src/catalogue.html b/src/catalogue.html
index 52f5bcc..efbdc4d 100644
--- a/src/catalogue.html
+++ b/src/catalogue.html
@@ -4,9 +4,9 @@ permalink: /catalogue/index.html
title: Catalogue
---
+{% from "macros/catalogue.njk" import list %}
Catalogue
A collection of my thoughts on various forms of media that I consume.
-{% set items = collections.catalogue %}
{% set catalogueTypes = collections.catalogueByType | keys %}
{% for type in catalogueTypes %}
@@ -16,4 +16,13 @@ title: Catalogue
{% endfor %}
-{% include "partials/catalogue.html" %}
+{% set itemsByYear = collections.catalogue | organizeByDate %}
+{% set years = itemsByYear | keys | sort("desc") %}
+
+ {% for year in years %}
+ {% set itemsInYear = itemsByYear[year] %}
+ {{ year }}
+ {{ list(itemsInYear) }}
+ {{ list(itemsInYear) }}
+ {% endfor %}
+
diff --git a/src/css/blocks/catalogue.css b/src/css/blocks/catalogue.css
index 4bb8abe..51de4f1 100644
--- a/src/css/blocks/catalogue.css
+++ b/src/css/blocks/catalogue.css
@@ -1,6 +1,11 @@
-.catalogue-type {
- font-size: 0.8rem;
- border-radius: 0.5rem;
+.catalogue-list-item {
+ display: grid;
+ grid-template-columns: 1fr auto auto;
+ gap: var(--spacing-1);
+}
+
+.catalogue-list-item a {
+ display: block;
}
.catalogue source,