diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx index 377e25e..8d5c099 100644 --- a/src/pages/Dashboard.jsx +++ b/src/pages/Dashboard.jsx @@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'; import { Link } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { useAuth } from '../context/AuthContext'; -import { useSite } from '../context/SiteContext'; import { getUserUsage, redeemCode, Q, quotaToDollar } from '../api'; import SpotlightCard from '../components/bits/SpotlightCard'; import CountUp from '../components/bits/CountUp'; @@ -12,8 +11,6 @@ import toast from 'react-hot-toast'; export default function Dashboard() { const { t } = useTranslation(); const { user, refreshUser } = useAuth(); - const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [usage, setUsage] = useState(null); const [redeemInput, setRedeemInput] = useState(''); const [redeeming, setRedeeming] = useState(false); @@ -64,7 +61,7 @@ export default function Dashboard() {

{t('dashboard.balance')}

- {cs} + $

{t('dashboard.quotaUnits', { count: quota.toLocaleString() })}

@@ -72,7 +69,7 @@ export default function Dashboard() {

{t('dashboard.used')}

- {cs} + $

{t('dashboard.quotaUnits', { count: usedQuota.toLocaleString() })}

diff --git a/src/pages/Packages.jsx b/src/pages/Packages.jsx index 1824ebf..a739769 100644 --- a/src/pages/Packages.jsx +++ b/src/pages/Packages.jsx @@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'; import { Link, useNavigate } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { useAuth } from '../context/AuthContext'; -import { useSite } from '../context/SiteContext'; import { getSitePackages, subscribePackage, getActiveSubscriptions, Q } from '../api'; import SpotlightCard from '../components/bits/SpotlightCard'; import toast from 'react-hot-toast'; @@ -22,8 +21,6 @@ function formatDate(unix) { export default function Packages() { const { t } = useTranslation(); const { user, refreshUser } = useAuth(); - const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const navigate = useNavigate(); const [packages, setPackages] = useState([]); const [loading, setLoading] = useState(true); @@ -141,7 +138,7 @@ export default function Packages() { style={{ width: `${pct}%` }} /> - {cs}{(remain / Q).toFixed(2)} / {cs}{(total / Q).toFixed(2)} + ${(remain / Q).toFixed(2)} / ${(total / Q).toFixed(2)} @@ -188,9 +185,9 @@ export default function Packages() { {/* Price */}
- {cs}{Number(pkg.price).toFixed(2)} + ${Number(pkg.price).toFixed(2)} {pkg.original_price > 0 && pkg.original_price > pkg.price && ( - {cs}{Number(pkg.original_price).toFixed(2)} + ${Number(pkg.original_price).toFixed(2)} )}
{pkg.duration > 0 && ( @@ -273,7 +270,7 @@ export default function Packages() {
)}

- {t('packages.yourBalance')} {cs}{userBalance.toFixed(2)} + {t('packages.yourBalance')} ${userBalance.toFixed(2)}

{insufficient && (
diff --git a/src/pages/Pricing.jsx b/src/pages/Pricing.jsx index d8e4d37..c983cf6 100644 --- a/src/pages/Pricing.jsx +++ b/src/pages/Pricing.jsx @@ -1,12 +1,9 @@ import React, { useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { useSite } from '../context/SiteContext'; import { getSiteModels } from '../api'; export default function Pricing() { const { t } = useTranslation(); - const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [search, setSearch] = useState(''); const [loading, setLoading] = useState(true); @@ -82,10 +79,10 @@ export default function Pricing() { {m.display_name || m.model_name} - {m.input_price != null ? `${cs}${(Number(m.input_price) * 1000).toFixed(4)}` : '-'} + {m.input_price != null ? `$${(Number(m.input_price) * 1000).toFixed(4)}` : '-'} - {m.output_price != null ? `${cs}${(Number(m.output_price) * 1000).toFixed(4)}` : '-'} + {m.output_price != null ? `$${(Number(m.output_price) * 1000).toFixed(4)}` : '-'}

{t('dashboard.balance')}

- {cs} + $

{t('dashboard.quotaUnits', { count: quota.toLocaleString() })}

@@ -334,7 +333,7 @@ export default function Topup() {

{t('dashboard.used')}

- {cs} + $
@@ -373,7 +372,7 @@ export default function Topup() { : 'glass-sm text-page-label hover:text-page hover:bg-white/[0.08]' }`} > - {cs}{val} + ${val} ))}
@@ -400,7 +399,7 @@ export default function Topup() {

{t('topup.calculating')}

) : payAmount ? (

- {t('topup.payAmountLabel')}: {cs}{payAmount} + {t('topup.payAmountLabel')}: ${payAmount}

) : null} @@ -444,7 +443,7 @@ export default function Topup() { >

{product.name}

- {cs}{product.price} {product.currency || 'USD'} + ${product.price} {product.currency || 'USD'}

{product.quota && (

{t('topup.quotaIncluded') || `${product.quota} quota`}

@@ -461,7 +460,7 @@ export default function Topup() { > {paymentLoading && payingMethod === 'creem' ? t('topup.processing') - : `${t('topup.payNow') || 'Pay'} ${cs}${selectedCreemProduct.price}`} + : `${t('topup.payNow') || 'Pay'} $${selectedCreemProduct.price}`} )} @@ -593,7 +592,7 @@ export default function Topup() { {history.map((item, i) => (
-

{cs}{item.amount}

+

${item.amount}

{new Date(item.create_time * 1000).toLocaleString()} · {item.payment_method || t('topup.redeemCode')}

diff --git a/src/themes/claude/Home.jsx b/src/themes/claude/Home.jsx index 3998c20..ae2de0f 100644 --- a/src/themes/claude/Home.jsx +++ b/src/themes/claude/Home.jsx @@ -16,7 +16,6 @@ export default function ClaudeHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -231,9 +230,9 @@ export default function ClaudeHome() { {pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )}
{pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

} diff --git a/src/themes/clean/Home.jsx b/src/themes/clean/Home.jsx index 1ca3d71..b4e965c 100644 --- a/src/themes/clean/Home.jsx +++ b/src/themes/clean/Home.jsx @@ -15,7 +15,6 @@ export default function CleanHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -208,9 +207,9 @@ export default function CleanHome() { {pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )}
{pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

} diff --git a/src/themes/corporate/Home.jsx b/src/themes/corporate/Home.jsx index 0f77445..1fb9f9e 100644 --- a/src/themes/corporate/Home.jsx +++ b/src/themes/corporate/Home.jsx @@ -14,7 +14,6 @@ export default function CorporateHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -218,9 +217,9 @@ export default function CorporateHome() { {pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )}
{pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

} diff --git a/src/themes/dark/Home.jsx b/src/themes/dark/Home.jsx index 3fa1d35..43a611d 100644 --- a/src/themes/dark/Home.jsx +++ b/src/themes/dark/Home.jsx @@ -12,7 +12,6 @@ export default function DarkHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -179,9 +178,9 @@ export default function DarkHome() {

{pkg.name}

{pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )} {pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

}
diff --git a/src/themes/default/Home.jsx b/src/themes/default/Home.jsx index 5102b3f..b7faef6 100644 --- a/src/themes/default/Home.jsx +++ b/src/themes/default/Home.jsx @@ -14,7 +14,6 @@ export default function DefaultHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -182,9 +181,9 @@ export default function DefaultHome() { {pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )}
{pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

} diff --git a/src/themes/minimal/Home.jsx b/src/themes/minimal/Home.jsx index 42f7df8..79fbe28 100644 --- a/src/themes/minimal/Home.jsx +++ b/src/themes/minimal/Home.jsx @@ -11,7 +11,6 @@ export default function MinimalHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -143,9 +142,9 @@ export default function MinimalHome() {

{pkg.name}

{pkg.description &&

{pkg.description}

}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )} {pkg.duration > 0 &&

{t('home.days', { count: pkg.duration })}

}
diff --git a/src/themes/starter/Home.jsx b/src/themes/starter/Home.jsx index 20a868a..351821c 100644 --- a/src/themes/starter/Home.jsx +++ b/src/themes/starter/Home.jsx @@ -14,7 +14,6 @@ export default function StarterHome() { const { t } = useTranslation(); const { user } = useAuth(); const { site } = useSite(); - const cs = site?.currency_symbol || '¥'; const [models, setModels] = useState([]); const [packages, setPackages] = useState([]); @@ -187,9 +186,9 @@ export default function StarterHome() { )}
- {cs}{pkg.price} + ${pkg.price} {pkg.original_price > pkg.price && ( - {cs}{pkg.original_price} + ${pkg.original_price} )}
{pkg.duration > 0 && (