arindy/dice-tower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

update-styling #4

Merged
arindy merged 5 commits from update-styling into main 2025-02-10 03:35:39 +01:00
Conversation 0 Commits 5 Files Changed 6 +6 -6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f40d85022 - Show all commits

5
src/main/kotlin/de/arindy/dicetower/OverlayResource.kt
View File

@ -5,6 +5,7 @@ import jakarta.ws.rs.GET
import jakarta.ws.rs.Path import jakarta.ws.rs.Path
import jakarta.ws.rs.PathParam import jakarta.ws.rs.PathParam
import jakarta.ws.rs.Produces import jakarta.ws.rs.Produces
import jakarta.ws.rs.QueryParam
import jakarta.ws.rs.core.MediaType import jakarta.ws.rs.core.MediaType
@Path("overlay/{diceid}") @Path("overlay/{diceid}")
@ -12,8 +13,8 @@ class OverlayResource {
@GET @GET
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
fun get(@PathParam("diceid") diceid: String): TemplateInstance { fun get(@PathParam("diceid") diceid: String, @QueryParam("scale") scale: Int? = 7): TemplateInstance {
return Templates.overlay(diceid) return Templates.overlay(diceid, scale ?: 7)
} }
@GET @GET

2
src/main/kotlin/de/arindy/dicetower/Templates.kt
View File

@ -6,7 +6,7 @@ import io.quarkus.qute.TemplateInstance
@CheckedTemplate @CheckedTemplate
object Templates { object Templates {
@JvmStatic @JvmStatic
external fun overlay(diceid: String): TemplateInstance external fun overlay(diceid: String, scale: Int): TemplateInstance
@JvmStatic @JvmStatic
external fun results(room: String): TemplateInstance external fun results(room: String): TemplateInstance
} }

3
src/main/resources/templates/overlay.html
View File

@ -41,7 +41,6 @@
} }
import DiceBox from "/vendor/dice-box/dice-box.es.js"; import DiceBox from "/vendor/dice-box/dice-box.es.js";
const evtSource = new EventSource(url() + "/dice/{diceid??}/stream"); const evtSource = new EventSource(url() + "/dice/{diceid??}/stream");
const diceBox = new DiceBox("#dice-box", { const diceBox = new DiceBox("#dice-box", {
assetPath: "/vendor/assets/", assetPath: "/vendor/assets/",
theme: 'default', theme: 'default',
@ -56,7 +55,7 @@
'smooth', 'smooth',
'wooden' 'wooden'
], ],
scale: 7 scale: {scale}
}); });
document.addEventListener("DOMContentLoaded", async() => { document.addEventListener("DOMContentLoaded", async() => {

2
src/main/resources/templates/pub/index.html
View File

@ -89,7 +89,7 @@
} }
function start(event) { function start(event) {
if((!event || event.keyCode === 13) && document.getElementById('name').value.length > 0 && document.getElementById('room').value.length > 0) { 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('resultsId').value = url() + '/overlay/' + document.getElementById('room').value + '/results';
document.getElementById('resultFrame').src = url() + '/overlay/' + document.getElementById('room').value + '/results'; document.getElementById('resultFrame').src = url() + '/overlay/' + document.getElementById('room').value + '/results';
document.getElementById('roll').hidden = false; document.getElementById('roll').hidden = false;