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>
414 lines
12 KiB
TypeScript
Vendored
414 lines
12 KiB
TypeScript
Vendored
import { useEffect, useMemo, useState } from 'react'
|
|
import type { z } from 'zod'
|
|
import { useForm } from 'react-hook-form'
|
|
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { Loader2 } from 'lucide-react'
|
|
import { useTranslation } from 'react-i18next'
|
|
import { toast } from 'sonner'
|
|
import { cn } from '@/lib/utils'
|
|
import { useStatus } from '@/hooks/use-status'
|
|
import { Button } from '@/components/ui/button'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from '@/components/ui/dialog'
|
|
import {
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
FormItem,
|
|
FormLabel,
|
|
FormMessage,
|
|
} from '@/components/ui/form'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Label } from '@/components/ui/label'
|
|
import { PasswordInput } from '@/components/password-input'
|
|
import { Turnstile } from '@/components/turnstile'
|
|
import { register, wechatLoginByCode } from '@/features/auth/api'
|
|
import { LegalConsent } from '@/features/auth/components/legal-consent'
|
|
import { OAuthProviders } from '@/features/auth/components/oauth-providers'
|
|
import { registerFormSchema } from '@/features/auth/constants'
|
|
import { useAuthRedirect } from '@/features/auth/hooks/use-auth-redirect'
|
|
import { useEmailVerification } from '@/features/auth/hooks/use-email-verification'
|
|
import { useTurnstile } from '@/features/auth/hooks/use-turnstile'
|
|
import { getAffiliateCode } from '@/features/auth/lib/storage'
|
|
|
|
export function SignUpForm({
|
|
className,
|
|
...props
|
|
}: React.HTMLAttributes<HTMLFormElement>) {
|
|
const { t } = useTranslation()
|
|
const [isLoading, setIsLoading] = useState(false)
|
|
const [verificationCode, setVerificationCode] = useState('')
|
|
const [agreedToLegal, setAgreedToLegal] = useState(false)
|
|
const [wechatCode, setWeChatCode] = useState('')
|
|
const [isWeChatDialogOpen, setIsWeChatDialogOpen] = useState(false)
|
|
const [isWeChatSubmitting, setIsWeChatSubmitting] = useState(false)
|
|
const legalConsentErrorMessage = t('Please agree to the legal terms first')
|
|
|
|
const { status } = useStatus()
|
|
const {
|
|
isTurnstileEnabled,
|
|
turnstileSiteKey,
|
|
turnstileToken,
|
|
setTurnstileToken,
|
|
validateTurnstile,
|
|
} = useTurnstile()
|
|
const { redirectToLogin, handleLoginSuccess } = useAuthRedirect()
|
|
const {
|
|
isSending: isSendingCode,
|
|
secondsLeft,
|
|
isActive,
|
|
sendCode,
|
|
} = useEmailVerification({
|
|
turnstileToken,
|
|
validateTurnstile,
|
|
})
|
|
|
|
const form = useForm<z.infer<typeof registerFormSchema>>({
|
|
resolver: zodResolver(registerFormSchema),
|
|
defaultValues: {
|
|
username: '',
|
|
email: '',
|
|
password: '',
|
|
confirmPassword: '',
|
|
},
|
|
})
|
|
|
|
const emailValue = form.watch('email')
|
|
const emailVerificationRequired = !!status?.email_verification
|
|
const hasUserAgreement = Boolean(status?.user_agreement_enabled)
|
|
const hasPrivacyPolicy = Boolean(status?.privacy_policy_enabled)
|
|
const requiresLegalConsent = hasUserAgreement || hasPrivacyPolicy
|
|
const oauthRegisterEnabled =
|
|
status?.oauth_register_enabled ??
|
|
status?.data?.oauth_register_enabled ??
|
|
true
|
|
const hasWeChatLogin = Boolean(status?.wechat_login)
|
|
|
|
const wechatQrCodeUrl = useMemo(() => {
|
|
return (
|
|
status?.wechat_qrcode ||
|
|
status?.wechat_qr_code ||
|
|
status?.wechat_qrcode_image_url ||
|
|
status?.wechat_qr_code_image_url ||
|
|
status?.wechat_account_qrcode_image_url ||
|
|
status?.WeChatAccountQRCodeImageURL ||
|
|
status?.data?.wechat_qrcode ||
|
|
status?.data?.WeChatAccountQRCodeImageURL ||
|
|
''
|
|
)
|
|
}, [status])
|
|
|
|
useEffect(() => {
|
|
if (requiresLegalConsent) {
|
|
setAgreedToLegal(false)
|
|
} else {
|
|
setAgreedToLegal(true)
|
|
}
|
|
}, [requiresLegalConsent])
|
|
|
|
async function onSubmit(data: z.infer<typeof registerFormSchema>) {
|
|
if (requiresLegalConsent && !agreedToLegal) {
|
|
toast.error(legalConsentErrorMessage)
|
|
return
|
|
}
|
|
|
|
// Validate email verification if required
|
|
if (emailVerificationRequired) {
|
|
if (!data.email) {
|
|
toast.error(t('Please enter your email'))
|
|
return
|
|
}
|
|
if (!verificationCode) {
|
|
toast.error(t('Please enter the verification code'))
|
|
return
|
|
}
|
|
}
|
|
|
|
setIsLoading(true)
|
|
try {
|
|
const res = await register({
|
|
username: data.username,
|
|
password: data.password,
|
|
email: data.email || undefined,
|
|
verification_code: verificationCode || undefined,
|
|
aff: getAffiliateCode(),
|
|
turnstile: turnstileToken,
|
|
})
|
|
|
|
if (res?.success) {
|
|
toast.success(t('Account created! Please sign in'))
|
|
redirectToLogin()
|
|
}
|
|
} catch (_error) {
|
|
// Errors are handled by global interceptor
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}
|
|
|
|
async function handleSendVerificationCode() {
|
|
await sendCode(emailValue || '')
|
|
}
|
|
|
|
const handleOpenWeChatDialog = () => {
|
|
if (requiresLegalConsent && !agreedToLegal) {
|
|
toast.error(legalConsentErrorMessage)
|
|
return
|
|
}
|
|
|
|
setIsWeChatDialogOpen(true)
|
|
}
|
|
|
|
const handleWeChatDialogChange = (open: boolean) => {
|
|
setIsWeChatDialogOpen(open)
|
|
if (!open) {
|
|
setWeChatCode('')
|
|
setIsWeChatSubmitting(false)
|
|
}
|
|
}
|
|
|
|
async function handleWeChatLogin() {
|
|
if (!wechatCode.trim()) {
|
|
toast.error(t('Please enter the verification code'))
|
|
return
|
|
}
|
|
|
|
setIsWeChatSubmitting(true)
|
|
try {
|
|
const res = await wechatLoginByCode(wechatCode)
|
|
if (res?.success) {
|
|
await handleLoginSuccess(res.data as { id?: number } | null)
|
|
toast.success(t('Signed in via WeChat'))
|
|
handleWeChatDialogChange(false)
|
|
} else {
|
|
toast.error(res?.message || t('Login failed'))
|
|
}
|
|
} catch (_error) {
|
|
toast.error(t('Login failed'))
|
|
} finally {
|
|
setIsWeChatSubmitting(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Form {...form}>
|
|
<form
|
|
onSubmit={form.handleSubmit(onSubmit)}
|
|
className={cn('grid gap-4', className)}
|
|
{...props}
|
|
>
|
|
{/* Username Field */}
|
|
<FormField
|
|
control={form.control}
|
|
name='username'
|
|
render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>{t('Username')}</FormLabel>
|
|
<FormControl>
|
|
<Input placeholder={t('Enter your username')} {...field} />
|
|
</FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
{/* Password Field */}
|
|
<FormField
|
|
control={form.control}
|
|
name='password'
|
|
render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>{t('Password')}</FormLabel>
|
|
<FormControl>
|
|
<PasswordInput
|
|
placeholder={t('Enter password (8-20 characters)')}
|
|
{...field}
|
|
/>
|
|
</FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
{/* Confirm Password Field */}
|
|
<FormField
|
|
control={form.control}
|
|
name='confirmPassword'
|
|
render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>{t('Confirm password')}</FormLabel>
|
|
<FormControl>
|
|
<PasswordInput placeholder={t('Confirm password')} {...field} />
|
|
</FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
{/* Email Verification Section */}
|
|
{emailVerificationRequired && (
|
|
<>
|
|
{/* Email Field */}
|
|
<FormField
|
|
control={form.control}
|
|
name='email'
|
|
render={({ field }) => (
|
|
<FormItem>
|
|
<FormLabel>
|
|
{t('Email (required for verification)')}
|
|
</FormLabel>
|
|
<FormControl>
|
|
<Input
|
|
placeholder={t('name@example.com')}
|
|
type='email'
|
|
{...field}
|
|
/>
|
|
</FormControl>
|
|
<FormMessage />
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
{/* Verification Code Field */}
|
|
<div className='flex items-end gap-2'>
|
|
<div className='flex-1'>
|
|
<Input
|
|
placeholder={t('Verification code')}
|
|
value={verificationCode}
|
|
onChange={(e) => setVerificationCode(e.target.value)}
|
|
/>
|
|
</div>
|
|
<Button
|
|
variant='outline'
|
|
type='button'
|
|
disabled={isLoading || isSendingCode || isActive || !emailValue}
|
|
onClick={handleSendVerificationCode}
|
|
>
|
|
{isActive ? (
|
|
t('Resend ({{seconds}}s)', { seconds: secondsLeft })
|
|
) : isSendingCode ? (
|
|
<Loader2 className='h-4 w-4 animate-spin' />
|
|
) : (
|
|
t('Send code')
|
|
)}
|
|
</Button>
|
|
</div>
|
|
|
|
{/* Turnstile */}
|
|
{isTurnstileEnabled && (
|
|
<div className='mt-2'>
|
|
<Turnstile
|
|
siteKey={turnstileSiteKey}
|
|
onVerify={setTurnstileToken}
|
|
/>
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
|
|
<LegalConsent
|
|
status={status}
|
|
checked={agreedToLegal}
|
|
onCheckedChange={setAgreedToLegal}
|
|
className='mt-1'
|
|
/>
|
|
|
|
{/* Submit Button */}
|
|
<Button
|
|
type='submit'
|
|
className='mt-2 w-full justify-center gap-2'
|
|
disabled={isLoading || (requiresLegalConsent && !agreedToLegal)}
|
|
>
|
|
{isLoading ? <Loader2 className='h-4 w-4 animate-spin' /> : null}
|
|
{t('Create account')}
|
|
</Button>
|
|
|
|
{oauthRegisterEnabled && (
|
|
<OAuthProviders
|
|
status={status}
|
|
disabled={isLoading || (requiresLegalConsent && !agreedToLegal)}
|
|
onWeChatLogin={hasWeChatLogin ? handleOpenWeChatDialog : undefined}
|
|
isWeChatLoading={isWeChatSubmitting}
|
|
className='pt-2'
|
|
/>
|
|
)}
|
|
</form>
|
|
|
|
{hasWeChatLogin && (
|
|
<Dialog
|
|
open={isWeChatDialogOpen}
|
|
onOpenChange={handleWeChatDialogChange}
|
|
>
|
|
<DialogContent className='max-w-sm'>
|
|
<DialogHeader className='text-left'>
|
|
<DialogTitle>{t('WeChat sign in')}</DialogTitle>
|
|
<DialogDescription>
|
|
{t(
|
|
'Scan the QR code to follow the official account and reply with “验证码” to receive your verification code.'
|
|
)}
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{wechatQrCodeUrl ? (
|
|
<div className='flex justify-center'>
|
|
<img
|
|
src={wechatQrCodeUrl}
|
|
alt={t('WeChat login QR code')}
|
|
className='h-40 w-40 rounded-md border object-contain'
|
|
/>
|
|
</div>
|
|
) : (
|
|
<p className='text-muted-foreground text-sm'>
|
|
{t('QR code is not configured. Please contact support.')}
|
|
</p>
|
|
)}
|
|
|
|
<div className='grid gap-2'>
|
|
<Label htmlFor='wechat-code'>{t('Verification code')}</Label>
|
|
<Input
|
|
id='wechat-code'
|
|
placeholder={t('Enter the verification code')}
|
|
value={wechatCode}
|
|
onChange={(event) => setWeChatCode(event.target.value)}
|
|
autoComplete='one-time-code'
|
|
/>
|
|
</div>
|
|
|
|
<DialogFooter>
|
|
<Button
|
|
type='button'
|
|
variant='outline'
|
|
onClick={() => handleWeChatDialogChange(false)}
|
|
disabled={isWeChatSubmitting}
|
|
>
|
|
{t('Cancel')}
|
|
</Button>
|
|
<Button
|
|
type='button'
|
|
onClick={handleWeChatLogin}
|
|
disabled={
|
|
isWeChatSubmitting ||
|
|
!wechatCode.trim() ||
|
|
(requiresLegalConsent && !agreedToLegal)
|
|
}
|
|
className='gap-2'
|
|
>
|
|
{isWeChatSubmitting ? (
|
|
<Loader2 className='h-4 w-4 animate-spin' />
|
|
) : null}
|
|
{t('Confirm')}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)}
|
|
</Form>
|
|
)
|
|
}
|