实现修改密码,但引入了修改密码后无法点击窗口的bug

This commit is contained in:
2025-05-18 23:18:42 +08:00
parent 1baff0712a
commit 0ebda96d62
6 changed files with 197 additions and 83 deletions

View File

@@ -32,6 +32,8 @@ import { Skeleton } from "./ui/skeleton"
import { toast } from "sonner"
import { useRouter } from "next/navigation"
import { ApiError } from "next/dist/server/api-utils"
import SetPassword from "./nav-user/SetPassword"
import { useState } from "react"
export function NavUser({ }: {}) {
const { isMobile } = useSidebar();
@@ -68,86 +70,92 @@ export function NavUser({ }: {}) {
}
}
const [passwordOpen, setPasswordOpen] = useState(false);
return (
<SidebarMenu>
<SidebarMenuItem>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<SidebarMenuButton
size="lg"
className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
<>
<SidebarMenu>
<SidebarMenuItem>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<SidebarMenuButton
size="lg"
className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
>
{
user && <>
<Avatar className="h-8 w-8 rounded-lg">
<AvatarImage src={user.avatar} />
<AvatarFallback className="rounded-lg">U</AvatarFallback>
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate font-medium">{user.nickname}</span>
<span className="truncate text-xs">{user.username}</span>
</div>
</>
}
{
isLoading && <div className="w-full flex items-center gap-2">
<Skeleton className="h-8 w-8 rounded-full" />
<div className="flex-1 flex flex-col gap-1">
<Skeleton className="w-full h-4" />
<Skeleton className="w-full h-4" />
</div>
</div>
}
<ChevronsUpDown className="ml-auto size-4" />
</SidebarMenuButton>
</DropdownMenuTrigger>
<DropdownMenuContent
className="w-(--radix-dropdown-menu-trigger-width) min-w-56 rounded-lg"
side={isMobile ? "bottom" : "right"}
align="end"
sideOffset={4}
>
{
user && <>
<Avatar className="h-8 w-8 rounded-lg">
<AvatarImage src={user.avatar} />
<AvatarFallback className="rounded-lg">U</AvatarFallback>
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate font-medium">{user.nickname}</span>
<span className="truncate text-xs">{user.username}</span>
<DropdownMenuLabel className="p-0 font-normal">
{
user &&
<div className="flex items-center gap-2 px-1 py-1.5 text-left text-sm">
<Avatar className="h-8 w-8 rounded-lg">
<AvatarImage src={user.avatar} />
<AvatarFallback className="rounded-lg">U</AvatarFallback>
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate font-medium">{user.nickname}</span>
<span className="truncate text-xs">{user.username}</span>
</div>
</div>
</>
}
{
isLoading && <div className="w-full flex items-center gap-2">
<Skeleton className="h-8 w-8 rounded-full" />
<div className="flex-1 flex flex-col gap-1">
<Skeleton className="w-full h-4" />
<Skeleton className="w-full h-4" />
}
{
isLoading && <div className="flex items-center gap-2">
<Skeleton className="h-8 w-8 rounded-full" />
<div className="flex-1 flex flex-col gap-1">
<Skeleton className="w-full h-4" />
<Skeleton className="w-full h-4" />
</div>
</div>
</div>
}
<ChevronsUpDown className="ml-auto size-4" />
</SidebarMenuButton>
</DropdownMenuTrigger>
<DropdownMenuContent
className="w-(--radix-dropdown-menu-trigger-width) min-w-56 rounded-lg"
side={isMobile ? "bottom" : "right"}
align="end"
sideOffset={4}
>
<DropdownMenuLabel className="p-0 font-normal">
{
user &&
<div className="flex items-center gap-2 px-1 py-1.5 text-left text-sm">
<Avatar className="h-8 w-8 rounded-lg">
<AvatarImage src={user.avatar} />
<AvatarFallback className="rounded-lg">U</AvatarFallback>
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate font-medium">{user.nickname}</span>
<span className="truncate text-xs">{user.username}</span>
</div>
</div>
}
{
isLoading && <div className="flex items-center gap-2">
<Skeleton className="h-8 w-8 rounded-full" />
<div className="flex-1 flex flex-col gap-1">
<Skeleton className="w-full h-4" />
<Skeleton className="w-full h-4" />
</div>
</div>
}
</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem>
<UserRoundCog />
</DropdownMenuItem>
<DropdownMenuItem>
<KeyRound />
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={logout}>
<LogOut />
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</SidebarMenuItem>
</SidebarMenu>
}
</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem>
<UserRoundCog />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setPasswordOpen(true)}>
<KeyRound />
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={logout}>
<LogOut />
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</SidebarMenuItem>
</SidebarMenu >
<SetPassword open={passwordOpen} onOpenChange={setPasswordOpen} />
</>
)
}