diff --git a/web/app/components/base/icons/assets/public/billing/asterisk.svg b/web/app/components/base/icons/assets/public/billing/asterisk.svg new file mode 100644 index 0000000000..1ee4059e81 --- /dev/null +++ b/web/app/components/base/icons/assets/public/billing/asterisk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/web/app/components/base/icons/src/public/billing/Asterisk.json b/web/app/components/base/icons/src/public/billing/Asterisk.json new file mode 100644 index 0000000000..6f70b27a1f --- /dev/null +++ b/web/app/components/base/icons/src/public/billing/Asterisk.json @@ -0,0 +1,38 @@ +{ + "icon": { + "type": "element", + "isRootNode": true, + "name": "svg", + "attributes": { + "width": "28", + "height": "28", + "viewBox": "0 0 28 28", + "fill": "none", + "xmlns": "http://www.w3.org/2000/svg" + }, + "children": [ + { + "type": "element", + "name": "g", + "attributes": { + "id": "asterisk" + }, + "children": [ + { + "type": "element", + "name": "path", + "attributes": { + "id": "Vector", + "d": "M14.0033 3.20837V24.7917M4.65747 8.60421L23.3492 19.3959M4.6586 19.3959L23.3503 8.60421", + "stroke": "#101828", + "stroke-width": "1.5", + "stroke-linecap": "round" + }, + "children": [] + } + ] + } + ] + }, + "name": "Asterisk" +} \ No newline at end of file diff --git a/web/app/components/base/icons/src/public/billing/Asterisk.tsx b/web/app/components/base/icons/src/public/billing/Asterisk.tsx new file mode 100644 index 0000000000..679ea86d77 --- /dev/null +++ b/web/app/components/base/icons/src/public/billing/Asterisk.tsx @@ -0,0 +1,16 @@ +// GENERATE BY script +// DON NOT EDIT IT MANUALLY + +import * as React from 'react' +import data from './Asterisk.json' +import IconBase from '@/app/components/base/icons/IconBase' +import type { IconBaseProps, IconData } from '@/app/components/base/icons/IconBase' + +const Icon = React.forwardRef, Omit>(( + props, + ref, +) => ) + +Icon.displayName = 'Asterisk' + +export default Icon diff --git a/web/app/components/base/icons/src/public/billing/index.ts b/web/app/components/base/icons/src/public/billing/index.ts index cc186bbd94..9460acff3c 100644 --- a/web/app/components/base/icons/src/public/billing/index.ts +++ b/web/app/components/base/icons/src/public/billing/index.ts @@ -1,4 +1,5 @@ export { default as ArCube1 } from './ArCube1' +export { default as Asterisk } from './Asterisk' export { default as AwsMarketplace } from './AwsMarketplace' export { default as Azure } from './Azure' export { default as Buildings } from './Buildings' diff --git a/web/app/components/billing/pricing/index.tsx b/web/app/components/billing/pricing/index.tsx index dbd6759dc2..f576bc3046 100644 --- a/web/app/components/billing/pricing/index.tsx +++ b/web/app/components/billing/pricing/index.tsx @@ -14,6 +14,7 @@ import SelfHostedPlanItem from './self-hosted-plan-item' import { useProviderContext } from '@/context/provider-context' import GridMask from '@/app/components/base/grid-mask' import { useAppContext } from '@/context/app-context' +import classNames from '@/utils/classnames' type Props = { onCancel: () => void @@ -51,7 +52,7 @@ const Pricing: FC = ({
{t('billing.plansCommon.freeTrialTipPrefix')} - {t('billing.plansCommon.freeTrialTip')} + {t('billing.plansCommon.freeTrialTip')} {t('billing.plansCommon.freeTrialTipSuffix')}
@@ -62,8 +63,20 @@ const Pricing: FC = ({ itemWidth={170} className='inline-flex' options={[ - { value: 'cloud', text:
{t('billing.plansCommon.cloud')}
}, - { value: 'self', text:
{t('billing.plansCommon.self')}
}]} + { + value: 'cloud', + text:
+ {t('billing.plansCommon.cloud')}
, + }, + { + value: 'self', + text:
+ {t('billing.plansCommon.self')}
, + }]} onChange={v => setCurrentPlan(v)} /> {currentPlan === 'cloud' && = ({
-
+
{t('billing.plansCommon.comparePlanAndFeatures')}
-
+ , document.body, ) diff --git a/web/app/components/billing/pricing/plan-item.tsx b/web/app/components/billing/pricing/plan-item.tsx index 8c91eb9549..4ba320441b 100644 --- a/web/app/components/billing/pricing/plan-item.tsx +++ b/web/app/components/billing/pricing/plan-item.tsx @@ -36,7 +36,7 @@ const KeyValue = ({ icon, label, tooltip }: { icon: ReactNode; label: string; to popupClassName='w-[200px]' >
- +
)} diff --git a/web/app/components/billing/pricing/select-plan-range.tsx b/web/app/components/billing/pricing/select-plan-range.tsx index 62b493d84d..07add5ea81 100644 --- a/web/app/components/billing/pricing/select-plan-range.tsx +++ b/web/app/components/billing/pricing/select-plan-range.tsx @@ -40,7 +40,7 @@ const SelectPlanRange: FC = ({
{t('billing.plansCommon.yearlyTip')}
- {t('billing.plansCommon.annualBilling')} + {t('billing.plansCommon.annualBilling')} { onChange(v ? PlanRange.yearly : PlanRange.monthly) }} /> diff --git a/web/app/components/billing/pricing/self-hosted-plan-item.tsx b/web/app/components/billing/pricing/self-hosted-plan-item.tsx index ae225838c6..b057a5b82b 100644 --- a/web/app/components/billing/pricing/self-hosted-plan-item.tsx +++ b/web/app/components/billing/pricing/self-hosted-plan-item.tsx @@ -2,12 +2,12 @@ import type { FC, ReactNode } from 'react' import React from 'react' import { useTranslation } from 'react-i18next' -import { RiArrowRightUpLine, RiAsterisk, RiBrain2Line, RiCheckLine, RiQuestionLine } from '@remixicon/react' +import { RiArrowRightUpLine, RiBrain2Line, RiCheckLine, RiQuestionLine } from '@remixicon/react' import { SelfHostedPlan } from '../type' import { contactSalesUrl, getStartedWithCommunityUrl, getWithPremiumUrl } from '../config' import Toast from '../../base/toast' import Tooltip from '../../base/tooltip' -import { AwsMarketplace, Azure, Buildings, Diamond, GoogleCloud } from '../../base/icons/src/public/billing' +import { Asterisk, AwsMarketplace, Azure, Buildings, Diamond, GoogleCloud } from '../../base/icons/src/public/billing' import type { PlanRange } from './select-plan-range' import cn from '@/utils/classnames' import { useAppContext } from '@/context/app-context' @@ -42,7 +42,7 @@ const KeyValue = ({ label, tooltip, textColor, tooltipIconColor }: { icon: React const style = { [SelfHostedPlan.community]: { - icon: , + icon: , title: 'text-text-primary', price: 'text-text-primary', priceTip: 'text-text-tertiary', @@ -142,7 +142,7 @@ const SelfHostedPlanItem: FC = ({ {t(`${i18nPrefix}.btnText`)} {isPremiumPlan && <> -
+