Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(web): Minor UI fix in billing plans #6665

Merged
merged 3 commits into from
Oct 16, 2024
Merged

fix(web): Minor UI fix in billing plans #6665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f04d59
Update Features.tsx
SokratisVidros Oct 9, 2024
2f38a21
Minor copywriting fix.
SokratisVidros Oct 9, 2024
a54c32a
Update .source
SokratisVidros Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .source
Open in desktop
Submodule .source updated from bc0193 to 0f6c1f
2 changes: 1 addition & 1 deletion apps/web/src/components/nav/SettingsNavMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const SettingsNavMenu: React.FC = () => {
></NavMenuLinkButton>
</When>
<NavMenuLinkButton
label="Billing"
label="Plans & Billing"
isVisible
icon={<IconCreditCard />}
link={ROUTES.BILLING}
Expand Down
61 changes: 12 additions & 49 deletions apps/web/src/ee/billing/components/Features.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ type Feature = {
const features: Feature[] = [
{
label: 'Platform',
isContrast: false,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was refactored so that we never have to adjacent background colors that are the same.

isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -70,7 +69,6 @@ const features: Feature[] = [
},
{
label: 'Monthly events',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: 'Up to 30,000' },
[SupportedPlansEnum.BUSINESS]: { value: 'Up to 250,000' },
Expand All @@ -79,7 +77,6 @@ const features: Feature[] = [
},
{
label: 'Additional Events',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: '$0.0012 per event' },
Expand All @@ -88,7 +85,6 @@ const features: Feature[] = [
},
{
label: 'Email, InApp, SMS, Chat, Push Channels',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -97,7 +93,6 @@ const features: Feature[] = [
},
{
label: 'Notification subscribers',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: 'Unlimited' },
[SupportedPlansEnum.BUSINESS]: { value: 'Unlimited' },
Expand All @@ -106,7 +101,6 @@ const features: Feature[] = [
},
{
label: 'Framework',
isContrast: false,
isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -116,7 +110,6 @@ const features: Feature[] = [
},
{
label: 'Total workflows',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: 'Unlimited' },
[SupportedPlansEnum.BUSINESS]: { value: 'Unlimited' },
Expand All @@ -125,16 +118,14 @@ const features: Feature[] = [
},
{
label: 'Provider integrations',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: 'Unlimited' },
[SupportedPlansEnum.BUSINESS]: { value: 'Unlimited' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'Unlimited' },
},
},
{
label: 'Activity retention',
isContrast: false,
label: 'Activity Feed retention',
values: {
[SupportedPlansEnum.FREE]: { value: '30 days' },
[SupportedPlansEnum.BUSINESS]: { value: '90 days' },
Expand All @@ -143,7 +134,6 @@ const features: Feature[] = [
},
{
label: 'Digests',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -152,7 +142,6 @@ const features: Feature[] = [
},
{
label: 'Step controls',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -161,7 +150,6 @@ const features: Feature[] = [
},
{
label: 'Inbox',
isContrast: true,
isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -171,7 +159,6 @@ const features: Feature[] = [
},
{
label: 'Inbox component',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -180,7 +167,6 @@ const features: Feature[] = [
},
{
label: 'User preferences component',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -189,25 +175,14 @@ const features: Feature[] = [
},
{
label: 'Remove Novu branding',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
[SupportedPlansEnum.ENTERPRISE]: { value: <IconCheck /> },
},
},
{
label: 'Notifications retention',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: <Badge label="Coming soon" /> },
[SupportedPlansEnum.BUSINESS]: { value: <Badge label="Coming soon" /> },
[SupportedPlansEnum.ENTERPRISE]: { value: <Badge label="Coming soon" /> },
},
},
{
label: 'Account administration and security',
isContrast: false,
isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -217,25 +192,22 @@ const features: Feature[] = [
},
{
label: 'Team members',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: '3' },
[SupportedPlansEnum.BUSINESS]: { value: '50' },
[SupportedPlansEnum.BUSINESS]: { value: '10' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'Unlimited' },
},
},
{
label: 'RBAC',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
[SupportedPlansEnum.ENTERPRISE]: { value: <IconCheck /> },
},
},
{
label: 'GDPR compliance',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: <IconCheck /> },
[SupportedPlansEnum.BUSINESS]: { value: <IconCheck /> },
Expand All @@ -244,7 +216,6 @@ const features: Feature[] = [
},
{
label: 'SAML SSO and Enterprise SSO providers',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: '-' },
Expand All @@ -253,7 +224,6 @@ const features: Feature[] = [
},
{
label: 'Support and account management',
isContrast: true,
isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -263,25 +233,22 @@ const features: Feature[] = [
},
{
label: 'Support SLA',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: 'Community & Intercom' },
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: '48 hours' },
[SupportedPlansEnum.ENTERPRISE]: { value: '24 hours' },
},
},
{
label: 'Support channels',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: 'Community & Intercom' },
[SupportedPlansEnum.BUSINESS]: { value: 'Chat and Email' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'Dedicated support' },
[SupportedPlansEnum.FREE]: { value: 'Community & Discord' },
[SupportedPlansEnum.BUSINESS]: { value: 'Slack & Email' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'Dedicated' },
},
},
{
label: 'Legal & Vendor management',
isContrast: false,
isTitle: true,
values: {
[SupportedPlansEnum.FREE]: { value: '' },
Expand All @@ -291,16 +258,14 @@ const features: Feature[] = [
},
{
label: 'Payment method',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: 'N/A' },
[SupportedPlansEnum.FREE]: { value: '-' },
[SupportedPlansEnum.BUSINESS]: { value: 'Credit card only' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'PO and Invoicing' },
[SupportedPlansEnum.ENTERPRISE]: { value: 'Credit card & PO and Invoicing' },
},
},
{
label: 'Terms of service',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: 'Standard' },
[SupportedPlansEnum.BUSINESS]: { value: 'Standard' },
Expand All @@ -309,7 +274,6 @@ const features: Feature[] = [
},
{
label: 'DPA',
isContrast: true,
values: {
[SupportedPlansEnum.FREE]: { value: 'Standard' },
[SupportedPlansEnum.BUSINESS]: { value: 'Standard' },
Expand All @@ -318,7 +282,6 @@ const features: Feature[] = [
},
{
label: 'Security review',
isContrast: false,
values: {
[SupportedPlansEnum.FREE]: { value: 'SOC 2 and ISO 27001 upon request' },
[SupportedPlansEnum.BUSINESS]: { value: 'Custom' },
Expand All @@ -331,14 +294,14 @@ export const Features = () => {
return (
<div className={styles.featureList}>
{features.map((feature, index) => (
<FeatureRow key={index} feature={feature} />
<FeatureRow key={index} feature={feature} index={index} />
))}
</div>
);
};

const FeatureRow = ({ feature }: { feature: Feature }) => (
<div className={styles.rowContainer(feature.isContrast, feature.isTitle)}>
const FeatureRow = ({ feature, index }: { feature: Feature; index: number }) => (
<div className={styles.rowContainer(index % 2 === 1, feature.isTitle)}>
<TitleCell>
<Text
variant={feature.isTitle ? 'strong' : undefined}
Expand Down
6 changes: 2 additions & 4 deletions apps/web/src/ee/billing/components/HighlightsRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@ const highlights: PlanHighlights = {
[ApiServiceLevelEnum.FREE]: [
{ text: 'Up to 30,000 events per month' },
{ text: '3 teammates' },
{ text: '7 days activity feed' },
{ text: '30 days Activity Feed retention' },
],
[ApiServiceLevelEnum.BUSINESS]: [
{ text: 'Up to 250,000 events per month' },
{ text: '50 teammates' },
{ text: '90 days activity feed' },
{ text: 'RBAC', badgeLabel: 'Coming soon' },
{ text: '90 days Activity Feed retention' },
],
[ApiServiceLevelEnum.ENTERPRISE]: [
{ text: 'Up to 5,000,000 events per month' },
{ text: 'Unlimited teammates' },
{ text: 'SAML SSO' },
{ text: 'RBAC', badgeLabel: 'Coming soon' },
],
};

Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/ee/clerk/pages/ManageAccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default function ManageAccountPage() {
className={normalTabStyle}
icon={<IconCreditCard className={tabIconStyle} />}
>
Billing plans
Plans & Billing
</Tabs.Tab>
</Tabs.List>

Expand Down Expand Up @@ -125,7 +125,7 @@ export default function ManageAccountPage() {
</Tabs.Panel>
)}
<Tabs.Panel value={MANAGE_ACCOUNT_ROUTE_SEGMENTS.BILLING}>
<Title className={billingTitle}>Billing plans</Title>
<Title className={billingTitle}>Plans & Billing</Title>
<BillingPage />
</Tabs.Panel>
</Tabs>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/pages/settings/BillingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SettingsPageContainer } from './SettingsPageContainer';

export const BillingPage: FC = () => {
return (
<SettingsPageContainer title={'Billing'}>
<SettingsPageContainer title={'Plans & Billing'}>
<BillingRoutes />
</SettingsPageContainer>
);
Expand Down
Loading