mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-20 14:39:06 +00:00
styles: muly
- change progressbar (show countdown instead of ellapsed) - fix issue where it would not refresh if there was no time - add style countdown to red background
This commit is contained in:
@@ -3,16 +3,21 @@ import styles from './MyProgressBar.module.css';
|
|||||||
|
|
||||||
export default function MyProgressBar(props) {
|
export default function MyProgressBar(props) {
|
||||||
const { now, complete, showElapsed } = props;
|
const { now, complete, showElapsed } = props;
|
||||||
const percentComplete = showElapsed
|
|
||||||
? clamp((100 - (now * 100) / complete), 0, 100)
|
let percentComplete = showElapsed ? 0 : 100;
|
||||||
: clamp((now * 100) / complete, 0, 100)
|
|
||||||
|
if (now != null && complete != null) {
|
||||||
|
percentComplete = showElapsed
|
||||||
|
? clamp(100 - (now * 100) / complete, 0, 100)
|
||||||
|
: clamp((now * 100) / complete, 0, 100);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.progress}>
|
<div className={showElapsed ? styles.progress : styles.progressCountdown}>
|
||||||
<div
|
<div
|
||||||
className={styles.progressBar}
|
className={styles.progressBar}
|
||||||
style={{ width: `${percentComplete}%` }}
|
style={{ width: `${percentComplete}%` }}
|
||||||
></div>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,22 @@
|
|||||||
.progress {
|
.progress,
|
||||||
|
.progressCountdown {
|
||||||
height: 2vh;
|
height: 2vh;
|
||||||
background-color: rgba(255, 255, 255, 0.13);
|
background-color: rgba(255, 255, 255, 0.13);
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.progress {
|
||||||
|
background-color: rgba(255, 255, 255, 0.13);
|
||||||
|
}
|
||||||
|
|
||||||
|
.progressCountdown {
|
||||||
|
background-color: #ff7597;
|
||||||
|
}
|
||||||
|
|
||||||
.progressBar {
|
.progressBar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 2vh;
|
height: 2vh;
|
||||||
background-color: rgba(255, 255, 255, 0.79);
|
background-color: rgb(255, 255, 255);
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
transition: 1s linear;
|
transition: 1s linear;
|
||||||
transition-property: width;
|
transition-property: width;
|
||||||
|
|||||||
@@ -71,11 +71,7 @@ export default function PresenterView(props) {
|
|||||||
isPlaying ? style.progressContainer : style.progressContainerPaused
|
isPlaying ? style.progressContainer : style.progressContainerPaused
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<MyProgressBar
|
<MyProgressBar now={normalisedTime} complete={time.durationSeconds} />
|
||||||
now={normalisedTime}
|
|
||||||
complete={time.durationSeconds}
|
|
||||||
showElapsed
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user