Commit Graph

4902 Commits (2dddd4ce7790f11ea8a644e0b52c66811fafaa88)

Author SHA1 Message Date
Syed Ali Shahbaz 522875da74
Brand color without correct hex value compatibility (#1737)
* enabled fallback support and og-brand-color fix

* --added react-colorful package

* added colorpicker component and added it to settings/profile

* lint fix

* typo fix in server/viewer

* clean-up

* improved colorpicker component

* added swatch component and integrated with brand color picker

* improved ux for color picker swatch

* added colorname integration

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 09:13:42 -07:00
Syed Ali Shahbaz 447def5849
Timeslot selectable times fix for not UTC timezones in Availability (#1721)
* --wip

* fix for event type availability tz mismatch

* cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-08 09:01:18 -07:00
Omar López 00a79bdaba
Ignores e2e test for translation PRs (#1748) 2022-02-08 15:42:05 +00: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
Peer Richelsen 476399abe8
fixed type for stripe (#1746) 2022-02-08 15:18:10 +00:00
Bailey Pumfleet ce3947ac4c
Fetch only CalDAV calendars via TSDav (#1727)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-08 14:56:49 +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
Arthur Denner c201bfab2d
fix: add missing items to app.json (#1732)
* fix: add Postgres addon to app.json

* feat: add BASE_URL env variable to app.json

* fix: add JWT_SECRET env variable to app.json

* fix: add postdeploy script to app.json

* fix: add CALENDSO_ENCRYPTION_KEY env variable to app.json
2022-02-07 22:01:51 +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 fb38c062ae
added verified badge to profile (#1710)
* added verified badge to profile

* added verified to schema

* made verified optional

* generated missing migration

* add if exists

Co-authored-by: Jamie <ijamespine@me.com>
2022-02-07 17:16:20 +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
Miguel Nieto A d14c7ed5c6
Update project-folder in README (#1726) 2022-02-07 16:19:44 +00:00
Peer Richelsen 5c98eee647
made event-type full width clickable (#1722) 2022-02-07 12:33:15 +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
Peer Richelsen df00df5124
increased zindex of bottom nav (#1712) 2022-02-06 18:37:30 +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
Jamie Pine d0a6d6a6e6
Better 2FA Interface (#1707)
* - added TwoFactor component
- added react-digit-input package
- added SAMLLogin component
- upgraded auth/logic to react-hook-form
- fixed EmailField to match other ___Field components to include Label
- cleaned up login logic

* upgraded error component

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-04 20:30:36 +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
Peer Richelsen dedf001237
Update README.md 2022-02-04 13:18:20 +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
Alex van Andel cd208d29ab
Re-implemented smartContractAddress guards (#1703) 2022-02-03 23:23:20 +00:00
Alex van Andel c0081b971b
Works on local, fingers crossed (#1701) 2022-02-03 22:31:22 +00:00
Peer Richelsen 6ea2c47942
removed redirects for web3, needs dialog in booking page (#1700)
* removed redirects, better: ask for verification in follow up pr for event-type pages

* fuck ts honestly

* ignoring type issues lol
2022-02-03 20:08:25 +00:00
Bailey Pumfleet b202c7b595 Reduce minimum time to 1 minute 2022-02-03 17:04:44 +00:00
Peer Richelsen 656d319cd9
removed web3 from .env.example 2022-02-03 14:29:44 +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
Syed Ali Shahbaz c709f9ed1b
fixed attendee language per attendee (#1694)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-03 12:29:41 +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
Peer Richelsen acf8b83b1a
added cz to dropdown (#1688)
* added cz to dropdown

* Update next-i18next.config.js
2022-02-02 18:53:16 +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
Deepak Prabhakara 7b65942de2
Feature/sso signup (#1555)
* updated saml-jackson

* if logged in redirect to getting-started page with username in the query param

* fixed issue with mixed up Google login, profile.id is undefined and this is causing the first record to be retrieved instead of the AND query failing

* updated updated saml-jackson

* document PGSSLMODE for Heroku

* tweaks to PGSSLMODE doc

* for self-hosted instance just allow user to signin with any identity (as long as email matches)

* fixed submitting flag

* added username to onboarding flow (if requested during signup)

* added telemetry for google login, saml login, saml config

* check if firstName and lastName are defined

* convert mutation to an async op

* added e2e test to ensure username query param gets picked up during onboarding

* fixed minor typo and added note about configuring Google integration as an Internal app when self-hosting

* cleaned up unnecessary ssr in sso signup routes

* renamed function

* Revert "cleaned up unnecessary ssr in sso signup routes"

This reverts commit 3607ffef79.

* moved client side code to useEffect hook

* - format
- fixed Save button in SAML config component

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-02 18:33:27 +00:00
Bailey Pumfleet bf74fab0d3
Disable email on profile update 2022-02-02 12:15:23 +00:00
Peer Richelsen 91a73c8105
small darkmode fix for web3 (#1685) 2022-02-02 11:30:37 +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
Alex van Andel f52e277dc4
Web3 hotfixes to latest main (#1681)
* Fixed import of web3 dir

* Invalid way of including the zodResolver, exposed by updating 2.8.3 to 2.8.5 in @hookform/resolvers

* smartContractAddress is added conditionally, so added check to reflect this in the updateMutation
2022-02-02 11:07:13 +00:00
Peer Richelsen 8bb3e9c0be
RTL (right-to-left) layout (#1654)
* added rtl to body

* added locale checkker in _document.tsx to check for ar or he locale

* added rtl modifiers for event-types

* added rtl classes

* wip

* wip

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-01 22:17:37 +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 60426aae74
Fix/web3 hotfixes (#1679)
* wip

* wip
2022-02-01 22:06:43 +00:00
Peer Richelsen c3da8a852f
wip (#1678) 2022-02-01 22:05:31 +00:00
Peer Richelsen aa28cf0641
using button loading props vs Loader component (#1677) 2022-02-01 21:52:54 +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
Peer Richelsen de32c0c3ca
renamed github (#1667) 2022-02-01 10:19:22 +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
Vladimir Klimontovich faa295837c
Fixed typo in README.md (#1656)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-01-31 10:30:05 +00:00
Bailey Pumfleet ff3569fdf8 Add instructions for importer 2022-01-31 10:18:12 +00:00
depfu[bot] 12fa906031
Update next to version 12.0.9 (#1643)
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-01-29 19:53:25 +00:00