Commit graph

164 commits

Author SHA1 Message Date
Syed Ali Shahbaz
c4862c4b92
adds validation to event type availability (#1778)
* adds validation to event type availability

* lint fix

* general improvement

* prettier fix

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-10 09:37:00 +00:00
github-actions[bot]
889edb8b44
New Crowdin translations by Github Action (#1765)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-09 19:22:02 +00:00
Syed Ali Shahbaz
a41dd30467
Add reason for rejection (optional) (#1719)
* init --WIP

* added rejection option modal

* migration added

* lint fix

* rejection reason in email added

* moved getRejectedReason function

* lint fix

* --wip

* Prevent undefineds and nulls on email messages

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-02-09 18:25:58 +00:00
Philipp Dormann
20d2955e68
Add Jitsi Meet Integration (#1674)
* basic integration structure

* jitsi logo

* add jitsi meet description to event settings page

* add JitsiVideoApiAdapter

ref #1445

* add LocationType.Jitsi to BookingPage

ref #1445

* add LocationType.Jitsi to event-types

ref #1445

* add meet.jit.si/cal/uuid support to BookingPage

ref #1445

* add basic "cal_provide_jitsi_meeting_url" translation strings

ref #1445

* generate meeting id

ref #1445

* implement direct jitsi link in /success page

ref #1445

* cleanup location link duplicate

ref #1445

* full JitsiVideoApiAdapter implementation

ref #1445

* check integration availability in /pages/event-types/[type]

ref #1445

* add video conferencing link as calendar event location

ref #1445

* PR feedback

* Update components/booking/pages/BookingPage.tsx

don't know - wouldn't do this myself for future proofing but fine...

Co-authored-by: Omar López <zomars@me.com>

* Update components/booking/pages/BookingPage.tsx

🤷‍♂️

Co-authored-by: Omar López <zomars@me.com>

* cleanup: props.type === "jitsi_video"

ref #1445

Co-authored-by: zomars <zomars@me.com>
2022-02-08 15:12:28 -07:00
github-actions[bot]
890daffad0
New Crowdin translations by Github Action (#1745)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-08 15:20:40 +00:00
github-actions[bot]
2ec0673e3d
New Crowdin translations by Github Action (#1743)
* New Crowdin translations by Github Action

* Update common.json

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-08 14:43:18 +00:00
Peer Richelsen
7f8883866a
added signup message for 404 (#1734)
* added signup message for 404

* wip

* wip

* Update common.json
2022-02-08 13:38:13 +00:00
Jamie Pine
5567721431
Team Billing (#1552)
* added base logic for team billing

- moved Stripe customer related logic to customer.ts
- implemented unstable logic for team owner upgrading, downgrading and adding/removing seats

* logic improvements

* - improved Alert style
- hide free team members on public team page
- upgraded textarea to ui component TextArea in SAML setup
- added Alert on team settings for hidden members
- hide CreateEventTypeButton if not admin
- fixed missing locale strings in team settings

* remove random import

* - show hidden status on team list
- refactor team pill

* - improved logic (mostly functional)
- added Alerts for members & owners
- added local strings
- created upgrade modal
- added info notice on invite member modal
- fixed router redirect after leaving team

* - improved logic in team-billing
- error display on upgrade modal
- added better launch.json for VSCode debugger
- fixed bug with missing inviteeUserId

* code cleanup

* nit pick fixes i should sleep now

* fixed leave team bug
- quantity would not decrease upon leave or removal

* added stripe billing callback handler

* - better launch.json
- teams empty component

* - fixed error not removing after successful pro upgrade
- fixed silent fail on team create name conflict
- fixed input border radius on member invite modal

* updated local strings

* improved logic for edge cases, such as:
- team owned by member sponsored by another team can smoothly upgrade to pro if kicked from sponsored team
- logic to calculate if owner is specifically missing pro subscription (ownerIsMissingSeat)
- corrected calculation of members missing seats, shouldn't care for proPaidForByTeamId as that only matters for removing member and preserving pro if they pay for it themselves
- added react query devtools
- added missing locale string

* - allow type override for LinkIconButton
- consolidate filter logic for getMembersMissingSeats

* - only activate team billing for hosted cal
- fix prod price keys

* fix requiresUpgrade when not hosted by cal

* added HOSTED_CAL_FEATURES

* fixed failing build

- fixed broken import path
- added support for premium price plan. (will consider premium as a valid seat)
- remove rouge console log

* fix customer id type error

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-07 23:35:26 +00:00
github-actions[bot]
4a13448595
New Crowdin translations by Github Action (#1723)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-07 19:55:24 +00:00
Peer Richelsen
19d1744138
smaller layout improvements to event-types edit (#1724)
* made event-type full width clickable

* fixed event locaiton dialog buttons on mobile

* some smaller changes on event-types
2022-02-07 16:26:08 +00:00
github-actions[bot]
42b1f090b0
New Crowdin translations by Github Action (#1713)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-06 19:34:18 +00:00
github-actions[bot]
34a75090c4
New Crowdin translations by Github Action (#1704)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-04 23:37:11 +00:00
Ken Miller
ae5d5e1261
Tandem Video (#1671)
* Tandem Video

* Updating some copy

* adding some instructions for getting client id + secret

* PR Feedback

* removing spurious tsconfig file
2022-02-04 18:30:52 +00:00
github-actions[bot]
3bddb58fc2
New Crowdin translations by Github Action (#1698)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-04 00:01:40 +00:00
Syed Ali Shahbaz
675340cb73
availability: end time should not be lower than start time (#1673)
* added start-end time check

* fixed init value for selected

* added zod validation

* cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-03 13:23:29 +00:00
github-actions[bot]
72d029d9f6
New Crowdin translations by Github Action (#1696)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-03 12:25:11 +00:00
Rohan Gupta
64db8d1cd4
Add Huddle01 integration (#1675)
* Add Huddle01 integration

* updated huddle01 locale strings

Co-authored-by: deepso <deeps.o7o8.y@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-03 11:59:02 +00:00
github-actions[bot]
6fb67bff20
New Crowdin translations by Github Action (#1690)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-02 18:51:26 +00:00
github-actions[bot]
8ede48b1a8
New Crowdin translations by Github Action (#1684)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-02 11:11:56 +00:00
github-actions[bot]
d9bb8aacfc
New Crowdin translations by Github Action (#1680)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-01 22:16:41 +00:00
Peer Richelsen
c3da8a852f
wip (#1678) 2022-02-01 22:05:31 +00:00
Edward Fernández
1d10874890
Web3 App (#1603)
* Crypto events (#1390)

* update schemas, functions & ui to allow creating and updating events with a smart contract property

* remove adding sc address in the dialog that first pops-up when creating a new event, since its an advanced option

* add sc to booking ui

* some more ts && error handling

* fetch erc20s and nfts list in event-type page

* some cleanup within time limit

* ts fix 1

* more ts fixes

* added web3 section to integrations

* added web3 wrapper, needs connection to user_settings db

* extract to api

* Update eventType.ts

* Update components/CryptoSection.tsx

Change comment from // to /** as @zomars suggested

Co-authored-by: Omar López <zomars@me.com>

* convert axios to fetch, change scAddress to smartContractAddress, load bloxy from next_public_env

* Fix branch conflict

* add enable/disable btn web3

* fixed away user causing duplicate entries

* Remove web3 validation

* renamed web3 button in integrations

* remove unused variable

* Add metadata column

* added loader and showToast to the web3 btn

* fix: remove smartContractAddress from info sended

* send to user events when the contract is missing

* use window.web3 instead of web3

* use NEXT_PUBLIC_WEB3_AUTH_MSG

* remove web3 auth from .env

* wip

* wip

* Add metamask not installed msg and success redirect

* add redirect when verified

* styled web3 button and added i18n to web3

* fixed redirect after verification

* wip

* wip

* moved crypto section to ee

Co-authored-by: Yuval Drori <53199044+yuvd@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Yuval Drori <yuvald29@protonmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-01 21:48:40 +00:00
github-actions[bot]
a81bb67cb1
New Crowdin translations by Github Action (#1672)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-02-01 13:03:10 +00:00
github-actions[bot]
b8dc26b9d3
New Crowdin translations by Github Action (#1662)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-31 10:33:31 +00:00
Bailey Pumfleet
ff3569fdf8 Add instructions for importer 2022-01-31 10:18:12 +00:00
github-actions[bot]
811f4351a5
New Crowdin translations by Github Action (#1652)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-29 19:05:31 +00:00
github-actions[bot]
a8d2cf0b58
New Crowdin translations by Github Action (#1647)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-29 13:35:43 +00:00
github-actions[bot]
77ac5542dd
New Crowdin translations by Github Action (#1645)
* New Crowdin translations by Github Action

* Update common.json

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-29 13:32:51 +00:00
Omar López
2fbdb93efb
Allows for in-app upgrade (#1642) 2022-01-28 17:46:35 -07:00
Nikolay Rademacher
07b75dadbd
feat: add option to provide cancellation reason for email (#1587)
* feat: add option to provide cancellation reason for email

* chore: move pos of getCancellationReason method in classes

* fix: only show cancellation reason if given
2022-01-28 10:40:29 -07:00
github-actions[bot]
067a48093a
New Crowdin translations by Github Action (#1641)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-28 13:25:32 +00:00
github-actions[bot]
c720e4e960
New Crowdin translations by Github Action (#1628)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-27 14:12:33 +00:00
Jamie Pine
e06edadda5
Improved authentication screens (Login/Logout/Forgot Password) (#1627) 2022-01-27 10:16:20 +00:00
github-actions[bot]
c59dce1284
New Crowdin translations by Github Action (#1620)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-26 16:35:04 +00:00
github-actions[bot]
c57debe600
New Crowdin translations by Github Action (#1614)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-25 16:44:28 +00:00
Peer Richelsen
1bf4913051
added <InfoBadge> component with tooltip (#1609)
* added <InfoBadge> component with tooltip, added to event-types event name

* added title to <InfoBadge> for a12y
2022-01-25 00:31:05 +00:00
github-actions[bot]
89bfff9a0b
New Crowdin translations by Github Action (#1598)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-24 15:09:50 +00:00
Omar López
c91b46c9fb
Adds missing locale (#1576) 2022-01-20 18:26:34 +00:00
github-actions[bot]
dabd82d018
New Crowdin translations by Github Action (#1574)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-20 15:50:00 +00:00
github-actions[bot]
32dc258077
New Crowdin translations by Github Action (#1559)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-19 10:14:20 +00:00
Philipp Dormann
f371595ae0
german translation improvements (#1553)
* several typo fixes

* Problemlösungen -> Problembehandlung

* "aktzeptiert" typo -> "akzeptiert"

* "Embed" -> "Einbetten"

* several readability adjustments

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-18 23:03:29 +00:00
github-actions[bot]
97f971b8a5
New Crowdin translations by Github Action (#1532)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-18 22:31:11 +00:00
Bailey Pumfleet
33694196e1
Calendly & SavvyCal import (#1512)
* Calendly & SavvyCal import

* added string keys to import

* Update pages/api/import/savvycal.ts

Co-authored-by: Omar López <zomars@me.com>

* Update pages/api/import/savvycal.ts

Co-authored-by: Omar López <zomars@me.com>

* Update pages/getting-started.tsx

Co-authored-by: Omar López <zomars@me.com>

* fixed string

* prettier

Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-15 16:23:42 +00:00
github-actions[bot]
b5569c6b1c
New Crowdin translations by Github Action (#1520)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-15 15:35:31 +00:00
Peer Richelsen
5e8a80001d
added roadmap link in dropdown (#1510)
* added roadmap link in dropdown

* Update public/static/locales/en/common.json

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-01-14 20:39:17 +00:00
Syed Ali Shahbaz
fac4de1144
Enhancement/cal 708 delete account (#1403)
* --WIP

* --WIP

* --WIP

* added prisma migration and delete cascade for user

* stripe customer removal and other --wip

* --wip

* added stripe user delete

* removed log remnants

* fixed signout import

* cleanup

* Changes requested

* fixed common-json apostrophe

* Simplifies account deletion logic and add e2e tests

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-01-14 13:49:15 +00:00
Deepak Prabhakara
1a20b0a0c6
Add log in with Google and SAML (#1192)
* Add log in with Google

* Fix merge conflicts

* Merge branch 'main' into feature/copy-add-identity-provider

# Conflicts:
#	pages/api/auth/[...nextauth].tsx
#	pages/api/auth/forgot-password.ts
#	pages/settings/security.tsx
#	prisma/schema.prisma
#	public/static/locales/en/common.json

* WIP: SAML login

* fixed login

* fixed verified_email check for Google

* tweaks to padding

* added BoxyHQ SAML service to local docker-compose

* identityProvider is missing from the select clause

* user may be undefined

* fix for yarn build

* Added SAML configuration to Settings -> Security page

* UI tweaks

* get saml login flag from the server

* UI tweaks

* moved SAMLConfiguration to a component in ee

* updated saml migration date

* fixed merge conflict

* fixed merge conflict

* lint fixes

* check-types fixes

* check-types fixes

* fixed type errors

* updated docker image for SAML Jackson

* added api keys config

* added default values for SAML_TENANT_ID and SAML_PRODUCT_ID

* - move all env vars related to saml into a separate file for easy access
- added SAML_ADMINS comma separated list of emails that will be able to configure the SAML metadata

* cleanup after merging main

* revert mistake during merge

* revert mistake during merge

* set info text to indicate SAML has been configured.

* tweaks to text

* tweaks to text

* i18n text

* i18n text

* tweak

* use a separate db for saml to avoid Prisma schema being out of sync

* use separate docker-compose file for saml

* padding tweak

* Prepare for implementing SAML login for the hosted solution

* WIP: Support for SAML in the hosted solution

* teams view has changed, adjusting saml changes accordingly

* enabled SAML only for PRO plan

* if user was invited and signs in via saml/google then update the user record

* WIP: embed saml lib

* 302 instead of 307

* no separate docker-compose file for saml

* - ogs cleanup
- type fixes

* fixed types for jackson

* cleaned up cors, not needed by the oauth flow

* updated jackson to support encryption at rest

* updated saml-jackson lib

* allow only the required http methods

* fixed issue with latest merge with main

* - Added instructions for deploying SAML support
- Tweaked SAML audience identifier

* fixed check for hosted Cal instance

* Added a new route to initiate Google and SAML login flows

* updated saml-jackson lib (node engine version is now 14.x or above)

* moved SAML instructions from Google Docs to a docs file

* moved randomString to lib

* comment SAML_DATABASE_URL and SAML_ADMINS in .env.example so that default is SAML off.

* fixed path to randomString

* updated @boxyhq/saml-jackson to v0.3.0

* fixed TS errors

* tweaked SAML config UI

* fixed types

* added e2e test for Google login

* setup secrets for Google login test

* test for OAuth login buttons (Google and SAML)

* enabled saml for the test

* added test for SAML config UI

* fixed nextauth import

* use pkce flow

* tweaked NextAuth config for saml

* updated saml-jackson

* added ability to delete SAML configuration

* SAML variables explainers and refactoring

* Prevents constant collision

* Var name changes

* Env explainers

* better validation for email

Co-authored-by: Omar López <zomars@me.com>

* enabled GOOGLE_API_CREDENTIALS in e2e tests (Github Actions secret)

* cleanup (will create an issue to handle forgot password for Google and SAML identities)

Co-authored-by: Chris <76668588+bytesbuffer@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-01-13 20:05:23 +00:00
github-actions[bot]
ffc0f460a0
New Crowdin translations by Github Action (#1500)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-13 19:53:26 +00:00
github-actions[bot]
643e64a0e4
New Crowdin translations by Github Action (#1493) 2022-01-12 22:17:09 +00:00
Bailey Pumfleet
f7fda47534
Add ability to change email (#1492) 2022-01-12 21:54:48 +00:00