Merge pull request #194 from ashert-hsueh/fix/usermenu-login-button

longsizhuo · web-flow · commit e570deb26986 · 2025-10-15T00:21:06.000+08:00
fix: fix login button logic in usermenu
diff --git a/app/components/UserMenu.tsx b/app/components/UserMenu.tsx
@@ -32,7 +32,7 @@ export function UserMenu({ user, provider }: UserMenuProps) {
         </Avatar>
       </summary>
 
-      <div className="absolute right-0 mt-2 w-60 overflow-hidden rounded-md border border-border bg-popover shadow-lg">
+      <div className="absolute right-0 mt-2 w-60 overflow-hidden rounded-md border border-border bg-popover shadow-lg z-50">
         <div className="border-b border-border bg-muted/40 px-4 py-3">
           <p className="text-sm font-medium text-foreground">
             {user.name ?? "Signed in"}
diff --git a/app/docs/layout.tsx b/app/docs/layout.tsx
@@ -62,16 +62,16 @@ function pruneEmptyFolders(root: PageTree.Root): PageTree.Root {
   return transformRoot(root);
 }
 
-export default function Layout({ children }: { children: ReactNode }) {
+export default async function Layout({ children }: { children: ReactNode }) {
   const tree = pruneEmptyFolders(source.pageTree);
-
+  const options = await baseOptions();
   return (
     <>
       {/* Add a class on <html> while in docs to adjust global backgrounds */}
       <DocsRouteFlag />
       <DocsLayout
         tree={tree}
-        {...baseOptions()}
+        {...options}
         sidebar={{
           // Only show top-level items on first load
           defaultOpenLevel: 0,
diff --git a/auth.ts b/auth.ts
@@ -20,7 +20,6 @@ export const { handlers, auth, signIn, signOut } = NextAuth(() => {
   if (!databaseUrl) {
     console.warn("[auth] DATABASE_URL missing – running without Neon adapter");
   }
-
   return {
     ...authConfig,
     providers: [
diff --git a/lib/layout.shared.tsx b/lib/layout.shared.tsx
@@ -1,12 +1,24 @@
 import type { BaseLayoutProps } from "fumadocs-ui/layouts/shared";
 import { SignInButton } from "@/app/components/SignInButton";
-export function baseOptions(): BaseLayoutProps {
+import { UserMenu } from "@/app/components/UserMenu";
+import { auth } from "@/auth";
+export async function baseOptions(): Promise<BaseLayoutProps> {
+  const session = await auth();
+  const user = session?.user;
+  const provider =
+    session && "provider" in session
+      ? (session.provider as string | undefined)
+      : undefined;
   return {
     nav: {
       title: "内卷地狱",
       children: (
         <div className="ms-auto flex justify-end">
-          <SignInButton />
+          {user ? (
+            <UserMenu user={user} provider={provider} />
+          ) : (
+            <SignInButton />
+          )}
         </div>
       ),
     },

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ export const { handlers, auth, signIn, signOut } = NextAuth(() => {`
`20`	`20`	`if (!databaseUrl) {`
`21`	`21`	`console.warn("[auth] DATABASE_URL missing – running without Neon adapter");`
`22`	`22`	`}`
`23`		`-`
`24`	`23`	`return {`
`25`	`24`	`...authConfig,`
`26`	`25`	`providers: [`