diff --git a/apps/client/src/AppRouter.tsx b/apps/client/src/AppRouter.tsx index 1307b0433d..0248f7bb45 100644 --- a/apps/client/src/AppRouter.tsx +++ b/apps/client/src/AppRouter.tsx @@ -28,7 +28,7 @@ const ClockView = React.lazy(() => import('./features/viewers/clock/Clock')); const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown')); const Backstage = React.lazy(() => import('./features/viewers/backstage/Backstage')); -const Timeline = React.lazy(() => import('./features/viewers/timeline/TimelinePage')); +const Timeline = React.lazy(() => import('./views/timeline/TimelinePage')); const Public = React.lazy(() => import('./features/viewers/public/Public')); const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird')); const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock')); diff --git a/apps/client/src/features/viewers/timeline/Timeline.module.scss b/apps/client/src/views/timeline/Timeline.module.scss similarity index 98% rename from apps/client/src/features/viewers/timeline/Timeline.module.scss rename to apps/client/src/views/timeline/Timeline.module.scss index 7aafe09a32..168daf427b 100644 --- a/apps/client/src/features/viewers/timeline/Timeline.module.scss +++ b/apps/client/src/views/timeline/Timeline.module.scss @@ -1,4 +1,4 @@ -@use '../../../theme/viewerDefs' as *; +@use '../../theme/viewerDefs' as *; $timeline-height: 1rem; $view-background: $ui-black; diff --git a/apps/client/src/features/viewers/timeline/Timeline.tsx b/apps/client/src/views/timeline/Timeline.tsx similarity index 100% rename from apps/client/src/features/viewers/timeline/Timeline.tsx rename to apps/client/src/views/timeline/Timeline.tsx diff --git a/apps/client/src/features/viewers/timeline/TimelineEntry.tsx b/apps/client/src/views/timeline/TimelineEntry.tsx similarity index 89% rename from apps/client/src/features/viewers/timeline/TimelineEntry.tsx rename to apps/client/src/views/timeline/TimelineEntry.tsx index b78ef61090..fbb2346e9d 100644 --- a/apps/client/src/features/viewers/timeline/TimelineEntry.tsx +++ b/apps/client/src/views/timeline/TimelineEntry.tsx @@ -1,8 +1,8 @@ -import { useTimelineStatus, useTimer } from '../../../common/hooks/useSocket'; -import { getProgress } from '../../../common/utils/getProgress'; -import { alpha, cx } from '../../../common/utils/styleUtils'; -import { formatDuration, formatTime } from '../../../common/utils/time'; -import { useTranslation } from '../../../translation/TranslationProvider'; +import { useTimelineStatus, useTimer } from '../../common/hooks/useSocket'; +import { getProgress } from '../../common/utils/getProgress'; +import { alpha, cx } from '../../common/utils/styleUtils'; +import { formatDuration, formatTime } from '../../common/utils/time'; +import { useTranslation } from '../../translation/TranslationProvider'; import { getStatusLabel, getTimeToStart } from './timeline.utils'; diff --git a/apps/client/src/features/viewers/timeline/TimelinePage.scss b/apps/client/src/views/timeline/TimelinePage.scss similarity index 98% rename from apps/client/src/features/viewers/timeline/TimelinePage.scss rename to apps/client/src/views/timeline/TimelinePage.scss index 1508647ac3..363e08bf89 100644 --- a/apps/client/src/features/viewers/timeline/TimelinePage.scss +++ b/apps/client/src/views/timeline/TimelinePage.scss @@ -1,4 +1,4 @@ -@use '../../../theme/viewerDefs' as *; +@use '../../theme/viewerDefs' as *; .timeline { width: 100vw; diff --git a/apps/client/src/features/viewers/timeline/TimelinePage.tsx b/apps/client/src/views/timeline/TimelinePage.tsx similarity index 86% rename from apps/client/src/features/viewers/timeline/TimelinePage.tsx rename to apps/client/src/views/timeline/TimelinePage.tsx index b00faa863f..477db8ddf2 100644 --- a/apps/client/src/features/viewers/timeline/TimelinePage.tsx +++ b/apps/client/src/views/timeline/TimelinePage.tsx @@ -1,12 +1,13 @@ import { useMemo } from 'react'; import { MaybeString, OntimeEvent, ProjectData, Runtime, Settings } from 'ontime-types'; -import ViewParamsEditor from '../../../common/components/view-params-editor/ViewParamsEditor'; -import { useWindowTitle } from '../../../common/hooks/useWindowTitle'; -import { ViewExtendedTimer } from '../../../common/models/TimeManager.type'; -import { formatDuration, formatTime, getDefaultFormat } from '../../../common/utils/time'; -import { useTranslation } from '../../../translation/TranslationProvider'; -import SuperscriptTime from '../common/superscript-time/SuperscriptTime'; +import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor'; +import { useWindowTitle } from '../../common/hooks/useWindowTitle'; +import { ViewExtendedTimer } from '../../common/models/TimeManager.type'; +import { formatTime, getDefaultFormat } from '../../common/utils/time'; +import { formatDuration } from '../../common/utils/time'; +import SuperscriptTime from '../../features/viewers/common/superscript-time/SuperscriptTime'; +import { useTranslation } from '../../translation/TranslationProvider'; import Section from './timeline-section/TimelineSection'; import Timeline from './Timeline'; @@ -70,7 +71,6 @@ export default function TimelinePage(props: TimelinePageProps) { followedByStatus = `T - ${formatDuration(timeToStart)}`; } } - return (