From 21e728fd1aa32bce6b618dfe46cc0f65f4c16852 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Tue, 24 Sep 2024 13:53:13 -0400 Subject: [PATCH] remove pages router and use app router --- .../app/settings/(settings-layout)/layout.tsx | 5 +++ .../my-account/appearance/page.tsx | 0 .../my-account/calendars/page.tsx | 0 .../my-account/conferencing/page.tsx | 0 .../my-account/general/page.tsx | 0 .../my-account/out-of-office/page.tsx | 0 .../my-account/profile/page.tsx | 0 .../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 -------------- 13 files changed, 5 insertions(+), 171 deletions(-) create mode 100644 apps/web/app/settings/(settings-layout)/layout.tsx rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/appearance/page.tsx (100%) rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/calendars/page.tsx (100%) rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/conferencing/page.tsx (100%) rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/general/page.tsx (100%) rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/out-of-office/page.tsx (100%) rename apps/web/app/{future/settings/(settings) => settings/(settings-layout)}/my-account/profile/page.tsx (100%) delete mode 100644 apps/web/pages/settings/my-account/appearance.tsx delete mode 100644 apps/web/pages/settings/my-account/calendars.tsx delete mode 100644 apps/web/pages/settings/my-account/conferencing.tsx delete mode 100644 apps/web/pages/settings/my-account/general.tsx delete mode 100644 apps/web/pages/settings/my-account/out-of-office/index.tsx delete mode 100644 apps/web/pages/settings/my-account/profile.tsx diff --git a/apps/web/app/settings/(settings-layout)/layout.tsx b/apps/web/app/settings/(settings-layout)/layout.tsx new file mode 100644 index 00000000000000..1e4a657288800f --- /dev/null +++ b/apps/web/app/settings/(settings-layout)/layout.tsx @@ -0,0 +1,5 @@ +import { WithLayout } from "app/layoutHOC"; + +import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir"; + +export default WithLayout({ getServerLayout: getLayout })<"L">; diff --git a/apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/appearance/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/appearance/page.tsx diff --git a/apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/calendars/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/calendars/page.tsx diff --git a/apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/conferencing/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx diff --git a/apps/web/app/future/settings/(settings)/my-account/general/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/general/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/general/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/general/page.tsx diff --git a/apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/out-of-office/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/out-of-office/page.tsx diff --git a/apps/web/app/future/settings/(settings)/my-account/profile/page.tsx b/apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx similarity index 100% rename from apps/web/app/future/settings/(settings)/my-account/profile/page.tsx rename to apps/web/app/settings/(settings-layout)/my-account/profile/page.tsx diff --git a/apps/web/pages/settings/my-account/appearance.tsx b/apps/web/pages/settings/my-account/appearance.tsx deleted file mode 100644 index 9fbe4f4adffde1..00000000000000 --- a/apps/web/pages/settings/my-account/appearance.tsx +++ /dev/null @@ -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 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 deleted file mode 100644 index 2dfa7cb2959d39..00000000000000 --- a/apps/web/pages/settings/my-account/calendars.tsx +++ /dev/null @@ -1,31 +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 { 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 deleted file mode 100644 index d4f749cff66fd5..00000000000000 --- a/apps/web/pages/settings/my-account/conferencing.tsx +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 37eb99532c5e46..00000000000000 --- a/apps/web/pages/settings/my-account/general.tsx +++ /dev/null @@ -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 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 deleted file mode 100644 index 89dbb3fdb69c1c..00000000000000 --- a/apps/web/pages/settings/my-account/out-of-office/index.tsx +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 9539cec4b4b72e..00000000000000 --- a/apps/web/pages/settings/my-account/profile.tsx +++ /dev/null @@ -1,27 +0,0 @@ -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;