diff --git a/src/controllers/dashboard/users/userlibraryaccess.html b/src/controllers/dashboard/users/userlibraryaccess.html deleted file mode 100644 index abcbfaf103..0000000000 --- a/src/controllers/dashboard/users/userlibraryaccess.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/src/components/pages/UserLibraryAccessPage.tsx b/src/routes/UserLibraryAccessPage.tsx similarity index 93% rename from src/components/pages/UserLibraryAccessPage.tsx rename to src/routes/UserLibraryAccessPage.tsx index 06400af89a..7cb645783b 100644 --- a/src/components/pages/UserLibraryAccessPage.tsx +++ b/src/routes/UserLibraryAccessPage.tsx @@ -1,16 +1,17 @@ import { UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react'; -import loading from '../loading/loading'; -import libraryMenu from '../../scripts/libraryMenu'; -import globalize from '../../scripts/globalize'; -import toast from '../toast/toast'; -import SectionTabs from '../dashboard/users/SectionTabs'; -import ButtonElement from '../dashboard/elements/ButtonElement'; -import { getParameterByName } from '../../utils/url'; -import SectionTitleContainer from '../dashboard/elements/SectionTitleContainer'; -import AccessContainer from '../dashboard/users/AccessContainer'; -import CheckBoxElement from '../dashboard/elements/CheckBoxElement'; +import loading from '../components/loading/loading'; +import libraryMenu from '../scripts/libraryMenu'; +import globalize from '../scripts/globalize'; +import toast from '../components/toast/toast'; +import SectionTabs from '../components/dashboard/users/SectionTabs'; +import ButtonElement from '../components/dashboard/elements/ButtonElement'; +import { getParameterByName } from '../utils/url'; +import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer'; +import AccessContainer from '../components/dashboard/users/AccessContainer'; +import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement'; +import Page from '../components/Page'; type ItemsArr = { Name?: string; @@ -226,8 +227,11 @@ const UserLibraryAccessPage: FunctionComponent = () => { }, [loadData]); return ( -
-
+ +
{
-
+ + ); }; diff --git a/src/routes/index.tsx b/src/routes/index.tsx index c15d1f6d4c..0ea8b888c9 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -5,6 +5,7 @@ import ConnectionRequired from '../components/ConnectionRequired'; import NewUserPage from './NewUserPage'; import SearchPage from './search'; import UserEditPage from './UserEditPage'; +import UserLibraryAccessPage from './UserLibraryAccessPage'; import UserProfilesPage from './UserProfilesPage'; const AppRoutes = () => ( @@ -42,6 +43,14 @@ const AppRoutes = () => ( } /> + + + + } + /> {/* Suppress warnings for unhandled routes */} diff --git a/src/scripts/routes.js b/src/scripts/routes.js index 95bf83d71b..0c52e0018d 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -429,14 +429,6 @@ import { appRouter } from '../components/appRouter'; controller: 'shows/tvrecommended' }); - defineRoute({ - alias: '/userlibraryaccess.html', - path: 'dashboard/users/userlibraryaccess.html', - autoFocus: false, - roles: 'admin', - pageComponent: 'UserLibraryAccessPage' - }); - defineRoute({ alias: '/userparentalcontrol.html', path: 'dashboard/users/userparentalcontrol.html',