jessebrault/jb-ssg-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using new wvc features.

Browse Source
This commit is contained in:
JesseBrault0709 2024-06-14 07:37:37 +02:00
parent 1f88d1b76d
commit 4985bb4b86
7 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/resources/com/jessebrault/site/StandardPageTemplate.wvc
View File

@ -9,10 +9,10 @@ import com.jessebrault.site.icon.YoutubeIcon
<body> <body>
<div class="header-banner-container"> <div class="header-banner-container">
<Header /> <Header />
<% children -> children << banner() %> <Outlet children={[banner()]} />
</div> </div>
<main> <main>
<% children -> mainChildren.each { children << it } %> <Outlet children={mainChildren} />
</main> </main>
<footer> <footer>
<div class="social-icons"> <div class="social-icons">

13
pages/groovy/com/jessebrault/site/lessons/LessonsPage.groovy
View File

@ -2,7 +2,6 @@ package com.jessebrault.site.lessons
import com.jessebrault.site.util.TitleMaker import com.jessebrault.site.util.TitleMaker
import com.jessebrault.ssg.di.InjectText import com.jessebrault.ssg.di.InjectText
import com.jessebrault.ssg.di.InjectTexts
import com.jessebrault.ssg.di.SelfPage import com.jessebrault.ssg.di.SelfPage
import com.jessebrault.ssg.page.Page import com.jessebrault.ssg.page.Page
import com.jessebrault.ssg.page.PageSpec 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.' static final String description = 'Information about lessons offered by Jesse Brault.'
final Page selfPage final Page selfPage
final Text lessons
private final TitleMaker titleMaker private final TitleMaker titleMaker
private final Text lessonsText
@Inject @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.selfPage = selfPage
this.titleMaker = titleMaker this.titleMaker = titleMaker
this.lessonsText = lessonsText this.lessons = lessons
} }
String getPageTitle() { String getTitle() {
titleMaker.makeTitle(selfPage.name) titleMaker.makeTitle(pageTitle)
} }
String renderLessons() { String renderLessons() {
this.lessonsText.render() this.lessons.render()
} }
} }

13
pages/groovy/com/jessebrault/site/videos/VideosPage.groovy
View File

@ -2,7 +2,6 @@ package com.jessebrault.site.videos
import com.jessebrault.site.util.TitleMaker import com.jessebrault.site.util.TitleMaker
import com.jessebrault.ssg.di.InjectText import com.jessebrault.ssg.di.InjectText
import com.jessebrault.ssg.di.InjectTexts
import com.jessebrault.ssg.di.SelfPage import com.jessebrault.ssg.di.SelfPage
import com.jessebrault.ssg.page.Page import com.jessebrault.ssg.page.Page
import com.jessebrault.ssg.page.PageSpec import com.jessebrault.ssg.page.PageSpec
@ -16,22 +15,22 @@ class VideosPage extends WvcPageView {
static final String description = 'Conducting videos of Jesse Brault.' static final String description = 'Conducting videos of Jesse Brault.'
final Page selfPage final Page selfPage
final Text videos
private final TitleMaker titleMaker private final TitleMaker titleMaker
private final Text videosText
@Inject @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.selfPage = selfPage
this.titleMaker = titleMaker this.titleMaker = titleMaker
this.videosText = videosText this.videos = videos
} }
String getPageTitle() { String getTitle() {
titleMaker.makeTitle(selfPage.name) titleMaker.makeTitle(pageTitle)
} }
String renderVideos() { String renderVideos() {
videosText.render() videos.render()
} }
} }

2
pages/resources/com/jessebrault/site/biography/BiographyPageTemplate.wvc
View File

@ -18,7 +18,7 @@ import com.jessebrault.site.util.OpenGraph
> >
<div class="article-container"> <div class="article-container">
<article id="biography-article"> <article id="biography-article">
<%= renderBiography() %> <Render item={biography} />
</article> </article>
</div> </div>
</StandardPage> </StandardPage>

2
pages/resources/com/jessebrault/site/composition/CompositionPageTemplate.wvc
View File

@ -65,7 +65,7 @@ import com.jessebrault.site.util.OpenGraph
</WhenNotEmpty> </WhenNotEmpty>
</section> </section>
<section class="composition-text"> <section class="composition-text">
${composition.text.render()} <Render item={composition.text} />
</section> </section>
</article> </article>
</div> </div>

6
pages/resources/com/jessebrault/site/lessons/LessonsPageTemplate.wvc
View File

@ -5,10 +5,10 @@ import com.jessebrault.site.StandardPage
import com.jessebrault.site.util.OpenGraph import com.jessebrault.site.util.OpenGraph
--- ---
<StandardPage <StandardPage
title={pageTitle} title={title}
description={description} description={description}
openGraph={<OpenGraph openGraph={<OpenGraph
title={selfPage.name} title={pageTitle}
description={description} description={description}
path={selfPage.path} path={selfPage.path}
/>} />}
@ -16,7 +16,7 @@ import com.jessebrault.site.util.OpenGraph
> >
<div class="article-container"> <div class="article-container">
<article id="lessons-article"> <article id="lessons-article">
<%= renderLessons() %> <Render item={lessons} />
</article> </article>
</div> </div>
</StandardPage> </StandardPage>

6
pages/resources/com/jessebrault/site/videos/VideosPageTemplate.wvc
View File

@ -5,10 +5,10 @@ import com.jessebrault.site.StandardPage
import com.jessebrault.site.util.OpenGraph import com.jessebrault.site.util.OpenGraph
--- ---
<StandardPage <StandardPage
title={pageTitle} title={title}
description={description} description={description}
openGraph={<OpenGraph openGraph={<OpenGraph
title={selfPage.name} title={pageTitle}
description={description} description={description}
path={selfPage.path} path={selfPage.path}
/>} />}
@ -16,7 +16,7 @@ import com.jessebrault.site.util.OpenGraph
> >
<div class="article-container"> <div class="article-container">
<article id="videos-article"> <article id="videos-article">
<%= renderVideos() %> <Render item={videos} />
</article> </article>
</div> </div>
</StandardPage> </StandardPage>