[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,27 +3,23 @@
import { observer } from "mobx-react";
import { Outlet } from "react-router";
import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
// plane web components
import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
import { ProjectAppSidebar } from "./_sidebar";
function WorkspaceLayout() {
return (
<AuthenticationWrapper>
<>
<ProjectsAppPowerKProvider />
<WorkspaceAuthWrapper>
<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 className="relative flex size-full overflow-hidden">
<ProjectAppSidebar />
<main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
<Outlet />
</main>
</div>
<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 className="relative flex size-full overflow-hidden">
<ProjectAppSidebar />
<main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
<Outlet />
</main>
</div>
</WorkspaceAuthWrapper>
</AuthenticationWrapper>
</div>
</>
);
}

View file

@ -5,27 +5,23 @@ import { Outlet } from "react-router";
import { ContentWrapper } from "@/components/core/content-wrapper";
import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
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() {
return (
<AuthenticationWrapper>
<WorkspaceAuthWrapper>
<ProjectsAppPowerKProvider />
<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">
{/* Header */}
<SettingsHeader />
{/* Content */}
<ContentWrapper className="p-page-x md:flex w-full">
<div className="w-full h-full overflow-hidden">
<Outlet />
</div>
</ContentWrapper>
</main>
</div>
</WorkspaceAuthWrapper>
</AuthenticationWrapper>
<>
<ProjectsAppPowerKProvider />
<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">
{/* Header */}
<SettingsHeader />
{/* Content */}
<ContentWrapper className="p-page-x md:flex w-full">
<div className="w-full h-full overflow-hidden">
<Outlet />
</div>
</ContentWrapper>
</main>
</div>
</>
);
}

View file

@ -2,14 +2,20 @@
import { Outlet } from "react-router";
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 { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
export default function WorkspaceLayout() {
return (
<AppRailProvider>
<WorkspaceContentWrapper>
<Outlet />
</WorkspaceContentWrapper>
</AppRailProvider>
<AuthenticationWrapper>
<WorkspaceAuthWrapper>
<AppRailProvider>
<WorkspaceContentWrapper>
<Outlet />
</WorkspaceContentWrapper>
</AppRailProvider>
</WorkspaceAuthWrapper>
</AuthenticationWrapper>
);
}