vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 1.9k Packages Projects Releases Wiki Activity

chore: (1) settings/security - remove pages router and use app router (#16795)

Browse Source 
* remove pages router and use app router

* add settings layout

* remove env vars
This commit is contained in:
Benny Joo
2024-09-30 23:27:58 +01:00
committed by GitHub
parent 5b5f7c1c48
commit 74a46e8ba3
13 changed files with 5 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
-1
View File
@@ -334,7 +334,6 @@ AB_TEST_BUCKET_PROBABILITY=50
# whether we redirect to the future/event-types from event-types or not
APP_ROUTER_EVENT_TYPES_ENABLED=0
APP_ROUTER_SETTINGS_DEVELOPER_ENABLED=0
APP_ROUTER_SETTINGS_SECURITY_ENABLED=0
APP_ROUTER_SETTINGS_ADMIN_ENABLED=0
APP_ROUTER_SETTINGS_PLATFORM_ENABLED=0
APP_ROUTER_SETTINGS_ORG_ENABLED=0
apps/web/abTest/middlewareFactory.ts
-1
View File
@@ -8,7 +8,6 @@ import { FUTURE_ROUTES_ENABLED_COOKIE_NAME, FUTURE_ROUTES_OVERRIDE_COOKIE_NAME }
const ROUTES: [URLPattern, boolean][] = [
["/event-types", process.env.APP_ROUTER_EVENT_TYPES_ENABLED === "1"] as const,
["/settings/developer/:path*", process.env.APP_ROUTER_SETTINGS_DEVELOPER_ENABLED === "1"] as const,
["/settings/security/:path*", process.env.APP_ROUTER_SETTINGS_SECURITY_ENABLED === "1"] as const,
["/settings/admin/:path*", process.env.APP_ROUTER_SETTINGS_ADMIN_ENABLED === "1"] as const,
["/settings/platform/:path*", process.env.APP_ROUTER_SETTINGS_PLATFORM_ENABLED === "1"] as const,
["/settings/organizations/:path*", process.env.APP_ROUTER_SETTINGS_ORG_ENABLED === "1"] as const,
apps/web/app/settings/(settings-layout)/layout.tsx
+5
View File
@@ -0,0 +1,5 @@
import { WithLayout } from "app/layoutHOC";
import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir";
export default WithLayout({ getServerLayout: getLayout })<"L">;
apps/web/app/future/settings/(settings)/security/impersonation/page.tsx → apps/web/app/settings/(settings-layout)/security/impersonation/page.tsx
View File
apps/web/app/future/settings/(settings)/security/password/page.tsx → apps/web/app/settings/(settings-layout)/security/password/page.tsx
View File
apps/web/app/future/settings/(settings)/security/sso/page.tsx → apps/web/app/settings/(settings-layout)/security/sso/page.tsx
View File
apps/web/app/future/settings/(settings)/security/two-factor-auth/page.tsx → apps/web/app/settings/(settings-layout)/security/two-factor-auth/page.tsx
View File
apps/web/pages/settings/security/impersonation.tsx
-26
View File
@@ -1,26 +0,0 @@
import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Meta } from "@calcom/ui";
import PageWrapper from "@components/PageWrapper";
import ProfileImpersonationViewWrapper from "~/settings/security/impersonation-view";
const Page = () => {
const { t } = useLocale();
return (
<>
<Meta
title={t("impersonation")}
description={t("impersonation_description")}
borderInShellHeader={true}
/>
<ProfileImpersonationViewWrapper />
</>
);
};
Page.getLayout = getLayout;
Page.PageWrapper = PageWrapper;
export default Page;
apps/web/pages/settings/security/password.tsx
-23
View File
@@ -1,23 +0,0 @@
import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Meta } from "@calcom/ui";
import PageWrapper from "@components/PageWrapper";
import PasswordViewWrapper from "~/settings/security/password-view";
const Page = () => {
const { t } = useLocale();
return (
<>
<Meta title={t("password")} description={t("password_description")} borderInShellHeader={true} />
<PasswordViewWrapper />
</>
);
};
Page.getLayout = getLayout;
Page.PageWrapper = PageWrapper;
export default Page;
apps/web/pages/settings/security/sso.tsx
-25
View File
@@ -1,25 +0,0 @@
import UserSSOView from "@calcom/features/ee/sso/page/user-sso-view";
import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Meta } from "@calcom/ui";
import PageWrapper from "@components/PageWrapper";
const Page = () => {
const { t } = useLocale();
return (
<>
<Meta
title={t("sso_configuration")}
description={t("sso_configuration_description")}
borderInShellHeader={true}
/>
<UserSSOView />
</>
);
};
Page.PageWrapper = PageWrapper;
Page.getLayout = getLayout;
export default Page;
apps/web/pages/settings/security/two-factor-auth.tsx
-22
View File
@@ -1,22 +0,0 @@
import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Meta } from "@calcom/ui";
import PageWrapper from "@components/PageWrapper";
import TwoFactorAuthView from "~/settings/security/two-factor-auth-view";
const Page = () => {
const { t } = useLocale();
return (
<>
<Meta title={t("2fa")} description={t("set_up_two_factor_authentication")} borderInShellHeader={true} />
<TwoFactorAuthView />
</>
);
};
Page.getLayout = getLayout;
Page.PageWrapper = PageWrapper;
export default Page;
apps/web/scripts/vercel-app-router-deploy.sh
-1
View File
@@ -9,7 +9,6 @@ checkRoute () {
checkRoute "$APP_ROUTER_EVENT_TYPES_ENABLED" app/future/event-types
checkRoute "$APP_ROUTER_AVAILABILITY_ENABLED" app/future/availability
checkRoute "$APP_ROUTER_SETTINGS_DEVELOPER_ENABLED" app/future/settings/developer
checkRoute "$APP_ROUTER_SETTINGS_SECURITY_ENABLED" app/future/settings/security
checkRoute "$APP_ROUTER_SETTINGS_ADMIN_ENABLED" app/future/settings/admin
checkRoute "$APP_ROUTER_SETTINGS_PLATFORM_ENABLED" app/future/settings/platform
checkRoute "$APP_ROUTER_SETTINGS_ORG_ENABLED" app/future/settings/organizations
turbo.json
-1
View File
@@ -237,7 +237,6 @@
"APP_ROUTER_EVENT_TYPES_ENABLED",
"APP_ROUTER_GETTING_STARTED_STEP_ENABLED",
"APP_ROUTER_SETTINGS_DEVELOPER_ENABLED",
"APP_ROUTER_SETTINGS_SECURITY_ENABLED",
"APP_ROUTER_SETTINGS_ADMIN_ENABLED",
"APP_ROUTER_SETTINGS_PLATFORM_ENABLED",
"APP_ROUTER_SETTINGS_ORG_ENABLED",