Commit graph

144 commits

Author SHA1 Message Date
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
github-actions[bot]
fbc1df9a30
New Crowdin translations by Github Action (#1475)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-12 13:13:24 +00:00
Bailey Pumfleet
7739994f4e
Add an away mode to disable your booking page (#1418)
* Add away column and status circle

* Add away status toggle

* Show message on booking page when away

* Update common.json

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-11 10:32:40 +00:00
github-actions[bot]
f0abf47ecc
New Crowdin translations by Github Action (#1465)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-10 23:32:53 +00:00
github-actions[bot]
57eeb48a8e
New Crowdin translations by Github Action (#1433)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-07 22:24:48 +00:00
Bailey Pumfleet
bf46038474
Update common.json 2022-01-07 10:23:07 +00:00
github-actions[bot]
592dcd36b3
New Crowdin translations by Github Action (#1412)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-06 10:12:35 +00:00
github-actions[bot]
80bd7fd89b
New Crowdin translations by Github Action (#1407)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-01-04 10:05:19 +00:00
Omar López
4cd7a4ce5b
Adds trial banner and in-app upgrade (#1402)
* WIP trial banner

* Fixes days left count

* Defers stripe loading until needed

* Fixes auth issues

* Checkout fixes

* Allows for signup testing

* Debugging checkout

* Adds tests for trial banner

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-03 22:50:59 +00:00
github-actions[bot]
f91ed7837c
New Crowdin translations by Github Action (#1384)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2021-12-27 15:31:27 +01:00
Adrien La
1567feb75e
i18n - Translate booking status when empty screen (#1219)
* i18n translate booking status when empty screen

* i18n - status key added to fr & en

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-27 13:29:43 +01:00
github-actions[bot]
43a721dce6
New Crowdin translations by Github Action (#1381)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2021-12-27 13:11:23 +01:00
albanobattistella
0f82427b1e
Update common.json (#1380) 2021-12-27 12:52:24 +01:00
github-actions[bot]
fbbd7ea45a
New Crowdin translations by Github Action (#1362) 2021-12-21 12:23:40 +00:00
Omar López
7bc7b241ac
Zomars/cal 794 normalize emails in db (#1361)
* Email input UX improvements

* Makes email queries case insensitive

* Lowercases all emails

* Type fixes

* Re adds lowercase email to login

* Removes citext dependency

* Updates schema

* Migration fixes

* Added failsafes to team invites

* Team invite improvements

* Deleting the index, lowercasing 

```
calendso=> UPDATE users SET email=LOWER(email);
ERROR:  duplicate key value violates unique constraint "users.email_unique"
DETAIL:  Key (email)=(free@example.com) already exists.
```

vs.

```
calendso=> CREATE UNIQUE INDEX "users.email_unique" ON "users" (email);
ERROR:  could not create unique index "users.email_unique"
DETAIL:  Key (email)=(Free@example.com) is duplicated.
```

I think it'll be easier to rectify for users if they try to run the migrations if the index stays in place.

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-12-21 00:59:06 +00:00
Nikolay Rademacher
a6382cf07f
fix: apostrophe in delete event type text (#1353)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-12-20 15:00:16 +00:00
Alex van Andel
cbf528c33e
Allows setting the event frequency to other than event length (#1349) 2021-12-19 12:11:31 +00:00
Alex van Andel
94a10992d2
Fixes contextual translation error (NL) (#1350)
Currently it translates as "Minimum preparation time" - contextually this could be right but in our case it isn't. Re-translated as "Minimum forward notice" - it's the closest I could come up with and used by booking.nl (Dutch version of Booking.com) - so I reckon that's best.
2021-12-18 10:44:19 +00:00
Peer Richelsen
6b426b5386
Revert "removed empty language files, triyng to debug crowdin (#1341)" (#1344) 2021-12-17 11:32:23 +00:00
Peer Richelsen
c0c4cb53db
removed empty language files, triyng to debug crowdin (#1341) 2021-12-17 00:29:08 +00:00
Jamie Pine
c21f0c2d49
Even Better Teams (#1304)
- dropdown improvements
- Improve performance of team availability
- Fix default timezone
- Allow team admins to edit event types
- Change team availability slot input to dropdown select (15,30,60)
- Prevent teams from access if not pro user
2021-12-17 00:16:59 +00:00