Skip to content

Commit bccefe4

Browse files
committed
fix: Match exact paths for countdown routes and add 404 page
1 parent 06f45f5 commit bccefe4

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

packages/webui/src/client/ui/ClockView/ClockView.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
3131

3232
return (
3333
<Switch>
34-
<Route path="/countdowns/:studioId/presenter">
34+
<Route exact path="/countdowns/:studioId/presenter">
3535
{playlist ? (
3636
<RundownTimingProvider playlist={playlist}>
3737
<PresenterScreen playlistId={playlist._id} studioId={studioId} />
@@ -40,7 +40,7 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
4040
<StudioScreenSaver studioId={studioId} ownBackground={true} screenName={t('Presenter Screen')} />
4141
)}
4242
</Route>
43-
<Route path="/countdowns/:studioId/director">
43+
<Route exact path="/countdowns/:studioId/director">
4444
{playlist ? (
4545
<RundownTimingProvider playlist={playlist}>
4646
<DirectorScreen playlistId={playlist._id} studioId={studioId} />
@@ -49,7 +49,7 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
4949
<StudioScreenSaver studioId={studioId} ownBackground={true} screenName={t("Director's Screen")} />
5050
)}
5151
</Route>
52-
<Route path="/countdowns/:studioId/overlay">
52+
<Route exact path="/countdowns/:studioId/overlay">
5353
{playlist ? (
5454
<RundownTimingProvider playlist={playlist}>
5555
<OverlayScreen playlistId={playlist._id} studioId={studioId} />
@@ -58,17 +58,20 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
5858
<OverlayScreenSaver studioId={studioId} />
5959
)}
6060
</Route>
61-
<Route path="/countdowns/:studioId/camera">
61+
<Route exact path="/countdowns/:studioId/camera">
6262
<RundownTimingProvider playlist={playlist}>
6363
<CameraScreen playlist={playlist} studioId={studioId} />
6464
</RundownTimingProvider>
6565
</Route>
66-
<Route path="/countdowns/:studioId/multiview">
66+
<Route exact path="/countdowns/:studioId/multiview">
6767
<MultiviewScreen studioId={studioId} />
6868
</Route>
69-
<Route path="/countdowns/:studioId">
69+
<Route exact path="/countdowns/:studioId">
7070
<ClockViewIndex studioId={studioId} />
7171
</Route>
72+
<Route path="*">
73+
<div>404 - Page not found</div>
74+
</Route>
7275
</Switch>
7376
)
7477
}

0 commit comments

Comments
 (0)