Move remaining router components

src/RootApp.tsx

@@ -3,7 +3,7 @@ import { History } from '@remix-run/router';
 import React from 'react';
 
 import StableApp from './apps/stable/App';
-import { HistoryRouter } from './components/HistoryRouter';
+import { HistoryRouter } from './components/router/HistoryRouter';
 import { ApiProvider } from './hooks/useApi';
 
 const ExperimentalApp = loadable(() => import('./apps/experimental/App'));

src/components/ConnectionRequired.tsx

@@ -3,7 +3,7 @@ import { Outlet, useLocation, useNavigate } from 'react-router-dom';
 import type { ConnectResponse } from 'jellyfin-apiclient';
 
 import alert from './alert';
-import { appRouter } from './appRouter';
+import { appRouter } from './router/appRouter';
 import Loading from './loading/LoadingComponent';
 import ServerConnections from './ServerConnections';
 import globalize from '../scripts/globalize';

src/components/alert.js

@@ -1,4 +1,4 @@
-import { appRouter } from './appRouter';
+import { appRouter } from './router/appRouter';
 import browser from '../scripts/browser';
 import dialog from './dialog/dialog';
 import globalize from '../scripts/globalize';

src/components/cardbuilder/cardBuilder.js

@@ -22,7 +22,7 @@ import './card.scss';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../guide/programs.scss';
 import ServerConnections from '../ServerConnections';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 
 const enableFocusTransform = !browser.slow && !browser.edge;
 

src/components/collectionEditor/collectionEditor.js

@@ -3,7 +3,7 @@ import dom from '../../scripts/dom';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import loading from '../loading/loading';
 import layoutManager from '../layoutManager';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import globalize from '../../scripts/globalize';
 import '../../elements/emby-button/emby-button';
 import '../../elements/emby-button/paper-icon-button-light';

src/components/common/GenresItemsContainer.tsx

@@ -5,7 +5,7 @@ import type { BaseItemDtoQueryResult } from '@jellyfin/sdk/lib/generated-client'
 import escapeHTML from 'escape-html';
 import React, { FC, useCallback, useEffect, useRef } from 'react';
 
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import cardBuilder from '../cardbuilder/cardBuilder';
 import layoutManager from '../layoutManager';
 import lazyLoader from '../lazyLoader/lazyLoaderIntersectionObserver';

src/components/confirm/confirm.js

@@ -1,4 +1,4 @@
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import browser from '../../scripts/browser';
 import dialog from '../dialog/dialog';
 import globalize from '../../scripts/globalize';

src/components/dialogHelper/dialogHelper.js

@@ -1,4 +1,4 @@
-import { history } from '../appRouter';
+import { history } from '../router/appRouter';
 import focusManager from '../focusManager';
 import browser from '../../scripts/browser';
 import layoutManager from '../layoutManager';

src/components/groupedcards.js

@@ -1,5 +1,5 @@
 import dom from '../scripts/dom';
-import { appRouter } from './appRouter';
+import { appRouter } from './router/appRouter';
 import Dashboard from '../utils/dashboard';
 import ServerConnections from './ServerConnections';
 

src/components/homesections/homesections.js

@@ -3,7 +3,7 @@ import cardBuilder from '../cardbuilder/cardBuilder';
 import layoutManager from '../layoutManager';
 import imageLoader from '../images/imageLoader';
 import globalize from '../../scripts/globalize';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import imageHelper from '../../scripts/imagehelper';
 import '../../elements/emby-button/paper-icon-button-light';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';

src/components/itemContextMenu.js

@@ -4,7 +4,7 @@ import dom from '../scripts/dom';
 import globalize from '../scripts/globalize';
 import actionsheet from './actionSheet/actionSheet';
 import { appHost } from './apphost';
-import { appRouter } from './appRouter';
+import { appRouter } from './router/appRouter';
 import itemHelper from './itemHelper';
 import { playbackManager } from './playback/playbackmanager';
 import ServerConnections from './ServerConnections';

src/components/mediainfo/mediainfo.js

@@ -1,7 +1,7 @@
 import escapeHtml from 'escape-html';
 import datetime from '../../scripts/datetime';
 import globalize from '../../scripts/globalize';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import itemHelper from '../itemHelper';
 import indicators from '../indicators/indicators';
 import 'material-design-icons-iconfont';

src/components/metadataEditor/metadataEditor.js

@@ -20,7 +20,7 @@ import '../../styles/flexstyles.scss';
 import './style.scss';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import template from './metadataEditor.template.html';
 
 let currentContext;

src/components/nowPlayingBar/nowPlayingBar.js

@@ -15,7 +15,7 @@ import appFooter from '../appFooter/appFooter';
 import itemShortcuts from '../shortcuts';
 import './nowPlayingBar.scss';
 import '../../elements/emby-slider/emby-slider';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 
 let currentPlayer;
 let currentPlayerSupportedCommands = [];

src/components/playback/playerSelectionMenu.js

@@ -4,7 +4,7 @@ import browser from '../../scripts/browser';
 import loading from '../loading/loading';
 import { playbackManager } from '../playback/playbackmanager';
 import { pluginManager } from '../pluginManager';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import globalize from '../../scripts/globalize';
 import { appHost } from '../apphost';
 import { enable, isEnabled, supported } from '../../scripts/autocast';

src/components/playlisteditor/playlisteditor.js

@@ -6,7 +6,7 @@ import layoutManager from '../layoutManager';
 import { playbackManager } from '../playback/playbackmanager';
 import { pluginManager } from '../pluginManager';
 import * as userSettings from '../../scripts/settings/userSettings';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import globalize from '../../scripts/globalize';
 import { PluginType } from '../../types/plugin.ts';
 

src/components/pluginManager.js

@@ -4,7 +4,7 @@ import loading from './loading/loading';
 import appSettings from '../scripts/settings/appSettings';
 import { playbackManager } from './playback/playbackmanager';
 import { appHost } from '../components/apphost';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from './router/appRouter';
 import * as inputManager from '../scripts/inputManager';
 import toast from '../components/toast/toast';
 import confirm from '../components/confirm/confirm';

src/components/remotecontrol/remotecontrol.js

@@ -18,7 +18,7 @@ import './remotecontrol.scss';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 
 let showMuteButton = true;
 let showVolumeSlider = true;

src/components/router/appRouter.js

@@ -1,15 +1,15 @@
 import { Action, createHashHistory } from 'history';
 
-import { appHost } from './apphost';
+import { appHost } from '../apphost';
-import { clearBackdrop, setBackdropTransparency } from './backdrop/backdrop';
+import { clearBackdrop, setBackdropTransparency } from '../backdrop/backdrop';
-import globalize from '../scripts/globalize';
+import globalize from '../../scripts/globalize';
-import Events from '../utils/events.ts';
+import Events from '../../utils/events.ts';
-import itemHelper from './itemHelper';
+import itemHelper from '../itemHelper';
-import loading from './loading/loading';
+import loading from '../loading/loading';
-import viewManager from './viewManager/viewManager';
+import viewManager from '../viewManager/viewManager';
-import ServerConnections from './ServerConnections';
+import ServerConnections from '../ServerConnections';
-import alert from './alert';
+import alert from '../alert';
-import { ConnectionState } from '../utils/jellyfin-apiclient/ConnectionState.ts';
+import { ConnectionState } from '../../utils/jellyfin-apiclient/ConnectionState.ts';
 
 export const history = createHashHistory();
 
@@ -247,7 +247,7 @@ class AppRouter {
             url = apiClient.getUrl(`/web${url}`);
             promise = apiClient.get(url);
         } else {
-            promise = import(/* webpackChunkName: "[request]" */ `../controllers/${url}`);
+            promise = import(/* webpackChunkName: "[request]" */ `../../controllers/${url}`);
         }
 
         promise.then((html) => {
@@ -267,7 +267,7 @@ class AppRouter {
         };
 
         if (route.controller) {
-            import(/* webpackChunkName: "[request]" */ '../controllers/' + route.controller).then(onInitComplete);
+            import(/* webpackChunkName: "[request]" */ '../../controllers/' + route.controller).then(onInitComplete);
         } else {
             onInitComplete();
         }

src/components/search/SearchSuggestions.tsx

@@ -5,7 +5,7 @@ import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by';
 import escapeHtml from 'escape-html';
 import React, { FunctionComponent, useEffect, useState } from 'react';
 
-import { appRouter } from '../appRouter';
+import { appRouter } from '../router/appRouter';
 import { useApi } from '../../hooks/useApi';
 import globalize from '../../scripts/globalize';
 

src/components/shortcuts.js

@@ -5,7 +5,7 @@
 
 import { playbackManager } from './playback/playbackmanager';
 import inputManager from '../scripts/inputManager';
-import { appRouter } from './appRouter';
+import { appRouter } from './router/appRouter';
 import globalize from '../scripts/globalize';
 import dom from '../scripts/dom';
 import recordingHelper from './recordingcreator/recordinghelper';

src/controllers/favorites.js

@@ -1,4 +1,4 @@
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import cardBuilder from '../components/cardbuilder/cardBuilder';
 import dom from '../scripts/dom';
 import globalize from '../scripts/globalize';

src/controllers/itemDetails/index.js

@@ -6,7 +6,7 @@ import isEqual from 'lodash-es/isEqual';
 
 import { appHost } from '../../components/apphost';
 import loading from '../../components/loading/loading';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import layoutManager from '../../components/layoutManager';
 import Events from '../../utils/events.ts';
 import * as userSettings from '../../scripts/settings/userSettings';

src/controllers/movies/moviegenres.js

@@ -5,7 +5,7 @@ import libraryBrowser from '../../scripts/libraryBrowser';
 import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
 import globalize from '../../scripts/globalize';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import '../../elements/emby-button/emby-button';
 
 export default function (view, params, tabContent) {

src/controllers/playback/video/index.js

@@ -21,7 +21,7 @@ import '../../../styles/videoosd.scss';
 import ServerConnections from '../../../components/ServerConnections';
 import shell from '../../../scripts/shell';
 import SubtitleSync from '../../../components/subtitlesync/subtitlesync';
-import { appRouter } from '../../../components/appRouter';
+import { appRouter } from '../../../components/router/appRouter';
 import LibraryMenu from '../../../scripts/libraryMenu';
 import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../../components/backdrop/backdrop';
 import { pluginManager } from '../../../components/pluginManager';

src/controllers/session/addServer/index.js

@@ -63,7 +63,7 @@ export default function(view) {
     }
 
     function goBack() {
-        import('../../../components/appRouter').then(({ appRouter }) => {
+        import('../../../components/router/appRouter').then(({ appRouter }) => {
             appRouter.back();
         });
     }

src/controllers/session/selectServer/index.js

@@ -1,6 +1,6 @@
 import escapeHtml from 'escape-html';
 import loading from '../../../components/loading/loading';
-import { appRouter } from '../../../components/appRouter';
+import { appRouter } from '../../../components/router/appRouter';
 import layoutManager from '../../../components/layoutManager';
 import libraryMenu from '../../../scripts/libraryMenu';
 import appSettings from '../../../scripts/settings/appSettings';

src/controllers/shows/tvgenres.js

@@ -5,7 +5,7 @@ import libraryBrowser from '../../scripts/libraryBrowser';
 import cardBuilder from '../../components/cardbuilder/cardBuilder';
 import lazyLoader from '../../components/lazyLoader/lazyLoaderIntersectionObserver';
 import globalize from '../../scripts/globalize';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import '../../elements/emby-button/emby-button';
 
 export default function (view, params, tabContent) {

src/elements/emby-button/LinkButton.tsx

@@ -2,7 +2,7 @@ import React, { AnchorHTMLAttributes, DetailedHTMLProps, MouseEvent, useCallback
 import classNames from 'classnames';
 import layoutManager from '../../components/layoutManager';
 import shell from '../../scripts/shell';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import { appHost } from '../../components/apphost';
 import './emby-button.scss';
 

src/elements/emby-button/emby-button.js

@@ -2,7 +2,7 @@ import 'webcomponents.js/webcomponents-lite';
 import { removeEventListener, addEventListener } from '../../scripts/dom';
 import layoutManager from '../../components/layoutManager';
 import shell from '../../scripts/shell';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import { appHost } from '../../components/apphost';
 import './emby-button.scss';
 

src/index.jsx

@@ -20,7 +20,7 @@ import { appHost } from './components/apphost';
 import { getPlugins } from './scripts/settings/webSettings';
 import { pluginManager } from './components/pluginManager';
 import packageManager from './components/packageManager';
-import { appRouter, history } from './components/appRouter';
+import { appRouter, history } from './components/router/appRouter';
 import './elements/emby-button/emby-button';
 import './scripts/autoThemes';
 import './components/themeMediaPlayer';

src/plugins/comicsPlayer/plugin.js

@@ -3,7 +3,7 @@ import { Archive } from 'libarchive.js';
 import loading from '../../components/loading/loading';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import ServerConnections from '../../components/ServerConnections';
 import * as userSettings from '../../scripts/settings/userSettings';
 import { PluginType } from '../../types/plugin.ts';

src/plugins/htmlVideoPlayer/plugin.js

@@ -3,7 +3,7 @@ import { appHost } from '../../components/apphost';
 import loading from '../../components/loading/loading';
 import dom from '../../scripts/dom';
 import { playbackManager } from '../../components/playback/playbackmanager';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import {
     bindEventsToHlsPlayer,
     destroyHlsPlayer,

src/plugins/pdfPlayer/plugin.js

@@ -3,7 +3,7 @@ import loading from '../../components/loading/loading';
 import keyboardnavigation from '../../scripts/keyboardNavigation';
 import dialogHelper from '../../components/dialogHelper/dialogHelper';
 import dom from '../../scripts/dom';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import { PluginType } from '../../types/plugin.ts';
 import Events from '../../utils/events.ts';
 

src/plugins/youtubePlayer/plugin.js

@@ -1,5 +1,5 @@
 import browser from '../../scripts/browser';
-import { appRouter } from '../../components/appRouter';
+import { appRouter } from '../../components/router/appRouter';
 import loading from '../../components/loading/loading';
 import { setBackdropTransparency, TRANSPARENCY_LEVEL } from '../../components/backdrop/backdrop';
 import { PluginType } from '../../types/plugin.ts';

src/scripts/deleteHelper.js

@@ -1,6 +1,6 @@
 
 import confirm from '../components/confirm/confirm';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import globalize from './globalize';
 import ServerConnections from '../components/ServerConnections';
 import alert from '../components/alert';

src/scripts/inputManager.js

@@ -1,6 +1,6 @@
 import { playbackManager } from '../components/playback/playbackmanager';
 import focusManager from '../components/focusManager';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import dom from './dom';
 import { appHost } from '../components/apphost';
 

src/scripts/libraryMenu.js

@@ -5,7 +5,7 @@ import dom from './dom';
 import layoutManager from '../components/layoutManager';
 import inputManager from './inputManager';
 import viewManager from '../components/viewManager/viewManager';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import { appHost } from '../components/apphost';
 import { playbackManager } from '../components/playback/playbackmanager';
 import { pluginManager } from '../components/pluginManager';

src/scripts/serverNotifications.js

@@ -2,7 +2,7 @@ import { playbackManager } from '../components/playback/playbackmanager';
 import { pluginManager } from '../components/pluginManager';
 import inputManager from '../scripts/inputManager';
 import focusManager from '../components/focusManager';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import ServerConnections from '../components/ServerConnections';
 import toast from '../components/toast/toast';
 import alert from '../components/alert';

src/utils/dashboard.js

@@ -1,7 +1,7 @@
 import ServerConnections from '../components/ServerConnections';
 import toast from '../components/toast/toast';
 import loading from '../components/loading/loading';
-import { appRouter } from '../components/appRouter';
+import { appRouter } from '../components/router/appRouter';
 import baseAlert from '../components/alert';
 import baseConfirm from '../components/confirm/confirm';
 import globalize from '../scripts/globalize';