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

chore: clean up react app layouts

Browse source
This commit is contained in:
Grady Hallenbeck 2023-10-06 20:45:37 -07:00
parent 68b21bbb04
commit 48524332dc
4 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/apps/stable/AppLayout.tsx
View file

@ -1,12 +1,24 @@
import React from 'react';
import { Outlet } from 'react-router-dom';
import { Outlet, useLocation } from 'react-router-dom';
import AppBody from 'components/AppBody';
import { DASHBOARD_APP_PATHS } from 'apps/dashboard/routes/routes';
import Backdrop from 'components/Backdrop';
import AppHeader from 'components/AppHeader';
export default function AppLayout() {
const location = useLocation();
const isNewLayoutPath = Object.values(DASHBOARD_APP_PATHS)
.some(path => location.pathname.startsWith(`/${path}`));
return (
<AppBody>
<Outlet />
</AppBody>
<>
<Backdrop />
<AppHeader isHidden={isNewLayoutPath} />
<AppBody>
<Outlet />
</AppBody>
</>
);
}

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

@ -11,7 +11,7 @@ const router = createHashRouter([
...DASHBOARD_APP_ROUTES
]);
export default function StableAppRouter({ history }: { history: History }) {
export default function StableAppRouter({ history }: Readonly<{ history: History }>) {
useLegacyRouterSync({ router, history });
return <RouterProvider router={router} />;