From de10bfd83970ed03e9d649d08e833ea3386f213a Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Mon, 20 May 2024 10:50:46 -0700 Subject: [PATCH] chore: dry up media templates --- package-lock.json | 4 ++-- package.json | 2 +- .../media/books/year.liquid} | 0 .../partials/media/music/period/chart.liquid | 19 ++++++++++++++++ .../partials/media/music/period/grid.liquid | 16 ++++++++++++++ .../releases.liquid} | 0 .../tracks/chart.liquid} | 0 .../tracks/recent.liquid} | 0 .../watching/favorites-grid.liquid | 0 .../partials/{ => media}/watching/hero.liquid | 0 .../partials/widgets/paginator.liquid | 2 +- src/links.html | 2 +- src/pages/main/books/want-to-read.html | 2 +- src/pages/main/books/years/2020.html | 2 +- src/pages/main/books/years/2021.html | 2 +- src/pages/main/books/years/2022.html | 2 +- src/pages/main/books/years/2023.html | 2 +- src/pages/main/books/years/2024.html | 2 +- src/pages/main/music/albums/3-months.html | 19 ++-------------- src/pages/main/music/albums/all-time.html | 19 ++-------------- src/pages/main/music/albums/this-month.html | 19 ++-------------- src/pages/main/music/albums/this-week.html | 19 ++-------------- src/pages/main/music/artists/3-months.html | 19 ++-------------- src/pages/main/music/artists/all-time.html | 19 ++-------------- src/pages/main/music/artists/this-month.html | 19 ++-------------- src/pages/main/music/artists/this-week.html | 19 ++-------------- src/pages/main/music/index.html | 12 +++++----- src/pages/main/music/tracks/3-months.html | 22 ++----------------- src/pages/main/music/tracks/all-time.html | 22 ++----------------- src/pages/main/music/tracks/this-month.html | 22 ++----------------- src/pages/main/music/tracks/this-week.html | 22 ++----------------- src/pages/main/watching/favorites/movies.html | 2 +- src/pages/main/watching/favorites/shows.html | 2 +- src/pages/main/watching/index.html | 6 ++--- src/pages/main/watching/to-watch/movies.html | 2 +- src/pages/main/watching/to-watch/shows.html | 2 +- src/posts.html | 2 +- .../drying-up-now-page-templates-eleventy.md | 2 +- src/tag-list.html | 2 +- 39 files changed, 86 insertions(+), 243 deletions(-) rename src/_includes/{book-year.liquid => partials/media/books/year.liquid} (100%) create mode 100644 src/_includes/partials/media/music/period/chart.liquid create mode 100644 src/_includes/partials/media/music/period/grid.liquid rename src/_includes/partials/media/{album-releases.liquid => music/releases.liquid} (100%) rename src/_includes/partials/media/{track-chart.liquid => music/tracks/chart.liquid} (100%) rename src/_includes/partials/media/{tracks-recent.liquid => music/tracks/recent.liquid} (100%) rename src/_includes/partials/{ => media}/watching/favorites-grid.liquid (100%) rename src/_includes/partials/{ => media}/watching/hero.liquid (100%) diff --git a/package-lock.json b/package-lock.json index 261ac1c3..e16d06df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "16.2.0", + "version": "16.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "16.2.0", + "version": "16.3.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", diff --git a/package.json b/package.json index 2b4f0869..be75a87f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "16.2.0", + "version": "16.3.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/book-year.liquid b/src/_includes/partials/media/books/year.liquid similarity index 100% rename from src/_includes/book-year.liquid rename to src/_includes/partials/media/books/year.liquid diff --git a/src/_includes/partials/media/music/period/chart.liquid b/src/_includes/partials/media/music/period/chart.liquid new file mode 100644 index 00000000..b3b1d722 --- /dev/null +++ b/src/_includes/partials/media/music/period/chart.liquid @@ -0,0 +1,19 @@ +
+
+ {% for item in data.items %} + {%- assign percentage = item.plays | calculatePlayPercentage:playTotal -%} +
+
+
{{ item.rank | formatNumber }}.
+
+
+ {{ item.title }} +
+
{{ item.artist }} • {{ item.plays }} plays
+
+
+ {% render "partials/media/progress-bar.liquid", percentage:percentage %} +
+ {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:data %} \ No newline at end of file diff --git a/src/_includes/partials/media/music/period/grid.liquid b/src/_includes/partials/media/music/period/grid.liquid new file mode 100644 index 00000000..7911c73a --- /dev/null +++ b/src/_includes/partials/media/music/period/grid.liquid @@ -0,0 +1,16 @@ +
+
+ {% for item in data.items %} + {% assign alt = item.alt | strip | escape %} + +
+
+
{{ item.title }}
+
{{ item.plays }} plays
+
+ +
+ + {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:data %} \ No newline at end of file diff --git a/src/_includes/partials/media/album-releases.liquid b/src/_includes/partials/media/music/releases.liquid similarity index 100% rename from src/_includes/partials/media/album-releases.liquid rename to src/_includes/partials/media/music/releases.liquid diff --git a/src/_includes/partials/media/track-chart.liquid b/src/_includes/partials/media/music/tracks/chart.liquid similarity index 100% rename from src/_includes/partials/media/track-chart.liquid rename to src/_includes/partials/media/music/tracks/chart.liquid diff --git a/src/_includes/partials/media/tracks-recent.liquid b/src/_includes/partials/media/music/tracks/recent.liquid similarity index 100% rename from src/_includes/partials/media/tracks-recent.liquid rename to src/_includes/partials/media/music/tracks/recent.liquid diff --git a/src/_includes/partials/watching/favorites-grid.liquid b/src/_includes/partials/media/watching/favorites-grid.liquid similarity index 100% rename from src/_includes/partials/watching/favorites-grid.liquid rename to src/_includes/partials/media/watching/favorites-grid.liquid diff --git a/src/_includes/partials/watching/hero.liquid b/src/_includes/partials/media/watching/hero.liquid similarity index 100% rename from src/_includes/partials/watching/hero.liquid rename to src/_includes/partials/media/watching/hero.liquid diff --git a/src/_includes/partials/widgets/paginator.liquid b/src/_includes/partials/widgets/paginator.liquid index 5f8c8518..57c9c669 100644 --- a/src/_includes/partials/widgets/paginator.liquid +++ b/src/_includes/partials/widgets/paginator.liquid @@ -20,7 +20,7 @@ diff --git a/src/links.html b/src/links.html index 42a4f82f..b2ec439f 100644 --- a/src/links.html +++ b/src/links.html @@ -4,7 +4,7 @@ layout: default pagination: data: collections.links size: 30 -permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" --- {% if pagination.pageNumber == 0 %}

Links

diff --git a/src/pages/main/books/want-to-read.html b/src/pages/main/books/want-to-read.html index 29eff6c6..504a3829 100644 --- a/src/pages/main/books/want-to-read.html +++ b/src/pages/main/books/want-to-read.html @@ -5,7 +5,7 @@ pagination: data: collections.booksToRead alias: books size: 30 -permalink: "/books/want-to-read/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/books/want-to-read/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: books --- {% if pagination.pageNumber == 0 %} diff --git a/src/pages/main/books/years/2020.html b/src/pages/main/books/years/2020.html index 94676221..5e8381c5 100644 --- a/src/pages/main/books/years/2020.html +++ b/src/pages/main/books/years/2020.html @@ -1,7 +1,7 @@ --- title: 2020 • Books year: 2020 -layout: book-year +layout: partials/media/books/year permalink: "/books/years/2020.html" schema: books --- diff --git a/src/pages/main/books/years/2021.html b/src/pages/main/books/years/2021.html index f4c8fd4f..2880b4bd 100644 --- a/src/pages/main/books/years/2021.html +++ b/src/pages/main/books/years/2021.html @@ -1,7 +1,7 @@ --- title: 2021 • Books year: 2021 -layout: book-year +layout: partials/media/books/year permalink: "/books/years/2021.html" schema: books --- diff --git a/src/pages/main/books/years/2022.html b/src/pages/main/books/years/2022.html index f6ab2b5f..53b2b4f8 100644 --- a/src/pages/main/books/years/2022.html +++ b/src/pages/main/books/years/2022.html @@ -1,7 +1,7 @@ --- title: 2022 • Books year: 2022 -layout: book-year +layout: partials/media/books/year permalink: "/books/years/2022.html" schema: books --- diff --git a/src/pages/main/books/years/2023.html b/src/pages/main/books/years/2023.html index 33772811..a736e3a5 100644 --- a/src/pages/main/books/years/2023.html +++ b/src/pages/main/books/years/2023.html @@ -1,7 +1,7 @@ --- title: 2023 • Books year: 2023 -layout: book-year +layout: partials/media/books/year permalink: "/books/years/2023.html" schema: books --- diff --git a/src/pages/main/books/years/2024.html b/src/pages/main/books/years/2024.html index ad28d715..b660b7c8 100644 --- a/src/pages/main/books/years/2024.html +++ b/src/pages/main/books/years/2024.html @@ -1,7 +1,7 @@ --- title: 2024 • Books year: 2024 -layout: book-year +layout: partials/media/books/year permalink: "/books/years/2024.html" schema: books --- diff --git a/src/pages/main/music/albums/3-months.html b/src/pages/main/music/albums/3-months.html index 5bc68f70..3dab4b73 100644 --- a/src/pages/main/music/albums/3-months.html +++ b/src/pages/main/music/albums/3-months.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.threeMonth.albums size: 24 -permalink: "/music/albums/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/albums/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.threeMonth.albums.size }} albums over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | genresToString: 5 }}.

See my artists or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/all-time.html b/src/pages/main/music/albums/all-time.html index 95c08995..cb2a7fa4 100644 --- a/src/pages/main/music/albums/all-time.html +++ b/src/pages/main/music/albums/all-time.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.allTime.albums size: 24 -permalink: "/music/albums/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/albums/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.allTime.albums.size }} albums and most of what I listen to is {{ music.allTime.genres | genresToString: 5 }}.

See my artists or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/this-month.html b/src/pages/main/music/albums/this-month.html index 593ecf03..85e82caf 100644 --- a/src/pages/main/music/albums/this-month.html +++ b/src/pages/main/music/albums/this-month.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.month.albums size: 24 -permalink: "/music/albums/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/albums/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.month.albums.size }} albums this month and most of what I've listened to has been {{ music.month.genres | genresToString: 5 }}.

See my artists or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/albums/this-week.html b/src/pages/main/music/albums/this-week.html index 4b2ef9ec..17db695c 100644 --- a/src/pages/main/music/albums/this-week.html +++ b/src/pages/main/music/albums/this-week.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.week.albums size: 24 -permalink: "/music/albums/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/albums/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.week.albums.size }} albums this week and most of what I've listened to has been {{ music.week.genres | genresToString: 5 }}.

See my artists or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/3-months.html b/src/pages/main/music/artists/3-months.html index 3028ef6e..73eb04da 100644 --- a/src/pages/main/music/artists/3-months.html +++ b/src/pages/main/music/artists/3-months.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.threeMonth.artists size: 24 -permalink: "/music/artists/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/artists/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.threeMonth.artists.size }} artists over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | genresToString: 5 }}.

See my albums or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/all-time.html b/src/pages/main/music/artists/all-time.html index a724d3c8..dae9ae05 100644 --- a/src/pages/main/music/artists/all-time.html +++ b/src/pages/main/music/artists/all-time.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.allTime.artists size: 24 -permalink: "/music/artists/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/artists/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.allTime.artists.size }} artists and most of what I listen to is {{ music.allTime.genres | genresToString: 5 }}.

See my albums or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/this-month.html b/src/pages/main/music/artists/this-month.html index bf4b9aa0..9d9498ac 100644 --- a/src/pages/main/music/artists/this-month.html +++ b/src/pages/main/music/artists/this-month.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.month.artists size: 24 -permalink: "/music/artists/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/artists/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.month.artists.size }} artists this month and most of what I've listened to has been {{ music.month.genres | genresToString: 5 }}.

See my albums or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/artists/this-week.html b/src/pages/main/music/artists/this-week.html index 2a803eea..2eba60c6 100644 --- a/src/pages/main/music/artists/this-week.html +++ b/src/pages/main/music/artists/this-week.html @@ -4,26 +4,11 @@ layout: default pagination: data: music.week.artists size: 24 -permalink: "/music/artists/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/artists/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.week.artists.size }} artists this week and most of what I've listened to has been {{ music.week.genres | genresToString: 5 }}.

See my albums or tracks for this period.

-
-
- {% for item in pagination.items %} - {% assign alt = item.alt | strip | escape %} - -
-
-
{{ item.title }}
-
{{ item.plays }} plays
-
- -
- - {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/grid.liquid" data:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index f4a542e6..a4d14a15 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -76,20 +76,20 @@ schema: music
- {% render "partials/media/tracks-recent.liquid", data:music.recent.tracksChronological %} + {% render "partials/media/music/tracks/recent", data:music.recent.tracksChronological %}

More: This week • This month • 3 months • All time

-{% render "partials/media/album-releases.liquid", albumReleases:albumReleases %} +{% render "partials/media/music/releases.liquid", albumReleases:albumReleases %}

This page was last updated on {{ "now" | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}. It typically updates once an hour.

\ No newline at end of file diff --git a/src/pages/main/music/tracks/3-months.html b/src/pages/main/music/tracks/3-months.html index 798f0dfc..939e6212 100644 --- a/src/pages/main/music/tracks/3-months.html +++ b/src/pages/main/music/tracks/3-months.html @@ -4,29 +4,11 @@ layout: default pagination: data: music.threeMonth.tracks size: 50 -permalink: "/music/tracks/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/tracks/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.threeMonth.tracks.size }} tracks over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | genresToString: 5 }}.

See my artists or albums for this period.

-
-
- {% for item in pagination.items %} - {%- assign percentage = item.plays | calculatePlayPercentage: music.threeMonth.tracks[0].plays -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} -
-
{{ item.artist }} • {{ item.plays }} plays
-
-
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/chart.liquid" data:pagination, playTotal: music.threeMonth.tracks[0].plays %} \ No newline at end of file diff --git a/src/pages/main/music/tracks/all-time.html b/src/pages/main/music/tracks/all-time.html index 0dc4c163..fbd7df8d 100644 --- a/src/pages/main/music/tracks/all-time.html +++ b/src/pages/main/music/tracks/all-time.html @@ -4,29 +4,11 @@ layout: default pagination: data: music.allTime.tracks size: 50 -permalink: "/music/tracks/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/tracks/all-time/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.allTime.tracks.size }} tracks and most of what I've listened to has been {{ music.allTime.genres | genresToString: 5 }}.

See my artists or albums for this period.

-
-
- {% for item in pagination.items %} - {%- assign percentage = item.plays | calculatePlayPercentage: music.allTime.tracks[0].plays -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} -
-
{{ item.artist }} • {{ item.plays }} plays
-
-
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/chart.liquid" data:pagination, playTotal: music.allTime.tracks[0].plays %} \ No newline at end of file diff --git a/src/pages/main/music/tracks/this-month.html b/src/pages/main/music/tracks/this-month.html index 1d15776b..4687174b 100644 --- a/src/pages/main/music/tracks/this-month.html +++ b/src/pages/main/music/tracks/this-month.html @@ -4,29 +4,11 @@ layout: default pagination: data: music.month.tracks size: 50 -permalink: "/music/tracks/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/tracks/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.month.tracks.size }} tracks this month and most of what I've listened to has been {{ music.month.genres | genresToString: 5 }}.

See my artists or albums for this period.

-
-
- {% for item in pagination.items %} - {%- assign percentage = item.plays | calculatePlayPercentage: music.month.tracks[0].plays -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} -
-
{{ item.artist }} • {{ item.plays }} plays
-
-
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/chart.liquid" data:pagination, playTotal: music.month.tracks[0].plays %} \ No newline at end of file diff --git a/src/pages/main/music/tracks/this-week.html b/src/pages/main/music/tracks/this-week.html index 55d8c1f0..1541a6cb 100644 --- a/src/pages/main/music/tracks/this-week.html +++ b/src/pages/main/music/tracks/this-week.html @@ -4,29 +4,11 @@ layout: default pagination: data: music.week.tracks size: 50 -permalink: "/music/tracks/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/music/tracks/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: music ---

{% tablericon "arrow-left" "Go back" %} Go back

{{ title }}

I've listened to {{ music.week.tracks.size }} tracks this week and most of what I've listened to has been {{ music.week.genres | genresToString: 5 }}.

See my artists or albums for this period.

-
-
- {% for item in pagination.items %} - {%- assign percentage = item.plays | calculatePlayPercentage: music.week.tracks[0].plays -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} -
-
{{ item.artist }} • {{ item.plays }} plays
-
-
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} -
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/media/music/period/chart.liquid" data:pagination, playTotal: music.week.tracks[0].plays %} \ No newline at end of file diff --git a/src/pages/main/watching/favorites/movies.html b/src/pages/main/watching/favorites/movies.html index 581f03f5..256638d3 100644 --- a/src/pages/main/watching/favorites/movies.html +++ b/src/pages/main/watching/favorites/movies.html @@ -8,4 +8,4 @@ schema: watching

{{ title }}

These are my favorite movies. There are many like them, but these are mine.

-{% render "partials/watching/favorites-grid.liquid", favorites:movies.favorites, count: 99 %} \ No newline at end of file +{% render "partials/media/watching/favorites-grid.liquid", favorites:movies.favorites, count: 99 %} \ No newline at end of file diff --git a/src/pages/main/watching/favorites/shows.html b/src/pages/main/watching/favorites/shows.html index 0b508708..761eaf77 100644 --- a/src/pages/main/watching/favorites/shows.html +++ b/src/pages/main/watching/favorites/shows.html @@ -8,4 +8,4 @@ schema: watching

{{ title }}

These are my favorite shows. There are many like them, but these are mine.

-{% render "partials/watching/favorites-grid.liquid", favorites:tv.favorites, count: 99 %} \ No newline at end of file +{% render "partials/media/watching/favorites-grid.liquid", favorites:tv.favorites, count: 99 %} \ No newline at end of file diff --git a/src/pages/main/watching/index.html b/src/pages/main/watching/index.html index 3c923f4a..ed0e4db1 100644 --- a/src/pages/main/watching/index.html +++ b/src/pages/main/watching/index.html @@ -6,7 +6,7 @@ schema: watching --- {% assign featuredMovie = movies.favorites | featuredWatching: 1 | first %}

{{ title }}

-{% render "partials/watching/hero.liquid" movie:featuredMovie %} +{% render "partials/media/watching/hero.liquid" movie:featuredMovie %}

Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion. You can also take a look at the movies and shows I'm planning to watch.

{% render "partials/banners/rss.liquid", url: "https://feedpress.me/coryd-movies", text: "Subscribe to my movies feed or follow along on this page" %}

@@ -26,7 +26,7 @@ schema: watching

{% assign favoriteMovies = movies.favorites | featuredWatching: 6 %} -{% render "partials/watching/favorites-grid.liquid", favorites:favoriteMovies, count: 6 %} +{% render "partials/media/watching/favorites-grid.liquid", favorites:favoriteMovies, count: 6 %}

{% tablericon "star" "Favorite shows" %} @@ -34,5 +34,5 @@ schema: watching

{% assign favoriteShows = tv.favorites | featuredWatching: 6 %} -{% render "partials/watching/favorites-grid.liquid", favorites:favoriteShows, count: 6 %} +{% render "partials/media/watching/favorites-grid.liquid", favorites:favoriteShows, count: 6 %}

This page was last updated on {{ "now" | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}. It typically updates once an hour.

\ No newline at end of file diff --git a/src/pages/main/watching/to-watch/movies.html b/src/pages/main/watching/to-watch/movies.html index 0fb159de..77d1e940 100644 --- a/src/pages/main/watching/to-watch/movies.html +++ b/src/pages/main/watching/to-watch/movies.html @@ -5,7 +5,7 @@ pagination: data: movies.toWatch alias: movies size: 30 -permalink: "/watching/movies-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/watching/movies-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching ---

{% tablericon "arrow-left" "Go back" %} Go back

diff --git a/src/pages/main/watching/to-watch/shows.html b/src/pages/main/watching/to-watch/shows.html index 9a6f81cc..0d95f4c3 100644 --- a/src/pages/main/watching/to-watch/shows.html +++ b/src/pages/main/watching/to-watch/shows.html @@ -5,7 +5,7 @@ pagination: data: tv.toWatch alias: shows size: 30 -permalink: "/watching/shows-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/watching/shows-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching ---

{% tablericon "arrow-left" "Go back" %} Go back

diff --git a/src/posts.html b/src/posts.html index 0f67c8b1..634a66e9 100644 --- a/src/posts.html +++ b/src/posts.html @@ -6,7 +6,7 @@ pagination: size: 8 reverse: true alias: posts -permalink: "/posts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/posts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" ---
{% for post in pagination.items %} diff --git a/src/posts/2023/drying-up-now-page-templates-eleventy.md b/src/posts/2023/drying-up-now-page-templates-eleventy.md index 9cd09a89..bf69ea81 100644 --- a/src/posts/2023/drying-up-now-page-templates-eleventy.md +++ b/src/posts/2023/drying-up-now-page-templates-eleventy.md @@ -136,7 +136,7 @@ layout: main {{ content }} {% render "partials/media/grid.liquid", data:artists, icon: "microphone-2", title: "Artists", shape: "square", count: 8, loading: 'eager' %} {% render "partials/media/grid.liquid", data:albums, icon: "vinyl", title: "Albums", shape: "square", count: 8, loading: 'lazy' %} -{% render "partials/media/album-releases.liquid", albumReleases:albumReleases %} +{% render "partials/media/music/releases.liquid", albumReleases:albumReleases %} {% render "partials/media/grid.liquid", data:books, icon: "books", title: "Books", shape: "vertical", count: 6, loading: 'lazy' %} {% render "partials/now/links.liquid", links:links %} {% render "partials/media/grid.liquid", data:movies, icon: "movie", title: "Movies", shape: "vertical", count: 6, loading: 'lazy' %} diff --git a/src/tag-list.html b/src/tag-list.html index 48650e01..29621291 100644 --- a/src/tag-list.html +++ b/src/tag-list.html @@ -4,7 +4,7 @@ pagination: data: collections size: 1 alias: tag -permalink: "/tags/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" +permalink: "/tags/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" eleventyComputed: title: '{{ tag }}' ---