Commit Graph

376 Commits (509206e85f59028c3d21e98af679e5bd30f6378b)

Author SHA1 Message Date
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