From d8290fe7dbc44ce1b7f60fecc87b53e35b97ae7b Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Fri, 14 Jun 2024 10:10:22 -0700 Subject: [PATCH] feat: split out period music pages + nav improvements --- config/filters/index.js | 5 +- package-lock.json | 33 +++++----- package.json | 4 +- src/_includes/base.liquid | 4 +- .../partials/media/books/year.liquid | 2 +- src/pages/main/books/book.html | 2 +- src/pages/main/music/albums/3-months.html | 5 +- src/pages/main/music/albums/this-month.html | 5 +- src/pages/main/music/albums/this-week.html | 5 +- src/pages/main/music/artists/3-months.html | 5 +- src/pages/main/music/artists/artist.html | 2 +- src/pages/main/music/artists/this-month.html | 5 +- src/pages/main/music/artists/this-week.html | 5 +- src/pages/main/music/genre.html | 2 +- src/pages/main/music/index.html | 62 +++++-------------- src/pages/main/music/periods/this-month.html | 34 ++++++++++ .../main/music/periods/three-months.html | 34 ++++++++++ src/pages/main/music/tracks/3-months.html | 5 +- src/pages/main/music/tracks/this-month.html | 5 +- src/pages/main/music/tracks/this-week.html | 5 +- src/pages/main/watching/favorites/movies.html | 2 +- src/pages/main/watching/favorites/shows.html | 2 +- src/pages/main/watching/movie.html | 2 +- src/pages/main/watching/recent/movies.html | 2 +- src/pages/main/watching/recent/shows.html | 2 +- src/pages/main/watching/show.html | 2 +- 26 files changed, 143 insertions(+), 98 deletions(-) create mode 100644 src/pages/main/music/periods/this-month.html create mode 100644 src/pages/main/music/periods/three-months.html diff --git a/config/filters/index.js b/config/filters/index.js index 2cff600b..b1f022ca 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -23,10 +23,7 @@ export default { shuffleArray, // navigation - isLinkActive: (category, page) => { - const normalizedPage = page.includes('.html') ? page.replace('.html', '/') : page - return !!normalizedPage && normalizedPage.includes(category) && !/\d+/.test(normalizedPage); - }, + isLinkActive: (category, page) => page.includes(category) && page.split('/').filter(a => a !== '').length <= 1, // posts filterByPostType: (posts, postType) => { diff --git a/package-lock.json b/package-lock.json index 8d2c7571..47cd8a3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "19.2.8", + "version": "19.3.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "19.2.8", + "version": "19.3.8", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -20,7 +20,7 @@ "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", - "@cdransf/eleventy-plugin-tabler-icons": "^1.5.0", + "@cdransf/eleventy-plugin-tabler-icons": "^1.6.0", "@supabase/supabase-js": "^2.43.4", "dotenv-flow": "^4.1.0", "html-minifier-terser": "^7.2.0", @@ -269,9 +269,9 @@ "license": "MIT" }, "node_modules/@cdransf/eleventy-plugin-tabler-icons": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@cdransf/eleventy-plugin-tabler-icons/-/eleventy-plugin-tabler-icons-1.5.0.tgz", - "integrity": "sha512-KS7B7lSmD9kLsvkmwAn0qGqazcIsoaB6hUlPgIeSUdjY5VtG6geKOmyvEzaiByrS0bN+/2MNSeqTm9Wl3RxCSw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@cdransf/eleventy-plugin-tabler-icons/-/eleventy-plugin-tabler-icons-1.6.0.tgz", + "integrity": "sha512-/6+hMjlOn65NJBKyjMTV8QRYhOehziP6Ki1L6omjeRNmMyM/oayp4Cbt2ISZUA/HkQMJazPawPnW5HHcJJ+zFQ==", "dev": true, "license": "MIT" }, @@ -566,9 +566,9 @@ "license": "MIT" }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "dev": true, "license": "MIT", "bin": { @@ -579,11 +579,14 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", "dev": true, "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, "engines": { "node": ">=0.4.0" } @@ -822,9 +825,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001633", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001633.tgz", - "integrity": "sha512-6sT0yf/z5jqf8tISAgpJDrmwOpLsrpnyCdD/lOZKvKkkJK4Dn0X5i7KF7THEZhOq+30bmhwBlNEaqPUiHiKtZg==", + "version": "1.0.30001634", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz", + "integrity": "sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 3d325c38..e329c838 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "19.2.8", + "version": "19.3.8", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -30,7 +30,7 @@ "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", - "@cdransf/eleventy-plugin-tabler-icons": "^1.5.0", + "@cdransf/eleventy-plugin-tabler-icons": "^1.6.0", "@supabase/supabase-js": "^2.43.4", "dotenv-flow": "^4.1.0", "html-minifier-terser": "^7.2.0", diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index c2cfec61..269b6d9c 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -9,6 +9,8 @@ {%- assign pageTitle = 'Artists / ' | append: artist.name_string | append: ' / ' | append: meta.siteName -%} {%- elsif schema == 'music-index' -%} {%- assign pageTitle = 'Music / ' | append: meta.siteName -%} +{%- elsif schema == 'music-period' -%} + {%- assign pageTitle = 'Music / ' | append: page.title | append: meta.siteName -%} {%- elsif genre.name -%} {%- assign pageTitle = 'Music / ' | append: genre.name | append: ' / ' | append: meta.siteName -%} {%- elsif book.title -%} @@ -43,7 +45,7 @@ {%- assign ogImage = meta.meta_data.opengraph_default -%} {%- case schema -%} {%- when 'music' -%} - {%- assign ogImage = 'https://cdn.coryd.dev' | append: music.week.artists[0].image -%} + {%- assign ogImage = 'https://cdn.coryd.dev' | append: page.image -%} {%- when 'music-index' -%} {%- assign ogImage = 'https://cdn.coryd.dev' | append: music.week.artists[0].image -%} {%- when 'artist' -%} diff --git a/src/_includes/partials/media/books/year.liquid b/src/_includes/partials/media/books/year.liquid index 0eb4d1ff..0b8f69a6 100644 --- a/src/_includes/partials/media/books/year.liquid +++ b/src/_includes/partials/media/books/year.liquid @@ -5,7 +5,7 @@ layout: default {%- capture currentYear -%}{% currentYear %}{%- endcapture -%} {%- assign yearString = year | append: '' -%} {%- assign currentYearString = currentYear | append: '' -%} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the books index page" %} Back to books

{{ title }}

{{ content }} {% if yearString == currentYearString %} diff --git a/src/pages/main/books/book.html b/src/pages/main/books/book.html index 5c615196..3be3589f 100644 --- a/src/pages/main/books/book.html +++ b/src/pages/main/books/book.html @@ -11,7 +11,7 @@ schema: book {%- capture alt -%} {{ book.title }}{% if book.authors %}By {{ book.authors }}{% endif %} {%- endcapture -%} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the books index page" %} Back to books
0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.threeMonth.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or tracks for this period.

+

See the artists or tracks I've listened to over the last 3 months.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ 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 44fa175c..da679cc1 100644 --- a/src/pages/main/music/albums/this-month.html +++ b/src/pages/main/music/albums/this-month.html @@ -6,13 +6,14 @@ pagination: data: music.month.albums size: 24 permalink: "/music/albums/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.month.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or tracks for this period.

+

See the artists or tracks I've listened to this month.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ 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 78d17474..3368f016 100644 --- a/src/pages/main/music/albums/this-week.html +++ b/src/pages/main/music/albums/this-week.html @@ -6,13 +6,14 @@ pagination: data: music.week.albums size: 24 permalink: "/music/albums/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.week.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or tracks for this period.

+

See the artists or tracks I've listened to this week.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ 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 1b2abbf8..cf1652ee 100644 --- a/src/pages/main/music/artists/3-months.html +++ b/src/pages/main/music/artists/3-months.html @@ -6,13 +6,14 @@ pagination: data: music.threeMonth.artists size: 24 permalink: "/music/artists/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.threeMonth.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my albums or tracks for this period.

+

See the albums or tracks I've listened to over the last 3 months.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file diff --git a/src/pages/main/music/artists/artist.html b/src/pages/main/music/artists/artist.html index 34331392..a5a288e7 100644 --- a/src/pages/main/music/artists/artist.html +++ b/src/pages/main/music/artists/artist.html @@ -16,7 +16,7 @@ schema: artist {% endcapture %} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music
0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.month.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my albums or tracks for this period.

+

See the albums or tracks I've listened to this month.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ 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 1f6df424..c4c2a3f1 100644 --- a/src/pages/main/music/artists/this-week.html +++ b/src/pages/main/music/artists/this-week.html @@ -6,13 +6,14 @@ pagination: data: music.week.artists size: 24 permalink: "/music/artists/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.week.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my albums or tracks for this period.

+

See the albums or tracks I've listened to this week.

{% endif %} {% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file diff --git a/src/pages/main/music/genre.html b/src/pages/main/music/genre.html index f883193b..da2d0a73 100644 --- a/src/pages/main/music/genre.html +++ b/src/pages/main/music/genre.html @@ -21,7 +21,7 @@ schema: genre {% endcapture %} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music

{{ genre.name }}

My top {{ genre.name }} artists {{ connectingWord }} {{ genre.artists | sortByPlaysDescending: "total_plays" | mediaLinks: "artist", 5 }}. I've listened to {{ genre.total_plays | formatNumber }} tracks form this genre.

diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index 1521bd2b..34623fed 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -11,62 +11,35 @@ schema: music-index {% endcapture %}

{{ title }}

-

This is everything I've been listening to recently — it's collected in a database as I listen to it and displayed here. You can read more about the technical details, if you'd like.

+

This is everything I've been listening to recently — it's collected in a database as I listen to it and displayed here. You can read more about the technical details, if you'd like.

I mostly listen to {{ genres | sortByPlaysDescending: "total_plays" | genreStrings: "name" | mediaLinks: "genre", 5 }}. This week I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks.

+

See more of the artists, albums or tracks I've listened to this week.

{% render "partials/widgets/now-playing.liquid" %}
-
+

{% tablericon "microphone-2" "Artists" %} Artists

-
- - - -
-
-
- {% render "partials/media/grid.liquid", data:music.week.artists, shape: "square", count: 8, loading: "eager" %} -
- - -

More: This week / This month / 3 months

-
+ +{% render "partials/media/grid.liquid", data:music.week.artists, shape: "square", count: 8, loading: "eager" %} +

{% tablericon "vinyl" "Albums" %} Albums

-
- - - -
-
-
- {% render "partials/media/grid.liquid", data:music.week.albums, shape: "square", count: 8 %} -
- - -

More: This week / This month / 3 months

+ +{% render "partials/media/grid.liquid", data:music.week.albums, shape: "square", count: 8 %}
-

- {% tablericon "playlist" "Tracks" %} - Tracks -

+ +

+ {% tablericon "playlist" "Tracks" %} + Tracks +

+
- -
@@ -75,13 +48,6 @@ schema: music-index - - -

More: This week / This month / 3 months

{% if albumReleases.size > 0 %}

{% tablericon "calendar-time" "Anticipated albums" %} diff --git a/src/pages/main/music/periods/this-month.html b/src/pages/main/music/periods/this-month.html new file mode 100644 index 00000000..4bed8426 --- /dev/null +++ b/src/pages/main/music/periods/this-month.html @@ -0,0 +1,34 @@ +--- +title: This month +description: This is everything I've been listening to this month — it's collected in a database as I listen to it and displayed here. +layout: default +permalink: "/music/this-month/index.html" +updated: "now" +image: music.month.artists[0].image +schema: music-period +--- +

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

See more of the artists, albums or tracks I've listened to this month.

+
+ +

+ {% tablericon "microphone-2" "Artists" %} + Artists +

+ +{% render "partials/media/grid.liquid", data:music.month.artists, shape: "square", count: 8, loading: "eager" %} + +

+ {% tablericon "vinyl" "Albums" %} + Albums +

+ +{% render "partials/media/grid.liquid", data:music.month.albums, shape: "square", count: 8 %} + +

+ {% tablericon "playlist" "Tracks" %} + Tracks +

+ +{% render "partials/media/music/chart.liquid", data:music.month.tracks, mostPlayed:music.month.tracks[0].plays, count: 10 %} \ No newline at end of file diff --git a/src/pages/main/music/periods/three-months.html b/src/pages/main/music/periods/three-months.html new file mode 100644 index 00000000..6087c338 --- /dev/null +++ b/src/pages/main/music/periods/three-months.html @@ -0,0 +1,34 @@ +--- +title: 3 months +description: This is everything I've been listening to over the last 3 months — it's collected in a database as I listen to it and displayed here. +layout: default +permalink: "/music/three-months/index.html" +updated: "now" +image: music.threeMonth.artists[0].image +schema: music-period +--- +

{{ 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 | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

+

See more of the artists, albums or tracks I've listened to over the last 3 months.

+
+ +

+ {% tablericon "microphone-2" "Artists" %} + Artists +

+ +{% render "partials/media/grid.liquid", data:music.threeMonth.artists, shape: "square", count: 8, loading: "eager" %} + +

+ {% tablericon "vinyl" "Albums" %} + Albums +

+ +{% render "partials/media/grid.liquid", data:music.threeMonth.albums, shape: "square", count: 8 %} + +

+ {% tablericon "playlist" "Tracks" %} + Tracks +

+ +{% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, mostPlayed:music.threeMonth.tracks[0].plays, count: 10 %} \ 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 1e13e6ea..8b496d37 100644 --- a/src/pages/main/music/tracks/3-months.html +++ b/src/pages/main/music/tracks/3-months.html @@ -6,13 +6,14 @@ pagination: data: music.threeMonth.tracks size: 50 permalink: "/music/tracks/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.threeMonth.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ title }}

I've listened to {{ music.threeMonth.totalTracks }} tracks over the last 3 months and most of what I've listened to has been {{ music.threeMonth.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or albums for this period.

+

See the artists or albums I've listened to over the last 3 months.

{% endif %} {% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.threeMonth.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 385e1195..12fc091d 100644 --- a/src/pages/main/music/tracks/this-month.html +++ b/src/pages/main/music/tracks/this-month.html @@ -6,13 +6,14 @@ pagination: data: music.month.tracks size: 50 permalink: "/music/tracks/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.month.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ title }}

I've listened to {{ music.month.totalTracks }} tracks this month and most of what I've listened to has been {{ music.month.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or albums for this period.

+

See the artists or albums this month.

{% endif %} {% render "partials/media/music/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 94cc2d52..2cb0b697 100644 --- a/src/pages/main/music/tracks/this-week.html +++ b/src/pages/main/music/tracks/this-week.html @@ -6,13 +6,14 @@ pagination: data: music.week.tracks size: 50 permalink: "/music/tracks/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" +image: music.week.artists[0].image schema: music --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the music index page" %} Back to music {% if pagination.pageNumber == 0 %}

{{ title }}

I've listened to {{ music.week.totalTracks }} tracks this week and most of what I've listened to has been {{ music.week.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

-

See my artists or albums for this period.

+

See the artists or albums I've listened to this week.

{% endif %} {% render "partials/media/music/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 6351fc93..53bd4ae8 100644 --- a/src/pages/main/watching/favorites/movies.html +++ b/src/pages/main/watching/favorites/movies.html @@ -8,7 +8,7 @@ pagination: permalink: "/watching/favorite-movies/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching {% if pagination.pageNumber == 0 %}

{{ title }}

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

diff --git a/src/pages/main/watching/favorites/shows.html b/src/pages/main/watching/favorites/shows.html index 18a92fff..a53c7623 100644 --- a/src/pages/main/watching/favorites/shows.html +++ b/src/pages/main/watching/favorites/shows.html @@ -8,7 +8,7 @@ pagination: permalink: "/watching/favorite-shows/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching {% if pagination.pageNumber == 0 %}

{{ title }}

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

diff --git a/src/pages/main/watching/movie.html b/src/pages/main/watching/movie.html index 55a03ffe..dca3b0fd 100644 --- a/src/pages/main/watching/movie.html +++ b/src/pages/main/watching/movie.html @@ -10,7 +10,7 @@ schema: movie {%- capture alt -%} {{ movie.title }} / {{ movie.year }}{% if move.rating %} ({{ movie.rating }}){% endif %} {%- endcapture -%} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching
0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching {% if pagination.pageNumber == 0 %}

{{ title }}

These are the movies I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

diff --git a/src/pages/main/watching/recent/shows.html b/src/pages/main/watching/recent/shows.html index 9b2a50fc..fb99ecf3 100644 --- a/src/pages/main/watching/recent/shows.html +++ b/src/pages/main/watching/recent/shows.html @@ -8,7 +8,7 @@ pagination: permalink: "/watching/recent/shows/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" schema: watching --- -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching {% if pagination.pageNumber == 0 %}

{{ title }}

These are the shows I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

diff --git a/src/pages/main/watching/show.html b/src/pages/main/watching/show.html index a0c2a38c..9d4a9932 100644 --- a/src/pages/main/watching/show.html +++ b/src/pages/main/watching/show.html @@ -11,7 +11,7 @@ schema: show {{ show.title }} / {{ show.year }} {%- endcapture -%} {% assign lastWatched = show | getLastWatched %} -{% tablericon "arrow-left" "Go back" %} Go back +{% tablericon "arrow-left" "Go back to the watching index page" %} Back to watching