From 1a58b23df6e9ccaef5170ca321b590bdbff167fd Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Sun, 2 Jun 2024 15:01:04 +0200
Subject: [PATCH] More detailed composition page.

---
 .../site/composition/CompositionPage.groovy           |  6 ++++++
 .../site/composition/CompositionPageTemplate.wvc      | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pages/groovy/com/jessebrault/site/composition/CompositionPage.groovy b/pages/groovy/com/jessebrault/site/composition/CompositionPage.groovy
index 8d2d8b7..9839c09 100644
--- a/pages/groovy/com/jessebrault/site/composition/CompositionPage.groovy
+++ b/pages/groovy/com/jessebrault/site/composition/CompositionPage.groovy
@@ -4,6 +4,8 @@ import com.jessebrault.site.util.TitleMaker
 import com.jessebrault.ssg.view.WvcPageView
 import jakarta.inject.Inject
 
+import java.time.format.DateTimeFormatter
+
 class CompositionPage extends WvcPageView {
 
     Composition composition
@@ -18,4 +20,8 @@ class CompositionPage extends WvcPageView {
         this.titleMaker.makeTitle(pageTitle)
     }
 
+    String getCompositionYear() {
+        composition.date.format(DateTimeFormatter.ofPattern('yyyy'))
+    }
+
 }
diff --git a/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc b/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
index 52d47f0..90ab1bf 100644
--- a/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
@@ -5,6 +5,15 @@ import com.jessebrault.site.StandardPage
 ---
 <StandardPage title={title}>
     <article>
-        <h1>$composition.title</h1>
+        <section class="composition-info">
+            <h1>$composition.title</h1>
+            <WhenNotNull item={composition.subTitle} render={<h2>$it</h2>} />
+            <WhenNotNull item={composition.version} render={<p class="version">$it</p>} />
+            <p class="year">$compositionYear</p>
+            <p class="instrumentation">$composition.instrumentation</p>
+        </section>
+        <section class="composition-text">
+            ${composition.text.render()}
+        </section>
     </article>
 </StandardPage>