chore: reorganize home page to put media + activity in single section

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "3.7.4",
+  "version": "3.8.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "3.7.4",
+      "version": "3.8.4",
       "license": "MIT",
       "dependencies": {
         "html-minifier-terser": "7.2.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "3.7.4",
+  "version": "3.8.4",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "engines": {

src/includes/home/recent-activity.liquid

@@ -1,10 +1,5 @@
-<article>
+{%- for item in items -%}
-  <h2>
+<article class="{{ item.type }}">
-    {% tablericon "activity" %}
-    Recent activity
-  </h2>
-    {%- for item in items -%}
-    <article class="{{ item.type }}">
   <aside>
     {%- if item.featured -%}
       {% tablericon "star" %}
@@ -57,6 +52,5 @@
   {% render "blocks/tags.liquid",
     tags:item.tags
   %}
-    </article>
-    {%- endfor -%}
 </article>
+{%- endfor -%}

src/includes/home/recent-media.liquid

@@ -1,22 +1,15 @@
-<article>
+{% render "media/grid.liquid",
-  <h2>
-    {% tablericon "activity" %}
-    Recent media
-  </h2>
-  <p>My top <a href="/music/this-week/artists/" class="music">artists</a>, <a href="/music/this-week/albums/" class="music">albums</a>, recently <a href="/books/years/{{ "now" | date: "%Y" }}/" class="books">read books</a>, watched <a href="/watching/recent/movies/" class="tv">movies</a> and <a href="/watching/recent/shows/" class="tv">shows</a>. A living snapshot, if you will.</p>
-  {% render "media/grid.liquid",
   globals:globals,
   data:media.recentMusic,
   loading:"eager"
-  %}
+%}
-  {% render "media/grid.liquid",
+{% render "media/grid.liquid",
   globals:globals,
   data:media.recentWatchedRead,
   shape:"vertical",
   loading:"eager"
-  %}
+%}
-  {% render "blocks/banners/rss.liquid",
+{% render "blocks/banners/rss.liquid",
   url:"/feeds",
-    text:"Subscribe to my movies, books, links or activity feed(s)"
+  text:"Subscribe to my posts, movies, books, links or activity feed(s)"
-  %}
+%}
-</article>

src/pages/index.html

@@ -6,10 +6,16 @@ updated: "now"
   intro:globals.intro,
   nowPlaying:nowPlaying.content
 %}
-{% render "home/recent-media.liquid"
+<article>
+  <h2>
+    {% tablericon "activity" %}
+    Recent activity
+  </h2>
+  {% render "home/recent-media.liquid"
     media:recentMedia,
     globals:globals
-%}
+  %}
-{% render "home/recent-activity.liquid"
+  {% render "home/recent-activity.liquid"
     items:recentActivity
-%}
+  %}
+</article>