a2a5d48037
Upgrade turborepo v4 ( #3804 )
...
* Upgrades to turborepo 4
Adds turbo eslint config
* Linting according to turbo eslint plugin
* Add missing variables to turbo config
* Adds more missing env vars to turbo json
* Update turbo.json
* Update turbo.json
* Matches local lint with CI lint
* Update turbo.json
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-11 13:17:56 -06:00
22d3fb7e92
Adds verify page
2022-08-05 21:09:52 -06:00
3ed206df23
Squashed commit of the following:
...
commit c378c647fe4822071cbdfc577fcfc950e53973df
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:36:21 2022 -0600
Cleanup
commit a89cc7981df1c2aae96188466833490eb3b227a1
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:17:57 2022 -0600
redirect fixes
commit a27979c2b3f06c9956ee9abfef1e82a5558b6411
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:02:33 2022 -0600
Fingers crossed
commit c08a09e8d2ba3eb2561f418bb3b0370245f79bf7
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:28:55 2022 -0600
Update [...nextauth].tsx
commit 4063bddb2ea3cbf3dda6be6cc10070ecc1eb578c
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:05:21 2022 -0600
Submodule sync
commit e44dc73a3b751ba4cacc85abfe6680a668393c0d
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:05:06 2022 -0600
Upgrade next-auth
commit 2b36e0a1b376083739ea06b793f1523e2f158a33
Author: zomars <zomars@me.com>
Date: Fri Aug 5 15:23:03 2022 -0600
Magic signup fixes
commit 2cc81ca7e2f79a4e3fcab370e23ac29cbe3ee18d
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date: Thu Aug 4 11:49:51 2022 -0400
Properly parse list calendar call to MS Graph (#3698 )
commit 65887d8f9db8b399964fce38ec104ed24fcc48e6
Author: Leo Giovanetti <hello@leog.me>
Date: Thu Aug 4 12:52:50 2022 -0300
Fix app-store seeding (#3693 ) (#3697 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
commit 71594b9623#3650 ) (#3681 )
* fixed dark mode profile page
* nit
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
commit 78a5ae9882#3671 ) (#3676 )
commit b006240b0c6179b3fbee7418f68a6179b3fbe014443099e0
2022-08-05 18:08:05 -06:00
ff3bd5fc61
Event description now supports markdown formatting ( #3688 )
...
* yarn
* yarn update
* added Mardown style formatting with sanitized inputs
* Revert "yarn"
This reverts commit 46eb3595cf46eb3595cff4600d83a646eb3595cff4600d83a68ccab5ee2378a755eb39
2022-08-05 18:44:30 +00:00
be16b72400
feat: support lark calendar ( #3019 )
...
* feat: support lark calendar
* New Crowdin translations by Github Action (#3016 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: lark calendar get app ticket bugs
* feat: add send msg service for lark bot
* fix: comment on PR of lark-calendar
* chore: update lark bot message
* Refactors add endpoint
* Adds missing GET endpoint handler
* Update yarn.lock
* fix: comments
* Update yarn.lock
* fix: comment about inferred type
* Added fetcher helper
* Update yarn.lock
Co-authored-by: chengcheng.frontend <chengcheng.frontend@bytedance.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-05 17:56:20 +00:00
298a6d5e15
Tweaks for Website signup form ( #3635 )
...
* WIP, only deep testing needed
* Feedback suggestions
* Uses early returns instead
* Allows overriding t function via prop
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-03 13:59:40 -03:00
532723fb41
Update V2 components + Move to react-icons ( #3670 )
2022-08-03 16:01:29 +00:00
464343f5ab
Refactors EE code ( #3490 )
...
* WIP
* WIP
* Type and migration fixes
* Adds missing default import
* Fixes import
* Fixes tRPC imports in App Store
* Migrate stripe helpers
* WIP
* Type fixes
* Type fix?
* WIP
* WIP
* Update index.ts
* Fixes
* Update workflow.tsx
* Moved queries to lib
* Moves QueryCell
* Migrates MultiSelectCheckboxes
* WIP
* CryptoSection type fixes
* WIP
* Import fixes
* Build fixes
* Update app-providers.tsx
* Build fixes
* Upgrades hookform zod resolvers
* Build fixes
* Cleanup
* Build fixes
* Relocates QueryCell to ui
* Moved List and SkeletonLoader
* Revert QueryCell migration
* Can't use QueryCell here
* oops
* CryptoSection cleanup
* Update app-providers.tsx
* Moved ee to features
* ee to features/ee
* Removes @calcom/ee
* Adds possible feature locations
* Build fixes
* Migrates stripe to app-store lib
* Colocates stripe imports
* Update subscription.ts
* Submodule sync
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-28 13:58:26 -06:00
538c5dff43
Playwright should not live on deps
2022-07-26 10:54:25 -06:00
047d4a0773
Some optimisations to the storybook ( #3526 )
...
* Some optimisations to the storybook
* Fixed merge artifact
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
2022-07-26 15:05:11 +01:00
ef6ed6050b
Feat: Add next-themes for theme handling ( #3263 )
...
* chore: add next-themes
* feat: add next theme provider
* fix: modify useTheme hook to use next-themes
* fix: use the new hook for theming
* remove conditional rendering with isReady boolean flag
* remove Theme component returned from useTheme hook
* Update missing useTheme usage
* Fix theme switching as per system. Also, ensure that booking and non booking pages can maintain their own requirements of theme simulatenously
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-07-26 08:27:57 +00:00
e21e622096
Storybook router issue fix ( #3525 )
...
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
2022-07-25 22:02:33 +01:00
277b0c4c92
Feat/design system ( #3051 )
...
* Storybook Boilerplate setup
* Inital Setup
* First story
* Color Design System
* Badge Story + Comp
* Checkbox UI + Stories
* Update Red colors + Button Group
* Switch+Stories / Default brand color
* Update Version + Button Group combined
* Compact Butotn Group
* Tidy up Selectors
* Adds Tooltip to Button
* TextInput
* Update SB
* Prefix Input
* Match text area styles
* Prefix Controls
* Update spacing on text area
* Text Input Suffix
* Color Picker
* Update storybook
* Icon Suffix/Prefix
* Datepicker + move components to monorepo
* Text color on labels
* Move Radio over to monorepo
* Move CustomBranding to calcom/ib
* Radio
* IconBadge Component
* Update radio indicator background
* Disabled radio state
* Delete yarn.lock
* Revert "Delete yarn.lock"
This reverts commit 9b99d244b7
2022-07-22 18:39:50 -06:00
471420c1d4
Add getSchedule tests ( #3233 )
...
* Add getSchedule tests
* Add first integration test
* Update turbo.json
* Make sure unit tests run asap
* Worker threads
* Improve team event test
* Remove unrelated changes
* Improve tests readability
* Update CalendarManager.ts
* Add README
* Debug tests
* Temporarily disabled build errors
* Fix failing tests
* Remove unncessary logs
Co-authored-by: zomars <zomars@me.com>
2022-07-21 10:44:23 -06:00
3ff43520eb
Bump prisma to v4.1
2022-07-20 13:17:23 -06:00
4874a6e34c
Upgrades prisma to v4 ( #3179 )
...
* Upgrades prisma to v4
* Upgrades prisma to v4
* Upgrades prisma to v4
* Removes preview feature as it's on stable now
* Adds missing owner relationship
* Adds missing onCascades to prevent orphans
* TODO
* Adds default date to feedback
* Adds missing foreign keys
* Update schema.prisma
* Update console
* Fixes build error
* Update console
* Delete migration.sql
2022-07-20 12:49:53 -06:00
18389f459d
minor improvements to routing forms ( #3380 )
...
* minor improvements to routing forms
* UX improvements and text changes
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-15 11:46:05 +00:00
58d1c28e9d
Routing Forms ( #2785 )
...
* Add Routing logic to Query builder
* Make a working redirect
* Make it an app
* Move pages and components to App
* Integrate all pages in the app
* Integrate prisma everywhere
* Fix Routing Link
* Add routing preview
* Fixes
* Get deplouyed on preview with ts disabled
* Fix case
* add reordering for routes
* Move away from react DnD
* Add sidebar
* Add sidebar support and select support
* Various fixes and improvements
* Ignore eslint temporarly
* Route might be falsy
* Make CalNumber support required validation
* Loader improvements
* Add SSR support
* Fix few typescript issues
* More typesafety, download csv, bug fiees
* Add seo friendly link
* Avoid seding credebtials to frontend
* Self review fixes
* Improvements in app-store
* Cahnge Form layout
* Add scaffolding for app tests
* Add playwright tests and add user check in serving data
* Add CI tests
* Add route builder test
* Styling
* Apply suggestions from code review
Co-authored-by: Agusti Fernandez Pardo <6601142+agustif@users.noreply.github.com>
* Changes as per loom feedback
* Increase time for tests
* Fix PR suggestions
* Import CSS only in the module
* Fix codacy issues
* Move the codebbase to ee and add PRO and license check
* Add Badge
* Avoid lodash import
* Fix TS error
* Fix lint errors
* Fix bug to merge conflicts resolution - me query shouldnt cause the Shell to go in loading state
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Agusti Fernandez Pardo <6601142+agustif@users.noreply.github.com>
2022-07-14 12:40:53 +00:00
39199e515e
Workflows ( #3236 )
...
* build basic database structure and basic design
* create simple workflow list
* add editing dots to list
* add mutation to create workflows
* add createMutation on submit + redirect to editing page
* redirect to edit page when clicking on row
* add functionality to delete workflow
* add timeUnit + input validation
* add empty screen view
* add time before it triggers to description
* add multi select with checkboxes
* remove getServerSideProps
* set default time period to 24
* fetch eventypes and display in dropdown
* add functionality to update workflows + many-to-many relationship
* fix all checked event types
* add SMS reminders
* fix bug with trigger + relocate sms template
* clean code
* add model for unscheduled reminders
* fix selected eventTypes
* fixing value to show how many event types selected
* fix plural of event types in select
* add onDelete cascade for all relations
* fix errors
* add functionality to send SMS to specific number
* fix type error for timeUnit
* set default value for time unit + fix type issues
* remove console.logs
* fix error in checking if scheduled date is more than 1h in advance
* fix build errors
* add migration for workflows
* add basic UI for editing workflow steps
* add formSchema
* improve functionality to update a step
* remove console logs
* fix issue with active event types
* allow null value for time and timeUnit
* sort steps asc step number
* add action to workflow (frontend)
* add phone number input for SMS to specific number
* use PhoneInput for number input + input validation
* improve invalid input for phone number
* improve UI of phoneInput
* Improve design and validation
* fix undefined error
* set default action when adding action
* include all team event types
* fix phone number input for editing steps
* fix update muation to add steps
* remove console logs
* fix order of steps
* functionality to delete steps
* add trigger when event is cancelled
* add custom email body
* sms and email reminder updates
* add custom emails
* add custom email subject
* send reminder email to all attendees
* update migration
* fix default value for time and timeUnit
* save email reminders to database
* clean code
* add custom template to SMS actions
* schedule emails with sendgrid
* clean code
* add workflow templates
* keep custom template saved when changing templates
* create reminder template for email
* add dot at the end of sentace for email template
* fix merge error
* fix issue that template was not saved
* include sending emails for when event is cancelled
* fix bug that email was always sent
* add templates to sms reminders
* add info that sending sms to attendees won't trigger for already exisitng bookings
* only schedule sms for attendees when smsReminderNumber exists
* only schedule sms for attendees when smsReminderNumber exists
* set scheduled of workflow reminder to false when longer than 72 hours
* add cron for email scheduling + fixes for for sms an email scheduling
* adjust step number when deleting a step
* cast to boolean with !!
* update cron job for email reminders
* update sms template
* send reminder email not to guests
* remove sendTo from workflow reminder
* fixes sending sms without name + removing sendTo everywhere
* fix undefined name in sms template
* set user name to undefined for sending sms to a specific number
* fix singular and plural for time unit
* set to edit mode when changing action and custom template is selected
* delete reminders when booking cancelled or not active anymore
* fix type errors
* fix error that deleted reminders twice
* create booking reminders for existing bookings when eventType is set active
* improve email and sms templates
* use BookingInfo type instead of calendarEvent for reminder emails
* schedule emails for already existing bookings
* add and remove reminders for new active event types and cancelled events
* connect add action button with last step
* fix step container width for mobile view
* helper functions that return options for select
* fix typo and remove comment
* clean code
* add/improve error messages for forms
* fix typo
* clean code
* improve email template
* clean code
* fix missing prop
* save reference id when scheduling reminder
* fix step not added because of changed id for new steps
* small fixes + code cleanup
* code cleanup
* show error message when number is invalid
* fix typo
* fix phone number input when location is already phone
* set multi select checkbox to read only
* change email scheduling in cron job from 7 days to 72 hours
* show active event types in workflow list
* fix trigger information for workflow list
* improve layout for small screens in workflow list
* remove optional from zod type for workflow name
* order workflows by id
* use link icon to show active event types
* fix plural and add translation for showing nr of active eventtypes
* fix text for sms reminder template
* add reminders for added steps
* remove optional for activeOn
* improve reminder templates
* improve design of custom input fields
* set edit mode to false when phone number isn't needed anymore
* set sendTo in workflow step only for SMS_NUMBER action
* set email body and subject only when custom template
* only delete reminders that belong to workflow steps
* improve text for new event book trigger
* move reminders folder to workflows
* fix issue that save button was sometimes enabled in edit mode
* fix form issues for send to
* delete all scheduled reminders when workflow is deleted
* use enum for method
* fix imports for workflow methods
* add missing import
* fix edit mode
* create reminders when event is confirmed
* add reminderScheduler to reduce duplicate code
* make workflow enterprise and pro only feature
* move all files to /ee/ folder
* move package.json change to /ee/ folder
* add pro badge to shell
* set to edit mode to true if email subject is missing when action changes
* fix loading bug
* add migration
* fix old imports
* don't schedule reminders for opt-ins
* fix style of email body
* code clean up
* Update yarn.lock
* fix isLoading for active on dropdown
* update import for prisma
Co-authored-by: Omar López <zomars@me.com>
* update imports
* remove console
* use session to check if user has valid license
* use defaultHandler
* clean up code
* Create db-staging-snapshot.yml
* move LisenceRequired inside shell
* update import for FormValues
* fix phone input design
* fix disabled save button for edit mode
* squah all migration into a single one
* use isAfter and isBefore instead of isBetween
* import dayjs from @calcom
* validate phone number for sms reminders when booking event
* Allows auto approvals for crowdin
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-07-14 00:10:45 +00:00
b1d637d1a6
Upgrading nextjs and collect ( #3252 )
...
* Upgrading nextjs and collect
* Fixing suggestions + yarn.lock
* Updating submodules
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-12 11:43:53 -06:00
5587867598
RFC: Custom eslint plugin ( #3272 )
...
* WIP
* Renamed pacakge
* Update yarn.lock
* Lint fixes
* Moved afterBufferTime to busyTimes & heavily simplify busy check (#3258 )
* New Crowdin translations by Github Action (#3312 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
* Fix shell flicker (#3314 )
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Add recommended config to plugin
* Linting
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-07-11 17:35:50 -06:00
b70550fc83
Update yarn.lock
2022-07-06 16:25:29 -06:00
6a12ff7984
Update yarn.lock
2022-07-06 16:19:54 -06:00
c890e8d06d
feature/settings-username-update ( #2306 )
...
* WIP feature/settings-username-update
* WIP username change
* WIP downgrade stripe
* stripe downgrade and prorate preview
* new UI for username premium component
* Fix server side props
* Remove migration, changed field to metadata user
* WIP for update subscriptions
* WIP intent username table
* WIP saving and updating username via hooks
* WIP saving working username sub update
* WIP, update html to work with tests
* Added stripe test for username update go to stripe
* WIP username change test
* Working test for username change
* Fix timeout for flaky test
* Review changes, remove logs
* Move input username as a self contained component
* Self review changes
* Removing unnecesary arrow function
* Removed intentUsername table and now using user metadata
* Update website
* Update turbo.json
* Update e2e.yml
* Update yarn.lock
* Fixes for self host username update
* Revert yarn lock from main branch
* E2E fixes
* Centralizes username check
* Improvements
* WIP separate logic between premium and save username button
* WIP refactor username premium update
* Saving WIP
* WIP redo of username check
* WIP obtain action normal, update or downgrade
* Update username change components
* Fix test for change-username self host or cal server
* Fix user type for premiumTextfield
* Using now a global unique const to know if is selfhosted, css fixes
* Remove unused import
* Using dynamic import for username textfield, prevent submit on enter
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-06 13:31:07 -06:00
1f02a5c718
Update yarn.lock
2022-07-04 10:48:21 -06:00
dd941e62ef
Update next-auth to version 4.5.0 ( #3138 )
2022-07-04 14:36:20 +00:00
942b8da124
Update yarn.lock
2022-06-25 14:02:31 -06:00
f16f9466cb
Update Prisma to v3.15.2 to support data proxy ( #3124 )
...
* Update Prisma to v3.15.2 to support data proxy
* Update package.json
* Update package.json
* Update package.json
* Update yarn.lock
* Update console
* Update turbo.json
Co-authored-by: zomars <zomars@me.com>
2022-06-25 20:01:02 +00:00
79556f1d13
Upgrades turbo and adds snaplet configs
2022-06-25 10:14:53 -06:00
7be60b47f1
Runs format script
2022-06-24 07:37:56 -06:00
21fb0fc3a3
Turborepo improvements ( #3139 )
...
* WIP
* WIP
* Embed fixes
* Update turbo.json
* Update e2e-embed.yml
* E2E fixes
* Update turbo.json
* App store CLI cleanup
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
2022-06-22 14:41:19 -06:00
2d28ca61a4
Feature/parallel booking availability ( #3087 )
2022-06-19 16:02:00 +01:00
e9f3248fc0
Feature/booking page refactor ( #3035 )
...
* Extracted UI related logic on the DatePicker, stripped out all logic
* wip
* fixed small regression due to merge
* Fix alignment of the chevrons
* Added isToday dot, added onMonthChange so we can fetch this month slots
* Added includedDates to inverse excludedDates
* removed trpcState
* Improvements to the state
* All params are now dynamic
* This builds the flat map so not all paths block on every new build
* Added requiresConfirmation
* Correctly take into account getFilteredTimes to make the calendar function
* Rewritten team availability, seems to work
* Circumvent i18n flicker by showing the loader instead
* 'You can remove this code. Its not being used now' - Hariom
* Nailed a persistent little bug, new Date() caused the current day to flicker on and off
* TS fixes
* Fix some eventType details in AvailableTimes
* '5 / 6 Seats Available' instead of '6 / Seats Available'
* More type fixes
* Removed unrelated merge artifact
* Use WEBAPP_URL instead of hardcoded
* Next round of TS fixes
* I believe this was mistyped
* Temporarily disabled rescheduling 'this is when you originally scheduled', so removed dep
* Sorting some dead code
* This page has a lot of red, not all related to this PR
* A PR to your PR (#3067 )
* Cleanup
* Cleanup
* Uses zod to parse params
* Type fixes
* Fixes ISR
* E2E fixes
* Disabled dynamic bookings until post v1.7
* More test fixes
* Fixed border position (transparent border) to prevent dot from jumping - and possibly fix spacing
* Disabled style nitpicks
* Delete useSlots.ts
Removed early design artifact
* Unlock DatePicker locale
* Adds mini spinner to DatePicker
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-06-15 14:54:31 -06:00
0ebda5d483
Submodule updates
2022-06-13 16:42:51 -06:00
1960046994
App/exchange v2 ( #2493 )
...
* Create 2013 package
* Create 2016 package
* Add ews
* Update package.json
* Translate 2013 app to new structure
* Translate 2013 app to new structure
* Translate 2016 app to new structure
* Add appId
* Move setup to a seperate page
* RHF dependency version mismatch
* Move exchange 2016 setup to new page
* Add translations
* Relying on AppSetupMap not defined static pages
* Console build fixes
* Resolved node version to 16
* Prisma errors can't be handled on client
* Fixes node version mismatches
* Improvements
* Endpoint fixes
* Revert "Endpoint fixes"
This reverts commit c0320e3f3d
2022-06-13 16:12:27 -06:00
8d893d3ed1
Fix/app multiple installs ( #3045 )
...
* Add new flag for apps with multiple installs
* WIP saving work in progress
* Fix typo in metadata property
* Update apps/web/components/App.tsx
Co-authored-by: Leo Giovanetti <hello@leog.me>
* Using category in pref of new variable on metadata
* Update App.tsx
* Update yarn.lock
* Update yarn.lock
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: zomars <zomars@me.com>
2022-06-13 15:06:12 -06:00
d1cf91a1ea
Yarn lock fixes
2022-06-13 14:15:10 -06:00
881de59bf5
Fixes node version mismatches
2022-06-13 10:59:02 -06: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
1f1e364a30
Add consistent publish command and update versions to published version ( #3008 )
...
* Add consistent publish command and update versions to published version
* v1.0.8
* Bump version to released version
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-06-10 09:49:38 +00:00
bb4875443a
Add app-store:watch a dependency of web:dev ( #3005 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 16:57:27 +00:00
18e0f13605
[Feature] App Store CLI - Make it super easy to add an app. ( #2917 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 11:43:32 +05:30
547b40913f
Merge branch 'production'
...
# Conflicts:
# .env.example
# .github/workflows/e2e-embed.yml
# apps/web/components/EmptyScreen.tsx
# apps/web/components/SettingsShell.tsx
# apps/web/components/Shell.tsx
# apps/web/components/booking/BookingListItem.tsx
# apps/web/components/booking/pages/AvailabilityPage.tsx
# apps/web/ee/components/LicenseRequired.tsx
# apps/web/ee/components/apiKeys/ApiKeyListContainer.tsx
# apps/web/ee/components/support/HelpMenuItem.tsx
# apps/web/lib/emails/templates/attendee-request-reschedule-email.ts
# apps/web/lib/emails/templates/attendee-rescheduled-email.ts
# apps/web/lib/emails/templates/attendee-scheduled-email.ts
# apps/web/lib/emails/templates/organizer-request-reschedule-email.ts
# apps/web/lib/emails/templates/organizer-rescheduled-email.ts
# apps/web/lib/emails/templates/organizer-scheduled-email.ts
# apps/web/pages/_app.tsx
# apps/web/pages/apps/installed.tsx
# apps/web/pages/event-types/[type].tsx
# apps/web/public/static/locales/en/common.json
# apps/web/server/routers/viewer/bookings.tsx
# packages/app-store/vital/lib/templates/attendee-request-reschedule-email.ts
# packages/app-store/vital/lib/templates/base-template.ts
# packages/app-store/vital/lib/templates/organizer-request-reschedule-email.ts
# packages/app-store/wipemycalother/lib/templates/attendee-request-reschedule-email.ts
# packages/app-store/wipemycalother/lib/templates/base-template.ts
# packages/app-store/wipemycalother/lib/templates/organizer-request-reschedule-email.ts
# packages/ee/server/checkLicense.ts
# packages/emails/email-manager.ts
# packages/embeds/embed-core/package.json
# packages/embeds/embed-snippet/package.json
# packages/embeds/vite.config.js
# packages/lib/constants.ts
# packages/types/environment.d.ts
# yarn.lock
2022-06-06 11:58:32 -06:00
2344a4da13
Update yarn.lock
2022-06-05 16:42:26 -06:00
4652878e6c
tsc fixes
2022-06-05 16:35:39 -06:00
6f203d14e3
Submodule updates
2022-06-02 10:20:29 -06: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
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
01631e808f
v1.6.2 ( #2926 )
...
* Turbo fixes
* Make apps single pages public
* fixed /booking skeleton (#2722 )
* fixed /booking skeleton
* nit
* Type fixes
* Test fixes
* Update playwright.config.ts
* More test fixes
* Update dynamic-booking-pages.test.ts
* 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>
* Add more embed events (#2719 )
* Add more embed events
* Add more embed events
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* adds availability select loader (#2718 )
* Improve logs and Fix unwanted 500 to reduce noise in logs (#2674 )
* Improve logs
* Fix unintentional 500
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* added giphy description (#2730 )
* fixes #2732 (#2732 )
* Hotfix : Fix Infinite loading of Bookings (#2729 )
* Add more embed events
* Add more embed events
* Fix nextCursor calculation logic
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Hotfix: Success page for recurring event (#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>
* Fix preview.html not built and thus served during depooy (#2727 )
Co-authored-by: Omar López <zomars@me.com>
* Allow deletion of a disabled event (#2737 )
* allows deletion of disabled event
* some visual fixes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Multiple E2E improvements
* Parallelizes some tests
* Update booking-pages.test.ts
* E2E and paid bookings fixes
* Add 'free' and 'workingElsewhere' as a non-blocking event (#2652 )
* Add 'free' and 'workingElsewhere' to non-blocking event - this will allow bookings at these times
* Update CalendarService.ts
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* TODO marks blocking test to be fixed
* Update testUtils.ts
* Update testUtils.ts
* getBusyTimes consolidation
* Fixes delete-me test
* E2E fixing attemps
* Adjusting Zapier endpoints for publishing integration (#2728 )
* add /me endpoint for zapier API testing
* remove cacellationReason from listBookings response
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
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>
* Fix reschedule not happening in calendar if two calendards are there (#2733 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Increases timeout temporarily
* Merge pull request #2745 from calcom/apps/multiple-categories
Allow apps to belong to multiple categories
* Build fixes
* Populate msteams key in db (#2743 )
* Populate msteams key in db
* Fix calendar credentials to teams
* Clarify account dialog
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Improving Email DRYness (#2486 )
* Email DRY
* WIP
* Improve email DRYness
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* E2E fixtures (#2747 )
* Sign in button should be changed or disabled after click #2654 (#2749 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* 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>
* 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#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>
* Fix white border (#2761 )
* fix: remove hardcoded redirect in signin url email verification (#2764 )
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
* Bad UX when user wants to set the default Event Type Title #2245 (#2760 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* Skip sending emails in E2E
* 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>
* 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>
* 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>
* Readd steps to create a new user #2665 (#2759 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
* 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>
* 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>
* 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>
* 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
* Typo
* Typo
* Update apps/web/pages/apps/categories/[category].tsx
* Apply suggestions from code review
* 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>
* fix: split time correctly if the local working hours are just across mid night (#2766 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Update crowdin.yml
* New Crowdin translations by Github Action (#2773 )
* New Crowdin translations by Github Action
* Update vital.json
* Update vital.json
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Omar López <zomars@me.com>
* 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>
* v1.6
* v1.6
* 2FA submit disabled (#2790 )
* fixing the hyperlink for open startup (#2777 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Add login event (#2784 )
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* 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
* Add vscode tasks.json (#2801 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* Update check-types.yml
* adding organizer as attendee to google calendar events (#2779 )
* Fix auto-select and close of dropdown (#2819 )
* fixes dynamic color and typefix for tfunction after react upgrade (#2821 )
* New Crowdin translations by Github Action (#2791 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
* Relocates admin to console
# Conflicts:
# apps/admin
* Relocates admin to console
* Fix login submit (#2849 )
* fix: long string overflowing calendar div (#2842 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Adding labels (#2783 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* Meet/Zoom Email Clarification (#2828 )
* Add clarificaiton to email
* Update apps/web/lib/emails/templates/organizer-scheduled-email.ts
* Add to attendee scheduled email
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* 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>
* 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>
* Merge production to main
* Update vital.json
* Update vital.json
* 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>
* Playwright binaries shouldn't be on deps
* Playwright binaries shouldn't be on deps
* Fix infinite renders on event-type edit page (#2820 )
* Updates submodules
* Makes sure to hash post-install cache
* 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>
* Redesign help menu item (#2710 )
* Seperate help menu item and contact menu item
* Add menu items
* Install react-popover
* Render contact only if support keys are present
* Adjust contact support links
* Add translations
* Add embed changes
* Adjust menu if helped is pressed
* Add items to help menu
* Change button color on selection
* Create endpoint
* Create feedback table
* Create migration file
* Write feedback to db
* Remove logs
* Add response message
* Send feedback email
* Disable submit if no rating and after submit
* Add translations
* Fix padding
* Clean up
* Clean up
* Add user feedback email to .env example
* Lint fixes and styles
* Changed onClick function to a named function and fix style
* Fix ids order
* Removed commented code and changed textarea id and name
* Fix id orders
* Change to AND operator
Co-authored-by: Omar López <zomars@me.com>
* Add user relation to feedback
Co-authored-by: Omar López <zomars@me.com>
* Add migration files
* Change rating to strings
* Change rating to strings
* Fix type errors
* WIP success & error messages
* Change success and error to boolans
* Style messages
* Add await
Co-authored-by: Omar López <zomars@me.com>
* Remove duplicate string
* Refactor import statement
Co-authored-by: Omar López <zomars@me.com>
* Change opacity of emojis
* added support@cal.com email for feedback
* Add success toast
* Update .env.example
Co-authored-by: Omar López <zomars@me.com>
* Add tCRP route
* tCRP send email
* tCRP send email
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>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* 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>
* Submodule sync
* sec-001 fixes (#2866 ) (#2867 )
* sec-001 fixes (#2866 )
* sec-001 fixes
* Typo
* Fixes paid bookings
# Conflicts:
# apps/web/ee/components/stripe/Payment.tsx
* Hotfix: Fixing Security Issues (#2848 ) (#2850 )
* sec-001 fixes (#2866 )
* sec-001 fixes
* Typo
* Fixes paid bookings
* 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>
* Resolve if can't find event on google cal (#2860 )
* Resolve if can't find event on google cal
* Change order of console.error
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Disable Impersonation Option (#2880 )
* Disable Impersonation
* Update Description Copy
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Fix deleted event when on different cal (404) (#2882 )
* Fix/email shows false (#2879 )
* Webhook sec fixes (#2883 )
* Webhook sec fixes
* Revert changes
* 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>
* Fix 500 errors if data is invalid (#2886 )
* Check in middleware to ensure authorization for all endpoints (#2885 )
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* 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>
* remove unused imports (#2892 )
* Cascades impersonations on user delete (#2891 )
Co-authored-by: Alex van Andel <me@alexvanandel.com>
* Ensures json fields on each call (#2893 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Redundant conditional expression (#2894 )
* remove redundant conditional expressions
* remove redundant conditional expressions
* 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>
* Update turbo.json
* Reverts license check on payment
Since it's a public page
* Submodule sync
* fix: overflowing text on teams page - using tailwind line-clamp (#2843 )
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
* Fix @calcom/embed-react installation with TS project (#2870 )
* Fix failing builds (#2908 )
* Update turbo.json
* 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>
* added checkly and twitch badges
* Update README.md
* areas of expertise test
* Update CONTRIBUTING.md
* Update README.md (#2912 )
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* remove unsed imports (#2895 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* Cleanup & removed usages of sparingly used Text/ files (#2904 )
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Fixed typo in CheckboxField and wrapped description in <label> (#2924 )
* Fixed typo in CheckboxField and wrapped description in <label>
* Make functionality identical to before
* Fixed use of infomationIconText
* Fix lint error (needs refactor, out of scope)
* 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>
* 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>
* fix(app-store): Giphy Ux fixes (#2746 )
* fix(app-store): Giphy Ux fixes
* Add search placeholder
* Min height image on event type page
* Use regex in zod validation and fix design issues for figma row 1
* Add paddings as per discussion with Ciarán
* Fix getGiphyApiKey nomenclature
* Update apps/web/public/static/locales/en/common.json
* Update regex to be more readable and allow enter to search
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
* Add embed tests in CI (#2887 )
* Add embed tests in CI
* Update e2e-embed.yml
* Run quick tests only
* Ignore certain folders
* Add embed-react tests as well
* Fix commands
* Dont run unit tests
* Update playwright.config.ts
* Update playwright.config.ts
* Update playwright.config.ts
* Create correct artifcats
* Create correct artifcats
* Fi ignore path
* Update package.json
* Add back embed-react typecheck
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* remove subtitle (#2925 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* 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>
* v1.6.2
* 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>
* Update website
* Update HelpMenuItem.tsx
* Update event.ts
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Arthur Cruz <42497300+arthur1041@users.noreply.github.com>
Co-authored-by: Mitchell Moore <47459168+Mitchell-Moore@users.noreply.github.com>
Co-authored-by: Agusti Fernandez Pardo <me@agusti.me>
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: andreaestefania12 <19562383+andreaestefania12@users.noreply.github.com>
Co-authored-by: Miguel Nieto A <39246879+miguelnietoa@users.noreply.github.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Hashen <37979557+Hashen110@users.noreply.github.com>
Co-authored-by: buschco <colin@busch.dev>
Co-authored-by: iamkun <kunhello@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Ankit Gordhandas <agordhandas@gmail.com>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Ken Miller <kemiller@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Arun Kumar <palerdot@users.noreply.github.com>
Co-authored-by: Shrey Gupta <connectwithshrey@gmail.com>
2022-05-30 15:36:15 -06:00
843daad481
Merge branch 'production'
...
# Conflicts:
# .vscode/tasks.json
# apps/console
# apps/web/components/NavTabs.tsx
# apps/web/components/SettingsShell.tsx
# apps/web/components/booking/BookingListItem.tsx
# apps/web/components/ui/TableActions.tsx
# apps/web/components/ui/form/CheckboxField.tsx
# apps/web/lib/emails/templates/attendee-scheduled-email.ts
# apps/web/lib/emails/templates/organizer-scheduled-email.ts
# apps/web/lib/types/booking.ts
# apps/web/package.json
# apps/web/pages/event-types/[type].tsx
# apps/web/pages/getting-started.tsx
# apps/web/pages/success.tsx
# apps/web/public/static/locales/en/common.json
# packages/config/package.json
# packages/embeds/embed-core/package.json
# packages/embeds/embed-react/package.json
# packages/embeds/embed-react/src/index.ts
# packages/embeds/embed-snippet/package.json
# packages/embeds/embed-snippet/src/index.ts
# packages/lib/isPrismaObj.ts
# packages/lib/package.json
# packages/ui/Dialog.tsx
# yarn.lock
2022-05-30 12:50:31 -06:00
Omar López
