diff --git a/packages/login/src/components/Consent.tsx b/packages/login/src/app/(root)/consent/page.client.tsx similarity index 98% rename from packages/login/src/components/Consent.tsx rename to packages/login/src/app/(root)/consent/page.client.tsx index 95822acd6e..0ad7821d72 100644 --- a/packages/login/src/components/Consent.tsx +++ b/packages/login/src/app/(root)/consent/page.client.tsx @@ -1,4 +1,3 @@ -/* eslint-disable @next/next/no-img-element */ // (c) Copyright Ascensio System SIA 2009-2024 // // This program is a free software product. @@ -30,6 +29,7 @@ import React from "react"; import styled from "styled-components"; import { useTranslation, Trans } from "react-i18next"; +import { useRouter } from "next/navigation"; import ScopeList from "@docspace/shared/utils/oauth/ScopeList"; import { Button, ButtonSize } from "@docspace/shared/components/button"; @@ -44,11 +44,10 @@ import { deleteCookie } from "@docspace/shared/utils/cookie"; import { IClientProps, TScope } from "@docspace/shared/utils/oauth/types"; import { TUser } from "@docspace/shared/api/people/types"; import api from "@docspace/shared/api"; - -import OAuthClientInfo from "./ConsentInfo"; -import { useRouter } from "next/navigation"; import { FormWrapper } from "@docspace/shared/components/form-wrapper"; +import OAuthClientInfo from "../../../components/ConsentInfo"; + const StyledButtonContainer = styled.div` margin-top: 32px; margin-bottom: 16px; diff --git a/packages/login/src/app/(root)/consent/page.tsx b/packages/login/src/app/(root)/consent/page.tsx index dde3efb055..c7578c32c6 100644 --- a/packages/login/src/app/(root)/consent/page.tsx +++ b/packages/login/src/app/(root)/consent/page.tsx @@ -23,13 +23,13 @@ // 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 { cookies } from "next/headers"; import { IClientProps } from "@docspace/shared/utils/oauth/types"; import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme"; import { LANGUAGE } from "@docspace/shared/constants"; -import Consent from "@/components/Consent"; import { getOAuthClient, getScopeList, @@ -38,6 +38,8 @@ import { } from "@/utils/actions"; import { GreetingLoginContainer } from "@/components/GreetingContainer"; +import Consent from "./page.client"; + async function Page({ searchParams, }: {