(null);
- const searchParams = useSearchParams();
-
- const username = searchParams?.get("username")?.toLowerCase();
-
- useEffect(() => {
- if (username) {
- const enteredUsername = username.toLowerCase();
- signIn("impersonation-auth", {
- username: enteredUsername,
- callbackUrl: `${WEBAPP_URL}/event-types`,
- });
- }
- }, [username]);
-
- return (
- <>
-
-
- >
- );
-}
-
-AdminView.getLayout = getLayout;
-AdminView.PageWrapper = PageWrapper;
-
-export default AdminView;
diff --git a/apps/web/pages/settings/admin/index.tsx b/apps/web/pages/settings/admin/index.tsx
deleted file mode 100644
index 2193253fda..0000000000
--- a/apps/web/pages/settings/admin/index.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-"use client";
-
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-function AdminAppsView() {
- return (
- <>
-
- Admin index
- >
- );
-}
-
-AdminAppsView.getLayout = getLayout;
-AdminAppsView.PageWrapper = PageWrapper;
-
-export default AdminAppsView;
diff --git a/apps/web/pages/settings/admin/lockedSMS/index.tsx b/apps/web/pages/settings/admin/lockedSMS/index.tsx
deleted file mode 100644
index d10422dc32..0000000000
--- a/apps/web/pages/settings/admin/lockedSMS/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-import LockedSMSView from "~/settings/admin/locked-sms-view";
-
-const LockedSMSPage = () => (
- <>
-
-
- >
-);
-
-LockedSMSPage.getLayout = getLayout;
-LockedSMSPage.PageWrapper = PageWrapper;
-
-export default LockedSMSPage;
diff --git a/apps/web/pages/settings/admin/oAuth/index.tsx b/apps/web/pages/settings/admin/oAuth/index.tsx
deleted file mode 100644
index 0307086f32..0000000000
--- a/apps/web/pages/settings/admin/oAuth/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-import OAuthView from "~/settings/admin/oauth-view";
-
-const OAuthPage = () => (
- <>
-
-
- >
-);
-
-OAuthPage.getLayout = getLayout;
-OAuthPage.PageWrapper = PageWrapper;
-
-export default OAuthPage;
diff --git a/apps/web/pages/settings/admin/organizations/[id]/edit.tsx b/apps/web/pages/settings/admin/organizations/[id]/edit.tsx
deleted file mode 100644
index cb60a65ecd..0000000000
--- a/apps/web/pages/settings/admin/organizations/[id]/edit.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { z } from "zod";
-
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import OrgForm from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
-import { trpc } from "@calcom/trpc/react";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const paramsSchema = z.object({ id: z.coerce.number() });
-
-const Page = () => {
- const params = useParamsWithFallback();
- const parsedParams = paramsSchema.safeParse(params);
-
- if (!parsedParams.success) return Invalid id
;
-
- const [org] = trpc.viewer.organizations.adminGet.useSuspenseQuery({ id: parsedParams.data.id });
-
- return (
-
-
-
-
-
-
-
-
- );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/pages/settings/admin/organizations/index.tsx b/apps/web/pages/settings/admin/organizations/index.tsx
deleted file mode 100644
index b5ff176b3e..0000000000
--- a/apps/web/pages/settings/admin/organizations/index.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import AdminOrgTable from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => {
- const { t } = useLocale();
- return (
-
- );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/pages/settings/admin/users/[id]/edit.tsx b/apps/web/pages/settings/admin/users/[id]/edit.tsx
deleted file mode 100644
index 9b99ded74f..0000000000
--- a/apps/web/pages/settings/admin/users/[id]/edit.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { z } from "zod";
-
-import NoSSR from "@calcom/core/components/NoSSR";
-import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
-import UsersEditView from "@calcom/features/ee/users/pages/users-edit-view";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
-import { trpc } from "@calcom/trpc/react";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const userIdSchema = z.object({ id: z.coerce.number() });
-
-const Page = () => {
- const params = useParamsWithFallback();
- const input = userIdSchema.safeParse(params);
-
- if (!input.success) return Invalid input
;
-
- const [data] = trpc.viewer.users.get.useSuspenseQuery({ userId: input.data.id });
- const { user } = data;
-
- return (
- <>
-
-
-
-
-
-
-
-
- >
- );
-};
-
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/pages/settings/admin/users/add.tsx b/apps/web/pages/settings/admin/users/add.tsx
deleted file mode 100644
index ce2911b232..0000000000
--- a/apps/web/pages/settings/admin/users/add.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import UsersAddView from "@calcom/features/ee/users/pages/users-add-view";
-import { Meta } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => (
- <>
-
-
- >
-);
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/pages/settings/admin/users/index.tsx b/apps/web/pages/settings/admin/users/index.tsx
deleted file mode 100644
index 8a74ba8a10..0000000000
--- a/apps/web/pages/settings/admin/users/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
-import { Meta, Button } from "@calcom/ui";
-
-import PageWrapper from "@components/PageWrapper";
-import { getLayout } from "@components/auth/layouts/AdminLayout";
-
-const Page = () => {
- return (
- <>
-
- {/* TODO: Add import users functionality */}
- {/* */}
-
-
- }
- />
-
- >
- );
-};
-Page.PageWrapper = PageWrapper;
-Page.getLayout = getLayout;
-
-export default Page;
diff --git a/apps/web/playwright/settings-admin.e2e.ts b/apps/web/playwright/settings-admin.e2e.ts
index c1567b4ce0..3df06eda63 100644
--- a/apps/web/playwright/settings-admin.e2e.ts
+++ b/apps/web/playwright/settings-admin.e2e.ts
@@ -1,11 +1,10 @@
import { expect } from "@playwright/test";
import { test } from "./lib/fixtures";
-import { testBothFutureAndLegacyRoutes } from "./lib/future-legacy-routes";
test.describe.configure({ mode: "parallel" });
-testBothFutureAndLegacyRoutes.describe("Settings/admin tests", () => {
+test.describe("Settings/admin tests", () => {
test("should render /settings/admin page", async ({ page, users, context }) => {
const user = await users.create({
role: "ADMIN",
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index c0a683edb8..8bf40d22c0 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -634,6 +634,8 @@
"role": "Role",
"edit_role": "Edit Role",
"edit_team": "Edit team",
+ "editing_user": "Editing user",
+ "editing_org": "Editing organization",
"reject": "Reject",
"reject_all": "Reject all",
"accept": "Accept",
@@ -992,6 +994,8 @@
"access_token": "Access token",
"visit_roadmap": "Roadmap",
"featured_categories": "Featured Categories",
+ "feature_flags": "Feature Flags",
+ "admin_flags_description": "Here you can toggle your Cal.com instance features.",
"popular_categories": "Popular Categories",
"number_apps_one": "{{count}} App",
"number_apps_other": "{{count}} Apps",
@@ -1761,6 +1765,12 @@
"disable_app_description": "Disabling this app could cause problems with how your users interact with Cal",
"edit_keys": "Edit Keys",
"admin_apps_description": "Enable apps for your instance of Cal",
+ "admin_users_description": "A list of all the users in your account including their name, title, email and role.",
+ "admin_users_add_description": "Here you can add a new user.",
+ "admin_users_edit_description": "Here you can edit a current user.",
+ "admin_orgs_edit_description": "Here you can edit an organization.",
+ "admin_oAuth_description": "Add new OAuth Clients",
+ "admin_lockedSMS_description": "Lock or unlock SMS sending for users",
"no_available_apps": "There are no available apps",
"no_available_apps_description": "Please ensure there are apps in your deployment under 'packages/app-store'",
"no_apps": "There are no apps enabled in this instance of Cal",
@@ -2320,6 +2330,7 @@
"add_client": "Add client",
"copy_client_secret_info": "After copying the secret you won't be able to view it anymore",
"add_new_client": "Add new Client",
+ "add_new_user": "Add new user",
"this_app_is_not_setup_already": "This app has not been setup yet",
"as_csv": "as CSV",
"overlay_my_calendar": "Overlay my calendar",
diff --git a/apps/web/scripts/vercel-app-router-deploy.sh b/apps/web/scripts/vercel-app-router-deploy.sh
index 05d39d1869..442d193082 100755
--- a/apps/web/scripts/vercel-app-router-deploy.sh
+++ b/apps/web/scripts/vercel-app-router-deploy.sh
@@ -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_ADMIN_ENABLED" app/future/settings/admin
checkRoute "$APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED" app/future/settings/my-account
checkRoute "$APP_ROUTER_SETTINGS_PLATFORM_ENABLED" app/future/settings/platform
checkRoute "$APP_ROUTER_SETTINGS_ORG_ENABLED" app/future/settings/organizations
diff --git a/turbo.json b/turbo.json
index f4f7b5120e..da1c670b34 100644
--- a/turbo.json
+++ b/turbo.json
@@ -238,7 +238,6 @@
"APP_ROUTER_EVENT_TYPES_ENABLED",
"APP_ROUTER_GETTING_STARTED_STEP_ENABLED",
"APP_ROUTER_SETTINGS_DEVELOPER_ENABLED",
- "APP_ROUTER_SETTINGS_ADMIN_ENABLED",
"APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED",
"APP_ROUTER_SETTINGS_PLATFORM_ENABLED",
"APP_ROUTER_SETTINGS_ORG_ENABLED",