From 3917434062d92c3079df61280f93ed56fb6b9172 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Tue, 4 Jun 2024 11:57:01 -0700 Subject: [PATCH] feat: album releases grid --- config/filters/index.js | 11 +++++++--- package-lock.json | 22 +++++++++---------- package.json | 2 +- src/_data/albumReleases.js | 4 +++- .../partials/media/music/releases.liquid | 18 --------------- src/pages/main/music/index.html | 8 ++++++- 6 files changed, 30 insertions(+), 35 deletions(-) delete mode 100644 src/_includes/partials/media/music/releases.liquid diff --git a/config/filters/index.js b/config/filters/index.js index 5f44233c..020c0a7d 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -128,15 +128,20 @@ export default { url: item['url'], type: item.type } + if (item.type === 'artists') { + normalized['title'] = item['title'] + normalized['alt'] = `${item['plays']} plays of ${item['title']}` + normalized['subtext'] = `${item['plays']} plays` + } if (item.type === 'albums') { normalized['title'] = item['title'] normalized['alt'] = `${item['title']} by ${item['artist']}` normalized['subtext'] = `${item['artist']}` } - if (item.type === 'artists') { + if (item.type === 'album-release') { normalized['title'] = item['title'] - normalized['alt'] = `${item['plays']} plays of ${item['title']}` - normalized['subtext'] = `${item['plays']} plays` + normalized['alt'] = `${item['title']} by ${item['artist']}` + normalized['subtext'] = `${item['artist']} • ${item['date']}` } if (item.type === 'movie') { normalized['title'] = item['title'] diff --git a/package-lock.json b/package-lock.json index 67352f77..90778573 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "18.8.10", + "version": "18.11.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "18.8.10", + "version": "18.11.11", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -121,15 +121,15 @@ } }, "node_modules/@11ty/eleventy-dev-server": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@11ty/eleventy-dev-server/-/eleventy-dev-server-2.0.0.tgz", - "integrity": "sha512-hqxQV92Bos0uyZa3P+BAX0nQqjQQMi4vCSxcQHNYEB/jjGV6CnurLBSn63U1VoixGAL4SpHm9OdTa2oVOTUx6Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-dev-server/-/eleventy-dev-server-2.0.1.tgz", + "integrity": "sha512-G92KbOx5vg2G3mlQQ1B0+L+Ni7pcn1yeMgQdnT8b2G20ZnbGNtuGYEPehbQV4Xqr2iAtoBfbihNskbLDoVtNOg==", "dev": true, "license": "MIT", "dependencies": { "@11ty/eleventy-utils": "^1.0.2", "chokidar": "^3.6.0", - "debug": "^4.3.4", + "debug": "^4.3.5", "dev-ip": "^1.0.1", "finalhandler": "^1.2.0", "mime": "^3.0.0", @@ -137,9 +137,9 @@ "morphdom": "^2.7.2", "please-upgrade-node": "^3.2.0", "send": "^0.18.0", - "ssri": "^10.0.5", + "ssri": "^10.0.6", "urlpattern-polyfill": "^10.0.0", - "ws": "^8.16.0" + "ws": "^8.17.0" }, "bin": { "eleventy-dev-server": "cmd.js" @@ -1146,9 +1146,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.788", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.788.tgz", - "integrity": "sha512-ubp5+Ev/VV8KuRoWnfP2QF2Bg+O2ZFdb49DiiNbz2VmgkIqrnyYaqIOqj8A6K/3p1xV0QcU5hBQ1+BmB6ot1OA==", + "version": "1.4.789", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz", + "integrity": "sha512-0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index 4f0075e7..f9a02440 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "18.10.11", + "version": "18.11.11", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/albumReleases.js b/src/_data/albumReleases.js index fc8e9a3d..ec3d190d 100644 --- a/src/_data/albumReleases.js +++ b/src/_data/albumReleases.js @@ -31,9 +31,11 @@ export default async function () { title: album['name'], date: DateTime.fromISO(album['release_date']).toLocaleString(DateTime.DATE_FULL), url: album['release_link'], + image: album['image'], artist_url: `/music/artists/${sanitizeMediaString(album['artists']['name_string'])}-${sanitizeMediaString(parseCountryField(album['artists']['country']))}`, mbid: album['artists']['mbid'], - timestamp: DateTime.fromISO(album['release_date']).toSeconds() + timestamp: DateTime.fromISO(album['release_date']).toSeconds(), + type: 'album-release' } }).sort((a, b) => a.timestamp - b.timestamp) } diff --git a/src/_includes/partials/media/music/releases.liquid b/src/_includes/partials/media/music/releases.liquid deleted file mode 100644 index e7a8bf7f..00000000 --- a/src/_includes/partials/media/music/releases.liquid +++ /dev/null @@ -1,18 +0,0 @@ -

- {% tablericon "calendar-time" "Anticipated albums" %} - Anticipated albums -

- \ No newline at end of file diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index 42c8f81f..94fc4e28 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -82,4 +82,10 @@ schema: music-index {% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, mostPlayed:music.threeMonth.tracks[0].plays, count: 10 %}

More: This week • This month • 3 months

-{% render "partials/media/music/releases.liquid", albumReleases:albumReleases %} \ No newline at end of file +{% if albumReleases.size > 0 %} +

+ {% tablericon "calendar-time" "Anticipated albums" %} + Anticipated albums +

+{% render "partials/media/grid.liquid", data:albumReleases, shape: "square", count: 8 %} +{% endif %} \ No newline at end of file