commit 97
This commit is contained in:
parent
1647bd1b88
commit
0a5148cf37
4 changed files with 29 additions and 23 deletions
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<ChangeBlinkingBox :blink-seconds="20" :value="prop" class="flex flex-col items-center">
|
||||
<div class="text-s1 tracking-wide text-gray-400">
|
||||
<div class="text-4 text-center tracking-wide text-gray-400">
|
||||
{{ positionName }}
|
||||
</div>
|
||||
<div class="flex-grow w-full">
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
Publikum
|
||||
</div>
|
||||
</div>
|
||||
<div :class="$style.row" class="border-t border-b border-dark-300 h-20">
|
||||
<div :class="$style.row" class="border-t border-b border-dark-300 h-24">
|
||||
<PropBox :prop="current.step.props.PROSCENIUM_RIGHT" position-name="Rechte Vorbühne"/>
|
||||
<PropBox :prop="current.step.props.PROSCENIUM_CENTER" position-name="Mitte der Vorbühne"/>
|
||||
<PropBox :prop="current.step.props.PROSCENIUM_LEFT" position-name="Linke der Vorbühne"/>
|
||||
|
|
|
@ -1,29 +1,32 @@
|
|||
<template>
|
||||
<div class="h-full flex flex-col gap-10">
|
||||
<div class="flex-grow flex-shrink-0 flex flex-col gap-2">
|
||||
<div class="text-gray text-2xl">
|
||||
Aktuelle Anweisung
|
||||
<div class="grid lg:grid-cols-2 gap-6 h-full">
|
||||
<div class="h-full flex flex-col gap-10">
|
||||
<div class="flex-grow flex-shrink-0 flex flex-col gap-2">
|
||||
<div class="text-gray text-2xl">
|
||||
Aktuelle Anweisung
|
||||
</div>
|
||||
<ChangeBlinkingBox :blink-seconds="10" :value="currentState" class="text-7 md:text-10">
|
||||
{{ getDisplayedCommand(currentState) }}
|
||||
</ChangeBlinkingBox>
|
||||
</div>
|
||||
<ChangeBlinkingBox :blink-seconds="10" :value="currentState" class="text-7 md:text-10">
|
||||
{{ getDisplayedCommand(currentState) }}
|
||||
</ChangeBlinkingBox>
|
||||
</div>
|
||||
<div v-if="nextStepWithChange !== null" class="flex-grow flex-shrink-0 flex flex-col gap-2">
|
||||
<div class="text-gray text-6">
|
||||
Nächste Anweisung
|
||||
<span class="whitespace-nowrap">
|
||||
<div v-if="nextStepWithChange !== null" class="flex-grow flex-shrink-0 flex flex-col gap-2">
|
||||
<div class="text-gray text-6">
|
||||
Nächste Anweisung
|
||||
<span class="whitespace-nowrap">
|
||||
[{{
|
||||
nextStepWithChange.delta === 0
|
||||
? "in dieser Szene"
|
||||
: nextStepWithChange.delta === 1
|
||||
? "in der nächsten Szene"
|
||||
: `in ${nextStepWithChange.delta} Szenen`
|
||||
}}]
|
||||
nextStepWithChange.delta === 0
|
||||
? "in dieser Szene"
|
||||
: nextStepWithChange.delta === 1
|
||||
? "in der nächsten Szene"
|
||||
: `in ${nextStepWithChange.delta} Szenen`
|
||||
}}]
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-7 md:text-10">{{ getDisplayedCommand(nextStepWithChange.state) }}</div>
|
||||
</div>
|
||||
<div class="text-7 md:text-10">{{ getDisplayedCommand(nextStepWithChange.state) }}</div>
|
||||
<MessageEdit class="flex-grow"/>
|
||||
</div>
|
||||
<MessageEdit class="flex-grow"/>
|
||||
<StageTopDownView class="<lg:hidden"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -37,6 +40,7 @@
|
|||
import ChangeBlinkingBox from "@/components/ChangeBlinkingBox.vue"
|
||||
import MessageDisplay from "@/components/MessageDisplay.vue"
|
||||
import MessageEdit from "@/components/MessageEdit.vue"
|
||||
import StageTopDownView from "@/components/StageTopDownView.vue"
|
||||
|
||||
const currentState = computed(() => current.step.curtainState)
|
||||
|
||||
|
|
|
@ -22,8 +22,10 @@ export const connect = () => new Promise<void>(resolve => {
|
|||
url.protocol = "ws"
|
||||
url.pathname = "/api/ws"
|
||||
socket = new ReconnectingWebSocket(url.toString(), [], {
|
||||
minUptime: 1000,
|
||||
connectionTimeout: 2000,
|
||||
reconnectionDelayGrowFactor: 1,
|
||||
minReconnectionDelay: 1000
|
||||
minReconnectionDelay: 100
|
||||
})
|
||||
|
||||
let isFirstMessage = true
|
||||
|
|
Loading…
Add table
Reference in a new issue