Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Sep 30, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e2c34f
remove pages router and use app router
hbjORbj Sep 24, 2024
1b7debb
add settings layout
hbjORbj Sep 24, 2024
d2ceadb
remove env vars
hbjORbj Sep 24, 2024
87df607
Merge branch 'main' into chore/remove-pages-router-settings-security
hbjORbj Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apps/web/abTest/middlewareFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions apps/web/app/settings/(settings-layout)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { WithLayout } from "app/layoutHOC";

import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir";

export default WithLayout({ getServerLayout: getLayout })<"L">;
0 ...settings)/security/impersonation/page.tsx → ...s-layout)/security/impersonation/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...ngs/(settings)/security/password/page.tsx → ...ttings-layout)/security/password/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...settings/(settings)/security/sso/page.tsx → ...s/(settings-layout)/security/sso/page.tsx
View file
Open in desktop
File renamed without changes.
0 ...ttings)/security/two-factor-auth/page.tsx → ...layout)/security/two-factor-auth/page.tsx
View file
Open in desktop
File renamed without changes.
26 changes: 0 additions & 26 deletions apps/web/pages/settings/security/impersonation.tsx
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions apps/web/pages/settings/security/password.tsx
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions apps/web/pages/settings/security/sso.tsx
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions apps/web/pages/settings/security/two-factor-auth.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/web/scripts/vercel-app-router-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading