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

update route naming

Browse source
This commit is contained in:
grafixeyehero 2022-06-29 23:35:56 +03:00
parent b1a50fbd73
commit 3c63e1472c
11 changed files with 109 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/user/menu/index.html
View file

@ -3,7 +3,7 @@
<div class="readOnlyContent" style="margin: 0 auto;"> <div class="readOnlyContent" style="margin: 0 auto;">
<div class="verticalSection verticalSection-extrabottompadding"> <div class="verticalSection verticalSection-extrabottompadding">
<h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2> <h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
<a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkMyProfile listItem-border"> <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkUserProfile listItem-border">
<div class="listItem"> <div class="listItem">
<span class="material-icons listItemIcon listItemIcon-transparent person" aria-hidden="true"></span> <span class="material-icons listItemIcon listItemIcon-transparent person" aria-hidden="true"></span>
<div class="listItemBody"> <div class="listItemBody">

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

@ -26,7 +26,7 @@ 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('.lnkMyProfile').setAttribute('href', '#/myprofile.html?userId=' + userId); page.querySelector('.lnkUserProfile').setAttribute('href', '#/userprofile.html?userId=' + userId);
page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay.html?userId=' + userId); page.querySelector('.lnkDisplayPreferences').setAttribute('href', '#/mypreferencesdisplay.html?userId=' + userId);
page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId); page.querySelector('.lnkHomePreferences').setAttribute('href', '#/mypreferenceshome.html?userId=' + userId);
page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId); page.querySelector('.lnkPlaybackPreferences').setAttribute('href', '#/mypreferencesplayback.html?userId=' + userId);

30
src/routes/index.tsx
View file

@ -2,32 +2,32 @@ import React from 'react';
import { Route, Routes } from 'react-router-dom'; import { Route, Routes } from 'react-router-dom';
import ConnectionRequired from '../components/ConnectionRequired'; import ConnectionRequired from '../components/ConnectionRequired';
import NewUserPage from './NewUserPage'; import UserNew from './user/usernew';
import SearchPage from './search'; import Search from './search';
import UserEditPage from './UserEditPage'; import UserEdit from './user/useredit';
import UserLibraryAccessPage from './UserLibraryAccessPage'; import UserLibraryAccess from './user/userlibraryaccess';
import UserParentalControl from './UserParentalControl'; import UserParentalControl from './user/userparentalcontrol';
import UserPasswordPage from './UserPasswordPage'; import UserPassword from './user/userpassword';
import UserProfilePage from './UserProfilePage'; import UserProfile from './user/userprofile';
import UserProfilesPage from './UserProfilesPage'; import UserProfiles from './user/userprofiles';
const AppRoutes = () => ( const AppRoutes = () => (
<Routes> <Routes>
<Route path='/'> <Route path='/'>
{/* User routes */} {/* User routes */}
<Route path='/' element={<ConnectionRequired />}> <Route path='/' element={<ConnectionRequired />}>
<Route path='search.html' element={<SearchPage />} /> <Route path='search.html' element={<Search />} />
<Route path='myprofile.html' element={<UserProfilePage />} /> <Route path='userprofile.html' element={<UserProfile />} />
</Route> </Route>
{/* Admin routes */} {/* Admin routes */}
<Route path='/' element={<ConnectionRequired isAdminRequired={true} />}> <Route path='/' element={<ConnectionRequired isAdminRequired={true} />}>
<Route path='usernew.html' element={<NewUserPage />} /> <Route path='usernew.html' element={<UserNew />} />
<Route path='userprofiles.html' element={<UserProfilesPage />} /> <Route path='userprofiles.html' element={<UserProfiles />} />
<Route path='useredit.html' element={<UserEditPage />} /> <Route path='useredit.html' element={<UserEdit />} />
<Route path='userlibraryaccess.html' element={<UserLibraryAccessPage />} /> <Route path='userlibraryaccess.html' element={<UserLibraryAccess />} />
<Route path='userparentalcontrol.html' element={<UserParentalControl />} /> <Route path='userparentalcontrol.html' element={<UserParentalControl />} />
<Route path='userpassword.html' element={<UserPasswordPage />} /> <Route path='userpassword.html' element={<UserPassword />} />
</Route> </Route>
{/* Suppress warnings for unhandled routes */} {/* Suppress warnings for unhandled routes */}

4
src/routes/search.tsx
View file

@ -8,7 +8,7 @@ import SearchSuggestions from '../components/search/SearchSuggestions';
import LiveTVSearchResults from '../components/search/LiveTVSearchResults'; import LiveTVSearchResults from '../components/search/LiveTVSearchResults';
import globalize from '../scripts/globalize'; import globalize from '../scripts/globalize';
const SearchPage: FunctionComponent = () => { const Search: FunctionComponent = () => {
const [ query, setQuery ] = useState<string>(); const [ query, setQuery ] = useState<string>();
const [ searchParams ] = useSearchParams(); const [ searchParams ] = useSearchParams();
@ -41,4 +41,4 @@ const SearchPage: FunctionComponent = () => {
); );
}; };
export default SearchPage; export default Search;

32
src/routes/UserEditPage.tsx → src/routes/user/useredit.tsx
View file

@ -1,20 +1,20 @@
import { SyncPlayUserAccessType, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import { SyncPlayUserAccessType, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react'; import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
import Dashboard from '../utils/dashboard'; import Dashboard from '../../utils/dashboard';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import LibraryMenu from '../scripts/libraryMenu'; import LibraryMenu from '../../scripts/libraryMenu';
import ButtonElement from '../elements/ButtonElement'; import ButtonElement from '../../elements/ButtonElement';
import CheckBoxElement from '../elements/CheckBoxElement'; import CheckBoxElement from '../../elements/CheckBoxElement';
import InputElement from '../elements/InputElement'; import InputElement from '../../elements/InputElement';
import LinkEditUserPreferences from '../components/dashboard/users/LinkEditUserPreferences'; import LinkEditUserPreferences from '../../components/dashboard/users/LinkEditUserPreferences';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import SectionTabs from '../components/dashboard/users/SectionTabs'; import SectionTabs from '../../components/dashboard/users/SectionTabs';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import toast from '../components/toast/toast'; import toast from '../../components/toast/toast';
import { getParameterByName } from '../utils/url'; import { getParameterByName } from '../../utils/url';
import escapeHTML from 'escape-html'; import escapeHTML from 'escape-html';
import SelectElement from '../elements/SelectElement'; import SelectElement from '../../elements/SelectElement';
import Page from '../components/Page'; import Page from '../../components/Page';
type ItemsArr = { type ItemsArr = {
Name?: string; Name?: string;
@ -27,7 +27,7 @@ type ProvidersArr = {
Id?: string; Id?: string;
} }
const UserEditPage: FunctionComponent = () => { const UserEdit: FunctionComponent = () => {
const [ userName, setUserName ] = useState(''); const [ userName, setUserName ] = useState('');
const [ deleteFoldersAccess, setDeleteFoldersAccess ] = useState<ItemsArr[]>([]); const [ deleteFoldersAccess, setDeleteFoldersAccess ] = useState<ItemsArr[]>([]);
const [ authProviders, setAuthProviders ] = useState<ProvidersArr[]>([]); const [ authProviders, setAuthProviders ] = useState<ProvidersArr[]>([]);
@ -578,4 +578,4 @@ const UserEditPage: FunctionComponent = () => {
); );
}; };
export default UserEditPage; export default UserEdit;

26
src/routes/UserLibraryAccessPage.tsx → src/routes/user/userlibraryaccess.tsx
View file

@ -1,17 +1,17 @@
import { UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import { UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react'; import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import libraryMenu from '../scripts/libraryMenu'; import libraryMenu from '../../scripts/libraryMenu';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import toast from '../components/toast/toast'; import toast from '../../components/toast/toast';
import SectionTabs from '../components/dashboard/users/SectionTabs'; import SectionTabs from '../../components/dashboard/users/SectionTabs';
import ButtonElement from '../elements/ButtonElement'; import ButtonElement from '../../elements/ButtonElement';
import { getParameterByName } from '../utils/url'; import { getParameterByName } from '../../utils/url';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import AccessContainer from '../components/dashboard/users/AccessContainer'; import AccessContainer from '../../components/dashboard/users/AccessContainer';
import CheckBoxElement from '../elements/CheckBoxElement'; import CheckBoxElement from '../../elements/CheckBoxElement';
import Page from '../components/Page'; import Page from '../../components/Page';
type ItemsArr = { type ItemsArr = {
Name?: string; Name?: string;
@ -20,7 +20,7 @@ type ItemsArr = {
checkedAttribute?: string checkedAttribute?: string
} }
const UserLibraryAccessPage: FunctionComponent = () => { const UserLibraryAccess: FunctionComponent = () => {
const [ userName, setUserName ] = useState(''); const [ userName, setUserName ] = useState('');
const [channelsItems, setChannelsItems] = useState<ItemsArr[]>([]); const [channelsItems, setChannelsItems] = useState<ItemsArr[]>([]);
const [mediaFoldersItems, setMediaFoldersItems] = useState<ItemsArr[]>([]); const [mediaFoldersItems, setMediaFoldersItems] = useState<ItemsArr[]>([]);
@ -318,4 +318,4 @@ const UserLibraryAccessPage: FunctionComponent = () => {
); );
}; };
export default UserLibraryAccessPage; export default UserLibraryAccess;

24
src/routes/NewUserPage.tsx → src/routes/user/usernew.tsx
View file

@ -1,15 +1,15 @@
import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react'; import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
import Dashboard from '../utils/dashboard'; import Dashboard from '../../utils/dashboard';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import toast from '../components/toast/toast'; import toast from '../../components/toast/toast';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import InputElement from '../elements/InputElement'; import InputElement from '../../elements/InputElement';
import ButtonElement from '../elements/ButtonElement'; import ButtonElement from '../../elements/ButtonElement';
import AccessContainer from '../components/dashboard/users/AccessContainer'; import AccessContainer from '../../components/dashboard/users/AccessContainer';
import CheckBoxElement from '../elements/CheckBoxElement'; import CheckBoxElement from '../../elements/CheckBoxElement';
import Page from '../components/Page'; import Page from '../../components/Page';
type userInput = { type userInput = {
Name?: string; Name?: string;
@ -21,7 +21,7 @@ type ItemsArr = {
Id?: string; Id?: string;
} }
const NewUserPage: FunctionComponent = () => { const UserNew: FunctionComponent = () => {
const [ channelsItems, setChannelsItems ] = useState<ItemsArr[]>([]); const [ channelsItems, setChannelsItems ] = useState<ItemsArr[]>([]);
const [ mediaFoldersItems, setMediaFoldersItems ] = useState<ItemsArr[]>([]); const [ mediaFoldersItems, setMediaFoldersItems ] = useState<ItemsArr[]>([]);
const element = useRef<HTMLDivElement>(null); const element = useRef<HTMLDivElement>(null);
@ -263,4 +263,4 @@ const NewUserPage: FunctionComponent = () => {
); );
}; };
export default NewUserPage; export default UserNew;

30
src/routes/UserParentalControl.tsx → src/routes/user/userparentalcontrol.tsx
View file

@ -1,19 +1,19 @@
import { AccessSchedule, DynamicDayOfWeek, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import { AccessSchedule, DynamicDayOfWeek, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react'; import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import LibraryMenu from '../scripts/libraryMenu'; import LibraryMenu from '../../scripts/libraryMenu';
import AccessScheduleList from '../components/dashboard/users/AccessScheduleList'; import AccessScheduleList from '../../components/dashboard/users/AccessScheduleList';
import BlockedTagList from '../components/dashboard/users/BlockedTagList'; import BlockedTagList from '../../components/dashboard/users/BlockedTagList';
import ButtonElement from '../elements/ButtonElement'; import ButtonElement from '../../elements/ButtonElement';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import SectionTabs from '../components/dashboard/users/SectionTabs'; import SectionTabs from '../../components/dashboard/users/SectionTabs';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import toast from '../components/toast/toast'; import toast from '../../components/toast/toast';
import { getParameterByName } from '../utils/url'; import { getParameterByName } from '../../utils/url';
import CheckBoxElement from '../elements/CheckBoxElement'; import CheckBoxElement from '../../elements/CheckBoxElement';
import escapeHTML from 'escape-html'; import escapeHTML from 'escape-html';
import SelectElement from '../elements/SelectElement'; import SelectElement from '../../elements/SelectElement';
import Page from '../components/Page'; import Page from '../../components/Page';
type RatingsArr = { type RatingsArr = {
Name: string; Name: string;
@ -242,7 +242,7 @@ const UserParentalControl: FunctionComponent = () => {
const showSchedulePopup = (schedule: AccessSchedule, index: number) => { const showSchedulePopup = (schedule: AccessSchedule, index: number) => {
schedule = schedule || {}; schedule = schedule || {};
import('../components/accessSchedule/accessSchedule').then(({default: accessschedule}) => { import('../../components/accessSchedule/accessSchedule').then(({default: accessschedule}) => {
accessschedule.show({ accessschedule.show({
schedule: schedule schedule: schedule
}).then(function (updatedSchedule) { }).then(function (updatedSchedule) {
@ -275,7 +275,7 @@ const UserParentalControl: FunctionComponent = () => {
}; };
const showBlockedTagPopup = () => { const showBlockedTagPopup = () => {
import('../components/prompt/prompt').then(({default: prompt}) => { import('../../components/prompt/prompt').then(({default: prompt}) => {
prompt({ prompt({
label: globalize.translate('LabelTag') label: globalize.translate('LabelTag')
}).then(function (value) { }).then(function (value) {

16
src/routes/UserPasswordPage.tsx → src/routes/user/userpassword.tsx
View file

@ -1,12 +1,12 @@
import React, { FunctionComponent, useCallback, useEffect, useState } from 'react'; import React, { FunctionComponent, useCallback, useEffect, useState } from 'react';
import SectionTabs from '../components/dashboard/users/SectionTabs'; import SectionTabs from '../../components/dashboard/users/SectionTabs';
import UserPasswordForm from '../components/dashboard/users/UserPasswordForm'; import UserPasswordForm from '../../components/dashboard/users/UserPasswordForm';
import { getParameterByName } from '../utils/url'; import { getParameterByName } from '../../utils/url';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import Page from '../components/Page'; import Page from '../../components/Page';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
const UserPasswordPage: FunctionComponent = () => { const UserPassword: FunctionComponent = () => {
const userId = getParameterByName('userId'); const userId = getParameterByName('userId');
const [ userName, setUserName ] = useState(''); const [ userName, setUserName ] = useState('');
@ -48,4 +48,4 @@ const UserPasswordPage: FunctionComponent = () => {
); );
}; };
export default UserPasswordPage; export default UserPassword;

26
src/routes/UserProfilePage.tsx → src/routes/user/userprofile.tsx
View file

@ -1,19 +1,19 @@
import { ImageType, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import { ImageType, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
import React, { FunctionComponent, useEffect, useState, useRef, useCallback } from 'react'; import React, { FunctionComponent, useEffect, useState, useRef, useCallback } from 'react';
import Dashboard from '../utils/dashboard'; import Dashboard from '../../utils/dashboard';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import LibraryMenu from '../scripts/libraryMenu'; import LibraryMenu from '../../scripts/libraryMenu';
import { appHost } from '../components/apphost'; import { appHost } from '../../components/apphost';
import confirm from '../components/confirm/confirm'; import confirm from '../../components/confirm/confirm';
import ButtonElement from '../elements/ButtonElement'; import ButtonElement from '../../elements/ButtonElement';
import UserPasswordForm from '../components/dashboard/users/UserPasswordForm'; import UserPasswordForm from '../../components/dashboard/users/UserPasswordForm';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import toast from '../components/toast/toast'; import toast from '../../components/toast/toast';
import { getParameterByName } from '../utils/url'; import { getParameterByName } from '../../utils/url';
import Page from '../components/Page'; import Page from '../../components/Page';
const UserProfilePage: FunctionComponent = () => { const UserProfile: FunctionComponent = () => {
const userId = getParameterByName('userId'); const userId = getParameterByName('userId');
const [ userName, setUserName ] = useState(''); const [ userName, setUserName ] = useState('');
@ -197,4 +197,4 @@ const UserProfilePage: FunctionComponent = () => {
); );
}; };
export default UserProfilePage; export default UserProfile;

26
src/routes/UserProfilesPage.tsx → src/routes/user/userprofiles.tsx
View file

@ -1,18 +1,18 @@
import { UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client'; import { UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
import React, {FunctionComponent, useEffect, useState, useRef} from 'react'; import React, {FunctionComponent, useEffect, useState, useRef} from 'react';
import Dashboard from '../utils/dashboard'; import Dashboard from '../../utils/dashboard';
import globalize from '../scripts/globalize'; import globalize from '../../scripts/globalize';
import loading from '../components/loading/loading'; import loading from '../../components/loading/loading';
import dom from '../scripts/dom'; import dom from '../../scripts/dom';
import confirm from '../components/confirm/confirm'; import confirm from '../../components/confirm/confirm';
import UserCardBox from '../components/dashboard/users/UserCardBox'; import UserCardBox from '../../components/dashboard/users/UserCardBox';
import SectionTitleContainer from '../elements/SectionTitleContainer'; import SectionTitleContainer from '../../elements/SectionTitleContainer';
import '../elements/emby-button/emby-button'; import '../../elements/emby-button/emby-button';
import '../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-button/paper-icon-button-light';
import '../components/cardbuilder/card.scss'; import '../components/cardbuilder/card.scss';
import '../components/indicators/indicators.scss'; import '../components/indicators/indicators.scss';
import '../assets/css/flexstyles.scss'; import '../assets/css/flexstyles.scss';
import Page from '../components/Page'; import Page from '../../components/Page';
type MenuEntry = { type MenuEntry = {
name?: string; name?: string;
@ -20,7 +20,7 @@ type MenuEntry = {
icon?: string; icon?: string;
} }
const UserProfilesPage: FunctionComponent = () => { const UserProfiles: FunctionComponent = () => {
const [ users, setUsers ] = useState<UserDto[]>([]); const [ users, setUsers ] = useState<UserDto[]>([]);
const element = useRef<HTMLDivElement>(null); const element = useRef<HTMLDivElement>(null);
@ -75,7 +75,7 @@ const UserProfilesPage: FunctionComponent = () => {
icon: 'delete' icon: 'delete'
}); });
import('../components/actionSheet/actionSheet').then(({default: actionsheet}) => { import('../../components/actionSheet/actionSheet').then(({default: actionsheet}) => {
actionsheet.show({ actionsheet.show({
items: menuItems, items: menuItems,
positionTo: card, positionTo: card,
@ -159,4 +159,4 @@ const UserProfilesPage: FunctionComponent = () => {
); );
}; };
export default UserProfilesPage; export default UserProfiles;