Commit Graph

54 Commits (ecd0360d9adeb4649e8dd03e1f480699c6a1d377)

Author SHA1 Message Date
Egor Zaitsev 1dadf9f9a6 fix: same problem on the availability page 2021-07-14 14:19:55 +03:00
Bailey Pumfleet db7c467d73 Merge branch 'main' of https://github.com/calendso/calendso into main 2021-07-08 10:23:48 +01:00
Bailey Pumfleet 5c699f8471 Add troubleshoot page & add loading spinners 2021-07-08 10:23:22 +01:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Alex van Andel b136941948 Fixes #337: Event times ordered seemingly random 2021-07-03 14:24:30 +00:00
Alex van Andel 5d30586a24 Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal 2021-06-29 22:00:25 +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 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Alex van Andel 28edb86c14 Don't render location if there is none for now 2021-06-24 22:48:01 +00: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
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Malte Delfs 0ea36cb3f8 added edit/remove for customEventTypeInputs 2021-06-22 17:10:52 +02: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
Bailey Pumfleet 1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments 2021-06-18 17:04:05 +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 68bca9e703 Implemented a configurable buffer between events 2021-06-15 18:19:00 +02: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
Bailey Pumfleet 3a6eae8b8f Update dashboard 2021-05-11 14:11:17 +01:00
Alex van Andel a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
Bailey Pumfleet 640ea4031d
Merge pull request #159 from rymaju/feature/close_modal
Fix bug when dismissing modal on availability page
2021-05-07 20:43:22 +01:00
Alex van Andel 880c4e91a3 Removed redirect clientside session logic from pages and moved to shell 2021-05-07 16:01:29 +00:00
Bailey Pumfleet 17b880335a
Merge pull request #156 from MaZderMind/link-to-public-page
Add Links to Public Pages
2021-05-06 22:22:33 +01:00
Ryan Jung 25c9da1ef2 set modal state to false 2021-05-05 18:14:07 -04:00
Ryan Jung 03717a0a29 add required attribute to all required <input> tags 2021-05-05 17:58:42 -04:00
Peter Körner 15a6799421 add links to public pages 2021-05-05 22:01:56 +02: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 687ab5ad3e Replace router URL instead of reloading 2021-04-29 13:05:50 +01:00
Bailey Pumfleet a1eed7c77e Add URL slugs 2021-04-28 13:24:16 +01:00
Bailey Pumfleet 4d585505f7 Add view link for hidden event types 2021-04-28 10:27:45 +01:00
Bailey Pumfleet c320b0f20d Add hidden event types 2021-04-28 10:23:30 +01:00
Bailey Pumfleet ce398bd77c Replace all SVG icons with Heroicons components 2021-04-21 11:10:27 +01:00
Bailey Pumfleet 064ddf9fa3 Add confirmation to set times modal 2021-04-20 15:09:31 +01:00
Bailey Pumfleet 6b3ba4edae
Merge pull request #56 from harad1/new-event-validation
Basic validation for New Event Type to prevent unexpected behaviour
2021-04-20 11:33:53 +01:00
Damian Harateh c09ce2b2b5 Basic validation for New Event Type to prevent unexpected behaviour
Previously, when creating a new event type, user was still allowed to create a new event type, even if the event length's field was empty. This would cause a prisma error, since it would receive NaN and no event would have been added, but the page still reloaded. Therefore, a very basic validation to address this, at least in the short-term.
2021-04-20 01:30:38 +01:00