Commit graph

29 commits

Author SHA1 Message Date
Alex van Andel
28edb86c14 Don't render location if there is none for now 2021-06-24 22:48:01 +00: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
Alex van Andel
1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00: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
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
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
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
2441f47c10 Fix layout issue with event types 2021-06-18 17:21:39 +01:00
Alex van Andel
e3dbc52676 Cleaned up loading the availability schedule 2021-06-16 22:50:58 +00: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
Malte Delfs
738d91787b changed naming 2021-06-15 17:27:56 +02:00
Malte Delfs
4fb0fbfe07 Made event name customizable 2021-06-15 17:26:16 +02:00
Alex van Andel
03f583b021 Save WIP 2021-06-14 18:53:20 +00:00
Alex van Andel
16b090efd4 Codestyle adjusted & fixed the column behaviour on mobile 2021-06-10 18:49:11 +00:00
Bailey Pumfleet
01d150092f Mobile UI fixes 2021-05-26 20:47:06 +01:00
Alex van Andel
a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
Alex van Andel
880c4e91a3 Removed redirect clientside session logic from pages and moved to shell 2021-05-07 16:01:29 +00:00
Ryan Jung
03717a0a29 add required attribute to all required <input> tags 2021-05-05 17:58:42 -04:00
Bailey Pumfleet
ea31607598 Fix a bunch of TypeScript errors 2021-04-29 14:47:01 +01:00
Bailey Pumfleet
1b7c9cf359 Fix TypeScript ref errors 2021-04-29 14:04:08 +01:00
Bailey Pumfleet
a1eed7c77e Add URL slugs 2021-04-28 13:24:16 +01:00
Bailey Pumfleet
c320b0f20d Add hidden event types 2021-04-28 10:23:30 +01:00
Damian Harateh
c9b334462b Fix for a bug when updating an event type
- Due to the lack of router object, after clicking "Update" on the Event Type - a response would be printed to the console, but without being routed back to the availability page.
2021-04-20 01:25:35 +01:00
Bailey Pumfleet
2c4b5c2846 Create, edit and delete event types 2021-04-08 15:20:38 +01:00