diff --git a/app/web/src/components/pages/AuthBody.tsx b/app/web/src/components/pages/AuthBody.tsx index c00bff4..1fa2130 100644 --- a/app/web/src/components/pages/AuthBody.tsx +++ b/app/web/src/components/pages/AuthBody.tsx @@ -2,7 +2,6 @@ * 鉴权页主体:薄 SSR — 外层容器 + AuthForm 在浏览器渲染。 */ import type { Locale } from "@app/i18n"; -import { Toaster } from "@app/ui"; import AuthForm, { type AuthFormMode } from "~/components/AuthForm"; export interface AuthBodyProps { @@ -18,7 +17,6 @@ export default function AuthBody({ locale, mode, next, token }: AuthBodyProps) {
- ); } diff --git a/app/web/src/layouts/AppLayout.astro b/app/web/src/layouts/AppLayout.astro index 06cff09..488be79 100644 --- a/app/web/src/layouts/AppLayout.astro +++ b/app/web/src/layouts/AppLayout.astro @@ -2,6 +2,7 @@ import { ClientRouter } from "astro:transitions"; import "../styles/globals.css"; import UserMenu from "~/components/UserMenu"; +import { Toaster } from "@app/ui"; import ThemeSwitch from "~/components/ThemeSwitch"; import LocaleSwitch from "~/components/LocaleSwitch"; import { @@ -238,5 +239,6 @@ const nav = [ )} - + + diff --git a/app/web/src/views/browse.astro b/app/web/src/views/browse.astro index 8a40e8b..4cb84f1 100644 --- a/app/web/src/views/browse.astro +++ b/app/web/src/views/browse.astro @@ -1,6 +1,5 @@ --- import { type Locale, t } from "@app/i18n"; -import { Toaster } from "@app/ui"; import { BrowseBody } from "~/components/pages/BrowseBody"; import AppLayout from "~/layouts/AppLayout.astro"; @@ -23,5 +22,4 @@ const { locale } = Astro.props; }} > - diff --git a/app/web/src/views/danmaku.astro b/app/web/src/views/danmaku.astro index 0a72850..9f8a7f0 100644 --- a/app/web/src/views/danmaku.astro +++ b/app/web/src/views/danmaku.astro @@ -1,6 +1,5 @@ --- import { type Locale, t } from "@app/i18n"; -import { Toaster } from "@app/ui"; import { DanmakuSettingsBody } from "~/components/pages/DanmakuSettingsBody"; import AppLayout from "~/layouts/AppLayout.astro"; @@ -23,5 +22,4 @@ const { locale } = Astro.props; }} > - diff --git a/app/web/src/views/library.astro b/app/web/src/views/library.astro index f51ff3f..d55ccb8 100644 --- a/app/web/src/views/library.astro +++ b/app/web/src/views/library.astro @@ -1,6 +1,5 @@ --- import { type Locale, t } from "@app/i18n"; -import { Toaster } from "@app/ui"; import { LibraryBody } from "~/components/pages/LibraryBody"; import AppLayout from "~/layouts/AppLayout.astro"; @@ -23,5 +22,4 @@ const { locale } = Astro.props; }} > - diff --git a/app/web/src/views/mounts.astro b/app/web/src/views/mounts.astro index 416077e..4e50615 100644 --- a/app/web/src/views/mounts.astro +++ b/app/web/src/views/mounts.astro @@ -1,6 +1,5 @@ --- import { type Locale, t } from "@app/i18n"; -import { Toaster } from "@app/ui"; import { MountsBody } from "~/components/pages/MountsBody"; import AppLayout from "~/layouts/AppLayout.astro"; @@ -23,5 +22,4 @@ const { locale } = Astro.props; }} > - diff --git a/app/web/src/views/watch.astro b/app/web/src/views/watch.astro index d7051dc..2bc1b7c 100644 --- a/app/web/src/views/watch.astro +++ b/app/web/src/views/watch.astro @@ -1,6 +1,5 @@ --- import { type Locale, t } from "@app/i18n"; -import { Toaster } from "@app/ui"; import { WatchBody } from "~/components/pages/WatchBody"; import AppLayout from "~/layouts/AppLayout.astro"; @@ -24,5 +23,4 @@ const { locale, mediaItemId } = Astro.props; }} > - diff --git a/packages/ui/src/sonner.tsx b/packages/ui/src/sonner.tsx index c183e6c..412ca4f 100644 --- a/packages/ui/src/sonner.tsx +++ b/packages/ui/src/sonner.tsx @@ -3,19 +3,31 @@ import { Toaster as SonnerToaster, toast } from "sonner"; type ToasterProps = React.ComponentProps; -const Toaster = ({ style, ...props }: ToasterProps) => { +/** + * sonner 封装:站点统一 toast。 + * 视觉用 design tokens,位置右上角,跟随主题。 + */ +const Toaster = ({ ...props }: ToasterProps) => { return (