diff --git a/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt b/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt index a9331e7..82e65da 100644 --- a/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt +++ b/src/main/kotlin/de/arindy/dicetower/OverlayResource.kt @@ -5,6 +5,7 @@ import jakarta.ws.rs.GET import jakarta.ws.rs.Path import jakarta.ws.rs.PathParam import jakarta.ws.rs.Produces +import jakarta.ws.rs.QueryParam import jakarta.ws.rs.core.MediaType @Path("overlay/{diceid}") @@ -12,8 +13,8 @@ class OverlayResource { @GET @Produces(MediaType.TEXT_HTML) - fun get(@PathParam("diceid") diceid: String): TemplateInstance { - return Templates.overlay(diceid) + fun get(@PathParam("diceid") diceid: String, @QueryParam("scale") scale: Int? = 7): TemplateInstance { + return Templates.overlay(diceid, scale ?: 7) } @GET diff --git a/src/main/kotlin/de/arindy/dicetower/Templates.kt b/src/main/kotlin/de/arindy/dicetower/Templates.kt index c4343f8..b47f94d 100644 --- a/src/main/kotlin/de/arindy/dicetower/Templates.kt +++ b/src/main/kotlin/de/arindy/dicetower/Templates.kt @@ -6,7 +6,7 @@ import io.quarkus.qute.TemplateInstance @CheckedTemplate object Templates { @JvmStatic - external fun overlay(diceid: String): TemplateInstance + external fun overlay(diceid: String, scale: Int): 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 04ec6fd..295cef4 100644 --- a/src/main/resources/templates/overlay.html +++ b/src/main/resources/templates/overlay.html @@ -41,7 +41,6 @@ } import DiceBox from "/vendor/dice-box/dice-box.es.js"; const evtSource = new EventSource(url() + "/dice/{diceid??}/stream"); - const diceBox = new DiceBox("#dice-box", { assetPath: "/vendor/assets/", theme: 'default', @@ -56,7 +55,7 @@ 'smooth', 'wooden' ], - scale: 7 + scale: {scale} }); document.addEventListener("DOMContentLoaded", async() => { diff --git a/src/main/resources/templates/pub/index.html b/src/main/resources/templates/pub/index.html index 4f34502..7e3c885 100644 --- a/src/main/resources/templates/pub/index.html +++ b/src/main/resources/templates/pub/index.html @@ -89,7 +89,7 @@ } function start(event) { if((!event || event.keyCode === 13) && document.getElementById('name').value.length > 0 && document.getElementById('room').value.length > 0) { - document.getElementById('overlayId').value = url() + '/overlay/' + document.getElementById('room').value + ':' + localStorage.getItem('userId'); + document.getElementById('overlayId').value = url() + '/overlay/' + document.getElementById('room').value + ':' + localStorage.getItem('userId') + '?scale=7'; document.getElementById('resultsId').value = url() + '/overlay/' + document.getElementById('room').value + '/results'; document.getElementById('resultFrame').src = url() + '/overlay/' + document.getElementById('room').value + '/results'; document.getElementById('roll').hidden = false;