Commit Graph

23 Commits (55d77993af422b98345094d6f7cd8be75b84ef0b)

Author SHA1 Message Date
Omar López 0861d7cc61
Ends the war between tRPC and next-i18next (#939)
* Ends the war between tRPC and next-i18next

* Locale fixes

* Linting

* Linting

* trpc i18n (not working) (#942)

* simplify i18n handler and remove redundant(?) fn check

* split up viewer to a "logged in only" and "public"

* wip -- skip first render

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

* Linting

* I18n fixes

* We don't need serverSideTranslations in every page anymore

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-14 13:57:49 +03:00
Alex van Andel cf92deb145
Removes Headless UI from the sidenav (#935)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-10-13 14:00:40 +00:00
Omar López 9539d26ac7
Fixes location in payment page (#918)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-12 14:54:42 +00:00
Omar López 95b49a5995
Several type fixes (#855)
* Several type fixes

* Update ee/lib/stripe/client.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

* Typo

* Refactors createPaymentLink

* Simplify calendarClietn type

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-10-05 16:46:48 -06:00
Kelvin F. Alfaro 1662c9cf91
Correct License banner instructions. (#846)
* Update common.json

* Banner instructions were incorrect. 

Removed the I from "I Agree". License banner indicates setting NEXT_PUBLIC_LICENSE_CONSENT env var to "I Agree". Env var NEXT_PUBLIC_LICENSE_CONSENT set to only accept "agree"

* Update common.json

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peer@cal.com>
2021-10-02 20:37:10 +01:00
Peer Richelsen 860db6c959
added license banner (#833)
* added license banner and NEXT_PUBLIC_LICENSE_CONSENT in .env.example. agree to hide the banner

* minor changes to license banner

* added /ee/ to tailwind purge config

* wip
2021-10-01 00:42:08 +01:00
Omar López 7a8ad8381e
Fixes error when user cancels stripe integration (#813)
* Fixes customer portal return ur

* Attempt to fix portal CSRF issue

* Fixes CSRF issue with Stripe redirect

* Fixes error when user cancels stripe integration
2021-09-28 22:27:06 +01:00
Alex Johansson f8a4f81991
fix stripe `customer.subscription.deleted`-webhook (#811) 2021-09-28 19:48:45 +00:00
Omar López 230c82e316
Zomars/fixes stripe portal redirect (#808) 2021-09-28 17:21:45 +01:00
Alex Johansson a4fbe7b2b4
downgrade users when trial ends (#767)
* wip

* wip

* wip

* wtf

* should be all the logic

* comment

* fix receiver name

* safeguard a bit more

* downgrade users cron job

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-28 14:00:19 +01:00
Omar López dd9f801872
cal 485 prevent users from changing their username to premium ones (#799)
* Makes userRequired middleware

* Prevent users from changing usernames to premium ones

* refactor on zomars' branch (#801)

* rename `profile` -> `mutation`

* `createProtectedRouter()` helper

* move profile mutation to `viewer.`

* simplify checkUsername

* Auto scrolls to error when there is one

* Renames username helpers

* Follows db convention

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-28 09:57:30 +01:00
Omar López f23e4f2b9d
Fixes customer portal return url (#802) 2021-09-28 09:04:30 +01:00
Peer Richelsen 58dde562a3
switching to stripes customer portal (#772) 2021-09-27 23:57:23 +01:00
Omar López 9e7cb2c0b8
CAL-469 Adds intercom dynamically (#762)
* Adds react-use-intercom

* Adds intercom env var

* Loads intercom dynamically if env is set

* CAL-473 Fixes client-side routing for authed pages

* Moves intercom code to ee

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-24 21:02:03 +01:00
Omar López 50367c236a
Prevents a 404 page for payments (#770) 2021-09-24 17:45:35 +01:00
Omar López d194878bb2
Suggestion: let prettier sort imports order (#673)
* Suggestion: let prettier sort imports order

# Conflicts:
#	yarn.lock

* AUTO SORT ALL THE IMPORTS

* Linting

* Fixes test
2021-09-22 13:52:38 -06:00
Omar López 3add84a279
Adds Stripe integration (#717)
* Adds Stripe integration

* Moves Stripe instrucctions to ee

* Adds NEXT_PUBLIC_APP_URL variable

* Adds fallback for NEXT_PUBLIC_APP_URL

* Throws error objects instead

* Improved error handling

* Removes deprecated method

* Bug fixing

* Payment refactoring

* PaymentPage fixes

* Fixes preview links

* More preview link fixes

* Fixes client links

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-09-22 19:36:13 +01:00
Conor Meagher 96fd7ecf41
chore: change calendso strings to cal.com (#707)
* chore: change calendso strings to cal.com

* rebase LICENSE

* rebase LICENSE

* strings that were missed

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:59:34 +01:00
Peer_Rich 1891427f7f
Update README.md 2021-09-20 16:50:58 +01:00
Peer_Rich f71889566e
Calendso to Cal.com 2021-09-20 16:50:15 +01:00
Peer_Rich e3843f5a0e
Update README.md 2021-09-16 23:01:02 +01:00
Alex van Andel cf7f5ae53c
Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails (#662) 2021-09-15 21:35:55 +01:00
Peer_Rich 16f15a2f16
added readme and license for /ee folder (#633)
* added readme and license for /ee folder

* fixed company typo
2021-09-14 14:05:03 +01:00