From 96d4a9bd6d78e1367c81cb324aa2120904f54a61 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Thu, 10 Jun 2021 18:04:07 +0000 Subject: [PATCH 1/2] Set Reply-To header to allow replying to bookings --- lib/emails/confirm-booked.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/emails/confirm-booked.ts b/lib/emails/confirm-booked.ts index 22aa7b12..4641efbe 100644 --- a/lib/emails/confirm-booked.ts +++ b/lib/emails/confirm-booked.ts @@ -32,6 +32,7 @@ const sendEmail = (calEvent: CalendarEvent, uid: String, { { to: `${calEvent.attendees[0].name} <${calEvent.attendees[0].email}>`, from: `${calEvent.organizer.name} <${from}>`, + replyTo: calEvent.organizer.email, subject: `Confirmed: ${calEvent.type} with ${calEvent.organizer.name} on ${inviteeStart.format('dddd, LL')}`, html: html(calEvent, uid), text: text(calEvent, uid), From 16b090efd4d5b6a4889cb0587496131efb8c46ce Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Thu, 10 Jun 2021 18:49:11 +0000 Subject: [PATCH 2/2] Codestyle adjusted & fixed the column behaviour on mobile --- pages/availability/event/[type].tsx | 357 ++++++++++++++-------------- 1 file changed, 181 insertions(+), 176 deletions(-) diff --git a/pages/availability/event/[type].tsx b/pages/availability/event/[type].tsx index bb081328..ed575f25 100644 --- a/pages/availability/event/[type].tsx +++ b/pages/availability/event/[type].tsx @@ -7,7 +7,12 @@ import prisma from '../../../lib/prisma'; import { LocationType } from '../../../lib/location'; import Shell from '../../../components/Shell'; import { useSession, getSession } from 'next-auth/client'; -import { LocationMarkerIcon, PlusCircleIcon, XIcon, PhoneIcon } from '@heroicons/react/outline'; +import { + LocationMarkerIcon, + PlusCircleIcon, + XIcon, + PhoneIcon, +} from '@heroicons/react/outline'; export default function EventType(props) { const router = useRouter(); @@ -129,191 +134,191 @@ export default function EventType(props) { }; return ( -
- - {props.eventType.title} | Event Type | Calendso - - - -
-
-
-
-
-
- -
- -
-
-
- -
-
+
+ + {props.eventType.title} | Event Type | Calendso + + + +
+
+
+
+ +
+ +
+ +
+
+
+ +
+
{location.hostname}/{props.user.username}/ - -
-
-
-
- - {locations.length === 0 &&
-
- -
-
-
- -
- -
- minutes -
-
-
-
-
-
- -
-
- -

Hide the event type from your page, so it can only be booked through it's URL.

-
-
-
- - Cancel - -
+
+
-
-
-
-

- Delete this event type -

-
-

- Once you delete this event type, it will be permanently removed. -

-
-
- -
-
+
+ + {locations.length === 0 &&
+
+ +
+
+
+ +
+ +
+ minutes +
+
+
+
+
+
+ +
+
+ +

Hide the event type from your page, so it can only be booked through it's URL.

+
+
+
+ + Cancel +
- {showLocationModal && -
-
- +
+
+
+
+
+

+ Delete this event type +

+
+

+ Once you delete this event type, it will be permanently removed. +

+
+
+ +
+
+
+
+
+ {showLocationModal && +
+
+ - + -
-
-
- -
-
- -
-
-
- + +
+ + +
+ +
+
+
+ } + +
); }