Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions frontend/src/app/layout/app-header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { MemoryRouter, Route, Routes, useLocation } from 'react-router'
import type { AuthTokens, CreditAccount, QuotaApis, UserApis } from '@/entities'
import { forgetActiveRun, rememberActiveRun } from '@/features/active-run'
import { AuthSessionProvider } from '@/features/auth-session'
import defaultAccountAvatar from '@/assets/account/avatars/windup-witch-avatar.webp'
import { AppHeader } from './app-header'

const user = {
Expand Down Expand Up @@ -484,6 +485,9 @@ describe('AppHeader', () => {
expect(
within(accountMenu).getByTestId('default-account-avatar').getAttribute('aria-hidden'),
).toBe('true')
expect(within(accountMenu).getByTestId('default-account-avatar').getAttribute('src')).toBe(
defaultAccountAvatar,
)
})

it('账号菜单在点击外部或按 Escape 时关闭', async () => {
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/app/layout/app-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { WindupMark } from '@/shared/ui/windup-mark'
import { useEffect, useRef, useState } from 'react'
import { Link, useLocation, useNavigate } from 'react-router'

import defaultAccountAvatar from '@/assets/account/avatars/windup-witch-avatar.webp'
import { quotaApis as defaultQuotaApis } from '@/entities'
import type { QuotaApis } from '@/entities'
import { readActiveRun, subscribeActiveRun } from '@/features/active-run'
Expand Down Expand Up @@ -432,11 +433,13 @@ export function AppHeader({
accountMenu.expanded ? 'scale-110' : 'scale-100'
}`}
>
<WindupMark
<img
data-testid="default-account-avatar"

src={defaultAccountAvatar}
alt=""
aria-hidden="true"
className="h-5 w-5 object-contain"
style={{ imageRendering: 'pixelated' }}
/>
</span>
<span className="hidden truncate sm:inline">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions frontend/src/pages/account/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { quotaApis } from '@/entities'
import type { AuthTokens, User, UserApis } from '@/entities'
import { AuthSessionProvider } from '@/features/auth-session'
import { AppRoutes } from '@/app/app'
import defaultAccountAvatar from '@/assets/account/avatars/windup-witch-avatar.webp'

const user: User = {
id: '7',
Expand Down Expand Up @@ -140,6 +141,9 @@ describe('AccountPage', () => {
expect(screen.getByTestId('account-profile-default-avatar').getAttribute('aria-hidden')).toBe(
'true',
)
expect(screen.getByTestId('account-profile-default-avatar').getAttribute('src')).toBe(
defaultAccountAvatar,
)
expect(screen.queryByLabelText('邮箱验证码')).toBeNull()

fireEvent.click(screen.getByRole('button', { name: '修改密码' }))
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/pages/account/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { WindupMark } from '@/shared/ui/windup-mark'
import { Gift, X } from '@phosphor-icons/react'
import {
useEffect,
Expand All @@ -13,6 +12,7 @@ import {
import { useSearchParams } from 'react-router'

import accountBadgeArtwork from '@/assets/account/illustrations/account-badge.webp'
import defaultAccountAvatar from '@/assets/account/avatars/windup-witch-avatar.webp'
import { quotaApis, type CreditRedemptionResult, type User } from '@/entities'
import { useAuthSession } from '@/features/auth-session'
import {
Expand Down Expand Up @@ -735,11 +735,13 @@ export function AccountPage() {

<div className="mt-5 flex items-center gap-4 border-b border-app-line pb-5">
<span className="grid size-14 shrink-0 place-items-center rounded-full bg-app-accent-soft">
<WindupMark
<img
data-testid="account-profile-default-avatar"

src={defaultAccountAvatar}
alt=""
aria-hidden="true"
className="size-9 object-contain"
style={{ imageRendering: 'pixelated' }}
/>
</span>
<div className="min-w-0">
Expand Down
Loading