From de8097e17ad648a63df2f50a723016baa3f4dae6 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Fri, 11 Oct 2024 22:01:58 +0800 Subject: [PATCH] pricing style looks good now --- v3/src/components/common/Scamming.jsx | 4 +- v3/src/components/widgets/Note.astro | 8 +- v3/src/components/widgets/Pricing.astro | 132 +++++++++++++++--------- v3/src/pages/about.astro | 47 +++++---- v3/src/pages/pricing.astro | 128 ++++++++++++++++------- v3/src/types.d.ts | 3 +- 6 files changed, 207 insertions(+), 115 deletions(-) diff --git a/v3/src/components/common/Scamming.jsx b/v3/src/components/common/Scamming.jsx index 1d65e41..732ed0a 100644 --- a/v3/src/components/common/Scamming.jsx +++ b/v3/src/components/common/Scamming.jsx @@ -23,8 +23,8 @@ const ScammingBanner = () => {
WARNING: YOU MAY BE BEING SCAMMED!
- If you are on the phone with someone you DON'T know AND TRUST who has asked - you to install RustDesk,
+ If you are on the phone with someone you DON'T know AND TRUST who has asked you to install RustDesk, +
do not install and hang up immediately.
They are likely a scammer trying to steal your money or other private information. diff --git a/v3/src/components/widgets/Note.astro b/v3/src/components/widgets/Note.astro index 6543b4f..d37f122 100644 --- a/v3/src/components/widgets/Note.astro +++ b/v3/src/components/widgets/Note.astro @@ -1,11 +1,15 @@ --- import { Icon } from 'astro-icon/components'; + +const { title = await Astro.slots.render('title'), subtitle = await Astro.slots.render('subtitle') } = Astro.props; ---
- Philosophy: Simplicity, Best Practices and High Performance + + : +
diff --git a/v3/src/components/widgets/Pricing.astro b/v3/src/components/widgets/Pricing.astro index 193f108..426b3e7 100644 --- a/v3/src/components/widgets/Pricing.astro +++ b/v3/src/components/widgets/Pricing.astro @@ -21,62 +21,94 @@ const {
-
+
{ prices && - prices.map(({ title, subtitle, price, period, items, callToAction, hasRibbon = false, ribbonTitle }) => ( -
- {price && period && ( -
- {hasRibbon && ribbonTitle && ( -
- - {ribbonTitle} - -
- )} -
- {title && ( -

{title}

- )} - {subtitle &&

{subtitle}

} -
-
- $ - {price} + prices.map( + ({ + title, + subtitle, + price, + period, + items, + callToAction, + callToAction2, + hasRibbon = false, + ribbonTitle, + }) => ( +
+ {price && period && ( +
+ {hasRibbon && ribbonTitle && ( +
+ + {ribbonTitle} +
- {period} -
- {items && ( -
    - {items.map( - ({ description, icon }) => - description && ( -
  • -
    - -
    - {description} -
    • - ) - )} -
)} -
- {callToAction && ( -
- {typeof callToAction === 'string' ? ( - - ) : ( - callToAction && - callToAction.href &&
- )} -
- )) + {callToAction && ( +
+ {typeof callToAction === 'string' ? ( + + ) : ( + callToAction && + callToAction.href && ( +
+ )} + {callToAction2 && ( +
+ {typeof callToAction2 === 'string' ? ( + + ) : ( + callToAction2 && + callToAction2.href && ( +
+ )} +
+ )} +
+ ) + ) }
diff --git a/v3/src/pages/about.astro b/v3/src/pages/about.astro index 730599b..641e3bb 100644 --- a/v3/src/pages/about.astro +++ b/v3/src/pages/about.astro @@ -12,16 +12,17 @@ const metadata = { - - - Why Are We Building This? - + + Why Are We Building This?

- In the midst of the Covid-19 pandemic in mid-2020, the now lead dev / founder found themselves compelled to procure a commercial license for TeamViewer to facilitate remote work in Singapore. However, they were taken aback by the exorbitant cost. Following a restless night, they embarked on a mission to create an alternative solution. Thus, RustDesk was conceived — an open-source, freely accessible remote desktop software that was diligently crafted through numerous sleepless nights. This labor of dedication and determination culminated in the release of RustDesk on GitHub in 2021, allowing it to be utilized by individuals worldwide. + In the midst of the Covid-19 pandemic in mid-2020, the now lead dev / founder found themselves compelled to + procure a commercial license for TeamViewer to facilitate remote work in Singapore. However, they were taken + aback by the exorbitant cost. Following a restless night, they embarked on a mission to create an alternative + solution. Thus, RustDesk was conceived — an open-source, freely accessible remote desktop software that was + diligently crafted through numerous sleepless nights. This labor of dedication and determination culminated in + the release of RustDesk on GitHub in 2021, allowing it to be utilized by individuals worldwide.

@@ -34,37 +35,35 @@ const metadata = { { title: 'Joseph Jacks
CEO', description: - 'Joseph Jacks founded OSS Capital in 2018. It is the world\'s first and only early stage VC dedicated exclusively to COSS (commercial open source) startups on a global basis. Previously, he helped start and run the very first Kubernetes startup (Kismatic) and also found and run KubeCon (the Kubernetes community conference) before donating it to the Linux Foundation in 2016 as the CNCF (Cloud Native Computing Foundation) was materializing.', - icon: "tabler:user", + "Joseph Jacks founded OSS Capital in 2018. It is the world's first and only early stage VC dedicated exclusively to COSS (commercial open source) startups on a global basis. Previously, he helped start and run the very first Kubernetes startup (Kismatic) and also found and run KubeCon (the Kubernetes community conference) before donating it to the Linux Foundation in 2016 as the CNCF (Cloud Native Computing Foundation) was materializing.", + icon: 'tabler:user', }, { title: 'Huabing Zhou
CTO', description: 'Prior to founding and developing RustDesk, Huabing Zhou accumulated over 12 years of experience in the field of financial IT while working in Singapore. Bringing a wealth of real life experience to both the project and managing the business.', - icon: "tabler:user", + icon: 'tabler:user', }, { title: 'Daniel Lamb
Community Assistant', description: - 'With a remarkable quarter century career in the IT industry, Daniel Lamb has actively participated in numerous open-source projects, assuming various roles and responsibilities. Additionally, he has accomplished the establishment of an IT services company based in Scotland, catering to customers worldwide. Daniel\'s extensive expertise encompasses support, sales, and community engagement, bringing a large amount of knowledge and experience to the project.', - icon: "tabler:user", + "With a remarkable quarter century career in the IT industry, Daniel Lamb has actively participated in numerous open-source projects, assuming various roles and responsibilities. Additionally, he has accomplished the establishment of an IT services company based in Scotland, catering to customers worldwide. Daniel's extensive expertise encompasses support, sales, and community engagement, bringing a large amount of knowledge and experience to the project.", + icon: 'tabler:user', }, ]} /> - - + title="Our locations" + tagline="Find us" + columns={1} + items={[ + { + title: 'Singapore', + description: '18A, Canberra Drive, Yishun', + }, + ]} + /> diff --git a/v3/src/pages/pricing.astro b/v3/src/pages/pricing.astro index 0e7fb1a..05386c7 100644 --- a/v3/src/pages/pricing.astro +++ b/v3/src/pages/pricing.astro @@ -1,6 +1,6 @@ --- import Layout from '~/layouts/PageLayout.astro'; -import HeroText from '~/components/widgets/HeroText.astro'; +import Note from '~/components/widgets/Note.astro'; import Prices from '~/components/widgets/Pricing.astro'; import FAQs from '~/components/widgets/FAQs.astro'; import Steps from '~/components/widgets/Steps.astro'; @@ -13,37 +13,82 @@ const metadata = { --- - - - /month', + period: 'Open source and free', items: [ { - description: 'Etiam in libero, et volutpat', + description: 'Online status', }, { - description: 'Aenean ac nunc dolor tristique', + description: 'Community support', + }, + ], + callToAction: { + target: '_blank', + text: 'Get started', + href: 'https://rustdesk.com/docs/en/self-host/rustdesk-server-oss/', + }, + }, + { + title: 'Individual', + subtitle: 'Individual Self-hosting Pro Plan', + price: '9.90 /month', + period: 'billed annually', + items: [ + { + description: + '1 licensed user', }, { - description: 'Cras scelerisque accumsan lib', + description: + '20 managed devices', }, { - description: 'In hac habitasse', + description: + 'Unlimited concurrent connections', + }, + { + description: + '2FA', + }, + { + description: + 'Web console', + }, + { + description: 'Address book', + }, + { + description: 'Audit log', + }, + { + description: 'Change ID', + }, + { + description: + 'Access control', + }, + { + description: + 'Centralized settings', + }, + { + description: + 'Distributed relay servers', }, ], callToAction: { @@ -53,25 +98,38 @@ const metadata = { }, }, { - title: 'standard', - subtitle: 'Optimal choice for small teams', - price: 69, - period: 'Per Month', + title: 'Basic', + subtitle: 'Basic Self-hosting Pro Plan', + price: '19.90 /month', + period: 'billed annually', items: [ { - description: 'Proin vel laoreet', + description: 'Everything in the individual plan', + icon: 'tabler:checks', }, { - description: 'Ut efficitur habitasse egestas', + description: + '10 licensed users', }, { - description: 'Volutpat hac curabitur', + description: + '100 managed devices', }, { - description: 'Pellentesque blandit ut nibh', + description: + 'OIDC (SSO)', }, { - description: 'Donec fringilla sem', + description: + 'LDAP integration', + }, + { + description: + 'Cross group access', + }, + { + description: + 'Custom client generator', }, ], callToAction: { @@ -83,28 +141,26 @@ const metadata = { ribbonTitle: 'popular', }, { - title: 'premium', - subtitle: 'Optimal choice for companies', - price: 199, - period: 'Per Month', + title: 'Customized', + subtitle: 'Customized Pro Plan', + price: '0 /month', + period: 'billed annually', items: [ { - description: 'Curabitur suscipit risus', + description: 'Everything in the basic plan', + icon: 'tabler:checks', }, { - description: 'Aliquam habitasse malesuada', + description: '$1 for each additional user', }, { - description: 'Suspendisse sit amet blandit', - }, - { - description: 'Suspendisse auctor blandit dui', + description: '$0.1 for each additional device', }, ], callToAction: { target: '_blank', text: 'Get started', - href: '#', + href: 'https://rustdesk.com/docs/en/self-host/rustdesk-server-oss/', }, }, ]} diff --git a/v3/src/types.d.ts b/v3/src/types.d.ts index 6c4223b..a12a9b2 100644 --- a/v3/src/types.d.ts +++ b/v3/src/types.d.ts @@ -149,6 +149,7 @@ export interface Price { period?: string; items?: Array; callToAction?: CallToAction; + callToAction2?: CallToAction; hasRibbon?: boolean; ribbonTitle?: string; } @@ -283,4 +284,4 @@ export interface Content extends Omit, Widget { callToAction?: CallToAction; } -export interface Contact extends Omit, Form, Widget {} +export interface Contact extends Omit, Form, Widget { }