33a45a8af5
Installed Apps page revamp ( #2751 )
...
* First round of changes
* Some missing styling
* Last round of core changes
* Color tweaks
* Improving code readability
* Reverting unneeded changes
* Reverting yarn.lock
* Removing yarn.lock
* Empty state updated
* Fixing webhook test
* Cleaning up code
* Fixing test and simplifying code a bit
* Merging API Keys into developer section
* Unifying Empty Screen with monorepo version
* Cleaning up
* Installed apps logic consistency + cleaning up
* Type fixes
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
* Improvements, still WIP
* Update apps/web/pages/apps/installed.tsx
Co-authored-by: Omar López <zomars@me.com>
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* App active install status
* Apple Calendar setup, Daily.co preinstalled
* Final pass
* Minor tweaks
* Conflicts with migration ignored
* Fixing merge
* Fixing merge yet again
* Adopting main changes
* Removing unneeded data-testid
* Fixing reported bugs
* Simplifying webhook query
* Moving teams settings tab to second
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-01 14:24:41 -03:00
6145c7ad90
Bug - Admin Shell Duplicated ( #2933 )
...
* Fix additional shell in admin
* Update headings
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-05-31 14:36:20 +01:00
3af6b3b6b3
Update event.ts
2022-05-30 14:43:15 -06:00
0761e8664a
Add reschedule reason to DB and emails ( #2909 )
...
* Write reschedule reason to db
* Add reschedule reason to emails
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Add reschedule reason to request reschedule email
* Write reschedule reason to db
* Add reschedule reason to emails
* No longer using rescheduleReason in favor of cancellationReason
* Update apps emails accordingly with reschedule reason
* Update reschedule.test.ts
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-30 13:40:29 -06:00
375517486c
Fix booking detail page for cancelled events ( #2905 )
...
* fix booking detail page for cancelled events
* Fix typo
* fix bug when now attendees exist in booking
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-05-30 20:17:50 +02:00
b22c562719
Allow less than 6 bookings and add proper min validation of 2+ ( #2921 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 09:46:05 -06:00
e493b16466
Payment amount input leading 0 ( #2836 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
2022-05-30 09:28:32 -06:00
a15fe78ddb
Cleanup & removed usages of sparingly used Text/ files ( #2904 )
2022-05-30 11:36:23 +02:00
e270be1b87
Fix event-type preview links on Vercel Previews ( #2919 )
...
* Fix website url
* Fix avatar paths everywhere
* Fix linting errors
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 07:57:48 +00:00
8fe969d3b8
remove unsed imports ( #2895 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 05:19:22 +00:00
7b01bae829
Change location of booking ( #2658 )
...
* add functionality to change location in booking and send out mail
* add i18n
* change location with dropdown like in event-types
* small fixes and code clean up
* clean code
* improve format of current Location string
* clean code
* clear selection when dialog closed
* added mutation and changed props (first working verison)
* clean code
* clean code
* clean code
* clean code
* fix typo
* change maxHeight of select
* use useWatch for selectedLocation
* pass default values with props
* set current location directly in useState
* clear selected values when updating location
* fix trpc query for credentialst
* change icons for editing booking
* improve naming of variables
* remove unnecessary orderBy
* use locationOptionsToString method
* fix current location naming for Cal Video
* add phone input
* save phone number as location of booking
* remove input field for phone number for event-types
* fix redirection issue
* show previous selected location in event-type
* remove attendee number from selection for booking
* make first letter of location lowercase
* remove input field for attendee phone number
* clear Errors when changing location type
* set location details to optional
* clean code
* fixing issue that dropdown doesn't close when dialog opens
* clean code
* make overflow visibile in dialog
* fix existing bug with address not showing in event-type settings
* fix issue with losing focus after validation
* close rejection dialog
* small spelling fixes
* fix issue with LocationChangeEmail
* fix failing E2E test
* fix failing E2E test
* fix E2E test
* bug fix for saving user phone, and other minor changes
* merge main
* improve text
* fix UI of booking list
* Delete admin
* remove selection after update and submit
* add translation for error message
* add default values for checkbox
* add "your phone number" to locations on booking page
* remove duplicate attributes from viewer.bookings
Co-authored-by: Omar López <zomars@me.com>
* check if user is authorized to make changes to booking
* remove location string
* clan code for displayLocaitonPublicly checkbox
* fetch locationOptions on server side
* remove trpc query for credentials
* fix phone number input
* fix labels of host and attendee phone number for booking page
* Migrates edit location to tRPC
* Link elemnt should only be used in `a` tags
* Adds missin router
* Migrates locationOptions to tRPC query
* Type fixes
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-27 23:27:41 +00:00
445cdd7cbf
Fix @calcom/embed-react installation with TS project ( #2870 )
2022-05-27 09:37:02 -06:00
9df4867fca
License server ( #2379 )
...
* WIP License server
* WIP
* Moves locations to App Store and Core
* LocationType fixes
* Runs db migrations post-deploy
* WIP
* WIP
* Cleanup
* WIP
* WIP
* Decouples translations from NavTabs
* Adds admin submodule
* Adds admin submodule
* Sync dependencies
* WIP
* WIP
* Updates submodules
* Renames package
* Updates submodules
* Adds scripts for console
* Updates license checker URL
* Updates admin
* Adds staging/prod admin console links
* Update yarn.lock
* Update NavTabs.tsx
* WIP
* Update admin
* WIP
* Adds hint to InputField
* Update admin
* Adds turbo admin dependecies
* Update admin
* Prevents redirection on form submit
* Form warning fixes
* Update admin
* Form fixes
* Update yarn.lock
* Update admin
* Update admin
* Update admin
* Adds withLicenseRequired HOC
* Adds LicenseRequired to EE components
* Admin deploy fix?
* Updates submodules
* Use relative inside lib
* type fixes
* Fixes turbo race condition
* Relocates admin to console
* Relocates admin to console
* Update console
* Update api
* Update turbo.json
* Update ErrorBoundary.tsx
* Update defaultEvents.ts
* Update checkLicense.ts
* Update yarn.lock
* Skip on E2E
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-26 11:07:14 -06:00
6940c8d6cc
Redundant conditional expression ( #2894 )
...
* remove redundant conditional expressions
* remove redundant conditional expressions
2022-05-26 16:41:05 +00:00
c67338bb3f
Fix bug to check opt in bookings ( #2889 )
...
* Fix bug to check opt in bookings
* Implemented value, onChange instead of form access
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-05-26 16:24:19 +01:00
40c81ee405
Fix 500 errors if data is invalid ( #2886 )
2022-05-26 08:38:10 +00:00
7c3090bc23
Feat/Display location information publicly ( #2752 )
...
* Updating checkbox field to reflect new designs
* Include Infobadge option checkbox
* Checkbox Field + i18n
* Default checked - true
* Sync with router
* Extracting Types
* Update filtering logic
* Add UI to booking page
* Default address/link
* Update hashedlink page
* Tidy up
* Video icon
* Add nullish check
* Update to use RHF controller
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-25 14:34:08 -06:00
1bf009f5f5
Disable Impersonation Option ( #2880 )
...
* Disable Impersonation
* Update Description Copy
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-25 15:21:18 +00:00
07aa2e88a1
fixes issues with date of recurring events on booking detail page ( #2872 )
...
* fixes date not showing for confirmed recurring event
* only show all events on upcoming bookings
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2022-05-25 11:24:01 +02:00
7548233a96
sec-001 fixes ( #2866 ) ( #2867 )
...
* sec-001 fixes (#2866 )
* sec-001 fixes
* Typo
* Fixes paid bookings
# Conflicts:
# apps/web/ee/components/stripe/Payment.tsx
2022-05-24 19:29:29 -06:00
eacfdac016
fixed labels for seats, removes shadow from event-type inputs ( #2862 )
...
* fixed labels for seats
* minor fixes, removed shadow from all event-type inputs
* Render input field on pro accounts (#2859 )
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
2022-05-24 22:15:53 +02:00
c8d6c0dbdd
Add seats to event types ( #2485 )
...
* Add seatsPerTimeSlot to event type schema
* Add seats per time slot to event type form
* Book event and render seats
* Pass booking uid for seats
* Disable requires confirmation if seats are enabled
* Fix type errors
* Update submodules
* Fix type errors
* Fix type errors
* Fix duplicate string
* Fix duplicate string
* Fix schema and migration file
* Fix render seats
* Fix bookinguid typos
* Remove console.log
* Fix type error
* Fix mobile formatting
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/lib/hooks/useSlots.ts
Co-authored-by: Omar López <zomars@me.com>
* Added translation for seats available text
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: alannnc <alannnc@gmail.com>
2022-05-24 15:19:12 +02:00
f0a36f8194
Fix infinite renders on event-type edit page ( #2820 )
2022-05-23 18:59:09 +01:00
7d7a1c5bbc
Fix login page CTA disabled state ( #2832 )
...
* fix(ui/login): better disabled state for login CTA
The fix involves tracking the form submission with a dedicated state `submitInProgress` with React.
`formState` from `react-hook-form` does not take time taken for the network call into account. For example,
if the api takes 5 seconds to complete, we would expect the `formState.isSubmitting` to be true for `5`
seconds. But, surprisingly this is not the case and `formState` from `react-hook-form` resolves
immediately after it makes a successful connection to the endpoint.
A dedicated state (with `useState`) is introduced that is enabled when the user clicks on the login CTA, and disabled when the api call is resolved, either successfully or with an error.
* Update login.tsx
* Update login.tsx
* Fixes isSubmitting state
Co-authored-by: zomars <zomars@me.com>
2022-05-23 17:20:35 +00:00
3a1d8b8183
Merge production to main
2022-05-23 09:29:19 -06:00
38f23986ad
Hotfix: Fixing Security Issues ( #2848 )
...
* Fixing Privilege Escalation
* Fixing critical obj ref in availability
* Fixing reschedule security issue
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-23 11:29:29 +00:00
27422c351c
Fix UI of dialog ( #2788 )
...
* removed large mandatory height and scroll
* added z index using css
* cleanup
* fixed TS errors
* extract dialog out of dropdown
* Adds custom loading text to confirmation dialog
* rename update
* utilizing mutation loading state
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-23 13:17:00 +02:00
c5ad74f61c
Request the inclusion Assuncion Time Zone ( #2840 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
2022-05-23 13:12:41 +02:00
2560b72596
Wrong username is identified if query params are present and user doesn't exist ( #2838 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
2022-05-23 12:34:11 +02:00
7d7c61a1ab
Adding labels ( #2783 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-23 09:11:04 +01:00
ba9be4e69d
Fix login submit ( #2849 )
2022-05-22 14:28:18 +02:00
e62af90619
fixes dynamic color and typefix for tfunction after react upgrade ( #2821 )
2022-05-20 07:06:21 +00:00
4b6c701c48
save additional inputs as json + view details of booking ( #2796 )
...
* move custom inputs from description to own json object
* show custom inputs on success page
* fix type error
* add custom inputs to email and webhook
* add custom inputs to all emails
* add values for custom inputs when rescheduling
* add custom input everywhere description is shown
* fix bug with boolean value
* fix issues with null values
* disable custom inputs and add notes for organizer
* don't show custom input with empty string
* don't show custom inputs with empty string in calender event and email
* add link to booking details page
* redirect to success page to see booking details
* add functionality to cancel and reschedule booking
* fix bookings that require confirmation
* clean code
* fix infinite lopp in useEffect of success page
* show web conference details message when integration as location
* improve design of cancelling event
* clean code
* disable darkmode for organizer on booking details page
* fix dark mode for cancelling booking
* fix build error
* Fixes infinite loop
* Fixes infinite loop
* Fixes infinite loop
* Update all Yarn dependencies (2022-05-16) (#2769 )
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
* Create ci.yml
* Update ci.yml
* Reintroduces typescript-eslint
Buckle up!
* Type fixes
* Update ci.yml
* Update api
* Update admin
* Reusable inferSSRProps
* Linting
* Linting
* Prisma fixes
* Update ci.yml
* Cache testing
* Update e2e.yml
* Update DatePicker.tsx
* Update e2e.yml
* Revert "Linting"
This reverts commit adf817766e1b59dacd64#2803 )
* Fix missing tabs - Embed (#2804 )
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
* Add import statement (#2812 )
* Add import statement
* Update apps/docs/next.config.js
Co-authored-by: Omar López <zomars@me.com>
* Show success page if booking was deleted on calendar (#2808 )
* Add exception to 410
* Fix type error
* Add GoogelCalError type
* only show invite link for app.cal.dev (#2807 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
* fix: update eslint config to test .ts and .js separately (#2805 )
* fix: update eslint config
* fix: update ts ignore
* fix: update eslint config
* Update TeamAvailabilityScreen.tsx
* Type fixes
* Update useIntercom.ts
Co-authored-by: Omar López <zomars@me.com>
* fix: sync api to latest commit (#2810 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Embed React improvements (#2782 )
* Add off support. Add getApi export.
* Add publish command
* Add embed-snippet in prod deps
* Update README
* Update package.json
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Consolidates test-results
* Type fixes
* Abstracts minimal booking select
* Type fixes
* Update listBookings.ts
* Update common.json
* Update bookingReminder.ts
* Consolidates isOutOfBounds
* Update webhookResponse-chromium.txt
* Update TableActions.tsx
* Type fixes
* Update BookingPage.tsx
* Update webhookResponse-chromium.txt
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-18 15:05:49 -06:00
821105dccb
Add team Id to hash url ( #2803 )
2022-05-18 08:59:23 -06:00
0153bc583a
Type fixes
2022-05-17 15:32:54 -06:00
db01f7be19
Update all Yarn dependencies (2022-05-16) ( #2769 )
...
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-17 19:31:49 +00:00
683e8c4490
Fixes infinite loop
2022-05-17 11:10:57 -06:00
1c4d2fae56
Fixes infinite loop
2022-05-17 10:53:10 -06:00
84967e5cdf
Add login event ( #2784 )
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-05-17 17:22:57 +01:00
676268b62d
2FA submit disabled ( #2790 )
2022-05-17 14:15:57 +01:00
ad126efee8
Add Google cal extneral calendar id to booking reference ( #2671 )
...
* Set google cal event id to use our uid
* Save calendar external id to bookingRef
* Pass external calendar ids to update and delete
* Create migration
* Fix type errors
* Fix prisma url
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-16 14:20:09 -06:00
81d917e27a
Alert to describe exclusion of options ( #2770 )
...
* Alert to describe exclusion of options
* Update apps/web/pages/event-types/[type].tsx
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/components/eventtype/RecurringEventController.tsx
Co-authored-by: Omar López <zomars@me.com>
* Formatting
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-16 18:50:53 +00:00
3421af10a9
Apply suggestions from code review
2022-05-16 12:36:26 -06:00
f75917d9c4
Update apps/web/pages/apps/categories/[category].tsx
2022-05-16 12:26:19 -06:00
7d1b13c88d
Typo
2022-05-16 12:17:28 -06:00
9c52e195ea
Fix adds redirect callback that support app.cal.com ( #2768 )
...
* Fix adds redirect callback that support app.cal.com
* Update apps/web/pages/api/auth/[...nextauth].tsx
Check origin of website and baseurl
Co-authored-by: Omar López <zomars@me.com>
* fix: lint issue extra space removed
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:44:44 +00:00
e4c5df7a2e
remove redundant conditional expressions ( #2756 )
...
* remove redundant conditional expressions
* remove redundant conditional expression
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
2022-05-16 11:26:32 -06:00
2eae40eff2
Readd steps to create a new user #2665 ( #2759 )
...
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
2022-05-16 11:23:40 -06:00
9e662aa202
Mutually exclusive options ( #2755 )
...
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:15:09 +00:00
f2a6d00348
Fix/unpaid unconfirmed ( #2553 )
...
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/book/event.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Update apps/web/pages/api/integrations.ts
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
* Fix merge errors
* Errors prettier/prettier
* Update apps/web/pages/api/book/confirm.ts
Co-authored-by: alannnc <alannnc@gmail.com>
* Modal window before delete stripe integration
* ESLint Report
* Test fixes
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-16 10:27:36 -06:00
Leo Giovanetti