From a038703d373c96c0fe60a844a930ca6b36e06843 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Wed, 6 Jul 2022 13:07:40 -0400 Subject: [PATCH] Actually display the error message --- .../net/starshipfights/campaign/endpoints_campaign.kt | 8 +++++++- .../kotlin/net/starshipfights/labs/endpoints_labs.kt | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt index 58f7a9a..956245c 100644 --- a/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt +++ b/src/jvmMain/kotlin/net/starshipfights/campaign/endpoints_campaign.kt @@ -16,11 +16,17 @@ import net.starshipfights.labs.labUrl import net.starshipfights.redirect fun Routing.installCampaign() { - lab("cluster", "Star Clusters") { + lab("cluster", "Star Clusters") { errorMessage -> section { h1 { +"Star Clusters" } p { +"This is only a test and may not be indicative of the finished star-cluster feature for Starship Fights" } form(action = "/labs/cluster", method = FormMethod.post) { + errorMessage?.let { errorMsg -> + p { + style = "color:#d22" + +errorMsg + } + } h2 { +"Generation Parameters" } h3 { +"Background Color" } for (color in StarClusterBackground.values()) { diff --git a/src/jvmMain/kotlin/net/starshipfights/labs/endpoints_labs.kt b/src/jvmMain/kotlin/net/starshipfights/labs/endpoints_labs.kt index c19cf2c..bd8a95a 100644 --- a/src/jvmMain/kotlin/net/starshipfights/labs/endpoints_labs.kt +++ b/src/jvmMain/kotlin/net/starshipfights/labs/endpoints_labs.kt @@ -18,7 +18,7 @@ private val labsSidebar: Sidebar fun labUrl(slug: String) = "/labs/$slug" -fun Routing.lab(slug: String, title: String, pageBody: SECTIONS.() -> Unit) { +fun Routing.lab(slug: String, title: String, pageBody: SECTIONS.(errorMessage: String?) -> Unit) { labs[slug] = title get(labUrl(slug)) { @@ -27,8 +27,7 @@ fun Routing.lab(slug: String, title: String, pageBody: SECTIONS.() -> Unit) { title, call.standardNavBar(), labsSidebar, - pageBody - ) + ) { pageBody(call.request.queryParameters["error"]) } ) } } -- 2.25.1