Merge pull request #272 from Malte-D/feature/customise-event-names

Feature/customise event names

lib/event.ts

@@ -0,0 +1,5 @@
+export function getEventName(name: string, eventTitle: string, eventNameTemplate?: string) {
+    return eventNameTemplate
+      ? eventNameTemplate.replace("{USER}", name)
+      : eventTitle + ' with ' + name
+}

pages/[user]/book.tsx

@@ -56,7 +56,7 @@ export default function Book(props) {
             email: event.target.email.value,
             notes: event.target.notes.value,
             timeZone: preferredTimeZone,
-            eventName: props.eventType.title,
+            eventTypeId: props.eventType.id,
             rescheduleUid: rescheduleUid
         };
 
@@ -76,7 +76,7 @@ export default function Book(props) {
             }
         );
 
-        let successUrl = `/success?date=${date}&type=${props.eventType.id}&user=${props.user.username}&reschedule=1`;
+        let successUrl = `/success?date=${date}&type=${props.eventType.id}&user=${props.user.username}&reschedule=1&name=${payload.name}`;
         if (payload['location']) {
             successUrl += "&location=" + encodeURIComponent(payload['location']);
         }

pages/api/availability/eventtype.ts

@@ -18,6 +18,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             length: parseInt(req.body.length),
             hidden: req.body.hidden,
             locations: req.body.locations,
+            eventName: req.body.eventName
         };
 
         if (req.method == "POST") {

pages/api/book/[user].ts

@@ -5,6 +5,7 @@ import createConfirmBookedEmail from "../../../lib/emails/confirm-booked";
 import async from 'async';
 import {v5 as uuidv5} from 'uuid';
 import short from 'short-uuid';
+import {getEventName} from "../../../lib/event";
 
 const translator = short();
 
@@ -26,9 +27,20 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
   const rescheduleUid = req.body.rescheduleUid;
 
+  const selectedEventType = await prisma.eventType.findFirst({
+    where: {
+      userId: currentUser.id,
+      id: req.body.eventTypeId
+    },
+    select: {
+      eventName: true,
+      title: true
+    }
+  });
+
   const evt: CalendarEvent = {
-    type: req.body.eventName,
+    type: selectedEventType.title,
-    title: req.body.eventName + ' with ' + req.body.name,
+    title: getEventName(req.body.name, selectedEventType.title, selectedEventType.eventName),
     description: req.body.notes,
     startTime: req.body.start,
     endTime: req.body.end,

pages/availability/event/[type].tsx

@@ -27,6 +27,7 @@ export default function EventType(props) {
     const descriptionRef = useRef<HTMLTextAreaElement>();
     const lengthRef = useRef<HTMLInputElement>();
     const isHiddenRef = useRef<HTMLInputElement>();
+    const eventNameRef = useRef<HTMLInputElement>();
 
     if (loading) {
         return <p className="text-gray-400">Loading...</p>;
@@ -40,11 +41,12 @@ export default function EventType(props) {
         const enteredDescription = descriptionRef.current.value;
         const enteredLength = lengthRef.current.value;
         const enteredIsHidden = isHiddenRef.current.checked;
+        const enteredEventName = eventNameRef.current.value;
         // TODO: Add validation
 
         const response = await fetch('/api/availability/eventtype', {
             method: 'PATCH',
-            body: JSON.stringify({id: props.eventType.id, title: enteredTitle, slug: enteredSlug, description: enteredDescription, length: enteredLength, hidden: enteredIsHidden, locations }),
+            body: JSON.stringify({id: props.eventType.id, title: enteredTitle, slug: enteredSlug, description: enteredDescription, length: enteredLength, hidden: enteredIsHidden, locations, eventName: enteredEventName }),
             headers: {
                 'Content-Type': 'application/json'
             }
@@ -232,6 +234,12 @@ export default function EventType(props) {
                         </div>
                       </div>
                     </div>
+                    <div className="mb-4">
+                      <label htmlFor="eventName" className="block text-sm font-medium text-gray-700">Calendar entry name</label>
+                      <div className="mt-1 relative rounded-md shadow-sm">
+                        <input ref={eventNameRef} type="text" name="title" id="title" className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md" placeholder="Meeting with {USER}" defaultValue={props.eventType.eventName} />
+                      </div>
+                    </div>
                     <div className="my-8">
                       <div className="relative flex items-start">
                         <div className="flex items-center h-5">
@@ -348,6 +356,7 @@ export async function getServerSideProps(context) {
             length: true,
             hidden: true,
             locations: true,
+            eventName: true,
         }
     });
 

pages/success.tsx

@@ -10,6 +10,7 @@ import utc from 'dayjs/plugin/utc';
 import toArray from 'dayjs/plugin/toArray';
 import timezone from 'dayjs/plugin/timezone';
 import { createEvent } from 'ics';
+import {getEventName} from "../lib/event";
 
 dayjs.extend(utc);
 dayjs.extend(toArray);
@@ -17,7 +18,7 @@ dayjs.extend(timezone);
 
 export default function Success(props) {
     const router = useRouter();
-    const { location } = router.query;
+    const {location, name} = router.query;
 
     const [ is24h, setIs24h ] = useState(false);
     const [ date, setDate ] = useState(dayjs.utc(router.query.date));
@@ -27,6 +28,8 @@ export default function Success(props) {
         setIs24h(!!localStorage.getItem('timeOption.is24hClock'));
     }, []);
 
+    const eventName = getEventName(name, props.eventType.title, props.eventType.eventName);
+
     function eventLink(): string {
 
         let optional = {};
@@ -37,7 +40,7 @@ export default function Success(props) {
         const event = createEvent({
            start: date.utc().toArray().slice(0, 6),
            startInputType: 'utc',
-           title: props.eventType.title + ' with ' + props.user.name,
+           title: eventName,
            description: props.eventType.description,
            duration: { minutes: props.eventType.length },
            ...optional
@@ -53,7 +56,7 @@ export default function Success(props) {
     return(
         <div>
             <Head>
-                <title>Booking Confirmed | {props.eventType.title} with {props.user.name || props.user.username} | Calendso</title>
+                <title>Booking Confirmed | {eventName} | Calendso</title>
                 <link rel="icon" href="/favicon.ico" />
             </Head>
             <main className="max-w-3xl mx-auto my-24">
@@ -76,7 +79,7 @@ export default function Success(props) {
                                         </p>
                                     </div>
                                     <div className="mt-4 border-t border-b py-4">
-                                        <h2 className="text-lg font-medium text-gray-600 mb-2">{props.eventType.title} with {props.user.name}</h2>
+                                        <h2 className="text-lg font-medium text-gray-600 mb-2">{eventName}</h2>
                                         <p className="text-gray-500 mb-1">
                                             <ClockIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
                                             {props.eventType.length} minutes
@@ -95,17 +98,17 @@ export default function Success(props) {
                             <div className="mt-5 sm:mt-6 text-center">
                                 <span className="font-medium text-gray-500">Add to your calendar</span>
                                 <div className="flex mt-2">
-                                    <Link href={`https://calendar.google.com/calendar/r/eventedit?dates=${date.utc().format('YYYYMMDDTHHmmss[Z]')}/${date.add(props.eventType.length, 'minute').utc().format('YYYYMMDDTHHmmss[Z]')}&text=${props.eventType.title} with ${props.user.name}&details=${props.eventType.description}` + ( location ? "&location=" + encodeURIComponent(location) : '')}>
+                                    <Link href={`https://calendar.google.com/calendar/r/eventedit?dates=${date.utc().format('YYYYMMDDTHHmmss[Z]')}/${date.add(props.eventType.length, 'minute').utc().format('YYYYMMDDTHHmmss[Z]')}&text=${eventName}&details=${props.eventType.description}` + ( location ? "&location=" + encodeURIComponent(location) : '')}>
                                         <a className="mx-2 btn-wide btn-white">
                                             <svg className="inline-block w-4 h-4 mr-1 -mt-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>Google</title><path d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"/></svg>
                                         </a>
                                     </Link>
-                                    <Link href={encodeURI("https://outlook.live.com/calendar/0/deeplink/compose?body=" + props.eventType.description + "&enddt=" + date.add(props.eventType.length, 'minute').format() + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + date.format() + "&subject=" + props.eventType.title + " with " + props.user.name) + (location ? "&location=" + location : '')}>
+                                    <Link href={encodeURI("https://outlook.live.com/calendar/0/deeplink/compose?body=" + props.eventType.description + "&enddt=" + date.add(props.eventType.length, 'minute').format() + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + date.format() + "&subject=" + eventName) + (location ? "&location=" + location : '')}>
                                         <a className="mx-2 btn-wide btn-white">
                                             <svg className="inline-block w-4 h-4 mr-1 -mt-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>Microsoft Outlook</title><path d="M7.88 12.04q0 .45-.11.87-.1.41-.33.74-.22.33-.58.52-.37.2-.87.2t-.85-.2q-.35-.21-.57-.55-.22-.33-.33-.75-.1-.42-.1-.86t.1-.87q.1-.43.34-.76.22-.34.59-.54.36-.2.87-.2t.86.2q.35.21.57.55.22.34.31.77.1.43.1.88zM24 12v9.38q0 .46-.33.8-.33.32-.8.32H7.13q-.46 0-.8-.33-.32-.33-.32-.8V18H1q-.41 0-.7-.3-.3-.29-.3-.7V7q0-.41.3-.7Q.58 6 1 6h6.5V2.55q0-.44.3-.75.3-.3.75-.3h12.9q.44 0 .75.3.3.3.3.75V10.85l1.24.72h.01q.1.07.18.18.07.12.07.25zm-6-8.25v3h3v-3zm0 4.5v3h3v-3zm0 4.5v1.83l3.05-1.83zm-5.25-9v3h3.75v-3zm0 4.5v3h3.75v-3zm0 4.5v2.03l2.41 1.5 1.34-.8v-2.73zM9 3.75V6h2l.13.01.12.04v-2.3zM5.98 15.98q.9 0 1.6-.3.7-.32 1.19-.86.48-.55.73-1.28.25-.74.25-1.61 0-.83-.25-1.55-.24-.71-.71-1.24t-1.15-.83q-.68-.3-1.55-.3-.92 0-1.64.3-.71.3-1.2.85-.5.54-.75 1.3-.25.74-.25 1.63 0 .85.26 1.56.26.72.74 1.23.48.52 1.17.81.69.3 1.56.3zM7.5 21h12.39L12 16.08V17q0 .41-.3.7-.29.3-.7.3H7.5zm15-.13v-7.24l-5.9 3.54Z"/></svg>
                                         </a>
                                     </Link>
-                                    <Link href={encodeURI("https://outlook.office.com/calendar/0/deeplink/compose?body=" + props.eventType.description + "&enddt=" + date.add(props.eventType.length, 'minute').format() + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + date.format() + "&subject=" + props.eventType.title + " with " + props.user.name) + (location ? "&location=" + location : '')}>
+                                    <Link href={encodeURI("https://outlook.office.com/calendar/0/deeplink/compose?body=" + props.eventType.description + "&enddt=" + date.add(props.eventType.length, 'minute').format() + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + date.format() + "&subject=" + eventName) + (location ? "&location=" + location : '')}>
                                         <a className="mx-2 btn-wide btn-white">
                                             <svg className="inline-block w-4 h-4 mr-1 -mt-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>Microsoft Office</title><path d="M21.53 4.306v15.363q0 .807-.472 1.433-.472.627-1.253.85l-6.888 1.974q-.136.037-.29.055-.156.019-.293.019-.396 0-.72-.105-.321-.106-.656-.292l-4.505-2.544q-.248-.137-.391-.366-.143-.23-.143-.515 0-.434.304-.738.304-.305.739-.305h5.831V4.964l-4.38 1.563q-.533.187-.856.658-.322.472-.322 1.03v8.078q0 .496-.248.912-.25.416-.683.651l-2.072 1.13q-.286.148-.571.148-.497 0-.844-.347-.348-.347-.348-.844V6.563q0-.62.33-1.19.328-.571.874-.881L11.07.285q.248-.136.534-.21.285-.075.57-.075.211 0 .38.031.166.031.364.093l6.888 1.899q.384.11.7.329.317.217.547.52.23.305.353.67.125.367.125.764zm-1.588 15.363V4.306q0-.273-.16-.478-.163-.204-.423-.28l-3.388-.93q-.397-.111-.794-.23-.397-.117-.794-.216v19.68l4.976-1.427q.26-.074.422-.28.161-.204.161-.477z"/></svg>
                                         </a>
@@ -149,7 +152,8 @@ export async function getServerSideProps(context) {
             id: true,
             title: true,
             description: true,
-            length: true
+            length: true,
+            eventName: true
         }
     });
 

prisma/migrations/20210615142134_added_custom_event_name/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventType" ADD COLUMN     "eventName" TEXT;

prisma/schema.prisma

@@ -21,6 +21,7 @@ model EventType {
   user          User?   @relation(fields: [userId], references: [id])
   userId        Int?
   bookings      Booking[]
+  eventName     String?
 }
 
 model Credential {