WIP: subscription, plan & permissions #841
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
ba4dd78
to
e22a9f8
Compare
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
e22a9f8
to
cff6086
Compare
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
cff6086
to
dc73a2d
Compare
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
dc73a2d
to
83f1757
Compare
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
83f1757
to
f96376c
Compare
elboletaire
changed the title
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
f96376c
to
ddf4638
Compare
What's done so far: - Created the new "subscription" view - Recovered the menu link to this new page - Show a table with the current subscription. It's been done as a table since it looks like it, but I'm not sure if it's useful considering there aren't plans for multiple subscriptions - Removed the "open modal" temporary button from the main menu - Such modal can now be opened using the "view plans & pricing" button in the new page - A new Subscription Provider/Context has been created, with a `permissions` method in order to check for permissions of the current plan, but it has not been applied yet anywhere - The pricing modal has been minimally changed to allow setting a custom title, and moving its contents into an independent component - Created modals for the different tier/plan upgrade scenarios
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
ddf4638
to
1d79126
Compare
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
86d5573
to
1cb3ab8
Compare
- Created a PricingModals provider and context, with their usePricingModals hook - Integrated these into the invite team memberships, showing the upgrade tier modal there (which already links to the pricing one)
elboletaire
force-pushed
the
f/subscription-permissions
branch
from
1cb3ab8
to
00d43e8
Compare
jpaulet
approved these changes
Nov 27, 2024
jpaulet
requested changes
Nov 27, 2024
| <> | ||
| <SubscriptionModal isOpen={isOpen} onClose={onClose} title={t('pricing.title')} /> | ||
| <Button onClick={onOpen} alignSelf='end'> | ||
| View Plans & Pricing |
| {subscription.plan.name} ({subscription.plan.organization.memberships} members) | ||
| </Td> | ||
| <Td> | ||
| <Tag>undefined</Tag> |
There was a problem hiding this comment.
Actually, this should be the price. Was set as undefined because I had no way to know it then. I'll fix it.
| mb={44} | ||
| mt={6} | ||
| > | ||
| <> | ||
| <Box mb={5}> | ||
| <Heading as='h1' size='xl' mb={3}> | ||
| Privacy Policy |
| mt={6} | ||
| mx='auto' | ||
| > | ||
| <> | ||
| <Heading as='h1' size='xl'> | ||
| Terms and Conditions for Vocdoni Association |
| @@ -173,7 +160,7 @@ const Terms = () => ( | |||
| By continuing to use app.vocdoni.io or onvote.app, you confirm your acceptance of these terms and your agreement | |||
yarn.lock
Outdated
There was a problem hiding this comment.
This field shouldn't be part of the git tracking...
- Trying to get rid of the plans mock, but it still needs some work (complicated when most features are missing from the plan rn) - Commented all the non implemented features in the process create form
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's done so far:
/admin/subscription)Settings -> Subscription)Responsive tables are also a problem with thefixed in 9e2899cdisplay: gridwe're using in the dashboard.permissionsmethod in order to check for permissions of the current plan, but it has not been applied yet anywhere