From 63e8c2ec30b6a17701491387ec0d44c7d1d4da38 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Wed, 1 May 2024 15:15:45 -0700 Subject: [PATCH] chore: bug fixes, organization, metadata --- config/filters/index.js | 10 +- package.json | 2 +- src/_data/json/read.json | 97 +++++-------------- src/_includes/book-year.liquid | 7 ++ src/{pages => meta}/opml.liquid | 0 src/{pages => meta}/sitemap.liquid | 0 src/pages/books/years/2024.html | 8 ++ src/pages/{contact.md => contact/index.md} | 0 .../success.html} | 0 src/pages/{ => errors}/400.html | 0 src/pages/{ => errors}/404.html | 0 src/pages/{ => main}/about.md | 0 src/pages/{ => main}/feeds.md | 0 src/pages/{ => main}/now.html | 0 src/pages/{ => main}/search.html | 0 src/pages/{ => secondary}/blogroll.html | 4 - src/pages/{ => secondary}/referrals.md | 0 src/pages/{ => secondary}/stats.html | 0 src/pages/{ => secondary}/uses.md | 0 src/pages/{ => secondary}/webrings.md | 0 src/{pages => }/tag-list.html | 4 + 21 files changed, 54 insertions(+), 78 deletions(-) create mode 100644 src/_includes/book-year.liquid rename src/{pages => meta}/opml.liquid (100%) rename src/{pages => meta}/sitemap.liquid (100%) create mode 100644 src/pages/books/years/2024.html rename src/pages/{contact.md => contact/index.md} (100%) rename src/pages/{contact-success.html => contact/success.html} (100%) rename src/pages/{ => errors}/400.html (100%) rename src/pages/{ => errors}/404.html (100%) rename src/pages/{ => main}/about.md (100%) rename src/pages/{ => main}/feeds.md (100%) rename src/pages/{ => main}/now.html (100%) rename src/pages/{ => main}/search.html (100%) rename src/pages/{ => secondary}/blogroll.html (91%) rename src/pages/{ => secondary}/referrals.md (100%) rename src/pages/{ => secondary}/stats.html (100%) rename src/pages/{ => secondary}/uses.md (100%) rename src/pages/{ => secondary}/webrings.md (100%) rename src/{pages => }/tag-list.html (92%) diff --git a/config/filters/index.js b/config/filters/index.js index 763e34d5..824628a5 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -210,7 +210,7 @@ export default { } if (item.type === 'movie') normalized['alt'] = item['title'] if (item.type === 'book') { - normalized['alt'] = `${item['title']} by ${item['author']}` + normalized['alt'] = `${item['title']} by ${item['authors']}` normalized['subtext'] = `${item['percentage']} finished` normalized['percentage'] = item['percentage'] } @@ -228,6 +228,14 @@ export default { }), calculatePlayPercentage: (plays, mostPlayed) => `${plays/mostPlayed * 100}%`, bookStatus: (books, status) => books.filter(book => book.status === status), + bookFinishedYear: (books, year) => books.filter(book => { + if (book.status === 'finished' && book.dateAdded) return parseInt(book.dateAdded.split('-')[0]) === year + return '' + }).sort((a, b) => { + const dateA = DateTime.fromISO(a.dateAdded) + const dateB = DateTime.fromISO(b.dateAdded) + return dateB - dateA + }), // tags filterTags: (tags) => { diff --git a/package.json b/package.json index 8e62f85e..98ee1558 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "13.2.11", + "version": "13.3.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/json/read.json b/src/_data/json/read.json index 72151ef8..87dc7e3f 100644 --- a/src/_data/json/read.json +++ b/src/_data/json/read.json @@ -503,7 +503,7 @@ }, { "isbn": "9780062916310", - "dateFinished": "2024-04-21", + "dateFinished": "2020-08-12", "status": "finished", "rating": "unrated", "tags": [ @@ -526,7 +526,7 @@ }, { "isbn": "9781601429568", - "dateFinished": "2024-04-21", + "dateFinished": "2020-07-22", "status": "finished", "rating": "unrated", "tags": [ @@ -549,7 +549,7 @@ }, { "isbn": "1937557049", - "dateFinished": "2024-04-21", + "dateFinished": "2018-02-17", "status": "finished", "rating": "unrated", "tags": [ @@ -888,7 +888,7 @@ { "isbn": "9780525656869", "dateFinished": "2024-04-21", - "status": "finished", + "status": "want to read", "rating": "unrated", "tags": [ "politics", @@ -8735,7 +8735,7 @@ }, { "isbn": "9781429925051", - "dateFinished": "2024-04-20", + "dateFinished": "2005-08", "status": "finished", "rating": "unrated", "tags": [ @@ -8745,7 +8745,7 @@ "authors": [ "Steven Gould" ], - "publishedDate": "2008-02-05", + "publishedDate": "2005-08", "description": "An original novel from Steven Gould, creator of the Jumper series, that tells the back story of Griffin O'Connor, a character created for the film of Jumper. What if you could jump? Go anywhere in the world in the blink of an eye? What would you do? Where would you go? What if you were only five years old? Griffin has a secret. It's a secret that he's sworn to his parents to keep, and never tell. Griffin is a Jumper: a person who can teleport to any place he has ever been. The first time was when he was five, and his parents crossed an ocean to protect the secret. The most important time was when he was nine. That was the day that the men came to his house and murdered his parents. Griffin knows that the men were looking for him, and he must never let them find him. Griffin grows up with only two goals: to survive, and to kill the people who want him dead. And a Jumper bent on revenge is not going to let anything stand in his way. Jumper is a major motion picture from 20th Century Fox/New Regency Productions, starring Hayden Christensen, Samuel L. Jackson, Diane Lane, and Jamie Bell. At the Publisher's request, this title is being sold without Digital Rights Management Software (DRM) applied.", "pageCount": 288, "printType": "BOOK", @@ -8758,7 +8758,7 @@ }, { "isbn": "9780812578546", - "dateFinished": "2024-04-20", + "dateFinished": "2005-08-01", "status": "finished", "rating": "unrated", "tags": [ @@ -8768,7 +8768,7 @@ "authors": [ "Steven Gould" ], - "publishedDate": "2005-08", + "publishedDate": "2005-08-01", "description": "Davy, who teleports for government cases, is taken captive by a mysterious group of people who brainwash him for their own purposes, forcing Davy's teleportation-capable wife, Millie, to rescue him.", "pageCount": 388, "printType": "BOOK", @@ -8781,7 +8781,7 @@ }, { "isbn": "9781429987547", - "dateFinished": "2024-04-20", + "dateFinished": "2013-01-08", "status": "finished", "rating": "unrated", "tags": [ @@ -8804,7 +8804,7 @@ }, { "isbn": "9780765357694", - "dateFinished": "2024-04-20", + "dateFinished": "2008-02-05", "status": "finished", "rating": "unrated", "tags": [ @@ -8827,7 +8827,7 @@ }, { "isbn": "9780385263481", - "dateFinished": "2024-04-20", + "dateFinished": "2010-01-01", "status": "finished", "rating": "⭐️⭐️⭐️⭐️⭐️", "tags": [ @@ -8850,7 +8850,7 @@ }, { "isbn": "9780307781918", - "dateFinished": "2024-04-20", + "dateFinished": "2011-01-05", "status": "finished", "rating": "unrated", "tags": [ @@ -8873,7 +8873,7 @@ }, { "isbn": "9780307781895", - "dateFinished": "2024-04-20", + "dateFinished": "2011-02-02", "status": "finished", "rating": "unrated", "tags": [ @@ -8896,7 +8896,7 @@ }, { "isbn": "9780307781925", - "dateFinished": "2024-04-20", + "dateFinished": "2011-01-12", "status": "finished", "rating": "unrated", "tags": [ @@ -8919,7 +8919,7 @@ }, { "isbn": "9780380978939", - "dateFinished": "2024-04-20", + "dateFinished": "2003-07-22", "status": "finished", "rating": "unrated", "tags": [ @@ -8942,7 +8942,7 @@ }, { "isbn": "9780380978946", - "dateFinished": "2024-04-20", + "dateFinished": "2005-06-28", "status": "finished", "rating": "unrated", "tags": [ @@ -8965,7 +8965,7 @@ }, { "isbn": "9780316669078", - "dateFinished": "2024-04-20", + "dateFinished": "2022-03-27", "status": "finished", "rating": "unrated", "tags": [ @@ -8988,7 +8988,7 @@ }, { "isbn": "9781612199160", - "dateFinished": "2024-04-20", + "dateFinished": "2022-08-24", "status": "finished", "rating": "unrated", "tags": [ @@ -9012,7 +9012,7 @@ }, { "isbn": "9780300252989", - "dateFinished": "2024-04-20", + "dateFinished": "2022-08-20", "status": "finished", "rating": "unrated", "tags": [ @@ -9035,33 +9035,9 @@ "language": "en", "link": "https://play.google.com/store/books/details?id=CA7UDwAAQBAJ" }, - { - "isbn": "0593136381", - "dateFinished": "2024-04-20", - "status": "finished", - "rating": "unrated", - "tags": [ - "climate", - "nonfiction" - ], - "title": "Paradise", - "authors": [ - "Lizzie Johnson" - ], - "publishedDate": "2021", - "description": "The definitive firsthand account of California's Camp Fire-the nation's deadliest wildfire in a century-and a riveting examination of what went wrong and how to avert future tragedies as the climate crisis unfolds ... A cautionary tale for a new era of megafires, Paradise is the gripping story of a town wiped off the map and the determination of its people to rise again…", - "pageCount": 433, - "printType": "BOOK", - "categories": [ - "Biography & Autobiography" - ], - "thumbnail": "https://books.google.com/books/content?id=qSk5EAAAQBAJ&printsec=frontcover&img=1&zoom=1&edge=curl&source=gbs_api&w=512", - "language": "en", - "link": "https://books.google.com/books/about/Paradise.html?hl=&id=qSk5EAAAQBAJ" - }, { "isbn": "9781501134630", - "dateFinished": "2024-09-20", + "dateFinished": "2022-09-20", "status": "finished", "rating": "unrated", "tags": [ @@ -10179,7 +10155,7 @@ }, { "isbn": "9780593238738", - "dateFinished": "2024-04-18", + "dateFinished": "2023-04-18", "status": "finished", "rating": "unrated", "tags": [ @@ -10202,32 +10178,9 @@ "language": "en", "link": "https://books.google.com/books/about/It_s_OK_to_Be_Angry_About_Capitalism.html?hl=&id=Q4bmEAAAQBAJ" }, - { - "isbn": "0307279278", - "dateFinished": "2024-04-21", - "status": "finished", - "rating": "unrated", - "tags": [ - "nonfiction" - ], - "title": "The Snakehead", - "authors": [ - "Patrick Radden Keefe" - ], - "publishedDate": "2010-07-27", - "description": "In this thrilling panorama of real-life events, the bestselling author of Empire of Pain investigates a secret world run by a surprising criminal: a charismatic middle-aged grandmother, who from a tiny noodle shop in New York’s Chinatown managed a multi-million dollar business smuggling people. “Reads like a mashup of The Godfather and Chinatown, complete with gun battles, a ruthless kingpin and a mountain of cash. Except that it’s all true.” —Time Keefe reveals the inner workings of Sister Ping’s complex empire and recounts the decade-long FBI investigation that eventually brought her down. He follows an often incompetent and sometimes corrupt INS as it pursues desperate immigrants risking everything to come to America, and along the way, he paints a stunning portrait of a generation of illegal immigrants and the intricate underground economy that sustains and exploits them. Grand in scope yet propulsive in narrative force, The Snakehead is both a kaleidoscopic crime story and a brilliant exploration of the ironies of immigration in America.", - "pageCount": 434, - "printType": "BOOK", - "categories": [ - "True Crime" - ], - "thumbnail": "https://books.google.com/books/content?id=6LByqlMGrAEC&printsec=frontcover&img=1&zoom=1&edge=curl&source=gbs_api&w=512", - "language": "en", - "link": "https://books.google.com/books/about/The_Snakehead.html?hl=&id=6LByqlMGrAEC" - }, { "isbn": "9780999745465", - "dateFinished": "2024-04-21", + "dateFinished": "2021-05-01", "status": "finished", "rating": "unrated", "tags": [ @@ -10251,7 +10204,7 @@ }, { "isbn": "9780307463760", - "dateFinished": "2024-04-21", + "dateFinished": "2021-03-21", "status": "finished", "rating": "unrated", "tags": [ @@ -10276,7 +10229,7 @@ }, { "isbn": "9780385543798", - "dateFinished": "2024-04-21", + "dateFinished": "2020-10-13", "status": "finished", "rating": "unrated", "tags": [ @@ -10300,7 +10253,7 @@ }, { "isbn": "9781101980972", - "dateFinished": "2024-08-28", + "dateFinished": "2021-08-28", "status": "finished", "rating": "unrated", "tags": [ diff --git a/src/_includes/book-year.liquid b/src/_includes/book-year.liquid new file mode 100644 index 00000000..3aadcf3a --- /dev/null +++ b/src/_includes/book-year.liquid @@ -0,0 +1,7 @@ +--- +layout: default +--- +

{{ title }}

+{{ content }} +{% assign bookData = books | bookStatus: 'finished' | bookFinishedYear: year %} +{% render "partials/now/media-grid.liquid", data:bookData, shape: "vertical", count: 200 %} \ No newline at end of file diff --git a/src/pages/opml.liquid b/src/meta/opml.liquid similarity index 100% rename from src/pages/opml.liquid rename to src/meta/opml.liquid diff --git a/src/pages/sitemap.liquid b/src/meta/sitemap.liquid similarity index 100% rename from src/pages/sitemap.liquid rename to src/meta/sitemap.liquid diff --git a/src/pages/books/years/2024.html b/src/pages/books/years/2024.html new file mode 100644 index 00000000..08c44f54 --- /dev/null +++ b/src/pages/books/years/2024.html @@ -0,0 +1,8 @@ +--- +title: 2024 • Books +year: 2024 +layout: book-year +permalink: "/books/years/2024.html" +--- +

This is everything I've read in 2024 — continuing my trend of concentrating on science fiction, tech coverage, pop sci, autobiographies and coverage of musicians I appreciate.

+
\ No newline at end of file diff --git a/src/pages/contact.md b/src/pages/contact/index.md similarity index 100% rename from src/pages/contact.md rename to src/pages/contact/index.md diff --git a/src/pages/contact-success.html b/src/pages/contact/success.html similarity index 100% rename from src/pages/contact-success.html rename to src/pages/contact/success.html diff --git a/src/pages/400.html b/src/pages/errors/400.html similarity index 100% rename from src/pages/400.html rename to src/pages/errors/400.html diff --git a/src/pages/404.html b/src/pages/errors/404.html similarity index 100% rename from src/pages/404.html rename to src/pages/errors/404.html diff --git a/src/pages/about.md b/src/pages/main/about.md similarity index 100% rename from src/pages/about.md rename to src/pages/main/about.md diff --git a/src/pages/feeds.md b/src/pages/main/feeds.md similarity index 100% rename from src/pages/feeds.md rename to src/pages/main/feeds.md diff --git a/src/pages/now.html b/src/pages/main/now.html similarity index 100% rename from src/pages/now.html rename to src/pages/main/now.html diff --git a/src/pages/search.html b/src/pages/main/search.html similarity index 100% rename from src/pages/search.html rename to src/pages/main/search.html diff --git a/src/pages/blogroll.html b/src/pages/secondary/blogroll.html similarity index 91% rename from src/pages/blogroll.html rename to src/pages/secondary/blogroll.html index a93bda63..37b152c3 100644 --- a/src/pages/blogroll.html +++ b/src/pages/secondary/blogroll.html @@ -4,10 +4,6 @@ layout: default permalink: /blogroll.html description: 'These are awesome blogs that I enjoy and you may enjoy too.' --- -{% capture css %} - {% render "../assets/styles/pages/blogroll.css" %} -{% endcapture %} -

{{ title }}

You can download an OPML file containing all of these feeds and import them into your RSS reader.

diff --git a/src/pages/referrals.md b/src/pages/secondary/referrals.md similarity index 100% rename from src/pages/referrals.md rename to src/pages/secondary/referrals.md diff --git a/src/pages/stats.html b/src/pages/secondary/stats.html similarity index 100% rename from src/pages/stats.html rename to src/pages/secondary/stats.html diff --git a/src/pages/uses.md b/src/pages/secondary/uses.md similarity index 100% rename from src/pages/uses.md rename to src/pages/secondary/uses.md diff --git a/src/pages/webrings.md b/src/pages/secondary/webrings.md similarity index 100% rename from src/pages/webrings.md rename to src/pages/secondary/webrings.md diff --git a/src/pages/tag-list.html b/src/tag-list.html similarity index 92% rename from src/pages/tag-list.html rename to src/tag-list.html index 366d9f6d..ad7a6a90 100644 --- a/src/pages/tag-list.html +++ b/src/tag-list.html @@ -19,7 +19,11 @@ eleventyComputed: {{ post.date | date: "%B %e, %Y" }} + {% if author %} + + {% else %} + {% endif %}

{{ post.data.title }}

 {% if author %}via {{ author }}{% endif %}