refactor: 个人主页移除徽章卡片
徽章已在成就页的"题单奖章" tab 展示,主页重复且与旁边的成就摘要 风格不一致。连带删掉无引用的 GroupedUserBadge 组件。 成就图标那排补上"最近获得"标签,避免被误读成成就总数。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -4,15 +4,10 @@ import { NH2, NH3 } from "naive-ui"
|
|||||||
import { getProfile } from "shared/api"
|
import { getProfile } from "shared/api"
|
||||||
import { useBreakpoints } from "shared/composables/breakpoints"
|
import { useBreakpoints } from "shared/composables/breakpoints"
|
||||||
import { durationToDays, parseTime } from "utils/functions"
|
import { durationToDays, parseTime } from "utils/functions"
|
||||||
import type {
|
import type { AchievementSummary, Profile } from "utils/types"
|
||||||
AchievementSummary,
|
|
||||||
Profile,
|
|
||||||
UserBadge as UserBadgeType,
|
|
||||||
} from "utils/types"
|
|
||||||
import { getAchievementSummary } from "oj/achievement/api"
|
import { getAchievementSummary } from "oj/achievement/api"
|
||||||
import { getMetrics, getUserBadges } from "../api"
|
import { getMetrics } from "../api"
|
||||||
import AchievementIcon from "shared/components/AchievementIcon.vue"
|
import AchievementIcon from "shared/components/AchievementIcon.vue"
|
||||||
import GroupedUserBadge from "shared/components/GroupedUserBadge.vue"
|
|
||||||
import { useUserStore } from "shared/store/user"
|
import { useUserStore } from "shared/store/user"
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
@@ -24,7 +19,6 @@ const firstSubmissionAt = ref("")
|
|||||||
const latestSubmissionAt = ref("")
|
const latestSubmissionAt = ref("")
|
||||||
const toLatestAt = ref("")
|
const toLatestAt = ref("")
|
||||||
const learnDuration = ref("")
|
const learnDuration = ref("")
|
||||||
const userBadges = ref<GroupedBadge[]>([])
|
|
||||||
const achievementSummary = ref<AchievementSummary | null>(null)
|
const achievementSummary = ref<AchievementSummary | null>(null)
|
||||||
const [loading, toggle] = useToggle()
|
const [loading, toggle] = useToggle()
|
||||||
const [show, toggleShow] = useToggle(false)
|
const [show, toggleShow] = useToggle(false)
|
||||||
@@ -65,40 +59,6 @@ const hasMoreProblems = computed(
|
|||||||
() => problems.value.length > itemsPerRow.value * 3,
|
() => problems.value.length > itemsPerRow.value * 3,
|
||||||
)
|
)
|
||||||
|
|
||||||
// 分组徽章接口
|
|
||||||
interface GroupedBadge {
|
|
||||||
icon: string
|
|
||||||
count: number
|
|
||||||
badges: UserBadgeType[]
|
|
||||||
latestEarnedTime: Date
|
|
||||||
}
|
|
||||||
|
|
||||||
// 按图标分组徽章
|
|
||||||
function groupBadgesByIcon(badges: UserBadgeType[]): GroupedBadge[] {
|
|
||||||
const grouped = new Map<string, UserBadgeType[]>()
|
|
||||||
|
|
||||||
// 按图标分组
|
|
||||||
badges.forEach((badge) => {
|
|
||||||
const icon = badge.badge.icon
|
|
||||||
if (!grouped.has(icon)) {
|
|
||||||
grouped.set(icon, [])
|
|
||||||
}
|
|
||||||
grouped.get(icon)!.push(badge)
|
|
||||||
})
|
|
||||||
|
|
||||||
// 转换为数组并排序
|
|
||||||
return Array.from(grouped.entries())
|
|
||||||
.map(([icon, badgeList]) => ({
|
|
||||||
icon,
|
|
||||||
count: badgeList.length,
|
|
||||||
badges: badgeList,
|
|
||||||
latestEarnedTime: new Date(
|
|
||||||
Math.max(...badgeList.map((b) => new Date(b.earned_time).getTime())),
|
|
||||||
),
|
|
||||||
}))
|
|
||||||
.sort((a, b) => a.icon.localeCompare(b.icon))
|
|
||||||
}
|
|
||||||
|
|
||||||
async function init() {
|
async function init() {
|
||||||
toggle(true)
|
toggle(true)
|
||||||
try {
|
try {
|
||||||
@@ -113,23 +73,9 @@ async function init() {
|
|||||||
})
|
})
|
||||||
ac.sort()
|
ac.sort()
|
||||||
problems.value = ac
|
problems.value = ac
|
||||||
const promises: Promise<{ data: any }>[] = []
|
|
||||||
|
|
||||||
if (profile.value.submission_number > 0) {
|
if (profile.value.submission_number > 0) {
|
||||||
promises.push(getMetrics(profile.value.user.id))
|
const metricsRes = await getMetrics(profile.value.user.id)
|
||||||
}
|
|
||||||
|
|
||||||
if (route.query.name) {
|
|
||||||
promises.push(getUserBadges(route.query.name as string))
|
|
||||||
} else {
|
|
||||||
promises.push(getUserBadges())
|
|
||||||
}
|
|
||||||
|
|
||||||
const results = await Promise.all(promises)
|
|
||||||
|
|
||||||
// 处理 metrics 结果
|
|
||||||
if (profile.value.submission_number > 0) {
|
|
||||||
const metricsRes = results[0]
|
|
||||||
firstSubmissionAt.value = parseTime(metricsRes.data.first)
|
firstSubmissionAt.value = parseTime(metricsRes.data.first)
|
||||||
latestSubmissionAt.value = parseTime(metricsRes.data.latest)
|
latestSubmissionAt.value = parseTime(metricsRes.data.latest)
|
||||||
toLatestAt.value = durationToDays(
|
toLatestAt.value = durationToDays(
|
||||||
@@ -141,9 +87,6 @@ async function init() {
|
|||||||
metricsRes.data.latest,
|
metricsRes.data.latest,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理 badges 结果
|
|
||||||
userBadges.value = groupBadgesByIcon(results[1].data)
|
|
||||||
} finally {
|
} finally {
|
||||||
toggle(false)
|
toggle(false)
|
||||||
}
|
}
|
||||||
@@ -297,6 +240,9 @@ onMounted(() => {
|
|||||||
</n-button>
|
</n-button>
|
||||||
</n-flex>
|
</n-flex>
|
||||||
<n-flex align="center" :size="10" class="achievement-recent">
|
<n-flex align="center" :size="10" class="achievement-recent">
|
||||||
|
<n-text v-if="achievementSummary.recent.length" depth="3">
|
||||||
|
最近获得
|
||||||
|
</n-text>
|
||||||
<n-tooltip v-for="a in achievementSummary.recent" :key="a.id">
|
<n-tooltip v-for="a in achievementSummary.recent" :key="a.id">
|
||||||
<template #trigger>
|
<template #trigger>
|
||||||
<span class="achievement-icon">
|
<span class="achievement-icon">
|
||||||
@@ -311,24 +257,6 @@ onMounted(() => {
|
|||||||
</n-flex>
|
</n-flex>
|
||||||
</n-card>
|
</n-card>
|
||||||
|
|
||||||
<!-- 徽章展示卡片 -->
|
|
||||||
<n-card
|
|
||||||
v-if="!loading && profile && userBadges.length > 0"
|
|
||||||
class="wrapper"
|
|
||||||
hoverable
|
|
||||||
>
|
|
||||||
<template #header>
|
|
||||||
<n-h4 style="margin: 0">获得的徽章</n-h4>
|
|
||||||
</template>
|
|
||||||
<n-flex wrap>
|
|
||||||
<GroupedUserBadge
|
|
||||||
v-for="groupedBadge in userBadges"
|
|
||||||
:key="groupedBadge.icon"
|
|
||||||
:grouped-badge="groupedBadge"
|
|
||||||
/>
|
|
||||||
</n-flex>
|
|
||||||
</n-card>
|
|
||||||
|
|
||||||
<n-descriptions v-if="!loading && profile" class="wrapper" bordered>
|
<n-descriptions v-if="!loading && profile" class="wrapper" bordered>
|
||||||
<n-descriptions-item v-if="!!problems.length">
|
<n-descriptions-item v-if="!!problems.length">
|
||||||
<template #label>
|
<template #label>
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="badge-item">
|
|
||||||
<img
|
|
||||||
:src="groupedBadge.icon"
|
|
||||||
:alt="groupedBadge.badges[0].badge.name"
|
|
||||||
class="badge-icon"
|
|
||||||
@error="handleImageError"
|
|
||||||
/>
|
|
||||||
<div v-if="groupedBadge.count > 1" class="badge-count">
|
|
||||||
×{{ groupedBadge.count }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
interface GroupedBadge {
|
|
||||||
icon: string
|
|
||||||
count: number
|
|
||||||
badges: any[]
|
|
||||||
latestEarnedTime: Date
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
groupedBadge: GroupedBadge
|
|
||||||
}
|
|
||||||
|
|
||||||
defineProps<Props>()
|
|
||||||
|
|
||||||
function handleImageError(event: Event) {
|
|
||||||
const img = event.target as HTMLImageElement
|
|
||||||
img.src = "/badge-1.png"
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.badge-item {
|
|
||||||
position: relative;
|
|
||||||
display: inline-block;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 44px;
|
|
||||||
height: 44px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.badge-icon {
|
|
||||||
width: 40px;
|
|
||||||
height: 40px;
|
|
||||||
border-radius: 50%;
|
|
||||||
object-fit: cover;
|
|
||||||
border: 2px solid #e0e0e0;
|
|
||||||
transition: all 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.badge-icon:hover {
|
|
||||||
transform: scale(1.1);
|
|
||||||
border-color: #1890ff;
|
|
||||||
box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.badge-count {
|
|
||||||
position: absolute;
|
|
||||||
top: -5px;
|
|
||||||
right: -5px;
|
|
||||||
background: #ff4d4f;
|
|
||||||
color: white;
|
|
||||||
border-radius: 50%;
|
|
||||||
width: 18px;
|
|
||||||
height: 18px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-size: 10px;
|
|
||||||
font-weight: bold;
|
|
||||||
border: 2px solid white;
|
|
||||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
Reference in New Issue
Block a user