diff --git a/client/src/common/components/countdown/Countdown.jsx b/client/src/common/components/countdown/Countdown.jsx index 38e5cb451..8f1f3a3e9 100644 --- a/client/src/common/components/countdown/Countdown.jsx +++ b/client/src/common/components/countdown/Countdown.jsx @@ -1,16 +1,7 @@ import { useEffect, useState } from 'react'; +import { formatDisplay } from '../../dateConfig'; import styles from './Countdown.module.css'; -function formatDisplay(seconds, hideZero) { - const format = (val) => `0${Math.floor(val)}`.slice(-2); - const hours = seconds / 3600; - const minutes = (seconds % 3600) / 60; - - if (hideZero && hours < 1) - return [minutes, seconds % 60].map(format).join(':'); - else return [hours, minutes, seconds % 60].map(format).join(':'); -} - export default function Countdown(props) { const { time, small, hideZeroHours } = props; const [clock, setClock] = useState(time); diff --git a/client/src/common/dateConfig.js b/client/src/common/dateConfig.js index 0af90de25..a89197bc0 100644 --- a/client/src/common/dateConfig.js +++ b/client/src/common/dateConfig.js @@ -20,6 +20,17 @@ export const stringFromMillis = ( : `${parseInt(hours) ? `${hours}` : '00'}${delim}${minutes}`; }; +// another go at simpler string formatting (counters) +export function formatDisplay(seconds, hideZero) { + const format = (val) => `0${Math.floor(val)}`.slice(-2); + const hours = seconds / 3600; + const minutes = (seconds % 3600) / 60; + + if (hideZero && hours < 1) + return [minutes, seconds % 60].map(format).join(':'); + else return [hours, minutes, seconds % 60].map(format).join(':'); +} + // millis to seconds export const millisToSeconds = (millis) => { return Math.floor(millis / 1000); diff --git a/client/src/features/control/MessageControl.jsx b/client/src/features/control/MessageControl.jsx index 93eb169e4..bb9c8eb9e 100644 --- a/client/src/features/control/MessageControl.jsx +++ b/client/src/features/control/MessageControl.jsx @@ -28,6 +28,7 @@ export default function MessageControl() { // Handle presenter messages socket.on('messages-presenter', (data) => { + console.log('debug: stting data', data); setPres({ ...data }); }); @@ -52,6 +53,8 @@ export default function MessageControl() { }; }, [socket]); + console.log('debug', pres); + const messageControl = async (action, payload) => { switch (action) { case 'pres-text': @@ -84,9 +87,8 @@ export default function MessageControl() { Presenter screen message