Commit Graph

320 Commits (c91b46c9fb8e2ffdc33320ba5550ed538bbf5130)

Author SHA1 Message Date
Alex van Andel 47d7634638 Adds prisma helper function whereAndSelect 2021-07-06 16:51:34 +00:00
Alex van Andel 496fcdfabc Minimized msgraph calls while event listing by batching 2021-07-05 19:50:54 +00:00
Alex van Andel bfc7cce688 Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy 2021-06-30 15:27:49 +00:00
Alex van Andel e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
nicolas 313ee0376e Fixed padding 2021-06-30 00:53:37 +02:00
nicolas 8accc3b775 Fixed padding 2021-06-30 00:50:34 +02:00
Alex van Andel 0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +00:00
nicolas 88db124f47 Fixed padding 2021-06-30 00:35:05 +02:00
nicolas e49c636a13 Fixed padding 2021-06-30 00:31:30 +02:00
nicolas ae3aa275f7 fixed padding 2021-06-30 00:16:25 +02:00
nicolas 7568071334 removed div 2021-06-30 00:11:16 +02:00
nicolas f91fdd16cf Use HTML to allow line breaks in outlook 2021-06-29 23:47:50 +02:00
nicolas 098b95ef55 Introduced CalEventParser to acquire rich descriptions for events in integrations 2021-06-29 23:43:18 +02:00
femyeda 726d211f27 attach hangouts location to invitee and organizer email notification 2021-06-29 07:16:20 -05:00
femyeda e714bd5b8e use google events conference data version 1
- fix issue where google meet details were no longer add to the created event
2021-06-29 07:16:20 -05:00
Alex van Andel 575747bcd3 Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul. 2021-06-29 01:45:58 +00:00
Alex van Andel 1eba242820 Compare busyTimes in UTC, re-implement hasErrors 2021-06-27 22:30:11 +00:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Bailey Pumfleet aa2e35d68e
Merge pull request #311 from Nico-J/feature/zoom-event-location
Added zoom as an event location and fixed linting
2021-06-25 16:52:52 +01:00
Bailey Pumfleet 8394b12a71
Merge pull request #307 from femyeda/feat/cal-69/password-reset
Feat/cal 69/password reset
2021-06-25 16:52:36 +01:00
femyeda 6fec24a69d use lib folder 2021-06-25 09:21:21 -05:00
nicolas bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Alex van Andel ef3274d8f3 Working version ready for testing
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
2021-06-24 22:15:18 +00:00
Malte Delfs 2f20cf2968 made sendEmail async 2021-06-24 19:30:39 +02:00
Malte Delfs 646ff4a107 eslint fixes 2021-06-24 18:12:22 +02:00
Malte Delfs 917b2c4821 Merge branch 'main' into feature/refresh-tokens-and-error-handling 2021-06-24 18:03:54 +02:00
femyeda ab1298e2ca Allow user to reset password 2021-06-24 11:01:41 -05:00
Peer Richelsen a1ddb873f0 minor change to reschedule info in email 2021-06-24 11:01:41 -05:00
Peer Richelsen 20cd3bc52e minor change to reschedule info in email 2021-06-23 23:45:07 +01:00
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Bailey Pumfleet 0c8d2c74de
Merge pull request #292 from emrysal/feature/decrease-conflicts-booking-page-by-component-splitting
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-22 09:24:19 +01:00
Femi Odugbesan 7690350124
feat: allow users to set google meet as a location for events (#287)
* feat: allow users to set google meet as a location for events

- add google meet location with support for other integrations

* return location types from server

also avoids potential leaks of user credentials

* chore: remove unused variable

* fix: return minimal required data from server
2021-06-21 18:15:29 -05:00
Alex van Andel b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00:00
Alex van Andel 4c62c7c97f Included missing dayjs plugins 2021-06-21 19:30:00 +00:00
Malte Delfs 22a009edd2 fixes after merge 2021-06-21 18:15:05 +02:00
Malte Delfs 88ab985ac4 Merge branch 'main' into feature/refresh-tokens-and-error-handling
# Conflicts:
#	lib/calendarClient.ts
#	pages/[user]/[type].tsx
#	pages/[user]/book.tsx
#	pages/api/book/[user].ts
2021-06-21 17:56:14 +02:00
Alex van Andel 88fc22ddd4 Updated to latest 2021-06-21 10:39:01 +00:00
Bailey Pumfleet e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page 2021-06-21 11:35:59 +01:00
Alex van Andel f99729c392 Merged with main 2021-06-20 17:52:18 +00:00
Malte Delfs ded27d17ea - save refreshed tokens of both calendar integrations
- Office365 expiry check was off by *1000
- log errors from calendar integrations with console.error
- improved google calendar integration performance further when calendars are selected
2021-06-20 17:33:02 +02:00
nicolas 9007bbed29 Added links to iCal again 2021-06-20 17:04:00 +02:00
nicolas ebc42f0c96 Merge branch 'main' into feature/zoom-integration
# Conflicts:
#	lib/calendarClient.ts
#	lib/emails/new-event.ts
#	pages/[user]/book.tsx
#	pages/api/availability/[user].ts
#	pages/api/book/[user].ts
#	pages/integrations/index.tsx
2021-06-20 16:37:51 +02:00
Alex van Andel d407ba0fe7 Make sure all dayjs() plugins are there 2021-06-20 14:37:33 +00:00
Alex van Andel a463fded8f Added <AvailableTimes /> and <TimeOptions /> components 2021-06-20 14:19:41 +00:00
Alex van Andel b423f2894a WIP to save progress 2021-06-19 22:50:47 +00:00
Malte Delfs 653509d655 formatting cleanup 2021-06-19 21:51:18 +02:00
Malte Delfs 639341f701 show custom inputs on booking screen 2021-06-19 21:44:36 +02:00
Malte Delfs 543482ca52 Merge branch 'main' into feature/custom-fields-on-the-booking-page
# Conflicts:
#	pages/api/availability/eventtype.ts
#	pages/availability/event/[type].tsx
2021-06-19 20:47:31 +02:00
Malte Delfs 76b72f64d8 event type custom input WIP 2021-06-18 21:58:42 +02:00
Bailey Pumfleet 81246edab2
Merge pull request #268 from emrysal/hotfix/ics-month-error
Fixes #266: ICS event is off by one month
2021-06-18 17:04:37 +01:00
Bailey Pumfleet 90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
Malte Delfs d2466440f9 removed debug logging 2021-06-18 14:03:31 +02:00
nicolas c662c97d14 Refactored EventOwner to EventOrganizer 2021-06-18 02:44:41 +02:00
nicolas 869ba9b97c Implemented reschedule mail and fixed bug that rescheduling weren't saved 2021-06-17 02:44:13 +02:00
nicolas a11641d7b9 Implemented common availability 2021-06-17 01:41:56 +02:00
nicolas 9b4cf088c0 Added line break 2021-06-17 00:57:59 +02:00
nicolas f56ced0ff1 Re-implemented event confirmation mails object based 2021-06-17 00:56:02 +02:00
Alex van Andel 9d5186f1e3 Functionality works, only thing left is a bit of cleaning up and all done 2021-06-16 22:27:27 +00:00
nicolas 04e0b55b51 Introduced more classes for event mails 2021-06-17 00:26:51 +02:00
nicolas e37dd017c8 Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations 2021-06-16 23:40:13 +02:00
nicolas 51a8bafaa7 Full zoom integration (except availability check) 2021-06-16 22:14:44 +02:00
Malte Delfs 4fb0fbfe07 Made event name customizable 2021-06-15 17:26:16 +02:00
Alex van Andel dbd1721405 Fixes #266: ICS event is off by one month 2021-06-14 19:00:37 +00:00
Alex van Andel 03f583b021 Save WIP 2021-06-14 18:53:20 +00:00
Malte Delfs ad69feed70 Merge branch 'main' into feature/select-calendars-to-check-for-availability 2021-06-14 20:13:36 +02:00
Malte Delfs d3b8431699 Implemented calendar selection for availability checking.
Also upgraded outlook integration to be able to check all calendars instead of only the default one.
2021-06-14 19:45:24 +02:00
nicolas 9ff8e9bd00 Calculate proper duration 2021-06-14 19:18:53 +02:00
nicolas 3cf00043b1 Persist new refresh token 2021-06-14 18:13:54 +02:00
nicolas 7ecb7f22e3 Merge branch 'main' into feature/zoom-integration 2021-06-14 17:17:09 +02:00
nicolas 31670d37b8 Fixed api urls and env variable names 2021-06-13 16:18:55 +02:00
nicolas bc8c58e57c Fixed integration identifier 2021-06-13 16:07:41 +02:00
nicolas 3cf7ffd6a7 First test implementation of video client 2021-06-13 15:22:17 +02:00
nicolas 0bb4678bf7 Added subtitle to zoom integrations 2021-06-13 13:59:40 +02:00
nicolas 124086d1ca Added zoom to list 2021-06-13 01:24:13 +02:00
nicolas 8227e733e6 Append reschedule/cancel also to event description 2021-06-13 00:37:35 +02:00
Bailey Pumfleet 65c7960b76
Merge branch 'main' into feature/invite-external-users 2021-06-11 22:02:07 +01:00
Alex van Andel 96d4a9bd6d Set Reply-To header to allow replying to bookings 2021-06-10 18:04:59 +00:00
nicolas 3d4222c631 Merge branch 'main' into feature/cancel-reschedule-links 2021-06-10 08:33:39 +02:00
nicolas abae62f30e Removed sha256 2021-06-10 01:14:38 +02:00
Alex van Andel 40eb9036f4 Implements inviting external users to teams 2021-06-09 21:43:37 +00:00
nicolas 749427cab3 Fixed update method 2021-06-09 22:04:57 +02:00
nicolas 3e338aaa05 Fixed update method 2021-06-09 22:03:05 +02:00
nicolas bd1cb474c5 Fixed update call 2021-06-09 21:59:29 +02:00
nicolas b9d1dd1059 Potentially working update method for google calendar 2021-06-09 21:47:03 +02:00
nicolas 403823fc62 change event for outlook implemented 2021-06-09 21:22:34 +02:00
nicolas 72a07770e8 Implemented link generation in mails 2021-06-08 17:24:06 +02:00
nicolas a3a4a65a80 Successfully implemented deletion 2021-06-08 02:25:34 +02:00
Alex van Andel 7df41b519f Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email 2021-06-07 16:57:59 +00:00
nicolas 8c7322b0dc Send mails to all users 2021-06-07 09:24:44 +02:00
nicolas 1e306ef1b0 Use calendar deletion 2021-06-07 08:59:13 +02:00
nicolas b376e9e5a4 Prepared google calendar deletion 2021-06-07 01:10:56 +02:00
nicolas d05ae49e8d Made UID unique, implemented cancel API, Prepared mail footer, 2021-06-06 03:51:24 +02:00
nicolas ec7a84ce22 Implemented request handler and error handling in frontend and added cancellation event to telemetry 2021-06-06 03:12:55 +02:00
nicolas a5e750eae7 Implemented SHA256 hash helper function 2021-06-06 01:29:27 +02:00
Alex van Andel 7a31cb0f6a Implemented the API, split the teams page up into multiple components 2021-06-05 22:53:33 +00:00
Alex van Andel c4c5e83499 Disables booking confirmation for Office 365 & enable new event email for all 2021-06-01 19:16:06 +00:00
Bailey Pumfleet eb02dd2dfa
Merge pull request #224 from emrysal/bugfix/add-location-to-email 2021-05-29 08:32:31 +01:00
Alex van Andel b0ab75dff6 Added the optional Location information + fixed nonfunctional a tag 2021-05-28 23:34:28 +00:00
Alex van Andel 64ca462f99 Fixes #222 - switched out custom function with dayjs toArray 2021-05-28 23:07:07 +00:00
Alex van Andel 4010fb9075 Small adjustments to the From behaviour, send as Calendso or via user depending on who you are sending to. 2021-05-28 11:16:19 +00:00
Alex van Andel 89cefa9894 Removed left-over console.log 2021-05-27 22:26:10 +00:00
Alex van Andel cf3713d3a1 Implemented mailing for Calendso instances
added two templates, confirm-booked (sent to invitee) and new-event (sent to agent, for the time being only when no calendar integrations exist).
2021-05-27 22:10:20 +00:00
Bailey Pumfleet 6e300f0db1
Merge pull request #147 from jfernandogt/main
feat: Add support for multiple google calendars
2021-05-11 16:04:31 +01:00
Fernando Barrios 91d71d61ae fix: Allow to read calendars ended with google.com 2021-05-11 07:27:06 -06:00
Fernando Barrios 5f101ca5fc feat: Add support for multiple google calendars 2021-05-11 07:27:06 -06:00
Fernando Barrios ba2feb2c15 feat: Add support to use gravatar as a fallback avatar 2021-05-08 14:26:19 -06:00
Alex van Andel a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
vklimontovich 3739d7752d Telemetry enhancements (mainly, data masking improvements)
- data masking is moved to a separate function;
 - hostnames and urls are masked now
 - collect pageview for pages not wrapped in Shell
2021-05-07 20:05:33 +03:00
Leonardo Stenico 084c7db559 Now a user can choose a timezone to display slots when scheduling a meeting 2021-05-06 19:36:57 +02:00
Bailey Pumfleet f7295afaa2
Merge branch 'main' into main 2021-05-05 15:18:58 +01:00
Bailey Pumfleet ea31607598 Fix a bunch of TypeScript errors 2021-04-29 14:47:01 +01:00
vklimontovich 2894be8689 Added telemetry collection (through jitsu.com)
- Introduced useTelemetry() hook
 - Telemetry events are sent for page_view, booking_confirmed, time_selected, date_selected events
 - Telemetry is configured (and can be disabled) with NEXT_PUBLIC_TELEMETRY_KEY env variable
2021-04-27 17:19:12 +03:00
Alex van Andel a8ea115a44 Even though Office 365 is set to UTC, it does not respond with Z in the API response indicating UTC, this fixes that by adding the Z 2021-04-22 13:58:48 +00:00
Alex van Andel 6a9632bb12 Added User.Read explicitly to office 365 oauth scopes, as it seems some setups do not automatically apply this scope. 2021-04-22 13:27:57 +00:00
Alex van Andel 8010abf15a
Adds Office 365 / Outlook.com Calendar Integration
* Added MS_GRAPH_CLIENT_* credentials to .env.example.
* Refactored the google integration into an abstraction layer for creating events and getting the user schedule from either Google or Office 365.
* FIX: when re-authorizing the Google Integration the refresh_token would no longer be set and the google integration would stop working.
* Updated Office 365 integration image
2021-04-21 23:10:48 +01:00
Leonardo Stenico 2b0e8bef7a Completely rebuilt logic when dealing with timezones. Now all available events should appear when selecting a date. 2021-04-17 02:08:35 +02:00
Bailey Pumfleet ddd7ccfb01 Standardise semicolons 2021-04-11 18:12:18 +01:00
Bailey Pumfleet 1db4973aee View and delete integrations 2021-04-10 13:02:35 +01:00
Bailey Pumfleet 388ff394c7 Add base admin interface 2021-03-24 15:03:04 +00:00
Bailey Pumfleet d769c3943c Add booking flow 2021-03-22 13:48:48 +00:00