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,62 +1,56 @@
-<article>
+{%- for item in items -%}
-  <h2>
+<article class="{{ item.type }}">
-    {% tablericon "activity" %}
+  <aside>
-    Recent activity
+    {%- if item.featured -%}
-  </h2>
+      {% tablericon "star" %}
-    {%- for item in items -%}
+    {%- endif -%}
-    <article class="{{ item.type }}">
+    <time datetime="{{ item.content_date }}">
-      <aside>
+      {{ item.content_date | date:"%B %e, %Y" }}
-        {%- if item.featured -%}
+    </time>
-          {% tablericon "star" %}
+     • {{ item.label }}
-        {%- endif -%}
+    {%- if item.notes -%}
-        <time datetime="{{ item.content_date }}">
+      {% assign notes = item.notes | markdown %}
-          {{ item.content_date | date:"%B %e, %Y" }}
+      {% render "blocks/dialog.liquid",
-        </time>
+        icon:"info-circle",
-         • {{ item.label }}
+        label:"View info about this concert"
-        {%- if item.notes -%}
+        dynamic:"optimized_concerts",
-          {% assign notes = item.notes | markdown %}
+        markdown:"concert_notes",
-          {% render "blocks/dialog.liquid",
+        id:item.id
-            icon:"info-circle",
-            label:"View info about this concert"
-            dynamic:"optimized_concerts",
-            markdown:"concert_notes",
-            id:item.id
-          %}
-        {%- endif -%}
-      </aside>
-      <h3>
-        {%- if item.type == "concerts" -%}
-          {%- capture artistName -%}
-            {%- if item.artist_url -%}
-              <a href="{{ item.artist_url }}">{{ item.title | split: ' at ' | first }}</a>
-            {%- else -%}
-              {{ item.title | split: ' at ' | first }}
-            {%- endif -%}
-          {%- endcapture -%}
-          {%- capture venue -%}
-            {%- if item.venue_lat and item.venue_lon -%}
-              <a href="https://www.openstreetmap.org/?mlat={{ item.venue_lat }}&mlon={{ item.venue_lon }}#map=18/{{ item.venue_lat }}/{{ item.venue_lon }}">{{ item.venue_name }}</a>
-            {%- else -%}
-              {{ item.venue_name }}
-            {%- endif -%}
-          {%- endcapture -%}
-          {{ artistName }}
-          {% if venue %} at {{ venue }}{% endif %}
-        {%- else -%}
-          <a href="{{ item.url | prepend: globals.url }}">{{ item.title }}</a>
-          {%- if item.type == "link" and item.author -%}
-            <span> via </span>
-            {%- if item.author.url -%}
-              <a href="{{ item.author.url }}">{{ item.author.name }}</a>
-            {%- else -%}
-              {{ item.author.name }}
-            {%- endif -%}
-          {%- endif -%}
-        {%- endif -%}
-      </h3>
-      {% render "blocks/tags.liquid",
-        tags:item.tags
       %}
-    </article>
+    {%- endif -%}
-    {%- endfor -%}
+  </aside>
+  <h3>
+    {%- if item.type == "concerts" -%}
+      {%- capture artistName -%}
+        {%- if item.artist_url -%}
+          <a href="{{ item.artist_url }}">{{ item.title | split: ' at ' | first }}</a>
+        {%- else -%}
+          {{ item.title | split: ' at ' | first }}
+        {%- endif -%}
+      {%- endcapture -%}
+      {%- capture venue -%}
+        {%- if item.venue_lat and item.venue_lon -%}
+          <a href="https://www.openstreetmap.org/?mlat={{ item.venue_lat }}&mlon={{ item.venue_lon }}#map=18/{{ item.venue_lat }}/{{ item.venue_lon }}">{{ item.venue_name }}</a>
+        {%- else -%}
+          {{ item.venue_name }}
+        {%- endif -%}
+      {%- endcapture -%}
+      {{ artistName }}
+      {% if venue %} at {{ venue }}{% endif %}
+    {%- else -%}
+      <a href="{{ item.url | prepend: globals.url }}">{{ item.title }}</a>
+      {%- if item.type == "link" and item.author -%}
+        <span> via </span>
+        {%- if item.author.url -%}
+          <a href="{{ item.author.url }}">{{ item.author.name }}</a>
+        {%- else -%}
+          {{ item.author.name }}
+        {%- endif -%}
+      {%- endif -%}
+    {%- endif -%}
+  </h3>
+  {% render "blocks/tags.liquid",
+    tags:item.tags
+  %}
 </article>
+{%- endfor -%}

src/includes/home/recent-media.liquid

@@ -1,22 +1,15 @@
-<article>
+{% render "media/grid.liquid",
-  <h2>
+  globals:globals,
-    {% tablericon "activity" %}
+  data:media.recentMusic,
-    Recent media
+  loading:"eager"
-  </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",
-  {% render "media/grid.liquid",
+  globals:globals,
-    globals:globals,
+  data:media.recentWatchedRead,
-    data:media.recentMusic,
+  shape:"vertical",
-    loading:"eager"
+  loading:"eager"
-  %}
+%}
-  {% render "media/grid.liquid",
+{% render "blocks/banners/rss.liquid",
-    globals:globals,
+  url:"/feeds",
-    data:media.recentWatchedRead,
+  text:"Subscribe to my posts, movies, books, links or activity feed(s)"
-    shape:"vertical",
+%}
-    loading:"eager"
-  %}
-  {% render "blocks/banners/rss.liquid",
-    url:"/feeds",
-    text:"Subscribe to my 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>
-  media:recentMedia,
+  <h2>
-  globals:globals
+    {% tablericon "activity" %}
-%}
+    Recent activity
-{% render "home/recent-activity.liquid"
+  </h2>
-  items:recentActivity
+  {% render "home/recent-media.liquid"
-%}
+    media:recentMedia,
+    globals:globals
+  %}
+  {% render "home/recent-activity.liquid"
+    items:recentActivity
+  %}
+</article>