diff --git a/package-lock.json b/package-lock.json index 716eeb7d..5ae90e1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "16.6.0", + "version": "16.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "16.6.0", + "version": "16.7.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", diff --git a/package.json b/package.json index d43391ed..4d0d14ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "16.6.0", + "version": "16.7.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 6c330050..00466d58 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -8,7 +8,18 @@ Books • {{ book.title }} • {{ meta.siteName }} {% else %} {{ meta.siteName }} - {% endif %} + {%- endif -%} +{%- endcapture -%} +{%- capture pageDescription -%} + {%- if schema == 'blog' -%} + {{ post_excerpt | markdown | strip_html }} + {% elsif book.description %} + {{ book.description }} + {% elsif description %} + {{ description }} + {% else %} + {{ meta.siteDescription }} + {%- endif -%} {%- endcapture -%} {%- capture ogImage -%} {%- if schema == 'blog' -%} @@ -25,7 +36,7 @@ {{ book.image }} {%- else -%} {{ meta.meta_data.opengraph_default }} -{%- endif -%} + {%- endif -%} {%- endcapture -%} @@ -38,8 +49,8 @@ - - + + diff --git a/src/_includes/partials/media/books/year.liquid b/src/_includes/partials/media/books/year.liquid index ace4ad1c..20c3a836 100644 --- a/src/_includes/partials/media/books/year.liquid +++ b/src/_includes/partials/media/books/year.liquid @@ -11,7 +11,7 @@ layout: default {% if yearString == currentYearString %}

I've finished {{ bookData.size }} books this year.

{% else %} -

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

+

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

{% endif %}
{% render "partials/media/grid.liquid", data:bookData, shape: "vertical", count: 200, loading: "eager" %} \ No newline at end of file diff --git a/src/pages/errors/400.html b/src/pages/errors/400.html index 2bc3b12c..d2f4be0e 100644 --- a/src/pages/errors/400.html +++ b/src/pages/errors/400.html @@ -1,5 +1,6 @@ --- title: 400 +description: Nah, that's a bad request. layout: default permalink: /400.html --- diff --git a/src/pages/errors/404.html b/src/pages/errors/404.html index ef3090ff..b12b87f7 100644 --- a/src/pages/errors/404.html +++ b/src/pages/errors/404.html @@ -1,5 +1,6 @@ --- title: 404 +description: What kind of idiots do you have working here? Hurry up and skip out on the room service bill! layout: default permalink: /404.html image: /assets/img/404.jpg diff --git a/src/pages/main/books/index.html b/src/pages/main/books/index.html index 5226f8da..9d2691a3 100644 --- a/src/pages/main/books/index.html +++ b/src/pages/main/books/index.html @@ -1,5 +1,6 @@ --- title: Currently reading • Books +description: Here's what I'm reading at the moment. layout: default permalink: "/books/index.html" updated: "now" diff --git a/src/pages/main/books/want-to-read.html b/src/pages/main/books/want-to-read.html index 504a3829..bb10e102 100644 --- a/src/pages/main/books/want-to-read.html +++ b/src/pages/main/books/want-to-read.html @@ -1,5 +1,6 @@ --- title: Want to read • Books +description: These are books I want to read, sorted in alphabetical order. As one would expect, it will change as I navigate through and add to it. layout: default pagination: data: collections.booksToRead diff --git a/src/pages/main/books/years/2020.html b/src/pages/main/books/years/2020.html index 5e8381c5..a6ab4a86 100644 --- a/src/pages/main/books/years/2020.html +++ b/src/pages/main/books/years/2020.html @@ -1,5 +1,6 @@ --- title: 2020 • Books +description: "This is everything I read in 2020. My favorites were: every book in The Expanse series and I'll Be Gone in the Dark. I finished 34 books in 2020." year: 2020 layout: partials/media/books/year permalink: "/books/years/2020.html" diff --git a/src/pages/main/books/years/2021.html b/src/pages/main/books/years/2021.html index 2880b4bd..15e5ee22 100644 --- a/src/pages/main/books/years/2021.html +++ b/src/pages/main/books/years/2021.html @@ -1,5 +1,6 @@ --- title: 2021 • Books +description: "This is everything I read in 2021. My favorites were: This Is How They Tell Me The World Ends, Sandworm, Empire of Pain, Say Nothing, Sigh, Gone and Leviathan Falls. I finished 53 books in 2021." year: 2021 layout: partials/media/books/year permalink: "/books/years/2021.html" diff --git a/src/pages/main/books/years/2022.html b/src/pages/main/books/years/2022.html index 53b2b4f8..3e0c6ba8 100644 --- a/src/pages/main/books/years/2022.html +++ b/src/pages/main/books/years/2022.html @@ -1,5 +1,6 @@ --- title: 2022 • Books +description: "This is everything I read in 2022. My favorites were: Sellout, The Sins of Our Fathers, Drive, Adnan's Story and The Lazarus Heist. I finished 67 books in 2022." year: 2022 layout: partials/media/books/year permalink: "/books/years/2022.html" diff --git a/src/pages/main/books/years/2023.html b/src/pages/main/books/years/2023.html index a736e3a5..090e147b 100644 --- a/src/pages/main/books/years/2023.html +++ b/src/pages/main/books/years/2023.html @@ -1,5 +1,6 @@ --- title: 2023 • Books +description: "This is everything I read in 2023. My favorites were: Stay True, Where Are Your Boys Tonight?, Trouble Boys, Tracers in the Dark and Girl in a Band. I finished 69 books in 2023." year: 2023 layout: partials/media/books/year permalink: "/books/years/2023.html" diff --git a/src/pages/main/books/years/2024.html b/src/pages/main/books/years/2024.html index b660b7c8..490649b2 100644 --- a/src/pages/main/books/years/2024.html +++ b/src/pages/main/books/years/2024.html @@ -1,5 +1,6 @@ --- title: 2024 • Books +description: "Here's what I'm reading at the moment." year: 2024 layout: partials/media/books/year permalink: "/books/years/2024.html" diff --git a/src/pages/main/feeds.md b/src/pages/main/feeds.md index f84c9bfa..675aefe6 100644 --- a/src/pages/main/feeds.md +++ b/src/pages/main/feeds.md @@ -2,7 +2,7 @@ title: Feeds layout: default permalink: /feeds.html -description: 'Content feeds exposed by and generated from my site.' +description: Content feeds exposed by and generated from my site. ---

{{ title }}

diff --git a/src/pages/main/music/albums/3-months.html b/src/pages/main/music/albums/3-months.html index 8f929729..f57f0d15 100644 --- a/src/pages/main/music/albums/3-months.html +++ b/src/pages/main/music/albums/3-months.html @@ -1,5 +1,6 @@ --- title: Albums • 3 months +description: All of the albums I've listened to over the last 3 months. layout: default pagination: data: music.threeMonth.albums diff --git a/src/pages/main/music/albums/all-time.html b/src/pages/main/music/albums/all-time.html index ee88adde..434dd913 100644 --- a/src/pages/main/music/albums/all-time.html +++ b/src/pages/main/music/albums/all-time.html @@ -1,5 +1,6 @@ --- title: Albums • all time +description: All of the albums I've listened to. layout: default pagination: data: music.allTime.albums diff --git a/src/pages/main/music/albums/this-month.html b/src/pages/main/music/albums/this-month.html index cd101101..79324a3a 100644 --- a/src/pages/main/music/albums/this-month.html +++ b/src/pages/main/music/albums/this-month.html @@ -1,5 +1,6 @@ --- title: Albums • This month +description: All of the albums I've listened to over the past month. layout: default pagination: data: music.month.albums diff --git a/src/pages/main/music/albums/this-week.html b/src/pages/main/music/albums/this-week.html index 867d442f..2e9b7f26 100644 --- a/src/pages/main/music/albums/this-week.html +++ b/src/pages/main/music/albums/this-week.html @@ -1,5 +1,6 @@ --- title: Albums • This week +description: All of the albums I've listened to this week. layout: default pagination: data: music.week.albums diff --git a/src/pages/main/music/artists/3-months.html b/src/pages/main/music/artists/3-months.html index ff2dbfd6..40a7bc46 100644 --- a/src/pages/main/music/artists/3-months.html +++ b/src/pages/main/music/artists/3-months.html @@ -1,5 +1,6 @@ --- title: Artists • 3 months +description: All of the artists I've listened to over the last 3 months. layout: default pagination: data: music.threeMonth.artists diff --git a/src/pages/main/music/artists/all-time.html b/src/pages/main/music/artists/all-time.html index e9fd32bd..73125d10 100644 --- a/src/pages/main/music/artists/all-time.html +++ b/src/pages/main/music/artists/all-time.html @@ -1,5 +1,6 @@ --- title: Artists • all time +description: All of the artists I've listened to. layout: default pagination: data: music.allTime.artists diff --git a/src/pages/main/music/artists/this-month.html b/src/pages/main/music/artists/this-month.html index cc0c4f1c..73210a23 100644 --- a/src/pages/main/music/artists/this-month.html +++ b/src/pages/main/music/artists/this-month.html @@ -1,5 +1,6 @@ --- title: Artists • This month +description: All of the artists I've listened to over the past month. layout: default pagination: data: music.month.artists diff --git a/src/pages/main/music/artists/this-week.html b/src/pages/main/music/artists/this-week.html index 8523be7c..e37f11d2 100644 --- a/src/pages/main/music/artists/this-week.html +++ b/src/pages/main/music/artists/this-week.html @@ -1,5 +1,6 @@ --- title: Artists • This week +description: All of the artists I've listened to this week. layout: default pagination: data: music.week.artists diff --git a/src/pages/main/music/tracks/3-months.html b/src/pages/main/music/tracks/3-months.html index e6726d7f..4bbfa031 100644 --- a/src/pages/main/music/tracks/3-months.html +++ b/src/pages/main/music/tracks/3-months.html @@ -1,5 +1,6 @@ --- title: Tracks • 3 months +description: All of the tracks I've listened to over the last 3 months. layout: default pagination: data: music.threeMonth.tracks diff --git a/src/pages/main/music/tracks/all-time.html b/src/pages/main/music/tracks/all-time.html index 02da90ab..777d5e35 100644 --- a/src/pages/main/music/tracks/all-time.html +++ b/src/pages/main/music/tracks/all-time.html @@ -1,5 +1,6 @@ --- title: Artists • all time +description: All of the tracks I've listened to. layout: default pagination: data: music.allTime.tracks diff --git a/src/pages/main/music/tracks/this-month.html b/src/pages/main/music/tracks/this-month.html index 24deac90..526e85b0 100644 --- a/src/pages/main/music/tracks/this-month.html +++ b/src/pages/main/music/tracks/this-month.html @@ -1,5 +1,6 @@ --- title: Tracks • This month +description: All of the tracks I've listened to over the past month. layout: default pagination: data: music.month.tracks diff --git a/src/pages/main/music/tracks/this-week.html b/src/pages/main/music/tracks/this-week.html index 419ba5b2..d3953bc6 100644 --- a/src/pages/main/music/tracks/this-week.html +++ b/src/pages/main/music/tracks/this-week.html @@ -1,5 +1,6 @@ --- title: Tracks • This week +description: All of the tracks I've listened to this week. layout: default pagination: data: music.week.tracks diff --git a/src/pages/main/now.html b/src/pages/main/now.html index 0eac082d..28e15c8f 100644 --- a/src/pages/main/now.html +++ b/src/pages/main/now.html @@ -2,7 +2,7 @@ title: Now layout: default permalink: /now.html -description: "See what I'm doing now." +description: See what I'm doing now. updated: 2024-05-18T15:49:00Z ---

{{ title }}

diff --git a/src/pages/main/search.html b/src/pages/main/search.html index 6e768f00..1a5620ad 100644 --- a/src/pages/main/search.html +++ b/src/pages/main/search.html @@ -1,6 +1,6 @@ --- title: Search -description: "Search through and find the posts and links on my site." +description: Search through and find the posts and links on my site. layout: default permalink: /search.html --- diff --git a/src/pages/main/watching/favorites/movies.html b/src/pages/main/watching/favorites/movies.html index 53c0ef25..28468762 100644 --- a/src/pages/main/watching/favorites/movies.html +++ b/src/pages/main/watching/favorites/movies.html @@ -1,5 +1,6 @@ --- title: Favorite movies +description: These are my favorite movies. There are many like them, but these are mine. layout: default permalink: "/watching/favorite-movies/index.html" schema: watching diff --git a/src/pages/main/watching/favorites/shows.html b/src/pages/main/watching/favorites/shows.html index f41775eb..559f64a7 100644 --- a/src/pages/main/watching/favorites/shows.html +++ b/src/pages/main/watching/favorites/shows.html @@ -1,5 +1,6 @@ --- title: Favorite shows +description: These are my favorite shows. There are many like them, but these are mine. layout: default permalink: "/watching/favorite-shows/index.html" schema: watching diff --git a/src/pages/main/watching/index.html b/src/pages/main/watching/index.html index d2b32215..76dfc903 100644 --- a/src/pages/main/watching/index.html +++ b/src/pages/main/watching/index.html @@ -1,5 +1,6 @@ --- title: Watching +description: Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion. layout: default permalink: "/watching/index.html" updated: "now" diff --git a/src/pages/main/watching/recent/movies.html b/src/pages/main/watching/recent/movies.html index e51271ee..f9c76aaf 100644 --- a/src/pages/main/watching/recent/movies.html +++ b/src/pages/main/watching/recent/movies.html @@ -1,5 +1,6 @@ --- title: Recent movies +description: These are the movies I've watched recently. There are many like them, but these are mine. layout: default permalink: "/recent/movies/index.html" schema: watching diff --git a/src/pages/main/watching/recent/shows.html b/src/pages/main/watching/recent/shows.html index 52cfa1e8..0375ab1c 100644 --- a/src/pages/main/watching/recent/shows.html +++ b/src/pages/main/watching/recent/shows.html @@ -1,5 +1,6 @@ --- title: Recent shows +description: These are the shows I've watched recently. There are many like them, but these are mine. layout: default permalink: "/recent/shows/index.html" schema: watching diff --git a/src/pages/main/watching/to-watch/movies.html b/src/pages/main/watching/to-watch/movies.html index cd91764f..73ca7100 100644 --- a/src/pages/main/watching/to-watch/movies.html +++ b/src/pages/main/watching/to-watch/movies.html @@ -1,5 +1,6 @@ --- title: Movies to watch +description: These are movies I want to watch, sorted in alphabetical order. As one would expect, it will change as I navigate through and add to it. layout: default pagination: data: movies.toWatch diff --git a/src/pages/main/watching/to-watch/shows.html b/src/pages/main/watching/to-watch/shows.html index a2ee8ece..fcc7f022 100644 --- a/src/pages/main/watching/to-watch/shows.html +++ b/src/pages/main/watching/to-watch/shows.html @@ -1,5 +1,6 @@ --- title: Shows to watch +description: These are shows I want to watch, sorted in alphabetical order. As one would expect, it will change as I navigate through and add to it. layout: default pagination: data: tv.toWatch @@ -11,7 +12,7 @@ schema: watching {% tablericon "arrow-left" "Go back" %} Go back {% if pagination.pageNumber == 0 %}

{{ title }}

-

These are shpws I want to watch, sorted in alphabetical order. As one would expect, it will change as I navigate through and add to it.

+

These are shows I want to watch, sorted in alphabetical order. As one would expect, it will change as I navigate through and add to it.

{% endif %}