20b7ac8c0d
feat: implement tiered Intercom chat system replacing Plain ( #23285 )
...
* feat: implement tiered Intercom chat system replacing Plain
- Add TieredIntercomChat component with customer tier detection
- Add IntercomContactForm for free users using Intercom API
- Add /api/intercom-conversation endpoint for free user support
- Update UserDropdown to use tiered chat logic
- Replace Plain chat with Intercom in app providers
- Remove all Plain chat components and related files
- Use useHasPaidPlan hook for customer tier detection
Paying customers see Intercom widget, free users see contact form
that creates conversations via Intercom API.
Co-Authored-By: peer@cal.com <peer@cal.com >
* fix: add missing environment variables to turbo.json globalEnv
- Add NEXT_PUBLIC_WEBAPP_URL, NEXT_PUBLIC_WEBSITE_URL, NEXT_PUBLIC_STRIPE_PUBLIC_KEY
- Add NEXT_PUBLIC_IS_E2E, NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE_MONTHLY
- Add NEXT_PUBLIC_BOOKER_NUMBER_OF_DAYS_TO_LOAD, NEXT_PUBLIC_STRIPE_CREDITS_PRICE_ID
- Resolves turbo/no-undeclared-env-vars ESLint errors blocking commits
Co-Authored-By: peer@cal.com <peer@cal.com >
* fix: resolve linting errors in platform examples base package
- Fix prettier/prettier formatting (quotes and comma)
- Add underscore prefix to unused variables
- Resolves CI failure in @calcom/base#lint check
Co-Authored-By: peer@cal.com <peer@cal.com >
* remove plain usage
* placement fixes
* fix: pop closing immediately issue
* stuff
* proper error and additional user info
* add key to .env.example and remove unused plain route
* fix conversation route
* refactor intercom dynamic provider
* code rabbit fixes
* feat: introduce tiered support feature flag
* fix: type check
* Apply suggestion from @coderabbitai[bot]
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com >
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-09-09 18:20:22 +09:00
Hariom Balhara
f905ae7502
fix: Add CSP back to login page ( #22688 )
...
* Middleware only logic to add CSP header as Next.js App Router doesnt allow setting header in server component
* add tests
* Remove nonce from Page Router and fix ts issues
* Add checkly test
2025-07-26 01:38:20 +01:00
Benny Joo
a43437b1d6
fix ( #20693 )
2025-04-14 16:54:25 +00:00
Benny Joo
b17b5a169f
perf: make useLocale hook to use server-fetched i18n if in App router context ( #20597 )
...
* write I18nProvider
* rename
* update useLocale
* fix
* use a singleton
* safer
* better
* fix e2e test 1
* fix e2e test 2
* fix e2e test 3
* fix e2e test 4
* fix
* refactor
* address comments
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix flaky test
* add more caching
* revert changes to e2e tests
* add jsdoc
* memoize
* update window object with new translations in /settings/my-account/general
* remove dead code
* only use locale and ns as deps
* fix
2025-04-11 14:28:26 -07:00
8ad442f2be
feat: Upgrade to Next 15 ( #18834 )
...
* wip
* update layoutHOC
* wip
* remove app router related code no longer used
* remove more
* await cookies, headers, params, serachparams
* update yarn.lock
* await cookies, headers, params, serachparams more
* update yarn lock again
* downgrade next-auth to 4.22.1
* update yarn lock
* fix
* update yarn lock
* fix type checks
* update yarn lock
* await headers and cookies
* restore pages folder
* restore yarn.lock
* update yarn.lock
* await headers and cookies
* remove
* await params in API routes
* updates
* restore next.config.js
* remove i18n from next.config.js
* Fixed tests
* Fixed types
* Removed duplicate favicon.ico
* Fixing more types
* ImageResponse moved to next/og
* Fixed prisma import issues
* dynamic import for @ewsjs/xhr
* remove deasync dep
* dynamic import for @tryvital/vital-node
* fix type checks
* add back turbopack command
* Type fix
* Removed unneeded file
* fix turbopack relative path errors
* add comments
* remove unneeded code
* Fixed build errors
* await apis
* use Promise<Params> type in defaultResponderForAppDir util
* refactor scim api route
* fix type checks
* separate app-routing.config into client-config and server-config
* wip
* refactor routing forms components
* revert unneeded changes for easier review
* fix
* fix
* use CustomTrans
* fix type
* fix unit tests
* fix type error
* fix build error
* fix build error
* fix build error
* fix warnings
* fix warnings
* upgrade @tremor/react and tailwindcss
* numCols -> numItems
* fix forgot-password e2e test
* fix 1 more e2e test
* fix login e2e test
* fix e2e tests
* fix e2e tests
* clean up
* remove error
* use tremor/react 2.11.0
* fix
* rename CustomTrans to ServerTrans
* address comment
* fix test
* fix ServerTrans
* fix
* fix type
* fix ServerTrans usages 1
* fix translations
* fix type checks
* fix type checks
* link styling
* fix
---------
Co-authored-by: Keith Williams <keithwillcode@gmail.com >
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com >
2025-03-20 21:30:51 -03:00
Hariom Balhara
564c84dade
fix: App theme being used in routing-form embed ( #19489 )
...
* fix wrong theme routing-form embed
* fix wrong theme routing-form embed
2025-02-28 23:50:46 +05:30
Benny Joo
6ea879f265
perf: run ssrInit() at root layout ( #19460 )
...
* wip
* remove ssrInit unneeded
* refactor
* revert unneeded changes
* update booking-page-wrapper layout
2025-02-25 06:08:23 -05:00
Benny Joo
aba7c6df7f
perf: move all booking pages into (booking-page-wrapper) route group ( #19321 )
...
* update useIsBookingPage
* move team pages into use-page-wrapper route group
* update imports
* fix type check
* update
* update
* remove isBookingPage configure from booking client components
* move all booking pages to use-page-wrapper route group
* add checkIfBookingPage util
* update layout
* update AppProviders
* improve comments
* update
* update pagesAndRewritePaths logic
* refactor
2025-02-23 10:13:11 +01:00
d027f8004a
perf: Move PlainChat up the hierarchy to remove rerenders ( #19255 )
...
* perf: Move PlainChat up the hierarchy to remove rerenders
* rmeove yarn lock
---------
Co-authored-by: Nizzy <nizabizaher@gmail.com >
Co-authored-by: nizzy <140507264+nizzyabi@users.noreply.github.com >
2025-02-12 19:13:54 +00:00
luzpaz
15334ff20b
fix: typos in apps/web ( #19194 )
...
Found via `codespell -q 3 -S "*.svg,./apps/web/public/static/locales,./packages/app-store/stripepayment/lib/currencyOptions.ts,./packages/lib/freeEmailDomainCheck/freeEmailDomains.ts" -L afterall,atleast,datea,fo,incase,ist,nam,notin,optionel,perview,reccuring`
Closes #19193
2025-02-10 03:35:17 +00:00
Omar López
0f07ab2f7b
fix: Load plain dynamically ( #18571 )
2025-01-22 20:10:11 +00:00
Benny Joo
4424b2aea3
useIsThemeSupported hook ( #18746 )
2025-01-20 14:30:18 +05:30
Benny Joo
15156c2225
perf: use react svg cache from root level ( #18506 )
2025-01-08 09:29:50 +01:00
Alex van Andel
57bd0b3df3
fix: type + build errors ( #18502 )
2025-01-07 18:35:06 +01:00
Benny Joo
9d4496133e
feat: Prevent re-renders (moving SessionProvider to Root level for both app router / pages router) ( #18493 )
2025-01-07 11:46:08 +01:00
+6
225313e391
feat: Plain chat ( #18284 )
...
* plain custom desin
* No display on card
* dynamic plain chat component and hmac hash
* re-route users to plain.com chat instead of intercom chat when going to /support
* provider errors
* yarn lock fix
* plain chat removed unneeded hmac
* fix ts error
* error handling improved
* remove intercome provider from app-dir
* Create getting-started.mdx (#18342 )
* Delete help directory (#18343 )
* chore: moved docs/help to /help (#18345 )
* chore: Delete unused guides directory (#18346 )
* feat: booking filters (#18303 )
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com >
* chore: Remove `HeadSeo` components where no longer needed + improve app router metadata logic (#18348 )
* remove HeadSeo for already migrated pages and refactor prepareMetadata
* create _generateMetadataWithoutImage and refactor _generateMetadata
* chore: app router - /bookings status page (#18183 )
* chore: app router - /bookings page
* remove env vars
* fix
* Update middleware.ts
* revert unneeded change
* refactor for the better
* fix
* cache i18n instances (#18309 )
* feat: virtual queues tab in insights (#18260 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: sean-brydon <sean@cal.com >
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: Omar López <zomars@me.com >
* feat: update translations via @replexica (#18361 )
Co-authored-by: Replexica <support@replexica.com >
* update OOO e2e tests to remove flakiness (#18367 )
* fix: metadata is overwritten for child managed eventType when updating parent (#18059 )
* fix: metadata is overwirten
* Update
* type error
* Update
* fix test
* fix type error
* chore: added routing support link (#18369 )
* Added routing form support link
* small change
* Type fix
---------
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com >
* chore: refactor handling logic for embeds in app router (#18362 )
* refactor handling logic for embeds in app router
* fix type checks
* add test for withEmbedSsrAppDir
* fix
* review changes
* yarn lock
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com >
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com >
Co-authored-by: Benny Joo <sldisek783@gmail.com >
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com >
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: sean-brydon <sean@cal.com >
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: Omar López <zomars@me.com >
Co-authored-by: Replexica <support@replexica.com >
Co-authored-by: Vijay <vijayraghav22@gmail.com >
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com >
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com >
Co-authored-by: Alex van Andel <me@alexvanandel.com >
2024-12-26 19:07:08 +00:00
Benny Joo and Alex van Andel
f72748b6f2
fix: trpc/react-query — only one query client should exist ( #18179 )
...
* use prefetch function in ScheduleListItem and refactor
* modify app router trpc provider to match the original configs
* revert unneeded change
* move trpc provider up and do refactors
* remove log
* add comment
* fix: Some typing style fixes
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com >
2024-12-13 20:26:51 -05:00
ddfbe25903
feat: adding posthog libs for node + js ( #16862 )
...
* adding posthog libs for node + js
* updating lock
* move to init posthog client - pageview component
* adding identify in shell
* removing test event captures
* add signout tracking to dropdown as it was missed in merge
---------
Co-authored-by: sean <sean@brydon.io >
Co-authored-by: Bailey Pumfleet <bailey@pumfleet.co.uk >
2024-11-04 11:46:25 -05:00
Benny Joo
babb1a3bf7
fix annoying warning due to key spread ( #16948 )
2024-10-04 19:39:20 +00:00
Benny Joo
2146c04444
fix: i18n for app router ( #16909 )
...
* fix: translations for app router
* fix build error
2024-10-03 00:32:33 +01:00
Benny Joo
b283f1f8cd
fix: theme is not configured in app router ( #16889 )
...
* fix: theme is not configured in app router
* fix type error
* remove logs
* use testBothFutureAndLegacyRoutes
* add APP_ROUTER_SETTINGS_MY_ACCOUNT_ENABLED
2024-10-01 04:39:37 -04:00
Benny Joo
e9076c8e3e
Refactor AppProvidersAppDir ( #16496 )
2024-09-06 08:53:25 +00:00
Omar López
101fea2c1c
fix: cross domain SVG sprites ( #16244 )
2024-08-16 16:33:10 +00:00
Keith Williams
2c8c8368a0
chore: Reducing E2E test sharding ( #15192 )
...
* chore: Removing E2E test sharding
* Added back 4 shards for main E2E
* Bump build machines to use 8vCPUs
* Downgrading builds to 2 vCPUs to see time difference
* Reduced shards to 2 to see if flakes are reduced
* Increased E2E vCPUs
* Put builds back to 4 vCPUs since they need it
* Updated E2E suite to use 16 vCPUs and no sharding
* Not running in parallel just to test
* Put back the parallelism
* Get rid of themeBasis warning in test suite
* Skipping another flaky test
* 2 shards
* Update e2e.yml
2024-05-28 20:50:39 +00:00
51b2a15cb0
feat: Settings for dashboard theme that is separate from system ( #13779 )
...
* feat(db): add new col: user appTheme
* feat(event-types page): apply appTheme color
* add appTheme for trpc
* feat: mutate main page theme
* feat: add english translation for app theme update section
* modify keys in common (en)
* add woring
* Revert yarn.lock to its state before unintended changes
* feat(i18n): add back the i18n string (for dark/light mode switching)
* refactor: refactor ThemeLabel
* fix: add new user field "appTheme" to test files
* chore: modify TODO comment
* chore: update common.json (en) for "theme"
since we had appTheme now, I think it's better to update the wording here to avoid confusion
* fix: update button's data-testid to fix e2e test error
* chore: remove comment
* fix: fix brand-color-not-apply bug
* solve type error
* fix: fix type error
* fix: use correct storageKey for booker / dashboard
* fix: tidy up
* fix: skeleton
---------
Co-authored-by: swh00tw <a6140000@gmail.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: Keith Williams <keithwillcode@gmail.com >
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
Co-authored-by: Udit Takkar <udit222001@gmail.com >
2024-02-21 13:02:40 +00:00
DmytroHryshyn
abd90f6af8
chore: [app-router-migration 14] migrate not-found page ( #13032 )
...
* chore: migrate not-found page
* migrate page, replace ssgInit
* fix flaky test
* fix
* fix
* fix
2024-01-12 18:21:35 -03:00
zomars
83a187bf11
Revert "fix: temp renamed app dir to prevent OOM"
...
This reverts commit 0d3baee5930d3baee5930d3baee5930d3baee593
2023-12-19 12:26:52 -07:00
Udit Takkar and Hariom
6e829e23f9
fix: type error ( #12808 )
...
* fix: type error
* chore
* Dont run future tests
* Skip more tests
* Fix 404 text
* Fix more tests
---------
Co-authored-by: Hariom <hariombalhara@gmail.com >
2023-12-15 13:21:38 +00:00
DmytroHryshyn
add6ffdfc4
chore: [app-router-migration-4]: apps/categories page ( #12619 )
2023-12-12 11:43:15 -07:00
Greg Pabian and Omar López
1de05ebf3d
chore: migrate the event-types page to the app directory ( #12390 )
...
Co-authored-by: Omar López <zomars@me.com >
2023-11-22 19:17:33 +00:00
139a7c8249
chore: [app dir bootstrapping 5] add RootLayout ( #11982 )
...
Co-authored-by: zomars <zomars@me.com >
Co-authored-by: Greg Pabian <35925521+grzpab@users.noreply.github.com >
2023-10-25 13:58:08 -07:00
Hariom Balhara
Benny Joo
luzpaz
Omar López
Alex van Andel
DmytroHryshyn
Greg PabianandOmar López
