This repository has been archived by the owner on Jan 23, 2024. It is now read-only.
forked from calcom/cal.com
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: type error in
settings/admin
in app router (calcom#12638)
- Loading branch information
Showing
12 changed files
with
19 additions
and
28 deletions.
There are no files selected for viewing
8 changes: 3 additions & 5 deletions
8
.../app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,11 @@ | ||
import Page from "@pages/settings/admin/organizations/index"; | ||
import { _generateMetadata } from "app/_utils"; | ||
|
||
import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage"; | ||
|
||
export const generateMetadata = async () => | ||
await _generateMetadata( | ||
(t) => t("organizations"), | ||
(t) => t("orgs_page_description") | ||
); | ||
|
||
export default function AppPage() { | ||
// @ts-expect-error FIXME Property 'Component' is incompatible with index signature | ||
return <Page />; | ||
} | ||
export default Page; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 3 additions & 5 deletions
8
.../web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,11 @@ | ||
import Page from "@pages/settings/admin/users/add"; | ||
import { _generateMetadata } from "app/_utils"; | ||
|
||
import Page from "@calcom/features/ee/users/pages/users-add-view"; | ||
|
||
export const generateMetadata = async () => | ||
await _generateMetadata( | ||
() => "Add new user", | ||
() => "Here you can add a new user." | ||
); | ||
|
||
export default function AppPage() { | ||
// @ts-expect-error FIXME AppProps | undefined' does not satisfy the constraint 'PageProps' | ||
return <Page />; | ||
} | ||
export default Page; |
8 changes: 3 additions & 5 deletions
8
apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,11 @@ | ||
import Page from "@pages/settings/admin/users/index"; | ||
import { _generateMetadata } from "app/_utils"; | ||
|
||
import Page from "@calcom/features/ee/users/pages/users-listing-view"; | ||
|
||
export const generateMetadata = async () => | ||
await _generateMetadata( | ||
() => "Users", | ||
() => "A list of all the users in your account including their name, title, email and role." | ||
); | ||
|
||
export default function AppPage() { | ||
// @ts-expect-error FIXME Property 'Component' is incompatible with index signature | ||
return <Page />; | ||
} | ||
export default Page; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
"use client"; | ||
|
||
import { usePathname, useRouter } from "next/navigation"; | ||
import { z } from "zod"; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
"use client"; | ||
|
||
import NoSSR from "@calcom/core/components/NoSSR"; | ||
import { Button, Meta } from "@calcom/ui"; | ||
|
||
|