Commit Graph

165 Commits (d3d6778c60601e55aba0ed2ac3d0b4a199ac2e3d)

Author SHA1 Message Date
Femi Odugbesan 793351fe96
[cal-184] add and handle date query params for event types (#359) 2021-07-13 11:10:22 -05:00
Bailey Pumfleet 6ed9bfde7b
Merge pull request #354 from emrysal/feature/user-theme
Implemented theme through user preferences
2021-07-12 14:01:08 +01:00
Alex van Andel 4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Malte Delfs 3283eb422c Fixed a bug that selected the following day on the booking page, when the selected time is smaller than the utc offset of the current timezone. Also fixed the reloading of the last 24h/12h selection 2021-07-11 18:05:49 +02:00
Alex van Andel 5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Bailey Pumfleet a9b45c1057
Merge pull request #351 from calendso/darkmode
hotfix: added dark mode for profile page
2021-07-09 14:14:53 +01:00
Peer Richelsen bf85cff76d added dark mode for profile page 2021-07-09 13:34:00 +02:00
Bailey Pumfleet c02c69073d
Merge pull request #346 from calendso/darkmode
added darkmode classes to [type] and /book and dashboard
2021-07-09 11:46:16 +01:00
Alex van Andel be102b1b09 Fixes #347 & some other minor things when timezones differ 2021-07-08 21:14:29 +00:00
Alex van Andel ffd99d02bb Implement whereAndSelect decorator 2021-07-08 20:44:40 +00:00
Peer Richelsen 01fc00b92f added darkmode classs to ¢[type] and /book 2021-07-07 21:58:18 +02:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Peer Richelsen 749978798b fixed layout for confirmation screen on mobile 2021-07-03 22:27:56 +02:00
Peer Richelsen b61cdbf40c removed top margin and shadow for mobile layout 2021-07-03 22:19:12 +02:00
Alex van Andel b136941948 Fixes #337: Event times ordered seemingly random 2021-07-03 14:24:30 +00:00
Alex van Andel 6aa8df7fcf If no availability set, default to user prefs 2021-06-30 15:57:56 +00:00
Alex van Andel a28cb455f1 Fixed bug that kept the date enabled when the time slot was less than 30m 2021-06-30 15:41:38 +00:00
Alex van Andel 8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Alex van Andel e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
Bailey Pumfleet 51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01: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 b4272ad7aa Merge branch 'main' of github.com:calendso/calendso into feature/scheduling 2021-06-28 19:53:07 +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
Alex van Andel 383ec64a7f onChange callback got removed in eslint cleanups
Triggered eslint:no-empty-function, this PR circumvents this by adding
a comment as part of the function body.
2021-06-27 13:51:06 +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
Malte Delfs 9c3eea5257 booking hotfix 2021-06-24 20:41:26 +02:00
Malte Delfs 917b2c4821 Merge branch 'main' into feature/refresh-tokens-and-error-handling 2021-06-24 18:03:54 +02:00
Peer Richelsen afa2e19f03 added more meta data to booking page 2021-06-23 12:14:19 +01:00
Bailey Pumfleet 629a34262e
Merge branch 'main' into bugfix/lowercase-usernames 2021-06-23 11:29:56 +01:00
Peer_Rich c428c3f80e
Merge pull request #300 from Malte-D/feature/og-image
Added og-image to booking pages
2021-06-22 19:24:45 +01:00
Malte Delfs 0e27e7e3d9 changed og-image link 2021-06-22 20:14:28 +02:00
Alex van Andel 892ba8a335 Lowercase the router.query.user & some typescript fixes 2021-06-22 17:42:32 +00:00
Malte Delfs e4b977c001 fix for single quotes 2021-06-22 18:01:03 +02:00
Malte Delfs a3b4cbeadd use https://github.com/calendso/og-image to show dynamic og-image of booking links with avatar and title of booking. 2021-06-22 17:52:52 +02:00
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Alex van Andel 78451a98b1 Updated timeFormat to something more sensible 2021-06-22 14:25:01 +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 b50fe16566 Moved DatePicker and PoweredByCalendso to seperate components 2021-06-21 20:26:04 +00: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
Malte Delfs 931e6b26f1 error handling WIP 2021-06-20 21:02:15 +02: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
Alex van Andel a463fded8f Added <AvailableTimes /> and <TimeOptions /> components 2021-06-20 14:19:41 +00:00
Alex van Andel d904dd7a00 AvailableTimes refactor complete, it all seems much simpler now 2021-06-20 00:10:08 +00:00
Alex van Andel b423f2894a WIP to save progress 2021-06-19 22:50:47 +00:00
Malte Delfs 6dc5efd6ee fixed additional notes 2021-06-19 21:54:22 +02:00
Malte Delfs 639341f701 show custom inputs on booking screen 2021-06-19 21:44:36 +02:00
femyeda ad0b561cca fix: eventType not defined on [user]/[type] 2021-06-19 10:17:23 -05:00
Alex van Andel cc1b3fa7dd Return 404 when requesting event url that does not exist 2021-06-18 20:41:12 +00:00
Bailey Pumfleet 90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
Alex van Andel 7584b77811 Updated useEffect so it only fires once (added []) 2021-06-17 19:29:42 +00: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
nicolas e5dc036c50 Replaces nulls with empty strings 2021-06-10 00:50:45 +02:00
nicolas af08c74c8a Implemented rescheduling and concurrent usage of all integrations 2021-06-09 21:46:41 +02:00
nicolas e92b2e01fc UI for rescheduling 2021-06-09 20:28:39 +02:00
Alex van Andel 3fdc997caa Fixed alignment issue with loading spinner 2021-06-01 18:03:13 +00:00
Alex van Andel adbf0476ad Merge branch 'main' into feature/mailings 2021-05-27 22:12:17 +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 6023a8a314 Add loading spinner to book button 2021-05-27 21:34:02 +01:00
Alex van Andel cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Heath Daniel 71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04:00
Bailey Pumfleet e845673662
Merge pull request #177 from jfernandogt/add-gravatar-support
feat: Add support to use gravatar as a fallback avatar
2021-05-11 14:26:43 +01:00
Bailey Pumfleet 1ab1dfc669
Merge pull request #180 from parasg1999/feature/overlappingAppointment
fix: check for overlapping appointments
2021-05-10 11:28:57 +01:00
Paras Gupta 977e879406 fix: busy time in slot interval 2021-05-10 02:48:12 +05:30
Paras Gupta 3da430b577 fix: check for overlapping appointments 2021-05-10 02:28:05 +05:30
Alex van Andel e8ed94d849 Default [] value for locations array on booking page 2021-05-08 22:17:25 +00: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
Bailey Pumfleet 5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144 2021-05-07 20:40:12 +01:00
Bailey Pumfleet 5553d14631
Merge branch 'main' into main 2021-05-07 20:37:18 +01:00
Bailey Pumfleet edec0226c4
Update branding link to calendso.com 2021-05-07 20:34:03 +01:00
Peer Richelsen a49ac34b7a fixed logo 2021-05-07 19:23:00 +01:00
Peer Richelsen 52d9f94711 inverted color 2021-05-07 19:21:42 +01:00
Peer Richelsen 44e5158941 added powered by calendso 2021-05-07 19:18:41 +01:00
vklimontovich db05c587a3 collect pageview for pages not wrapped in Shell 2021-05-07 20:07:36 +03: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
Alex van Andel 9ce82360c0 Check if user exists or return a 404 before proceeding 2021-05-07 15:17:06 +00:00
Bailey Pumfleet 5be885de19 UI improvements to time settings 2021-05-06 21:44:55 +01: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
vklimontovich ca1979fac2 - Updated jitsu to 2.0.1
- Mask sensitive information (such as page title and IP address)
2021-05-05 18:04:53 +03:00
Bailey Pumfleet 5cb0e44b00
Merge branch 'main' into fix/calendar-style 2021-05-05 15:42:36 +01:00
Bailey Pumfleet a445b262ce
Merge pull request #138 from rymaju/add_client_side_email_validation
Adding email validation to booking
2021-05-05 15:32:43 +01:00
Bailey Pumfleet f7295afaa2
Merge branch 'main' into main 2021-05-05 15:18:58 +01:00
Choongkyu Kim e036e9b216 fix calendar style and resolve some TS lint errors 2021-05-04 20:42:01 -07:00
Ryan Jung acf29cdaa5 make name and email fields required 2021-05-03 16:56:33 -04:00
Ryan Jung b8d570c8db changed input type to email 2021-05-03 16:33:07 -04:00
Bailey Pumfleet 27eb9ad95e Fix cancel link on booking page 2021-04-30 13:06:04 +01:00
Bailey Pumfleet ea31607598 Fix a bunch of TypeScript errors 2021-04-29 14:47:01 +01:00
Bailey Pumfleet a1eed7c77e Add URL slugs 2021-04-28 13:24:16 +01:00
Bailey Pumfleet 5fc433ecdf Add day labels to calendar 2021-04-28 09:23:42 +01:00
Heath Daniel 36db7fb4f1 Match formatting 2021-04-27 21:56:30 -04:00
Heath Daniel 83822c777c Fix calendar layout and adjust spacing 2021-04-27 21:50:54 -04: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