From 274f2efb2e6c2771baaaad0a3f4c4e631ff5263e Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Sun, 2 Jun 2024 15:10:42 +0200
Subject: [PATCH] Added Near, Under, Far, new category, and urls to composition
 pages.

---
 .../site/composition/CompositionListing.groovy         |  6 +++++-
 .../site/composition/CompositionListingTemplate.wvc    |  4 ++--
 ssg/default.groovy                                     |  2 +-
 texts/compositions/NearUnderFar.md                     | 10 ++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 texts/compositions/NearUnderFar.md

diff --git a/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy b/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
index f7ddbeb..24094c1 100644
--- a/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
+++ b/components/groovy/com/jessebrault/site/composition/CompositionListing.groovy
@@ -12,8 +12,12 @@ class CompositionListing extends BaseWebViewComponent {
         this.composition = composition
     }
 
-    String renderDate() {
+    String getCompositionDate() {
         composition.date.format(DateTimeFormatter.ofPattern('yyyy'))
     }
 
+    String getCompositionUrl() {
+        '/compositions/' + composition.slug
+    }
+
 }
diff --git a/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc b/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
index 5fe5b1f..cedda9d 100644
--- a/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
+++ b/components/resources/com/jessebrault/site/composition/CompositionListingTemplate.wvc
@@ -3,7 +3,7 @@ package com.jessebrault.site.composition
 ---
 <div class="composition-listing">
     <div class="info-row-1">
-        <h4 class="title">$composition.title</h4>
+        <h4 class="title"><a href={compositionUrl}>$composition.title</a></h4>
         <WhenNotNull item={composition.subTitle} render={<h5 class="sub-title">$it</h5>} />
         <WhenNotNull item={composition.version} render={<span class="version">$it</span>} />
     </div>
@@ -14,6 +14,6 @@ package com.jessebrault.site.composition
         <div class="info-row-3"><span class="short-info">$composition.shortInfo</span></div>
     } />
     <div class="date-column">
-        <span class="date">${renderDate()}</span>
+        <span class="date">$compositionDate</span>
     </div>
 </div>
diff --git a/ssg/default.groovy b/ssg/default.groovy
index acb8d84..96f3675 100644
--- a/ssg/default.groovy
+++ b/ssg/default.groovy
@@ -15,7 +15,7 @@ build {
     globals {
         siteTagLine = 'Conductor and Composer'
         menuItems = ['Biography', 'Compositions']
-        compositionCategories = ['Chamber']
+        compositionCategories = ['Chamber', 'Solo']
     }
     objectFactoryBuilder.configure {
         configureRegistry {
diff --git a/texts/compositions/NearUnderFar.md b/texts/compositions/NearUnderFar.md
new file mode 100644
index 0000000..05db072
--- /dev/null
+++ b/texts/compositions/NearUnderFar.md
@@ -0,0 +1,10 @@
+---
+title: Near, Under, Far
+slug: near-under-far
+instrumentation: For solo cello.
+shortInfo: Based on <em>Die blaue Eiche</em> by Luc Tuymans.
+date: 2021-03-01
+categories: 
+  - Solo
+---
+Information about _Near, Under, Far_.