Merge branch 'main' into zomars/cal-2724-implement-csrf-protection-for-public-trpc-endpoints

packages/features/bookings/components/event-meta/AvailableEventLocations.tsx

@@ -22,7 +22,7 @@ function RenderIcon({
   return (
     <img
       src={eventLocationType.iconUrl}
-      className={classNames(invertLogoOnDark(eventLocationType?.iconUrl), "me-[10px] h-4 w-4")}
+      className={classNames(invertLogoOnDark(eventLocationType?.iconUrl, true), "me-[10px] h-4 w-4")}
       alt={`${eventLocationType.label} icon`}
     />
   );

packages/lib/invertLogoOnDark.ts

@@ -1,6 +1,15 @@
 // we want to invert all logos that contain -dark in their name
 // we don't want to invert logos that are not coming from the app-store
 
-export default function invertLogoOnDark(url?: string) {
-  return (url?.includes("-dark") || !url?.startsWith("/app-store")) && "dark:invert";
+export default function invertLogoOnDark(
+  url?: string,
+  // The background color of the logo's display location is opposite of the general theme of the application.
+  // Ex. General App theme is black but the logo's background color is white.
+  opposite?: boolean
+) {
+  return url?.includes("-dark") || !url?.startsWith("/app-store")
+    ? opposite
+      ? "invert dark:invert-0"
+      : "dark:invert"
+    : "";
 }

packages/prisma/migrations/20231117081852_idx_eventtype_scheduleid/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "EventType_scheduleId_idx" ON "EventType"("scheduleId");

packages/prisma/schema.prisma

@@ -123,6 +123,7 @@ model EventType {
   @@unique([userId, parentId])
   @@index([userId])
   @@index([teamId])
+  @@index([scheduleId])
 }
 
 model Credential {