mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #6617 from thornbill/no-more-html

Browse source 
Remove .html from routes
This commit is contained in:
Bill Thornton 2025-03-20 12:03:48 -04:00 • committed by GitHub
commit 0b05ea7012
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
44 changed files with 178 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/apps/dashboard/routes/users/profile.tsx
View file

@ -298,7 +298,7 @@ const UserEdit = () => {
className='lnkEditUserPreferencesContainer' className='lnkEditUserPreferencesContainer'
style={{ paddingBottom: '1em' }} style={{ paddingBottom: '1em' }}
> >
<LinkButton className='lnkEditUserPreferences button-link' href={userDto?.Id ? `mypreferencesmenu.html?userId=${userDto.Id}` : undefined}> <LinkButton className='lnkEditUserPreferences button-link' href={userDto?.Id ? `mypreferencesmenu?userId=${userDto.Id}` : undefined}>
{globalize.translate('ButtonEditOtherUserPreferences')} {globalize.translate('ButtonEditOtherUserPreferences')}
</LinkButton> </LinkButton>
</div> </div>

6
src/apps/experimental/components/AppToolbar/SearchButton.tsx
View file

@ -35,13 +35,13 @@ const SearchButton: FC<SearchButtonProps> = ({ isTabsAvailable }) => {
const location = useLocation(); const location = useLocation();
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const isSearchPath = location.pathname === '/search.html'; const isSearchPath = location.pathname === '/search';
const createSearchLink = isTabsAvailable ? const createSearchLink = isTabsAvailable ?
{ {
pathname: '/search.html', pathname: '/search',
search: `?${createSearchParams(getUrlParams(searchParams))}` search: `?${createSearchParams(getUrlParams(searchParams))}`
} : } :
'/search.html'; '/search';
return ( return (
<Tooltip title={globalize.translate('Search')}> <Tooltip title={globalize.translate('Search')}>

10
src/apps/experimental/components/AppToolbar/index.tsx
View file

@ -14,11 +14,11 @@ interface AppToolbarProps {
} }
const PUBLIC_PATHS = [ const PUBLIC_PATHS = [
'/addserver.html', '/addserver',
'/selectserver.html', '/selectserver',
'/login.html', '/login',
'/forgotpassword.html', '/forgotpassword',
'/forgotpasswordpin.html' '/forgotpasswordpin'
]; ];
const ExperimentalAppToolbar: FC<AppToolbarProps> = ({ const ExperimentalAppToolbar: FC<AppToolbarProps> = ({

6
src/apps/experimental/components/drawers/MainDrawerContent.tsx
View file

@ -30,7 +30,7 @@ const MainDrawerContent = () => {
const userViews = userViewsData?.Items || []; const userViews = userViewsData?.Items || [];
const webConfig = useWebConfig(); const webConfig = useWebConfig();
const isHomeSelected = location.pathname === '/home.html' && (!location.search || location.search === '?tab=0'); const isHomeSelected = location.pathname === '/home' && (!location.search || location.search === '?tab=0');
return ( return (
<> <>
@ -40,7 +40,7 @@ const MainDrawerContent = () => {
<DrawerHeaderLink /> <DrawerHeaderLink />
</ListItem> </ListItem>
<ListItem disablePadding> <ListItem disablePadding>
<ListItemLink to='/home.html' selected={isHomeSelected}> <ListItemLink to='/home' selected={isHomeSelected}>
<ListItemIcon> <ListItemIcon>
<Home /> <Home />
</ListItemIcon> </ListItemIcon>
@ -48,7 +48,7 @@ const MainDrawerContent = () => {
</ListItemLink> </ListItemLink>
</ListItem> </ListItem>
<ListItem disablePadding> <ListItem disablePadding>
<ListItemLink to='/home.html?tab=1'> <ListItemLink to='/home?tab=1'>
<ListItemIcon> <ListItemIcon>
<Favorite /> <Favorite />
</ListItemIcon> </ListItemIcon>

10
src/apps/experimental/components/tabs/tabRoutes.ts
View file

@ -36,7 +36,7 @@ export const getDefaultTabIndex = (path: string, libraryId?: string | null) => {
const TabRoutes: TabRoute[] = [ const TabRoutes: TabRoute[] = [
{ {
path: '/livetv.html', path: '/livetv',
tabs: [ tabs: [
{ {
index: 0, index: 0,
@ -72,7 +72,7 @@ const TabRoutes: TabRoute[] = [
] ]
}, },
{ {
path: '/movies.html', path: '/movies',
tabs: [ tabs: [
{ {
index: 0, index: 0,
@ -108,7 +108,7 @@ const TabRoutes: TabRoute[] = [
] ]
}, },
{ {
path: '/music.html', path: '/music',
tabs: [ tabs: [
{ {
index: 0, index: 0,
@ -149,7 +149,7 @@ const TabRoutes: TabRoute[] = [
] ]
}, },
{ {
path: '/tv.html', path: '/tv',
tabs: [ tabs: [
{ {
index: 0, index: 0,
@ -185,7 +185,7 @@ const TabRoutes: TabRoute[] = [
] ]
}, },
{ {
path: '/homevideos.html', path: '/homevideos',
tabs: [ tabs: [
{ {
index: 0, index: 0,

2
src/apps/experimental/features/details/components/buttons/CancelSeriesTimerButton.tsx
View file

@ -36,7 +36,7 @@ const CancelSeriesTimerButton: FC<CancelSeriesTimerButtonProps> = ({
onSuccess: async () => { onSuccess: async () => {
toast(globalize.translate('SeriesCancelled')); toast(globalize.translate('SeriesCancelled'));
loading.hide(); loading.hide();
navigate('/livetv.html'); navigate('/livetv');
}, },
onError: (err: unknown) => { onError: (err: unknown) => {
loading.hide(); loading.hide();

18
src/apps/experimental/routes/asyncRoutes/user.ts
View file

@ -2,14 +2,14 @@ import { AsyncRoute } from 'components/router/AsyncRoute';
import { AppType } from 'constants/appType'; import { AppType } from 'constants/appType';
export const ASYNC_USER_ROUTES: AsyncRoute[] = [ export const ASYNC_USER_ROUTES: AsyncRoute[] = [
{ path: 'home.html', page: 'home', type: AppType.Experimental }, { path: 'home', page: 'home', type: AppType.Experimental },
{ path: 'quickconnect', page: 'quickConnect' }, { path: 'quickconnect', page: 'quickConnect' },
{ path: 'search.html', page: 'search' }, { path: 'search', page: 'search' },
{ path: 'userprofile.html', page: 'user/userprofile' }, { path: 'userprofile', page: 'user/userprofile' },
{ path: 'movies.html', page: 'movies', type: AppType.Experimental }, { path: 'movies', page: 'movies', type: AppType.Experimental },
{ path: 'tv.html', page: 'shows', type: AppType.Experimental }, { path: 'tv', page: 'shows', type: AppType.Experimental },
{ path: 'music.html', page: 'music', type: AppType.Experimental }, { path: 'music', page: 'music', type: AppType.Experimental },
{ path: 'livetv.html', page: 'livetv', type: AppType.Experimental }, { path: 'livetv', page: 'livetv', type: AppType.Experimental },
{ path: 'mypreferencesdisplay.html', page: 'user/display', type: AppType.Experimental }, { path: 'mypreferencesdisplay', page: 'user/display', type: AppType.Experimental },
{ path: 'homevideos.html', page: 'homevideos', type: AppType.Experimental } { path: 'homevideos', page: 'homevideos', type: AppType.Experimental }
]; ];

22
src/apps/experimental/routes/legacyRoutes/public.ts
View file

@ -2,77 +2,77 @@ import { LegacyRoute } from '../../../../components/router/LegacyRoute';
export const LEGACY_PUBLIC_ROUTES: LegacyRoute[] = [ export const LEGACY_PUBLIC_ROUTES: LegacyRoute[] = [
{ {
path: 'addserver.html', path: 'addserver',
pageProps: { pageProps: {
controller: 'session/addServer/index', controller: 'session/addServer/index',
view: 'session/addServer/index.html' view: 'session/addServer/index.html'
} }
}, },
{ {
path: 'selectserver.html', path: 'selectserver',
pageProps: { pageProps: {
controller: 'session/selectServer/index', controller: 'session/selectServer/index',
view: 'session/selectServer/index.html' view: 'session/selectServer/index.html'
} }
}, },
{ {
path: 'login.html', path: 'login',
pageProps: { pageProps: {
controller: 'session/login/index', controller: 'session/login/index',
view: 'session/login/index.html' view: 'session/login/index.html'
} }
}, },
{ {
path: 'forgotpassword.html', path: 'forgotpassword',
pageProps: { pageProps: {
controller: 'session/forgotPassword/index', controller: 'session/forgotPassword/index',
view: 'session/forgotPassword/index.html' view: 'session/forgotPassword/index.html'
} }
}, },
{ {
path: 'forgotpasswordpin.html', path: 'forgotpasswordpin',
pageProps: { pageProps: {
controller: 'session/resetPassword/index', controller: 'session/resetPassword/index',
view: 'session/resetPassword/index.html' view: 'session/resetPassword/index.html'
} }
}, },
{ {
path: 'wizardremoteaccess.html', path: 'wizardremoteaccess',
pageProps: { pageProps: {
controller: 'wizard/remote/index', controller: 'wizard/remote/index',
view: 'wizard/remote/index.html' view: 'wizard/remote/index.html'
} }
}, },
{ {
path: 'wizardfinish.html', path: 'wizardfinish',
pageProps: { pageProps: {
controller: 'wizard/finish/index', controller: 'wizard/finish/index',
view: 'wizard/finish/index.html' view: 'wizard/finish/index.html'
} }
}, },
{ {
path: 'wizardlibrary.html', path: 'wizardlibrary',
pageProps: { pageProps: {
controller: 'wizard/library', controller: 'wizard/library',
view: 'wizard/library.html' view: 'wizard/library.html'
} }
}, },
{ {
path: 'wizardsettings.html', path: 'wizardsettings',
pageProps: { pageProps: {
controller: 'wizard/settings/index', controller: 'wizard/settings/index',
view: 'wizard/settings/index.html' view: 'wizard/settings/index.html'
} }
}, },
{ {
path: 'wizardstart.html', path: 'wizardstart',
pageProps: { pageProps: {
controller: 'wizard/start/index', controller: 'wizard/start/index',
view: 'wizard/start/index.html' view: 'wizard/start/index.html'
} }
}, },
{ {
path: 'wizarduser.html', path: 'wizarduser',
pageProps: { pageProps: {
controller: 'wizard/user/index', controller: 'wizard/user/index',
view: 'wizard/user/index.html' view: 'wizard/user/index.html'

12
src/apps/experimental/routes/legacyRoutes/user.ts
View file

@ -8,7 +8,7 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
view: 'itemDetails/index.html' view: 'itemDetails/index.html'
} }
}, { }, {
path: 'list.html', path: 'list',
pageProps: { pageProps: {
controller: 'list', controller: 'list',
view: 'list.html' view: 'list.html'
@ -20,31 +20,31 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
view: 'lyrics.html' view: 'lyrics.html'
} }
}, { }, {
path: 'mypreferencesmenu.html', path: 'mypreferencesmenu',
pageProps: { pageProps: {
controller: 'user/menu/index', controller: 'user/menu/index',
view: 'user/menu/index.html' view: 'user/menu/index.html'
} }
}, { }, {
path: 'mypreferencescontrols.html', path: 'mypreferencescontrols',
pageProps: { pageProps: {
controller: 'user/controls/index', controller: 'user/controls/index',
view: 'user/controls/index.html' view: 'user/controls/index.html'
} }
}, { }, {
path: 'mypreferenceshome.html', path: 'mypreferenceshome',
pageProps: { pageProps: {
controller: 'user/home/index', controller: 'user/home/index',
view: 'user/home/index.html' view: 'user/home/index.html'
} }
}, { }, {
path: 'mypreferencesplayback.html', path: 'mypreferencesplayback',
pageProps: { pageProps: {
controller: 'user/playback/index', controller: 'user/playback/index',
view: 'user/playback/index.html' view: 'user/playback/index.html'
} }
}, { }, {
path: 'mypreferencessubtitles.html', path: 'mypreferencessubtitles',
pageProps: { pageProps: {
controller: 'user/subtitles/index', controller: 'user/subtitles/index',
view: 'user/subtitles/index.html' view: 'user/subtitles/index.html'

2
src/apps/experimental/routes/routes.tsx
View file

@ -16,7 +16,7 @@ export const EXPERIMENTAL_APP_ROUTES: RouteObject[] = [
path: '/*', path: '/*',
lazy: () => import('../AppLayout'), lazy: () => import('../AppLayout'),
children: [ children: [
{ index: true, element: <Navigate replace to='/home.html' /> }, { index: true, element: <Navigate replace to='/home' /> },
{ {
/* User routes */ /* User routes */

4
src/apps/stable/routes/asyncRoutes/user.ts
View file

@ -2,6 +2,6 @@ import { AsyncRoute } from '../../../../components/router/AsyncRoute';
export const ASYNC_USER_ROUTES: AsyncRoute[] = [ export const ASYNC_USER_ROUTES: AsyncRoute[] = [
{ path: 'quickconnect', page: 'quickConnect' }, { path: 'quickconnect', page: 'quickConnect' },
{ path: 'search.html', page: 'search' }, { path: 'search', page: 'search' },
{ path: 'userprofile.html', page: 'user/userprofile' } { path: 'userprofile', page: 'user/userprofile' }
]; ];

22
src/apps/stable/routes/legacyRoutes/public.ts
View file

@ -2,77 +2,77 @@ import { LegacyRoute } from '../../../../components/router/LegacyRoute';
export const LEGACY_PUBLIC_ROUTES: LegacyRoute[] = [ export const LEGACY_PUBLIC_ROUTES: LegacyRoute[] = [
{ {
path: 'addserver.html', path: 'addserver',
pageProps: { pageProps: {
controller: 'session/addServer/index', controller: 'session/addServer/index',
view: 'session/addServer/index.html' view: 'session/addServer/index.html'
} }
}, },
{ {
path: 'selectserver.html', path: 'selectserver',
pageProps: { pageProps: {
controller: 'session/selectServer/index', controller: 'session/selectServer/index',
view: 'session/selectServer/index.html' view: 'session/selectServer/index.html'
} }
}, },
{ {
path: 'login.html', path: 'login',
pageProps: { pageProps: {
controller: 'session/login/index', controller: 'session/login/index',
view: 'session/login/index.html' view: 'session/login/index.html'
} }
}, },
{ {
path: 'forgotpassword.html', path: 'forgotpassword',
pageProps: { pageProps: {
controller: 'session/forgotPassword/index', controller: 'session/forgotPassword/index',
view: 'session/forgotPassword/index.html' view: 'session/forgotPassword/index.html'
} }
}, },
{ {
path: 'forgotpasswordpin.html', path: 'forgotpasswordpin',
pageProps: { pageProps: {
controller: 'session/resetPassword/index', controller: 'session/resetPassword/index',
view: 'session/resetPassword/index.html' view: 'session/resetPassword/index.html'
} }
}, },
{ {
path: 'wizardremoteaccess.html', path: 'wizardremoteaccess',
pageProps: { pageProps: {
controller: 'wizard/remote/index', controller: 'wizard/remote/index',
view: 'wizard/remote/index.html' view: 'wizard/remote/index.html'
} }
}, },
{ {
path: 'wizardfinish.html', path: 'wizardfinish',
pageProps: { pageProps: {
controller: 'wizard/finish/index', controller: 'wizard/finish/index',
view: 'wizard/finish/index.html' view: 'wizard/finish/index.html'
} }
}, },
{ {
path: 'wizardlibrary.html', path: 'wizardlibrary',
pageProps: { pageProps: {
controller: 'wizard/library', controller: 'wizard/library',
view: 'wizard/library.html' view: 'wizard/library.html'
} }
}, },
{ {
path: 'wizardsettings.html', path: 'wizardsettings',
pageProps: { pageProps: {
controller: 'wizard/settings/index', controller: 'wizard/settings/index',
view: 'wizard/settings/index.html' view: 'wizard/settings/index.html'
} }
}, },
{ {
path: 'wizardstart.html', path: 'wizardstart',
pageProps: { pageProps: {
controller: 'wizard/start/index', controller: 'wizard/start/index',
view: 'wizard/start/index.html' view: 'wizard/start/index.html'
} }
}, },
{ {
path: 'wizarduser.html', path: 'wizarduser',
pageProps: { pageProps: {
controller: 'wizard/user/index', controller: 'wizard/user/index',
view: 'wizard/user/index.html' view: 'wizard/user/index.html'

24
src/apps/stable/routes/legacyRoutes/user.ts
View file

@ -8,13 +8,13 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
view: 'itemDetails/index.html' view: 'itemDetails/index.html'
} }
}, { }, {
path: 'list.html', path: 'list',
pageProps: { pageProps: {
controller: 'list', controller: 'list',
view: 'list.html' view: 'list.html'
} }
}, { }, {
path: 'livetv.html', path: 'livetv',
pageProps: { pageProps: {
controller: 'livetv/livetvsuggested', controller: 'livetv/livetvsuggested',
view: 'livetv.html' view: 'livetv.html'
@ -26,49 +26,49 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
view: 'lyrics.html' view: 'lyrics.html'
} }
}, { }, {
path: 'music.html', path: 'music',
pageProps: { pageProps: {
controller: 'music/musicrecommended', controller: 'music/musicrecommended',
view: 'music/music.html' view: 'music/music.html'
} }
}, { }, {
path: 'mypreferencesmenu.html', path: 'mypreferencesmenu',
pageProps: { pageProps: {
controller: 'user/menu/index', controller: 'user/menu/index',
view: 'user/menu/index.html' view: 'user/menu/index.html'
} }
}, { }, {
path: 'mypreferencescontrols.html', path: 'mypreferencescontrols',
pageProps: { pageProps: {
controller: 'user/controls/index', controller: 'user/controls/index',
view: 'user/controls/index.html' view: 'user/controls/index.html'
} }
}, { }, {
path: 'mypreferencesdisplay.html', path: 'mypreferencesdisplay',
pageProps: { pageProps: {
controller: 'user/display/index', controller: 'user/display/index',
view: 'user/display/index.html' view: 'user/display/index.html'
} }
}, { }, {
path: 'mypreferenceshome.html', path: 'mypreferenceshome',
pageProps: { pageProps: {
controller: 'user/home/index', controller: 'user/home/index',
view: 'user/home/index.html' view: 'user/home/index.html'
} }
}, { }, {
path: 'mypreferencesplayback.html', path: 'mypreferencesplayback',
pageProps: { pageProps: {
controller: 'user/playback/index', controller: 'user/playback/index',
view: 'user/playback/index.html' view: 'user/playback/index.html'
} }
}, { }, {
path: 'mypreferencessubtitles.html', path: 'mypreferencessubtitles',
pageProps: { pageProps: {
controller: 'user/subtitles/index', controller: 'user/subtitles/index',
view: 'user/subtitles/index.html' view: 'user/subtitles/index.html'
} }
}, { }, {
path: 'tv.html', path: 'tv',
pageProps: { pageProps: {
controller: 'shows/tvrecommended', controller: 'shows/tvrecommended',
view: 'shows/tvrecommended.html' view: 'shows/tvrecommended.html'
@ -93,13 +93,13 @@ export const LEGACY_USER_ROUTES: LegacyRoute[] = [
isThemeMediaSupported: true isThemeMediaSupported: true
} }
}, { }, {
path: 'home.html', path: 'home',
pageProps: { pageProps: {
controller: 'home', controller: 'home',
view: 'home.html' view: 'home.html'
} }
}, { }, {
path: 'movies.html', path: 'movies',
pageProps: { pageProps: {
controller: 'movies/moviesrecommended', controller: 'movies/moviesrecommended',
view: 'movies/movies.html' view: 'movies/movies.html'

2
src/apps/stable/routes/quickConnect/index.tsx
View file

@ -84,7 +84,7 @@ const QuickConnectPage: FC = () => {
<p> <p>
{globalize.translate('QuickConnectAuthorizeSuccess')} {globalize.translate('QuickConnectAuthorizeSuccess')}
</p> </p>
<Link to='/home.html' className='button-link emby-button'> <Link to='/home' className='button-link emby-button'>
{globalize.translate('GoHome')} {globalize.translate('GoHome')}
</Link> </Link>
</div> </div>

2
src/apps/stable/routes/routes.tsx
View file

@ -17,7 +17,7 @@ export const STABLE_APP_ROUTES: RouteObject[] = [
path: '/*', path: '/*',
Component: AppLayout, Component: AppLayout,
children: [ children: [
{ index: true, element: <Navigate replace to='/home.html' /> }, { index: true, element: <Navigate replace to='/home' /> },
{ {
/* User routes */ /* User routes */

8
src/components/ConnectionRequired.tsx
View file

@ -9,10 +9,10 @@ import globalize from '../lib/globalize';
import { ConnectionState } from '../utils/jellyfin-apiclient/ConnectionState'; import { ConnectionState } from '../utils/jellyfin-apiclient/ConnectionState';
enum BounceRoutes { enum BounceRoutes {
Home = '/home.html', Home = '/home',
Login = '/login.html', Login = '/login',
SelectServer = '/selectserver.html', SelectServer = '/selectserver',
StartWizard = '/wizardstart.html' StartWizard = '/wizardstart'
} }
type ConnectionRequiredProps = { type ConnectionRequiredProps = {

2
src/components/favoriteitems.js
View file

@ -137,7 +137,7 @@ function loadSection(elem, userId, topParentId, section, isSingleSection) {
html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">'; html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
if (!layoutManager.tv && options.Limit && result.Items.length >= options.Limit) { if (!layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
html += '<a is="emby-linkbutton" href="' + ('#/list.html?serverId=' + ApiClient.serverId() + '&type=' + section.types + '&IsFavorite=true') + '" class="more button-flat button-flat-mini sectionTitleTextButton">'; html += '<a is="emby-linkbutton" href="' + ('#/list?serverId=' + ApiClient.serverId() + '&type=' + section.types + '&IsFavorite=true') + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate(section.name); html += globalize.translate(section.name);
html += '</h2>'; html += '</h2>';

2
src/components/itemContextMenu.js
View file

@ -562,7 +562,7 @@ function executeCommand(item, id, options) {
navigator.share({ navigator.share({
title: item.Name, title: item.Name,
text: item.Overview, text: item.Overview,
url: `${apiClient.serverAddress()}/web/index.html${appRouter.getRouteUrl(item)}` url: `${apiClient.serverAddress()}/web/${appRouter.getRouteUrl(item)}`
}); });
break; break;
case 'album': case 'album':

2
src/components/router/FallbackRoute.tsx
View file

@ -43,7 +43,7 @@ const FallbackRoute = () => {
<p>{globalize.translate('PageNotFound')}</p> <p>{globalize.translate('PageNotFound')}</p>
<LinkButton <LinkButton
className='button-link' className='button-link'
href='#/home.html' href='#/home'
> >
{globalize.translate('GoHome')} {globalize.translate('GoHome')}
</LinkButton> </LinkButton>

98
src/components/router/appRouter.js
View file

@ -13,21 +13,21 @@ import { toApi } from 'utils/jellyfin-apiclient/compat';
import { history } from 'RootAppRouter'; import { history } from 'RootAppRouter';
/** Pages of "no return" (when "Go back" should behave differently, probably quitting the application). */ /** Pages of "no return" (when "Go back" should behave differently, probably quitting the application). */
const START_PAGE_PATHS = ['/home.html', '/login.html', '/selectserver.html']; const START_PAGE_PATHS = ['/home', '/login', '/selectserver'];
/** Pages that do not require a user to be logged in to view. */ /** Pages that do not require a user to be logged in to view. */
const PUBLIC_PATHS = [ const PUBLIC_PATHS = [
'/addserver.html', '/addserver',
'/selectserver.html', '/selectserver',
'/login.html', '/login',
'/forgotpassword.html', '/forgotpassword',
'/forgotpasswordpin.html', '/forgotpasswordpin',
'/wizardremoteaccess.html', '/wizardremoteaccess',
'/wizardfinish.html', '/wizardfinish',
'/wizardlibrary.html', '/wizardlibrary',
'/wizardsettings.html', '/wizardsettings',
'/wizardstart.html', '/wizardstart',
'/wizarduser.html' '/wizarduser'
]; ];
class AppRouter { class AppRouter {
@ -89,7 +89,7 @@ class AppRouter {
path = path.replace(this.baseUrl(), ''); path = path.replace(this.baseUrl(), '');
// can't use this with home right now due to the back menu // can't use this with home right now due to the back menu
if (history.location.pathname === path && path !== '/home.html') { if (history.location.pathname === path && path !== '/home') {
loading.hide(); loading.hide();
return Promise.resolve(); return Promise.resolve();
} }
@ -249,11 +249,11 @@ class AppRouter {
const serverId = item.ServerId || options.serverId; const serverId = item.ServerId || options.serverId;
if (item === 'settings') { if (item === 'settings') {
return '#/mypreferencesmenu.html'; return '#/mypreferencesmenu';
} }
if (item === 'wizard') { if (item === 'wizard') {
return '#/wizardstart.html'; return '#/wizardstart';
} }
if (item === 'manageserver') { if (item === 'manageserver') {
@ -261,15 +261,15 @@ class AppRouter {
} }
if (item === 'recordedtv') { if (item === 'recordedtv') {
return '#/livetv.html?tab=3&serverId=' + options.serverId; return '#/livetv?tab=3&serverId=' + options.serverId;
} }
if (item === 'nextup') { if (item === 'nextup') {
return '#/list.html?type=nextup&serverId=' + options.serverId; return '#/list?type=nextup&serverId=' + options.serverId;
} }
if (item === 'list') { if (item === 'list') {
let urlForList = '#/list.html?serverId=' + options.serverId + '&type=' + options.itemTypes; let urlForList = '#/list?serverId=' + options.serverId + '&type=' + options.itemTypes;
if (options.isFavorite) { if (options.isFavorite) {
urlForList += '&IsFavorite=true'; urlForList += '&IsFavorite=true';
@ -304,49 +304,49 @@ class AppRouter {
if (item === 'livetv') { if (item === 'livetv') {
if (options.section === 'programs') { if (options.section === 'programs') {
return '#/livetv.html?tab=0&serverId=' + options.serverId; return '#/livetv?tab=0&serverId=' + options.serverId;
} }
if (options.section === 'guide') { if (options.section === 'guide') {
return '#/livetv.html?tab=1&serverId=' + options.serverId; return '#/livetv?tab=1&serverId=' + options.serverId;
} }
if (options.section === 'movies') { if (options.section === 'movies') {
return '#/list.html?type=Programs&IsMovie=true&serverId=' + options.serverId; return '#/list?type=Programs&IsMovie=true&serverId=' + options.serverId;
} }
if (options.section === 'shows') { if (options.section === 'shows') {
return '#/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + options.serverId; return '#/list?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=' + options.serverId;
} }
if (options.section === 'sports') { if (options.section === 'sports') {
return '#/list.html?type=Programs&IsSports=true&serverId=' + options.serverId; return '#/list?type=Programs&IsSports=true&serverId=' + options.serverId;
} }
if (options.section === 'kids') { if (options.section === 'kids') {
return '#/list.html?type=Programs&IsKids=true&serverId=' + options.serverId; return '#/list?type=Programs&IsKids=true&serverId=' + options.serverId;
} }
if (options.section === 'news') { if (options.section === 'news') {
return '#/list.html?type=Programs&IsNews=true&serverId=' + options.serverId; return '#/list?type=Programs&IsNews=true&serverId=' + options.serverId;
} }
if (options.section === 'onnow') { if (options.section === 'onnow') {
return '#/list.html?type=Programs&IsAiring=true&serverId=' + options.serverId; return '#/list?type=Programs&IsAiring=true&serverId=' + options.serverId;
} }
if (options.section === 'channels') { if (options.section === 'channels') {
return '#/livetv.html?tab=2&serverId=' + options.serverId; return '#/livetv?tab=2&serverId=' + options.serverId;
} }
if (options.section === 'dvrschedule') { if (options.section === 'dvrschedule') {
return '#/livetv.html?tab=4&serverId=' + options.serverId; return '#/livetv?tab=4&serverId=' + options.serverId;
} }
if (options.section === 'seriesrecording') { if (options.section === 'seriesrecording') {
return '#/livetv.html?tab=5&serverId=' + options.serverId; return '#/livetv?tab=5&serverId=' + options.serverId;
} }
return '#/livetv.html?serverId=' + options.serverId; return '#/livetv?serverId=' + options.serverId;
} }
if (itemType == 'SeriesTimer') { if (itemType == 'SeriesTimer') {
@ -354,11 +354,11 @@ class AppRouter {
} }
if (item.CollectionType == CollectionType.Livetv) { if (item.CollectionType == CollectionType.Livetv) {
return `#/livetv.html?collectionType=${item.CollectionType}`; return `#/livetv?collectionType=${item.CollectionType}`;
} }
if (item.Type === 'Genre') { if (item.Type === 'Genre') {
url = '#/list.html?genreId=' + item.Id + '&serverId=' + serverId; url = '#/list?genreId=' + item.Id + '&serverId=' + serverId;
if (context === 'livetv') { if (context === 'livetv') {
url += '&type=Programs'; url += '&type=Programs';
@ -372,7 +372,7 @@ class AppRouter {
} }
if (item.Type === 'MusicGenre') { if (item.Type === 'MusicGenre') {
url = '#/list.html?musicGenreId=' + item.Id + '&serverId=' + serverId; url = '#/list?musicGenreId=' + item.Id + '&serverId=' + serverId;
if (options.parentId) { if (options.parentId) {
url += '&parentId=' + options.parentId; url += '&parentId=' + options.parentId;
@ -382,7 +382,7 @@ class AppRouter {
} }
if (item.Type === 'Studio') { if (item.Type === 'Studio') {
url = '#/list.html?studioId=' + item.Id + '&serverId=' + serverId; url = '#/list?studioId=' + item.Id + '&serverId=' + serverId;
if (options.parentId) { if (options.parentId) {
url += '&parentId=' + options.parentId; url += '&parentId=' + options.parentId;
@ -392,7 +392,7 @@ class AppRouter {
} }
if (item === 'tag') { if (item === 'tag') {
url = `#/list.html?type=tag&tag=${encodeURIComponent(options.tag)}&serverId=${serverId}`; url = `#/list?type=tag&tag=${encodeURIComponent(options.tag)}&serverId=${serverId}`;
if (options.parentId) { if (options.parentId) {
url += '&parentId=' + options.parentId; url += '&parentId=' + options.parentId;
@ -403,7 +403,7 @@ class AppRouter {
if (context !== 'folders' && !itemHelper.isLocalItem(item)) { if (context !== 'folders' && !itemHelper.isLocalItem(item)) {
if (item.CollectionType == CollectionType.Movies) { if (item.CollectionType == CollectionType.Movies) {
url = `#/movies.html?topParentId=${item.Id}&collectionType=${item.CollectionType}`; url = `#/movies?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
if (options && options.section === 'latest') { if (options && options.section === 'latest') {
url += '&tab=1'; url += '&tab=1';
@ -413,7 +413,7 @@ class AppRouter {
} }
if (item.CollectionType == CollectionType.Tvshows) { if (item.CollectionType == CollectionType.Tvshows) {
url = `#/tv.html?topParentId=${item.Id}&collectionType=${item.CollectionType}`; url = `#/tv?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
if (options && options.section === 'latest') { if (options && options.section === 'latest') {
url += '&tab=1'; url += '&tab=1';
@ -423,7 +423,7 @@ class AppRouter {
} }
if (item.CollectionType == CollectionType.Music) { if (item.CollectionType == CollectionType.Music) {
url = `#/music.html?topParentId=${item.Id}&collectionType=${item.CollectionType}`; url = `#/music?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
if (options?.section === 'latest') { if (options?.section === 'latest') {
url += '&tab=1'; url += '&tab=1';
@ -435,7 +435,7 @@ class AppRouter {
const layoutMode = localStorage.getItem('layout'); const layoutMode = localStorage.getItem('layout');
if (layoutMode === 'experimental' && item.CollectionType == CollectionType.Homevideos) { if (layoutMode === 'experimental' && item.CollectionType == CollectionType.Homevideos) {
url = '#/homevideos.html?topParentId=' + item.Id; url = '#/homevideos?topParentId=' + item.Id;
return url; return url;
} }
@ -455,7 +455,7 @@ class AppRouter {
if (item.IsFolder) { if (item.IsFolder) {
if (id) { if (id) {
return '#/list.html?parentId=' + id + '&serverId=' + serverId; return '#/list?parentId=' + id + '&serverId=' + serverId;
} }
return '#'; return '#';
@ -465,7 +465,7 @@ class AppRouter {
} }
showLocalLogin(serverId) { showLocalLogin(serverId) {
return this.show('login.html?serverid=' + serverId); return this.show('login?serverid=' + serverId);
} }
showVideoOsd() { showVideoOsd() {
@ -473,11 +473,11 @@ class AppRouter {
} }
showSelectServer() { showSelectServer() {
return this.show('selectserver.html'); return this.show('selectserver');
} }
showSettings() { showSettings() {
return this.show('mypreferencesmenu.html'); return this.show('mypreferencesmenu');
} }
showNowPlaying() { showNowPlaying() {
@ -485,27 +485,27 @@ class AppRouter {
} }
showGuide() { showGuide() {
return this.show('livetv.html?tab=1'); return this.show('livetv?tab=1');
} }
goHome() { goHome() {
return this.show('home.html'); return this.show('home');
} }
showSearch() { showSearch() {
return this.show('search.html'); return this.show('search');
} }
showLiveTV() { showLiveTV() {
return this.show('livetv.html'); return this.show('livetv');
} }
showRecordedTV() { showRecordedTV() {
return this.show('livetv.html?tab=3'); return this.show('livetv?tab=3');
} }
showFavorites() { showFavorites() {
return this.show('home.html?tab=1'); return this.show('home?tab=1');
} }
} }

4
src/components/toolbar/AppUserMenu.tsx
View file

@ -73,7 +73,7 @@ const AppUserMenu: FC<AppUserMenuProps> = ({
> >
<MenuItem <MenuItem
component={Link} component={Link}
to={`/userprofile.html?userId=${user?.Id}`} to={`/userprofile?userId=${user?.Id}`}
onClick={onMenuClose} onClick={onMenuClose}
> >
<ListItemIcon> <ListItemIcon>
@ -85,7 +85,7 @@ const AppUserMenu: FC<AppUserMenuProps> = ({
</MenuItem> </MenuItem>
<MenuItem <MenuItem
component={Link} component={Link}
to='/mypreferencesmenu.html' to='/mypreferencesmenu'
onClick={onMenuClose} onClick={onMenuClose}
> >
<ListItemIcon> <ListItemIcon>

2
src/controllers/itemDetails/index.js
View file

@ -1995,7 +1995,7 @@ export default function (view, params) {
function onCancelSeriesTimerClick() { function onCancelSeriesTimerClick() {
import('../../components/recordingcreator/recordinghelper').then(({ default: recordingHelper }) => { import('../../components/recordingcreator/recordinghelper').then(({ default: recordingHelper }) => {
recordingHelper.cancelSeriesTimerWithConfirmation(currentItem.Id, currentItem.ServerId).then(function () { recordingHelper.cancelSeriesTimerWithConfirmation(currentItem.Id, currentItem.ServerId).then(function () {
Dashboard.navigate('livetv.html'); Dashboard.navigate('livetv');
}); });
}); });
} }

12
src/controllers/livetv.html
View file

@ -3,7 +3,7 @@
<div class="pageTabContent" id="suggestionsTab" data-index="0"> <div class="pageTabContent" id="suggestionsTab" data-index="0">
<div id="activePrograms" class="verticalSection"> <div id="activePrograms" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>
@ -12,7 +12,7 @@
</div> </div>
<div id="upcomingEpisodes" class="verticalSection"> <div id="upcomingEpisodes" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Shows}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Shows}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>
@ -21,7 +21,7 @@
</div> </div>
<div id="upcomingTvMovies" class="verticalSection"> <div id="upcomingTvMovies" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Movies}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Movies}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>
@ -30,7 +30,7 @@
</div> </div>
<div id="upcomingSports" class="verticalSection"> <div id="upcomingSports" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>
@ -39,7 +39,7 @@
</div> </div>
<div id="upcomingKids" class="verticalSection"> <div id="upcomingKids" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>
@ -48,7 +48,7 @@
</div> </div>
<div id="upcomingNews" class="verticalSection"> <div id="upcomingNews" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left"> <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="#/list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs"> <a href="#/list?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2> <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2>
<span class="material-icons chevron_right" aria-hidden="true"></span> <span class="material-icons chevron_right" aria-hidden="true"></span>
</a> </a>

2
src/controllers/livetv/livetvrecordings.js
View file

@ -70,7 +70,7 @@ function onMoreClick() {
const type = this.getAttribute('data-type'); const type = this.getAttribute('data-type');
if (type === 'latest') { if (type === 'latest') {
Dashboard.navigate('list.html?type=Recordings&serverId=' + ApiClient.serverId()); Dashboard.navigate('list?type=Recordings&serverId=' + ApiClient.serverId());
} }
} }

2
src/controllers/livetv/livetvsuggested.js
View file

@ -323,7 +323,7 @@ export default function (view, params) {
function onInputCommand(evt) { function onInputCommand(evt) {
if (evt.detail.command === 'search') { if (evt.detail.command === 'search') {
evt.preventDefault(); evt.preventDefault();
Dashboard.navigate('search.html?collectionType=livetv'); Dashboard.navigate('search?collectionType=livetv');
} }
} }

2
src/controllers/movies/moviesrecommended.js
View file

@ -370,7 +370,7 @@ export default function (view, params) {
function onInputCommand(e) { function onInputCommand(e) {
if (e.detail.command === 'search') { if (e.detail.command === 'search') {
e.preventDefault(); e.preventDefault();
Dashboard.navigate('search.html?collectionType=movies&parentId=' + params.topParentId); Dashboard.navigate('search?collectionType=movies&parentId=' + params.topParentId);
} }
} }

2
src/controllers/music/musicrecommended.js
View file

@ -348,7 +348,7 @@ export default function (view, params) {
function onInputCommand(e) { function onInputCommand(e) {
if (e.detail.command === 'search') { if (e.detail.command === 'search') {
e.preventDefault(); e.preventDefault();
Dashboard.navigate('search.html?collectionType=music&parentId=' + params.topParentId); Dashboard.navigate('search?collectionType=music&parentId=' + params.topParentId);
} }
} }

6
src/controllers/session/addServer/index.js
View file

@ -12,14 +12,14 @@ function handleConnectionResult(page, result) {
case ConnectionState.SignedIn: { case ConnectionState.SignedIn: {
const apiClient = result.ApiClient; const apiClient = result.ApiClient;
Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient); Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
Dashboard.navigate('home.html'); Dashboard.navigate('home');
break; break;
} }
case ConnectionState.ServerSignIn: case ConnectionState.ServerSignIn:
Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id, false, 'none'); Dashboard.navigate('login?serverid=' + result.Servers[0].Id, false, 'none');
break; break;
case ConnectionState.ServerSelection: case ConnectionState.ServerSelection:
Dashboard.navigate('selectserver.html', false, 'none'); Dashboard.navigate('selectserver', false, 'none');
break; break;
case ConnectionState.ServerUpdateNeeded: case ConnectionState.ServerUpdateNeeded:
Dashboard.alert({ Dashboard.alert({

2
src/controllers/session/forgotPassword/index.js
View file

@ -30,7 +30,7 @@ function processForgotPasswordResult(result) {
message: msg, message: msg,
title: globalize.translate('ButtonForgotPassword'), title: globalize.translate('ButtonForgotPassword'),
callback: function () { callback: function () {
Dashboard.navigate('forgotpasswordpin.html'); Dashboard.navigate('forgotpasswordpin');
} }
}); });
} }

6
src/controllers/session/login/index.js
View file

@ -110,7 +110,7 @@ function authenticateQuickConnect(apiClient, targetUrl) {
function onLoginSuccessful(id, accessToken, apiClient, url) { function onLoginSuccessful(id, accessToken, apiClient, url) {
Dashboard.onServerChanged(id, accessToken, apiClient); Dashboard.onServerChanged(id, accessToken, apiClient);
Dashboard.navigate(url || 'home.html'); Dashboard.navigate(url || 'home');
} }
function showManualForm(context, showCancel, focusPassword) { function showManualForm(context, showCancel, focusPassword) {
@ -201,7 +201,7 @@ export default function (view, params) {
} }
} }
return '/home.html'; return '/home';
} }
function showVisualForm() { function showVisualForm() {
@ -243,7 +243,7 @@ export default function (view, params) {
return false; return false;
}); });
view.querySelector('.btnForgotPassword').addEventListener('click', function () { view.querySelector('.btnForgotPassword').addEventListener('click', function () {
Dashboard.navigate('forgotpassword.html'); Dashboard.navigate('forgotpassword');
}); });
view.querySelector('.btnCancel').addEventListener('click', showVisualForm); view.querySelector('.btnCancel').addEventListener('click', showVisualForm);
view.querySelector('.btnQuick').addEventListener('click', function () { view.querySelector('.btnQuick').addEventListener('click', function () {

2
src/controllers/session/selectServer/index.html
View file

@ -9,7 +9,7 @@
</div> </div>
</div> </div>
<div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x"> <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
<a is="emby-linkbutton" href="#/addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;"> <a is="emby-linkbutton" href="#/addserver" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
<span>${ButtonAddServer}</span> <span>${ButtonAddServer}</span>
</a> </a>
</div> </div>

4
src/controllers/session/selectServer/index.js
View file

@ -115,12 +115,12 @@ export default function (view, params) {
switch (result.State) { switch (result.State) {
case ConnectionState.SignedIn: case ConnectionState.SignedIn:
Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient); Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
Dashboard.navigate('home.html'); Dashboard.navigate('home');
break; break;
case ConnectionState.ServerSignIn: case ConnectionState.ServerSignIn:
Dashboard.onServerChanged(null, null, apiClient); Dashboard.onServerChanged(null, null, apiClient);
Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id); Dashboard.navigate('login?serverid=' + result.Servers[0].Id);
break; break;
case ConnectionState.ServerUpdateNeeded: case ConnectionState.ServerUpdateNeeded:

2
src/controllers/shows/tvrecommended.js
View file

@ -333,7 +333,7 @@ export default function (view, params) {
function onInputCommand(e) { function onInputCommand(e) {
if (e.detail.command === 'search') { if (e.detail.command === 'search') {
e.preventDefault(); e.preventDefault();
Dashboard.navigate(`search.html?collectionType=${CollectionType.Tvshows}&parentId=${params.topParentId}`); Dashboard.navigate(`search?collectionType=${CollectionType.Tvshows}&parentId=${params.topParentId}`);
} }
} }

12
src/controllers/user/menu/index.js
View file

@ -26,13 +26,13 @@ export default function (view, params) {
const userId = params.userId || Dashboard.getCurrentUserId(); const userId = params.userId || Dashboard.getCurrentUserId();
const page = this; const page = this;
page.querySelector('.lnkUserProfile').setAttribute('href', '#/userprofile.html?userId=' + userId); page.querySelector('.lnkUserProfile').setAttribute('href', '#/userprofile?userId=' + userId);
page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay.html?userId=' + userId); page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay?userId=' + userId);
page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId); page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome?userId=' + userId);
page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId); page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback?userId=' + userId);
page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#/mypreferencessubtitles.html?userId=' + userId); page.querySelector('.lnkSubtitlePreferences').setAttribute('href', '#/mypreferencessubtitles?userId=' + userId);
page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#/quickconnect?userId=' + userId); page.querySelector('.lnkQuickConnectPreferences').setAttribute('href', '#/quickconnect?userId=' + userId);
page.querySelector('.lnkControlsPreferences').setAttribute('href', '#/mypreferencescontrols.html?userId=' + userId); page.querySelector('.lnkControlsPreferences').setAttribute('href', '#/mypreferencescontrols?userId=' + userId);
const supportsClientSettings = appHost.supports('clientsettings'); const supportsClientSettings = appHost.supports('clientsettings');
page.querySelector('.clientSettings').classList.toggle('hide', !supportsClientSettings); page.querySelector('.clientSettings').classList.toggle('hide', !supportsClientSettings);

2
src/controllers/wizard/library.js
View file

@ -361,7 +361,7 @@ function getVirtualFolderHtml(page, virtualFolder, index) {
window.WizardLibraryPage = { window.WizardLibraryPage = {
next: function () { next: function () {
Dashboard.navigate('wizardsettings.html'); Dashboard.navigate('wizardsettings');
} }
}; };
pageClassOn('pageshow', 'mediaLibraryPage', function () { pageClassOn('pageshow', 'mediaLibraryPage', function () {

2
src/controllers/wizard/remote/index.js
View file

@ -23,7 +23,7 @@ function save(page) {
} }
function navigateToNextPage() { function navigateToNextPage() {
Dashboard.navigate('wizardfinish.html'); Dashboard.navigate('wizardfinish');
} }
function onSubmit(e) { function onSubmit(e) {

2
src/controllers/wizard/settings/index.js
View file

@ -66,7 +66,7 @@ function reload(page) {
} }
function navigateToNextPage() { function navigateToNextPage() {
Dashboard.navigate('wizardremoteaccess.html'); Dashboard.navigate('wizardremoteaccess');
} }
function onSubmit(e) { function onSubmit(e) {

2
src/controllers/wizard/start/index.js
View file

@ -24,7 +24,7 @@ function save(page) {
url: apiClient.getUrl('Startup/Configuration'), url: apiClient.getUrl('Startup/Configuration'),
contentType: 'application/json' contentType: 'application/json'
}).then(function () { }).then(function () {
Dashboard.navigate('wizarduser.html'); Dashboard.navigate('wizarduser');
}); });
}); });
} }

2
src/controllers/wizard/user/index.js
View file

@ -11,7 +11,7 @@ function getApiClient() {
} }
function nextWizardPage() { function nextWizardPage() {
Dashboard.navigate('wizardlibrary.html') Dashboard.navigate('wizardlibrary')
.catch(err => { .catch(err => {
console.error('[Wizard > User] error navigating to library setup', err); console.error('[Wizard > User] error navigating to library setup', err);
}); });

2
src/hooks/useCurrentTab.ts
View file

@ -6,7 +6,7 @@ const useCurrentTab = () => {
const [searchParams, setSearchParams] = useSearchParams(); const [searchParams, setSearchParams] = useSearchParams();
const searchParamsTab = searchParams.get('tab'); const searchParamsTab = searchParams.get('tab');
const libraryId = const libraryId =
location.pathname === '/livetv.html' ? location.pathname === '/livetv' ?
'livetv' : 'livetv' :
searchParams.get('topParentId'); searchParams.get('topParentId');
const activeTab: number = const activeTab: number =

2
src/manifest.json
View file

@ -3,7 +3,7 @@
"description": "The Free Software Media System", "description": "The Free Software Media System",
"lang": "en-US", "lang": "en-US",
"short_name": "Jellyfin", "short_name": "Jellyfin",
"start_url": "index.html#/home.html", "start_url": "index.html#/home",
"theme_color": "#101010", "theme_color": "#101010",
"background_color": "#101010", "background_color": "#101010",
"display": "standalone", "display": "standalone",

12
src/scripts/itemsByName.js
View file

@ -302,26 +302,26 @@ function loadItems(element, item, type, query, listOptions) {
function getMoreItemsHref(item, type) { function getMoreItemsHref(item, type) {
if (item.Type === 'Genre') { if (item.Type === 'Genre') {
return '#/list.html?type=' + type + '&genreId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&genreId=' + item.Id + '&serverId=' + item.ServerId;
} }
if (item.Type === 'MusicGenre') { if (item.Type === 'MusicGenre') {
return '#/list.html?type=' + type + '&musicGenreId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&musicGenreId=' + item.Id + '&serverId=' + item.ServerId;
} }
if (item.Type === 'Studio') { if (item.Type === 'Studio') {
return '#/list.html?type=' + type + '&studioId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&studioId=' + item.Id + '&serverId=' + item.ServerId;
} }
if (item.Type === 'MusicArtist') { if (item.Type === 'MusicArtist') {
return '#/list.html?type=' + type + '&artistId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&artistId=' + item.Id + '&serverId=' + item.ServerId;
} }
if (item.Type === 'Person') { if (item.Type === 'Person') {
return '#/list.html?type=' + type + '&personId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&personId=' + item.Id + '&serverId=' + item.ServerId;
} }
return '#/list.html?type=' + type + '&parentId=' + item.Id + '&serverId=' + item.ServerId; return '#/list?type=' + type + '&parentId=' + item.Id + '&serverId=' + item.ServerId;
} }
function addCurrentItemToQuery(query, item) { function addCurrentItemToQuery(query, item) {

10
src/scripts/libraryMenu.js
View file

@ -214,11 +214,11 @@ function showSearch() {
} }
function onHeaderUserButtonClick() { function onHeaderUserButtonClick() {
Dashboard.navigate('mypreferencesmenu.html'); Dashboard.navigate('mypreferencesmenu');
} }
function onHeaderHomeButtonClick() { function onHeaderHomeButtonClick() {
Dashboard.navigate('home.html'); Dashboard.navigate('home');
} }
function showAudioPlayer() { function showAudioPlayer() {
@ -321,7 +321,7 @@ function onMainDrawerSelect() {
function refreshLibraryInfoInDrawer(user) { function refreshLibraryInfoInDrawer(user) {
let html = ''; let html = '';
html += '<div style="height:.5em;"></div>'; html += '<div style="height:.5em;"></div>';
html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#/home.html"><span class="material-icons navMenuOptionIcon home" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Home')}</span></a>`; html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#/home"><span class="material-icons navMenuOptionIcon home" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Home')}</span></a>`;
// placeholder for custom menu links // placeholder for custom menu links
html += '<div class="customMenuOptions"></div>'; html += '<div class="customMenuOptions"></div>';
@ -406,7 +406,7 @@ function getUserViews(apiClient, userId) {
guideView.Name = globalize.translate('Guide'); guideView.Name = globalize.translate('Guide');
guideView.ImageTags = {}; guideView.ImageTags = {};
guideView.icon = 'dvr'; guideView.icon = 'dvr';
guideView.url = '#/livetv.html?tab=1'; guideView.url = '#/livetv?tab=1';
list.push(guideView); list.push(guideView);
} }
} }
@ -503,7 +503,7 @@ function onSelectServerClick() {
} }
function onSettingsClick() { function onSettingsClick() {
Dashboard.navigate('mypreferencesmenu.html'); Dashboard.navigate('mypreferencesmenu');
} }
function onExitAppClick() { function onExitAppClick() {

4
src/utils/dashboard.js
View file

@ -105,7 +105,7 @@ export function logout() {
// Reset cached views // Reset cached views
viewContainer.reset(); viewContainer.reset();
webSettings.getMultiServer().then(multi => { webSettings.getMultiServer().then(multi => {
multi ? navigate('selectserver.html') : navigate('login.html'); multi ? navigate('selectserver') : navigate('login');
}); });
}); });
} }
@ -191,7 +191,7 @@ export function selectServer() {
if (window.NativeShell && typeof window.NativeShell.selectServer === 'function') { if (window.NativeShell && typeof window.NativeShell.selectServer === 'function') {
window.NativeShell.selectServer(); window.NativeShell.selectServer();
} else { } else {
navigate('selectserver.html'); navigate('selectserver');
} }
} }