V2 fix socket (#296)

* refactor: rename timer endpoint

* refactor: typescript

* refactor: rename eventData and viewSettings

* refactor: message manager uses event store

apps/client/src/features/viewers/ViewWrapper.jsx

@@ -3,7 +3,7 @@ import { useEffect, useMemo, useState } from 'react';
 
 import { useMessageControl } from '../../common/hooks/useSocket';
 import useSubscription from '../../common/hooks/useSubscription';
-import useEvent from '../../common/hooks-query/useEvent';
+import useEventData from '../../common/hooks-query/useEventData';
 import useRundown from '../../common/hooks-query/useRundown';
 import useViewSettings from '../../common/hooks-query/useViewSettings';
 import socket from '../../common/utils/socket';
@@ -11,13 +11,13 @@ import socket from '../../common/utils/socket';
 const withSocket = (Component) => {
   return (props) => {
     const { data: eventsData } = useRundown();
-    const { data: genData } = useEvent();
+    const { data: genData } = useEventData();
     const { data: viewSettings } = useViewSettings();
-    const { data: messages } = useMessageControl();
+    const { data: messageControl } = useMessageControl();
 
     const [publicSelectedId, setPublicSelectedId] = useState(null);
 
-    const [timer] = useSubscription('ontime-timer', {
+    const [timer] = useSubscription('timer', {
       clock: null,
       current: null,
       elapsed: null ,
@@ -123,9 +123,9 @@ const withSocket = (Component) => {
     return (
       <Component
         {...props}
-        pres={messages.presenter}
-        publ={messages.public}
-        lower={messages.lower}
+        pres={messageControl.messages.presenter}
+        publ={messageControl.messages.public}
+        lower={messageControl.messages.lower}
         title={titleManager}
         publicTitle={publicTitleManager}
         time={TimeManagerType}
@@ -136,7 +136,7 @@ const withSocket = (Component) => {
         viewSettings={viewSettings}
         nextId={nextId}
         general={genData}
-        onAir={messages.onAir}
+        onAir={messageControl.onAir}
       />
     );
   };

apps/client/src/features/viewers/clock/Clock.tsx

@@ -1,21 +1,21 @@
 import { useEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useAtom } from 'jotai';
+import { ViewSettings } from 'ontime-types';
 
 import { overrideStylesURL } from '../../../common/api/apiConstants';
 import { mirrorViewersAtom } from '../../../common/atoms/ViewerSettings';
 import NavigationMenu from '../../../common/components/navigation-menu/NavigationMenu';
 import { useRuntimeStylesheet } from '../../../common/hooks/useRuntimeStylesheet';
 import { TimeManagerType } from '../../../common/models/TimeManager.type';
-import { ViewSettingsType } from '../../../common/models/ViewSettings.type';
-import { OverridableOptions } from '../../../common/models/ViewTypes';
+import { OverridableOptions } from '../../../common/models/View.types';
 import { formatTime } from '../../../common/utils/time';
 
 import './Clock.scss';
 
 interface ClockProps {
   time: TimeManagerType;
-  viewSettings: ViewSettingsType;
+  viewSettings: ViewSettings;
 }
 
 const formatOptions = {

apps/client/src/features/viewers/countdown/Countdown.tsx

@@ -1,13 +1,13 @@
 import { useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useAtom } from 'jotai';
+import { OntimeEvent, OntimeRundownEntry, SupportedEvent } from 'ontime-types';
 import PropTypes from 'prop-types';
 
 import { overrideStylesURL } from '../../../common/api/apiConstants';
 import { mirrorViewersAtom } from '../../../common/atoms/ViewerSettings';
 import NavigationMenu from '../../../common/components/navigation-menu/NavigationMenu';
 import { useRuntimeStylesheet } from '../../../common/hooks/useRuntimeStylesheet';
-import { OntimeEvent, OntimeRundownEntry, SupportedEvent } from '../../../common/models/EventTypes';
 import { formatDisplay, millisToSeconds } from '../../../common/utils/dateConfig';
 import getDelayTo from '../../../common/utils/getDelayTo';
 import { formatTime } from '../../../common/utils/time';

apps/client/src/features/viewers/countdown/CountdownSelect.tsx

@@ -1,7 +1,7 @@
 import { Link } from 'react-router-dom';
+import { OntimeEvent, OntimeRundownEntry, SupportedEvent } from 'ontime-types';
 
 import Empty from '../../../common/components/state/Empty';
-import { OntimeEvent, OntimeRundownEntry, SupportedEvent } from '../../../common/models/EventTypes';
 import { formatTime } from '../../../common/utils/time';
 
 import { sanitiseTitle } from './countdown.helpers';

apps/client/src/features/viewers/countdown/countdown.helpers.ts

@@ -1,4 +1,5 @@
-import { OntimeEvent } from '../../../common/models/EventTypes';
+import { OntimeEvent } from 'ontime-types';
+
 import { TimeManagerType } from '../../../common/models/TimeManager.type';
 
 export enum TimerMessage {

apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx

@@ -1,25 +1,23 @@
 import { useEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
-import { EventDataType } from 'common/models/EventData.type';
 import { useAtom } from 'jotai';
+import { EventData, Message, ViewSettings } from 'ontime-types';
 
 import { overrideStylesURL } from '../../../common/api/apiConstants';
 import { mirrorViewersAtom } from '../../../common/atoms/ViewerSettings';
 import NavigationMenu from '../../../common/components/navigation-menu/NavigationMenu';
 import { useRuntimeStylesheet } from '../../../common/hooks/useRuntimeStylesheet';
-import { PresenterMessageType } from '../../../common/models/PresenterMessage.type';
 import { TimeManagerType } from '../../../common/models/TimeManager.type';
-import { ViewSettingsType } from '../../../common/models/ViewSettings.type';
-import { OverridableOptions } from '../../../common/models/ViewTypes';
+import { OverridableOptions } from '../../../common/models/View.types';
 import { formatDisplay, millisToSeconds } from '../../../common/utils/dateConfig';
 
 import './MinimalTimer.scss';
 
 interface MinimalTimerProps {
-  pres: PresenterMessageType;
+  pres: Message;
   time: TimeManagerType;
-  viewSettings: ViewSettingsType;
-  general: EventDataType;
+  viewSettings: ViewSettings;
+  general: EventData;
 }
 
 export default function MinimalTimer(props: MinimalTimerProps) {