dates are millis

This commit is contained in:
cv
2021-04-12 22:21:18 +02:00
parent 19bb1904f6
commit 023c8c446e
10 changed files with 61 additions and 54 deletions
+8 -8
View File
@@ -16,8 +16,8 @@ export const sampleData = {
title: 'Is the internet a fad?',
subtitle: 'It is',
presenter: 'Carlos Valente',
timeStart: new Date('October 13, 2014 11:30:00'),
timeEnd: new Date('October 13, 2014 11:50:00'),
timeStart: 37800000,
timeEnd: 39600000,
clockStarted: dummy,
timerDuration: 60,
type: 'event',
@@ -25,7 +25,7 @@ export const sampleData = {
{
id: 0.4849093424577693,
order: 2,
timerDuration: 25,
duration: 25*60000,
type: 'delay',
},
{
@@ -34,10 +34,10 @@ export const sampleData = {
title: 'Is reddit a dictatorship?',
subtitle: 'It is',
presenter: 'Carlos Valente',
timeStart: new Date('October 13, 2014 12:30:00'),
timeEnd: new Date('October 13, 2014 12:50:00'),
timeStart: 39600000,
timeEnd: 40320000,
clockStarted: dummy,
timerDuration: 60,
timerDuration: 60*60000,
type: 'event',
},
{
@@ -46,8 +46,8 @@ export const sampleData = {
title: 'Out of words',
subtitle: '',
presenter: 'Carlos Valente',
timeStart: new Date('October 13, 2014 13:30:00'),
timeEnd: new Date('October 13, 2014 13:50:00'),
timeStart: 41400000,
timeEnd: 43200000,
clockStarted: dummy,
timerDuration: 60,
type: 'event',
-5
View File
@@ -29,11 +29,6 @@ export const millisToMinutes = (millis) => {
return Math.floor(millis / 60000);
};
// make date with string
export const timeToDate = (time) => {
return new Date(refDate.toDateString() + ' ' + time);
};
// timeStringToMillis
export const timeStringToMillis = (string) => {
let time = string.split(':');
+2 -1
View File
@@ -1,3 +1,4 @@
import { millisToMinutes } from '../dateConfig';
import style from './EditableTimer.module.css';
export default function DelayValue(props) {
@@ -5,7 +6,7 @@ export default function DelayValue(props) {
const delayed = delay > 0;
return (
<div className={delayed ? style.delayValue : undefined}>
{delayed && <span>{`+ ${delay}`}</span>}
{delayed && <span>{`+ ${millisToMinutes(delay)}`}</span>}
</div>
);
}
@@ -1,9 +1,6 @@
import { IconButton } from '@chakra-ui/button';
import style from './PlaybackControl.module.css';
import Countdown from '../../common/components/countdown/Countdown';
import { FiPause, FiSkipBack, FiSkipForward, FiClock } from 'react-icons/fi';
import { format } from 'date-fns';
import { timeFormatSeconds } from '../../common/dateConfig';
import { stringFromMillis } from '../../common/dateConfig';
import { useEffect, useState } from 'react';
import {
getStart,
@@ -13,7 +10,6 @@ import {
getNext,
} from '../../app/api/playbackApi';
import { useSocket } from '../../app/context/socketContext';
import PlayIconButton from '../../common/components/buttons/StartIconBtn';
import StartIconBtn from '../../common/components/buttons/StartIconBtn';
import PauseIconBtn from '../../common/components/buttons/PauseIconBtn';
import PrevIconBtn from '../../common/components/buttons/PrevIconBtn';
@@ -92,12 +88,8 @@ export default function PlaybackControl() {
}
};
const started = timer?.startedAt
? format(timer.startedAt, timeFormatSeconds)
: '...';
const finish = timer?.expectedFinish
? format(timer.expectedFinish, timeFormatSeconds)
: '...';
const started = stringFromMillis(timer.startedAt, true);
const finish = stringFromMillis(timer.expectedFinish, true);
return (
<div className={style.mainContainer}>
@@ -39,7 +39,7 @@ export default function EventList(props) {
/>
);
} else if (e.type === 'delay') {
cumulativeDelay = cumulativeDelay + e.timerDuration;
cumulativeDelay = cumulativeDelay + e.duration;
return (
<DelayBlock
key={e.id}
@@ -36,13 +36,13 @@ export default function DefaultPresenter() {
const timer = differenceInSeconds(
now,
subMinutes(clockStarted, values.timerDuration)
subMinutes(clockStarted, values.duration)
);
const timeStart = format(values.timeStart, 'HH:mm');
const currentTime = format(now, 'HH:mm');
const timeEnd = format(values.timeEnd, 'HH:mm');
const elapsed = timer / (values.timerDuration * 60);
const elapsed = timer / (values.duration * 60);
return (
<div className='presenter'>