Merge branch 'main' into bugfix/unify-email-sending

README.md

@@ -236,12 +236,9 @@ Contributions are what make the open source community such an amazing place to b
 9. Set the Redirect URL for OAuth `<CALENDSO URL>/api/integrations/zoomvideo/callback` replacing CALENDSO URL with the URI at which your application runs.
 10. Also add the redirect URL given above as a whitelist URL and enable "Subdomain check". Make sure, it says "saved" below the form.
 11. You don't need to provide basic information about your app. Instead click at "Scopes" and then at "+ Add Scopes". Search for and check the following scopes:
-    1. account:read:admin
-    2. account:write:admin
-    3. meeting:read:admin
-    4. meeting:write:admin
-    5. user:read:admin
-    6. user:write:admin
+    1. account:write:admin
+    2. meeting:write:admin
+    3. user:write:admin
 12. Click "Done".
 13. You're good to go. Now you can easily add your Zoom integration in the Calendso settings.
 

lib/slots.ts

@@ -121,17 +121,14 @@ const getSlots = ({
   // current date in invitee tz
   const currentDate = dayjs().utcOffset(inviteeDate.utcOffset());
   const startDate = currentDate.add(minimumBookingNotice, "minutes"); // + minimum notice period
-  // when the invitee date is not the same as the current date, reset the date to the start of day
-  if (inviteeDate.date() !== currentDate.date()) {
-    inviteeDate = inviteeDate.startOf("day");
-  }
 
   const startTime = startDate.isAfter(inviteeDate)
     ? // block out everything when inviteeDate is less than startDate
-      startDate.date() > inviteeDate.date()
+      startDate.diff(inviteeDate, "day") > 0
       ? 1440
       : startDate.hour() * 60 + startDate.minute()
     : 0;
+
   const inviteeBounds = inviteeBoundary(startTime, inviteeDate.utcOffset(), frequency);
 
   return getOverlaps(

pages/bookings/index.tsx

@@ -81,7 +81,7 @@ export default function Bookings({ bookings }) {
                           </td>
                           <td
                             className={
-                              "px-6 py-4 whitespace-nowrap" + (booking.rejected ? " line-through" : "")
+                              "px-6 py-4 max-w-20 w-full" + (booking.rejected ? " line-through" : "")
                             }>
                             <div className="text-sm text-gray-900">{booking.title}</div>
                             <div className="text-sm text-gray-500">{booking.description}</div>