From 4985bb4b863ffe86e35b3cc95149e15098d5e4be Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Fri, 14 Jun 2024 07:37:37 +0200
Subject: [PATCH] Using new wvc features.

---
 .../com/jessebrault/site/StandardPageTemplate.wvc   |  4 ++--
 .../com/jessebrault/site/lessons/LessonsPage.groovy | 13 ++++++-------
 .../com/jessebrault/site/videos/VideosPage.groovy   | 13 ++++++-------
 .../site/biography/BiographyPageTemplate.wvc        |  2 +-
 .../site/composition/CompositionPageTemplate.wvc    |  2 +-
 .../site/lessons/LessonsPageTemplate.wvc            |  6 +++---
 .../jessebrault/site/videos/VideosPageTemplate.wvc  |  6 +++---
 7 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/components/resources/com/jessebrault/site/StandardPageTemplate.wvc b/components/resources/com/jessebrault/site/StandardPageTemplate.wvc
index 79bfd8e..69902de 100644
--- a/components/resources/com/jessebrault/site/StandardPageTemplate.wvc
+++ b/components/resources/com/jessebrault/site/StandardPageTemplate.wvc
@@ -9,10 +9,10 @@ import com.jessebrault.site.icon.YoutubeIcon
     <body>
         <div class="header-banner-container">
             <Header />
-            <% children -> children << banner() %>
+            <Outlet children={[banner()]} />
         </div>
         <main>
-            <% children -> mainChildren.each { children << it } %>
+            <Outlet children={mainChildren} />
         </main>
         <footer>
             <div class="social-icons">
diff --git a/pages/groovy/com/jessebrault/site/lessons/LessonsPage.groovy b/pages/groovy/com/jessebrault/site/lessons/LessonsPage.groovy
index 444428f..ffd07c2 100644
--- a/pages/groovy/com/jessebrault/site/lessons/LessonsPage.groovy
+++ b/pages/groovy/com/jessebrault/site/lessons/LessonsPage.groovy
@@ -2,7 +2,6 @@ package com.jessebrault.site.lessons
 
 import com.jessebrault.site.util.TitleMaker
 import com.jessebrault.ssg.di.InjectText
-import com.jessebrault.ssg.di.InjectTexts
 import com.jessebrault.ssg.di.SelfPage
 import com.jessebrault.ssg.page.Page
 import com.jessebrault.ssg.page.PageSpec
@@ -16,22 +15,22 @@ class LessonsPage extends WvcPageView {
     static final String description = 'Information about lessons offered by Jesse Brault.'
 
     final Page selfPage
+    final Text lessons
     private final TitleMaker titleMaker
-    private final Text lessonsText
 
     @Inject
-    LessonsPage(@SelfPage Page selfPage, TitleMaker titleMaker, @InjectText('/Lessons.md') Text lessonsText) {
+    LessonsPage(@SelfPage Page selfPage, TitleMaker titleMaker, @InjectText('/Lessons.md') Text lessons) {
         this.selfPage = selfPage
         this.titleMaker = titleMaker
-        this.lessonsText = lessonsText
+        this.lessons = lessons
     }
 
-    String getPageTitle() {
-        titleMaker.makeTitle(selfPage.name)
+    String getTitle() {
+        titleMaker.makeTitle(pageTitle)
     }
 
     String renderLessons() {
-        this.lessonsText.render()
+        this.lessons.render()
     }
 
 }
diff --git a/pages/groovy/com/jessebrault/site/videos/VideosPage.groovy b/pages/groovy/com/jessebrault/site/videos/VideosPage.groovy
index 6abdc4d..acd3aad 100644
--- a/pages/groovy/com/jessebrault/site/videos/VideosPage.groovy
+++ b/pages/groovy/com/jessebrault/site/videos/VideosPage.groovy
@@ -2,7 +2,6 @@ package com.jessebrault.site.videos
 
 import com.jessebrault.site.util.TitleMaker
 import com.jessebrault.ssg.di.InjectText
-import com.jessebrault.ssg.di.InjectTexts
 import com.jessebrault.ssg.di.SelfPage
 import com.jessebrault.ssg.page.Page
 import com.jessebrault.ssg.page.PageSpec
@@ -16,22 +15,22 @@ class VideosPage extends WvcPageView {
     static final String description = 'Conducting videos of Jesse Brault.'
 
     final Page selfPage
+    final Text videos
     private final TitleMaker titleMaker
-    private final Text videosText
 
     @Inject
-    VideosPage(@SelfPage Page selfPage, TitleMaker titleMaker, @InjectText('/Videos.md') Text videosText) {
+    VideosPage(@SelfPage Page selfPage, TitleMaker titleMaker, @InjectText('/Videos.md') Text videos) {
         this.selfPage = selfPage
         this.titleMaker = titleMaker
-        this.videosText = videosText
+        this.videos = videos
     }
 
-    String getPageTitle() {
-        titleMaker.makeTitle(selfPage.name)
+    String getTitle() {
+        titleMaker.makeTitle(pageTitle)
     }
 
     String renderVideos() {
-        videosText.render()
+        videos.render()
     }
 
 }
diff --git a/pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc b/pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc
index 46d16d5..32b8ab5 100644
--- a/pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc
@@ -18,7 +18,7 @@ import com.jessebrault.site.util.OpenGraph
 >
     <div class="article-container">
         <article id="biography-article">
-            <%= renderBiography() %>
+            <Render item={biography} />
         </article>
     </div>
 </StandardPage>
diff --git a/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc b/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
index f87ea08..cb740b6 100644
--- a/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
@@ -65,7 +65,7 @@ import com.jessebrault.site.util.OpenGraph
                 </WhenNotEmpty>
             </section>
             <section class="composition-text">
-                ${composition.text.render()}
+                <Render item={composition.text} />
             </section>
         </article>
     </div>
diff --git a/pages/resources/com/jessebrault/site/lessons/LessonsPageTemplate.wvc b/pages/resources/com/jessebrault/site/lessons/LessonsPageTemplate.wvc
index 844e949..8224f39 100644
--- a/pages/resources/com/jessebrault/site/lessons/LessonsPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/lessons/LessonsPageTemplate.wvc
@@ -5,10 +5,10 @@ import com.jessebrault.site.StandardPage
 import com.jessebrault.site.util.OpenGraph
 ---
 <StandardPage
-    title={pageTitle}
+    title={title}
     description={description}
     openGraph={<OpenGraph
-        title={selfPage.name}
+        title={pageTitle}
         description={description}
         path={selfPage.path}
     />}
@@ -16,7 +16,7 @@ import com.jessebrault.site.util.OpenGraph
 >
     <div class="article-container">
         <article id="lessons-article">
-            <%= renderLessons() %>
+            <Render item={lessons} />
         </article>
     </div>
 </StandardPage>
diff --git a/pages/resources/com/jessebrault/site/videos/VideosPageTemplate.wvc b/pages/resources/com/jessebrault/site/videos/VideosPageTemplate.wvc
index af76db4..dcda445 100644
--- a/pages/resources/com/jessebrault/site/videos/VideosPageTemplate.wvc
+++ b/pages/resources/com/jessebrault/site/videos/VideosPageTemplate.wvc
@@ -5,10 +5,10 @@ import com.jessebrault.site.StandardPage
 import com.jessebrault.site.util.OpenGraph
 ---
 <StandardPage
-    title={pageTitle}
+    title={title}
     description={description}
     openGraph={<OpenGraph
-        title={selfPage.name}
+        title={pageTitle}
         description={description}
         path={selfPage.path}
     />}
@@ -16,7 +16,7 @@ import com.jessebrault.site.util.OpenGraph
 >
     <div class="article-container">
         <article id="videos-article">
-            <%= renderVideos() %>
+            <Render item={videos} />
         </article>
     </div>
 </StandardPage>
