Login:Src:App: change root layout and login page
This commit is contained in:
parent
96fa461916
commit
eb45c3f7f4
@ -26,13 +26,14 @@
|
||||
|
||||
import React from "react";
|
||||
|
||||
import { cookies } from "next/headers";
|
||||
|
||||
import { getBgPattern } from "@docspace/shared/utils/common";
|
||||
import { Scrollbar } from "@docspace/shared/components/scrollbar";
|
||||
|
||||
import SimpleNav from "@/components/SimpleNav";
|
||||
import { getColorTheme, getSettings } from "@/utils/actions";
|
||||
import { cookies } from "next/headers";
|
||||
import { ContentWrapper, FormWrapper } from "@/components/StyledLayout.styled";
|
||||
import { ContentWrapper, StyledPage } from "@/components/Layout.styled";
|
||||
|
||||
export default async function Layout({
|
||||
children,
|
||||
@ -55,12 +56,12 @@ export default async function Layout({
|
||||
<div style={{ width: "100%", height: "100%" }}>
|
||||
<SimpleNav culture={culture} />
|
||||
|
||||
<FormWrapper id="form-wrapper" bgPattern={bgPattern}>
|
||||
<ContentWrapper id="content-wrapper" bgPattern={bgPattern}>
|
||||
<div className="bg-cover" />
|
||||
<Scrollbar id="customScrollBar">
|
||||
<ContentWrapper id="content-wrapper">{children}</ContentWrapper>
|
||||
<StyledPage id="styled-page">{children}</StyledPage>
|
||||
</Scrollbar>
|
||||
</FormWrapper>
|
||||
</ContentWrapper>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ import {
|
||||
getSSO,
|
||||
getThirdPartyProviders,
|
||||
} from "@/utils/actions";
|
||||
import Login, { LoginContent } from "@/components/Login";
|
||||
import Login from "@/components/Login";
|
||||
import LoginForm from "@/components/LoginForm";
|
||||
import ThirdParty from "@/components/ThirdParty";
|
||||
import RecoverAccess from "@/components/RecoverAccess";
|
||||
@ -97,11 +97,12 @@ async function Page({
|
||||
themeId={ThemeId.LinkForgotPassword}
|
||||
isRegisterContainerVisible={isRegisterContainerVisible}
|
||||
>
|
||||
<LoginContent>
|
||||
<>
|
||||
<GreetingLoginContainer
|
||||
greetingSettings={settings.greetingSettings}
|
||||
culture={culture}
|
||||
/>
|
||||
|
||||
<FormWrapper id="login-form">
|
||||
<Login>
|
||||
<LoginForm
|
||||
@ -147,7 +148,7 @@ async function Page({
|
||||
)}
|
||||
</Login>
|
||||
</FormWrapper>
|
||||
</LoginContent>
|
||||
</>
|
||||
</ColorTheme>
|
||||
)}
|
||||
</>
|
||||
|
Loading…
Reference in New Issue
Block a user