Hotfix/4.0.2 (#64)

* hotfix 4.0.2: implement playback router
* hotfix 4.0.2: fix studio clock styles
* hotfix 4.0.2: broadcast clock always
* hotfix 4.0.2: fix overflow in timer control

client/src/features/control/PlaybackButtons.jsx

@@ -1,5 +1,5 @@
 import { memo } from 'react';
-import style from './PlaybackControl.module.css';
+import style from './PlaybackControl.module.scss';
 import StartIconBtn from 'common/components/buttons/StartIconBtn';
 import PauseIconBtn from 'common/components/buttons/PauseIconBtn';
 import PrevIconBtn from 'common/components/buttons/PrevIconBtn';

client/src/features/control/PlaybackControl.jsx

@@ -1,4 +1,4 @@
-import style from './PlaybackControl.module.css';
+import style from './PlaybackControl.module.scss';
 import { useEffect, useState } from 'react';
 import { useSocket } from 'app/context/socketContext';
 import PlaybackButtons from './PlaybackButtons';

client/src/features/control/PlaybackControl.module.scss

@@ -97,6 +97,10 @@
   grid-area: fin;
 }
 
+.roll {
+  grid-area: 2 / 2 / 2 / 4 ;
+}
+
 .time {
   color: #ccc;
   font-size: 1.1em;

client/src/features/control/PlaybackTimer.jsx

@@ -1,9 +1,9 @@
-import style from './PlaybackControl.module.css';
+import style from './PlaybackControl.module.scss';
 import Countdown from 'common/components/countdown/Countdown';
-import { stringFromMillis } from 'common/utils/dateConfig';
-import { Tooltip } from '@chakra-ui/react';
-import { Button } from '@chakra-ui/button';
-import { memo } from 'react';
+import {stringFromMillis} from 'common/utils/dateConfig';
+import {Tooltip} from '@chakra-ui/react';
+import {Button} from '@chakra-ui/button';
+import {memo} from 'react';
 
 const areEqual = (prevProps, nextProps) => {
   return (
@@ -16,7 +16,7 @@ const areEqual = (prevProps, nextProps) => {
 };
 
 const PlaybackTimer = (props) => {
-  const { timer, playback, handleIncrement } = props;
+  const {timer, playback, handleIncrement} = props;
   const started = stringFromMillis(timer.startedAt, true);
   const finish = stringFromMillis(timer.expectedFinish, true);
   const isNegative = timer.running < 0;
@@ -28,7 +28,7 @@ const PlaybackTimer = (props) => {
     width: '2.9em',
     colorScheme: 'whiteAlpha',
     variant: 'outline',
-    _focus: { boxShadow: 'none' },
+    _focus: {boxShadow: 'none'},
   };
 
   return (
@@ -36,12 +36,12 @@ const PlaybackTimer = (props) => {
       <div className={style.timeContainer}>
         <div className={style.indicators}>
           <Tooltip label='Roll mode active'>
-            <div className={isRolling ? style.indRollActive : style.indRoll} />
+            <div className={isRolling ? style.indRollActive : style.indRoll}/>
           </Tooltip>
           <div
             className={isNegative ? style.indNegativeActive : style.indNegative}
           />
-          <div className={style.indDelay} />
+          <div className={style.indDelay}/>
         </div>
         <div className={style.timer}>
           <Countdown
@@ -51,7 +51,7 @@ const PlaybackTimer = (props) => {
           />
         </div>
         {isWaiting ? (
-          <div className={style.start}>
+          <div className={style.roll}>
             <span className={style.rolltag}>Roll: Countdown to start</span>
             <span className={style.time}>{''}</span>
           </div>

client/src/features/viewers/studio/StudioClock.jsx

@@ -6,13 +6,13 @@ import {formatDisplay} from "../../../common/utils/dateConfig";
 import {formatEventList, trimEventlist} from "../../../common/utils/eventsManager";
 
 export default function StudioClock(props) {
-  const { title, time, backstageEvents, selectedId, nextId, onAir } = props;
-  const { fontSize, ref } = useFitText({maxFontSize:500});
-  const [hoursNow, minutesNow] = time.clockNoSeconds.split(':');
+  const {title, time, backstageEvents, selectedId, nextId, onAir} = props;
+  const {fontSize, ref} = useFitText({maxFontSize: 500});
+  const [, , secondsNow] = time.clock.split(':');
   const [schedule, setSchedule] = useState([]);
 
-  const hoursIndicators = [...Array(12).keys()];
-  const minutesIndicators = [...Array(60).keys()];
+  const activeIndicators = [...Array(12).keys()];
+  const secondsIndicators = [...Array(60).keys()];
   const MAX_TITLES = 8;
 
   // Set window title
@@ -35,35 +35,35 @@ export default function StudioClock(props) {
 
   return (
     <div className={style.container}>
-      <NavLogo />
+      <NavLogo/>
       <div className={style.clockContainer}>
         <div className={style.time}>{time.clockNoSeconds}</div>
         <div
           ref={ref}
           className={style.nextTitle}
-          style={{fontSize, height:'100px', width:'100%', maxWidth:'680px'}}
+          style={{fontSize, height: '100px', width: '100%', maxWidth: '680px'}}
         >
           {title.titleNext}
         </div>
-          <div className={time.running > 0 ? style.nextCountdown: style.nextCountdown__overtime}>
-            {selectedId != null && formatDisplay(time.running)}
-          </div>
+        <div className={time.running > 0 ? style.nextCountdown : style.nextCountdown__overtime}>
+          {selectedId != null && formatDisplay(time.running)}
+        </div>
         <div className={style.indicators}>
-          {hoursIndicators.map(i => (
+          {activeIndicators.map(i => (
               <div
-                key = {i}
-                className={i <= hoursNow ? style.hours__active : style.hours}
+                key={i}
+                className={style.hours__active}
                 style={{
-                  transform: `rotate(${360/12*i-90}deg) translateX(380px)`
+                  transform: `rotate(${360 / 12 * i - 90}deg) translateX(380px)`
                 }}/>
             )
           )}
-          {minutesIndicators.map(i => (
+          {secondsIndicators.map(i => (
               <div
                 key={i}
-                className={i <= minutesNow ? style.min__active : style.min}
+                className={i <= secondsNow ? style.min__active : style.min}
                 style={{
-                  transform: `rotate(${360/60*i-90}deg) translateX(415px)`
+                  transform: `rotate(${360 / 60 * i - 90}deg) translateX(415px)`
                 }}/>
             )
           )}
@@ -75,9 +75,9 @@ export default function StudioClock(props) {
           <ul>
             {schedule.map((s) => (
               <li key={s.id} className={s.isNow ? style.now : s.isNext ? style.next : ''}>
-               <div className={s.isNow ? style.decorator__active : s.isNext ? style.decorator__next : style.decorator}/>{`${s.time} ${s.title}`}
+                {`${s.time} ${s.title}`}
               </li>
-              ))
+            ))
             }
           </ul>
         </div>

client/src/features/viewers/studio/StudioClock.module.scss

@@ -11,7 +11,7 @@
   height: 100vh;
   padding: 1vw;
 
-  background: #111;
+  background: #000;
 
   display: grid;
   grid-template-columns: 1000px 1fr;
@@ -26,7 +26,7 @@
   $size-min: 18px;
   $half-min: 9px;
   $red-active: #c53030;
-  $red-idle: darken($red-active, 30%);
+  $red-idle: #300000;
   $cyan-active: #0ff;
   $cyan-idle: #0aa;
 
@@ -46,9 +46,8 @@
     .time {
       margin-top: 175px;
       color: $red-active;
-      font-size: 275px;
+      font-size: 300px;
       line-height: 0.8em;
-      text-shadow: rgb(180,0,0) 0 0 20px;
     }
     .nextTitle:after,
     .nextCountdown:after,
@@ -118,13 +117,11 @@
     font-family: digital-clock, monospace;
     text-transform: uppercase;
 
-
     .onAir,
     .onAir__idle{
       padding-bottom: 50px;
-      font-size: 190px;
+      font-size: 170px;
       line-height: 0.9em;
-      letter-spacing: 0.05em;
     }
     .onAir {
       color: $red-active;
@@ -148,30 +145,10 @@
         gap: 20px;
       }
       .now {
-        color: $cyan-active;
-        text-shadow: rgb(0,100,100) 0 0 20px;
+        color: $red-active;
       }
       .next {
-        color: $red-active;
-        text-shadow: rgb(100,0,0) 0 0 20px;
-      }
-      .decorator,
-      .decorator__active,
-      .decorator__next {
-        aspect-ratio: 1;
-        border-radius: 50%;
-        background: $red-idle;
-        min-height: $size-hours;
-        max-height: $size-hours;
-        width: $size-hours;
-      }
-      .decorator__active {
-        background: $cyan-active;
-        box-shadow: 0 0 10px 2px rgba(0,255,255,0.25);
-      }
-      .decorator__next{
-        background: $red-active;
-        box-shadow: 0 0 10px 2px rgba(255,0,0,0.25);
+        color: $cyan-active;
       }
     }
   }