diff --git a/_redirects b/_redirects index 604a4663..aa3c34c4 100644 --- a/_redirects +++ b/_redirects @@ -40,6 +40,8 @@ /posts/2024/link-blogging-using-readwise/ /posts/2024/link-blogging-using-readwise-reader/ 301 /2022/12/automating-email-cleanup-in-gmail /posts/2022/automating-email-cleanup-in-gmail/ 301 /posts/2023/automate-syndicate-content-mastodon-eleventy/ /posts/2023/automate-and-syndicate-content-from-eleventy-to-mastodon/ 301 +/posts/2023/road-to-madness-apple-music-charts/ /posts/2023/road-to-madness-charting-apple-music-listening-data/ 301 +/posts/2023/semi-automated-hashtags-syndicated-posts/ /posts/2023/semi-automated-hashtags-for-syndicated-posts/ 301 # music /music/artists/hyperdontia-denmark-turkiye /music/artists/hyperdontia-denmark-tuerkiye 301 @@ -47,6 +49,7 @@ # 404s /robot.txt /robots.txt 301 robotx.txt /robots.txt 301 +/sitemap /sitemap.xml 301 /sitemap.txt /sitemap.xml 301 /blog / 301 /posts/2024 / 301 diff --git a/package-lock.json b/package-lock.json index caa602cb..3a133ae6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "19.5.19", + "version": "19.6.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "19.5.19", + "version": "19.6.13", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -16,12 +16,12 @@ "youtube-video-element": "^1.1.6" }, "devDependencies": { - "@11ty/eleventy": "3.0.0-alpha.13", + "@11ty/eleventy": "3.0.0-alpha.14", "@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.6.1", - "@supabase/supabase-js": "^2.43.5", + "@cdransf/eleventy-plugin-tabler-icons": "^1.7.0", + "@supabase/supabase-js": "^2.44.1", "dotenv-flow": "^4.1.0", "html-minifier-terser": "^7.2.0", "liquidjs": "^10.14.0", @@ -68,9 +68,9 @@ } }, "node_modules/@11ty/eleventy": { - "version": "3.0.0-alpha.13", - "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.13.tgz", - "integrity": "sha512-LZ1mI2JoB/vu6eIzeh9Eim0istAmKiJ0C5LEYG8HigvGgVsADd7OGHpOeOpDgKjotPSO+DTVh48gQj/cW2mRNw==", + "version": "3.0.0-alpha.14", + "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.14.tgz", + "integrity": "sha512-SQGvi/0cSrgyjhTocO8nGpivQbZBXnFlVLp1M3H8xcdvpXYgCVHiEYvrY79TnDd9Nxvj5QtsQuCiselJb3X16g==", "dev": true, "license": "MIT", "dependencies": { @@ -83,6 +83,7 @@ "@11ty/posthtml-urls": "^1.0.0", "@sindresorhus/slugify": "^2.2.1", "bcp-47-normalize": "^2.3.0", + "chardet": "^2.0.0", "chokidar": "^3.6.0", "cross-spawn": "^7.0.3", "debug": "^4.3.5", @@ -93,7 +94,7 @@ "is-glob": "^4.0.3", "iso-639-1": "^3.1.2", "kleur": "^4.1.5", - "liquidjs": "^10.13.1", + "liquidjs": "^10.14.0", "luxon": "^3.4.4", "markdown-it": "^14.1.0", "micromatch": "^4.0.7", @@ -269,9 +270,9 @@ "license": "MIT" }, "node_modules/@cdransf/eleventy-plugin-tabler-icons": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@cdransf/eleventy-plugin-tabler-icons/-/eleventy-plugin-tabler-icons-1.6.1.tgz", - "integrity": "sha512-ZWR9W1yShXcKQD8/eai27ooPVYhAjnqtrKfkyXEMyiITE7tAQ0PU/V9tarn6X6o1UO4R5MMMJs2e/f9AeaF8lQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@cdransf/eleventy-plugin-tabler-icons/-/eleventy-plugin-tabler-icons-1.7.0.tgz", + "integrity": "sha512-rC0exJmeoiM6C27i7/zIC7A76tUPPeZqOcGe4/Pf/rbywdKQL7eeHMQjkC5I+y5Bn94JJ04PDc4BaHcNfZlpMA==", "dev": true, "license": "MIT" }, @@ -456,9 +457,9 @@ } }, "node_modules/@supabase/postgrest-js": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.15.5.tgz", - "integrity": "sha512-YR4TiitTE2hizT7mB99Cl3V9i00RAY5sUxS2/NuWWzkreM7OeYlP2OqnqVwwb4z6ILn+j8x9e/igJDepFhjswQ==", + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.15.7.tgz", + "integrity": "sha512-TJztay5lcnnKuXjIO/X/aaajOsP8qNeW0k3MqIFoOtRolj5MEAIy8rixNakRk3o23eVCdsuP3iMLYPvOOruH6Q==", "dev": true, "license": "MIT", "dependencies": { @@ -466,9 +467,9 @@ } }, "node_modules/@supabase/realtime-js": { - "version": "2.9.5", - "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.9.5.tgz", - "integrity": "sha512-TEHlGwNGGmKPdeMtca1lFTYCedrhTAv3nZVoSjrKQ+wkMmaERuCe57zkC5KSWFzLYkb5FVHW8Hrr+PX1DDwplQ==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.10.1.tgz", + "integrity": "sha512-SrrXxE8xgwWvjREQMkC9LIHIoCQde+OqkFPKP2s/O0ROjhmJ/iXeLvoWhAzXh9gwire4oaK14/ncL/iRiaVWQw==", "dev": true, "license": "MIT", "dependencies": { @@ -489,17 +490,17 @@ } }, "node_modules/@supabase/supabase-js": { - "version": "2.43.5", - "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.43.5.tgz", - "integrity": "sha512-Y4GukjZWW6ouohMaPlYz8tSz9ykf9jY7w9/RhqKuScmla3Xiklce8eLr8TYAtA+oQYCWxo3RgS3B6O4rd/72FA==", + "version": "2.44.1", + "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.44.1.tgz", + "integrity": "sha512-4vCOkefRoeacmMELIWlYPwsfd9y/stH4fCZ4GZZjiOCHeViIrZ8artdj61MwkjQKFuF1uZ87gCKjtMDKLJsDlA==", "dev": true, "license": "MIT", "dependencies": { "@supabase/auth-js": "2.64.2", "@supabase/functions-js": "2.4.1", "@supabase/node-fetch": "2.6.15", - "@supabase/postgrest-js": "1.15.5", - "@supabase/realtime-js": "2.9.5", + "@supabase/postgrest-js": "1.15.7", + "@supabase/realtime-js": "2.10.1", "@supabase/storage-js": "2.6.0" } }, @@ -532,9 +533,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "20.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.7.tgz", - "integrity": "sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==", + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", "dev": true, "license": "MIT", "dependencies": { @@ -825,9 +826,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001636", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", - "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", + "version": "1.0.30001638", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", + "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", "dev": true, "funding": [ { @@ -845,6 +846,13 @@ ], "license": "CC-BY-4.0" }, + "node_modules/chardet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.0.0.tgz", + "integrity": "sha512-xVgPpulCooDjY6zH4m9YW3jbkaBe3FKIAvF5sj5t7aBNsVl2ljIE+xwJ4iNgiDZHFQvNIpjdKdVOQvvk5ZfxbQ==", + "dev": true, + "license": "MIT" + }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", @@ -1149,9 +1157,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.807", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.807.tgz", - "integrity": "sha512-kSmJl2ZwhNf/bcIuCH/imtNOKlpkLDn2jqT5FJ+/0CXjhnFaOa9cOe9gHKKy71eM49izwuQjZhKk+lWQ1JxB7A==", + "version": "1.4.812", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.812.tgz", + "integrity": "sha512-7L8fC2Ey/b6SePDFKR2zHAy4mbdp1/38Yk5TsARO66W3hC5KEaeKMMHoxwtuH+jcu2AYLSn9QX04i95t6Fl1Hg==", "dev": true, "license": "ISC" }, @@ -2343,9 +2351,9 @@ } }, "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 008eac8b..f49d8fec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "19.5.19", + "version": "19.6.13", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -26,12 +26,12 @@ "youtube-video-element": "^1.1.6" }, "devDependencies": { - "@11ty/eleventy": "3.0.0-alpha.13", + "@11ty/eleventy": "3.0.0-alpha.14", "@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.6.1", - "@supabase/supabase-js": "^2.43.5", + "@cdransf/eleventy-plugin-tabler-icons": "^1.7.0", + "@supabase/supabase-js": "^2.44.1", "dotenv-flow": "^4.1.0", "html-minifier-terser": "^7.2.0", "liquidjs": "^10.14.0", diff --git a/src/_data/nav.js b/src/_data/nav.js index 8f230758..295f582a 100644 --- a/src/_data/nav.js +++ b/src/_data/nav.js @@ -6,14 +6,14 @@ export default async function () { { name: 'Watching', url: '/watching', icon: 'device-tv' }, { name: 'Books', url: '/books', icon: 'books' }, { name: 'Links', icon: 'link' }, - { name: 'About', url: '/about', icon: 'info-square' }, + { name: 'About', url: '/about', icon: 'info-circle' }, { name: 'Search', icon: 'search' }, { name: 'Feeds', icon: 'rss' }, { name: 'Mastodon', icon: 'brand-mastodon' }, ], footer: [ - { name: 'Now' }, { name: 'Uses' }, + { name: 'Colophon' }, { name: 'Blogroll' }, { name: 'Save' }, ], @@ -23,8 +23,8 @@ export default async function () { { name: 'npm', url: 'https://www.npmjs.com/~cdransf', icon: 'brand-npm'}, { name: 'Mastodon', url: 'https://social.lol/@cory', icon: 'brand-mastodon' }, { name: 'ListenBrainz', url: 'https://listenbrainz.org/user/cdransf/', icon: 'brain' }, - { name: 'Instapaper', url: 'https://www.instapaper.com/p/coryd', icon: 'news' }, { name: 'Coffee', url: 'https://buymeacoffee.com/cory', icon: 'coffee' }, + { name: 'Now', url: '/now', icon: 'clock-hour-3' }, { name: 'Webrings', url: '/webrings', icon: 'heart-handshake' }, ], } diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 05ea0738..36751305 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -76,7 +76,7 @@ {{ pageTitle }} - + diff --git a/src/_includes/partials/media/music/chart.liquid b/src/_includes/partials/media/music/chart.liquid index 09f8779f..e6d8f45f 100644 --- a/src/_includes/partials/media/music/chart.liquid +++ b/src/_includes/partials/media/music/chart.liquid @@ -1,29 +1,32 @@
{% assign items = data.items | default: data %} - {% for item in items limit: count | default: items.size %} - {%- assign playTotal = playTotal | default: mostPlayed -%} - {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%} -
-
-
{{ item.rank | formatNumber }}.
-
-
- {{ item.title }} +
    + {% for item in items limit: count | default: items.size %} + {%- assign playTotal = playTotal | default: mostPlayed -%} + {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%} +
  1. +
    +
    +
    +
    + {{ item.title }} +
    + {% capture playsLabel %} + {% if item.plays > 1 %} + plays + {% else %} + play + {% endif %} + {% endcapture %} +
    {{ item.artist }}
    +
    {{ item.plays }} {{ playsLabel }}
    +
    - {% capture playsLabel %} - {% if item.plays > 1 %} - plays - {% else %} - play - {% endif %} - {% endcapture %} -
    {{ item.artist }}
    -
    {{ item.plays }} {{ playsLabel }}
    + {% render "partials/media/progress-bar.liquid", percentage:percentage %}
    -
- {% render "partials/media/progress-bar.liquid", percentage:percentage %} -
- {% endfor %} + + {% endfor %} +
{% unless count %} {% render "partials/widgets/paginator.liquid", pagination:data %} diff --git a/src/_includes/partials/media/music/recent.liquid b/src/_includes/partials/media/music/recent.liquid index 27d1b66e..ff8478f4 100644 --- a/src/_includes/partials/media/music/recent.liquid +++ b/src/_includes/partials/media/music/recent.liquid @@ -5,15 +5,11 @@
{{ alt }}{{ js }}
-