From 77950e48c76f4a3b29d01831d43039caba29888a Mon Sep 17 00:00:00 2001
From: wwf <1971391498@qq.com>
Date: 星期二, 18 十一月 2025 14:12:42 +0800
Subject: [PATCH] 修改
---
app/account/avatar.tsx | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/app/account/avatar.tsx b/app/account/avatar.tsx
index ea897e6..47e8e75 100644
--- a/app/account/avatar.tsx
+++ b/app/account/avatar.tsx
@@ -2,16 +2,11 @@
import { useTranslation } from 'react-i18next'
import { Fragment } from 'react'
import { useRouter } from 'next/navigation'
-import {
- RiGraduationCapFill,
-} from '@remixicon/react'
-import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react'
+import { Menu, Transition } from '@headlessui/react'
import Avatar from '@/app/components/base/avatar'
import { logout } from '@/service/common'
import { useAppContext } from '@/context/app-context'
-import { useProviderContext } from '@/context/provider-context'
import { LogOut01 } from '@/app/components/base/icons/src/vender/line/general'
-import PremiumBadge from '@/app/components/base/premium-badge'
export type IAppSelector = {
isMobile: boolean
@@ -21,7 +16,6 @@
const router = useRouter()
const { t } = useTranslation()
const { userProfile } = useAppContext()
- const { isEducationAccount } = useProviderContext()
const handleLogout = async () => {
await logout({
@@ -42,17 +36,17 @@
({ open }) => (
<>
<div>
- <MenuButton
+ <Menu.Button
className={`
- p-1x inline-flex
- items-center rounded-[20px] text-sm
+ inline-flex items-center
+ rounded-[20px] p-1x text-sm
text-text-primary
mobile:px-1
${open && 'bg-components-panel-bg-blur'}
`}
>
<Avatar avatar={userProfile.avatar_url} name={userProfile.name} size={32} />
- </MenuButton>
+ </Menu.Button>
</div>
<Transition
as={Fragment}
@@ -63,43 +57,35 @@
leaveFrom="transform opacity-100 scale-100"
leaveTo="transform opacity-0 scale-95"
>
- <MenuItems
+ <Menu.Items
className="
absolute -right-2 -top-1 w-60 max-w-80
- origin-top-right divide-y divide-divider-subtle rounded-lg bg-components-panel-bg-blur
+ divide-y divide-divider-subtle origin-top-right rounded-lg bg-components-panel-bg-blur
shadow-lg
"
>
- <MenuItem>
+ <Menu.Item>
<div className='p-1'>
<div className='flex flex-nowrap items-center px-3 py-2'>
<div className='grow'>
- <div className='system-md-medium break-all text-text-primary'>
- {userProfile.name}
- {isEducationAccount && (
- <PremiumBadge size='s' color='blue' className='ml-1 !px-2'>
- <RiGraduationCapFill className='mr-1 h-3 w-3' />
- <span className='system-2xs-medium'>EDU</span>
- </PremiumBadge>
- )}
- </div>
- <div className='system-xs-regular break-all text-text-tertiary'>{userProfile.email}</div>
+ <div className='system-md-medium text-text-primary break-all'>{userProfile.name}</div>
+ <div className='system-xs-regular text-text-tertiary break-all'>{userProfile.email}</div>
</div>
<Avatar avatar={userProfile.avatar_url} name={userProfile.name} size={32} />
</div>
</div>
- </MenuItem>
- <MenuItem>
+ </Menu.Item>
+ <Menu.Item>
<div className='p-1' onClick={() => handleLogout()}>
<div
- className='group flex h-9 cursor-pointer items-center justify-start rounded-lg px-3 hover:bg-state-base-hover'
+ className='flex items-center justify-start h-9 px-3 rounded-lg cursor-pointer group hover:bg-state-base-hover'
>
- <LogOut01 className='mr-1 flex h-4 w-4 text-text-tertiary' />
- <div className='text-[14px] font-normal text-text-secondary'>{t('common.userProfile.logout')}</div>
+ <LogOut01 className='w-4 h-4 text-text-tertiary flex mr-1' />
+ <div className='font-normal text-[14px] text-text-secondary'>{t('common.userProfile.logout')}</div>
</div>
</div>
- </MenuItem>
- </MenuItems>
+ </Menu.Item>
+ </Menu.Items>
</Transition>
</>
)
--
Gitblit v1.8.0