moritzruth-commissions/dracula-musical
1
0
Fork 0
Code Releases Activity Actions

commit 79

Browse source
This commit is contained in:
Moritz Ruth 2025-03-13 19:31:41 +01:00
parent 858d2107df
commit b3dac25ba3
Signed by: moritzruth
GPG key ID: C9BBAB79405EE56D
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/kotlin/de/moritzruth/theaterdsl/show/Runner.kt
View file

@ -185,7 +185,7 @@ data class StateUpdateMessage(
val state: ShowState val state: ShowState
) )
private fun CoroutineScope.startWebsocketServer(context: ShowContext) = launch(Dispatchers.IO) { private fun CoroutineScope.startWebsocketServer(context: ShowContext) = launch {
val updateMessageJsonFlow = context.stateFlow.map { state -> val updateMessageJsonFlow = context.stateFlow.map { state ->
Json.encodeToString( Json.encodeToString(
StateUpdateMessage( StateUpdateMessage(
@ -195,10 +195,10 @@ private fun CoroutineScope.startWebsocketServer(context: ShowContext) = launch(D
) )
} }
val showJson = Json.encodeToString(context.show) val showJson = withContext(Dispatchers.IO) { Json.encodeToString(context.show) }
val indexHtmlContent = this::class.java.getResourceAsStream("/ui/index.html")!!.reader().use { it.readText() } val indexHtmlContent = withContext(Dispatchers.IO) { this::class.java.getResourceAsStream("/ui/index.html")!!.reader().use { it.readText() } }
embeddedServer(CIO, port = 8000) { embeddedServer(CIO, port = 80) {
install(WebSockets) { install(WebSockets) {
pingPeriod = 10.seconds pingPeriod = 10.seconds
timeout = 15.seconds timeout = 15.seconds

14
ui/src/App.vue
View file

@ -1,9 +1,9 @@
<template> <template>
<div v-if="isConnecting" class="flex flex-col justify-center items-center h-100dvh gap-4"> <div v-if="isConnecting" class="flex flex-col justify-center items-center gap-4" :class="$style.fillScreen">
<div class="font-bold text-10">Connecting…</div> <div class="font-bold text-10">Connecting…</div>
<div class="text-s1">Janus, created by Moritz Ruth</div> <div class="text-s1">Janus, created by Moritz Ruth</div>
</div> </div>
<div v-else class="h-100dvh flex flex-col"> <div v-else class="flex flex-col" :class="$style.fillScreen">
<div class="font-black text-2xl md:text-4xl px-4 pt-4 flex-shrink-0 truncate"> <div class="font-black text-2xl md:text-4xl px-4 pt-4 flex-shrink-0 truncate">
{{ current.act === null ? "" : `${current.act.name} — ` }}{{ current.scene.name }} {{ current.act === null ? "" : `${current.act.name} — ` }}{{ current.scene.name }}
</div> </div>
@ -37,6 +37,16 @@
} }
</style> </style>
<style module lang="scss">
.fillScreen {
height: 100vh;
@supports (height: 100dvh) {
height: 100dvh
}
}
</style>
<script> <script>
import { connect } from "./syncing" import { connect } from "./syncing"
import { ref } from "vue" import { ref } from "vue"