[WEB-5458] improvement: restructure layout components to enhance loading (#8141)

This commit is contained in:
Prateek Shourya 2025-11-19 19:11:17 +05:30 committed by GitHub
parent d6503232de
commit 1eaa48c95c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 38 deletions

View file

@ -3,16 +3,13 @@
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { Outlet } from "react-router"; import { Outlet } from "react-router";
import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider"; import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
// plane web components // plane web components
import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
import { ProjectAppSidebar } from "./_sidebar"; import { ProjectAppSidebar } from "./_sidebar";
function WorkspaceLayout() { function WorkspaceLayout() {
return ( return (
<AuthenticationWrapper> <>
<ProjectsAppPowerKProvider /> <ProjectsAppPowerKProvider />
<WorkspaceAuthWrapper>
<div className="relative flex flex-col h-full w-full overflow-hidden rounded-lg border border-custom-border-200"> <div className="relative flex flex-col h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
<div id="full-screen-portal" className="inset-0 absolute w-full" /> <div id="full-screen-portal" className="inset-0 absolute w-full" />
<div className="relative flex size-full overflow-hidden"> <div className="relative flex size-full overflow-hidden">
@ -22,8 +19,7 @@ function WorkspaceLayout() {
</main> </main>
</div> </div>
</div> </div>
</WorkspaceAuthWrapper> </>
</AuthenticationWrapper>
); );
} }

View file

@ -5,13 +5,10 @@ import { Outlet } from "react-router";
import { ContentWrapper } from "@/components/core/content-wrapper"; import { ContentWrapper } from "@/components/core/content-wrapper";
import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider"; import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
import { SettingsHeader } from "@/components/settings/header"; import { SettingsHeader } from "@/components/settings/header";
import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
export default function SettingsLayout() { export default function SettingsLayout() {
return ( return (
<AuthenticationWrapper> <>
<WorkspaceAuthWrapper>
<ProjectsAppPowerKProvider /> <ProjectsAppPowerKProvider />
<div className="relative flex h-full w-full overflow-hidden rounded-lg border border-custom-border-200"> <div className="relative flex h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
<main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100"> <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
@ -25,7 +22,6 @@ export default function SettingsLayout() {
</ContentWrapper> </ContentWrapper>
</main> </main>
</div> </div>
</WorkspaceAuthWrapper> </>
</AuthenticationWrapper>
); );
} }

View file

@ -2,14 +2,20 @@
import { Outlet } from "react-router"; import { Outlet } from "react-router";
import { AppRailProvider } from "@/hooks/context/app-rail-context"; import { AppRailProvider } from "@/hooks/context/app-rail-context";
import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
import { WorkspaceContentWrapper } from "@/plane-web/components/workspace/content-wrapper"; import { WorkspaceContentWrapper } from "@/plane-web/components/workspace/content-wrapper";
import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
export default function WorkspaceLayout() { export default function WorkspaceLayout() {
return ( return (
<AuthenticationWrapper>
<WorkspaceAuthWrapper>
<AppRailProvider> <AppRailProvider>
<WorkspaceContentWrapper> <WorkspaceContentWrapper>
<Outlet /> <Outlet />
</WorkspaceContentWrapper> </WorkspaceContentWrapper>
</AppRailProvider> </AppRailProvider>
</WorkspaceAuthWrapper>
</AuthenticationWrapper>
); );
} }