diff --git a/_redirects b/_redirects index 1b3c529b..bb141489 100644 --- a/_redirects +++ b/_redirects @@ -71,11 +71,6 @@ /assets/img/feed-icon.png /assets/icons/apple-touch-icon.png 200! # general -/posts/0/ /posts/ 200! -/links/0/ /links/ 200! -/watching/movies-to-watch/ /watching/movies-to-watch/0/ 200! -/watching/shows-to-watch/ /watching/shows-to-watch/0/ 200! -/books/want-to-read/ /books/want-to-read/0/ 200! /articles/ / 301! /tags /search 301! /mastodon https://social.lol/@cory 301! diff --git a/config/collections/index.js b/config/collections/index.js index 9c0588c4..3423fa8c 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -64,7 +64,7 @@ export const allContent = (collection) => { addContent(posts, '📝', item => item.data.title, item => item.data.date) addContent(links, '🔗', item => item.data.title, item => item.data.date) - addContent(books.filter(book => book.status === 'finished'), '📖', item => item.title, item => item.date) + addContent(books.filter(book => book.status === 'finished'), '📖', item => `${item.title}${item.rating ? ' (' + item.rating + ')' : ''}`, item => item.date) addContent(movies, '🎥', item => `${item.title}${item.rating ? ' (' + item.rating + ')' : ''}`, item => item.lastWatched) addContent(weeklyArtistChart, '🎧', item => item.title, item => item.date) diff --git a/config/filters/index.js b/config/filters/index.js index 60d4664c..cabeff81 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -222,6 +222,14 @@ export default { return normalized }), calculatePlayPercentage: (plays, mostPlayed) => `${plays/mostPlayed * 100}%`, + genresToString: (genres, count = 10) => { + const genreData = genres.slice(0, count) + if (genreData.length === 0) return '' + if (genreData.length === 1) return genreData[0].genre + const allButLast = genreData.slice(0, -1).map(g => g.genre).join(', ') + const last = genreData[genreData.length - 1].genre + return `${allButLast} and ${last}` + }, bookStatus: (books, status) => books.filter(book => book.status === status), bookSortDescending: (books) => books.sort((a, b) => { const dateA = DateTime.fromISO(a.date) diff --git a/src/_data/music.js b/src/_data/music.js index 362f1032..a11a24e1 100644 --- a/src/_data/music.js +++ b/src/_data/music.js @@ -71,7 +71,8 @@ const aggregateData = (data, groupByField, groupByType, sort = true) => { url: item['albums']?.mbid ? `https://musicbrainz.org/release/${item['albums'].mbid}` : `https://musicbrainz.org/search?query=${encodeURIComponent(item['album_name'])}&type=release`, image: item['albums']?.image || '', timestamp: item['listened_at'], - type: groupByType + type: groupByType, + genre: item['artists']?.genre || 'Unknown' } } else { aggregation[key] = { @@ -80,7 +81,8 @@ const aggregateData = (data, groupByField, groupByType, sort = true) => { mbid: item[groupByType]?.mbid || '', url: item[groupByType]?.mbid ? `https://musicbrainz.org/${groupByType === 'albums' ? 'release' : 'artist'}/${item[groupByType].mbid}` : `https://musicbrainz.org/search?query=${encodeURIComponent(item[groupByField])}&type=${groupByType === 'albums' ? 'release' : 'artist'}`, image: item[groupByType]?.image || '', - type: groupByType + type: groupByType, + genre: item['artists']?.genre || 'Unknown' } } if ( @@ -94,6 +96,18 @@ const aggregateData = (data, groupByField, groupByType, sort = true) => { return aggregatedData.filter(item => item.plays > 0) } +const aggregateGenres = (data) => { + const genreAggregation = {} + data.forEach(item => { + const genre = item.artists.genre + if (!genreAggregation[genre]) { + genreAggregation[genre] = { genre, plays: 0 } + } + genreAggregation[genre].plays++ + }) + return Object.values(genreAggregation).sort((a, b) => b.plays - a.plays) +} + export default async function() { const periods = { week: DateTime.now().minus({ days: 7 }).startOf('day'), // last week @@ -108,7 +122,7 @@ export default async function() { album_name, album_key, listened_at, - artists (mbid, image), + artists (mbid, image, genre), albums (mbid, image) ` @@ -117,7 +131,8 @@ export default async function() { results[period] = { artists: aggregateData(periodData, 'artist_name', 'artists'), albums: aggregateData(periodData, 'album_name', 'albums'), - tracks: aggregateData(periodData, 'track_name', 'track') + tracks: aggregateData(periodData, 'track_name', 'track'), + genres: aggregateGenres(periodData) } } @@ -126,7 +141,8 @@ export default async function() { results['allTime'] = { artists: aggregateData(allTimeData, 'artist_name', 'artists'), albums: aggregateData(allTimeData, 'album_name', 'albums'), - tracks: aggregateData(allTimeData, 'track_name', 'track') + tracks: aggregateData(allTimeData, 'track_name', 'track'), + genres: aggregateGenres(allTimeData) } const recentData = await fetchDataForPeriod(DateTime.now().minus({ days: 7 }), selectFields, 'listens') @@ -136,6 +152,7 @@ export default async function() { albums: aggregateData(recentData, 'album_name', 'albums'), tracks: aggregateData(recentData, 'track_name', 'track'), tracksChronological: aggregateData(recentData, 'track_name', 'track', false), + genres: aggregateGenres(recentData) } results['nowPlaying'] = results['recent']['tracksChronological'][0] diff --git a/src/_includes/now.liquid b/src/_includes/now.liquid index 5687d040..ed0c7b4f 100644 --- a/src/_includes/now.liquid +++ b/src/_includes/now.liquid @@ -1,84 +1,7 @@ --- layout: default --- -{% capture js %} - {% render "../assets/scripts/media-toggles.js" %} -{% endcapture %} - {{ content }} -
-

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

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

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

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

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

-
- - - - -
-
-
- {% render "partials/now/tracks-recent.liquid", data:music.recent.tracksChronological %} -
- - - -{% render "partials/now/album-releases.liquid", albumReleases:albumReleases %}

{% tablericon "books" "Books" %} diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index eae42685..15f7915a 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -165,6 +165,10 @@ h6 { font-size: var(--font-size-xs) } .section-header { margin: var(--sizing-3xl) 0 var(--sizing-lg); + &.reduced-margin { + margin: var(--sizing-md) 0 var(--sizing-lg); + } + &.posts { margin: 0 0 var(--sizing-lg); } @@ -175,13 +179,17 @@ h6 { font-size: var(--font-size-xs) } } .section-header-buttons { - margin: 0 0 var(--sizing-lg); + margin: var(--sizing-3xl) 0 var(--sizing-lg); + + &.reduced-margin { + margin: var(--sizing-md) 0 var(--sizing-lg); + } & > button { - margin-bottom: var(--sizing-sm); + margin-bottom: var(--sizing-sm) !important; &:last-of-type { - margin-right: 0; + margin-right: 0 !important; } } } @@ -322,6 +330,7 @@ nav .active svg { .brand-npm svg { stroke: var(--brand-npm) !important; } .brand-mastodon svg { stroke: var(--brand-mastodon) !important; } .brain svg { stroke: var(--brand-listenbrainz) !important; } +.headphones svg { stroke: var(--brand-music) !important; } .device-tv svg { stroke: var(--brand-tv) !important; } .news svg { stroke: var(--brand-instapaper) !important; } .books svg { stroke: var(--brand-books) !important; } @@ -616,14 +625,6 @@ li { flex-direction: row; } - .section-header-buttons { - margin: var(--sizing-3xl) 0 var(--sizing-lg); - - & > button { - margin-bottom: 0; - } - } - article { & h2 { margin: 0 0 var(--sizing-xs); diff --git a/src/assets/styles/components/media-grid.css b/src/assets/styles/components/media-grid.css index 1a748255..15f4b643 100644 --- a/src/assets/styles/components/media-grid.css +++ b/src/assets/styles/components/media-grid.css @@ -6,6 +6,7 @@ .media-grid { display: grid; gap: var(--sizing-sm); + margin-bottom: var(--sizing-base); &.square { grid-template-columns: var(--grid-square); diff --git a/src/assets/styles/defaults/vars.css b/src/assets/styles/defaults/vars.css index 132dd363..d4da66c9 100644 --- a/src/assets/styles/defaults/vars.css +++ b/src/assets/styles/defaults/vars.css @@ -48,6 +48,7 @@ --brand-npm: #cc3534; --brand-mastodon: #6364ff; --brand-listenbrainz: #e97941; + --brand-music: #00bcd4; --brand-tv: #d63031; --brand-instapaper: var(--text-color); --brand-books: #10b582; diff --git a/src/links.html b/src/links.html index 95e603f7..390675cd 100644 --- a/src/links.html +++ b/src/links.html @@ -4,6 +4,7 @@ layout: default pagination: data: collections.links size: 30 +permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" --- {% if pagination.pageNumber == 0 %}

Links

diff --git a/src/pages/books/index.html b/src/pages/main/books/index.html similarity index 100% rename from src/pages/books/index.html rename to src/pages/main/books/index.html diff --git a/src/pages/books/want-to-read.html b/src/pages/main/books/want-to-read.html similarity index 86% rename from src/pages/books/want-to-read.html rename to src/pages/main/books/want-to-read.html index 33152d43..f1fc2f37 100644 --- a/src/pages/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/{{ pagination.pageNumber }}/index.html" +permalink: "/books/want-to-read/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" --- {% if pagination.pageNumber == 0 %}

Want to read

diff --git a/src/pages/books/years/2020.html b/src/pages/main/books/years/2020.html similarity index 100% rename from src/pages/books/years/2020.html rename to src/pages/main/books/years/2020.html diff --git a/src/pages/books/years/2021.html b/src/pages/main/books/years/2021.html similarity index 100% rename from src/pages/books/years/2021.html rename to src/pages/main/books/years/2021.html diff --git a/src/pages/books/years/2022.html b/src/pages/main/books/years/2022.html similarity index 100% rename from src/pages/books/years/2022.html rename to src/pages/main/books/years/2022.html diff --git a/src/pages/books/years/2023.html b/src/pages/main/books/years/2023.html similarity index 100% rename from src/pages/books/years/2023.html rename to src/pages/main/books/years/2023.html diff --git a/src/pages/books/years/2024.html b/src/pages/main/books/years/2024.html similarity index 100% rename from src/pages/books/years/2024.html rename to src/pages/main/books/years/2024.html diff --git a/src/pages/main/music/albums/3-months.html b/src/pages/main/music/albums/3-months.html new file mode 100644 index 00000000..8a43f8d0 --- /dev/null +++ b/src/pages/main/music/albums/3-months.html @@ -0,0 +1,27 @@ +--- +title: Albums • 3 months +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/albums/all-time.html b/src/pages/main/music/albums/all-time.html new file mode 100644 index 00000000..67c5b688 --- /dev/null +++ b/src/pages/main/music/albums/all-time.html @@ -0,0 +1,27 @@ +--- +title: Albums • all time +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/albums/this-month.html b/src/pages/main/music/albums/this-month.html new file mode 100644 index 00000000..e364141c --- /dev/null +++ b/src/pages/main/music/albums/this-month.html @@ -0,0 +1,27 @@ +--- +title: Albums • This month +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/albums/this-week.html b/src/pages/main/music/albums/this-week.html new file mode 100644 index 00000000..5b17b3aa --- /dev/null +++ b/src/pages/main/music/albums/this-week.html @@ -0,0 +1,27 @@ +--- +title: Albums • This week +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/artists/3-months.html b/src/pages/main/music/artists/3-months.html new file mode 100644 index 00000000..ceb777b3 --- /dev/null +++ b/src/pages/main/music/artists/3-months.html @@ -0,0 +1,27 @@ +--- +title: Artists • 3 months +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/artists/all-time.html b/src/pages/main/music/artists/all-time.html new file mode 100644 index 00000000..378cd8e5 --- /dev/null +++ b/src/pages/main/music/artists/all-time.html @@ -0,0 +1,27 @@ +--- +title: Artists • all time +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/artists/this-month.html b/src/pages/main/music/artists/this-month.html new file mode 100644 index 00000000..9a329f8c --- /dev/null +++ b/src/pages/main/music/artists/this-month.html @@ -0,0 +1,27 @@ +--- +title: Artists • This month +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/artists/this-week.html b/src/pages/main/music/artists/this-week.html new file mode 100644 index 00000000..4e783cee --- /dev/null +++ b/src/pages/main/music/artists/this-week.html @@ -0,0 +1,27 @@ +--- +title: Artists • This week +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" +--- +

{% 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 }}.

+
+
+ {% 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 diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html new file mode 100644 index 00000000..7e148729 --- /dev/null +++ b/src/pages/main/music/index.html @@ -0,0 +1,88 @@ +--- +title: Music +layout: default +permalink: "/music/index.html" +--- +{% capture js %} + {% render "../../../assets/scripts/media-toggles.js" %} +{% 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.

+

I mostly listen to {{ music.allTime.genres | genresToString: 5 }}. This week I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.tracks.size }} tracks.

+
+

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

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

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

+
+

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

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

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

+
+

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

+
+ + + + +
+
+
+ {% render "partials/now/tracks-recent.liquid", data:music.recent.tracksChronological %} +
+ + + +{% render "partials/now/album-releases.liquid", albumReleases:albumReleases %} +

This page was last updated on {{ "now" | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}. It typically updates about 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 new file mode 100644 index 00000000..91890ac0 --- /dev/null +++ b/src/pages/main/music/tracks/3-months.html @@ -0,0 +1,30 @@ +--- +title: Tracks • 3 months +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" +--- +

{% 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 }}.

+
+
+ {% for item in pagination.items %} + {%- assign percentage = item.plays | calculatePlayPercentage: music.threeMonth.tracks[0].plays -%} +
+
+
{{ forloop.index }}.
+
+
+ {{ item.title }} +
+
{{ item.artist }} • {{ item.plays }} plays
+
+
+ {% render "partials/now/progress-bar.liquid", percentage:percentage %} +
+ {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ 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 new file mode 100644 index 00000000..ea12be8c --- /dev/null +++ b/src/pages/main/music/tracks/all-time.html @@ -0,0 +1,30 @@ +--- +title: Artists • all time +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" +--- +

{% 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 }}.

+
+
+ {% for item in pagination.items %} + {%- assign percentage = item.plays | calculatePlayPercentage: music.allTime.tracks[0].plays -%} +
+
+
{{ forloop.index }}.
+
+
+ {{ item.title }} +
+
{{ item.artist }} • {{ item.plays }} plays
+
+
+ {% render "partials/now/progress-bar.liquid", percentage:percentage %} +
+ {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ 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 new file mode 100644 index 00000000..22407c9d --- /dev/null +++ b/src/pages/main/music/tracks/this-month.html @@ -0,0 +1,30 @@ +--- +title: Tracks • This month +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" +--- +

{% 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 }}.

+
+
+ {% for item in pagination.items %} + {%- assign percentage = item.plays | calculatePlayPercentage: music.month.tracks[0].plays -%} +
+
+
{{ forloop.index }}.
+
+
+ {{ item.title }} +
+
{{ item.artist }} • {{ item.plays }} plays
+
+
+ {% render "partials/now/progress-bar.liquid", percentage:percentage %} +
+ {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ 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 new file mode 100644 index 00000000..0b579058 --- /dev/null +++ b/src/pages/main/music/tracks/this-week.html @@ -0,0 +1,30 @@ +--- +title: Tracks • This week +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" +--- +

{% 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 }}.

+
+
+ {% for item in pagination.items %} + {%- assign percentage = item.plays | calculatePlayPercentage: music.week.tracks[0].plays -%} +
+
+
{{ forloop.index }}.
+
+
+ {{ item.title }} +
+
{{ item.artist }} • {{ item.plays }} plays
+
+
+ {% render "partials/now/progress-bar.liquid", percentage:percentage %} +
+ {% endfor %} +
+{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file diff --git a/src/pages/watching/favorite-movies.html b/src/pages/main/watching/favorite-movies.html similarity index 100% rename from src/pages/watching/favorite-movies.html rename to src/pages/main/watching/favorite-movies.html diff --git a/src/pages/watching/favorite-shows.html b/src/pages/main/watching/favorite-shows.html similarity index 100% rename from src/pages/watching/favorite-shows.html rename to src/pages/main/watching/favorite-shows.html diff --git a/src/pages/watching/index.html b/src/pages/main/watching/index.html similarity index 100% rename from src/pages/watching/index.html rename to src/pages/main/watching/index.html diff --git a/src/pages/watching/movies-to-watch.html b/src/pages/main/watching/movies-to-watch.html similarity index 85% rename from src/pages/watching/movies-to-watch.html rename to src/pages/main/watching/movies-to-watch.html index 95105bce..492d0a95 100644 --- a/src/pages/watching/movies-to-watch.html +++ b/src/pages/main/watching/movies-to-watch.html @@ -5,7 +5,7 @@ pagination: data: movies.toWatch alias: movies size: 30 -permalink: "/watching/movies-to-watch/{{ pagination.pageNumber }}/index.html" +permalink: "/watching/movies-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" ---

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

{% if pagination.pageNumber == 0 %} diff --git a/src/pages/watching/shows-to-watch.html b/src/pages/main/watching/shows-to-watch.html similarity index 85% rename from src/pages/watching/shows-to-watch.html rename to src/pages/main/watching/shows-to-watch.html index e1b2ae7f..a7f647cc 100644 --- a/src/pages/watching/shows-to-watch.html +++ b/src/pages/main/watching/shows-to-watch.html @@ -5,7 +5,7 @@ pagination: data: tv.toWatch alias: shows size: 30 -permalink: "/watching/shows-to-watch/{{ pagination.pageNumber }}/index.html" +permalink: "/watching/shows-to-watch/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" ---

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

{% if pagination.pageNumber == 0 %} diff --git a/src/pages/contact/index.md b/src/pages/secondary/contact/index.md similarity index 100% rename from src/pages/contact/index.md rename to src/pages/secondary/contact/index.md diff --git a/src/pages/contact/success.html b/src/pages/secondary/contact/success.html similarity index 100% rename from src/pages/contact/success.html rename to src/pages/secondary/contact/success.html diff --git a/src/posts.html b/src/posts.html index 4b2177f9..0f67c8b1 100644 --- a/src/posts.html +++ b/src/posts.html @@ -6,6 +6,7 @@ pagination: size: 8 reverse: true alias: posts +permalink: "/posts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" ---
{% for post in pagination.items %} diff --git a/src/tag-list.html b/src/tag-list.html index be5829fc..48650e01 100644 --- a/src/tag-list.html +++ b/src/tag-list.html @@ -4,7 +4,7 @@ pagination: data: collections size: 1 alias: tag -permalink: /tags/{{ tag }}/ +permalink: "/tags/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber | plus: 1 }}/{% endif %}index.html" eleventyComputed: title: '{{ tag }}' ---