mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-07 01:56:53 +00:00
* 🎨 feat(web/default): add shadcn-style theme presets, radius prefs, and fix selection badges Integrate the qn-platform–style OKLCH color system into the default frontend while keeping the existing blue-tinted dark tokens for the default theme. Add [data-theme-preset] palettes for seven named presets plus the default zinc-like scale, define [data-theme-radius] overrides so user radius beats preset --radius, and align the Tailwind @custom-variant dark helper with .dark usage. Introduce ThemeCustomizationProvider to own preset and radius state, persist choices in cookies (theme-preset, theme-radius), and sync data-theme-preset / data-theme-radius on <html>. Wrap the tree in main.tsx. Extend ConfigDrawer with theme preset swatches (scoped data-theme-preset) and radius previews wired to context; refactor swatch/card markup so selected CircleCheck badges sit outside clipped rows (remove outer overflow-hidden that hid the centered checkmark). Add i18n keys for preset names, radius, and accessibility labels across en, zh, fr, ja, ru, vi. * 🎨 fix(web): align segmented controls with theme radius tokens - Replace hard-coded inner pill radii (rounded-[5px]) on dashboard chart toolbars with radius-md so the active state follows --radius when users change Radius in Theme Settings. - Use nested radii consistent with TabsList/TabsTrigger: outer rounded-lg (var(--radius)) and inner rounded-md (calc(var(--radius) - 2px)) so the track and active thumb stay concentric at small scales (e.g. 0.3rem) instead of a squared “focus” block inside a rounded shell. - Apply the same pattern to pricing SegmentedControl and the segmented groups in consumption-distribution-chart, model-charts, and user-charts. Verified: bun run typecheck (web/default) * ✨ feat(pricing): enrich model details with uptime sparkline and API documentation Add a compact 30-day uptime sparkline (OpenRouter-style bars + aggregate %) with per-day tooltips, surface it in a status row under quick stats and in the per-group performance table, and extend mock data so uptime series are stable and optionally scoped by group. Introduce an API tab with Shiki-highlighted code samples (cURL, Python, TypeScript, JavaScript), endpoint-type switching, authentication guidance, a supported-parameters table, and mock per-group RPM/TPM/RPD limits. Infer vendor, tokenizer, license, and data-retention hints for a provider & data privacy card on the Overview tab (capabilities/modalities stay with model identity; rate limits stay with the API tab). Update i18n for all new user-facing strings across en, zh, fr, ja, ru, and vi. * 🏆 feat(rankings): add comprehensive rankings dashboard Add a mock-data powered rankings experience with period tabs, model, app, and vendor leaderboards, market share and history charts, movers, new releases, and per-category sections while backend analytics are pending. Link ranked models to pricing details and ranked vendors to filtered pricing results, and include localized copy for all supported frontend locales. * fix(theme): correct theme preset selection state - update Base UI Radio selectors to use data-checked/data-unchecked states. - fix unchecked theme options still showing selected indicators. - isolate the default theme preview tokens to prevent preset changes from leaking into it. * fix(setup): correct usage mode radio state - use Base UI data-checked/data-unchecked states for RadioGroup styling. - hide radio indicators when options are unchecked to avoid setup page display issues. - drive usage mode card and icon selection styles from Base UI state. * fix(auth): submit sign-in and sign-up forms * 🎨 refactor: Align default theme with shadcn Base Nova and prune legacy customization Migrate shadcn UI to Base UI primitives via CLI (`base-nova` / `components.json`) and reinstall full component registry with `--overwrite`, including Hugeicons-backed widgets and newly added registry components. - Remove custom multi-preset/theme-radius system (`ThemeCustomizationProvider`, cookies, preset UI from config drawer); rely on official semantic CSS tokens + light/dark only. - Replace `theme.css` with shadcn’s documented neutral `:root`/`.dark` palette and `@theme inline` mappings (plus skeleton token vars for existing shimmer usage). - Update global styles for Base UI: collapsible animation uses `--collapsible-panel-height`; clarify scroll-lock override comment. Application compatibility: - Keep minimal shims where app code diverged from official APIs (popover collision props, combobox legacy `options` callers, Spinner prop typing). - Switch interactive styling from Radix-era `data-state` / `--radix-*` selectors to Base UI semantics (`data-open`, `data-popup-open`, `data-panel-open`, `--anchor-width`, etc.) Tooling / docs / build: - Rename Rsbuild vendor chunk grouping to `@base-ui` + transitive `@radix-ui`. - Refresh AGENTS.md / CLAUDE.md / classic→default sync skill for Base UI stack. - Bump `package.json` / lockfile for shadcn-postinstall deps (Hugeicons, chart stack, themes, etc.) Verified: `bun run typecheck` passes. Note: `bun run lint` still reports pre-existing hooks rule violations elsewhere; not addressed in this change. * 🎨 chore(web/default): unify table toolbar, relocate usage stats, refine filters - Refactor DataTableToolbar to a single wrapping flex row with a right-aligned action cluster (Reset / Search / View / Expand) for a cleaner Ant Design Pro–style filter bar; remove the dedicated stats row and the toolbar `stats` prop. - Move Common Logs summary badges (Usage / RPM / TPM) and the sensitive- data visibility toggle into the page header via CommonLogsHeaderActions and SectionPageLayout.Actions so the toolbar stays focused on filters. - Slim CommonLogsFilterBar props (no stats / preActions eye control). - Improve CompactDateTimeRangePicker: show minute-precision labels on the trigger (seconds omitted; aligns with datetime-local inputs); widen the trigger on sm+ breakpoints so the full range is visible without truncation; apply the same width in task logs filters. - Simplify DataTableViewOptions: text-only “View” trigger, no sliders icon. - Earlier layout tweak: extra top padding on SectionPageLayout scroll content so control focus rings are not clipped by overflow. * feat(web/default): Base UI migration and component foundation Migrate from Radix UI to Base UI, rewrite core UI primitives, update dependencies (recharts, date-fns, next-themes), add shadcn agent skill documentation, and refresh AI element components. This is the foundational work from the v2/localmain lineage that was not covered by the individual feature commits above. --------- Co-authored-by: t0ng7u <dev@aiass.cc> Co-authored-by: QuentinHsu <xuquentinyang@gmail.com>
308 lines
9.9 KiB
TypeScript
Vendored
308 lines
9.9 KiB
TypeScript
Vendored
import { useState, useEffect } from 'react'
|
|
import { Crown, CalendarClock, Package } from 'lucide-react'
|
|
import { useTranslation } from 'react-i18next'
|
|
import { toast } from 'sonner'
|
|
import { Alert, AlertDescription } from '@/components/ui/alert'
|
|
import { Button } from '@/components/ui/button'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from '@/components/ui/dialog'
|
|
import {
|
|
Select,
|
|
SelectContent,
|
|
SelectItem,
|
|
SelectTrigger,
|
|
SelectValue,
|
|
} from '@/components/ui/select'
|
|
import { Separator } from '@/components/ui/separator'
|
|
import { GroupBadge } from '@/components/group-badge'
|
|
import {
|
|
paySubscriptionStripe,
|
|
paySubscriptionCreem,
|
|
paySubscriptionEpay,
|
|
} from '../../api'
|
|
import { formatDuration, formatResetPeriod } from '../../lib'
|
|
import type { PlanRecord } from '../../types'
|
|
|
|
interface PaymentMethod {
|
|
type: string
|
|
name?: string
|
|
}
|
|
|
|
interface Props {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
plan: PlanRecord | null
|
|
enableStripe?: boolean
|
|
enableCreem?: boolean
|
|
enableOnlineTopUp?: boolean
|
|
epayMethods?: PaymentMethod[]
|
|
purchaseLimit?: number
|
|
purchaseCount?: number
|
|
}
|
|
|
|
export function SubscriptionPurchaseDialog(props: Props) {
|
|
const { t } = useTranslation()
|
|
const [paying, setPaying] = useState(false)
|
|
const [selectedEpayMethod, setSelectedEpayMethod] = useState('')
|
|
|
|
useEffect(() => {
|
|
if (props.open && props.epayMethods && props.epayMethods.length > 0) {
|
|
setSelectedEpayMethod(props.epayMethods[0].type)
|
|
} else if (!props.open) {
|
|
setSelectedEpayMethod('')
|
|
}
|
|
}, [props.open, props.epayMethods])
|
|
|
|
const plan = props.plan?.plan
|
|
if (!plan) return null
|
|
|
|
const hasStripe = props.enableStripe && !!plan.stripe_price_id
|
|
const hasCreem = props.enableCreem && !!plan.creem_product_id
|
|
const hasEpay =
|
|
props.enableOnlineTopUp && (props.epayMethods || []).length > 0
|
|
const hasAnyPayment = hasStripe || hasCreem || hasEpay
|
|
const totalAmount = Number(plan.total_amount || 0)
|
|
const price = Number(plan.price_amount || 0).toFixed(2)
|
|
const limitReached =
|
|
(props.purchaseLimit || 0) > 0 &&
|
|
(props.purchaseCount || 0) >= (props.purchaseLimit || 0)
|
|
|
|
const handlePayStripe = async () => {
|
|
setPaying(true)
|
|
try {
|
|
const res = await paySubscriptionStripe({ plan_id: plan.id })
|
|
if (res.message === 'success' && res.data?.pay_link) {
|
|
window.open(res.data.pay_link, '_blank')
|
|
toast.success(t('Payment page opened'))
|
|
props.onOpenChange(false)
|
|
} else {
|
|
toast.error(
|
|
res.message && res.message !== 'success'
|
|
? res.message
|
|
: t('Payment request failed')
|
|
)
|
|
}
|
|
} catch {
|
|
toast.error(t('Payment request failed'))
|
|
} finally {
|
|
setPaying(false)
|
|
}
|
|
}
|
|
|
|
const handlePayCreem = async () => {
|
|
setPaying(true)
|
|
try {
|
|
const res = await paySubscriptionCreem({ plan_id: plan.id })
|
|
if (res.message === 'success' && res.data?.checkout_url) {
|
|
window.open(res.data.checkout_url, '_blank')
|
|
toast.success(t('Payment page opened'))
|
|
props.onOpenChange(false)
|
|
} else {
|
|
toast.error(
|
|
res.message && res.message !== 'success'
|
|
? res.message
|
|
: t('Payment request failed')
|
|
)
|
|
}
|
|
} catch {
|
|
toast.error(t('Payment request failed'))
|
|
} finally {
|
|
setPaying(false)
|
|
}
|
|
}
|
|
|
|
const isSafari =
|
|
typeof navigator !== 'undefined' &&
|
|
/^((?!chrome|android).)*safari/i.test(navigator.userAgent)
|
|
|
|
const handlePayEpay = async () => {
|
|
if (!selectedEpayMethod) {
|
|
toast.error(t('Please select a payment method'))
|
|
return
|
|
}
|
|
setPaying(true)
|
|
try {
|
|
const res = await paySubscriptionEpay({
|
|
plan_id: plan.id,
|
|
payment_method: selectedEpayMethod,
|
|
})
|
|
if (res.message === 'success' && res.url) {
|
|
const form = document.createElement('form')
|
|
form.action = res.url
|
|
form.method = 'POST'
|
|
if (!isSafari) {
|
|
form.target = '_blank'
|
|
}
|
|
Object.entries(res.data || {}).forEach(([key, value]) => {
|
|
const input = document.createElement('input')
|
|
input.type = 'hidden'
|
|
input.name = key
|
|
input.value = String(value)
|
|
form.appendChild(input)
|
|
})
|
|
document.body.appendChild(form)
|
|
form.submit()
|
|
document.body.removeChild(form)
|
|
toast.success(t('Payment initiated'))
|
|
props.onOpenChange(false)
|
|
} else {
|
|
toast.error(
|
|
res.message && res.message !== 'success'
|
|
? res.message
|
|
: t('Payment request failed')
|
|
)
|
|
}
|
|
} catch {
|
|
toast.error(t('Payment request failed'))
|
|
} finally {
|
|
setPaying(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Dialog open={props.open} onOpenChange={props.onOpenChange}>
|
|
<DialogContent className='max-sm:w-[calc(100vw-1.5rem)] sm:max-w-md'>
|
|
<DialogHeader>
|
|
<DialogTitle className='flex items-center gap-2'>
|
|
<Crown className='h-5 w-5' />
|
|
{t('Purchase Subscription')}
|
|
</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
<div className='space-y-3 sm:space-y-4'>
|
|
<div className='bg-muted/50 space-y-2.5 rounded-lg border p-3 sm:space-y-3 sm:p-4'>
|
|
<div className='flex justify-between'>
|
|
<span className='text-muted-foreground text-sm'>
|
|
{t('Plan Name')}
|
|
</span>
|
|
<span className='max-w-[200px] truncate text-sm font-medium'>
|
|
{plan.title}
|
|
</span>
|
|
</div>
|
|
<div className='flex items-center justify-between'>
|
|
<span className='text-muted-foreground text-sm'>
|
|
{t('Validity Period')}
|
|
</span>
|
|
<span className='flex items-center gap-1 text-sm'>
|
|
<CalendarClock className='h-3.5 w-3.5' />
|
|
{formatDuration(plan, t)}
|
|
</span>
|
|
</div>
|
|
{formatResetPeriod(plan, t) !== t('No Reset') && (
|
|
<div className='flex justify-between'>
|
|
<span className='text-muted-foreground text-sm'>
|
|
{t('Reset Period')}
|
|
</span>
|
|
<span className='text-sm'>{formatResetPeriod(plan, t)}</span>
|
|
</div>
|
|
)}
|
|
<div className='flex items-center justify-between'>
|
|
<span className='text-muted-foreground text-sm'>
|
|
{t('Total Quota')}
|
|
</span>
|
|
<span className='flex items-center gap-1 text-sm'>
|
|
<Package className='h-3.5 w-3.5' />
|
|
{totalAmount > 0 ? totalAmount : t('Unlimited')}
|
|
</span>
|
|
</div>
|
|
{plan.upgrade_group && (
|
|
<div className='flex items-center justify-between'>
|
|
<span className='text-muted-foreground text-sm'>
|
|
{t('Upgrade Group')}
|
|
</span>
|
|
<GroupBadge group={plan.upgrade_group} />
|
|
</div>
|
|
)}
|
|
<Separator />
|
|
<div className='flex items-center justify-between'>
|
|
<span className='text-sm font-medium'>{t('Amount Due')}</span>
|
|
<span className='text-primary text-lg font-bold'>${price}</span>
|
|
</div>
|
|
</div>
|
|
|
|
{limitReached && (
|
|
<Alert variant='destructive'>
|
|
<AlertDescription>
|
|
{t('Purchase limit reached')} ({props.purchaseCount}/
|
|
{props.purchaseLimit})
|
|
</AlertDescription>
|
|
</Alert>
|
|
)}
|
|
|
|
{hasAnyPayment ? (
|
|
<div className='space-y-3'>
|
|
<p className='text-muted-foreground text-xs'>
|
|
{t('Select payment method')}
|
|
</p>
|
|
{(hasStripe || hasCreem) && (
|
|
<div className='grid grid-cols-2 gap-2 sm:flex'>
|
|
{hasStripe && (
|
|
<Button
|
|
variant='outline'
|
|
className='flex-1'
|
|
onClick={handlePayStripe}
|
|
disabled={paying || limitReached}
|
|
>
|
|
Stripe
|
|
</Button>
|
|
)}
|
|
{hasCreem && (
|
|
<Button
|
|
variant='outline'
|
|
className='flex-1'
|
|
onClick={handlePayCreem}
|
|
disabled={paying || limitReached}
|
|
>
|
|
Creem
|
|
</Button>
|
|
)}
|
|
</div>
|
|
)}
|
|
{hasEpay && (
|
|
<div className='grid grid-cols-[minmax(0,1fr)_auto] gap-2'>
|
|
<Select
|
|
value={selectedEpayMethod}
|
|
onValueChange={(v) =>
|
|
v !== null && setSelectedEpayMethod(v)
|
|
}
|
|
disabled={limitReached}
|
|
>
|
|
<SelectTrigger className='flex-1'>
|
|
<SelectValue placeholder={t('Select payment method')} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{(props.epayMethods || []).map((m) => (
|
|
<SelectItem key={m.type} value={m.type}>
|
|
{m.name || m.type}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
<Button
|
|
onClick={handlePayEpay}
|
|
disabled={paying || !selectedEpayMethod || limitReached}
|
|
>
|
|
{t('Pay')}
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</div>
|
|
) : (
|
|
<Alert>
|
|
<AlertDescription>
|
|
{t(
|
|
'Online payment is not enabled. Please contact the administrator.'
|
|
)}
|
|
</AlertDescription>
|
|
</Alert>
|
|
)}
|
|
</div>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|