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

Jump to bottom

fix(core): update pricing pages #7521

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fix(core): update pricing pages #7521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,11 @@ export const CloudPlanLayout = ({
<ScrollArea.Thumb className={styles.scrollThumb}></ScrollArea.Thumb>
</ScrollArea.Scrollbar>
</ScrollArea.Root>
{lifetime ? <div id="lifetimePricingPlan">{lifetime}</div> : null}
{lifetime ? (
<div style={{ paddingTop: 12 }} id="lifetimePricingPlan">
{lifetime}
</div>
) : null}
</PricingCollapsible>
);
};
5 changes: 0 additions & 5 deletions ...tend/core/src/components/affine/setting-modal/general-setting/plans/lifetime/benefits.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ export const BelieverBenefits = ({
})}
</span>
</li>

<li className={li}>
<DoneIcon />
<span>{t['com.affine.payment.lifetime.benefit-4']()}</span>
</li>
</ul>
);
};
2 changes: 1 addition & 1 deletion ...core/src/components/affine/setting-modal/general-setting/plans/lifetime/lifetime-plan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const LifetimePlan = () => {
<Trans
i18nKey="com.affine.payment.lifetime.caption-2"
components={{
a: <a className={styles.usePolicyLink} href="#" />,
a: <a className={styles.userPolicyLink} href="#" />,
}}
/>
</div>
Expand Down
9 changes: 6 additions & 3 deletions ...tend/core/src/components/affine/setting-modal/general-setting/plans/lifetime/style.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ export const caption2 = style({
marginBottom: 16,
maxWidth: 324,
});
export const usePolicyLink = style({
color: cssVar('textPrimaryColor'),
textDecoration: 'underline',
export const userPolicyLink = style({
// link not ready
// color: cssVar('textPrimaryColor'),
// textDecoration: 'underline',
color: 'inherit',
cursor: 'text',
});
10 changes: 5 additions & 5 deletions packages/frontend/i18n/src/resources/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{

Check notice on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

Unused keys 

com.affine.payment.disable-payment.title, com.affine.payment.disable-payment.description, com.affine.just-now

Check warning on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

Inconsistent keys 

com.affine.cmdk.affine.create-new-edgeless-as, com.affine.cmdk.affine.create-new-page-as, com.affine.cmdk.affine.create-new-doc-and-insert, com.affine.payment.ai.pricing-plan.caption-free, com.affine.payment.cloud.team.title

Check notice on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

New keys 

Get in touch! Join our communities., It takes up little space on your device., It takes up more space on your device., com.affine.auth.open.affine.download-app, com.affine.auth.open.affine.prompt, com.affine.auth.open.affine.try-again, com.affine.auth.reset.password.message, com.affine.auth.reset.password.page.success, com.affine.auth.sent.change.email.hint, com.affine.auth.sent.reset.password.success.message, com.affine.auth.sent.set.password.hint, com.affine.auth.sent.set.password.success.message, com.affine.auth.set.password.save, com.affine.auth.sign.up.sent.email.subtitle, com.affine.auth.sign.up.success.title, com.affine.editCollection.rules.tips.highlight, com.affine.page-properties.add-property.menu.create, com.affine.page-properties.add-property.menu.header, com.affine.pageMode.all, com.affine.pageMode.edgeless, com.affine.pageMode.page, com.affine.setting.account.delete.message, com.affine.settings.appearance.border-style-description, com.affine.settings.appearance.start-week-description, com.affine.settings.email.action, com.affine.settings.password.action.change, com.affine.settings.password.action.set, com.affine.settings.password.message, com.affine.settings.profile.message, com.affine.settings.profile.placeholder, com.affine.settings.workspace.experimental-features, com.affine.settings.workspace.experimental-features.get-started, com.affine.settings.workspace.experimental-features.header.plugins, com.affine.settings.workspace.experimental-features.prompt-disclaimer, com.affine.settings.workspace.experimental-features.prompt-header, com.affine.settings.workspace.experimental-features.prompt-warning, com.affine.settings.workspace.experimental-features.prompt-warning-title, com.affine.settings.workspace.preferences, com.affine.settings.workspace.properties, com.affine.settings.workspace.properties.add_property, com.affine.settings.workspace.properties.all, com.affine.settings.workspace.properties.delete-property, com.affine.settings.workspace.properties.doc, com.affine.settings.workspace.properties.doc_others, com.affine.settings.workspace.properties.edit-property, com.affine.settings.workspace.properties.header.subtitle, com.affine.settings.workspace.properties.header.title, com.affine.settings.workspace.properties.in-use, com.affine.settings.workspace.properties.set-as-required, com.affine.settings.workspace.properties.unused, com.affine.settings.workspace.storage.tip, com.affine.storage.maximum-tips.pro, com.affine.workspace.cloud.description

Check notice on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

Unused keys 

com.affine.payment.disable-payment.title, com.affine.payment.disable-payment.description, com.affine.just-now

Check warning on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

Inconsistent keys 

com.affine.cmdk.affine.create-new-edgeless-as, com.affine.cmdk.affine.create-new-page-as, com.affine.cmdk.affine.create-new-doc-and-insert, com.affine.payment.ai.pricing-plan.caption-free, com.affine.payment.billing-setting.current-plan.description.yearly, com.affine.payment.cloud.pricing-plan.toggle-billed-yearly, com.affine.payment.cloud.pricing-plan.toggle-yearly, com.affine.payment.cloud.pro.title.billed-yearly, com.affine.payment.cloud.team.title, com.affine.payment.recurring-yearly

Check notice on line 1 in packages/frontend/i18n/src/resources/en.json

View workflow job for this annotation

GitHub Actions / main

New keys 

Get in touch! Join our communities., It takes up little space on your device., It takes up more space on your device., com.affine.auth.open.affine.download-app, com.affine.auth.open.affine.prompt, com.affine.auth.open.affine.try-again, com.affine.auth.reset.password.message, com.affine.auth.reset.password.page.success, com.affine.auth.sent.change.email.hint, com.affine.auth.sent.reset.password.success.message, com.affine.auth.sent.set.password.hint, com.affine.auth.sent.set.password.success.message, com.affine.auth.set.password.save, com.affine.auth.sign.up.sent.email.subtitle, com.affine.auth.sign.up.success.title, com.affine.editCollection.rules.tips.highlight, com.affine.page-properties.add-property.menu.create, com.affine.page-properties.add-property.menu.header, com.affine.pageMode.all, com.affine.pageMode.edgeless, com.affine.pageMode.page, com.affine.setting.account.delete.message, com.affine.settings.appearance.border-style-description, com.affine.settings.appearance.start-week-description, com.affine.settings.email.action, com.affine.settings.password.action.change, com.affine.settings.password.action.set, com.affine.settings.password.message, com.affine.settings.profile.message, com.affine.settings.profile.placeholder, com.affine.settings.workspace.experimental-features, com.affine.settings.workspace.experimental-features.get-started, com.affine.settings.workspace.experimental-features.header.plugins, com.affine.settings.workspace.experimental-features.prompt-disclaimer, com.affine.settings.workspace.experimental-features.prompt-header, com.affine.settings.workspace.experimental-features.prompt-warning, com.affine.settings.workspace.experimental-features.prompt-warning-title, com.affine.settings.workspace.preferences, com.affine.settings.workspace.properties, com.affine.settings.workspace.properties.add_property, com.affine.settings.workspace.properties.all, com.affine.settings.workspace.properties.delete-property, com.affine.settings.workspace.properties.doc, com.affine.settings.workspace.properties.doc_others, com.affine.settings.workspace.properties.edit-property, com.affine.settings.workspace.properties.header.subtitle, com.affine.settings.workspace.properties.header.title, com.affine.settings.workspace.properties.in-use, com.affine.settings.workspace.properties.set-as-required, com.affine.settings.workspace.properties.unused, com.affine.settings.workspace.storage.tip, com.affine.storage.maximum-tips.pro, com.affine.workspace.cloud.description
"404 - Page Not Found": "404 - Page Not Found",
"404.back": "Back to My Content",
"404.hint": "Sorry, you do not have access or this content does not exist...",
Expand Down Expand Up @@ -944,7 +944,7 @@
"com.affine.payment.billing-setting.current-plan": "AFFiNE Cloud",
"com.affine.payment.billing-setting.current-plan.description": "You are currently on the <1>{{planName}} plan</1>.",
"com.affine.payment.billing-setting.current-plan.description.monthly": "You are currently on the monthly <1>{{planName}} plan</1>.",
"com.affine.payment.billing-setting.current-plan.description.yearly": "You are currently on the yearly <1>{{planName}} plan</1>.",
"com.affine.payment.billing-setting.current-plan.description.yearly": "You are currently on the annually <1>{{planName}} plan</1>.",
"com.affine.payment.billing-setting.current-plan.description.lifetime": "You are currently on the believer <1>{{planName}} plan</1>.",
"com.affine.payment.billing-setting.expiration-date": "Expiration Date",
"com.affine.payment.billing-setting.expiration-date.description": "Your subscription is valid until {{expirationDate}}",
Expand Down Expand Up @@ -991,9 +991,9 @@
"com.affine.payment.cloud.free.title": "Free forever",
"com.affine.payment.cloud.pricing-plan.select.caption": "We host, no technical setup required.",
"com.affine.payment.cloud.pricing-plan.select.title": "Hosted by AFFiNE.Pro",
"com.affine.payment.cloud.pricing-plan.toggle-billed-yearly": "Billed Yearly",
"com.affine.payment.cloud.pricing-plan.toggle-billed-yearly": "Billed Annually",
"com.affine.payment.cloud.pricing-plan.toggle-discount": "Saving {{discount}}%",
"com.affine.payment.cloud.pricing-plan.toggle-yearly": "Yearly",
"com.affine.payment.cloud.pricing-plan.toggle-yearly": "Annually",
"com.affine.payment.cloud.pro.benefit.g1": "Include in Pro",
"com.affine.payment.cloud.pro.benefit.g1-1": "Everything in AFFiNE FOSS & Basic.",
"com.affine.payment.cloud.pro.benefit.g1-2": "100 GB of Cloud Storage.",
Expand All @@ -1005,7 +1005,7 @@
"com.affine.payment.cloud.pro.benefit.g1-8": "Real-time Syncing & Collaboration for more people.",
"com.affine.payment.cloud.pro.description": "For family and small teams.",
"com.affine.payment.cloud.pro.name": "Pro",
"com.affine.payment.cloud.pro.title.billed-yearly": "billed yearly",
"com.affine.payment.cloud.pro.title.billed-yearly": "billed annually",
"com.affine.payment.cloud.pro.title.price-monthly": "{{price}} per month",
"com.affine.payment.cloud.team.benefit.g1": "Both in Team & Enterprise",
"com.affine.payment.cloud.team.benefit.g1-1": "Everything in AFFiNE Pro.",
Expand Down Expand Up @@ -1064,7 +1064,7 @@
"com.affine.payment.plans-error-tip": "Unable to load Pricing plans, please check your network. ",
"com.affine.payment.price-description.per-month": "per month",
"com.affine.payment.recurring-monthly": "monthly",
"com.affine.payment.recurring-yearly": "yearly",
"com.affine.payment.recurring-yearly": "annually",
"com.affine.payment.resume": "Resume",
"com.affine.payment.resume-renewal": "Resume Auto-renewal",
"com.affine.payment.see-all-plans": "See all plans",
Expand Down
Loading