diff --git a/apps/admin b/apps/admin new file mode 160000 index 0000000000..8474e2baa2 --- /dev/null +++ b/apps/admin @@ -0,0 +1 @@ +Subproject commit 8474e2baa27ef665b69491fa000ccb5d94257363 diff --git a/apps/api b/apps/api index 44f0830b16..be2d4338ee 160000 --- a/apps/api +++ b/apps/api @@ -1 +1 @@ -Subproject commit 44f0830b16d42c555ea8631d3e795abab5097b0f +Subproject commit be2d4338ee1023a2d2862978ccf91554d47ff51f diff --git a/apps/web/pages/event-types/[type].tsx b/apps/web/pages/event-types/[type].tsx index b9baf5bb0f..9ddd425979 100644 --- a/apps/web/pages/event-types/[type].tsx +++ b/apps/web/pages/event-types/[type].tsx @@ -173,7 +173,7 @@ const SuccessRedirectEdit = >({ }} readOnly={proUpgradeRequired} type="url" - className=" block w-full rounded-sm border-gray-300 shadow-sm sm:text-sm" + className=" block w-full rounded-sm border-gray-300 sm:text-sm" placeholder={t("external_redirect_url")} defaultValue={eventType.successRedirectUrl || ""} {...formMethods.register("successRedirectUrl")} @@ -435,7 +435,7 @@ const EventTypePage = (props: inferSSRProps) => { {...locationFormMethods.register("locationAddress")} id="address" required - className=" block w-full rounded-sm border-gray-300 text-sm shadow-sm" + className=" block w-full rounded-sm border-gray-300 text-sm" defaultValue={ formMethods .getValues("locations") @@ -457,7 +457,7 @@ const EventTypePage = (props: inferSSRProps) => { {...locationFormMethods.register("locationLink")} id="address" required - className=" block w-full rounded-sm border-gray-300 shadow-sm sm:text-sm" + className=" block w-full rounded-sm border-gray-300 sm:text-sm" defaultValue={ formMethods.getValues("locations").find((location) => location.type === LocationType.Link) ?.link @@ -630,9 +630,7 @@ const EventTypePage = (props: inferSSRProps) => { {formMethods.getValues("locations").length > 0 && (
    {formMethods.getValues("locations").map((location) => ( -
  • +
  • {location.type === LocationType.InPerson && (
    @@ -1048,7 +1046,7 @@ const EventTypePage = (props: inferSSRProps) => {
    -
    +
    {process.env.NEXT_PUBLIC_WEBSITE_URL?.replace(/^(https?:|)\/\//, "")}/ {team ? "team/" + team.slug : eventType.users[0].username}/ @@ -1124,7 +1122,7 @@ const EventTypePage = (props: inferSSRProps) => {
    @@ -1254,7 +1252,7 @@ const EventTypePage = (props: inferSSRProps) => {
    -
    +
    ) => {
    -
    +
    ) => {
    -
    +
    { ) => {
    ) => { ) => { { value: 5, label: "5" }, { value: -1, - isDisabled: !eventType.users.some((user) => user.plan === "PRO"), + isDisabled: !eventType.users.some( + (user) => user.plan === ("PRO" || "TRIAL") + ), label: (
    - 6 + + 6+ PRO
    ) as unknown as string, @@ -1815,54 +1816,65 @@ const EventTypePage = (props: inferSSRProps) => { <>
    - - +
    + ) : ( + <> + + -
    - )}
    ); @@ -1873,7 +1885,6 @@ const EventTypePage = (props: inferSSRProps) => {
    )}
    -
    @@ -1936,7 +1947,7 @@ const EventTypePage = (props: inferSSRProps) => {
    -
    +