From 0df6777814152736894a891ffed2d4dd759a125a Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Thu, 11 Jan 2024 12:44:44 +0000 Subject: [PATCH] chore: [app-router-migration 20] Migrate `/settings/security/*` pages (#13046) * intuita codemod: app-directory-boilerplate-calcom * manual: move folders to (settings-layout) route group * manual: add title/description metadata * manual: Change structure & Refactor to make code up to date --- .../future/settings/security/impersonation/layout.tsx | 5 +++++ .../future/settings/security/impersonation/page.tsx | 10 ++++++++++ .../app/future/settings/security/password/layout.tsx | 5 +++++ .../app/future/settings/security/password/page.tsx | 10 ++++++++++ apps/web/app/future/settings/security/sso/layout.tsx | 5 +++++ apps/web/app/future/settings/security/sso/page.tsx | 11 +++++++++++ .../settings/security/two-factor-auth/layout.tsx | 5 +++++ .../future/settings/security/two-factor-auth/page.tsx | 10 ++++++++++ apps/web/pages/settings/security/impersonation.tsx | 2 ++ apps/web/pages/settings/security/password.tsx | 2 ++ apps/web/pages/settings/security/two-factor-auth.tsx | 2 ++ packages/features/ee/sso/page/user-sso-view.tsx | 2 ++ 12 files changed, 69 insertions(+) create mode 100644 apps/web/app/future/settings/security/impersonation/layout.tsx create mode 100644 apps/web/app/future/settings/security/impersonation/page.tsx create mode 100644 apps/web/app/future/settings/security/password/layout.tsx create mode 100644 apps/web/app/future/settings/security/password/page.tsx create mode 100644 apps/web/app/future/settings/security/sso/layout.tsx create mode 100644 apps/web/app/future/settings/security/sso/page.tsx create mode 100644 apps/web/app/future/settings/security/two-factor-auth/layout.tsx create mode 100644 apps/web/app/future/settings/security/two-factor-auth/page.tsx diff --git a/apps/web/app/future/settings/security/impersonation/layout.tsx b/apps/web/app/future/settings/security/impersonation/layout.tsx new file mode 100644 index 0000000000..230bfea4d1 --- /dev/null +++ b/apps/web/app/future/settings/security/impersonation/layout.tsx @@ -0,0 +1,5 @@ +import { WithLayout } from "app/layoutHOC"; + +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir"; + +export default WithLayout({ getLayout }); diff --git a/apps/web/app/future/settings/security/impersonation/page.tsx b/apps/web/app/future/settings/security/impersonation/page.tsx new file mode 100644 index 0000000000..2fa8e4fec2 --- /dev/null +++ b/apps/web/app/future/settings/security/impersonation/page.tsx @@ -0,0 +1,10 @@ +import Page from "@pages/settings/security/impersonation"; +import { _generateMetadata } from "app/_utils"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("impersonation"), + (t) => t("impersonation_description") + ); + +export default Page; diff --git a/apps/web/app/future/settings/security/password/layout.tsx b/apps/web/app/future/settings/security/password/layout.tsx new file mode 100644 index 0000000000..230bfea4d1 --- /dev/null +++ b/apps/web/app/future/settings/security/password/layout.tsx @@ -0,0 +1,5 @@ +import { WithLayout } from "app/layoutHOC"; + +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir"; + +export default WithLayout({ getLayout }); diff --git a/apps/web/app/future/settings/security/password/page.tsx b/apps/web/app/future/settings/security/password/page.tsx new file mode 100644 index 0000000000..acf5fe37b2 --- /dev/null +++ b/apps/web/app/future/settings/security/password/page.tsx @@ -0,0 +1,10 @@ +import Page from "@pages/settings/security/password"; +import { _generateMetadata } from "app/_utils"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("password"), + (t) => t("password_description") + ); + +export default Page; diff --git a/apps/web/app/future/settings/security/sso/layout.tsx b/apps/web/app/future/settings/security/sso/layout.tsx new file mode 100644 index 0000000000..230bfea4d1 --- /dev/null +++ b/apps/web/app/future/settings/security/sso/layout.tsx @@ -0,0 +1,5 @@ +import { WithLayout } from "app/layoutHOC"; + +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir"; + +export default WithLayout({ getLayout }); diff --git a/apps/web/app/future/settings/security/sso/page.tsx b/apps/web/app/future/settings/security/sso/page.tsx new file mode 100644 index 0000000000..996ac7c913 --- /dev/null +++ b/apps/web/app/future/settings/security/sso/page.tsx @@ -0,0 +1,11 @@ +import { _generateMetadata } from "app/_utils"; + +import Page from "@calcom/features/ee/sso/page/user-sso-view"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("sso_configuration"), + (t) => t("sso_configuration_description") + ); + +export default Page; diff --git a/apps/web/app/future/settings/security/two-factor-auth/layout.tsx b/apps/web/app/future/settings/security/two-factor-auth/layout.tsx new file mode 100644 index 0000000000..230bfea4d1 --- /dev/null +++ b/apps/web/app/future/settings/security/two-factor-auth/layout.tsx @@ -0,0 +1,5 @@ +import { WithLayout } from "app/layoutHOC"; + +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayoutAppDir"; + +export default WithLayout({ getLayout }); diff --git a/apps/web/app/future/settings/security/two-factor-auth/page.tsx b/apps/web/app/future/settings/security/two-factor-auth/page.tsx new file mode 100644 index 0000000000..55e16afd17 --- /dev/null +++ b/apps/web/app/future/settings/security/two-factor-auth/page.tsx @@ -0,0 +1,10 @@ +import Page from "@pages/settings/security/two-factor-auth"; +import { _generateMetadata } from "app/_utils"; + +export const generateMetadata = async () => + await _generateMetadata( + (t) => t("two_factor_auth"), + (t) => t("add_an_extra_layer_of_security") + ); + +export default Page; diff --git a/apps/web/pages/settings/security/impersonation.tsx b/apps/web/pages/settings/security/impersonation.tsx index f23b358f72..7950f64129 100644 --- a/apps/web/pages/settings/security/impersonation.tsx +++ b/apps/web/pages/settings/security/impersonation.tsx @@ -1,3 +1,5 @@ +"use client"; + import { useState } from "react"; import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; diff --git a/apps/web/pages/settings/security/password.tsx b/apps/web/pages/settings/security/password.tsx index e008234279..7460ffa455 100644 --- a/apps/web/pages/settings/security/password.tsx +++ b/apps/web/pages/settings/security/password.tsx @@ -1,3 +1,5 @@ +"use client"; + import { signOut, useSession } from "next-auth/react"; import { useState } from "react"; import { useForm } from "react-hook-form"; diff --git a/apps/web/pages/settings/security/two-factor-auth.tsx b/apps/web/pages/settings/security/two-factor-auth.tsx index 1feca6152a..e5c7f13d9a 100644 --- a/apps/web/pages/settings/security/two-factor-auth.tsx +++ b/apps/web/pages/settings/security/two-factor-auth.tsx @@ -1,3 +1,5 @@ +"use client"; + import { useState } from "react"; import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; diff --git a/packages/features/ee/sso/page/user-sso-view.tsx b/packages/features/ee/sso/page/user-sso-view.tsx index c5792745d1..84b3d6bf8c 100644 --- a/packages/features/ee/sso/page/user-sso-view.tsx +++ b/packages/features/ee/sso/page/user-sso-view.tsx @@ -1,3 +1,5 @@ +"use client"; + import { useRouter } from "next/navigation"; import { useEffect } from "react";