fix: tenancy middleware order and ui consistency for user profile
This commit is contained in:
@@ -351,7 +351,7 @@ export default function AuthenticatedLayout({
|
||||
{user.name}
|
||||
</span>
|
||||
<span className="text-xs text-slate-500">
|
||||
{user.username || 'Administrator'}
|
||||
{user.role_labels?.[0] || user.roles?.[0] || '一般用戶'}
|
||||
</span>
|
||||
</div>
|
||||
<div className="h-9 w-9 bg-slate-100 rounded-full flex items-center justify-center text-slate-600 group-hover:bg-primary-lightest group-hover:text-primary-main transition-all">
|
||||
@@ -359,7 +359,17 @@ export default function AuthenticatedLayout({
|
||||
</div>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end" className="w-56 z-[100]" sideOffset={8}>
|
||||
<DropdownMenuLabel>我的帳號</DropdownMenuLabel>
|
||||
<DropdownMenuLabel>{user.name} ({user.username})</DropdownMenuLabel>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem asChild>
|
||||
<Link
|
||||
href={route('profile.edit')}
|
||||
className="w-full flex items-center cursor-pointer text-slate-600 focus:bg-slate-100 focus:text-slate-900 group"
|
||||
>
|
||||
<Settings className="mr-2 h-4 w-4 text-slate-500 group-focus:text-slate-900" />
|
||||
<span>使用者設定</span>
|
||||
</Link>
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem asChild>
|
||||
<Link
|
||||
|
||||
Reference in New Issue
Block a user