jellyfin/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2026-09-03 03:50:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update experimental naming

Browse Source
This commit is contained in:
Bill Thornton
2026-06-30 12:17:22 -04:00
parent fad0c5ca19
commit bb7b72dc3f
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RootAppRouter.tsx
+5 -5
View File
@@ -8,8 +8,8 @@ import {
} from 'react-router-dom';
import { DASHBOARD_APP_PATHS, DASHBOARD_APP_ROUTES } from 'apps/dashboard/routes/routes';
import { EXPERIMENTAL_APP_ROUTES } from 'apps/modern/routes/routes';
import { STABLE_APP_ROUTES } from 'apps/legacy/routes/routes';
import { APP_ROUTES as MODERN_APP_ROUTES } from 'apps/modern/routes/routes';
import { APP_ROUTES as LEGACY_APP_ROUTES } from 'apps/legacy/routes/routes';
import { WIZARD_APP_ROUTES } from 'apps/wizard/routes/routes';
import AppHeader from 'components/AppHeader';
import Backdrop from 'components/Backdrop';
@@ -20,13 +20,13 @@ import { LayoutMode } from 'constants/layoutMode';
import appTheme from 'themes';
import { ThemeStorageManager } from 'themes/themeStorageManager';
const isExperimentalLayout = layoutManager.layout === LayoutMode.Experimental;
const isModernLayout = layoutManager.layout === LayoutMode.Experimental;
const router = createHashRouter([
{
element: <RootAppLayout />,
children: [
...(isExperimentalLayout ? EXPERIMENTAL_APP_ROUTES : STABLE_APP_ROUTES),
...(isModernLayout ? MODERN_APP_ROUTES : LEGACY_APP_ROUTES),
...DASHBOARD_APP_ROUTES,
...WIZARD_APP_ROUTES,
{
@@ -59,7 +59,7 @@ function RootAppLayout() {
storageManager={ThemeStorageManager}
>
<Backdrop />
<AppHeader isHidden={isExperimentalLayout || isNewLayoutPath} />
<AppHeader isHidden={isModernLayout || isNewLayoutPath} />
<Outlet />
</ThemeProvider>
src/apps/legacy/routes/routes.tsx
+1 -1
View File
@@ -12,7 +12,7 @@ import AppLayout from '../AppLayout';
import { ASYNC_PUBLIC_ROUTES, ASYNC_USER_ROUTES } from './asyncRoutes';
import { LEGACY_PUBLIC_ROUTES, LEGACY_USER_ROUTES } from './legacyRoutes';
export const STABLE_APP_ROUTES: RouteObject[] = [
export const APP_ROUTES: RouteObject[] = [
{
path: '/*',
Component: AppLayout,
src/apps/modern/components/AppToolbar/index.tsx
+5 -5
View File
@@ -3,7 +3,7 @@ import React, { type FC } from 'react';
import { useLocation } from 'react-router-dom';
import { appRouter, PUBLIC_PATHS } from 'components/router/appRouter';
import AppToolbar from 'components/toolbar/AppToolbar';
import BaseToolbar from 'components/toolbar/AppToolbar';
import ServerButton from 'components/toolbar/ServerButton';
import RemotePlayButton from './RemotePlayButton';
@@ -17,7 +17,7 @@ interface AppToolbarProps {
onDrawerButtonClick: (event: React.MouseEvent<HTMLElement>) => void
}
const ExperimentalAppToolbar: FC<AppToolbarProps> = ({
const AppToolbar: FC<AppToolbarProps> = ({
isDrawerAvailable,
isDrawerOpen,
onDrawerButtonClick
@@ -34,7 +34,7 @@ const ExperimentalAppToolbar: FC<AppToolbarProps> = ({
const isPublicPath = PUBLIC_PATHS.includes(location.pathname);
return (
<AppToolbar
<BaseToolbar
buttons={!isPublicPath && (
<>
<SyncPlayButton />
@@ -60,8 +60,8 @@ const ExperimentalAppToolbar: FC<AppToolbarProps> = ({
)}
</Stack>
)}
</AppToolbar>
</BaseToolbar>
);
};
export default ExperimentalAppToolbar;
export default AppToolbar;
src/apps/modern/routes/routes.tsx
+1 -1
View File
@@ -11,7 +11,7 @@ import { ASYNC_USER_ROUTES } from './asyncRoutes';
import { LEGACY_PUBLIC_ROUTES, LEGACY_USER_ROUTES } from './legacyRoutes';
import VideoPage from './video';
export const EXPERIMENTAL_APP_ROUTES: RouteObject[] = [
export const APP_ROUTES: RouteObject[] = [
{
path: '/*',
lazy: () => import('../AppLayout'),
src/components/router/appRouter.js
+7 -7
View File
@@ -405,9 +405,9 @@ class AppRouter {
}
if (context !== 'folders' && !itemHelper.isLocalItem(item)) {
const isExperimentalLayout = layoutManager.layout === LayoutMode.Experimental;
const isModernLayout = layoutManager.layout === LayoutMode.Experimental;
if (isExperimentalLayout && item.CollectionType == CollectionType.Books) {
if (isModernLayout && item.CollectionType == CollectionType.Books) {
url = `#/books?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
if (options?.section === 'latest') {
@@ -446,11 +446,11 @@ class AppRouter {
return url;
}
if (isExperimentalLayout && item.CollectionType == CollectionType.Homevideos) {
if (isModernLayout && item.CollectionType == CollectionType.Homevideos) {
return '#/homevideos?topParentId=' + item.Id;
}
if (isExperimentalLayout && item.CollectionType == CollectionType.Musicvideos) {
if (isModernLayout && item.CollectionType == CollectionType.Musicvideos) {
url = `#/musicvideos?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
if (options?.section === 'latest') {
@@ -459,15 +459,15 @@ class AppRouter {
return url;
}
if (isExperimentalLayout && item.CollectionType == CollectionType.Boxsets) {
if (isModernLayout && item.CollectionType == CollectionType.Boxsets) {
return `#/boxsets?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
}
if (isExperimentalLayout && item.CollectionType == CollectionType.Playlists) {
if (isModernLayout && item.CollectionType == CollectionType.Playlists) {
return `#/playlists?topParentId=${item.Id}&collectionType=${item.CollectionType}`;
}
if (isExperimentalLayout && item.CollectionType == null && item.Type === 'CollectionFolder') {
if (isModernLayout && item.CollectionType == null && item.Type === 'CollectionFolder') {
url = `#/mixed?topParentId=${item.Id}&collectionType=mixed`;
if (options?.section === 'latest') {