) {
+ return async (p: P extends "P" ? PageProps : LayoutProps) => {
+ const h = headers();
+ const nonce = h.get("x-nonce") ?? undefined;
+ const props = getData ? await getData(buildLegacyCtx(h, cookies(), p.params)) : ({} as T);
+
+ const children = "children" in p ? p.children : null;
+
+ return (
+
+ {Page ?
+ );
+ };
+}
diff --git a/apps/web/components/PageWrapperAppDir.tsx b/apps/web/components/PageWrapperAppDir.tsx
index 414e4009bc..ae36417c97 100644
--- a/apps/web/components/PageWrapperAppDir.tsx
+++ b/apps/web/components/PageWrapperAppDir.tsx
@@ -2,8 +2,6 @@
import { type DehydratedState } from "@tanstack/react-query";
import type { SSRConfig } from "next-i18next";
-import { Inter } from "next/font/google";
-import localFont from "next/font/local";
// import I18nLanguageHandler from "@components/I18nLanguageHandler";
import { usePathname } from "next/navigation";
import Script from "next/script";
@@ -20,17 +18,9 @@ export interface CalPageWrapper {
PageWrapper?: AppProps["Component"]["PageWrapper"];
}
-const interFont = Inter({ subsets: ["latin"], variable: "--font-inter", preload: true, display: "swap" });
-const calFont = localFont({
- src: "../fonts/CalSans-SemiBold.woff2",
- variable: "--font-cal",
- preload: true,
- display: "swap",
-});
-
export type PageWrapperProps = Readonly<{
getLayout: ((page: React.ReactElement) => ReactNode) | null;
- children: React.ReactElement;
+ children: React.ReactNode;
requiresLicense: boolean;
nonce: string | undefined;
themeBasis: string | null;
@@ -71,15 +61,8 @@ function PageWrapper(props: PageWrapperProps) {
id="page-status"
dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }}
/>
-
-
{getLayout(
- props.requiresLicense ? {props.children} : props.children
+ props.requiresLicense ? {props.children} : <>{props.children}
)}
diff --git a/apps/web/components/auth/layouts/AdminLayout.tsx b/apps/web/components/auth/layouts/AdminLayout.tsx
index 7289c08f0c..5c51ef47ce 100644
--- a/apps/web/components/auth/layouts/AdminLayout.tsx
+++ b/apps/web/components/auth/layouts/AdminLayout.tsx
@@ -26,7 +26,7 @@ export default function AdminLayout({
const isAppsPage = pathname?.startsWith("/settings/admin/apps");
return (
-
+
*]:flex-1"}>
{children}
diff --git a/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx b/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx
new file mode 100644
index 0000000000..b3d76190c4
--- /dev/null
+++ b/apps/web/components/auth/layouts/AdminLayoutAppDir.tsx
@@ -0,0 +1,40 @@
+"use client";
+
+import { useSession } from "next-auth/react";
+import { usePathname, useRouter } from "next/navigation";
+import type { ComponentProps } from "react";
+import React, { useEffect } from "react";
+
+import SettingsLayout from "@calcom/features/settings/layouts/SettingsLayout";
+import type Shell from "@calcom/features/shell/Shell";
+import { UserPermissionRole } from "@calcom/prisma/enums";
+import { ErrorBoundary } from "@calcom/ui";
+
+export default function AdminLayout({
+ children,
+ ...rest
+}: { children: React.ReactNode } & ComponentProps
) {
+ const pathname = usePathname();
+ const session = useSession();
+ const router = useRouter();
+
+ // Force redirect on component level
+ useEffect(() => {
+ if (session.data && session.data.user.role !== UserPermissionRole.ADMIN) {
+ router.replace("/settings/my-account/profile");
+ }
+ }, [session, router]);
+
+ const isAppsPage = pathname?.startsWith("/settings/admin/apps");
+ return (
+
+
+
*]:flex-1"}>
+ {children}
+
+
+ );
+}
+
+export const getLayout = (page: React.ReactElement) => {page} ;
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index f2281abd8a..5abfb821cc 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -1,8 +1,12 @@
import Link from "next/link";
import { useState } from "react";
-import type { EventLocationType } from "@calcom/app-store/locations";
-import { getEventLocationType } from "@calcom/app-store/locations";
+import type { EventLocationType, getEventLocationValue } from "@calcom/app-store/locations";
+import {
+ getEventLocationType,
+ getSuccessPageLocationMessage,
+ guessEventLocationType,
+} from "@calcom/app-store/locations";
import dayjs from "@calcom/dayjs";
// TODO: Use browser locale, implement Intl in Dayjs maybe?
import "@calcom/dayjs/locales";
@@ -14,6 +18,7 @@ import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
import { BookingStatus } from "@calcom/prisma/enums";
+import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterInputs, RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { ActionType } from "@calcom/ui";
@@ -93,6 +98,16 @@ function BookingListItem(booking: BookingItemProps) {
const paymentAppData = getPaymentAppData(booking.eventType);
+ const location = booking.location as ReturnType;
+ const locationVideoCallUrl = bookingMetadataSchema.parse(booking?.metadata || {})?.videoCallUrl;
+
+ const locationToDisplay = getSuccessPageLocationMessage(
+ locationVideoCallUrl ? locationVideoCallUrl : location,
+ t,
+ booking.status
+ );
+ const provider = guessEventLocationType(location);
+
const bookingConfirm = async (confirm: boolean) => {
let body = {
bookingId: booking.id,
@@ -359,6 +374,33 @@ function BookingListItem(booking: BookingItemProps) {
attendees={booking.attendees}
/>
+ {!isPending && (
+
+ )}
{isPending && (
{t("unconfirmed")}
@@ -525,8 +567,8 @@ const RecurringBookingsTooltip = ({
return (
recurringDate >= now &&
!booking.recurringInfo?.bookings[BookingStatus.CANCELLED]
- .map((date) => date.toDateString())
- .includes(recurringDate.toDateString())
+ .map((date) => date.toString())
+ .includes(recurringDate.toString())
);
}).length;
@@ -543,8 +585,8 @@ const RecurringBookingsTooltip = ({
const pastOrCancelled =
aDate < now ||
booking.recurringInfo?.bookings[BookingStatus.CANCELLED]
- .map((date) => date.toDateString())
- .includes(aDate.toDateString());
+ .map((date) => date.toString())
+ .includes(aDate.toString());
return (
{formatTime(aDate, userTimeFormat, userTimeZone)}
diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
index 252d5fcf92..4aee471929 100644
--- a/apps/web/components/dialog/EditLocationDialog.tsx
+++ b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -382,7 +382,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
}}
/>
{selectedLocation && LocationOptions}
-
+
{
setShowLocationModal(false);
diff --git a/apps/web/components/eventtype/EventAppsTab.tsx b/apps/web/components/eventtype/EventAppsTab.tsx
index 6c96d701cd..6fa09878af 100644
--- a/apps/web/components/eventtype/EventAppsTab.tsx
+++ b/apps/web/components/eventtype/EventAppsTab.tsx
@@ -47,10 +47,17 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
};
};
- const getAppDataSetter = (appId: EventTypeAppsList, credentialId?: number): SetAppData => {
+ const eventTypeFormMetadata = methods.getValues("metadata");
+
+ const getAppDataSetter = (
+ appId: EventTypeAppsList,
+ appCategories: string[],
+ credentialId?: number
+ ): SetAppData => {
return function (key, value) {
// Always get latest data available in Form because consequent calls to setData would update the Form but not allAppsData(it would update during next render)
const allAppsDataFromForm = methods.getValues("metadata")?.apps || {};
+
const appData = allAppsDataFromForm[appId];
setAllAppsData({
...allAppsDataFromForm,
@@ -58,6 +65,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
...appData,
[key]: value,
credentialId,
+ appCategories,
},
});
};
@@ -77,10 +85,15 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
appCards.push(
{
},
}}
eventType={eventType}
+ eventTypeFormMetadata={eventTypeFormMetadata}
{...shouldLockDisableProps("apps")}
/>
);
@@ -148,10 +162,15 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
return (
& { isTeamEvent: boolean }) => {
+ const paymentAppData = getPaymentAppData(eventType);
+
+ const requirePayment = paymentAppData.price > 0;
+
+ return (
+ {
+ const isChecked = value;
+ return (
+ {
+ formMethods.setValue("onlyShowFirstAvailableSlot", active ?? false);
+ }}
+ switchContainerClassName={classNames(
+ "border-subtle mt-6 rounded-lg border py-6 px-4 sm:px-6",
+ isChecked && "rounded-b-none"
+ )}
+ />
+ );
+ }}
+ />
(eventType?.isInstantEvent ?? false);
+ const formMethods = useFormContext();
+
+ const { shouldLockDisableProps } = useLockedFieldsManager(
+ eventType,
+ t("locked_fields_admin_description"),
+ t("locked_fields_member_description")
+ );
+
+ const instantLocked = shouldLockDisableProps("isInstantEvent");
+
+ const isOrg = !!session.data?.user?.org?.id;
+
+ if (session.status === "loading") return <>;
+
+ return (
+
+
+ {!isOrg || !isTeamEvent ? (
+
{t("upgrade")}}
+ />
+ ) : (
+
+ {paymentEnabled ? (
+
+ ) : (
+ <>
+
+
{
+ if (!e) {
+ formMethods.setValue("isInstantEvent", false);
+ setInstantEventState(false);
+ } else {
+ formMethods.setValue("isInstantEvent", true);
+ setInstantEventState(true);
+ }
+ }}>
+
+ {instantEventState && (
+
+
{t("warning_payment_instant_meeting_event")}
+
+ )}
+
+
+ )}
+
+ );
+}
diff --git a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
index 6c606178b5..abcf37ef6e 100644
--- a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
+++ b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
@@ -82,7 +82,7 @@ const ConnectedCalendars = (props: IConnectCalendarsProps) => {
type="button"
data-testid="save-calendar-button"
className={classNames(
- "text-inverted mt-8 flex w-full flex-row justify-center rounded-md border border-black bg-black p-2 text-center text-sm",
+ "text-inverted bg-inverted border-inverted mt-8 flex w-full flex-row justify-center rounded-md border p-2 text-center text-sm",
disabledNextButton ? "cursor-not-allowed opacity-20" : ""
)}
onClick={() => nextStep()}
diff --git a/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx b/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
index 1179460825..ad5072dcb4 100644
--- a/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
+++ b/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
@@ -53,7 +53,7 @@ const ConnectedVideoStep = (props: ConnectedAppStepProps) => {
type="button"
data-testid="save-video-button"
className={classNames(
- "text-inverted mt-8 flex w-full flex-row justify-center rounded-md border border-black bg-black p-2 text-center text-sm",
+ "text-inverted border-inverted bg-inverted mt-8 flex w-full flex-row justify-center rounded-md border p-2 text-center text-sm",
!hasAnyInstalledVideoApps ? "cursor-not-allowed opacity-20" : ""
)}
disabled={!hasAnyInstalledVideoApps}
diff --git a/apps/web/components/getting-started/steps-views/UserProfile.tsx b/apps/web/components/getting-started/steps-views/UserProfile.tsx
index 79f4fd9076..54ff76fc1f 100644
--- a/apps/web/components/getting-started/steps-views/UserProfile.tsx
+++ b/apps/web/components/getting-started/steps-views/UserProfile.tsx
@@ -3,7 +3,6 @@ import type { FormEvent } from "react";
import { useRef, useState } from "react";
import { useForm } from "react-hook-form";
-import OrganizationMemberAvatar from "@calcom/features/ee/organizations/components/OrganizationMemberAvatar";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { md } from "@calcom/lib/markdownIt";
import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
@@ -11,6 +10,7 @@ import turndown from "@calcom/lib/turndownService";
import { trpc } from "@calcom/trpc/react";
import type { Ensure } from "@calcom/types/utils";
import { Button, Editor, ImageUploader, Label, showToast } from "@calcom/ui";
+import { UserAvatar } from "@calcom/ui";
import { ArrowRight } from "@calcom/ui/components/icon";
type FormData = {
@@ -108,9 +108,7 @@ const UserProfile = () => {
return (