From 9d72d51013124d9b348bc566945686f337ff7a1e Mon Sep 17 00:00:00 2001 From: Arindy Date: Sun, 9 Feb 2025 22:51:31 +0100 Subject: [PATCH] updates style & introduces results overlay --- compose.yml | 2 + .../de/arindy/dicetower/OverlayResource.kt | 7 + .../de/arindy/dicetower/ResultsResource.kt | 18 +++ .../kotlin/de/arindy/dicetower/Templates.kt | 2 + src/main/resources/templates/overlay.html | 8 +- src/main/resources/templates/pub/index.html | 128 +++++++++--------- src/main/resources/templates/results.html | 39 ++++++ 7 files changed, 136 insertions(+), 68 deletions(-) create mode 100644 src/main/kotlin/de/arindy/dicetower/ResultsResource.kt create mode 100644 src/main/resources/templates/results.html diff --git a/compose.yml b/compose.yml index 101f5dc..d9c1c8a 100644 --- a/compose.yml +++ b/compose.yml @@ -3,6 +3,8 @@ services: container_name: dice-tower image: dice-tower restart: always + networks: + - reverse_proxy networks: reverse_proxy: diff --git a/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt b/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt index 4a88741..a9331e7 100644 --- a/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt +++ b/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt @@ -15,4 +15,11 @@ class OverlayResource { fun get(@PathParam("diceid") diceid: String): TemplateInstance { return Templates.overlay(diceid) } + + @GET + @Path("/results") + @Produces(MediaType.TEXT_HTML) + fun results(@PathParam("diceid") room: String): TemplateInstance { + return Templates.results(room) + } } diff --git a/src/main/kotlin/de/arindy/dicetower/ResultsResource.kt b/src/main/kotlin/de/arindy/dicetower/ResultsResource.kt new file mode 100644 index 0000000..fcc883a --- /dev/null +++ b/src/main/kotlin/de/arindy/dicetower/ResultsResource.kt @@ -0,0 +1,18 @@ +package de.arindy.dicetower + +import io.quarkus.qute.TemplateInstance +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.PathParam +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType + +@Path("results/{room}") +class ResultsResource { + + @GET + @Produces(MediaType.TEXT_HTML) + fun get(@PathParam("room") room: String): TemplateInstance { + return Templates.results(room) + } +} diff --git a/src/main/kotlin/de/arindy/dicetower/Templates.kt b/src/main/kotlin/de/arindy/dicetower/Templates.kt index 47a4f37..c4343f8 100644 --- a/src/main/kotlin/de/arindy/dicetower/Templates.kt +++ b/src/main/kotlin/de/arindy/dicetower/Templates.kt @@ -7,4 +7,6 @@ import io.quarkus.qute.TemplateInstance object Templates { @JvmStatic external fun overlay(diceid: String): TemplateInstance + @JvmStatic + external fun results(room: String): TemplateInstance } diff --git a/src/main/resources/templates/overlay.html b/src/main/resources/templates/overlay.html index af8c2aa..df5515e 100644 --- a/src/main/resources/templates/overlay.html +++ b/src/main/resources/templates/overlay.html @@ -36,8 +36,11 @@
- -

Dice-Tower

-

Welcome to Dice-Tower

-
-
- - - -
-
+ +
+

Dice-Tower

+

Welcome to Dice-Tower

+
+
+
+
+ + + + +
+ + -- 2.47.2