IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Login:Src:App: change wizard page and remove wizard layout

Browse Source
This commit is contained in:
Darya Umrikhina 2024-08-22 12:19:57 +04:00
parent 3476ca4b95
commit 5932a02b25
3 changed files with 36 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/login/src/app/wizard/page.tsx → packages/login/src/app/(root)/wizard/page.tsx
View File

@ -24,6 +24,12 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import dynamic from "next/dynamic";
import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme";
import { FormWrapper } from "@docspace/shared/components/form-wrapper";
import { GreetingContainer } from "@/components/GreetingContainer";
import WizardForm from "@/components/WizardForm";
import {
getMachineName,
@ -34,6 +40,13 @@ import {
getPortalCultures,
} from "@/utils/actions";
const LanguageComboboxWrapper = dynamic(
() => import("@/components/LanguageCombobox"),
{
ssr: false,
},
);
async function Page() {
const settings = await getSettings();
@ -54,16 +67,29 @@ async function Page() {
]);
return (
<WizardForm
passwordSettings={passwordSettings}
machineName={machineName}
isRequiredLicense={isRequiredLicense}
portalCultures={portalCultures}
portalTimeZones={portalTimeZones}
culture={objectSettings?.culture}
wizardToken={objectSettings?.wizardToken}
passwordHash={objectSettings?.passwordHash}
/>
<>
<LanguageComboboxWrapper />
<ColorTheme themeId={ThemeId.LinkForgotPassword}>
<>
<GreetingContainer
greetingSettings={objectSettings?.greetingSettings}
welcomeTitle="Wizard:WelcomeTitle"
/>
<FormWrapper id="wizard-form">
<WizardForm
passwordSettings={passwordSettings}
machineName={machineName}
isRequiredLicense={isRequiredLicense}
portalCultures={portalCultures}
portalTimeZones={portalTimeZones}
culture={objectSettings?.culture}
wizardToken={objectSettings?.wizardToken}
passwordHash={objectSettings?.passwordHash}
/>
</FormWrapper>
</>
</ColorTheme>
</>
);
}

79
packages/login/src/app/wizard/layout.tsx
View File

@ -1,79 +0,0 @@
// (c) Copyright Ascensio System SIA 2009-2024
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import { redirect } from "next/navigation";
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 { getColorTheme, getSettings } from "@/utils/actions";
import {
WizardContent,
WizardFormWrapper,
} from "@/components/Wizard/Wizard.styled";
import { GreetingContainer } from "@/components/GreetingContainer";
export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
const [settings, colorTheme] = await Promise.all([
getSettings(),
getColorTheme(),
]);
const objectSettings = typeof settings === "string" ? undefined : settings;
if (!objectSettings || !objectSettings.wizardToken) {
redirect("/");
}
const bgPattern = getBgPattern(colorTheme?.selected);
return (
<div style={{ width: "100%", height: "100%" }}>
<SimpleNav isLanguageComboboxVisible={false} />
<WizardFormWrapper id="wizard-page" bgPattern={bgPattern}>
<div className="bg-cover" />
<Scrollbar id="customScrollBar">
<WizardContent>
<ColorTheme themeId={ThemeId.LinkForgotPassword}>
<GreetingContainer
greetingSettings={objectSettings?.greetingSettings}
welcomeTitle="Wizard:WelcomeTitle"
/>
<FormWrapper id="wizard-form">{children}</FormWrapper>
</ColorTheme>
</WizardContent>
</Scrollbar>
</WizardFormWrapper>
</div>
);
}

32
packages/login/src/app/wizard/loading.tsx
View File

@ -1,32 +0,0 @@
// (c) Copyright Ascensio System SIA 2009-2024
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import AppLoader from "@docspace/shared/components/app-loader";
export default function Loading() {
// You can add any UI inside Loading, including a Skeleton.
return <AppLoader />;
}