Login:Src:App: change layout for login and confirm pages

packages/login/src/app/(root)/layout.tsx

@@ -25,35 +25,22 @@
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
 import { cookies } from "next/headers";
-import dynamic from "next/dynamic";
 
 import { SYSTEM_THEME_KEY } from "@docspace/shared/constants";
-import { ThemeKeys, WhiteLabelLogoType } from "@docspace/shared/enums";
-import { getBgPattern, getLogoUrl } from "@docspace/shared/utils/common";
+import { ThemeKeys } from "@docspace/shared/enums";
+import { getBgPattern } from "@docspace/shared/utils/common";
 import { Scrollbar } from "@docspace/shared/components/scrollbar";
-import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme";
-import { FormWrapper } from "@docspace/shared/components/form-wrapper";
 
 import SimpleNav from "@/components/SimpleNav";
-import { LoginContent, LoginFormWrapper } from "@/components/Login";
-import { getColorTheme, getSettings } from "@/utils/actions";
-
-const LanguageComboboxWrapper = dynamic(
-  () => import("@/components/LanguageCombobox"),
-  {
-    ssr: false,
-  },
-);
+import { getColorTheme } from "@/utils/actions";
+import { ContentWrapper, FormWrapper } from "@/components/StyledLayout.styled";
 
 export default async function Layout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-  const [settings, colorTheme] = await Promise.all([
-    getSettings(),
-    getColorTheme(),
-  ]);
+  const colorTheme = await getColorTheme();
 
   const cookieStore = cookies();
 
@@ -61,28 +48,16 @@ export default async function Layout({
 
   const bgPattern = getBgPattern(colorTheme?.selected);
 
-  const objectSettings = typeof settings === "string" ? undefined : settings;
-
-  const isRegisterContainerVisible = objectSettings?.enabledJoin;
-
   return (
     <div style={{ width: "100%", height: "100%" }}>
       <SimpleNav systemTheme={systemTheme} />
 
-      <LoginFormWrapper id="login-page" bgPattern={bgPattern}>
+      <FormWrapper bgPattern={bgPattern} id="form-wrapper">
         <div className="bg-cover" />
         <Scrollbar id="customScrollBar">
-          <LanguageComboboxWrapper />
-          <LoginContent>
-            <ColorTheme
-              themeId={ThemeId.LinkForgotPassword}
-              isRegisterContainerVisible={isRegisterContainerVisible}
-            >
-              {children}
-            </ColorTheme>
-          </LoginContent>
+          <ContentWrapper id="content-wrapper">{children}</ContentWrapper>
         </Scrollbar>
-      </LoginFormWrapper>
+      </FormWrapper>
     </div>
   );
 }

packages/login/src/app/(root)/page.tsx

@@ -25,46 +25,59 @@
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
 import { getSettings } from "@/utils/actions";
-import Login from "@/components/Login";
+import Login, { LoginContent } from "@/components/Login";
 import LoginForm from "@/components/LoginForm";
 import ThirdParty from "@/components/ThirdParty";
 import RecoverAccess from "@/components/RecoverAccess";
 import Register from "@/components/Register";
 import { GreetingLoginContainer } from "@/components/GreetingContainer";
 import { FormWrapper } from "@docspace/shared/components/form-wrapper";
+import LanguageComboboxWrapper from "@/components/LanguageCombobox";
+import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme";
 
 async function Page() {
   const settings = await getSettings();
 
+  const isRegisterContainerVisible =
+    typeof settings === "string" ? undefined : settings?.enabledJoin;
+
   return (
-    <Login>
+    <>
+      <LanguageComboboxWrapper />
       {settings && typeof settings !== "string" && (
-        <>
-          <GreetingLoginContainer
-            greetingSettings={settings.greetingSettings}
-          />
-          <FormWrapper id="login-form">
-            <LoginForm
-              hashSettings={settings?.passwordHash}
-              cookieSettingsEnabled={settings?.cookieSettingsEnabled}
-              reCaptchaPublicKey={settings?.recaptchaPublicKey}
-              reCaptchaType={settings?.recaptchaType}
+        <ColorTheme
+          themeId={ThemeId.LinkForgotPassword}
+          isRegisterContainerVisible={isRegisterContainerVisible}
+        >
+          <LoginContent>
+            <GreetingLoginContainer
+              greetingSettings={settings.greetingSettings}
             />
-            <ThirdParty />
-            {settings.enableAdmMess && <RecoverAccess />}
-            {settings.enabledJoin && (
-              <Register
-                id="login_register"
-                enabledJoin
-                trustedDomains={settings.trustedDomains}
-                trustedDomainsType={settings.trustedDomainsType}
-                isAuthenticated={false}
-              />
-            )}
-          </FormWrapper>
-        </>
+            <FormWrapper id="login-form">
+              <Login>
+                <LoginForm
+                  hashSettings={settings?.passwordHash}
+                  cookieSettingsEnabled={settings?.cookieSettingsEnabled}
+                  reCaptchaPublicKey={settings?.recaptchaPublicKey}
+                  reCaptchaType={settings?.recaptchaType}
+                />
+                <ThirdParty />
+                {settings.enableAdmMess && <RecoverAccess />}
+                {settings.enabledJoin && (
+                  <Register
+                    id="login_register"
+                    enabledJoin
+                    trustedDomains={settings.trustedDomains}
+                    trustedDomainsType={settings.trustedDomainsType}
+                    isAuthenticated={false}
+                  />
+                )}
+              </Login>
+            </FormWrapper>
+          </LoginContent>
+        </ColorTheme>
       )}
-    </Login>
+    </>
   );
 }