From 086cd2078851ed3b0672b43d31981cd21d2bc03b Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Thu, 10 Oct 2024 20:17:45 -0700
Subject: [PATCH] chore: drop shortcode; fix book date finished

---
 .eleventy.js                      | 2 --
 src/pages/dynamic/books/book.html | 2 +-
 src/pages/dynamic/books/year.html | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.eleventy.js b/.eleventy.js
index c3251fac..998faa12 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -11,7 +11,6 @@ import tablerIcons from '@cdransf/eleventy-plugin-tabler-icons'
 import { copyErrorPages, minifyJsComponents } from './config/events/index.js'
 import { processContent, albumReleasesCalendar } from './config/collections/index.js'
 import { cssConfig } from './config/plugins/css-config.js'
-import { DateTime } from 'luxon'
 
 // load .env
 dotenvFlow.config()
@@ -88,7 +87,6 @@ export default async function (eleventyConfig) {
   })
 
   eleventyConfig.addShortcode('appVersion', () => appVersion)
-  eleventyConfig.addShortcode('currentYear', () => DateTime.now().year)
 
   // events
   if (process.env.ELEVENTY_PRODUCTION) eleventyConfig.on('afterBuild', copyErrorPages)
diff --git a/src/pages/dynamic/books/book.html b/src/pages/dynamic/books/book.html
index b1d4dfe9..a4214d45 100644
--- a/src/pages/dynamic/books/book.html
+++ b/src/pages/dynamic/books/book.html
@@ -43,7 +43,7 @@ schema: book
         <p class="sub-meta tattoo">{% tablericon "needle" %} I have a tattoo inspired by this book!</p>
       {%- endif -%}
       {% if book.status == 'finished' %}
-        <p class="sub-meta">Finished on: {{ book.date | date: "%B %e, %Y" }}</p>
+        <p class="sub-meta">Finished on: <strong class="highlight-text">{{ book.date_finished | date: "%B %e, %Y" }}</strong></p>
       {% endif %}
       {% if book.status == 'started' %}
         {%- assign percentage = book.progress | append: '%' -%}
diff --git a/src/pages/dynamic/books/year.html b/src/pages/dynamic/books/year.html
index faaaa63c..9b316683 100644
--- a/src/pages/dynamic/books/year.html
+++ b/src/pages/dynamic/books/year.html
@@ -10,7 +10,7 @@ schema: books-year
 {%- assign bookData = year.data | bookStatus: 'finished' -%}
 {%- assign bookDataFavorites = bookData | bookFavorites -%}
 {%- capture favoriteBooks -%}{{ bookDataFavorites | shuffleArray | mediaLinks: "book", 5 }}{%- endcapture -%}
-{%- capture currentYear -%}{% currentYear %}{%- endcapture -%}
+{%- assign currentYear = 'now' | date: "%Y" -%}
 {%- assign yearString = year.value | append: '' -%}
 {%- assign currentYearString = currentYear | append: '' -%}
 <a class="icon-link" href="/books" title="Go back to the books index page">{% tablericon "arrow-left" %} Back to books</a>