diff --git a/.env.example b/.env.example index e99867e3e1..f832808a1c 100644 --- a/.env.example +++ b/.env.example @@ -371,10 +371,6 @@ APP_ROUTER_AUTH_SAML_ENABLED=0 APP_ROUTER_AUTH_ERROR_ENABLED=0 APP_ROUTER_AUTH_PLATFORM_ENABLED=0 APP_ROUTER_AUTH_OAUTH2_ENABLED=0 -APP_ROUTER_MORE_ENABLED=0 -APP_ROUTER_MAINTENANCE_ENABLED=0 -APP_ROUTER_UPGRADE_ENABLED=0 -APP_ROUTER_CONNECT_AND_JOIN_ENABLED=0 # disable setry server source maps SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1 diff --git a/apps/web/abTest/middlewareFactory.ts b/apps/web/abTest/middlewareFactory.ts index 6903552b80..7cedf24458 100644 --- a/apps/web/abTest/middlewareFactory.ts +++ b/apps/web/abTest/middlewareFactory.ts @@ -27,10 +27,6 @@ const ROUTES: [URLPattern, boolean][] = [ ["/video/:path*", process.env.APP_ROUTER_VIDEO_ENABLED === "1"] as const, ["/team", process.env.APP_ROUTER_TEAM_ENABLED === "1"] as const, ["/teams", process.env.APP_ROUTER_TEAMS_ENABLED === "1"] as const, - ["/more", process.env.APP_ROUTER_MORE_ENABLED === "1"] as const, - ["/maintenance", process.env.APP_ROUTER_MAINTENANCE_ENABLED === "1"] as const, - ["/upgrade", process.env.APP_ROUTER_UPGRADE_ENABLED === "1"] as const, - ["/connect-and-join", process.env.APP_ROUTER_CONNECT_AND_JOIN_ENABLED === "1"] as const, ["/availability", process.env.APP_ROUTER_AVAILABILITY_ENABLED === "1"] as const, ].map(([pathname, enabled]) => [ new URLPattern({ diff --git a/apps/web/app/future/connect-and-join/page.tsx b/apps/web/app/connect-and-join/page.tsx similarity index 90% rename from apps/web/app/future/connect-and-join/page.tsx rename to apps/web/app/connect-and-join/page.tsx index b429d5be7a..e0e7f58128 100644 --- a/apps/web/app/future/connect-and-join/page.tsx +++ b/apps/web/app/connect-and-join/page.tsx @@ -5,7 +5,7 @@ import LegacyPage from "~/connect-and-join/connect-and-join-view"; export const generateMetadata = async () => { return await _generateMetadata( - () => "Connect and Join", + (t) => t("connect_and_join"), () => "" ); }; diff --git a/apps/web/app/future/maintenance/page.tsx b/apps/web/app/maintenance/page.tsx similarity index 68% rename from apps/web/app/future/maintenance/page.tsx rename to apps/web/app/maintenance/page.tsx index 1067014dbc..afb78f2469 100644 --- a/apps/web/app/future/maintenance/page.tsx +++ b/apps/web/app/maintenance/page.tsx @@ -5,10 +5,17 @@ import { APP_NAME } from "@calcom/lib/constants"; import LegacyPage from "~/maintenance/maintenance-view"; -export const generateMetadata = async () => - await _generateMetadata( +export const generateMetadata = async () => { + const metadata = await _generateMetadata( (t) => t("under_maintenance"), (t) => t("under_maintenance_description", { appName: APP_NAME }) ); + return { + ...metadata, + icons: { + icon: "/favicon.ico", + }, + }; +}; export default WithLayout({ getLayout: null, Page: LegacyPage })<"P">; diff --git a/apps/web/app/future/more/page.tsx b/apps/web/app/more/page.tsx similarity index 93% rename from apps/web/app/future/more/page.tsx rename to apps/web/app/more/page.tsx index 1980555ae0..d3325d2e50 100644 --- a/apps/web/app/future/more/page.tsx +++ b/apps/web/app/more/page.tsx @@ -5,7 +5,7 @@ import Page from "~/more/more-page-view"; export const generateMetadata = async () => { return await _generateMetadata( - () => "More", + (t) => t("more"), () => "" ); }; diff --git a/apps/web/app/future/upgrade/page.tsx b/apps/web/app/upgrade/page.tsx similarity index 92% rename from apps/web/app/future/upgrade/page.tsx rename to apps/web/app/upgrade/page.tsx index aff0a0e14e..c8991427ce 100644 --- a/apps/web/app/future/upgrade/page.tsx +++ b/apps/web/app/upgrade/page.tsx @@ -5,7 +5,7 @@ import LegacyPage from "~/upgrade/upgrade-view"; export const generateMetadata = async () => await _generateMetadata( - () => "Upgrade", + (t) => t("upgrade"), () => "" ); diff --git a/apps/web/modules/maintenance/maintenance-view.tsx b/apps/web/modules/maintenance/maintenance-view.tsx index 605174f723..129e8b4460 100644 --- a/apps/web/modules/maintenance/maintenance-view.tsx +++ b/apps/web/modules/maintenance/maintenance-view.tsx @@ -1,17 +1,11 @@ "use client"; -import Head from "next/head"; - -import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants"; +import { WEBSITE_URL } from "@calcom/lib/constants"; import { Button } from "@calcom/ui"; export default function MaintenancePage() { return (
- - Under Maintenance | {APP_NAME} - -

Down for maintenance

diff --git a/apps/web/pages/connect-and-join.tsx b/apps/web/pages/connect-and-join.tsx deleted file mode 100644 index 6dae34a2f0..0000000000 --- a/apps/web/pages/connect-and-join.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import ConnectAndJoinPage from "~/connect-and-join/connect-and-join-view"; - -const Page = () => ; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/maintenance.tsx b/apps/web/pages/maintenance.tsx deleted file mode 100644 index 3428f9f126..0000000000 --- a/apps/web/pages/maintenance.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default } from "~/maintenance/maintenance-view"; diff --git a/apps/web/pages/more.tsx b/apps/web/pages/more.tsx deleted file mode 100644 index 0e82af955f..0000000000 --- a/apps/web/pages/more.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import MorePage from "~/more/more-page-view"; - -const Page = () => ; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/pages/upgrade.tsx b/apps/web/pages/upgrade.tsx deleted file mode 100644 index a805294b0b..0000000000 --- a/apps/web/pages/upgrade.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import PageWrapper from "@components/PageWrapper"; - -import UpgradePage from "~/upgrade/upgrade-view"; - -const Page = () => ; -Page.PageWrapper = PageWrapper; - -export default Page; diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 3c5c886669..5db1d376cb 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -885,6 +885,7 @@ "requires_confirmation_will_block_slot_description": "Unconfirmed bookings still block calendar slots.", "recurring_event": "Recurring Event", "recurring_event_description": "People can subscribe for recurring events", + "connect_and_join": "Connect and Join", "cannot_be_used_with_paid_event_types": "It cannot be used with paid event types", "warning_payment_instant_meeting_event": "Instant Meetings are not supported with recurring events and payment apps yet", "warning_instant_meeting_experimental": "Experimental: Instant Meeting Events are currently experimental.", diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh index 72ad7d3f19..d2b3a9680b 100755 --- a/apps/web/scripts/vercel-app-router-deploy.sh +++ b/apps/web/scripts/vercel-app-router-deploy.sh @@ -28,10 +28,6 @@ checkRoute "$APP_ROUTER_BOOKING_ENABLED" app/future/booking checkRoute "$APP_ROUTER_VIDEO_ENABLED" app/future/video checkRoute "$APP_ROUTER_TEAM_ENABLED" app/future/team checkRoute "$APP_ROUTER_TEAMS_ENABLED" app/future/teams -checkRoute "$APP_ROUTER_MORE_ENABLED" app/future/more -checkRoute "$APP_ROUTER_MAINTENANCE_ENABLED" app/future/maintenance -checkRoute "$APP_ROUTER_UPGRADE_ENABLED" app/future/upgrade -checkRoute "$APP_ROUTER_CONNECT_AND_JOIN_ENABLED" app/future/connect-and-join # These are routes that don't have and environment variable to enable or disable them # Will stop removing gradually as we test and confirm that they are working diff --git a/packages/app-store/office365calendar/api/add.ts b/packages/app-store/office365calendar/api/add.ts index 029180b59c..1a8c898c49 100644 --- a/packages/app-store/office365calendar/api/add.ts +++ b/packages/app-store/office365calendar/api/add.ts @@ -6,7 +6,13 @@ import { WEBAPP_URL_FOR_OAUTH } from "@calcom/lib/constants"; import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug"; import { encodeOAuthState } from "../../_utils/oauth/encodeOAuthState"; -const scopes = ["User.Read", "Calendars.Read", "Calendars.ReadWrite", "Calendars.ReadWrite.Shared", "offline_access"]; +const scopes = [ + "User.Read", + "Calendars.Read", + "Calendars.ReadWrite", + "Calendars.ReadWrite.Shared", + "offline_access", +]; let client_id = ""; diff --git a/packages/embeds/embed-core/playground.ts b/packages/embeds/embed-core/playground.ts index a0d76f76fd..74b51218f8 100644 --- a/packages/embeds/embed-core/playground.ts +++ b/packages/embeds/embed-core/playground.ts @@ -572,7 +572,7 @@ if (only === "all" || only == "ns:columnViewHideEventTypeDetails") { Cal.ns.columnViewHideEventTypeDetails("ui", { hideEventTypeDetails: true, }); - + Cal.ns.columnViewHideEventTypeDetails("on", { action: "*", callback, diff --git a/packages/embeds/embed-core/src/embed.test.ts b/packages/embeds/embed-core/src/embed.test.ts index 6fa860ce3f..b36927dcd4 100644 --- a/packages/embeds/embed-core/src/embed.test.ts +++ b/packages/embeds/embed-core/src/embed.test.ts @@ -31,8 +31,6 @@ describe("Cal", () => { CalClass = (await import("./embed")).Cal; }); - - describe("createIframe", () => { describe("params handling with forwardQueryParams feature enabled", () => { beforeEach(() => { @@ -126,7 +124,7 @@ describe("Cal", () => { expect(iframe.src).toContain("duration=30"); expect(iframe.src).toContain("email=test%40example.com"); }); - + it("should respect forwardQueryParams setting to disable sending page query params but still send the ones in the config", () => { mockSearchParams("?param1=value"); diff --git a/turbo.json b/turbo.json index 7b549044f5..2080fdc2c2 100644 --- a/turbo.json +++ b/turbo.json @@ -251,10 +251,6 @@ "APP_ROUTER_AUTH_ERROR_ENABLED", "APP_ROUTER_AUTH_PLATFORM_ENABLED", "APP_ROUTER_AUTH_OAUTH2_ENABLED", - "APP_ROUTER_MORE_ENABLED", - "APP_ROUTER_MAINTENANCE_ENABLED", - "APP_ROUTER_UPGRADE_ENABLED", - "APP_ROUTER_CONNECT_AND_JOIN_ENABLED", "APP_ROUTER_TEAM_ENABLED", "APP_ROUTER_TEAMS_ENABLED", "APP_ROUTER_AVAILABILITY_ENABLED",