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
1fb637d29d
Fix missing tabs - Embed ( #2804 )
...
* Fix missing tabs
* Fix Eslint error
* Fix Eslint errors
2022-05-18 09:04:50 -06:00
8545bfef67
Update DatePicker.tsx
2022-05-17 22:02: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
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
c05040795d
Typo
2022-05-16 12:20:40 -06:00
7d1b13c88d
Typo
2022-05-16 12:17:28 -06:00
9bd1246ada
Squashed commit of the following:
...
commit 27540b09ce#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
commit ae15a7d7392a5a89fe502ce1e78053#2725 )
* Merge pull request #2672 from calcom/main
v1.5.4
* Turbo fixes
* Make apps single pages public
* Fix preview.html not built and thus served during depooy (#2713 )
* Hotfix: Success page layout broken due to duplicate "When" (#2716 )
* Update BookingPage.tsx
* Reverting unchaged lines
* Fixing recurrenceRule for ICS files
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
commit 2d6d1cb444#2716 )
commit ef68f4f4f8#2713 )
commit 18c28cc3fdd40e8caff93161cc4d45ed808c3be4099a477ded808c3be6#2672 from calcom/main
v1.5.4
2022-05-16 12:00:04 -06:00
60c97c9fa9
respect local set timezone and update url on mismatch ( #2506 )
...
* ensure `timeZone()` will make its way to the URL
fixes https://github.com/calcom/cal.com/issues/2482
* keep `timeZone()` and the offset from URL in sync
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-16 17:57:53 +00: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
7fd149fd2e
Users Phone Number Option ( #2669 )
...
* Users Phone Number Option
* Implemented improvments
* Add validation to form
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-16 09:50:12 -06:00
2655f816af
Fix white border ( #2761 )
2022-05-16 12:38:22 +00:00
016023fa50
Added check on create eventtype to see is user has slug that already exists ( #2757 )
...
* Added check on create eventtype to see is user has slug that already exists, added error check on onError
* revert yarn.lock back
* Catches prisma known error instead of making an additional query
Co-authored-by: zomars <zomars@me.com>
2022-05-15 03:41:39 +00:00
2a53614723
Fix/avoid multiple schedule deletions ( #2602 )
...
* Prevents users from deleting the same schedule multiple times due to delay before the schedule disappears. It also applies the same fix to team disband.
Schedule deletion:
Team disband:
Fixes issue [#2569 ](https://github.com/calcom/cal.com/issues/2569 )
Bug fix (non-breaking change which fixes an issue)
**apps/web/components/LightLoader.tsx** → this file was created in order to make a light color loading spinner available. It's necessary when we need to display a loading spinner above dark backgrounds.
**apps/web/components/availability/ScheduleListItem.tsx** → this component was created in order to give a schedule list item its own state.
* Removing a "setTimeout" that was only used for testing purposes
* Adding a code review suggestion to my modifications
* Changing loading style
* Cleanup
* Avoids using unnecessary state
* Revert "Adding a code review suggestion to my modifications"
This reverts commit b5e40062d7
2022-05-14 12:47:23 -06:00
212fd1bc14
Fixing ESLint warnings ( #2723 )
...
* Fixing warnings
* Reverting and disabling ESLint in some cases
* Reverting Next Images
* Reverting file, bad merge
* Targeting ESLint to line
* Additional warnings
* New warning squished
* More tweaks and major fixes
* Uneeded conf
Co-authored-by: Omar López <zomars@me.com>
2022-05-14 13:49:39 +00:00
2bb6f33112
E2E fixtures ( #2747 )
2022-05-13 21:02:10 -06:00
fb436996c0
Change date format for RecurringBookings ( #2707 )
...
* Change date format for RecurringBookings
* Missing bookingId query param
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-11 07:59:49 +00:00
746643bf8e
adds availability select loader ( #2718 )
2022-05-11 05:26:06 +00:00
65a69ef1e4
Add more embed events ( #2719 )
...
* Add more embed events
* Add more embed events
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-11 05:14:08 +00:00
6483182ef6
add invite link to Zapier setup page ( #2696 )
...
* add invite link and toaster to zapier setup page
* create env variable for invite link and save in database
* fetch invite link form getStaticProps
* add getStaticPath method
* clean code
* Moves app setup and index page
* Moves Loader to ui
* Trying new way to handle dynamic app store pages
* Cleanup
* Update tailwind.config.js
* zapier invite link fixes
* Tests fixes
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-11 04:58:10 +00:00
92806d5257
fixed /booking skeleton ( #2722 )
...
* fixed /booking skeleton
* nit
2022-05-10 16:59:23 +02:00
9440df4445
Make apps single pages public
2022-05-09 16:17:23 -06:00
e9ff358ac2
Update BookingPage.tsx
2022-05-09 13:59:45 -06:00
edd99cdeb2
Replaces member avatars with links to avatar.png endpoint ( #2708 )
...
* Replaces member avatars with links to avatar.png endpoint
* Replaced additional occurences
* Use WEBSITE_URL from @calcom/lib/constants instead
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 18:25:12 +00:00
9825754b32
Hotfix: blank page for booking embed in Incognito Chrome ( #2700 )
...
* Merge remote-tracking branch 'origin/main' into feat/success-url
* Fix localstorage access
* Fix Comments
* make custom eleemnt explicitly 100% in width to go full width in a flex type parent
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-09 18:12:47 +00:00
fb042a36b6
Fix Mobile UI for /settings/security ( #2703 )
...
* Fix Mobile UI
* Remove truncate
* Move buttons
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-05-09 13:43:27 +02:00
351622c4a2
Add Invalid Email Error ( #2637 )
...
* Add error message UI
* Add border color
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-05-09 08:24:39 +00:00
a05860515e
Form fixes
2022-05-06 15:44:51 -06:00
269dea70a1
fix: Booking page display time based on selected timezone ( #2691 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 19:28:09 +00:00
67cc3a6409
Embed Code Generator: Fix Preview HTML and Embed Lib path for production ( #2688 )
...
* Improve logging
* Improve logging
* Keep embed origin conigurable
* Make embed URL and embed origin conigurable through env
* Gitignore public embed
* Add fingerprint to preview as well
* Fix path
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-06 15:56:26 +00:00
65a76b96c6
Add missing info to success page ( #2680 )
...
* Add missing info to success page
* Remove console.logs
* Add localized format to time
2022-05-06 08:15:05 -06:00
1a79e0624c
Recurring Events ( #2562 )
...
* Init dev
* UI changes for recurring event + prisma
* Revisiting schema + changes WIP
* UI done, BE WIP
* Feature completion
* Unused query param removed
* Invalid comment removed
* Removed unused translation
* Update apps/web/public/static/locales/en/common.json
Thanks!
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Success page changes
* More progress
* Email text tweaks + test + seed
* Tweaking emails + Cal Apps support WIP
* No app integration for now
Final email and pages tweaks to avoid recurring info showed
* Missing comment for clarity
* Yet again, comment
* Last minute fix
* Missing tooltip for upcoming bookings
* Fixing seed
* Fixing import
* Increasing timeout for e2e
* Fixing any
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/pages/d/[link]/book.tsx
Co-authored-by: Omar López <zomars@me.com>
* Code improvements
* More code improvements
* Reverting back number input arrows
* Update BookingPage.tsx
* Update BookingPage.tsx
* Adds fallback for sendOrganizerPaymentRefundFailedEmail
* Type overkill
* Type fixes
* Type fixes
* Nitpicks
* Update success.tsx
* Update success.tsx
* Update success.tsx
* Fixing types
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-05 18:16:25 -03:00
26e46ff06c
fix: DatePicker to display the correct available hours ( #2686 )
2022-05-05 18:51:22 +00:00
174ed9f6d1
Embed Snippet Generator ( #2597 )
...
* Add support to dynamically change the theme
* Add Embed UI in app
* Update UI as per Figma
* Dynamicaly update Embed Code
* Get differnet modes working in preview
* Support Embed on EventType Edit, Team Link Fix and Mobile unsupported
* Fix auto theme switch in Embed Snippet generator
* Fix types
* Self Review fixes
* Remove Embed from App section
* Move get query after the middleware to let middleware work on it
* Add sandboxes in the document
* Add error handling for embed loading
* Fix types
* Update snapshots and fix bug identified by tests
* UI Fixes
* Add Embed Tests
* Respond in preview to width and height
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-05 08:29:49 -06:00
f1a2239c97
Linting and legibility
2022-05-04 15:28:58 -06:00
977ad141ee
Extracts useMeQuery to own hook
2022-05-04 15:28:58 -06:00
06f88eb5a3
Move method that gets the current user to a separate file
2022-05-04 15:28:58 -06:00
daf39a4095
Fix problem related to data types
2022-05-04 15:28:58 -06:00
257481bad5
Update restriction to change the role of other Owners
2022-05-04 15:28:58 -06:00
68e08f13a1
Change plain strings
2022-05-04 15:28:58 -06:00
3234898892
Add restrictions to protect the owners and change their roles
2022-05-04 15:28:58 -06:00
02b935bcde
Feat/zapier app ( #2623 )
...
* create basic app structure
* add zapierSubscription model to prisma.schema
* change column name triggerEvent to lower case
* add zapier functionality + enpoints + adjust prisma.schema
* add subscriptionType + refactor code
* add app store information
* create setup page to generate api key
* clean code
* add copy functionality in setup page
* clean code
* add apiKeyType and delte key when uninstalled or new key generated
* clean code
* use Promise.all
* only approve zapier api key
* clean code
* fix findValidApiKey for api keys that don't expire
* fix migrations
* clean code
* small fixes
* add i18n
* add README.md file
* add setup guide to README.md
* fix yarn.lock
* Renames zapierother to zapier
* Typo
* Updates package name
* Rename fixes
* Adds zapier to the App Store seeder
* Adds missing zapier to apiHandlers
* Adds credential relationship to App
* Rename fixes
* Allows tailwind to pick up custom app-store components
* Consolidates zapier_setup_instructions
* Webhook fixes
* Uses app relationship instead of custom type
* Refactors sendPayload to accept webhook object
Instead of individual parameters
* refactoring
* Removes unused zapier check
* Update cancel.ts
* Refactoring
* Removes example comments
* Update InstallAppButton.tsx
* Type fixes
* E2E fixes
* Deletes all user zapier webhooks on integration removal
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-03 23:16:59 +00:00
6a27fb2959
Fixes/app store keys in db ( #2651 )
...
* Adds available apps
* Adds App Model
* WIP
* Updates seeder script
* Seeder fixes
* lowercase categories
* Upgrades prisma
* WIP
* WIP
* Hopefully fixes circular deps
* Type fixes
* Fixes seeder
* Adds migration to connect Credentials to Apps
* Updates app store callbacks
* Updates google credentials
* Uses dirName from DB
* Type fixes
* Update reschedule.ts
* Seeder fixes
* Fixes categories listing
* Update index.ts
* Update schema.prisma
* Updates dependencies
* Renames giphy app
* Uses dynamic imports for app metadata
* Fixes credentials error
* Uses dynamic import for api handlers
* Dynamic import fixes
* Allows for simple folder names in app store
* Squashes app migrations
* seeder fixes
* Fixes dyamic imports
* Update apiHandlers.tsx
2022-05-02 14:39:35 -06:00
43944a7d31
Enable Autocomplete ( #2645 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-29 17:28:34 +00:00
8bdc137917
added animations for dialog and tooltip ( #2648 )
...
* added animations for dialog and tooltip
* Update .env.example
2022-04-29 17:17:34 +00:00
02fb15228b
Hotfix - change calendar error message ( #2643 )
...
* Change calendar error message
* Change calendar error message
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-28 20:45:27 +00:00
59a1db9068
Hash my url ( #2484 )
...
* disposable link model added
* disposable model updated
* added disposable slug availability page
* added disposable book page
* added disposable slug hook
* added disposable link booking flow
* updated schema
* checktype fix
* added checkfix and schema generated
* create link API added
* added one time link view on event type list
* adjusted schema
* fixed disposable visual indicator
* expired check and visual indicator added
* updated slug for disposable event type
* revised schema
* WIP
* revert desc
* revert --WIP
* rework based on change of plans
* further adjustments
* added eventtype option for hashed link
* added refresh and delete on update
* fixed update call conditions
* cleanup
* code improvement
* clean up
* Potential fix for 404
* backward compat for booking page
* fixes regular booking for user and team
* typefix
* updated path for Booking import
* checkfix
* e2e wip
* link err fix
* workaround for banner issue in event type update-test
* added regenerate hash check
* fixed test according to new testID
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-28 09:44:26 -06:00
d1082e55a4
consistency for tablet booking page ( #2640 )
2022-04-28 13:31:55 +02:00
Carina Wollendorfer
