From 43cc7417a9020d0c00f32773b975a1f8f7640c28 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Tue, 8 Oct 2024 13:30:33 -0400 Subject: [PATCH] Revert "remove pages router and use app router (#16793)" This reverts commit 664a92a1d078899e9f3c8896f150944e8b221919. --- .../my-account/appearance/page.tsx | 0 .../(settings)}/my-account/calendars/page.tsx | 0 .../my-account/conferencing/page.tsx | 0 .../(settings)}/my-account/general/page.tsx | 8 +---- .../my-account/out-of-office/page.tsx | 0 .../(settings)}/my-account/profile/page.tsx | 0 .../settings/my-account/general-view.tsx | 21 +++-------- apps/web/next.config.js | 1 - .../pages/settings/my-account/appearance.tsx | 23 ++++++++++++ .../pages/settings/my-account/calendars.tsx | 31 ++++++++++++++++ .../settings/my-account/conferencing.tsx | 36 +++++++++++++++++++ .../web/pages/settings/my-account/general.tsx | 23 ++++++++++++ .../my-account/out-of-office/index.tsx | 31 ++++++++++++++++ .../web/pages/settings/my-account/profile.tsx | 27 ++++++++++++++ 14 files changed, 176 insertions(+), 25 deletions(-) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/appearance/page.tsx (100%) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/calendars/page.tsx (100%) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/conferencing/page.tsx (100%) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/general/page.tsx (78%) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/out-of-office/page.tsx (100%) rename apps/web/app/{settings/(settings-layout) => future/settings/(settings)}/my-account/profile/page.tsx (100%) create mode 100644 apps/web/pages/settings/my-account/appearance.tsx create mode 100644 apps/web/pages/settings/my-account/calendars.tsx create mode 100644 apps/web/pages/settings/my-account/conferencing.tsx create mode 100644 apps/web/pages/settings/my-account/general.tsx create mode 100644 apps/web/pages/settings/my-account/out-of-office/index.tsx create mode 100644 apps/web/pages/settings/my-account/profile.tsx diff --git a/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx b/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx similarity index 100% rename from apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx diff --git a/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx b/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx similarity index 100% rename from apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx diff --git a/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx b/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx similarity index 100% rename from apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx diff --git a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx b/apps/web/app/future/settings/(settings)/my-account/general/page.tsx similarity index 78% rename from apps/web/app/settings/(settings-layout)/my-account/general/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/general/page.tsx index a53fd802ef1637..c6ef48a09bc118 100644 --- a/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx +++ b/apps/web/app/future/settings/(settings)/my-account/general/page.tsx @@ -1,6 +1,5 @@ import { _generateMetadata } from "app/_utils"; import { getFixedT } from "app/_utils"; -import { revalidatePath } from "next/cache"; import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -17,14 +16,9 @@ const Page = async () => { const session = await getServerSessionForAppDir(); const t = await getFixedT(session?.user.locale || "en"); - const revalidatePage = async () => { - "use server"; - revalidatePath("settings/my-account/general"); - }; - return ( - + ); }; diff --git a/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx b/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx similarity index 100% rename from apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx diff --git a/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx b/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx similarity index 100% rename from apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx rename to apps/web/app/future/settings/(settings)/my-account/profile/page.tsx diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsx index 2902ee8a5fcd94..da82bbecc858e3 100644 --- a/apps/web/modules/settings/my-account/general-view.tsx +++ b/apps/web/modules/settings/my-account/general-view.tsx @@ -68,14 +68,9 @@ interface GeneralViewProps { localeProp: string; user: RouterOutputs["viewer"]["me"]; travelSchedules: RouterOutputs["viewer"]["getTravelSchedules"]; - revalidatePage: GeneralQueryViewProps["revalidatePage"]; } -type GeneralQueryViewProps = { - revalidatePage: () => Promise; -}; - -const GeneralQueryView = ({ revalidatePage }: GeneralQueryViewProps) => { +const GeneralQueryView = () => { const { t } = useLocale(); const { data: user, isPending } = trpc.viewer.me.useQuery(); @@ -87,17 +82,10 @@ const GeneralQueryView = ({ revalidatePage }: GeneralQueryViewProps) => { if (!user) { throw new Error(t("something_went_wrong")); } - return ( - - ); + return ; }; -const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: GeneralViewProps) => { +const GeneralView = ({ localeProp, user, travelSchedules }: GeneralViewProps) => { const utils = trpc.useContext(); const { t, @@ -117,7 +105,6 @@ const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: Gene if (res.locale) { window.calNewLocale = res.locale; } - await revalidatePage(); }, onError: () => { showToast(t("error_updating_settings"), "error"); @@ -190,7 +177,7 @@ const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: Gene
{ + handleSubmit={(values) => { setIsUpdateBtnLoading(true); mutation.mutate({ ...values, diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 6ddbb5b32f0eff..30355a8d3b77b1 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -178,7 +178,6 @@ const nextConfig = { serverComponentsExternalPackages: ["next-i18next"], optimizePackageImports: ["@calcom/ui"], instrumentationHook: true, - serverActions: true, }, i18n: { ...i18n, diff --git a/apps/web/pages/settings/my-account/appearance.tsx b/apps/web/pages/settings/my-account/appearance.tsx new file mode 100644 index 00000000000000..9fbe4f4adffde1 --- /dev/null +++ b/apps/web/pages/settings/my-account/appearance.tsx @@ -0,0 +1,23 @@ +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 AppearancePage from "~/settings/my-account/appearance-view"; + +const Page = () => { + const { t } = useLocale(); + + return ( + <> + + + + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page; diff --git a/apps/web/pages/settings/my-account/calendars.tsx b/apps/web/pages/settings/my-account/calendars.tsx new file mode 100644 index 00000000000000..2dfa7cb2959d39 --- /dev/null +++ b/apps/web/pages/settings/my-account/calendars.tsx @@ -0,0 +1,31 @@ +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 { CalendarListContainer } from "@components/apps/CalendarListContainer"; + +import AddCalendarButton from "~/settings/my-account/components/AddCalendarButton"; + +const Page = () => { + const { t } = useLocale(); + + return ( + <> + } + borderInShellHeader={false} + /> +
+ +
+ + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page; diff --git a/apps/web/pages/settings/my-account/conferencing.tsx b/apps/web/pages/settings/my-account/conferencing.tsx new file mode 100644 index 00000000000000..d4f749cff66fd5 --- /dev/null +++ b/apps/web/pages/settings/my-account/conferencing.tsx @@ -0,0 +1,36 @@ +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { Button, Meta } from "@calcom/ui"; + +import PageWrapper from "@components/PageWrapper"; + +import ConferencingView from "~/settings/my-account/conferencing-view"; + +const Page = () => { + const { t } = useLocale(); + + const AddConferencingButton = () => { + return ( + + ); + }; + + return ( + <> + } + borderInShellHeader={true} + /> + + + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page; diff --git a/apps/web/pages/settings/my-account/general.tsx b/apps/web/pages/settings/my-account/general.tsx new file mode 100644 index 00000000000000..37eb99532c5e46 --- /dev/null +++ b/apps/web/pages/settings/my-account/general.tsx @@ -0,0 +1,23 @@ +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 GeneralQueryView from "~/settings/my-account/general-view"; + +const Page = () => { + const { t } = useLocale(); + + return ( + <> + + + + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page; diff --git a/apps/web/pages/settings/my-account/out-of-office/index.tsx b/apps/web/pages/settings/my-account/out-of-office/index.tsx new file mode 100644 index 00000000000000..89dbb3fdb69c1c --- /dev/null +++ b/apps/web/pages/settings/my-account/out-of-office/index.tsx @@ -0,0 +1,31 @@ +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; +import CreateNewOutOfOfficeEntryButton from "@calcom/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton"; +import { OutOfOfficeEntriesList } from "@calcom/features/settings/outOfOffice/OutOfOfficeEntriesList"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { trpc } from "@calcom/trpc/react"; +import { Meta, SkeletonText } from "@calcom/ui"; + +import PageWrapper from "@components/PageWrapper"; + +const Page = () => { + const { t } = useLocale(); + + const { isPending } = trpc.viewer.outOfOfficeReasonList.useQuery(); + + return ( + <> + : } + /> + + + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page; diff --git a/apps/web/pages/settings/my-account/profile.tsx b/apps/web/pages/settings/my-account/profile.tsx new file mode 100644 index 00000000000000..9539cec4b4b72e --- /dev/null +++ b/apps/web/pages/settings/my-account/profile.tsx @@ -0,0 +1,27 @@ +import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout"; +import { APP_NAME } from "@calcom/lib/constants"; +import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { Meta } from "@calcom/ui"; + +import PageWrapper from "@components/PageWrapper"; + +import ProfileView from "~/settings/my-account/profile-view"; + +const Page = () => { + const { t } = useLocale(); + return ( + <> + + + + ); +}; + +Page.getLayout = getLayout; +Page.PageWrapper = PageWrapper; + +export default Page;