Commit Graph

576 Commits (738ee5d992e811441881b33d4cb393df055a0b23)

Author SHA1 Message Date
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
Malte Delfs b5b480f7e2 hotfix for booking 2021-06-26 19:48:24 +02: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
Bailey Pumfleet cc02558ac6
Merge pull request #310 from femyeda/fix-244-can-book-when-not-available
Fix 244 can book when not available
2021-06-25 16:51:28 +01:00
femyeda e883ab591a simplify expiry calculation, timezone unneccessary 2021-06-25 09:23:32 -05:00
femyeda 6fec24a69d use lib folder 2021-06-25 09:21:21 -05:00
femyeda ad657c0261 use proper response code 2021-06-25 09:17:39 -05:00
femyeda 2c29368337 fix: passwordResetLink uses correct page 2021-06-25 09:16:24 -05: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
femyeda a53cdf2660 fix: issue where user could book a meeting when unavailable 2021-06-24 16:21:25 -05:00
Malte Delfs 9c3eea5257 booking hotfix 2021-06-24 20:41:26 +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
Bailey Pumfleet ea5692c20c Add bookings page 2021-06-24 11:01:41 -05:00
Bailey Pumfleet ebb3e87284 Add bookings page 2021-06-24 14:36:31 +01:00
Alex van Andel 1668785678 Prevent users from entering mixed case usernames
Booking pages are case insensitive new, so no more case sensitive
usernames.
2021-06-23 16:10:58 +00: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
Bailey Pumfleet 6c6d262184
Merge pull request #299 from Malte-D/bugfix/edit-custom-inputs
added edit/remove for customEventTypeInputs
2021-06-22 16:15:45 +01:00
Malte Delfs 0ea36cb3f8 added edit/remove for customEventTypeInputs 2021-06-22 17:10:52 +02:00
Alex van Andel 78451a98b1 Updated timeFormat to something more sensible 2021-06-22 14:25:01 +00:00
Bailey Pumfleet a486d1eb02 Add some extra states 2021-06-22 15:05:15 +01: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 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
femyeda f2265fdbd7 Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""
This reverts commit de4c8f75e0.
2021-06-21 07:31:39 -05: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 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
femyeda ad0b561cca fix: eventType not defined on [user]/[type] 2021-06-19 10:17:23 -05:00
Femi Odugbesan de4c8f75e0
Revert "Fixed cancellation bug: "cannot read property 'length' of null"" 2021-06-19 09:14:24 -05:00
Bailey Pumfleet 11fc0f0d2a
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null 2021-06-19 09:24:19 +01:00
nicolas 11ba59be9c Fixes #281 2021-06-19 03:40:38 +02:00
Alex van Andel cc1b3fa7dd Return 404 when requesting event url that does not exist 2021-06-18 20:41:12 +00:00
Malte Delfs 95a99c620e selected calendars hotfix 2021-06-18 22:11:13 +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 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 1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments 2021-06-18 17:04:05 +01:00
Bailey Pumfleet 90c1ff25bf
Merge branch 'main' into feature/customise-event-names 2021-06-18 17:00:52 +01:00
Bailey Pumfleet 2960463f77
Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
Feature: select calendars to check for availability
2021-06-18 17:00:05 +01:00
Malte Delfs 50bc6b480e minor change 2021-06-18 14:00:53 +02:00
Peer_Rich 8bf556c742
Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice
Updated useEffect so it only fires once (added [])
2021-06-18 11:35:41 +01:00
Alex van Andel 7584b77811 Updated useEffect so it only fires once (added []) 2021-06-17 19:29:42 +00:00
Peer_Rich b3c5752d67
updated integration description 2021-06-17 17:06:32 +01: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 3366a05c1d Implemented legacy method to send email even if there is no integration 2021-06-17 01:04:08 +02:00
nicolas f56ced0ff1 Re-implemented event confirmation mails object based 2021-06-17 00:56:02 +02: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
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
Peer Richelsen 1de9ccff3a minor changes 2021-06-16 14:04:04 +01:00
Peer Richelsen ea75e8974d added getinitialprops 2021-06-16 13:44:25 +01:00
Peer Richelsen 87f7984d76 added billing to settings 2021-06-16 13:42:30 +01: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 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 4caac5a88c Layout fix 2021-06-14 19:55:55 +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 49abf06ce6 Deleting zoom also works 2021-06-14 19:00:17 +02:00
nicolas c4455b74ba Rescheduling zoom works 2021-06-14 18:55:20 +02:00
nicolas 8e9868db30 Properly concat results and properly handle zoom meeting uuids 2021-06-14 18:47:05 +02:00
nicolas 7ecb7f22e3 Merge branch 'main' into feature/zoom-integration 2021-06-14 17:17:09 +02:00
nicolas 2ba98c5dac Test setup to try zoom meeting creation 2021-06-13 15:57:01 +02:00
nicolas 30f30d7669 Renamed zoom to zoomvideo 2021-06-13 14:04:03 +02:00
nicolas 0bb4678bf7 Added subtitle to zoom integrations 2021-06-13 13:59:40 +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
nicolas 734d9ad243 Save whole JSON 2021-06-11 02:32:07 +02:00
nicolas 00f19bd654 Added integration to UI 2021-06-11 02:29:43 +02:00
nicolas a9a569f876 Removed scopes variable 2021-06-11 02:17:22 +02:00
nicolas f44c8b6326 Potentially first working version of token fetching for zoom 2021-06-11 02:14:36 +02:00
nicolas 697cae9cc9 Very rudimentary development version of zoom auth #6 2021-06-11 02:13:02 +02:00
nicolas 65a029acde Very rudimentary development version of zoom auth #5 2021-06-11 02:10:56 +02:00
nicolas 615e59cde7 Very rudimentary development version of zoom auth #4 2021-06-11 02:08:47 +02:00
nicolas 46474c9c70 Very rudimentary development version of zoom auth #3 2021-06-11 02:07:02 +02:00
nicolas a2f1462f10 Very rudimentary development version of zoom auth #2 2021-06-11 02:03:48 +02:00
nicolas b5733716de Very rudimentary development version of zoom auth 2021-06-11 01:37:58 +02:00
Bailey Pumfleet b7b644998a
Merge pull request #258 from Nico-J/bugfix/no-emails-sent-when-no-integration-added 2021-06-10 22:22:10 +01:00
Bailey Pumfleet 17ccf42976
Merge pull request #257 from Nico-J/feature/button-for-new-integration 2021-06-10 22:21:50 +01:00
nicolas cb9d749310 Send email when no integrations are present as well 2021-06-10 23:18:57 +02:00
nicolas d249c62620 Added button to add integrations 2021-06-10 22:54:48 +02:00
Alex van Andel 16b090efd4 Codestyle adjusted & fixed the column behaviour on mobile 2021-06-10 18:49:11 +00:00
Bailey Pumfleet 4dacf64a18
Merge pull request #253 from Nico-J/feature/cancel-reschedule-links 2021-06-10 07:53:38 +01:00
nicolas 3d4222c631 Merge branch 'main' into feature/cancel-reschedule-links 2021-06-10 08:33:39 +02:00
nicolas 01da470664 Removed whitespaces 2021-06-10 01:19:46 +02:00
nicolas 6c92e2fe1b Implemented short UUID as UID 2021-06-10 00:51:09 +02:00
nicolas e5dc036c50 Replaces nulls with empty strings 2021-06-10 00:50:45 +02:00
Alex van Andel 9aeb996aef Adds a bit of margin to left and right for better mobile display 2021-06-09 21:47:00 +00:00
Alex van Andel 40eb9036f4 Implements inviting external users to teams 2021-06-09 21:43:37 +00:00
Alex van Andel f24ca5b672 Fixed incorrect variable & also clears old errors now 2021-06-09 20:32:02 +00: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 e8a5357a89 Restricted usernames to be unique, removes the potential for username conflicts 2021-06-09 12:26:00 +00:00
Bailey Pumfleet 7d81a1f1fb Minor UI changes to teams 2021-06-08 17:00:06 +01:00
nicolas 72a07770e8 Implemented link generation in mails 2021-06-08 17:24:06 +02:00
nicolas 27194ef68c Fixed bug where null email address could occurr in office365 credential key 2021-06-07 20:21:38 +02:00
nicolas 2b84612e5d Request offline_access in first office365 step 2021-06-07 19:30:09 +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
Alex van Andel 5d3e39ea6e Better error handling during team member invitation
Now tells you if you have already added this member / invite is pending.
Behaviour a little bit more predictable during team editting.
2021-06-07 15:12:00 +00:00
nicolas 1daf9bd3f7 Use id 2021-06-07 09:56:15 +02:00
nicolas d2934a45ff Use RefUid 2021-06-07 09:44:56 +02:00
nicolas 38b6d1c3e9 Properly get eventId 2021-06-07 09:37:28 +02:00
nicolas 29fef04620 Moved delete request 2021-06-07 09:21:46 +02:00
nicolas ce8cca8a39 Fix: Check if credentials present
Fix: Request credentials as well
2021-06-07 09:18:41 +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 c29c0395ef Implemented cancellation success page 2021-06-06 03:26:14 +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 7045bfc364 Implemented (still actionless) page for cancellation 2021-06-06 02:36:40 +02:00
Alex van Andel 9f12ccf5c1 Teams are now refreshed properly when TeamListItems change 2021-06-05 23:41:05 +00:00
nicolas e32caa68eb Implemented database actions to store bookings in database 2021-06-06 01:32:24 +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 e2942224ab Tracking work in progress changes 2021-06-03 20:55:34 +00:00
Alex van Andel 1f6e3f8f2e Removed calendar scope, we shouldn't need it. 2021-06-03 00:05:54 +00:00
Bailey Pumfleet 6e76cc386c
Merge pull request #232 from emrysal/change-email-sending-moments 2021-06-01 23:38:49 +01: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
Alex van Andel 3fdc997caa Fixed alignment issue with loading spinner 2021-06-01 18:03:13 +00:00
Alex van Andel 9ba29ab347 Fixes #225 by correctly applying the timezone whilst keeping the original date in UTC 2021-05-29 22:29:04 +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
Bailey Pumfleet 01d150092f Mobile UI fixes 2021-05-26 20:47:06 +01:00
Bailey Pumfleet efa443a912
Merge pull request #216 from emrysal/feature/sticky-time-options
Implemented sticky time options based on localStorage
2021-05-26 19:56:00 +01:00
Alex van Andel cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Bailey Pumfleet 2726c8c87b Add embed section in Settings 2021-05-26 17:24:10 +01:00
Bailey Pumfleet 7d6a631f5d Round available hours if necessary 2021-05-25 21:34:18 +01:00
Alex van Andel c610874ec4 Removed unnecessary DB calls & changes everything to use session.user.id 2021-05-22 19:12:06 +00:00
Heath Daniel 71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04:00
Bailey Pumfleet 2d0b5709a1
Merge pull request #199 from jasmeetsohal/different-colors-feature
add random bullet color in user's events list
2021-05-17 10:16:08 +01:00
jasmeetsohal cf13dcc023 add random bullet color in list user's events 2021-05-13 23:05:28 +05:30
Bailey Pumfleet f66a59b7e3 Update donation banner 2021-05-13 15:44:48 +01:00
Peer Richelsen 8fe7de9d02 added donation banner for self-hosted 2021-05-13 14:07:27 +01: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 5f101ca5fc feat: Add support for multiple google calendars 2021-05-11 07:27:06 -06: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 3a6eae8b8f Update dashboard 2021-05-11 14:11:17 +01:00
Bailey Pumfleet 209791d86d Get user ID from session instead of looking it up 2021-05-11 10:21:05 +01:00
Bailey Pumfleet b760ed6ff7
Merge pull request #181 from emrysal/bugfix/ensure-utc-plugin-is-enabled 2021-05-10 18:00:32 +01:00
Alex van Andel 6b38fd7550 Fixes UTC issue to success page when refreshed 2021-05-10 16:35:48 +00: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 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
Bailey Pumfleet c867edcad8
Merge pull request #169 from emrysal/feature/server-side-settings-redirect
Added redirects() entry to next.config.js, changed Settings url to /settings/profile
2021-05-07 20:41:43 +01: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 7cf0504ce6
Merge pull request #171 from emrysal/feature/simplify-code-by-handling-auth-in-shell-component
Removed redirect clientside session logic from pages and moved to shell
2021-05-07 20:39:02 +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 880c4e91a3 Removed redirect clientside session logic from pages and moved to shell 2021-05-07 16:01:29 +00:00
Alex van Andel 9ce82360c0 Check if user exists or return a 404 before proceeding 2021-05-07 15:17:06 +00:00
Alex van Andel d2ca59adb8 Added redirects() function to next.config.js, changed Settings url 2021-05-07 15:04:56 +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
Bailey Pumfleet dfadd3178d
Merge pull request #158 from rymaju/feature/event_type_required_field_validation
Perform simple validation for required fields
2021-05-06 22:20:48 +01:00
Bailey Pumfleet 9032adb9ab
Merge pull request #164 from rberrelleza/split-signup-validation
send back a specific message per field
2021-05-06 21:48:04 +01:00
Bailey Pumfleet 5be885de19 UI improvements to time settings 2021-05-06 21:44:55 +01:00
Ramiro Berrelleza d4ba855a72
send back a specific message per field
Signed-off-by: Ramiro Berrelleza <rberrelleza@gmail.com>
2021-05-06 12:43:00 -07: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
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
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 e185b57db1
Merge pull request #148 from emrysal/feature/disable-integrations-when-invalid-or-missing-configuration
Take server config into account whilst listing integrations, improved…
2021-05-05 15:39:13 +01:00
Bailey Pumfleet 0f3323aa9d
Merge pull request #141 from emrysal/bugfix/remove-settings-cancel-button
Remove the 'Cancel' button from the Settings pages suggested in #140
2021-05-05 15:33:18 +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 cc2c3d7673
Merge pull request #136 from emrysal/bugfix/google-eventedit
Fixes #134, invalid add to google calendar link on success page.
2021-05-05 15:31:40 +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
Alex van Andel 4969258e62 Take server config into account whilst listing integrations, improved feedback for installer as per #142 2021-05-04 20:31:15 +00:00
Alex van Andel df88919d15 Remove the 'Cancel' button from the Settings pages suggested in #140 2021-05-04 11:36:06 +00: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
Alex van Andel 69f3497658 Fixes #134, invalid add to google calendar link on success page. 2021-05-03 16:59:49 +00:00
Bailey Pumfleet bf672280fe
Merge pull request #124 from emrysal/bugfix/fix-nextauth-webpack5
csrfToken->getCsrfToken is required by webpack5 (fixes #123, thanks @jacobocode)
2021-05-01 09:19:21 +01:00
Alex van Andel 7b8d0b1119 Implemented getCsrfToken as per auth-next docs, getCsrfToken is required by webpack5 (fixes #123, thanks @jacobocode) 2021-04-30 21:15:18 +00: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 1b7c9cf359 Fix TypeScript ref errors 2021-04-29 14:04:08 +01:00
Bailey Pumfleet c2dfbaad88 Set avatar through URL 2021-04-29 13:36:37 +01:00
Bailey Pumfleet 7d7b627304 Improve settings page redirect 2021-04-29 13:28:25 +01:00
Bailey Pumfleet 687ab5ad3e Replace router URL instead of reloading 2021-04-29 13:05:50 +01:00
Bailey Pumfleet b2c848d666 Fix logout screen icon 2021-04-29 13:03:49 +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 b32a4c75c0
Merge pull request #111 from diegofn/main
Update success page calendar icons
2021-04-28 09:28:00 +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
Diego Fernando Nieto 2c4fe5c3b7 Update success page calendar icons 2021-04-27 09:35:56 -05: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 d482b54fda Implemented react-timezone-select library, required the installation of 'next-transpile-modules', due to import and export not being natively supported within Next.js. 2021-04-26 12:14:23 +00:00
Alex van Andel d867631aee Combine different timezones to condense the list a little bit. Fixes https://github.com/calendso/calendso/issues/80 2021-04-22 18:03:52 +00:00
Bailey Pumfleet 6091f7ba86
Merge pull request #87 from emrysal/main
Adds Office 365 / Outlook.com Calendar Integration
2021-04-22 15:04:56 +01: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 598a86426b Fixes adding google integration not appearing in the dashboard after adding it. This was due to the credential being added async and the redirect happened before the save has completed. 2021-04-22 11:09:18 +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
Bailey Pumfleet ce398bd77c Replace all SVG icons with Heroicons components 2021-04-21 11:10:27 +01:00
Bailey Pumfleet d28166a2c3 Switch between 12 and 24 hours 2021-04-20 15:41:36 +01:00
Bailey Pumfleet 064ddf9fa3 Add confirmation to set times modal 2021-04-20 15:09:31 +01:00
Bailey Pumfleet 35f7b30097 Add success modal 2021-04-20 13:56:50 +01:00
Bailey Pumfleet 026e5475f1
Merge pull request #53 from harad1/main
Tweaks to the Dashboard UI
2021-04-20 11:36:12 +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
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
Damian Harateh 8b4ef30f74 Tweaks to the Dashboard UI
- Increasing the padding of "Your integrations" tile to match the height of "Welcome to Calendso!" tile in medium and large size screens.
- Tweaking rounding of corners of the "Welcome to Calendso!" tile so it matches the styling of "Your integrations" tile in all screen sizes.
2021-04-19 18:36:39 +01:00
Bailey Pumfleet 64d3fcfab2
Merge pull request #45 from emrysal/main
Added ics library, added icon to download .ics on the success page.
2021-04-19 16:35:18 +01:00
Bailey Pumfleet 3e5ed294a5 Fix incorrect modal toggle 2021-04-19 15:04:04 +01:00
Bailey Pumfleet 3100adfe36
Merge branch 'main' into main 2021-04-19 10:49:42 +01:00
Alex van Andel 90ebf8a97e Added ics library, added icon to download .ics on the success page. 2021-04-17 20:18:51 +00:00
Chris Benseler cee212c438 refactor: no need for else if true condition returns somrthing 2021-04-17 17:13:42 -03:00
Chris Benseler 501f229d0e refactor: using property assignment 2021-04-17 17:12:09 -03: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
Leonardo Stenico 96e2b762c6 Now owners can set their time zone and users can see available times relatively to their current time zone 2021-04-16 04:09:22 +02:00
Bailey Pumfleet f4dce81e5f Remove zulu time specification 2021-04-14 22:17:19 +01:00
Bailey Pumfleet 167f981522 Change start and end times of day 2021-04-13 17:16:32 +01:00
Bailey Pumfleet 952bdea723 Fix login spacing issue 2021-04-11 22:02:10 +01:00
Bailey Pumfleet bc655fd301 Fix conflict checking 2021-04-11 21:51:58 +01: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 ac550f5780 Vertically scroll through timeslots 2021-04-10 12:21:44 +01:00
Bailey Pumfleet 73ea3ca181
Merge pull request #3 from emrysal/main
Fixed some minor bugs that caused console errors
2021-04-10 11:54:23 +01:00
Bailey Pumfleet 652288679c Change full name field to defaultValue 2021-04-09 16:51:00 +01:00
Alex van Andel e414a178d6 Fixed some minor bugs that caused console errors, changed a>li to li>a to accomodate best practises 2021-04-09 15:47:42 +00:00
Alex van Andel 197ee86c32 When navigating to a calendso user that does not exist, return notFound. 2021-04-08 15:51:13 +00:00
Bailey Pumfleet 2c4b5c2846 Create, edit and delete event types 2021-04-08 15:20:38 +01:00
Bailey Pumfleet d209d3dd04 Add page headings to settings pages 2021-04-07 22:07:16 +01:00
Bailey Pumfleet 580d2fefb0 Fix hardcoded URL 2021-04-07 21:41:08 +01:00
Bailey Pumfleet 5bedd1f8b2 Fix route parameters 2021-04-07 21:37:41 +01:00
Bailey Pumfleet f55f2f6321 Add settings section 2021-04-07 16:03:02 +01:00
Bailey Pumfleet 443febac8d Add more empty states 2021-03-31 21:10:53 +01:00
Bailey Pumfleet 38cbb42b2c Add basic homepage content 2021-03-30 16:15:55 +01:00
Bailey Pumfleet d82dc10d74 Use server side props to get integration data 2021-03-30 14:23:51 +01:00
Bailey Pumfleet a758c28fb0 Custom login screen and error page 2021-03-29 22:01:12 +01:00
Bailey Pumfleet 1582cfd43f Add self-authentication with Google Calendar API 2021-03-26 15:51:19 +00: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
Bailey Pumfleet f260e295f5 Initial commit from Create Next App 2021-03-10 10:02:39 +00:00