@@ -342,29 +376,28 @@ function ConnectMenu() {
aria-label="Close Connect menu"
onClick={() => setOpen(false)}
/>
-
+
Connect a player
- 128 channels
+ {channelCountLabel}
}
label="M3U playlist"
- url={`/iptv/channels.m3u${suffix}`}
+ url={playlistUrl}
/>
}
label="XMLTV guide"
- url={`/iptv/xmltv.xml${suffix}`}
+ url={guideUrl}
/>
-
Works with any IPTV player.
@@ -376,12 +409,16 @@ function ConnectMenu() {
);
}
-function TopBar({ route }: { route: ScreenRoute }) {
+function TopBar({ route }: { route: ScreenRoute | null }) {
+ const title = route?.title ?? 'Page not found';
+ const kicker = route?.kicker ?? 'Unknown route';
+ const primaryAction = route?.primaryAction ?? 'Go To Dashboard';
+
return (
-
{route.kicker}
-
{route.title}
+
{kicker}
+
{title}
-
}>{route.primaryAction}
+
}>{primaryAction}
);
}
@@ -670,7 +707,29 @@ function PlaceholderScreen({ route }: { route: ScreenRoute }) {
);
}
-function ScreenContent({ route }: { route: ScreenRoute }) {
+function NotFoundScreen() {
+ const pathname = normalizePath(window.location.pathname);
+
+ return (
+
+
Unknown app route} subtitle="This URL does not match a ChicoryTV screen.">
+
+
+
+
Requested path
+
{pathname}
+
+
+
+
+ );
+}
+
+function ScreenContent({ route }: { route: ScreenRoute | null }) {
+ if (route === null) {
+ return
;
+ }
+
if (route.id === 'dashboard') {
return
;
}
@@ -680,7 +739,7 @@ function ScreenContent({ route }: { route: ScreenRoute }) {
export function App() {
const [theme, setTheme] = useState
(() => getStoredDesignSystemTheme());
- const [activeRoute, setActiveRoute] = useState(() => routeFromLocation());
+ const [activeRoute, setActiveRoute] = useState(() => routeFromLocation());
useEffect(() => {
applyDesignSystemTheme(theme);
@@ -697,9 +756,13 @@ export function App() {
const route = useMemo(() => activeRoute, [activeRoute]);
const navigate = (nextRoute: ScreenRoute, event: MouseEvent) => {
+ if (event.metaKey || event.ctrlKey || event.shiftKey || event.button !== 0) {
+ return;
+ }
+
event.preventDefault();
- if (nextRoute.id === route.id) {
+ if (nextRoute.id === route?.id) {
return;
}