Commit Graph

257 Commits (637fe4d49c0e7964baf30eed03491fba0f71ffc0)

Author SHA1 Message Date
Omar López 2c50781084
Makes every day available for events that don't have availability set (#756)
* Abstracts MinutesField

* Adds missing Minimum booking notice

* Refactoring

* Fixes int field sent as string

* Sorts slots by time

* Fixes availability page

* Fixes available days

* Type fixes

* More availability bugfixes

* Makes every day available for events that don't have availability set

* Type fixes
2021-09-23 12:03:07 -06:00
Omar López bcacc1d166
More availability fixes (#755)
* Abstracts MinutesField

* Adds missing Minimum booking notice

* Refactoring

* Fixes int field sent as string

* Sorts slots by time

* Fixes availability page

* Fixes available days

* Type fixes

* More availability bugfixes
2021-09-23 18:18:29 +01:00
Nico 2bc4678ef0
Fixed bug that old credentials were used to create a zoom booking (#729)
Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-23 10:35:39 +01:00
Bailey Pumfleet bb3362f2ef
Add JWT secret to next-auth.js (#730) 2021-09-23 10:02:53 +01:00
Mihai C 82e7e51fca
Setup i18n and locale detection (#712)
* feat: setup translations

* feat: i18n setup

* Update pages/settings/profile.tsx

Co-authored-by: Alex Johansson <alexander@n1s.se>

* fix: abstract locale hook

* fix: set default locale if preferred locale is not supported

* Revert "fix: set default locale if preferred locale is not supported"

This reverts commit e2a3d81371.

* fix: set default locale if preferred locale is not supported

* fix: use 1 namespace and remove unnecessary logs

* fix: yarn.lock

* fix: linting errors

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-09-23 09:49:17 +01:00
Omar López d194878bb2
Suggestion: let prettier sort imports order (#673)
* Suggestion: let prettier sort imports order

# Conflicts:
#	yarn.lock

* AUTO SORT ALL THE IMPORTS

* Linting

* Fixes test
2021-09-22 13:52:38 -06:00
Omar López 3add84a279
Adds Stripe integration (#717)
* Adds Stripe integration

* Moves Stripe instrucctions to ee

* Adds NEXT_PUBLIC_APP_URL variable

* Adds fallback for NEXT_PUBLIC_APP_URL

* Throws error objects instead

* Improved error handling

* Removes deprecated method

* Bug fixing

* Payment refactoring

* PaymentPage fixes

* Fixes preview links

* More preview link fixes

* Fixes client links

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-09-22 19:36:13 +01:00
Omar López e1f1386332
Feat disable guests for events (#719)
* Abstracts CheckboxField

* Allows disabling the guests field while booking

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 12:04:32 +01:00
Chris 1c2998fc13
Ensure users cannot delete teams they don’t own (#720)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 11:43:32 +01:00
Femi Odugbesan a047177e72
Fix/duplicate events on onboarding (#716) 2021-09-22 08:25:33 +01:00
Conor Meagher 96fd7ecf41
chore: change calendso strings to cal.com (#707)
* chore: change calendso strings to cal.com

* rebase LICENSE

* rebase LICENSE

* strings that were missed

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:59:34 +01:00
Chris c0330acd83
Add two-factor authentication (#692)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:29:20 +01:00
Chris f281c49e76
Remove password reset data from response (#699)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-19 15:31:45 +01:00
Chris 7eed1b2fa6
Prevent unauthorized event type access (#694)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-18 23:32:07 +01:00
Omar López f6005b8c70
[CAL-409] Prevents usernames with special characters (#668) 2021-09-18 00:08:02 +01:00
Nico 961f297ba8
No confirmation shall be needed when rescheduling events that need confirmation (#440)
* No reconfirmation needed when rescheduling

* adapted success page

* Parse query as string

Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-17 22:31:44 +01:00
Bailey Pumfleet 06f5559ca0 Fix user update API call 2021-09-17 15:41:28 +01:00
Chris S 13486d9988
Fix issues in multiple endpoints (#679) 2021-09-17 12:25:48 +01:00
Bailey Pumfleet eb25ef266a Remove API key from integrations 2021-09-14 19:20:12 +01:00
Alex van Andel 6ab741b927
Feature/round robin (#613)
* Heavy WIP

* More WIP

* Playing with backwards compat

* Moar wip

* wip

* Email changes for group feature

* Committing in redundant migrations for reference

* Combine all WIP migrations into a single feature migration

* Make backup of current version of radio area pending refactor

* Improved accessibility through keyboard

* Cleanup in seperate commit so I can cherrypick later

* Added RadioArea component

* wip

* Ignore .yarn file

* Kinda stable

* Getting closer...

* Hide header when there are only personal events

* Added uid to event create, updated EventTypeDescription

* Delete redundant migration

* Committing new team related migrations

* Optimising & implemented backwards compatibility

* Removed now redundant pages

* Undid prototyping to calendarClient I did not end up using

* Properly typed Select & fixed lint throughout

* How'd that get here, removed.

* TODO: investigate why userData is not compatible with passed type

* This likely matches the event type that is created for a user

* Few bugfixes

* Adding datepicker optimisations

* Fixed new event type spacing, initial profile should always be there

* Gave NEXT_PUBLIC_BASE_URL a try but I think it's not the right solution

* Updated EventTypeDescription to account for long titles, added logo to team page.

* Added logo to team query

* Added cancel Cypress test because an upcoming merge contains changes

* Fix for when the event type description is long

* Turned Theme into the useTheme hook, and made it fully compatible with teams pages

* Built AvatarGroup ui component + moved Avatar to ui

* Give the avatar some space fom the description

* Fixed timeZone selector

* Disabled tooltip +1-...

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-14 09:45:28 +01:00
Alex van Andel 8ee68e2ace
Converts booking deletion to soft-delete + more robust cancellation (#581)
* Converts booking deletion to soft-delete + more robust cancellation

* Update pages/api/cancel.ts

infer type :)

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-13 09:57:56 +01:00
Femi Odugbesan bc79f24fd4
integrate apple icalendar (#623) 2021-09-11 08:54:13 +01:00
Alex van Andel 1269c43c99
Username is now @unique in main, so we can now catch Prisma conflicts (#610) 2021-09-08 19:21:23 +02:00
Alex van Andel aff45e3451
Fixed #598 - handleLegacyConfirmationMail (#601)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-08 11:21:19 +00:00
Syed Ali Shahbaz fa35af7bd8
Cal 262 refactor edit teams according to the design reference (#516)
* refactored settings/team landing page

* changed team edit flow, WIP

* merge conflict fix for teams.tsx

* minor fixes to edit team, WIP

* invite-member and disband team APIs attached inside edit-team page

* added remove-member API in edit-team page, minor fixes

* minor code fix, WIP

* WIP

* add logo, bio, branding to team schema

* bio, logo, branding, slug patch API and minor code fix-- WIP

* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP

* Pull latest data after an action in settings/teams-edit page

* added slug conflict check at Patch time

* code clean-up

* initial change request fixes --WIP

* prop type fix and add warn button color theme --WIP

* added warn Button to Dialog

* remaining change request fixes

* added noop from react-query

* updated invited team-list design

* prettier fix for api/teams/profile

* removed noop import and added custom noop

* minor Button fix

* requested changes addressed
2021-09-06 14:22:22 +01:00
Alex van Andel d9aff72220
Prepares the email system for Calendso Teams (#586)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-06 09:06:33 +00:00
Alex Johansson 2f1ede9bcd
use `getSession()` from `@lib/auth` everywhere (#563) 2021-09-03 21:51:21 +01:00
Femi Odugbesan 2d23a8b7db
Onboarding Flow (#503)
* wip

* wip

* db: schedule schema

* fix adding time goes into new day

fix adding new time not keeping updating ranges

fix updating ranges not maintaining changed values

* remove photo upload

* remove unused code

* remove more unused code

* undo time lib

* didnt actually change this

* dont show onboardi
ng flow for users created before sept 1 2021

* use more consistent max-widths

* align all inputs in scheduler component

* allow overriding of default styles

* match figma designs

implement goto previous step

* add more types, match figma

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-02 13:13:19 +01:00
Mihai C fc50821282
feat: add react-query and navigate to edit after event-type creation (#528)
* feat: add react-query and navigate to edit after event-type creation

* fix: add types/toasts and add react-query mutations on event-types

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
2021-08-27 15:11:24 +03:00
Alex Johansson a44bc63304
fix linting issue introduced in 9844cf9 (#529) 2021-08-26 13:42:40 +02:00
Bailey Pumfleet 9844cf92a8 Temporarily disable checking video busy times 2021-08-24 22:44:29 +01:00
Alex van Andel bc97237858
Remove image from session, add /api/me, update Avatar component (#493)
* Remove image from session, add /api/me, update Avatar component

* Fixed Avatar on Desktop

* Added emailMd5 to session + load md5 from props on /settings/profile

* Explicitly select which fields to expose in /api/me

* Abstracted Gravatar, defaults avatar for /api/me, removed session dep from UserDropdown

* Delete md5.js :)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-08-22 14:16:42 +01:00
Mihai C 3894ee12d1
feat: CustomEventType placeholder and API fixes (#446)
* feat: add optional placeholder for text/multi-line text custom inputs on event types

* fix: delete associations of event type first

* fix: remove unneeded check

* fix: minor tweak

Co-authored-by: mihaic195 <mihai@sortlist.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-08-22 14:06:26 +01:00
Alex Johansson 6d158e0c50
fix google auth callback (#500)
* maybe fix?

* fix

* Update pages/api/integrations/googlecalendar/callback.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-08-19 15:37:18 +01:00
Alex Johansson f63aa5d550
add linting in CI + fix lint errors (#473)
* run `yarn lint --fix`

* Revert "Revert "add linting to ci""

This reverts commit 0bbbbee4be.

* Fixed some errors

* remove unused code - not sure why this was here?

* assert env var

* more type fixes

* fix typings og gcal callback - needs testing

* rename `md5.ts` to `md5.js`

it is js.

* fix types

* fix types

* fix lint errors

* fix last lint error

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-08-19 14:27:01 +02:00
Alex Johansson aed9757409
fix bad auth commit (#487) 2021-08-18 12:15:22 +00:00
Alex Johansson a0a0ec86f0
add type-safe `getSession()` (#486)
* fix types for auth
* implement safer to use `getSession`
2021-08-18 11:52:25 +00:00
Alex van Andel 3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
femyeda 49e7cbf803 fix issue where user could not connect to caldav
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
2021-08-16 09:34:49 -05:00
Bailey Pumfleet ceacf02383
Merge pull request #449 from kanji-keraliya/office-365-integration-domain
Fixed: Office 365 integration redirection URL issue
2021-08-16 10:23:45 +01:00
Bailey Pumfleet 3d725a9573
Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts
Removed selectedEventType + fixed missing booking.eventTypeId
2021-08-16 10:22:38 +01:00
Peer_Rich 83bef7d95e
Merge pull request #448 from femyeda/team-pages
Team pages
2021-08-15 18:44:42 +02:00
femyeda 19ef588fa5 fix issue where client side vali
dation not happening

show error message from server
2021-08-15 09:22:05 -05:00
Femi Odugbesan 65366b7c5b
cal-101-caldav-integration (#419)
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
2021-08-14 20:53:59 -05:00
Alex van Andel 03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel 92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya 4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda 216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
Bailey Pumfleet da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01:00
nicolas 5a5e61739b Removed faulty check 2021-08-08 21:41:02 +02:00
nicolas 560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Alex van Andel 8bc209f6d0 Attempts to fix conflict with zoom 2021-08-04 21:04:23 +00:00
Alex van Andel 72b62cd49a Removed selectedEventType + fixed missing booking.eventTypeId 2021-08-04 20:03:20 +00:00
Peer_Rich 6977b74f35
Merge pull request #411 from alishaz-polymath/main
Added 'Add Guest' button at the confirm booking step
2021-08-04 20:17:30 +02:00
Syed Ali Shahbaz 00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Alex van Andel 78de56b7f5 Missing dayjs().isBetween plugin + format Z explicitly 2021-08-03 10:14:20 +00:00
nicolas bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
nicolas 65fd733751 Use optional udi 2021-07-25 17:08:11 +02:00
nicolas 4fb8e8285e Added location to event 2021-07-25 16:29:06 +02:00
nicolas df161d5498 Added location to bookings table 2021-07-25 14:37:22 +02:00
nicolas a97862d4b8 Process event location in EventManager 2021-07-25 14:19:49 +02:00
nicolas 86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
Alex van Andel 9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Bailey Pumfleet 02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking
Feature/opt in booking
2021-07-22 11:30:48 +01:00
nicolas e0abbbb2f1 Fixed linting errors 2021-07-20 20:18:26 +02:00
nicolas 7aff32fb50 Only send single mail when booking zoom 2021-07-20 20:07:59 +02:00
Alex van Andel 7098e75841 Fixes 404 issue with slug when trailing whitespaces exist 2021-07-20 13:27:36 +00:00
Malte Delfs 0c975cdcbc fixed codacy issues 2021-07-18 21:22:39 +02:00
Malte Delfs f5516ed427 added reminder emails for opt-in bookings 2021-07-18 21:12:35 +02:00
Malte Delfs a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas 81e1287693 Fixed cancellation 2021-07-18 16:03:59 +02:00
nicolas b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
nicolas b146b80778 Fixed signature 2021-07-15 23:34:55 +02:00
Femi Odugbesan 45689059c7
Feat/cal 95/date range on event types (#353)
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
2021-07-15 09:10:26 -05:00
nicolas daecc1e0e4 Created EventManager in order to unify event CRUD logic 2021-07-15 03:19:30 +02:00
Alex van Andel 4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Alex van Andel 5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Femi Odugbesan 36b258f4b7
safely check user availability (#352) 2021-07-09 10:55:02 -05:00
Femi Odugbesan 5c4a9c32d1
Add application logger (#332)
* add application logger

* use logger
2021-07-09 10:49:42 -05:00
Femi Odugbesan 2f73997e72
safely check isAvailable (#331)
fix issue where checking availability throws an error
2021-07-07 11:53:33 -05:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet ad00e5fc0c
Merge pull request #333 from mihaic195/fix/teams-create-error-and-unauthenticated-request
Team API error and page
2021-07-07 10:56:16 +01:00
Bailey Pumfleet 43f899582f Fix issue where user ID is not fetched 2021-07-06 22:09:53 +01:00
mihaic195 e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request 2021-07-05 10:18:28 +03:00
mihaic195 6463b3ba37
fix codacy suggestions 2021-07-01 12:47:12 +03:00
Mihai C b91d021fc8
Update pages/api/teams.ts
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:29:55 +03:00
mihaic195 e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team 2021-06-30 16:48:34 +03:00
Alex van Andel 8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Bailey Pumfleet 3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user
hotfix for api/book/user
2021-06-29 17:20:49 +01:00
Malte Delfs dfb9870894 hotfix 2021-06-29 18:17:09 +02:00
Bailey Pumfleet 51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01:00
Bailey Pumfleet 099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +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
femyeda d1bdac45eb dont allow user to book a past date 2021-06-28 19:39:08 -05:00
nicolas f918f220eb Fixed Zoom Auth 2021-06-29 02:21:08 +02:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Malte Delfs b5b480f7e2 hotfix for booking 2021-06-26 19:48:24 +02: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
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