merge into a single activitylist component

diff --git a/_includes/components/activitylist.njk b/_includes/components/activitylist.njk
index b0a6788f9fa64d7239ace925a47e45f434461f9c..ef74ab02f349ff7f543fc0a81b170aa8557e73d4 100644 (file)
--- a/_includes/components/activitylist.njk
+++ b/_includes/components/activitylist.njk
@@ -1,19 +1,47 @@
 <dl>
-{% if maxPosts %}
-    {% set numPosts = collections.activities | length | min(maxPosts) %}
-    {% set activitieslist = collections.activities | reverse | head(numPosts) %}
+{% if page.filePathStem === "/articles" %}
+    {% set activitiescollection = collections.articles %}
+{% elseif page.filePathStem === "/links" %}
+    {% set activitiescollection = collections.links %}
+{% elseif page.filePathStem === "/reviews" %}
+    {% set activitiescollection = collections.reviews %}
 {% else %}
-    {% set activitieslist = collections.activities | reverse %}
+    {% set activitiescollection = collections.activities %}
 {% endif %}
+
+{% set numPosts = maxPosts | default(activitiescollection | length) %}
+{% set activitieslist = activitiescollection | reverse | head(numPosts) %}
+
 {%- for item in activitieslist %}
     <dt><a href="{{ item.url }}">{{ item.data.title }}</a></dt>
     <dd>
-        {% if "articles" in item.data.tags %}
-            <small class="collectiontag">article</small>
-        {% elseif "reviews" in item.data.tags %}
-            <small class="collectiontag">review</small>
-        {% elseif "links" in item.data.tags %}
-            <small class="collectiontag">link</small>
+        {% set tag = false %}
+        {% if page.filePathStem === "/links" %}
+            {% if "livestream" in item.data.tags %}
+                {% set tag = "livestream" %}
+            {% elseif "podcast" in item.data.tags %}
+                {% set tag = "podcast" %}
+            {% endif %}
+        {% elseif page.filePathStem === "/reviews" %}
+            {% if "movie" in item.data.tags %}
+                {% set tag = "movie" %}
+            {% elseif "music" in item.data.tags %}
+                {% set tag = "music" %}
+            {% elseif "show" in item.data.tags %}
+                {% set tag = "show" %}
+            {% endif %}
+        {% else %}
+            {% if "articles" in item.data.tags %}
+                {% set tag = "article" %}
+            {% elseif "reviews" in item.data.tags %}
+                {% set tag = "review" %}
+            {% elseif "links" in item.data.tags %}
+                {% set tag = "link" %}
+            {% endif %}
+        {% endif %}
+
+        {% if tag %}
+            <small class="collectiontag">{{ tag }}</small>
         {% endif %}
         {{ item.data.description }}
     </dd>

diff --git a/_includes/components/articleslist.njk b/_includes/components/articleslist.njk
deleted file mode 100644 (file)
index d038bb0..0000000
--- a/_includes/components/articleslist.njk
+++ /dev/null
@@ -1,12 +0,0 @@
-<dl>
-{% if maxPosts %}
-    {% set numPosts = collections.articles | length | min(maxPosts) %}
-    {% set articleslist = collections.articles | reverse | head(numPosts)%}
-{% else %}
-    {% set articleslist = collections.articles | reverse %}
-{% endif %}
-{%- for article in articleslist %}
-    <dt><a href="{{ article.url }}">{{ article.data.title }}</a></dt>
-    <dd>{{ article.data.description }}</dd>
-{%- endfor %}
-</dl>
\ No newline at end of file

diff --git a/_includes/components/linkslist.njk b/_includes/components/linkslist.njk
deleted file mode 100644 (file)
index c2f05ff..0000000
--- a/_includes/components/linkslist.njk
+++ /dev/null
@@ -1,19 +0,0 @@
-<dl>
-{% if maxPosts %}
-    {% set numPosts = collections.links | length | min(maxPosts) %}
-    {% set linkslist = collections.links | reverse | head(numPosts) %}
-{% else %}
-    {% set linkslist = collections.links | reverse %}
-{% endif %}
-{%- for link in linkslist %}
-    <dt><a href="{{ link.url }}">{{ link.data.title }}</a></dt>
-    <dd>
-        {% if "livestream" in link.data.tags %}
-            <small class="collectiontag">livestream</small>
-        {% elseif "podcast" in link.data.tags %}
-            <small class="collectiontag">podcast</small>
-        {% endif %}
-        {{ link.data.description }}
-    </dd>
-{%- endfor %}
-</dl>
\ No newline at end of file

diff --git a/_includes/components/reviewslist.njk b/_includes/components/reviewslist.njk
deleted file mode 100644 (file)
index 85b52ab..0000000
--- a/_includes/components/reviewslist.njk
+++ /dev/null
@@ -1,21 +0,0 @@
-<dl>
-{% if maxPosts %}
-    {% set numPosts = collections.reviews | length | min(maxPosts) %}
-    {% set reviewslist = collections.reviews | reverse | head(numPosts) %}
-{% else %}
-    {% set reviewslist = collections.reviews | reverse %}
-{% endif %}
-{%- for review in reviewslist %}
-    <dt><a href="{{ review.url }}">{{ review.data.title }}</a></dt>
-    <dd>
-        {% if "movie" in review.data.tags %}
-            <small class="collectiontag">movie</small>
-        {% elseif "music" in review.data.tags %}
-            <small class="collectiontag">music</small>
-        {% elseif "show" in review.data.tags %}
-            <small class="collectiontag">show</small>
-        {% endif %}
-        {{ review.data.description }}
-    </dd>
-{%- endfor %}
-</dl>
\ No newline at end of file

diff --git a/content/articles.njk b/content/articles.njk
index df82ad0302a0a094908072703e55d8182994a4a0..f09e5c3734d7bd8412f548393f48cfd76b69ab2f 100644 (file)
--- a/content/articles.njk
+++ b/content/articles.njk
@@ -2,9 +2,9 @@
 layout: layouts/base.njk
 title: Articles
 date: 2025-02-01
-modified: 2025-03-18
+modified: 2025-03-20
 ---
 
 <h1>Articles</h1>
 
-{% include "components/articleslist.njk" %}
+{% include "components/activitylist.njk" %}

diff --git a/content/links.njk b/content/links.njk
index 5aa47550d4d4c4231c69f8ab52e6f71efb228883..d2c21045cbac7560beb4e57e3bf9c8ceb5d215d6 100644 (file)
--- a/content/links.njk
+++ b/content/links.njk
@@ -2,9 +2,9 @@
 layout: layouts/base.njk
 title: Links
 date: 2025-02-01
-modified: 2025-03-18
+modified: 2025-03-20
 ---
 
 <h1>Links</h1>
 
-{% include "components/linkslist.njk" %}
+{% include "components/activitylist.njk" %}

diff --git a/content/reviews.njk b/content/reviews.njk
index b074fcd3015c1ab529aed7a5148e734da913e791..56bf07abb3b70c8379e7edf6ba328e982ee0c11a 100644 (file)
--- a/content/reviews.njk
+++ b/content/reviews.njk
@@ -2,9 +2,9 @@
 layout: layouts/base.njk
 title: Reviews
 date: 2025-02-01
-modified: 2025-03-18
+modified: 2025-03-20
 ---
 
 <h1>Reviews</h1>
 
-{% include "components/reviewslist.njk" %}
+{% include "components/activitylist.njk" %}