diff --git a/packages/ai-workspace-common/src/components/canvas-template/template-list.tsx b/packages/ai-workspace-common/src/components/canvas-template/template-list.tsx index 8f3390e6d1..91ea795b0e 100644 --- a/packages/ai-workspace-common/src/components/canvas-template/template-list.tsx +++ b/packages/ai-workspace-common/src/components/canvas-template/template-list.tsx @@ -10,7 +10,7 @@ import { TemplateCardSkeleton } from './template-card-skeleton'; import cn from 'classnames'; // Marketplace link -const MARKETPLACE_LINK = `${window.location.origin}`; +const MARKETPLACE_LINK = `${window.location.origin}/marketplace`; // Custom EndMessage component for template list const EndMessage = memo(() => { diff --git a/packages/ai-workspace-common/src/components/settings/subscribe-modal/priceContent.tsx b/packages/ai-workspace-common/src/components/settings/subscribe-modal/priceContent.tsx index 8a4a849b20..4f08fbcebf 100644 --- a/packages/ai-workspace-common/src/components/settings/subscribe-modal/priceContent.tsx +++ b/packages/ai-workspace-common/src/components/settings/subscribe-modal/priceContent.tsx @@ -6,7 +6,7 @@ import { logEvent } from '@refly/telemetry-web'; // styles import './index.scss'; import { Spin } from '@refly-packages/ai-workspace-common/components/common/spin'; -import { Checked, Wait } from 'refly-icons'; +import { Checked, Subscription, Wait } from 'refly-icons'; import { IconLightning01 } from '@refly-packages/ai-workspace-common/components/common/icon'; import getClient from '@refly-packages/ai-workspace-common/requests/proxiedRequest'; import { @@ -66,8 +66,8 @@ const PriceOption = memo(({ type, isSelected, price, yearlyTotal, onSelect }: Pr relative flex-1 p-4 rounded-xl cursor-pointer transition-all duration-200 ${ isSelected - ? 'border-2 border-[#0E9F77] bg-white' - : 'border-[1.5px] border-gray-200 bg-[#FAFAFA] hover:border-[#0E9F77]' + ? 'border-2 !border-solid !border-black bg-white' + : 'border-2 !border-solid !border-gray-200 bg-[#FAFAFA] hover:border-[#0E9F77]' } `} onClick={handleClick} @@ -77,7 +77,10 @@ const PriceOption = memo(({ type, isSelected, price, yearlyTotal, onSelect }: Pr {type === 'monthly' ? t('subscription.monthly') : t('subscription.yearly')} {type === 'yearly' && ( - + {t('subscription.save20')} )} @@ -105,62 +108,79 @@ interface FeatureItemProps { feature: Feature; isEnterprise?: boolean; isLast?: boolean; + planType?: string; + featureIndex?: number; } -const FeatureItem = memo(({ feature, isEnterprise, isLast }: FeatureItemProps) => { - const parts = feature.name.split('\n'); - const name = parts[0]; - const description = parts.length > 1 ? parts.slice(1).join('\n') : null; +const FeatureItem = memo( + ({ feature, isEnterprise, isLast, planType, featureIndex }: FeatureItemProps) => { + const parts = feature.name.split('\n'); + const name = parts[0]; + const description = parts.length > 1 ? parts.slice(1).join('\n') : null; + + // For plus plan, make the 2nd and 3rd description green + const isGreenDescription = + planType === 'plus' && + featureIndex !== undefined && + (featureIndex === 1 || featureIndex === 2); + + // Handle pointFreeTools type with special display logic + if (feature.type === 'pointFreeTools' && feature.items && feature.items.length > 0) { + return ( +
+ {/* Header with check icon */} +
+
+ +
+ {name} +
+ {/* Sub-items list */} +
+ {feature.items.map((item, index) => ( +
+
+ + {item} +
+ {feature.duration && ( + + {feature.duration} + + )} +
+ ))} +
+
+ ); + } - // Handle pointFreeTools type with special display logic - if (feature.type === 'pointFreeTools' && feature.items && feature.items.length > 0) { return ( -
- {/* Header with check icon */} -
-
+
+
+ {isEnterprise && isLast ? ( + + ) : ( -
- {name} + )}
- {/* Sub-items list */} -
- {feature.items.map((item, index) => ( -
-
- - {item} -
- {feature.duration && ( - - {feature.duration} - - )} -
- ))} +
+ + {name} + {description && ( + + {' '} + {description} + + )} +
); - } - - return ( -
-
- {isEnterprise && isLast ? ( - - ) : ( - - )} -
-
- - {name} - {description && {description}} - -
-
- ); -}); + }, +); FeatureItem.displayName = 'FeatureItem'; @@ -195,6 +215,7 @@ const PlanItem = memo((props: PlanItemProps) => { PlanPriorityMap[PlanPriorityMap[currentPlan as keyof typeof PlanPriorityMap] + 1] || 'enterprise'; const isUpgrade = upgradePlan === planType; + const [isHovered, setIsHovered] = useState(false); const isDowngrade = PlanPriorityMap[currentPlan as keyof typeof PlanPriorityMap] > PlanPriorityMap[planType as keyof typeof PlanPriorityMap]; @@ -253,7 +274,7 @@ const PlanItem = memo((props: PlanItemProps) => { } return ( - + {t('subscription.plans.upgrade', { planType: planType.charAt(0).toUpperCase() + planType.slice(1), })} @@ -276,6 +297,12 @@ const PlanItem = memo((props: PlanItemProps) => {

{description}

+ {/* Price */} +
+ $0 + /month +
+ {/* Button */}
@@ -314,11 +341,16 @@ const PlanItem = memo((props: PlanItemProps) => { background: isCurrentPlan || isUpgrade ? 'linear-gradient(180deg, rgba(14, 159, 119, 0.08) 0%, rgba(255, 255, 255, 0) 30%), #ffffff' - : 'linear-gradient(180deg, #1FC99615, #45BEFF10), #ffffff', + : isHovered + ? 'linear-gradient(180deg, #A4FFF6, #CFFFD3), #ffffff' + : '#ffffff', }} + onMouseEnter={() => setIsHovered(true)} + onMouseLeave={() => setIsHovered(false)} > {/* Header */}
+ {title} {isCurrentPlan && ( @@ -386,6 +418,8 @@ const PlanItem = memo((props: PlanItemProps) => { feature={feature} isEnterprise={planType === 'enterprise'} isLast={index === features.length - 1} + planType={planType} + featureIndex={index} /> ))}
@@ -422,7 +456,7 @@ export const PriceContent = memo((props: { source: PriceSource }) => { }, [currentPlan]); const plansData = useMemo(() => { - const planTypes = ['free', 'starter', 'maker', 'enterprise']; + const planTypes = ['free', 'plus']; const data: Record = {}; for (const planType of planTypes) { const rawFeatures = diff --git a/packages/i18n/src/en-US/ui.ts b/packages/i18n/src/en-US/ui.ts index a149bea00f..e136df9fa6 100644 --- a/packages/i18n/src/en-US/ui.ts +++ b/packages/i18n/src/en-US/ui.ts @@ -888,7 +888,7 @@ const translations = { endMessage: { title: "Didn't find the workflow automation template you need?", subtitle: "Join our Discord and tell us what you're looking for", - goToMarketplace: 'Go to Marketplace', + goToMarketplace: 'Explore More Templates', }, }, agentInputPlaceholder: 'Enter task description, Agent will generate reusable workflows', @@ -2704,7 +2704,7 @@ const translations = { getStarted: 'Get Started', subscribeNow: 'Subscribe Now', manage: 'Manage Subscription', - currentPlan: 'Current Plan', + currentPlan: 'Your Current Plan', t1Requests: 'T1 Requests', t1RequestsDescription: 'T1 models include Claude 3.7 Sonnet (Thinking), DeepSeek R1, o3 Mini, GPT-4o and others. Each successful skill call to T1 models counts as one request.', @@ -3591,7 +3591,7 @@ const translations = { }, }, subscription: { - modalTitle: 'Upgrade to Get More Credits', + modalTitle: 'Upgrade Your Plan to Get More Credits', cancelAnytime: "Cancel anytime. By subscribing, you agree to Refly's", privacy: 'Privacy', terms: 'Terms', @@ -3621,14 +3621,15 @@ const translations = { priceMonthly: '{{price}}/month', priceYearly: '{{price}}/month', priceYearlyTotal: '{{price}}/year Save 20%', - upgrade: 'Upgrade to {{planType}}', + upgrade: 'Get {{planType}}', cannotChangeTo: 'Cannot change to {{planType}}', - currentPlan: 'Current Plan', + currentPlan: 'Your Current Plan', cannotSwitchTo: "Legacy plans can't be switched to Plus directly.Please contact support@refly.ai", + memberBenefits: 'Member Benefits', free: { - title: 'Free Plan', - description: 'A welcoming gateway to explore the power of AI—completely free', + title: 'Free', + description: 'Ideal for beginners exploring workflow automation', price: 'Free forever', buttonText: 'Continue for free', buttonTextDowngrade: 'Downgrade to Free', @@ -3644,9 +3645,9 @@ const translations = { features: [ 'Daily new credits\n300 credits', 'Monthly credits\n2,000 credits', - 'New subscribers receive an extra\n2,000 bonus credits', + //'New subscribers receive an extra\n2,000 bonus credits', 'Access to a vast library of tools', - { + /*{ name: 'Credit-free tools', type: 'pointFreeTools', items: [ @@ -3660,7 +3661,7 @@ const translations = { 'X', ], duration: '365 DAYS', - }, + },*/ 'Service support\nHigh priority support', ], }, @@ -3825,7 +3826,7 @@ const translations = { storageFullModal: { free: { title: 'Free Plan', - titleCn: 'Current Plan', + titleCn: 'Your Current Plan', description: 'A welcoming gateway to explore the power of AI—completely free', price: 'Free forever', buttonText: 'Continue for free', @@ -3880,7 +3881,7 @@ const translations = { 'More enterprise features coming soon', ], }, - currentPlan: 'Current Plan', + currentPlan: 'Your Current Plan', }, }, onboarding: { diff --git a/packages/i18n/src/zh-Hans/ui.ts b/packages/i18n/src/zh-Hans/ui.ts index b963bdf687..b26034752d 100644 --- a/packages/i18n/src/zh-Hans/ui.ts +++ b/packages/i18n/src/zh-Hans/ui.ts @@ -138,9 +138,9 @@ const translations = { features: [ '每日可获取新积分\n100点', '每月积分\n2000点', - '首次订阅额外赠送\n2000点', + //'首次订阅额外赠送\n2000点', '访问丰富的工具库', - { + /*{ name: '免积分使用工具', type: 'pointFreeTools', items: [ @@ -154,7 +154,7 @@ const translations = { 'X', ], duration: '365 DAYS', - }, + },*/ '服务支持\n高优邮件支持', ], }, @@ -968,7 +968,7 @@ const translations = { endMessage: { title: '没有找到你需要的工作流自动化模板？', subtitle: '加入我们的 Discord 社区，告诉我们你想要什么', - goToMarketplace: '前往 Marketplace', + goToMarketplace: '探索更多模板', }, }, agentInputPlaceholder: '输入任务描述，Agent 将生成可复用的工作流',