Compare commits

..

25 Commits

Author SHA1 Message Date
Tim
bfadda1e7d fix: gray out unearned medals 2025-08-27 20:21:05 +08:00
Tim
a1fa7b2d5b fix: 站内信 scroll问题 #749 2025-08-27 20:00:14 +08:00
Tim
083c7980c6 Merge pull request #755 from nagisa77/feature/daily_bugfix_0827
fix:  回复表情通知为空的问题 #735
2025-08-27 19:45:21 +08:00
Tim
3d51f29be7 fix: 回复表情通知为空的问题 #735 2025-08-27 19:44:27 +08:00
Tim
d243e3a9d6 Merge pull request #752 from nagisa77/feature/daily_bugfix_0827
feature: 积分趋势统计
2025-08-27 15:56:33 +08:00
Tim
2b3c60f9a7 fix: 新增积分趋势统计 2025-08-27 15:55:20 +08:00
Tim
8b948a20cd Merge pull request #751 from nagisa77/codex/add-91zeiv
feat: show 30-day point trend chart
2025-08-27 15:43:33 +08:00
Tim
5053ac213d test(points): cover trend endpoint 2025-08-27 15:42:49 +08:00
Tim
e5ec801785 Merge pull request #750 from nagisa77/feature/daily_bugfix_0827
fix: 修复贴吧表情显示问题
2025-08-27 15:27:16 +08:00
Tim
31e25232d0 fix: 修复贴吧表情显示问题 2025-08-27 15:26:23 +08:00
Tim
cdc92aeebe Merge pull request #744 from nagisa77/feature/daily_bugfix_0825_c
fix: iOS修复blur问题
2025-08-27 13:21:19 +08:00
Tim
d2c2213197 fix: iOS修复blur问题 2025-08-27 13:20:42 +08:00
Tim
c687ffed54 Merge pull request #742 from nagisa77/feature/daily_bugfix_0825_c
fix: svg 采用本地,避免加载不了
2025-08-27 12:48:42 +08:00
Tim
5bc9ff45d7 fix: svg 采用本地,避免加载不了 2025-08-27 12:47:56 +08:00
Tim
78c7681bc8 Merge pull request #734 from nagisa77/feature/daily_bugfix_0825_c
daily bugfix
2025-08-27 12:36:00 +08:00
Tim
5eb206a358 fix: use base tabs 2025-08-27 12:34:28 +08:00
Tim
18179cca22 Merge pull request #741 from nagisa77/codex/create-reusable-multi-tabs-component-kvi40j
feat: add reusable swipeable tabs component
2025-08-27 12:31:11 +08:00
Tim
2b28cb2ac1 feat: add reusable swipeable tabs component 2025-08-27 12:30:56 +08:00
Tim
610a645092 Revert "feat: create BaseTabs component"
This reverts commit 0fc1415a14.
2025-08-27 12:30:08 +08:00
Tim
504ca55cad Merge pull request #740 from nagisa77/codex/create-reusable-multi-tabs-component-d2xsuk
feat: unify tab navigation with reusable swipeable component
2025-08-27 12:26:58 +08:00
Tim
50a84220fe Revert "feat: add reusable multi-tabs component"
This reverts commit e8a162d859.
2025-08-27 12:25:44 +08:00
Tim
af3e049c23 Merge branch 'feature/daily_bugfix_0825_c' of github.com:nagisa77/OpenIsle into feature/daily_bugfix_0825_c 2025-08-27 12:22:55 +08:00
Tim
c33b411659 Merge pull request #739 from nagisa77/codex/create-reusable-multi-tabs-component-j58zes
feat: add reusable multi-tabs component
2025-08-27 12:22:40 +08:00
Tim
e8a162d859 feat: add reusable multi-tabs component 2025-08-27 12:22:22 +08:00
Tim
e819926cf3 fix: 取消chunks分割,避免css覆盖问题 2025-08-27 12:08:50 +08:00
20 changed files with 1257 additions and 1169 deletions

View File

@@ -7,9 +7,11 @@ import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@RestController @RestController
@@ -25,4 +27,10 @@ public class PointHistoryController {
.map(pointHistoryMapper::toDto) .map(pointHistoryMapper::toDto)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@GetMapping("/trend")
public List<Map<String, Object>> trend(Authentication auth,
@RequestParam(value = "days", defaultValue = "30") int days) {
return pointService.trend(auth.getName(), days);
}
} }

View File

@@ -4,9 +4,12 @@ import com.openisle.model.PointHistory;
import com.openisle.model.User; import com.openisle.model.User;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> { public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
List<PointHistory> findByUserOrderByIdDesc(User user); List<PointHistory> findByUserOrderByIdDesc(User user);
long countByUser(User user); long countByUser(User user);
List<PointHistory> findByUserAndCreatedAtAfterOrderByCreatedAtDesc(User user, LocalDateTime createdAt);
} }

View File

@@ -7,6 +7,10 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -173,4 +177,25 @@ public class PointService {
return pointHistoryRepository.findByUserOrderByIdDesc(user); return pointHistoryRepository.findByUserOrderByIdDesc(user);
} }
public List<Map<String, Object>> trend(String userName, int days) {
if (days < 1) days = 1;
User user = userRepository.findByUsername(userName).orElseThrow();
LocalDate end = LocalDate.now();
LocalDate start = end.minusDays(days - 1L);
var histories = pointHistoryRepository.findByUserAndCreatedAtAfterOrderByCreatedAtDesc(
user, start.atStartOfDay());
int idx = 0;
int balance = user.getPoint();
List<Map<String, Object>> result = new ArrayList<>();
for (LocalDate day = end; !day.isBefore(start); day = day.minusDays(1)) {
result.add(Map.of("date", day.toString(), "value", balance));
while (idx < histories.size() && histories.get(idx).getCreatedAt().toLocalDate().isEqual(day)) {
balance -= histories.get(idx).getAmount();
idx++;
}
}
Collections.reverse(result);
return result;
}
} }

View File

@@ -0,0 +1,65 @@
package com.openisle.controller;
import com.openisle.config.CustomAccessDeniedHandler;
import com.openisle.config.SecurityConfig;
import com.openisle.service.PointService;
import com.openisle.mapper.PointHistoryMapper;
import com.openisle.service.JwtService;
import com.openisle.repository.UserRepository;
import com.openisle.model.User;
import com.openisle.model.Role;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import org.springframework.test.web.servlet.MockMvc;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(PointHistoryController.class)
@AutoConfigureMockMvc
@Import({SecurityConfig.class, CustomAccessDeniedHandler.class})
class PointHistoryControllerTest {
@Autowired
private MockMvc mockMvc;
@MockBean
private JwtService jwtService;
@MockBean
private UserRepository userRepository;
@MockBean
private PointService pointService;
@MockBean
private PointHistoryMapper pointHistoryMapper;
@Test
void trendReturnsSeries() throws Exception {
Mockito.when(jwtService.validateAndGetSubject("token")).thenReturn("user");
User user = new User();
user.setUsername("user");
user.setPassword("p");
user.setEmail("u@example.com");
user.setRole(Role.USER);
Mockito.when(userRepository.findByUsername("user")).thenReturn(Optional.of(user));
List<Map<String, Object>> data = List.of(
Map.of("date", java.time.LocalDate.now().minusDays(1).toString(), "value", 100),
Map.of("date", java.time.LocalDate.now().toString(), "value", 110)
);
Mockito.when(pointService.trend(Mockito.eq("user"), Mockito.anyInt())).thenReturn(data);
mockMvc.perform(get("/api/point-histories/trend").param("days", "2")
.header("Authorization", "Bearer token"))
.andExpect(status().isOk())
.andExpect(jsonPath("$[0].value").value(100))
.andExpect(jsonPath("$[1].value").value(110));
}
}

View File

@@ -18,7 +18,7 @@
--background-color-blur: rgba(255, 255, 255, 0.57); --background-color-blur: rgba(255, 255, 255, 0.57);
--menu-border-color: lightgray; --menu-border-color: lightgray;
--normal-border-color: lightgray; --normal-border-color: lightgray;
--menu-selected-background-color: rgba(228, 228, 228, 0.884); --menu-selected-background-color: rgba(242, 242, 242, 0.884);
--menu-text-color: black; --menu-text-color: black;
--scroller-background-color: rgba(130, 175, 180, 0.5); --scroller-background-color: rgba(130, 175, 180, 0.5);
/* --normal-background-color: rgb(241, 241, 241); */ /* --normal-background-color: rgb(241, 241, 241); */
@@ -142,6 +142,7 @@ body {
.info-content-text video { .info-content-text video {
max-width: 100%; max-width: 100%;
} }
.info-content-text { .info-content-text {
word-break: break-word; word-break: break-word;
max-width: 100%; max-width: 100%;

View File

@@ -46,7 +46,6 @@ function onError() {
<style scoped> <style scoped>
.base-image { .base-image {
display: block;
transition: transition:
filter 0.35s ease, filter 0.35s ease,
transform 0.35s ease, transform 0.35s ease,
@@ -55,12 +54,12 @@ function onError() {
} }
.base-image-ph { .base-image-ph {
filter: blur(10px) saturate(0.85); filter: blur(20px);
transform: scale(1.02); transform: scale(0.5);
} }
.base-image.is-loaded { .base-image.is-loaded {
filter: none; /* Allow filters from parent classes (e.g. grayscale for unfinished medals) */
transform: none; transform: none;
opacity: 1; opacity: 1;
} }

View File

@@ -1,50 +1,92 @@
<template> <template>
<div class="base-tabs" @touchstart="onTouchStart" @touchend="onTouchEnd"> <div class="base-tabs">
<div <div class="base-tabs-header">
v-for="tab in tabs" <div class="base-tabs-items">
:key="tab.name" <div
:class="[itemClass, { [activeClass]: tab.name === modelValue }]" v-for="tab in tabs"
@click="emit('update:modelValue', tab.name)" :key="tab.key"
> :class="['base-tabs-item', { selected: modelValue === tab.key }]"
<slot name="tab" :tab="tab">{{ tab.label }}</slot> @click="$emit('update:modelValue', tab.key)"
>
<i v-if="tab.icon" :class="tab.icon"></i>
<div class="base-tabs-item-label">{{ tab.label }}</div>
</div>
</div>
<div class="base-tabs-header-right">
<slot name="right"></slot>
</div>
</div>
<div class="base-tabs-content" @touchstart="onTouchStart" @touchend="onTouchEnd">
<slot></slot>
</div> </div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref } from 'vue'
const props = defineProps({ const props = defineProps({
tabs: { type: Array, required: true },
modelValue: { type: String, required: true }, modelValue: { type: String, required: true },
itemClass: { type: String, default: '' }, tabs: { type: Array, default: () => [] },
activeClass: { type: String, default: 'active' },
}) })
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
const startX = ref(0) let touchStartX = 0
function onTouchStart(e) { function onTouchStart(e) {
startX.value = e.changedTouches[0].clientX touchStartX = e.touches[0].clientX
} }
function onTouchEnd(e) { function onTouchEnd(e) {
const diff = e.changedTouches[0].clientX - startX.value const diffX = e.changedTouches[0].clientX - touchStartX
const threshold = 50 if (Math.abs(diffX) > 50) {
if (Math.abs(diff) > threshold) { const index = props.tabs.findIndex((t) => t.key === props.modelValue)
const currentIndex = props.tabs.findIndex((t) => t.name === props.modelValue) if (diffX < 0 && index < props.tabs.length - 1) {
if (currentIndex === -1) return emit('update:modelValue', props.tabs[index + 1].key)
const newIndex = currentIndex + (diff < 0 ? 1 : -1) } else if (diffX > 0 && index > 0) {
if (newIndex >= 0 && newIndex < props.tabs.length) { emit('update:modelValue', props.tabs[index - 1].key)
emit('update:modelValue', props.tabs[newIndex].name)
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.base-tabs { .base-tabs-header {
display: flex; display: flex;
border-bottom: 1px solid var(--normal-border-color);
align-items: center;
flex-direction: row;
}
.base-tabs-items {
display: flex;
overflow-x: auto;
scrollbar-width: none;
flex: 1;
}
.base-tabs-item {
padding: 10px 20px;
cursor: pointer;
white-space: nowrap;
display: flex;
align-items: center;
}
.base-tabs-item i {
margin-right: 6px;
}
.base-tabs-item.selected {
color: var(--primary-color);
border-bottom: 2px solid var(--primary-color);
}
.base-tabs-header-right {
display: flex;
flex-shrink: 0;
}
.base-tabs-content {
width: 100%;
} }
</style> </style>

View File

@@ -88,24 +88,24 @@ export default defineNuxtConfig({
vite: { vite: {
build: { build: {
// increase warning limit and split large libraries into separate chunks // increase warning limit and split large libraries into separate chunks
chunkSizeWarningLimit: 1024, // chunkSizeWarningLimit: 1024,
rollupOptions: { // rollupOptions: {
output: { // output: {
manualChunks(id) { // manualChunks(id) {
if (id.includes('node_modules')) { // if (id.includes('node_modules')) {
if (id.includes('vditor')) { // if (id.includes('vditor')) {
return 'vditor' // return 'vditor'
} // }
if (id.includes('echarts')) { // if (id.includes('echarts')) {
return 'echarts' // return 'echarts'
} // }
if (id.includes('highlight.js')) { // if (id.includes('highlight.js')) {
return 'highlight' // return 'highlight'
} // }
} // }
}, // },
}, // },
}, // },
}, },
}, },
}) })

View File

@@ -1,61 +1,51 @@
<template> <template>
<div class="about-page"> <div class="about-page">
<BaseTabs <BaseTabs v-model="selectedTab" :tabs="tabs">
v-model="selectedTab" <div class="about-loading" v-if="isFetching">
:tabs="tabs" <l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
class="about-tabs" </div>
item-class="about-tabs-item" <div
active-class="selected" v-else
> class="about-content"
<template #tab="{ tab }"> v-html="renderMarkdown(content)"
<div class="about-tabs-item-label">{{ tab.label }}</div> @click="handleContentClick"
</template> ></div>
</BaseTabs> </BaseTabs>
<div class="about-loading" v-if="isFetching">
<l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
</div>
<div
v-else
class="about-content"
v-html="renderMarkdown(content)"
@click="handleContentClick"
></div>
</div> </div>
</template> </template>
<script> <script>
import { ref, watch } from 'vue' import { onMounted, ref, watch } from 'vue'
import BaseTabs from '~/components/BaseTabs.vue'
import { handleMarkdownClick, renderMarkdown } from '~/utils/markdown' import { handleMarkdownClick, renderMarkdown } from '~/utils/markdown'
import BaseTabs from '~/components/BaseTabs.vue'
export default { export default {
name: 'AboutPageView', name: 'AboutPageView',
components: { BaseTabs },
setup() { setup() {
const isFetching = ref(false) const isFetching = ref(false)
const tabs = [ const tabs = [
{ {
name: 'about', key: 'about',
label: '关于', label: '关于',
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/about.md', file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/about.md',
}, },
{ {
name: 'agreement', key: 'agreement',
label: '用户协议', label: '用户协议',
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/agreement.md', file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/agreement.md',
}, },
{ {
name: 'guideline', key: 'guideline',
label: '创作准则', label: '创作准则',
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/guideline.md', file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/guideline.md',
}, },
{ {
name: 'privacy', key: 'privacy',
label: '隐私政策', label: '隐私政策',
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/privacy.md', file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/privacy.md',
}, },
] ]
const selectedTab = ref(tabs[0].name) const selectedTab = ref(tabs[0].key)
const content = ref('') const content = ref('')
const loadContent = async (file) => { const loadContent = async (file) => {
@@ -74,14 +64,14 @@ export default {
} }
} }
watch( onMounted(() => {
selectedTab, loadContent(tabs[0].file)
(name) => { })
const tab = tabs.find((t) => t.name === name)
if (tab) loadContent(tab.file) watch(selectedTab, (name) => {
}, const tab = tabs.find((t) => t.key === name)
{ immediate: true }, if (tab) loadContent(tab.file)
) })
const handleContentClick = (e) => { const handleContentClick = (e) => {
handleMarkdownClick(e) handleMarkdownClick(e)
@@ -99,28 +89,6 @@ export default {
margin: 0 auto; margin: 0 auto;
} }
.about-tabs {
top: calc(var(--header-height) + 1px);
background-color: var(--background-color-blur);
display: flex;
flex-direction: row;
border-bottom: 1px solid var(--normal-border-color);
margin-bottom: 20px;
overflow-x: auto;
scrollbar-width: none;
}
.about-tabs-item {
padding: 10px 20px;
cursor: pointer;
white-space: nowrap;
}
.about-tabs-item.selected {
color: var(--primary-color);
border-bottom: 2px solid var(--primary-color);
}
.about-content { .about-content {
line-height: 1.6; line-height: 1.6;
padding: 20px; padding: 20px;

View File

@@ -33,23 +33,11 @@
</template> </template>
<script setup> <script setup>
import { LineChart } from 'echarts/charts'
import {
DataZoomComponent,
GridComponent,
TitleComponent,
TooltipComponent,
} from 'echarts/components'
import { use } from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import VChart from 'vue-echarts'
import { getToken } from '~/utils/auth' import { getToken } from '~/utils/auth'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const API_BASE_URL = config.public.apiBaseUrl const API_BASE_URL = config.public.apiBaseUrl
use([LineChart, TitleComponent, TooltipComponent, GridComponent, DataZoomComponent, CanvasRenderer])
const dauOption = ref(null) const dauOption = ref(null)
const newUserOption = ref(null) const newUserOption = ref(null)
const postOption = ref(null) const postOption = ref(null)

View File

@@ -36,35 +36,19 @@
<div class="other-login-page-content"> <div class="other-login-page-content">
<div class="login-page-button" @click="loginWithGoogle"> <div class="login-page-button" @click="loginWithGoogle">
<BaseImage <img class="login-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" />
class="login-page-button-icon"
src="../assets/icons/google.svg"
alt="Google Logo"
/>
<div class="login-page-button-text">Google 登录</div> <div class="login-page-button-text">Google 登录</div>
</div> </div>
<div class="login-page-button" @click="loginWithGithub"> <div class="login-page-button" @click="loginWithGithub">
<BaseImage <img class="login-page-button-icon" src="../assets/icons/github.svg" alt="GitHub Logo" />
class="login-page-button-icon"
src="../assets/icons/github.svg"
alt="GitHub Logo"
/>
<div class="login-page-button-text">GitHub 登录</div> <div class="login-page-button-text">GitHub 登录</div>
</div> </div>
<div class="login-page-button" @click="loginWithDiscord"> <div class="login-page-button" @click="loginWithDiscord">
<BaseImage <img class="login-page-button-icon" src="../assets/icons/discord.svg" alt="Discord Logo" />
class="login-page-button-icon"
src="../assets/icons/discord.svg"
alt="Discord Logo"
/>
<div class="login-page-button-text">Discord 登录</div> <div class="login-page-button-text">Discord 登录</div>
</div> </div>
<div class="login-page-button" @click="loginWithTwitter"> <div class="login-page-button" @click="loginWithTwitter">
<BaseImage <img class="login-page-button-icon" src="../assets/icons/twitter.svg" alt="Twitter Logo" />
class="login-page-button-icon"
src="../assets/icons/twitter.svg"
alt="Twitter Logo"
/>
<div class="login-page-button-text">Twitter 登录</div> <div class="login-page-button-text">Twitter 登录</div>
</div> </div>
</div> </div>

View File

@@ -492,6 +492,7 @@ function goBack() {
.messages-list { .messages-list {
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
padding: 20px; padding: 20px;
padding-bottom: 100px; padding-bottom: 100px;
display: flex; display: flex;
@@ -597,6 +598,7 @@ function goBack() {
} }
.reply-preview { .reply-preview {
margin-top: 10px;
padding: 10px; padding: 10px;
border-left: 5px solid var(--primary-color); border-left: 5px solid var(--primary-color);
margin-bottom: 5px; margin-bottom: 5px;

View File

@@ -7,115 +7,113 @@
<div v-if="!isFloatMode" class="float-control"> <div v-if="!isFloatMode" class="float-control">
<i class="fas fa-compress" @click="minimize" title="最小化"></i> <i class="fas fa-compress" @click="minimize" title="最小化"></i>
</div> </div>
<BaseTabs <BaseTabs v-model="activeTab" :tabs="tabs">
v-model="activeTab" <div v-if="activeTab === 'messages'">
:tabs="tabs" <div v-if="loading" class="loading-message">
class="tabs" <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
item-class="tab"
active-class="active"
/>
<div v-if="activeTab === 'messages'">
<div v-if="loading" class="loading-message">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
</div>
<div v-else-if="error" class="error-container">
<div class="error-text">{{ error }}</div>
</div>
<div v-if="!loading && !isFloatMode" class="search-container">
<SearchPersonDropdown />
</div>
<div v-if="!loading && conversations.length === 0" class="empty-container">
<BasePlaceholder v-if="conversations.length === 0" text="暂无会话" icon="fas fa-inbox" />
</div>
<div
v-if="!loading"
v-for="convo in conversations"
:key="convo.id"
class="conversation-item"
@click="goToConversation(convo.id)"
>
<div class="conversation-avatar">
<BaseImage
:src="getOtherParticipant(convo)?.avatar || '/default-avatar.svg'"
:alt="getOtherParticipant(convo)?.username || '用户'"
class="avatar-img"
@error="handleAvatarError"
/>
</div> </div>
<div class="conversation-content"> <div v-else-if="error" class="error-container">
<div class="conversation-header"> <div class="error-text">{{ error }}</div>
<div class="participant-name">
{{ getOtherParticipant(convo)?.username || '未知用户' }}
</div>
<div class="message-time">
{{ formatTime(convo.lastMessage?.createdAt || convo.createdAt) }}
</div>
</div>
<div class="last-message-row">
<div class="last-message">
{{
convo.lastMessage ? stripMarkdownLength(convo.lastMessage.content, 100) : '暂无消息'
}}
</div>
<div v-if="convo.unreadCount > 0" class="unread-count-badge">
{{ convo.unreadCount }}
</div>
</div>
</div> </div>
</div>
</div>
<div v-else> <div v-if="!loading && !isFloatMode" class="search-container">
<div v-if="loadingChannels" class="loading-message"> <SearchPersonDropdown />
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
</div>
<div v-else>
<div v-if="channels.length === 0" class="empty-container">
<BasePlaceholder text="暂无频道" icon="fas fa-inbox" />
</div> </div>
<div v-if="!loading && conversations.length === 0" class="empty-container">
<BasePlaceholder v-if="conversations.length === 0" text="暂无会话" icon="fas fa-inbox" />
</div>
<div <div
v-for="ch in channels" v-if="!loading"
:key="ch.id" v-for="convo in conversations"
:key="convo.id"
class="conversation-item" class="conversation-item"
@click="goToChannel(ch.id)" @click="goToConversation(convo.id)"
> >
<div class="conversation-avatar"> <div class="conversation-avatar">
<BaseImage <BaseImage
:src="ch.avatar || '/default-avatar.svg'" :src="getOtherParticipant(convo)?.avatar || '/default-avatar.svg'"
:alt="ch.name" :alt="getOtherParticipant(convo)?.username || '用户'"
class="avatar-img" class="avatar-img"
@error="handleAvatarError" @error="handleAvatarError"
/> />
</div> </div>
<div class="conversation-content"> <div class="conversation-content">
<div class="conversation-header"> <div class="conversation-header">
<div class="participant-name"> <div class="participant-name">
{{ ch.name }} {{ getOtherParticipant(convo)?.username || '未知用户' }}
<span v-if="ch.unreadCount > 0" class="unread-dot"></span>
</div> </div>
<div class="message-time"> <div class="message-time">
{{ formatTime(ch.lastMessage?.createdAt || ch.createdAt) }} {{ formatTime(convo.lastMessage?.createdAt || convo.createdAt) }}
</div> </div>
</div> </div>
<div class="last-message-row"> <div class="last-message-row">
<div class="last-message"> <div class="last-message">
{{ {{
ch.lastMessage ? stripMarkdownLength(ch.lastMessage.content, 100) : ch.description convo.lastMessage
? stripMarkdownLength(convo.lastMessage.content, 100)
: '暂无消息'
}} }}
</div> </div>
<div class="member-count">成员 {{ ch.memberCount }}</div> <div v-if="convo.unreadCount > 0" class="unread-count-badge">
{{ convo.unreadCount }}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-else>
<div v-if="loadingChannels" class="loading-message">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
</div>
<div v-else>
<div v-if="channels.length === 0" class="empty-container">
<BasePlaceholder text="暂无频道" icon="fas fa-inbox" />
</div>
<div
v-for="ch in channels"
:key="ch.id"
class="conversation-item"
@click="goToChannel(ch.id)"
>
<div class="conversation-avatar">
<BaseImage
:src="ch.avatar || '/default-avatar.svg'"
:alt="ch.name"
class="avatar-img"
@error="handleAvatarError"
/>
</div>
<div class="conversation-content">
<div class="conversation-header">
<div class="participant-name">
{{ ch.name }}
<span v-if="ch.unreadCount > 0" class="unread-dot"></span>
</div>
<div class="message-time">
{{ formatTime(ch.lastMessage?.createdAt || ch.createdAt) }}
</div>
</div>
<div class="last-message-row">
<div class="last-message">
{{
ch.lastMessage
? stripMarkdownLength(ch.lastMessage.content, 100)
: ch.description
}}
</div>
<div class="member-count">成员 {{ ch.memberCount }}</div>
</div>
</div>
</div>
</div>
</div>
</BaseTabs>
</div> </div>
</template> </template>
@@ -146,24 +144,17 @@ const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
const { fetchChannelUnread: refreshChannelUnread, setFromList: setChannelUnreadFromList } = const { fetchChannelUnread: refreshChannelUnread, setFromList: setChannelUnreadFromList } =
useChannelsUnreadCount() useChannelsUnreadCount()
let subscription = null let subscription = null
const tabs = [
{ name: 'messages', label: '站内信' },
{ name: 'channels', label: '频道' },
]
const activeTab = ref('channels') const activeTab = ref('channels')
const tabs = [
{ key: 'messages', label: '站内信' },
{ key: 'channels', label: '频道' },
]
const channels = ref([]) const channels = ref([])
const loadingChannels = ref(false) const loadingChannels = ref(false)
const isFloatMode = computed(() => route.query.float === '1') const isFloatMode = computed(() => route.query.float === '1')
const floatRoute = useState('messageFloatRoute') const floatRoute = useState('messageFloatRoute')
watch(activeTab, (tab) => {
if (tab === 'messages') {
fetchConversations()
} else {
fetchChannels()
}
})
async function fetchConversations() { async function fetchConversations() {
const token = getToken() const token = getToken()
if (!token) { if (!token) {
@@ -227,6 +218,14 @@ async function fetchChannels() {
} }
} }
watch(activeTab, (tab) => {
if (tab === 'messages') {
fetchConversations()
} else {
fetchChannels()
}
})
async function goToChannel(id) { async function goToChannel(id) {
const token = getToken() const token = getToken()
if (!token) { if (!token) {
@@ -324,18 +323,18 @@ function minimize() {
cursor: pointer; cursor: pointer;
} }
.tabs { :deep(.base-tabs-header) {
display: flex; display: flex;
border-bottom: 1px solid var(--normal-border-color); border-bottom: 1px solid var(--normal-border-color);
margin-bottom: 16px; margin-bottom: 16px;
} }
.tab { :deep(.base-tabs-item) {
padding: 10px 20px; padding: 10px 20px;
cursor: pointer; cursor: pointer;
} }
.tab.active { :deep(.base-tabs-item.selected) {
border-bottom: 2px solid var(--primary-color); border-bottom: 2px solid var(--primary-color);
color: var(--primary-color); color: var(--primary-color);
} }
@@ -501,7 +500,7 @@ function minimize() {
display: block; display: block;
} }
.tabs, :deep(.base-tabs-header),
.loading-message, .loading-message,
.error-container, .error-container,
.search-container, .search-container,

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,170 +1,177 @@
<template> <template>
<div class="point-mall-page"> <div class="point-mall-page">
<BaseTabs <BaseTabs v-model="selectedTab" :tabs="tabs">
v-model="selectedTab" <template v-if="selectedTab === 'mall'">
:tabs="pointTabs" <div class="point-mall-page-content">
class="point-tabs" <section class="rules">
item-class="point-tab-item" <div class="section-title">🎉 积分规则</div>
active-class="selected" <div class="section-content">
/> <div class="section-item" v-for="(rule, idx) in pointRules" :key="idx">
{{ rule }}
</div>
</div>
</section>
<template v-if="selectedTab === 'mall'"> <section class="trend" v-if="trendOption">
<div class="point-mall-page-content"> <div class="section-title">积分走势</div>
<section class="rules"> <ClientOnly>
<div class="section-title">🎉 积分规则</div> <VChart :option="trendOption" :autoresize="true" style="height: 300px" />
<div class="section-content"> </ClientOnly>
<div class="section-item" v-for="(rule, idx) in pointRules" :key="idx">{{ rule }}</div> </section>
<div class="loading-points-container" v-if="isLoading">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
</div> </div>
</section>
<div class="loading-points-container" v-if="isLoading"> <div class="point-info">
<p v-if="authState.loggedIn && point !== null">
<span><i class="fas fa-coins coin-icon"></i></span>我的积分<span
class="point-value"
>{{ point }}</span
>
</p>
</div>
<section class="goods">
<div class="goods-item" v-for="(good, idx) in goods" :key="idx">
<BaseImage class="goods-item-image" :src="good.image" alt="good.name" />
<div class="goods-item-name">{{ good.name }}</div>
<div class="goods-item-cost">
<i class="fas fa-coins"></i>
{{ good.cost }} 积分
</div>
<div
class="goods-item-button"
:class="{ disabled: !authState.loggedIn || point === null || point < good.cost }"
@click="openRedeem(good)"
>
兑换
</div>
</div>
</section>
<RedeemPopup
:visible="dialogVisible"
v-model="contact"
:loading="loading"
@close="closeRedeem"
@submit="submitRedeem"
/>
</div>
</template>
<template v-else>
<div class="loading-points-container" v-if="historyLoading">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch> <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
</div> </div>
<BasePlaceholder
<div class="point-info"> v-else-if="histories.length === 0"
<p v-if="authState.loggedIn && point !== null"> text="暂无积分记录"
<span><i class="fas fa-coins coin-icon"></i></span>我的积分<span icon="fas fa-inbox"
class="point-value"
>{{ point }}</span
>
</p>
</div>
<section class="goods">
<div class="goods-item" v-for="(good, idx) in goods" :key="idx">
<BaseImage class="goods-item-image" :src="good.image" alt="good.name" />
<div class="goods-item-name">{{ good.name }}</div>
<div class="goods-item-cost">
<i class="fas fa-coins"></i>
{{ good.cost }} 积分
</div>
<div
class="goods-item-button"
:class="{ disabled: !authState.loggedIn || point === null || point < good.cost }"
@click="openRedeem(good)"
>
兑换
</div>
</div>
</section>
<RedeemPopup
:visible="dialogVisible"
v-model="contact"
:loading="loading"
@close="closeRedeem"
@submit="submitRedeem"
/> />
</div> <div class="timeline-container" v-else>
</template> <BaseTimeline :items="histories">
<template #item="{ item }">
<template v-else> <div class="history-content">
<div class="loading-points-container" v-if="historyLoading"> <template v-if="item.type === 'POST'">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch> 发送帖子
</div> <NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
<BasePlaceholder v-else-if="histories.length === 0" text="暂无积分记录" icon="fas fa-inbox" /> item.postTitle
<div class="timeline-container" v-else> }}</NuxtLink>
<BaseTimeline :items="histories"> 获得{{ item.amount }}积分
<template #item="{ item }"> </template>
<div class="history-content"> <template v-else-if="item.type === 'COMMENT'">
<template v-if="item.type === 'POST'"> 在文章
发送帖子 <NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{ item.postTitle
item.postTitle }}</NuxtLink>
}}</NuxtLink>
获得{{ item.amount }}积分 <template v-if="!item.fromUserId">
</template> 发送评论
<template v-else-if="item.type === 'COMMENT'"> <NuxtLink
在文章 :to="`/posts/${item.postId}#comment-${item.commentId}`"
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{ class="timeline-link"
item.postTitle >{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
}}</NuxtLink> >
获得{{ item.amount }}积分
<template v-if="!item.fromUserId"> </template>
发送评论 <template v-else>
被评论
<NuxtLink
:to="`/posts/${item.postId}#comment-${item.commentId}`"
class="timeline-link"
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
>
获得{{ item.amount }}积分
</template>
</template>
<template v-else-if="item.type === 'POST_LIKED' && item.fromUserId">
帖子
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
item.postTitle
}}</NuxtLink>
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
item.fromUserName
}}</NuxtLink>
按赞获得{{ item.amount }}积分
</template>
<template v-else-if="item.type === 'COMMENT_LIKED' && item.fromUserId">
评论
<NuxtLink <NuxtLink
:to="`/posts/${item.postId}#comment-${item.commentId}`" :to="`/posts/${item.postId}#comment-${item.commentId}`"
class="timeline-link" class="timeline-link"
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink >{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
> >
获得{{ item.amount }}积分
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
item.fromUserName
}}</NuxtLink>
按赞获得{{ item.amount }}积分
</template> </template>
<template v-else> <template v-else-if="item.type === 'INVITE' && item.fromUserId">
被评论 邀请了好友
<NuxtLink <NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
:to="`/posts/${item.postId}#comment-${item.commentId}`" item.fromUserName
class="timeline-link" }}</NuxtLink>
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink 加入社区 🎉获得 {{ item.amount }} 积分
>
获得{{ item.amount }}积分
</template> </template>
</template> <template v-else-if="item.type === 'FEATURE'">
<template v-else-if="item.type === 'POST_LIKED' && item.fromUserId"> 文章
帖子 <NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{ item.postTitle
item.postTitle }}</NuxtLink>
}}</NuxtLink> 被收录为精选获得 {{ item.amount }} 积分
</template>
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{ <template v-else-if="item.type === 'REDEEM'">
item.fromUserName 兑换商品消耗 {{ -item.amount }} 积分
}}</NuxtLink> </template>
按赞获得{{ item.amount }}积分 <template v-else-if="item.type === 'LOTTERY_JOIN'">
</template> 参与抽奖帖
<template v-else-if="item.type === 'COMMENT_LIKED' && item.fromUserId"> <NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
评论 item.postTitle
<NuxtLink }}</NuxtLink>
:to="`/posts/${item.postId}#comment-${item.commentId}`" 消耗 {{ -item.amount }} 积分
class="timeline-link" </template>
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink <template v-else-if="item.type === 'LOTTERY_REWARD'">
> 你的抽奖帖
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{ item.postTitle
item.fromUserName }}</NuxtLink>
}}</NuxtLink>
按赞获得{{ item.amount }}积分 <NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
</template> item.fromUserName
<template v-else-if="item.type === 'INVITE' && item.fromUserId"> }}</NuxtLink>
邀请了好友 参与获得 {{ item.amount }} 积分
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{ </template>
item.fromUserName <template v-else-if="item.type === 'SYSTEM_ONLINE'"> 积分历史系统上线 </template>
}}</NuxtLink> <i class="fas fa-coins"></i> 你目前的积分是 {{ item.balance }}
加入社区 🎉获得 {{ item.amount }} 积分 </div>
</template> <div class="history-time">{{ TimeManager.format(item.createdAt) }}</div>
<template v-else-if="item.type === 'FEATURE'"> </template>
文章 </BaseTimeline>
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{ </div>
item.postTitle </template>
}}</NuxtLink> </BaseTabs>
被收录为精选获得 {{ item.amount }} 积分
</template>
<template v-else-if="item.type === 'REDEEM'">
兑换商品消耗 {{ -item.amount }} 积分
</template>
<template v-else-if="item.type === 'LOTTERY_JOIN'">
参与抽奖帖
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
item.postTitle
}}</NuxtLink>
消耗 {{ -item.amount }} 积分
</template>
<template v-else-if="item.type === 'LOTTERY_REWARD'">
你的抽奖帖
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
item.postTitle
}}</NuxtLink>
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
item.fromUserName
}}</NuxtLink>
参与获得 {{ item.amount }} 积分
</template>
<template v-else-if="item.type === 'SYSTEM_ONLINE'"> 积分历史系统上线 </template>
<i class="fas fa-coins"></i> 你目前的积分是 {{ item.balance }}
</div>
<div class="history-time">{{ TimeManager.format(item.createdAt) }}</div>
</template>
</BaseTimeline>
</div>
</template>
</div> </div>
</template> </template>
@@ -181,16 +188,18 @@ import BaseTabs from '~/components/BaseTabs.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const API_BASE_URL = config.public.apiBaseUrl const API_BASE_URL = config.public.apiBaseUrl
const pointTabs = [
{ name: 'mall', label: '积分兑换' },
{ name: 'history', label: '积分历史' },
]
const selectedTab = ref('mall') const selectedTab = ref('mall')
const tabs = [
{ key: 'mall', label: '积分兑换' },
{ key: 'history', label: '积分历史' },
]
const point = ref(null) const point = ref(null)
const isLoading = ref(false) const isLoading = ref(false)
const histories = ref([]) const histories = ref([])
const historyLoading = ref(false) const historyLoading = ref(false)
const historyLoaded = ref(false) const historyLoaded = ref(false)
const trendOption = ref(null)
const pointRules = [ const pointRules = [
'发帖:每天前两次,每次 30 积分', '发帖:每天前两次,每次 30 积分',
@@ -220,13 +229,35 @@ const iconMap = {
LOTTERY_REWARD: 'fas fa-ticket-alt', LOTTERY_REWARD: 'fas fa-ticket-alt',
} }
const loadTrend = async () => {
if (!authState.loggedIn) return
const token = getToken()
const res = await fetch(`${API_BASE_URL}/api/point-histories/trend?days=30`, {
headers: { Authorization: `Bearer ${token}` },
})
if (res.ok) {
const data = await res.json()
const dates = data.map((d) => d.date)
const values = data.map((d) => d.value)
trendOption.value = {
tooltip: { trigger: 'axis' },
xAxis: { type: 'category', data: dates, boundaryGap: false },
yAxis: { type: 'value' },
series: [{ type: 'line', areaStyle: {}, smooth: true, data: values }],
dataZoom: [{ type: 'slider', start: 80 }, { type: 'inside' }],
}
}
}
onMounted(async () => { onMounted(async () => {
isLoading.value = true isLoading.value = true
if (authState.loggedIn) { if (authState.loggedIn) {
const user = await fetchCurrentUser() const user = await fetchCurrentUser()
point.value = user ? user.point : null point.value = user ? user.point : null
await Promise.all([loadGoods(), loadTrend()])
} else {
await loadGoods()
} }
await loadGoods()
isLoading.value = false isLoading.value = false
}) })
@@ -312,17 +343,17 @@ const submitRedeem = async () => {
padding: 0 20px; padding: 0 20px;
} }
.point-tabs { :deep(.base-tabs-header) {
display: flex; display: flex;
border-bottom: 1px solid var(--normal-border-color); border-bottom: 1px solid var(--normal-border-color);
} }
.point-tab-item { :deep(.base-tabs-item) {
padding: 10px 15px; padding: 10px 15px;
cursor: pointer; cursor: pointer;
} }
.point-tab-item.selected { :deep(.base-tabs-item.selected) {
border-bottom: 2px solid var(--primary-color); border-bottom: 2px solid var(--primary-color);
color: var(--primary-color); color: var(--primary-color);
} }
@@ -362,7 +393,8 @@ const submitRedeem = async () => {
} }
.rules, .rules,
.goods { .goods,
.trend {
margin-top: 20px; margin-top: 20px;
} }

View File

@@ -1225,7 +1225,6 @@ onMounted(async () => {
.info-content-text { .info-content-text {
font-size: 16px; font-size: 16px;
line-height: 1.5; line-height: 1.5;
width: 100%;
} }
.article-footer-container { .article-footer-container {

View File

@@ -70,35 +70,19 @@
<div class="other-signup-page-content"> <div class="other-signup-page-content">
<div class="signup-page-button" @click="signupWithGoogle"> <div class="signup-page-button" @click="signupWithGoogle">
<BaseImage <img class="signup-page-button-icon" src="~/assets/icons/google.svg" alt="Google Logo" />
class="signup-page-button-icon"
src="~/assets/icons/google.svg"
alt="Google Logo"
/>
<div class="signup-page-button-text">Google 注册</div> <div class="signup-page-button-text">Google 注册</div>
</div> </div>
<div class="signup-page-button" @click="signupWithGithub"> <div class="signup-page-button" @click="signupWithGithub">
<BaseImage <img class="signup-page-button-icon" src="~/assets/icons/github.svg" alt="GitHub Logo" />
class="signup-page-button-icon"
src="~/assets/icons/github.svg"
alt="GitHub Logo"
/>
<div class="signup-page-button-text">GitHub 注册</div> <div class="signup-page-button-text">GitHub 注册</div>
</div> </div>
<div class="signup-page-button" @click="signupWithDiscord"> <div class="signup-page-button" @click="signupWithDiscord">
<BaseImage <img class="signup-page-button-icon" src="~/assets/icons/discord.svg" alt="Discord Logo" />
class="signup-page-button-icon"
src="~/assets/icons/discord.svg"
alt="Discord Logo"
/>
<div class="signup-page-button-text">Discord 注册</div> <div class="signup-page-button-text">Discord 注册</div>
</div> </div>
<div class="signup-page-button" @click="signupWithTwitter"> <div class="signup-page-button" @click="signupWithTwitter">
<BaseImage <img class="signup-page-button-icon" src="~/assets/icons/twitter.svg" alt="Twitter Logo" />
class="signup-page-button-icon"
src="~/assets/icons/twitter.svg"
alt="Twitter Logo"
/>
<div class="signup-page-button-text">Twitter 注册</div> <div class="signup-page-button-text">Twitter 注册</div>
</div> </div>
</div> </div>

View File

@@ -72,237 +72,246 @@
</div> </div>
</div> </div>
<BaseTabs <BaseTabs v-model="selectedTab" :tabs="tabs">
v-model="selectedTab" <div v-if="tabLoading" class="tab-loading">
:tabs="profileTabs" <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)" />
class="profile-tabs" </div>
item-class="profile-tabs-item" <template v-else>
active-class="selected" <div v-if="selectedTab === 'summary'" class="profile-summary">
> <div class="total-summary">
<template #tab="{ tab }"> <div class="summary-title">统计信息</div>
<i :class="tab.icon"></i> <div class="total-summary-content">
<div class="profile-tabs-item-label">{{ tab.label }}</div> <div class="total-summary-item">
</template> <div class="total-summary-item-label">访问天数</div>
</BaseTabs> <div class="total-summary-item-value">{{ user.visitedDays }}</div>
</div>
<div v-if="tabLoading" class="tab-loading"> <div class="total-summary-item">
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)" /> <div class="total-summary-item-label">已读帖子</div>
</div> <div class="total-summary-item-value">{{ user.readPosts }}</div>
<template v-else> </div>
<div v-if="selectedTab === 'summary'" class="profile-summary"> <div class="total-summary-item">
<div class="total-summary"> <div class="total-summary-item-label">已送出的💗</div>
<div class="summary-title">统计信息</div> <div class="total-summary-item-value">{{ user.likesSent }}</div>
<div class="total-summary-content"> </div>
<div class="total-summary-item"> <div class="total-summary-item">
<div class="total-summary-item-label">访问天数</div> <div class="total-summary-item-label">已收到的💗</div>
<div class="total-summary-item-value">{{ user.visitedDays }}</div> <div class="total-summary-item-value">{{ user.likesReceived }}</div>
</div>
</div> </div>
<div class="total-summary-item"> </div>
<div class="total-summary-item-label">已读帖子</div> <div class="summary-divider">
<div class="total-summary-item-value">{{ user.readPosts }}</div> <div class="hot-reply">
<div class="summary-title">热门回复</div>
<div class="summary-content" v-if="hotReplies.length > 0">
<BaseTimeline :items="hotReplies">
<template #item="{ item }">
<NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
{{ item.comment.post.title }}
</NuxtLink>
<template v-if="item.comment.parentComment">
下对
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
</NuxtLink>
回复了
</template>
<template v-else> 下评论了 </template>
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.content, 200) }}
</NuxtLink>
<div class="timeline-date">
{{ formatDate(item.comment.createdAt) }}
</div>
</template>
</BaseTimeline>
</div>
<div v-else>
<div class="summary-empty">暂无热门回复</div>
</div>
</div> </div>
<div class="total-summary-item"> <div class="hot-topic">
<div class="total-summary-item-label">已送出的💗</div> <div class="summary-title">热门话题</div>
<div class="total-summary-item-value">{{ user.likesSent }}</div> <div class="summary-content" v-if="hotPosts.length > 0">
<BaseTimeline :items="hotPosts">
<template #item="{ item }">
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
{{ item.post.title }}
</NuxtLink>
<div class="timeline-snippet">
{{ stripMarkdown(item.post.snippet) }}
</div>
<div class="timeline-date">
{{ formatDate(item.post.createdAt) }}
</div>
</template>
</BaseTimeline>
</div>
<div v-else>
<div class="summary-empty">暂无热门话题</div>
</div>
</div> </div>
<div class="total-summary-item"> <div class="hot-tag">
<div class="total-summary-item-label">已收到的💗</div> <div class="summary-title">TA创建的tag</div>
<div class="total-summary-item-value">{{ user.likesReceived }}</div> <div class="summary-content" v-if="hotTags.length > 0">
<BaseTimeline :items="hotTags">
<template #item="{ item }">
<span class="timeline-link" @click="gotoTag(item.tag)">
{{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span>
</span>
<div class="timeline-snippet" v-if="item.tag.description">
{{ item.tag.description }}
</div>
<div class="timeline-date">
{{ formatDate(item.tag.createdAt) }}
</div>
</template>
</BaseTimeline>
</div>
<div v-else>
<div class="summary-empty">暂无标签</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="summary-divider">
<div class="hot-reply"> <div v-else-if="selectedTab === 'timeline'" class="profile-timeline">
<div class="summary-title">热门回复</div> <div class="timeline-tabs">
<div class="summary-content" v-if="hotReplies.length > 0"> <div
<BaseTimeline :items="hotReplies"> :class="['timeline-tab-item', { selected: timelineFilter === 'all' }]"
<template #item="{ item }"> @click="timelineFilter = 'all'"
>
全部
</div>
<div
:class="['timeline-tab-item', { selected: timelineFilter === 'articles' }]"
@click="timelineFilter = 'articles'"
>
文章
</div>
<div
:class="['timeline-tab-item', { selected: timelineFilter === 'comments' }]"
@click="timelineFilter = 'comments'"
>
评论和回复
</div>
</div>
<BasePlaceholder
v-if="filteredTimelineItems.length === 0"
text="暂无时间线"
icon="fas fa-inbox"
/>
<div class="timeline-list">
<BaseTimeline :items="filteredTimelineItems">
<template #item="{ item }">
<template v-if="item.type === 'post'">
发布了文章
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
{{ item.post.title }}
</NuxtLink>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
</template>
<template v-else-if="item.type === 'comment'">
<NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link"> <NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
{{ item.comment.post.title }} {{ item.comment.post.title }}
</NuxtLink> </NuxtLink>
<template v-if="item.comment.parentComment"> 下评论了
下对
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
</NuxtLink>
回复了
</template>
<template v-else> 下评论了 </template>
<NuxtLink <NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`" :to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
class="timeline-link" class="timeline-link"
> >
{{ stripMarkdownLength(item.comment.content, 200) }} {{ stripMarkdownLength(item.comment.content, 200) }}
</NuxtLink> </NuxtLink>
<div class="timeline-date"> <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
{{ formatDate(item.comment.createdAt) }}
</div>
</template> </template>
</BaseTimeline> <template v-else-if="item.type === 'reply'">
</div>
<div v-else> <NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
<div class="summary-empty">暂无热门回复</div> {{ item.comment.post.title }}
</div>
</div>
<div class="hot-topic">
<div class="summary-title">热门话题</div>
<div class="summary-content" v-if="hotPosts.length > 0">
<BaseTimeline :items="hotPosts">
<template #item="{ item }">
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
{{ item.post.title }}
</NuxtLink> </NuxtLink>
<div class="timeline-snippet"> 下对
{{ stripMarkdown(item.post.snippet) }} <NuxtLink
</div> :to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
<div class="timeline-date"> class="timeline-link"
{{ formatDate(item.post.createdAt) }} >
</div> {{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
</NuxtLink>
回复了
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.content, 200) }}
</NuxtLink>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
</template> </template>
</BaseTimeline> <template v-else-if="item.type === 'tag'">
</div> 创建了标签
<div v-else>
<div class="summary-empty">暂无热门话题</div>
</div>
</div>
<div class="hot-tag">
<div class="summary-title">TA创建的tag</div>
<div class="summary-content" v-if="hotTags.length > 0">
<BaseTimeline :items="hotTags">
<template #item="{ item }">
<span class="timeline-link" @click="gotoTag(item.tag)"> <span class="timeline-link" @click="gotoTag(item.tag)">
{{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span> {{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span>
</span> </span>
<div class="timeline-snippet" v-if="item.tag.description"> <div class="timeline-snippet" v-if="item.tag.description">
{{ item.tag.description }} {{ item.tag.description }}
</div> </div>
<div class="timeline-date"> <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
{{ formatDate(item.tag.createdAt) }}
</div>
</template> </template>
</BaseTimeline> </template>
</div> </BaseTimeline>
<div v-else>
<div class="summary-empty">暂无标签</div>
</div>
</div> </div>
</div> </div>
</div>
<div v-else-if="selectedTab === 'timeline'" class="profile-timeline"> <div v-else-if="selectedTab === 'following'" class="follow-container">
<BaseTabs <div class="follow-tabs">
v-model="timelineFilter" <div
:tabs="timelineTabs" :class="['follow-tab-item', { selected: followTab === 'followers' }]"
class="timeline-tabs" @click="followTab = 'followers'"
item-class="timeline-tab-item" >
active-class="selected" 关注者
/> </div>
<BasePlaceholder <div
v-if="filteredTimelineItems.length === 0" :class="['follow-tab-item', { selected: followTab === 'following' }]"
text="暂无时间线" @click="followTab = 'following'"
icon="fas fa-inbox" >
/> 正在关注
<div class="timeline-list"> </div>
<BaseTimeline :items="filteredTimelineItems"> </div>
<template #item="{ item }"> <div class="follow-list">
<template v-if="item.type === 'post'"> <UserList v-if="followTab === 'followers'" :users="followers" />
发布了文章 <UserList v-else :users="followings" />
</div>
</div>
<div v-else-if="selectedTab === 'favorites'" class="favorites-container">
<div v-if="favoritePosts.length > 0">
<BaseTimeline :items="favoritePosts">
<template #item="{ item }">
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link"> <NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
{{ item.post.title }} {{ item.post.title }}
</NuxtLink> </NuxtLink>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div> <div class="timeline-snippet">
</template> {{ stripMarkdown(item.post.snippet) }}
<template v-else-if="item.type === 'comment'">
<NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
{{ item.comment.post.title }}
</NuxtLink>
下评论了
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.content, 200) }}
</NuxtLink>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
</template>
<template v-else-if="item.type === 'reply'">
<NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
{{ item.comment.post.title }}
</NuxtLink>
下对
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
</NuxtLink>
回复了
<NuxtLink
:to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.comment.content, 200) }}
</NuxtLink>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
</template>
<template v-else-if="item.type === 'tag'">
创建了标签
<span class="timeline-link" @click="gotoTag(item.tag)">
{{ item.tag.name }}<span v-if="item.tag.count"> x{{ item.tag.count }}</span>
</span>
<div class="timeline-snippet" v-if="item.tag.description">
{{ item.tag.description }}
</div> </div>
<div class="timeline-date">{{ formatDate(item.createdAt) }}</div> <div class="timeline-date">{{ formatDate(item.post.createdAt) }}</div>
</template> </template>
</template> </BaseTimeline>
</BaseTimeline> </div>
<div v-else>
<BasePlaceholder text="暂无收藏文章" icon="fas fa-inbox" />
</div>
</div> </div>
</div>
<div v-else-if="selectedTab === 'following'" class="follow-container"> <div v-else-if="selectedTab === 'achievements'" class="achievements-container">
<BaseTabs <AchievementList :medals="medals" :can-select="isMine" />
v-model="followTab"
:tabs="followTabs"
class="follow-tabs"
item-class="follow-tab-item"
active-class="selected"
/>
<div class="follow-list">
<UserList v-if="followTab === 'followers'" :users="followers" />
<UserList v-else :users="followings" />
</div> </div>
</div> </template>
</BaseTabs>
<div v-else-if="selectedTab === 'favorites'" class="favorites-container">
<div v-if="favoritePosts.length > 0">
<BaseTimeline :items="favoritePosts">
<template #item="{ item }">
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
{{ item.post.title }}
</NuxtLink>
<div class="timeline-snippet">
{{ stripMarkdown(item.post.snippet) }}
</div>
<div class="timeline-date">{{ formatDate(item.post.createdAt) }}</div>
</template>
</BaseTimeline>
</div>
<div v-else>
<BasePlaceholder text="暂无收藏文章" icon="fas fa-inbox" />
</div>
</div>
<div v-else-if="selectedTab === 'achievements'" class="achievements-container">
<AchievementList :medals="medals" :can-select="isMine" />
</div>
</template>
</div> </div>
</div> </div>
</template> </template>
@@ -313,6 +322,7 @@ import { useRoute } from 'vue-router'
import AchievementList from '~/components/AchievementList.vue' import AchievementList from '~/components/AchievementList.vue'
import BasePlaceholder from '~/components/BasePlaceholder.vue' import BasePlaceholder from '~/components/BasePlaceholder.vue'
import BaseTimeline from '~/components/BaseTimeline.vue' import BaseTimeline from '~/components/BaseTimeline.vue'
import BaseTabs from '~/components/BaseTabs.vue'
import LevelProgress from '~/components/LevelProgress.vue' import LevelProgress from '~/components/LevelProgress.vue'
import UserList from '~/components/UserList.vue' import UserList from '~/components/UserList.vue'
import { toast } from '~/main' import { toast } from '~/main'
@@ -320,7 +330,6 @@ import { authState, getToken } from '~/utils/auth'
import { prevLevelExp } from '~/utils/level' import { prevLevelExp } from '~/utils/level'
import { stripMarkdown, stripMarkdownLength } from '~/utils/markdown' import { stripMarkdown, stripMarkdownLength } from '~/utils/markdown'
import TimeManager from '~/utils/time' import TimeManager from '~/utils/time'
import BaseTabs from '~/components/BaseTabs.vue'
const config = useRuntimeConfig() const config = useRuntimeConfig()
const API_BASE_URL = config.public.apiBaseUrl const API_BASE_URL = config.public.apiBaseUrl
@@ -336,22 +345,6 @@ const hotReplies = ref([])
const hotTags = ref([]) const hotTags = ref([])
const favoritePosts = ref([]) const favoritePosts = ref([])
const timelineItems = ref([]) const timelineItems = ref([])
const profileTabs = [
{ name: 'summary', label: '总结', icon: 'fas fa-chart-line' },
{ name: 'timeline', label: '时间线', icon: 'fas fa-clock' },
{ name: 'following', label: '关注', icon: 'fas fa-user-plus' },
{ name: 'favorites', label: '收藏', icon: 'fas fa-bookmark' },
{ name: 'achievements', label: '勋章', icon: 'fas fa-medal' },
]
const timelineTabs = [
{ name: 'all', label: '全部' },
{ name: 'articles', label: '文章' },
{ name: 'comments', label: '评论和回复' },
]
const followTabs = [
{ name: 'followers', label: '关注者' },
{ name: 'following', label: '正在关注' },
]
const timelineFilter = ref('all') const timelineFilter = ref('all')
const filteredTimelineItems = computed(() => { const filteredTimelineItems = computed(() => {
if (timelineFilter.value === 'articles') { if (timelineFilter.value === 'articles') {
@@ -372,6 +365,13 @@ const selectedTab = ref(
? route.query.tab ? route.query.tab
: 'summary', : 'summary',
) )
const tabs = [
{ key: 'summary', label: '总结', icon: 'fas fa-chart-line' },
{ key: 'timeline', label: '时间线', icon: 'fas fa-clock' },
{ key: 'following', label: '关注', icon: 'fas fa-user-plus' },
{ key: 'favorites', label: '收藏', icon: 'fas fa-bookmark' },
{ key: 'achievements', label: '勋章', icon: 'fas fa-medal' },
]
const followTab = ref('followers') const followTab = ref('followers')
const levelInfo = computed(() => { const levelInfo = computed(() => {
@@ -768,7 +768,7 @@ watch(selectedTab, async (val) => {
font-size: 14px; font-size: 14px;
} }
.profile-tabs { :deep(.base-tabs-header) {
position: sticky; position: sticky;
top: calc(var(--header-height) + 1px); top: calc(var(--header-height) + 1px);
z-index: 200; z-index: 200;
@@ -782,7 +782,7 @@ watch(selectedTab, async (val) => {
backdrop-filter: var(--blur-10); backdrop-filter: var(--blur-10);
} }
.profile-tabs-item { :deep(.base-tabs-item) {
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 auto;
flex-direction: row; flex-direction: row;
@@ -795,7 +795,7 @@ watch(selectedTab, async (val) => {
white-space: nowrap; white-space: nowrap;
} }
.profile-tabs-item.selected { :deep(.base-tabs-item.selected) {
color: var(--primary-color); color: var(--primary-color);
border-bottom: 2px solid var(--primary-color); border-bottom: 2px solid var(--primary-color);
} }
@@ -954,7 +954,7 @@ watch(selectedTab, async (val) => {
height: 100px; height: 100px;
} }
.profile-tabs-item { :deep(.base-tabs-item) {
width: 100px; width: 100px;
} }

View File

@@ -0,0 +1,18 @@
// plugins/echarts.client.ts
import { defineNuxtPlugin } from 'nuxt/app'
import VueECharts from 'vue-echarts'
import { use } from 'echarts/core'
import { CanvasRenderer } from 'echarts/renderers'
import { LineChart } from 'echarts/charts'
import {
GridComponent,
TooltipComponent,
DataZoomComponent,
TitleComponent,
} from 'echarts/components'
use([LineChart, TitleComponent, TooltipComponent, GridComponent, DataZoomComponent, CanvasRenderer])
export default defineNuxtPlugin((nuxtApp) => {
nuxtApp.vueApp.component('VChart', VueECharts)
})

View File

@@ -48,7 +48,7 @@ function tiebaEmojiPlugin(md) {
md.renderer.rules['tieba-emoji'] = (tokens, idx) => { md.renderer.rules['tieba-emoji'] = (tokens, idx) => {
const name = tokens[idx].content const name = tokens[idx].content
const file = tiebaEmoji[name] const file = tiebaEmoji[name]
return `<BaseImage class="emoji" src="${file}" alt="${name}">` return `<img class="emoji" src="${file}" alt="${name}">`
} }
md.inline.ruler.before('emphasis', 'tieba-emoji', (state, silent) => { md.inline.ruler.before('emphasis', 'tieba-emoji', (state, silent) => {
const pos = state.pos const pos = state.pos
@@ -92,7 +92,7 @@ function linkPlugin(md) {
/** @section MarkdownIt 实例:开启 HTML但配合强净化 */ /** @section MarkdownIt 实例:开启 HTML但配合强净化 */
const md = new MarkdownIt({ const md = new MarkdownIt({
html: true, // ⭐ 允许行内 HTML为 <video> 服务) html: true,
linkify: true, linkify: true,
breaks: true, breaks: true,
highlight: (str, lang) => { highlight: (str, lang) => {
@@ -106,11 +106,16 @@ const md = new MarkdownIt({
.trim() .trim()
.split('\n') .split('\n')
.map(() => `<div class="line-number"></div>`) .map(() => `<div class="line-number"></div>`)
// 保留你原有的 CodeBlock + 复制按钮 + 行号结构
return `<pre class="code-block"><button class="copy-code-btn">Copy</button><div class="line-numbers">${lineNumbers.join('')}</div><code class="hljs language-${lang || ''}">${code.trim()}</code></pre>` return `<pre class="code-block"><button class="copy-code-btn">Copy</button><div class="line-numbers">${lineNumbers.join('')}</div><code class="hljs language-${lang || ''}">${code.trim()}</code></pre>`
}, },
}) })
const md2TextRender = new MarkdownIt({
html: true,
linkify: true,
breaks: true,
})
md.use(mentionPlugin) md.use(mentionPlugin)
md.use(tiebaEmojiPlugin) md.use(tiebaEmojiPlugin)
md.use(linkPlugin) md.use(linkPlugin)
@@ -221,7 +226,7 @@ export function handleMarkdownClick(e) {
/** @section 纯文本提取(保持你原有“统一正则法”) */ /** @section 纯文本提取(保持你原有“统一正则法”) */
export function stripMarkdown(text) { export function stripMarkdown(text) {
const html = md.render(text || '') const html = md2TextRender.render(text || '')
let plainText = html.replace(/<[^>]+>/g, '') let plainText = html.replace(/<[^>]+>/g, '')
plainText = plainText plainText = plainText
.replace(/\r\n/g, '\n') .replace(/\r\n/g, '\n')