From 1852951f243e66e4b53f184a1de757923e841db2 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sun, 19 May 2024 14:40:22 -0700 Subject: [PATCH] chore: cleanup + organize --- package-lock.json | 10 +++---- package.json | 2 +- src/_includes/book-year.liquid | 2 +- src/_includes/partials/home/status.liquid | 2 +- .../{now => media}/album-releases.liquid | 0 .../media-grid.liquid => media/grid.liquid} | 0 .../{now => media}/progress-bar.liquid | 0 .../{now => media}/track-chart.liquid | 2 +- .../{now => media}/tracks-recent.liquid | 0 src/_includes/partials/now/status.liquid | 1 - .../partials/widgets/post-graph.liquid | 10 ------- src/assets/styles/components/post-graph.css | 25 ----------------- src/assets/styles/index.css | 1 - src/pages/main/music/index.html | 28 +++++++++---------- src/pages/main/music/tracks/3-months.html | 2 +- src/pages/main/music/tracks/all-time.html | 2 +- src/pages/main/music/tracks/this-month.html | 2 +- src/pages/main/music/tracks/this-week.html | 2 +- src/pages/main/watching/index.html | 4 +-- src/posts/2023/2023-in-review.html | 4 +-- .../drying-up-now-page-templates-eleventy.md | 14 +++++----- 21 files changed, 38 insertions(+), 75 deletions(-) rename src/_includes/partials/{now => media}/album-releases.liquid (100%) rename src/_includes/partials/{now/media-grid.liquid => media/grid.liquid} (100%) rename src/_includes/partials/{now => media}/progress-bar.liquid (100%) rename src/_includes/partials/{now => media}/track-chart.liquid (87%) rename src/_includes/partials/{now => media}/tracks-recent.liquid (100%) delete mode 100644 src/_includes/partials/now/status.liquid delete mode 100644 src/_includes/partials/widgets/post-graph.liquid delete mode 100644 src/assets/styles/components/post-graph.css diff --git a/package-lock.json b/package-lock.json index a5b9ff02..db3274ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "16.0.1", + "version": "16.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "16.0.1", + "version": "16.0.2", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", @@ -1158,9 +1158,9 @@ "integrity": "sha512-6AMQ/tl6uI3wXknv8exYJguym/bPHxIW5XOYg7aWCQtMbP4XUDAsWp2pv4o9wtesIF8K7CssNPR93qFOh7D8lw==" }, "node_modules/@emnapi/runtime": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.1.1.tgz", - "integrity": "sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.2.0.tgz", + "integrity": "sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ==", "dev": true, "optional": true, "dependencies": { diff --git a/package.json b/package.json index 03c4e626..ac91d33a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "16.0.1", + "version": "16.0.2", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/book-year.liquid b/src/_includes/book-year.liquid index 3c734229..c45b9212 100644 --- a/src/_includes/book-year.liquid +++ b/src/_includes/book-year.liquid @@ -14,4 +14,4 @@ layout: default

I finished {{ bookData.size }} books in {{ year }}

{% endif %}
-{% render "partials/now/media-grid.liquid", data:bookData, shape: "vertical", count: 200, loading: "eager" %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:bookData, shape: "vertical", count: 200, loading: "eager" %} \ No newline at end of file diff --git a/src/_includes/partials/home/status.liquid b/src/_includes/partials/home/status.liquid index cee88362..2e233518 100644 --- a/src/_includes/partials/home/status.liquid +++ b/src/_includes/partials/home/status.liquid @@ -3,6 +3,6 @@ {%- assign show = tv.recentlyWatched | first -%}

I'm a software developer based in Camarillo, California. I enjoy hanging out with my beautiful family and 3 rescue dogs, technology, automation, music, writing, reading, tv and movies. Lately I've been listening to a lot of {{ artist.title }}, reading {{ book.title }} and watching {{ show.name }}.

- {% render "partials/now/status.liquid", status:status %} +

{{ status.emoji }} {{ status.content }}

{% render "partials/widgets/now-playing.liquid" %}
\ No newline at end of file diff --git a/src/_includes/partials/now/album-releases.liquid b/src/_includes/partials/media/album-releases.liquid similarity index 100% rename from src/_includes/partials/now/album-releases.liquid rename to src/_includes/partials/media/album-releases.liquid diff --git a/src/_includes/partials/now/media-grid.liquid b/src/_includes/partials/media/grid.liquid similarity index 100% rename from src/_includes/partials/now/media-grid.liquid rename to src/_includes/partials/media/grid.liquid diff --git a/src/_includes/partials/now/progress-bar.liquid b/src/_includes/partials/media/progress-bar.liquid similarity index 100% rename from src/_includes/partials/now/progress-bar.liquid rename to src/_includes/partials/media/progress-bar.liquid diff --git a/src/_includes/partials/now/track-chart.liquid b/src/_includes/partials/media/track-chart.liquid similarity index 87% rename from src/_includes/partials/now/track-chart.liquid rename to src/_includes/partials/media/track-chart.liquid index fd4c84bf..7ef68f48 100644 --- a/src/_includes/partials/now/track-chart.liquid +++ b/src/_includes/partials/media/track-chart.liquid @@ -12,7 +12,7 @@
{{ item.artist }} • {{ item.plays }} plays
- {% render "partials/now/progress-bar.liquid", percentage:percentage %} + {% render "partials/media/progress-bar.liquid", percentage:percentage %} {% endfor %} diff --git a/src/_includes/partials/now/tracks-recent.liquid b/src/_includes/partials/media/tracks-recent.liquid similarity index 100% rename from src/_includes/partials/now/tracks-recent.liquid rename to src/_includes/partials/media/tracks-recent.liquid diff --git a/src/_includes/partials/now/status.liquid b/src/_includes/partials/now/status.liquid deleted file mode 100644 index 7c0b9679..00000000 --- a/src/_includes/partials/now/status.liquid +++ /dev/null @@ -1 +0,0 @@ -

{{ status.emoji }} {{ status.content }}

\ No newline at end of file diff --git a/src/_includes/partials/widgets/post-graph.liquid b/src/_includes/partials/widgets/post-graph.liquid deleted file mode 100644 index b15fc6a0..00000000 --- a/src/_includes/partials/widgets/post-graph.liquid +++ /dev/null @@ -1,10 +0,0 @@ -
- {% assign years = postYears | reverse %} - {%- for year in years %} -
-
{{ year.year }}
-
-
{{ year.postCount }}
-
- {% endfor %} -
\ No newline at end of file diff --git a/src/assets/styles/components/post-graph.css b/src/assets/styles/components/post-graph.css deleted file mode 100644 index 6bc041c1..00000000 --- a/src/assets/styles/components/post-graph.css +++ /dev/null @@ -1,25 +0,0 @@ -.post-graph { - margin-top: var(--sizing-base); - margin-bottom: var(--sizing-base); - - & .wrapper { - display: flex; - align-items: center; - height: var(--sizing-3xl); - margin-bottom: var(--sizing-sm); - - & .year { - font-family: var(--font-mono); - } - - & .progress { - background-color: var(--accent-color); - height: 100%; - } - - & .progress, - & .data { - margin-left: var(--sizing-sm); - } - } -} \ No newline at end of file diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index c2cb7bf7..e81f9fe9 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -36,7 +36,6 @@ @import url('./components/media-grid.css') layer(components); @import url('./components/menu.css') layer(components); @import url('./components/paginator.css') layer(components); -@import url('./components/post-graph.css') layer(components); @import url('./components/progress-bar.css') layer(components); @import url('./components/share-button.css') layer(components); @import url('./components/theme-toggle.css') layer(components); diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index 442fce83..97d92b5c 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -24,16 +24,16 @@ permalink: "/music/index.html"
- {% render "partials/now/media-grid.liquid", data:music.week.artists, shape: "square", count: 8, loading: "eager" %} + {% render "partials/media/grid.liquid", data:music.week.artists, shape: "square", count: 8, loading: "eager" %}

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

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

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

@@ -75,20 +75,20 @@ permalink: "/music/index.html"
- {% render "partials/now/tracks-recent.liquid", data:music.recent.tracksChronological %} + {% render "partials/media/tracks-recent.liquid", data:music.recent.tracksChronological %}

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

-{% render "partials/now/album-releases.liquid", albumReleases:albumReleases %} +{% render "partials/media/album-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 3369c53d..af26eccb 100644 --- a/src/pages/main/music/tracks/3-months.html +++ b/src/pages/main/music/tracks/3-months.html @@ -24,7 +24,7 @@ permalink: "/music/tracks/three-months/{% if pagination.pageNumber > 0 %}{{ pagi
{{ item.artist }} • {{ item.plays }} plays
- {% render "partials/now/progress-bar.liquid", percentage:percentage %} + {% render "partials/media/progress-bar.liquid", percentage:percentage %} {% endfor %} diff --git a/src/pages/main/music/tracks/all-time.html b/src/pages/main/music/tracks/all-time.html index 5718b9ce..1bf793be 100644 --- a/src/pages/main/music/tracks/all-time.html +++ b/src/pages/main/music/tracks/all-time.html @@ -24,7 +24,7 @@ permalink: "/music/tracks/all-time/{% if pagination.pageNumber > 0 %}{{ paginati
{{ item.artist }} • {{ item.plays }} plays
- {% render "partials/now/progress-bar.liquid", percentage:percentage %} + {% render "partials/media/progress-bar.liquid", percentage:percentage %} {% endfor %} diff --git a/src/pages/main/music/tracks/this-month.html b/src/pages/main/music/tracks/this-month.html index dc3157c0..b38b9286 100644 --- a/src/pages/main/music/tracks/this-month.html +++ b/src/pages/main/music/tracks/this-month.html @@ -24,7 +24,7 @@ permalink: "/music/tracks/this-month/{% if pagination.pageNumber > 0 %}{{ pagina
{{ item.artist }} • {{ item.plays }} plays
- {% render "partials/now/progress-bar.liquid", percentage:percentage %} + {% render "partials/media/progress-bar.liquid", percentage:percentage %} {% endfor %} diff --git a/src/pages/main/music/tracks/this-week.html b/src/pages/main/music/tracks/this-week.html index 74167a39..42871fac 100644 --- a/src/pages/main/music/tracks/this-week.html +++ b/src/pages/main/music/tracks/this-week.html @@ -24,7 +24,7 @@ permalink: "/music/tracks/this-week/{% if pagination.pageNumber > 0 %}{{ paginat
{{ item.artist }} • {{ item.plays }} plays
- {% render "partials/now/progress-bar.liquid", percentage:percentage %} + {% render "partials/media/progress-bar.liquid", percentage:percentage %} {% endfor %} diff --git a/src/pages/main/watching/index.html b/src/pages/main/watching/index.html index 3fa246da..c2eea2fa 100644 --- a/src/pages/main/watching/index.html +++ b/src/pages/main/watching/index.html @@ -12,12 +12,12 @@ permalink: "/watching/index.html" {% tablericon "movie" "Recent movies" %} Recent movies -{% render "partials/now/media-grid.liquid", data:movies.recentlyWatched, shape: "vertical", count: 6 %} +{% render "partials/media/grid.liquid", data:movies.recentlyWatched, shape: "vertical", count: 6 %}

{% tablericon "device-tv" "Recent shows" %} Recent shows

-{% render "partials/now/media-grid.liquid", data:tv.recentlyWatched, shape: "vertical", count: 6 %} +{% render "partials/media/grid.liquid", data:tv.recentlyWatched, shape: "vertical", count: 6 %}

{% tablericon "star" "Favorite movies" %} diff --git a/src/posts/2023/2023-in-review.html b/src/posts/2023/2023-in-review.html index 135111dc..6efbefdb 100644 --- a/src/posts/2023/2023-in-review.html +++ b/src/posts/2023/2023-in-review.html @@ -18,12 +18,12 @@ tags: ['books', 'music', 'development', 'Eleventy'] {% tablericon "books" "Favorite books" %} Favorite books

-{% render "partials/now/media-grid.liquid", data:roundups['2023'].books, shape: "vertical", count: 6 %} +{% render "partials/media/grid.liquid", data:roundups['2023'].books, shape: "vertical", count: 6 %}

{% tablericon "vinyl" "Favorite albums" %} Favorite books

-{% render "partials/now/media-grid.liquid", data:roundups['2023'].albums, shape: "square", count: 8 %} +{% render "partials/media/grid.liquid", data:roundups['2023'].albums, shape: "square", count: 8 %}

I wrote some things: