Commit graph

108 commits

Author SHA1 Message Date
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
Alex van Andel
0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +00: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