cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-16 21:03:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

V2 fix timer (#304)

Browse Source
This commit is contained in:
Carlos Valente
2023-02-28 19:50:37 +01:00
committed by GitHub
parent 99f4738f4a
commit 3e2626d4f9
9 changed files with 320 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/viewers/common/viewerUtils.ts
+1 -2
View File
@@ -20,8 +20,7 @@ export function getTimerByType(timerObject?: TimerTypeParams): string | number |
if (timerObject.timerType === TimerType.CountDown) {
timer = timerObject.current;
} else if (timerObject.timerType === TimerType.CountUp) {
//todo: fix counting down issue in backend later
timer = (timerObject.elapsed ?? 0) < 0 ? 0 : timerObject.elapsed;
timer = timerObject.elapsed;
} else if (timerObject.timerType === TimerType.Clock) {
timer = formatTime(timerObject.clock, formatOptions);
}
apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx
+2 -2
View File
@@ -142,8 +142,8 @@ export default function MinimalTimer(props: MinimalTimerProps) {
const stageTimerCharacters = display.replace('/:/g', '').length;
const timerFontSize = (89 / (stageTimerCharacters - 1)) * (userOptions.size || 1);
const timerClasseNames = `timer ${!isPlaying ? 'timer--paused' : ''} ${showFinished ? 'timer--finished' : ''}`;
const timerClasses = `timer ${!isPlaying ? 'timer--paused' : ''} ${showFinished ? 'timer--finished' : ''}`;
const baseClasses = `minimal-timer ${isMirrored ? 'mirror' : ''}`;
return (
@@ -166,7 +166,7 @@ export default function MinimalTimer(props: MinimalTimerProps) {
<div className='end-message'>{general.endMessage}</div>
) : (
<div
className={timerClasseNames}
className={timerClasses}
style={{
color: userOptions.textColour,
fontSize: `${timerFontSize}vw`,
apps/client/src/features/viewers/timer/Timer.tsx
+3 -3
View File
@@ -78,8 +78,8 @@ export default function Timer(props) {
display = `-${display}`;
}
const timerFontSize = 100 / stageTimerCharacters;
const timerClasseNames = `timer ${!isPlaying ? 'timer--paused' : ''} ${showFinished ? 'timer--finished' : ''}`;
const timerFontSize = 89 / (stageTimerCharacters - 1);
const timerClasses = `timer ${!isPlaying ? 'timer--paused' : ''} ${showFinished ? 'timer--finished' : ''}`;
return (
<div className={showFinished ? `${baseClasses} stage-timer--finished` : baseClasses} data-testid='timer-view'>
@@ -98,7 +98,7 @@ export default function Timer(props) {
<div className='end-message'>{general.endMessage}</div>
) : (
<div
className={timerClasseNames}
className={timerClasses}
style={{
fontSize: `${timerFontSize}vw`,
}}