diff --git a/apps/client/src/AppRouter.tsx b/apps/client/src/AppRouter.tsx index 05650c949..eef3495b1 100644 --- a/apps/client/src/AppRouter.tsx +++ b/apps/client/src/AppRouter.tsx @@ -31,7 +31,6 @@ const EditorFeatureWrapper = lazy(() => import('./features/EditorFeatureWrapper' const RundownPanel = lazy(() => import('./features/rundown/RundownExport')); const TimerControl = lazy(() => import('./features/control/playback/TimerControlExport')); const MessageControl = lazy(() => import('./features/control/message/MessageControlExport')); -const Info = lazy(() => import('./features/info/InfoExport')); export default function AppRouter() { return ( @@ -85,14 +84,6 @@ export default function AppRouter() { } /> - - - - } - /> {/*/!* Send to default if nothing found *!/*/} } /> diff --git a/apps/client/src/common/hooks/useSocket.ts b/apps/client/src/common/hooks/useSocket.ts index 5421b0b59..9fc196d30 100644 --- a/apps/client/src/common/hooks/useSocket.ts +++ b/apps/client/src/common/hooks/useSocket.ts @@ -80,18 +80,6 @@ export const setPlayback = { }, }; -export const useInfoPanel = () => { - const featureSelector = (state: RuntimeStore) => ({ - eventNow: state.eventNow, - eventNext: state.eventNext, - playback: state.playback, - selectedEventIndex: state.loaded.selectedEventIndex, - numEvents: state.loaded.numEvents, - }); - - return useRuntimeStore(featureSelector); -}; - export const useCuesheet = () => { const featureSelector = (state: RuntimeStore) => ({ playback: state.playback, diff --git a/apps/client/src/features/editors/Editor.module.scss b/apps/client/src/features/editors/Editor.module.scss index be769ca4d..7b2f5e048 100644 --- a/apps/client/src/features/editors/Editor.module.scss +++ b/apps/client/src/features/editors/Editor.module.scss @@ -46,17 +46,16 @@ $playback-width: 26rem; display: grid; grid-template-rows: auto 1fr; - grid-template-columns: $rundown-width $playback-width 1fr; + grid-template-columns: 1fr $playback-width; grid-template-areas: - 'rundown play info' - 'rundown mess info'; + 'rundown play' + 'rundown mess'; gap: 0.5rem; overflow: hidden; .rundown, .playback, - .messages, - .info { + .messages { position: relative; border-radius: 8px; height: 100%; @@ -72,6 +71,7 @@ $playback-width: 26rem; .rundown { grid-area: rundown; + min-width: $rundown-width; .content { height: calc(100% - 1.5rem); @@ -79,18 +79,6 @@ $playback-width: 26rem; } } -.info { - grid-area: info; - min-width: 17rem; - max-width: 800px; - - .content { - display: flex; - flex-direction: column; - overflow: hidden; - } -} - .messages { grid-area: mess; min-width: 24rem; diff --git a/apps/client/src/features/editors/Editor.tsx b/apps/client/src/features/editors/Editor.tsx index 4c1c9c2f8..41e8c7acf 100644 --- a/apps/client/src/features/editors/Editor.tsx +++ b/apps/client/src/features/editors/Editor.tsx @@ -16,7 +16,6 @@ import styles from './Editor.module.scss'; const Rundown = lazy(() => import('../rundown/RundownExport')); const TimerControl = lazy(() => import('../control/playback/TimerControlExport')); const MessageControl = lazy(() => import('../control/message/MessageControlExport')); -const Info = lazy(() => import('../info/InfoExport')); const EventEditor = lazy(() => import('../event-editor/EventEditorExport')); const IntegrationModal = lazy(() => import('../modals/integration-modal/IntegrationModal')); @@ -85,7 +84,6 @@ export default function Editor() { - )} diff --git a/apps/client/src/features/info/Info.module.scss b/apps/client/src/features/info/Info.module.scss deleted file mode 100644 index ff5dead02..000000000 --- a/apps/client/src/features/info/Info.module.scss +++ /dev/null @@ -1,45 +0,0 @@ -@use '../../theme/mixins' as *; -@use '../../theme/v2Styles' as *; - -.panelHeader { - display: flex; - justify-content: space-between; - gap: 1rem; - font-size: $inner-section-text-size; - - .title { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - .selected { - min-width: max-content; - color: $label-gray; - } -} - -.description { - font-size: $inner-section-text-size; - color: $label-gray; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.labels { - font-size: $inner-section-text-size; - display: flex; - flex-direction: column; - gap: $element-inner-spacing; -} - -.label { - color: $section-white; -} - -.content { - color: $secondary-text-gray; - margin-left: $element-inner-spacing; - font-size: $text-body-size; -} diff --git a/apps/client/src/features/info/Info.tsx b/apps/client/src/features/info/Info.tsx deleted file mode 100644 index 164b38487..000000000 --- a/apps/client/src/features/info/Info.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { useInfoPanel } from '../../common/hooks/useSocket'; - -import CollapsableInfo from './CollapsableInfo'; -import InfoTitles from './InfoTitles'; - -export default function Info() { - const data = useInfoPanel(); - - const titlesNow = { - title: data.eventNow?.title || '', - subtitle: data.eventNow?.subtitle || '', - presenter: data.eventNow?.presenter || '', - note: data.eventNow?.note || '', - }; - - const titlesNext = { - title: data.eventNext?.title || '', - subtitle: data.eventNext?.subtitle || '', - presenter: data.eventNext?.presenter || '', - note: data.eventNext?.note || '', - }; - - return ( - <> - - - - - - - - ); -} diff --git a/apps/client/src/features/info/InfoExport.tsx b/apps/client/src/features/info/InfoExport.tsx deleted file mode 100644 index 49e6fad5c..000000000 --- a/apps/client/src/features/info/InfoExport.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { memo } from 'react'; -import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp'; - -import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary'; -import { handleLinks } from '../../common/utils/linkUtils'; - -import Info from './Info'; - -import style from '../editors/Editor.module.scss'; - -const InfoExport = () => { - return ( -
- handleLinks(event, 'info')} /> -
- - - -
-
- ); -}; - -export default memo(InfoExport); diff --git a/apps/client/src/features/info/InfoTitles.tsx b/apps/client/src/features/info/InfoTitles.tsx deleted file mode 100644 index 20b7bdb39..000000000 --- a/apps/client/src/features/info/InfoTitles.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import style from './Info.module.scss'; - -type TitleShape = { - title: string; - presenter: string; - subtitle: string; - note: string; -}; - -interface InfoTitleProps { - data: TitleShape; -} - -export default function InfoTitles(props: InfoTitleProps) { - const { data } = props; - return ( -
-
- Title: - {data.title} -
-
- Presenter: - {data.presenter} -
-
- Subtitle: - {data.subtitle} -
-
- Note: - {data.note} -
-
- ); -} diff --git a/e2e/tests/000-smoke-tests.spec.ts b/e2e/tests/000-smoke-tests.spec.ts index 409af576d..9c421a582 100644 --- a/e2e/tests/000-smoke-tests.spec.ts +++ b/e2e/tests/000-smoke-tests.spec.ts @@ -13,7 +13,6 @@ test.describe('pages routes are available', () => { await expect(page.getByTestId('panel-rundown')).toBeVisible(); await expect(page.getByTestId('panel-timer-control')).toBeVisible(); await expect(page.getByTestId('panel-messages-control')).toBeVisible(); - await expect(page.getByTestId('panel-info')).toBeVisible(); await page.screenshot({ path: 'automated-screenshots/editor.png' }); }); @@ -99,9 +98,5 @@ test.describe('pages routes are available', () => { await page.goto('http://localhost:4001/messagecontrol'); await expect(page.getByTestId('panel-messages-control')).toBeVisible(); }); - test('info', async ({ page }) => { - await page.goto('http://localhost:4001/info'); - await expect(page.getByTestId('panel-info')).toBeVisible(); - }); }); });