Merge branch 'main' of https://git.luj0ga.de/franconian/www.franconian.net into main
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
commit
ef437880dc
|
@ -6,11 +6,12 @@
|
||||||
let headline = null;
|
let headline = null;
|
||||||
let speaker = null;
|
let speaker = null;
|
||||||
let isIntro = false;
|
let isIntro = false;
|
||||||
let holdDuration = 4000;
|
let holdDuration = 10;
|
||||||
let room = null;
|
let room = null;
|
||||||
let time = null;
|
let time = null;
|
||||||
let startDelay = 1000;
|
let startDelay = 1;
|
||||||
let gracePeriod = 5;
|
let gracePeriod = 360;
|
||||||
|
let interval = null;
|
||||||
|
|
||||||
async function getCurrentTalkByRoomName(roomName, offset) {
|
async function getCurrentTalkByRoomName(roomName, offset) {
|
||||||
if (!offset) {
|
if (!offset) {
|
||||||
|
@ -21,7 +22,7 @@
|
||||||
now = Date.parse(time) + offset;
|
now = Date.parse(time) + offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data) {
|
if (!offset || !data) {
|
||||||
const response = await fetch(scheduleUrl);
|
const response = await fetch(scheduleUrl);
|
||||||
data = await response.json();
|
data = await response.json();
|
||||||
}
|
}
|
||||||
|
@ -90,17 +91,23 @@
|
||||||
if (key === 'bottom') {
|
if (key === 'bottom') {
|
||||||
root.style.setProperty('--bottom', value);
|
root.style.setProperty('--bottom', value);
|
||||||
}
|
}
|
||||||
|
if (key === 'top') {
|
||||||
|
root.style.setProperty('--top', value);
|
||||||
|
}
|
||||||
if (key === 'width') {
|
if (key === 'width') {
|
||||||
root.style.setProperty('--width', value);
|
root.style.setProperty('--width', value);
|
||||||
}
|
}
|
||||||
if (key === 'gracePeriod') {
|
if (key === 'gracePeriod') {
|
||||||
gracePeriod = parseInt(value, 10)
|
gracePeriod = parseInt(value, 10);
|
||||||
|
}
|
||||||
|
if (key === 'interval') {
|
||||||
|
interval = parseInt(value, 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (room) {
|
if (room) {
|
||||||
let offset = gracePeriod * 60 * 1000;
|
let offset = gracePeriod * 1000;
|
||||||
let talk = await getCurrentTalkByRoomName(room);
|
let talk = await getCurrentTalkByRoomName(room);
|
||||||
if (!talk) {
|
if (!talk) {
|
||||||
talk = await getCurrentTalkByRoomName(room, -offset);
|
talk = await getCurrentTalkByRoomName(room, -offset);
|
||||||
|
@ -191,7 +198,7 @@
|
||||||
fadeInText(),
|
fadeInText(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
await new Promise(r => setTimeout(r, holdDuration));
|
await new Promise(r => setTimeout(r, holdDuration * 1000));
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
fadeOut(),
|
fadeOut(),
|
||||||
fadeOutText(),
|
fadeOutText(),
|
||||||
|
@ -283,10 +290,17 @@
|
||||||
await new Promise(r => setTimeout(r, 1000));
|
await new Promise(r => setTimeout(r, 1000));
|
||||||
}
|
}
|
||||||
|
|
||||||
window.addEventListener('load', async () => {
|
async function cycle() {
|
||||||
if (await init()) {
|
if (await init()) {
|
||||||
await new Promise(r => setTimeout(r, startDelay));
|
await new Promise(r => setTimeout(r, startDelay * 1000));
|
||||||
await animate();
|
await animate();
|
||||||
}
|
}
|
||||||
|
if (interval) {
|
||||||
|
setTimeout(cycle, interval * 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
cycle();
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
--bottom: 9vw;
|
--bottom: 9vw;
|
||||||
--left: 12.5vw;
|
--left: 12.5vw;
|
||||||
--width: 67.5vw;
|
--width: 67.5vw;
|
||||||
|
--top: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
:root.theme-main {
|
:root.theme-main {
|
||||||
|
@ -45,6 +46,7 @@ body {
|
||||||
bottom: var(--bottom);
|
bottom: var(--bottom);
|
||||||
left: var(--left);
|
left: var(--left);
|
||||||
width: var(--width);
|
width: var(--width);
|
||||||
|
top: var(--top);
|
||||||
}
|
}
|
||||||
|
|
||||||
.background {
|
.background {
|
||||||
|
|
Loading…
Reference in New Issue