833adaf7e9
Revert "The booker get’s the Ui option to reschedule but can’t reschedule ( #3061 )"
...
This reverts commit 8cfc91df95
2022-06-15 09:24:12 -06:00
8cfc91df95
The booker get’s the Ui option to reschedule but can’t reschedule ( #3061 )
2022-06-15 13:51:53 +01:00
ecea455b7f
Flicker on booking success page ( #3063 )
2022-06-15 13:50:22 +01:00
514fca7a53
Recurring event improvements ( #2750 )
...
* Loading state and rejected bookings gone
* Listing fixes
* Tweaking upcoming vs recurring bookings tabs
* Tweaking new emails to avoid recurringEvent param
* Tweaks to support recurring events in common flows
* Missed one renderEmail
* Removing uneeded references
* Reverting manual plural fixes
* Refactoring recurring event strings
* Correcting merge issues
* Relying on newly introduced obj
* Fixing mobile
* Final tweaks
* Latest fixes
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-10 17:38:06 -03:00
b11398f551
Recurring event fixes ( #3030 )
...
* Incorporates recurringEvent into calEvent
* Recurrent event fixes
* Update event.ts
* type fixes
* Update zod-utils.ts
* Adding more recurringEvent to calEvent and other fixes
* Moving away from heavy 3rd party enum
* Fixing test
* Renaming as suggested and fixes
Co-authored-by: Leo Giovanetti <hello@leog.me>
2022-06-09 18:32:34 -06:00
abe5d53fc1
Disable dark mode on the success page only for the organizer ( #3001 )
...
* disable darkmode only for organizer
* disable dark mode when user comes from user dashboard
* move Theme to shell
* fix build errors
* sort dates for recurring bookings
* new parameter if user comes from booking an event
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-08 16:02:09 +02:00
983c970069
Add more variables to event names and a dynamic field ( #2898 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-06-06 08:48:13 -04:00
f0a5b7734f
[Hotfix]Fixes 3 issues related to 404 links ( #2977 )
2022-06-06 09:41:11 +00:00
456a4ba581
Telemetry improvements ( #2935 )
...
* next-collect initial setup
* naming changes
* WIP
* WIP: added cookie name
* telemetry update
* fixes
* telemetry eventTypes fix
* tmp jitsu config for testing
* tmp jitsu key update (for tests)
* deploy commit
* cookieName fixes
* telemetry credentials update
* NextCollect updated to latest canary; added TELEMETRY_KEY to config
* TELEMETRY_KEY fix
removed browser_user_agent field from event
* removed _middleware.ts for test deploy
* _middleware.ts restored
* next-collect version bump
* yarn.lock fix
* Added license consent property, set default telemetry endpoint
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Updated to latest version of next-collect
* - Updated to latest version of next-collect
- Few improvements in event collection: isTeamBooking for all events, page_url for all events
- Do not send second page event on re-render of /team/[slug]
* Revert booking confirmed tracking
* Applied prettier + fix lint
Co-authored-by: Art Sk <kirsan007@gmail.com>
2022-06-02 10:19:01 -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
445cdd7cbf
Fix @calcom/embed-react installation with TS project ( #2870 )
2022-05-27 09:37:02 -06: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
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
0153bc583a
Type fixes
2022-05-17 15:32:54 -06:00
1c4d2fae56
Fixes infinite loop
2022-05-17 10:53:10 -06:00
3421af10a9
Apply suggestions from code review
2022-05-16 12:36:26 -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
06702aa48a
E2E and paid bookings fixes
2022-05-11 14:36:38 -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
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
819c6c96e8
Build fixes
2022-05-09 14:05:57 -06:00
f79fd36c03
Merge branch 'production'
2022-05-09 13:58:18 -06: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
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
f1bed08c13
feature/space-booking-app ( #2673 )
...
* Reschedule for dynamic events
* Fix lint
* feature/space-booking-app initial commit
* added loom video and fixes for main branch
* Revert previous commmit
* Renames spacebookingother to spacebooking
* Type and perf improvements
* Updated comment
* Update seed-app-store.ts
Co-authored-by: zomars <zomars@me.com>
2022-05-03 22:07:17 -06:00
2cb663cd6a
feature/space-booking-app ( #2673 )
...
* Reschedule for dynamic events
* Fix lint
* feature/space-booking-app initial commit
* added loom video and fixes for main branch
* Revert previous commmit
* Renames spacebookingother to spacebooking
* Type and perf improvements
* Updated comment
* Update seed-app-store.ts
Co-authored-by: zomars <zomars@me.com>
2022-05-04 04:06:20 +00:00
11f6972ec9
feat(app-store): Add Giphy app ( #2580 )
2022-05-02 16:21:11 -06:00
21867c9cd4
feat(app-store): Add Giphy app ( #2580 )
2022-05-01 21:42:35 +01:00
93c75b5fef
Embed Miscellaneous Improvements and Fixes ( #2499 )
2022-04-25 10:03:00 +05:30
5f57694148
Fix Mobile UI for Booking Availability Page. Make it consistent with booking page ( #2533 )
2022-04-17 13:25:11 +02:00
3c6ac395cc
Feature/reschedule bookings ( #2351 )
...
* WIP bookings page ui changes, created api endpoint
* Ui changes mobile/desktop
* Added translations
* Fix lib import and common names
* WIP reschedule
* WIP
* Save wip
* [WIP] builder and class for CalendarEvent, email for attende
* update rescheduled emails, booking view and availability page view
* Working version reschedule
* Fix for req.user as array
* Added missing translation and refactor dialog to self component
* Test for reschedule
* update on types
* Update lib no required
* Update type on createBooking
* fix types
* remove preview stripe sub
* remove unused file
* remove unused import
* Fix reschedule test
* Refactor and cleaning up code
* Email reschedule title fixes
* Adding calendar delete and recreate placeholder of cancelled
* Add translation
* Removed logs, notes, fixed types
* Fixes process.env types
* Use strict compare
* Fixes type inference
* Type fixing is my middle name
* Update apps/web/components/booking/BookingListItem.tsx
* Update apps/web/components/dialog/RescheduleDialog.tsx
* Update packages/core/builders/CalendarEvent/director.ts
* Update apps/web/pages/success.tsx
* Updates rescheduling labels
* Update packages/core/builders/CalendarEvent/builder.ts
* Type fixes
* Update packages/core/builders/CalendarEvent/builder.ts
* Only validating input blocked once
* E2E fixes
* Stripe tests fixes
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: zomars <zomars@me.com>
2022-04-14 15:25:24 -06:00
eceba51020
Dynamic group booking follow-up ( #2430 )
2022-04-08 17:50:10 +01:00
c63d81719b
Embed Improvements ( #2365 )
...
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-08 05:33:24 +00:00
31a8f25bb6
Fix E2E Tests and Fix broken success page and non existing user URL ( #2411 )
2022-04-07 08:34:19 +01:00
d1ffd1edae
dynamic group links ( #2239 )
...
* --init
* added default event types
* updated lib path
* updated group link design
* fixed collective description
* added default minimum booking notice
* Accept multi user query for a default event type
* check types
* check types --WIP
* check types still --WIP
* --WIP
* --WIP
* fixed single user type not working
* check fix
* --import path fix
* functional collective eventtype page
* fixed check type
* minor fixes and --WIP
* typefix
* custominput in defaultevent fix
* added booking page compatibility for dynamic group links
* added /book compatibility for dynamic group links
* checktype fix --WIP
* checktype fix
* Success page compatibility added
* added migrations
* added dynamic group booking slug to booking creation
* reschedule and database fix
* daily integration
* daily integration --locationtype fetch
* fixed reschedule
* added index to key parameter in eventtype list
* fix + added after last group slug
* added user setting option for dynamic booking
* changed defaultEvents location based on recent changes
* updated default event name in updated import
* disallow booking when one in group disallows it
* fixed setting checkbox association
* cleanup
* udded better error handling for disabled dynamic group bookings
* cleanup
* added tooltip to allow dynamic setting and enable by default
* Update yarn.lock
* Fix: Embed Fixes, UI configuration PRO Only, Tests (#2341 )
* #2325 Followup (#2369 )
* Adds initial MDX implementation for App Store pages
* Adds endpoint to serve app store static files
* Replaces zoom icon with dynamic-served one
* Fixes zoom icon
* Makes Slider reusable
* Adds gray-matter for MDX
* Adds zoom screenshots
* Update yarn.lock
* Slider improvements
* WIP
* Update TrendingAppsSlider.tsx
* WIP
* Adds MS teams screenshots
* Adds stripe screenshots
* Cleanup
* Update index.ts
* WIP
* Cleanup
* Cleanup
* Adds jitsi screenshot
* Adds Google meet screenshots
* Adds office 365 calendar screenshots
* Adds google calendar screenshots
* Follow #2325
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* requested changes
* further requested changes
* more changes
* type fix
* fixed prisma/client import path
* added e2e test
* test-fix
* E2E fixes
* Fixes circular dependency
* Fixed paid bookings seeder
* Added missing imports
* requested changes
* added username slugs as part of event description
* updated event description
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-06 10:20:30 -07:00
c07b9b96fe
Add translation for rediret string ( #2399 )
...
* Add translation for rediret string
* Simplify translations
* Update success.tsx
Co-authored-by: zomars <zomars@me.com>
2022-04-06 16:21:42 +00:00
41755c8c90
fixed redirect banner for mobile ( #2388 )
...
* improved redirect banner on success page
* changed text for redirect input box
* nit
* Updates submodules
* Update yarn.lock
Co-authored-by: zomars <zomars@me.com>
2022-04-06 12:26:08 +00:00
d76b9b0d01
Feature: Support redirecting to an external URL on successful booking ( #2087 )
2022-04-05 08:05:40 +00:00
4a58da62d6
[Feature]Booking Embed ( #2227 )
2022-03-31 09:45:47 +01:00
39d395bf62
Reverted to pre-dialog content ( #2189 )
2022-03-17 19:21:47 +00:00
bcbf8390e0
Refactor old dialog to radix Dialog ( #2151 )
...
* --init
* refactored more dialogs --WIP
* more modals replaced by dialogs --WIP
* fix for new dialog location import
* --WIP
* lint fix
* final dialog refactor
* added more width to max-w for dialog in sm screen
* clean-up
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-17 13:20:49 +00:00
558897fe53
Migrates components and libs to packages ( #2172 )
...
* Migrates Dialog to ui package
* Migrates Alert to ui
* Migrate Button to ui
* UI and lib migrations
* Add missing imports
* Update Error.tsx
2022-03-16 16:36:43 -07:00
8c4eed2bbc
Add "light-brand" and "dark-brand" colors (add a second color picker) ( #2028 )
...
* init dark brand color addition
* added dark mode css vars
* added contrast brand colors
* minor fixes
* added dark branding to loader, button
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-05 15:37:46 +00:00
b860a79d59
Detect users browser locale for time format 12/24 hours ( #1900 )
...
* fix: adds new isBrowserLocal24h timeFormat util, uses in BookingPage
* fix: adds new time format locale detector in available times
* fix: removes 24h clock from availabletimes
* chore: move timeFormat to lib util, add to payment page
* chore: remove commented out is24h
* fix: adds timeFormat to success page
* fix: adds timeFormat to cancel page
* fix: adds timeFormat to video meeting ended/not started pages
* fix: removes added typo in success page
* fix: reverts back to use of is24h Switch in available times / time options, renames timeFormat to detectBrowserTimeFormat to avoid collisions
* fix: moves use uf isBrowserLocal24h() to clock util initClock() itself, by calling it only if no localStorage settings are set
* chore: move back timeFormat props to line it was so no change
* chore: remove empty line in timeOptions
* chore: move back timeFormat where it was in TimeOptions props
* chore: add back empty line before selectedTimeZone return
* fix: reverts back to use of is24h in payments page
* feat: adds browser locale as default in payment page in case there's no settings set by the customer
* feat: adds browser locale as default in success page
* fix: deconstruct props so eslint passes
* fix: lint issue for extra empty line in meeting-ended uid page
Co-authored-by: Agusti Fernandez <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-23 12:37:15 +00:00
228dea1308
Hotfix for success page email input and button ( #1854 )
...
* hotfix
* cleanup
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-16 11:33:16 +00:00
038e8a4b7d
Runs prettier
2022-02-10 14:22:45 -07:00
0bc511a886
Migrated cal.com to apps/web
2022-02-10 14:22:45 -07:00
zomars