mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-06 17:46:23 +00:00
Replace the ad-hoc "workspace" abstraction with a focused, URL-driven
"sidebar view" registry that implements the modern Vercel / Cloudflare
drill-in pattern: clicking a top-level entry (e.g. System Settings)
swaps the sidebar to a contextual workspace, with a `← Back to
Dashboard` affordance, instead of stacking sub-navigation in the root.
Architecture
------------
- types.ts
+ SidebarView — declarative nested view config
(id, pathPattern, parent, getNavGroups)
+ SidebarViewParent — back-navigation descriptor
+ ResolvedSidebarView — { key, view, navGroups } returned by hook
+ SidebarData — slimmed to { navGroups } only
- Workspace — removed (logo/plan never rendered)
- lib/sidebar-view-registry.ts (new, replaces workspace-registry.ts)
+ SIDEBAR_VIEWS array — single source of truth for nested views
+ resolveSidebarView(pathname)
+ getNavGroupsForPath(pathname, t) — back-compat helper for the
command palette
- config/system-settings.config.ts
Refactored to export a single SYSTEM_SETTINGS_VIEW (SidebarView)
with parent `/dashboard/overview` + label `Back to Dashboard`.
- components/sidebar-view-header.tsx (new)
Renders only the back affordance (chevron + label). Uses the
default SidebarMenuButton size so its typography matches the
nav items below; collapses gracefully into icon mode via the
existing tooltip behavior. The redundant "title + icon" row was
removed — workspace context is already carried by the nav groups.
- hooks/use-sidebar-view.ts (new)
Encapsulates view resolution and root-nav filtering:
· matched view → returns its nav groups verbatim (route-level
beforeLoad guards already enforce access);
· no match → returns root nav groups, narrowed by user
role (admin gate) and useSidebarConfig
(admin × user sidebar_modules overlay).
- components/app-sidebar.tsx
Now a thin presentation layer: reads { key, view, navGroups }
from useSidebarView() and orchestrates the view transition via
AnimatePresence + MOTION_VARIANTS.sidebarSlide (respects
prefers-reduced-motion). No logic, no role checks, no path
matching — those live in the hook.
- components/command-menu.tsx
Switched to the new getNavGroupsForPath() API; behavior preserved.
Cleanup
-------
- Deleted layout/context/workspace-context.tsx (zero consumers).
- Deleted layout/lib/workspace-registry.ts and its
workspace-registry.example.ts companion (over-abstracted: name/id
metadata, isInWorkspace / getAllWorkspaces / WORKSPACE_IDS were
registered but never read).
- Removed `workspaces` field from useSidebarData (never consumed
after the top-switcher was dropped).
- Dropped WorkspaceProvider from authenticated-layout.tsx.
- Trimmed dead `Manage and configure` translation key from all six
locale files and from static-keys.ts.
i18n
----
Added the `Back to Dashboard` key to en, zh, fr, ja, ru, vi, and
registered it in static-keys.ts under "Sidebar views".
Verification
------------
- bun run typecheck: passes
- Lint: no new warnings/errors on the touched files
- Adding a new drill-in workspace now only requires registering a
SidebarView in SIDEBAR_VIEWS — no changes to AppSidebar required.
149 lines
4.4 KiB
TypeScript
Vendored
149 lines
4.4 KiB
TypeScript
Vendored
/*
|
|
Copyright (C) 2023-2026 QuantumNous
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License as
|
|
published by the Free Software Foundation, either version 3 of the
|
|
License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
For commercial licensing, please contact support@quantumnous.com
|
|
*/
|
|
import { type ReactNode } from 'react'
|
|
import i18next from 'i18next'
|
|
import { CreditCard, Landmark } from 'lucide-react'
|
|
import { SiAlipay, SiWechat, SiStripe } from 'react-icons/si'
|
|
import { PAYMENT_TYPES, PAYMENT_ICON_COLORS } from '../constants'
|
|
|
|
// ============================================================================
|
|
// UI Helper Functions
|
|
// ============================================================================
|
|
|
|
const HAS_LOCATION =
|
|
typeof globalThis !== 'undefined' && 'location' in globalThis
|
|
|
|
/**
|
|
* Resolves a backend-provided image URL to http(s) only. Rejects javascript:,
|
|
* data:, blob:, file:, and URLs with userinfo, which are unsafe in <img src/>.
|
|
*/
|
|
function normalizeHttpIconUrl(raw: string | undefined | null): string | null {
|
|
if (!raw) return null
|
|
const s = raw.trim()
|
|
if (!s) return null
|
|
let url: URL
|
|
try {
|
|
url = HAS_LOCATION
|
|
? new URL(s, (globalThis as { location: Location }).location.href)
|
|
: new URL(s)
|
|
} catch {
|
|
return null
|
|
}
|
|
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
|
return null
|
|
}
|
|
if (url.username || url.password) {
|
|
return null
|
|
}
|
|
return url.toString()
|
|
}
|
|
|
|
/**
|
|
* Get payment method icon component
|
|
*
|
|
* When iconUrl is provided, render an <img/> with that URL so custom
|
|
* gateway logos can be configured per-method.
|
|
*/
|
|
export function getPaymentIcon(
|
|
paymentType: string | undefined,
|
|
className: string = 'h-4 w-4',
|
|
iconUrl?: string,
|
|
altName?: string
|
|
): ReactNode {
|
|
const safeIconUrl = normalizeHttpIconUrl(iconUrl)
|
|
if (safeIconUrl) {
|
|
return (
|
|
<img
|
|
src={safeIconUrl}
|
|
alt={altName || paymentType || 'payment'}
|
|
className={className}
|
|
style={{ objectFit: 'contain' }}
|
|
loading='lazy'
|
|
decoding='async'
|
|
referrerPolicy='no-referrer'
|
|
/>
|
|
)
|
|
}
|
|
|
|
if (!paymentType) {
|
|
return <CreditCard className={className} />
|
|
}
|
|
|
|
switch (paymentType) {
|
|
case PAYMENT_TYPES.ALIPAY:
|
|
return (
|
|
<SiAlipay
|
|
className={className}
|
|
style={{ color: PAYMENT_ICON_COLORS[PAYMENT_TYPES.ALIPAY] }}
|
|
/>
|
|
)
|
|
case PAYMENT_TYPES.WECHAT:
|
|
return (
|
|
<SiWechat
|
|
className={className}
|
|
style={{ color: PAYMENT_ICON_COLORS[PAYMENT_TYPES.WECHAT] }}
|
|
/>
|
|
)
|
|
case PAYMENT_TYPES.STRIPE:
|
|
return (
|
|
<SiStripe
|
|
className={className}
|
|
style={{ color: PAYMENT_ICON_COLORS[PAYMENT_TYPES.STRIPE] }}
|
|
/>
|
|
)
|
|
case PAYMENT_TYPES.CREEM:
|
|
return (
|
|
<Landmark
|
|
className={className}
|
|
style={{ color: PAYMENT_ICON_COLORS[PAYMENT_TYPES.CREEM] }}
|
|
/>
|
|
)
|
|
case PAYMENT_TYPES.WAFFO:
|
|
return (
|
|
<CreditCard
|
|
className={className}
|
|
style={{ color: PAYMENT_ICON_COLORS[PAYMENT_TYPES.WAFFO] }}
|
|
/>
|
|
)
|
|
case PAYMENT_TYPES.WAFFO_PANCAKE:
|
|
// The W glyph fills only ~40% of its viewBox vertically (wide and
|
|
// short letterform); scale(2) brings its rendered height in line
|
|
// with Stripe's S and Creem's Landmark.
|
|
return (
|
|
<span
|
|
className={`inline-flex items-center justify-center leading-none ${className}`}
|
|
style={{ transform: 'scale(2)' }}
|
|
>
|
|
<img
|
|
src='/waffo-logo-light.svg'
|
|
alt={i18next.t('Waffo')}
|
|
className='block h-full w-full object-contain dark:hidden'
|
|
/>
|
|
<img
|
|
src='/waffo-logo-dark.svg'
|
|
alt={i18next.t('Waffo')}
|
|
className='hidden h-full w-full object-contain dark:block'
|
|
/>
|
|
</span>
|
|
)
|
|
default:
|
|
return <CreditCard className={className} />
|
|
}
|
|
}
|