Compare commits

...

56 Commits

Author SHA1 Message Date
tim
f93f58b055 fix: UI部份美化 2025-08-29 21:02:23 +08:00
tim
d427a41f6d fix: 首页 & 全局文字优化 2025-08-29 20:38:55 +08:00
tim
fff59e800d fix: menu ui 2025-08-29 14:51:40 +08:00
tim
6fd663d983 feat: MENU UI 优化 2025-08-29 14:41:29 +08:00
Tim
fd6fc11630 Merge pull request #779 from CH-122/fix/comment
更新评论项组件,添加回复用户头像和样式优化
2025-08-29 14:01:17 +08:00
CH-122
d7bfeed259 feat: 更新评论项组件,增加回复用户头像点击事件,取消使用 replace 2025-08-29 13:59:02 +08:00
Tim
c5e4da5e07 Merge pull request #781 from nagisa77/feature/daily_bugfix_0829
fix: 新增ipx依赖,新增node环境说明
2025-08-29 10:21:50 +08:00
Tim
b87932560b fix: 新增ipx依赖,新增node环境说明 2025-08-29 10:20:54 +08:00
CH-122
58ff8b177e fix: 更新评论项组件,添加回复用户头像和样式优化 2025-08-29 08:51:56 +08:00
Tim
4f6b585735 Merge pull request #776 from nagisa77/codex/add-mermaid-rendering-support
feat: add mermaid support to markdown rendering
2025-08-28 16:55:24 +08:00
Tim
ac81bccd20 feat: add mermaid support to markdown 2025-08-28 16:52:07 +08:00
Tim
351447e3d1 Merge pull request #773 from sivdead/main
解决文章和草稿长度不够的问题
2025-08-28 15:59:45 +08:00
sivdead
453d8fa68b refactor(model): 将 Post和Draft 实体的内容字段类型从 TEXT 改为 LONGTEXT 2025-08-28 15:11:14 +08:00
tim
2c5b38ee9e fix: 修复 http://localhost:3000/posts/310 内容超出的问题 2025-08-28 14:40:19 +08:00
Tim
b5fd5a3edc Update README.md 2025-08-28 10:16:12 +08:00
tim
ee717aced2 fix: 处理两处图片加载异常问题 2025-08-28 09:19:06 +08:00
Tim
9a9152593e Merge pull request #764 from nagisa77/feature/daily_bugfix_0827
fix: 简化time规则
2025-08-27 20:58:47 +08:00
Tim
856d3dd513 fix: 简化time规则 2025-08-27 20:57:20 +08:00
Tim
0e42a3335a Merge pull request #763 from nagisa77/feature/daily_bugfix_0827
fix: 新增相对时间
2025-08-27 20:48:57 +08:00
Tim
d96aae59d2 fix: 新增相对时间 2025-08-27 20:47:50 +08:00
Tim
122722d0e9 Merge pull request #762 from nagisa77/codex/fix-overlap-of-mobile-post-button
Adjust mobile post icon position and add close button to message box
2025-08-27 20:40:41 +08:00
Tim
0c2264e509 fix: adjust new post icon position and close message window 2025-08-27 20:39:46 +08:00
Tim
1e503e26f2 Merge pull request #761 from nagisa77/feature/daily_bugfix_0827
fix: 帖子可被刷积分,应新增取消赞消除积分😂 #685
2025-08-27 20:28:49 +08:00
Tim
ec0fd63e30 fix: 帖子可被刷积分,应新增取消赞消除积分😂 #685 2025-08-27 20:27:53 +08:00
Tim
dfd4c70b6e Merge pull request #760 from nagisa77/codex/fix-repeated-reaction-notifications-and-points
fix: resolve repeated reaction issues
2025-08-27 20:23:43 +08:00
Tim
d79dc8877d fix: handle reaction notification and point deduction 2025-08-27 20:23:28 +08:00
Tim
e979350d40 Merge pull request #759 from nagisa77/feature/daily_bugfix_0827
Feature/daily bugfix 0827
2025-08-27 20:21:58 +08:00
Tim
99bf80a47a Merge pull request #758 from nagisa77/codex-mv1xa5
fix: gray out unearned medals
2025-08-27 20:21:23 +08:00
Tim
bfadda1e7d fix: gray out unearned medals 2025-08-27 20:21:05 +08:00
Tim
906998a07f Merge pull request #757 from nagisa77/feature/daily_bugfix_0827
fix: 站内信 scroll问题 #749
2025-08-27 20:19:29 +08:00
Tim
02287c05be fix: 站内信 scroll问题 #749 2025-08-27 20:18:39 +08:00
Tim
56aed4603e Merge pull request #756 from nagisa77/feature/daily_bugfix_0827
fix: 站内信 scroll问题 #749
2025-08-27 20:01:34 +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
40 changed files with 4154 additions and 1987 deletions

View File

@@ -58,6 +58,8 @@ cp open-isle.env.example open-isle.env
> Step3 前端部署 > Step3 前端部署
**⚠️ 环境要求Node.js 版本最低 20.0.0(因为 Nuxt 框架要求)**
前端可以依赖本机部署的后端,也可以直接调用线上的后端接口 前端可以依赖本机部署的后端,也可以直接调用线上的后端接口
```shell ```shell

View File

@@ -1,9 +1,9 @@
<p align="center"> <p align="center">
<BaseImage alt="OpenIsle" src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png" width="200"> <img alt="OpenIsle" src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png" width="200">
<br> <br>
高效的开源社区前后端平台 高效的开源社区前后端平台
<br><br><br> <br><br><br>
<BaseImage alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200"> <img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
</p> </p>
## 💡 简介 ## 💡 简介

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

@@ -36,6 +36,7 @@ public class ReactionController {
Authentication auth) { Authentication auth) {
Reaction reaction = reactionService.reactToPost(auth.getName(), postId, req.getType()); Reaction reaction = reactionService.reactToPost(auth.getName(), postId, req.getType());
if (reaction == null) { if (reaction == null) {
pointService.deductForReactionOfPost(auth.getName(), postId);
return ResponseEntity.noContent().build(); return ResponseEntity.noContent().build();
} }
ReactionDto dto = reactionMapper.toDto(reaction); ReactionDto dto = reactionMapper.toDto(reaction);
@@ -50,6 +51,7 @@ public class ReactionController {
Authentication auth) { Authentication auth) {
Reaction reaction = reactionService.reactToComment(auth.getName(), commentId, req.getType()); Reaction reaction = reactionService.reactToComment(auth.getName(), commentId, req.getType());
if (reaction == null) { if (reaction == null) {
pointService.deductForReactionOfComment(auth.getName(), commentId);
return ResponseEntity.noContent().build(); return ResponseEntity.noContent().build();
} }
ReactionDto dto = reactionMapper.toDto(reaction); ReactionDto dto = reactionMapper.toDto(reaction);

View File

@@ -22,7 +22,7 @@ public class Draft {
private String title; private String title;
@Column(columnDefinition = "TEXT") @Column(columnDefinition = "LONGTEXT")
private String content; private String content;
@ManyToOne(fetch = FetchType.LAZY, optional = false) @ManyToOne(fetch = FetchType.LAZY, optional = false)

View File

@@ -5,6 +5,8 @@ public enum PointHistoryType {
COMMENT, COMMENT,
POST_LIKED, POST_LIKED,
COMMENT_LIKED, COMMENT_LIKED,
POST_LIKE_CANCELLED,
COMMENT_LIKE_CANCELLED,
INVITE, INVITE,
FEATURE, FEATURE,
SYSTEM_ONLINE, SYSTEM_ONLINE,

View File

@@ -31,7 +31,7 @@ public class Post {
@Column(nullable = false) @Column(nullable = false)
private String title; private String title;
@Column(nullable = false, columnDefinition = "TEXT") @Column(nullable = false, columnDefinition = "LONGTEXT")
private String content; private String content;
@CreationTimestamp @CreationTimestamp

View File

@@ -5,6 +5,7 @@ import com.openisle.model.User;
import com.openisle.model.Post; import com.openisle.model.Post;
import com.openisle.model.Comment; import com.openisle.model.Comment;
import com.openisle.model.NotificationType; import com.openisle.model.NotificationType;
import com.openisle.model.ReactionType;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
@@ -29,4 +30,8 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
List<Notification> findByTypeAndFromUser(NotificationType type, User fromUser); List<Notification> findByTypeAndFromUser(NotificationType type, User fromUser);
void deleteByTypeAndFromUserAndPost(NotificationType type, User fromUser, Post post); void deleteByTypeAndFromUserAndPost(NotificationType type, User fromUser, Post post);
void deleteByTypeAndFromUserAndPostAndReactionType(NotificationType type, User fromUser, Post post, ReactionType reactionType);
void deleteByTypeAndFromUserAndCommentAndReactionType(NotificationType type, User fromUser, Comment comment, ReactionType reactionType);
} }

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

@@ -114,6 +114,14 @@ public class NotificationService {
return n; return n;
} }
public void deleteReactionNotification(User fromUser, Post post, Comment comment, ReactionType reactionType) {
if (post != null) {
notificationRepository.deleteByTypeAndFromUserAndPostAndReactionType(NotificationType.REACTION, fromUser, post, reactionType);
} else if (comment != null) {
notificationRepository.deleteByTypeAndFromUserAndCommentAndReactionType(NotificationType.REACTION, fromUser, comment, reactionType);
}
}
/** /**
* Create notifications for all admins when a user submits a register request. * Create notifications for all admins when a user submits a register request.
* Old register request notifications from the same applicant are removed first. * Old register request notifications from the same applicant are removed first.

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
@@ -146,6 +150,16 @@ public class PointService {
return addPoint(poster, 10, PointHistoryType.POST_LIKED, post, null, reactioner); return addPoint(poster, 10, PointHistoryType.POST_LIKED, post, null, reactioner);
} }
public int deductForReactionOfPost(String reactionerName, Long postId) {
User poster = postRepository.findById(postId).orElseThrow().getAuthor();
User reactioner = userRepository.findByUsername(reactionerName).orElseThrow();
if (poster.getId().equals(reactioner.getId())) {
return 0;
}
Post post = postRepository.findById(postId).orElseThrow();
return addPoint(poster, -10, PointHistoryType.POST_LIKE_CANCELLED, post, null, reactioner);
}
// 考虑点赞者和评论者是同一个的情况 // 考虑点赞者和评论者是同一个的情况
public int awardForReactionOfComment(String reactionerName, Long commentId) { public int awardForReactionOfComment(String reactionerName, Long commentId) {
// 根据帖子id找到评论者 // 根据帖子id找到评论者
@@ -165,6 +179,17 @@ public class PointService {
return addPoint(commenter, 10, PointHistoryType.COMMENT_LIKED, post, comment, reactioner); return addPoint(commenter, 10, PointHistoryType.COMMENT_LIKED, post, comment, reactioner);
} }
public int deductForReactionOfComment(String reactionerName, Long commentId) {
User commenter = commentRepository.findById(commentId).orElseThrow().getAuthor();
User reactioner = userRepository.findByUsername(reactionerName).orElseThrow();
if (commenter.getId().equals(reactioner.getId())) {
return 0;
}
Comment comment = commentRepository.findById(commentId).orElseThrow();
Post post = comment.getPost();
return addPoint(commenter, -10, PointHistoryType.COMMENT_LIKE_CANCELLED, post, comment, reactioner);
}
public java.util.List<PointHistory> listHistory(String userName) { public java.util.List<PointHistory> listHistory(String userName) {
User user = userRepository.findByUsername(userName).orElseThrow(); User user = userRepository.findByUsername(userName).orElseThrow();
if (pointHistoryRepository.countByUser(user) == 0) { if (pointHistoryRepository.countByUser(user) == 0) {
@@ -173,4 +198,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

@@ -42,6 +42,7 @@ public class ReactionService {
java.util.Optional<Reaction> existing = java.util.Optional<Reaction> existing =
reactionRepository.findByUserAndPostAndType(user, post, type); reactionRepository.findByUserAndPostAndType(user, post, type);
if (existing.isPresent()) { if (existing.isPresent()) {
notificationService.deleteReactionNotification(user, post, null, type);
reactionRepository.delete(existing.get()); reactionRepository.delete(existing.get());
return null; return null;
} }
@@ -65,6 +66,7 @@ public class ReactionService {
java.util.Optional<Reaction> existing = java.util.Optional<Reaction> existing =
reactionRepository.findByUserAndCommentAndType(user, comment, type); reactionRepository.findByUserAndCommentAndType(user, comment, type);
if (existing.isPresent()) { if (existing.isPresent()) {
notificationService.deleteReactionNotification(user, null, comment, type);
reactionRepository.delete(existing.get()); reactionRepository.delete(existing.get());
return null; return null;
} }

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

@@ -138,7 +138,7 @@ const goToNewPost = () => {
height: 60px; height: 60px;
border-radius: 50%; border-radius: 50%;
position: fixed; position: fixed;
bottom: 40px; bottom: 70px;
right: 20px; right: 20px;
font-size: 20px; font-size: 20px;
cursor: pointer; cursor: pointer;

View File

@@ -18,8 +18,8 @@
--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: rgb(99, 99, 99);
--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); */
--normal-background-color: white; --normal-background-color: white;
@@ -27,7 +27,7 @@
--code-highlight-background-color: rgb(241, 241, 241); --code-highlight-background-color: rgb(241, 241, 241);
--login-background-color: rgb(248, 248, 248); --login-background-color: rgb(248, 248, 248);
--login-background-color-hover: #e0e0e0; --login-background-color-hover: #e0e0e0;
--text-color: black; --text-color: rgb(70, 70, 70);
--blockquote-text-color: #6a737d; --blockquote-text-color: #6a737d;
--menu-width: 200px; --menu-width: 200px;
--page-max-width: 1400px; --page-max-width: 1400px;
@@ -50,7 +50,7 @@
--menu-border-color: #555; --menu-border-color: #555;
--normal-border-color: #555; --normal-border-color: #555;
--menu-selected-background-color: rgba(255, 255, 255, 0.1); --menu-selected-background-color: rgba(255, 255, 255, 0.1);
--menu-text-color: white; --menu-text-color: rgb(173, 173, 173);
/* --normal-background-color: #000000; */ /* --normal-background-color: #000000; */
--normal-background-color: #333; --normal-background-color: #333;
--lottery-background-color: #4e4e4e; --lottery-background-color: #4e4e4e;
@@ -75,7 +75,7 @@
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: 'Roboto', sans-serif; font-family: 'WenQuanYi Micro Hei', 'Helvetica Neue', Arial, sans-serif;
background-color: var(--normal-background-color); background-color: var(--normal-background-color);
color: var(--text-color); color: var(--text-color);
/* 禁止滚动 */ /* 禁止滚动 */
@@ -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%;
@@ -161,6 +162,7 @@ body {
border-radius: 4px; border-radius: 4px;
line-height: 1.5; line-height: 1.5;
position: relative; position: relative;
white-space: break-spaces;
} }
.info-content-text pre .line-numbers { .info-content-text pre .line-numbers {
@@ -187,7 +189,6 @@ body {
font-family: 'Maple Mono', monospace; font-family: 'Maple Mono', monospace;
font-size: 13px; font-size: 13px;
border-radius: 4px; border-radius: 4px;
white-space: break-spaces;
background-color: var(--code-highlight-background-color); background-color: var(--code-highlight-background-color);
color: var(--text-color); color: var(--text-color);
} }

View File

@@ -2,7 +2,7 @@
<div v-if="show" class="cropper-modal"> <div v-if="show" class="cropper-modal">
<div class="cropper-body"> <div class="cropper-body">
<div class="cropper-wrapper"> <div class="cropper-wrapper">
<BaseImage ref="image" :src="src" alt="to crop" /> <img ref="image" :src="src" alt="to crop" />
</div> </div>
<div class="cropper-actions"> <div class="cropper-actions">
<button class="cropper-btn" @click="$emit('close')">取消</button> <button class="cropper-btn" @click="$emit('close')">取消</button>

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

@@ -23,9 +23,13 @@
>{{ getMedalTitle(comment.medal) }}</NuxtLink >{{ getMedalTitle(comment.medal) }}</NuxtLink
> >
<i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i> <i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
<span v-if="level >= 2"> <span v-if="level >= 2" class="reply-item">
<i class="fas fa-reply reply-icon"></i> <i class="fas fa-reply reply-icon"></i>
<span class="user-name reply-user-name">{{ comment.parentUserName }}</span> <span class="reply-info">
<BaseImage class="reply-avatar" :src="comment.parentUserAvatar || '/default-avatar.svg'" alt="avatar"
@click="comment.parentUserClick && comment.parentUserClick()" />
<span class="reply-user-name">{{ comment.parentUserName }}</span>
</span>
</span> </span>
<div class="post-time">{{ comment.time }}</div> <div class="post-time">{{ comment.time }}</div>
</div> </div>
@@ -250,6 +254,7 @@ const submitReply = async (parentUserName, text, clear) => {
medal: data.author.displayMedal, medal: data.author.displayMedal,
text: data.content, text: data.content,
parentUserName: parentUserName, parentUserName: parentUserName,
parentUserAvatar: props.comment.avatar,
reactions: [], reactions: [],
reply: (data.replies || []).map((r) => ({ reply: (data.replies || []).map((r) => ({
id: r.id, id: r.id,
@@ -376,7 +381,22 @@ const handleContentClick = (e) => {
justify-content: space-between; justify-content: space-between;
} }
.reply-item, .reply-info {
display: inline-flex;
flex-direction: row;
align-items: center;
}
.reply-avatar {
width: 20px;
height: 20px;
border-radius: 50%;
margin-right: 5px;
cursor: pointer;
}
.reply-icon { .reply-icon {
color: var(--primary-color);
margin-right: 10px; margin-right: 10px;
margin-left: 10px; margin-left: 10px;
opacity: 0.5; opacity: 0.5;

View File

@@ -4,7 +4,7 @@
<div class="header-content-left"> <div class="header-content-left">
<div v-if="showMenuBtn" class="menu-btn-wrapper"> <div v-if="showMenuBtn" class="menu-btn-wrapper">
<button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')"> <button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')">
<i class="fas fa-bars"></i> <i class="fas fa-bars micon"></i>
</button> </button>
<span <span
v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)" v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)"
@@ -63,7 +63,7 @@
<DropdownMenu v-if="isLogin" ref="userMenu" :items="headerMenuItems"> <DropdownMenu v-if="isLogin" ref="userMenu" :items="headerMenuItems">
<template #trigger> <template #trigger>
<div class="avatar-container"> <div class="avatar-container">
<BaseImage class="avatar-img" :src="avatar" alt="avatar" /> <img class="avatar-img" :src="avatar" alt="avatar" />
<i class="fas fa-caret-down dropdown-icon"></i> <i class="fas fa-caret-down dropdown-icon"></i>
</div> </div>
</template> </template>
@@ -318,6 +318,10 @@ onMounted(async () => {
gap: 20px; gap: 20px;
} }
.micon {
margin-left: 10px;
}
.menu-btn { .menu-btn {
font-size: 24px; font-size: 24px;
background: none; background: none;
@@ -370,6 +374,7 @@ onMounted(async () => {
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
margin-right: 10px;
} }
.avatar-img { .avatar-img {

View File

@@ -279,12 +279,29 @@ const gotoTag = (t) => {
padding: 10px 10px 0 10px; padding: 10px 10px 0 10px;
} }
.menu-content::-webkit-scrollbar {
display: none;
}
.menu-content {
-ms-overflow-style: none;
scrollbar-width: none;
}
.menu-item-container {
border-bottom: 1px solid var(--menu-border-color);
}
.menu-item:last-child {
margin-bottom: 5px;
}
/* .menu-item-container { */ /* .menu-item-container { */
/**/ /**/
/* } */ /* } */
.menu-item { .menu-item {
padding: 4px 10px; padding: 6px 12px;
text-decoration: none; text-decoration: none;
color: var(--menu-text-color); color: var(--menu-text-color);
border-radius: 10px; border-radius: 10px;
@@ -298,7 +315,7 @@ const gotoTag = (t) => {
} }
.menu-item-text { .menu-item-text {
font-size: 16px; font-size: 14px;
text-decoration: none; text-decoration: none;
color: var(--menu-text-color); color: var(--menu-text-color);
} }
@@ -352,16 +369,17 @@ const gotoTag = (t) => {
} }
.menu-section { .menu-section {
margin-top: 10px; border-bottom: 1px solid var(--menu-border-color);
padding-bottom: 5px;
} }
.section-header { .section-header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
font-weight: bold; font-size: 14px;
opacity: 0.5; padding: 6px 12px 0 12px;
padding: 4px 10px; color: var(--menu-text-color);
cursor: pointer; cursor: pointer;
} }
@@ -373,7 +391,7 @@ const gotoTag = (t) => {
} }
.section-item { .section-item {
padding: 4px 10px; padding: 6px 12px;
display: flex; display: flex;
align-items: center; align-items: center;
gap: 5px; gap: 5px;
@@ -393,6 +411,8 @@ const gotoTag = (t) => {
} }
.section-item-text { .section-item-text {
font-size: 14px;
text-decoration: none;
color: var(--menu-text-color); color: var(--menu-text-color);
} }

View File

@@ -16,6 +16,7 @@
@click="reboundToDefault" @click="reboundToDefault"
></i> ></i>
<i class="fas fa-expand" title="在页面中打开" @click="expand"></i> <i class="fas fa-expand" title="在页面中打开" @click="expand"></i>
<i class="fas fa-times" title="关闭" @click="close"></i>
</div> </div>
</div> </div>
</template> </template>
@@ -48,6 +49,10 @@ function expand() {
navigateTo(target) navigateTo(target)
} }
function close() {
floatRoute.value = null
}
function injectBaseTag() { function injectBaseTag() {
if (!iframeRef.value) return if (!iframeRef.value) return

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

File diff suppressed because it is too large Load Diff

View File

@@ -15,8 +15,10 @@
"echarts": "^5.6.0", "echarts": "^5.6.0",
"flatpickr": "^4.6.13", "flatpickr": "^4.6.13",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"ipx": "^3.1.1",
"ldrs": "^1.0.0", "ldrs": "^1.0.0",
"markdown-it": "^14.1.0", "markdown-it": "^14.1.0",
"mermaid": "^10.9.4",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"nuxt": "latest", "nuxt": "latest",
"sanitize-html": "^2.17.0", "sanitize-html": "^2.17.0",

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

@@ -72,9 +72,9 @@
<i v-if="article.type === 'LOTTERY'" class="fa-solid fa-gift lottery-icon"></i> <i v-if="article.type === 'LOTTERY'" class="fa-solid fa-gift lottery-icon"></i>
{{ article.title }} {{ article.title }}
</NuxtLink> </NuxtLink>
<div class="article-item-description main-item"> <NuxtLink class="article-item-description main-item" :to="`/posts/${article.id}`">
{{ sanitizeDescription(article.description) }} {{ sanitizeDescription(article.description) }}
</div> </NuxtLink>
<div class="article-info-container main-item"> <div class="article-info-container main-item">
<ArticleCategory :category="article.category" /> <ArticleCategory :category="article.category" />
<ArticleTags :tags="article.tags" /> <ArticleTags :tags="article.tags" />
@@ -527,15 +527,18 @@ const sanitizeDescription = (text) => stripMarkdown(text)
.article-item-title { .article-item-title {
margin-top: 10px; margin-top: 10px;
font-size: 20px; font-size: 18px;
text-decoration: none; text-decoration: none;
color: var(--text-color); color: var(--text-color);
max-width: 100%; max-width: 100%;
font-weight: bold;
transition: color 0.2s ease;
} }
.article-item-title:hover { .article-item-title:hover {
color: var(--primary-color); color: var(--primary-color);
text-decoration: underline; text-decoration: underline;
transition: color 0.2s ease;
} }
.pinned-icon, .pinned-icon,
@@ -547,13 +550,23 @@ const sanitizeDescription = (text) => stripMarkdown(text)
.article-item-description { .article-item-description {
max-width: 100%; max-width: 100%;
margin-top: 10px; margin-top: 10px;
font-size: 14px; font-size: 13px;
color: gray; color: rgba(140, 140, 140, 0.888);
display: -webkit-box; display: -webkit-box;
line-clamp: 3; line-clamp: 3;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
overflow: hidden; overflow: hidden;
letter-spacing: 0.01em;
font-weight: 400;
text-decoration: none;
transition: color 0.2s ease;
}
.article-item-description:hover {
color: var(--primary-color);
cursor: pointer;
transition: color 0.2s ease;
} }
.article-info-container { .article-info-container {

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

@@ -113,17 +113,23 @@ const error = ref(null)
const conversationId = route.params.id const conversationId = route.params.id
const currentUser = ref(null) const currentUser = ref(null)
const messagesListEl = ref(null) const messagesListEl = ref(null)
let lastMessageEl = null
const currentPage = ref(0) const currentPage = ref(0)
const totalPages = ref(0) const totalPages = ref(0)
const loadingMore = ref(false) const loadingMore = ref(false)
let scrollInterval = null
const conversationName = ref('') const conversationName = ref('')
const isChannel = ref(false) const isChannel = ref(false)
const isFloatMode = computed(() => route.query.float !== undefined) const isFloatMode = computed(() => route.query.float !== undefined)
const floatRoute = useState('messageFloatRoute') const floatRoute = useState('messageFloatRoute')
const replyTo = ref(null) const replyTo = ref(null)
const isUserNearBottom = ref(true)
function updateNearBottom() {
const el = messagesListEl.value
if (!el) return
const threshold = 40 // px
isUserNearBottom.value = el.scrollHeight - el.scrollTop - el.clientHeight <= threshold
}
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1) const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
const otherParticipant = computed(() => { const otherParticipant = computed(() => {
@@ -133,20 +139,37 @@ const otherParticipant = computed(() => {
return participants.value.find((p) => p.id !== currentUser.value.id) return participants.value.find((p) => p.id !== currentUser.value.id)
}) })
function isSentByCurrentUser(message) {
return message.sender.id === currentUser.value?.id
}
function handleAvatarError(event) {
event.target.src = '/default-avatar.svg'
}
function setReply(message) { function setReply(message) {
replyTo.value = message replyTo.value = message
} }
// No changes needed here, as renderMarkdown is now imported. /** 改造:滚动函数 —— smooth & instant */
// The old function is removed. function scrollToBottomSmooth() {
const el = messagesListEl.value
if (!el) return
// 优先使用原生 smooth失败则降级
try {
el.scrollTo({ top: el.scrollHeight, behavior: 'smooth' })
} catch {
// 降级:简易动画
const start = el.scrollTop
const end = el.scrollHeight
const duration = 200
const startTs = performance.now()
function step(now) {
const p = Math.min(1, (now - startTs) / duration)
el.scrollTop = start + (end - start) * p
if (p < 1) requestAnimationFrame(step)
}
requestAnimationFrame(step)
}
}
function scrollToBottomInstant() {
const el = messagesListEl.value
if (!el) return
el.scrollTop = el.scrollHeight
}
async function fetchMessages(page = 0) { async function fetchMessages(page = 0) {
if (page === 0) { if (page === 0) {
@@ -181,7 +204,6 @@ async function fetchMessages(page = 0) {
isChannel.value = conversationData.channel isChannel.value = conversationData.channel
} }
// Since the backend sorts by descending, we need to reverse for correct chat order
const newMessages = pageData.content.reverse().map((item) => ({ const newMessages = pageData.content.reverse().map((item) => ({
...item, ...item,
src: item.sender.avatar, src: item.sender.avatar,
@@ -202,12 +224,16 @@ async function fetchMessages(page = 0) {
currentPage.value = pageData.number currentPage.value = pageData.number
totalPages.value = pageData.totalPages totalPages.value = pageData.totalPages
// Scrolling is now fully handled by the watcher
await nextTick() await nextTick()
if (page > 0 && list) { if (page > 0 && list) {
// 加载更多:保持原视口位置
const newScrollHeight = list.scrollHeight const newScrollHeight = list.scrollHeight
list.scrollTop = newScrollHeight - oldScrollHeight list.scrollTop = newScrollHeight - oldScrollHeight
} else if (page === 0) {
// 首次加载:定位到底部(不用动画,避免“闪动感”)
scrollToBottomInstant()
} }
updateNearBottom()
} catch (e) { } catch (e) {
error.value = e.message error.value = e.message
toast.error(e.message) toast.error(e.message)
@@ -272,9 +298,10 @@ async function sendMessage(content, clearInput) {
}) })
clearInput() clearInput()
replyTo.value = null replyTo.value = null
setTimeout(() => {
scrollToBottom() await nextTick()
}, 100) // 仅“发送消息成功后”才平滑滚动到底部
scrollToBottomSmooth()
} catch (e) { } catch (e) {
toast.error(e.message) toast.error(e.message)
} finally { } finally {
@@ -290,7 +317,6 @@ async function markConversationAsRead() {
method: 'POST', method: 'POST',
headers: { Authorization: `Bearer ${token}` }, headers: { Authorization: `Bearer ${token}` },
}) })
// After marking as read, refresh the global unread count
refreshGlobalUnreadCount() refreshGlobalUnreadCount()
refreshChannelUnread() refreshChannelUnread()
} catch (e) { } catch (e) {
@@ -298,37 +324,12 @@ async function markConversationAsRead() {
} }
} }
function scrollToBottom() {
if (messagesListEl.value) {
const element = messagesListEl.value
// 強制滾動到底部,使用 smooth 行為確保視覺效果
element.scrollTop = element.scrollHeight
// 再次確認滾動位置
setTimeout(() => {
if (element.scrollTop < element.scrollHeight - element.clientHeight) {
element.scrollTop = element.scrollHeight
}
}, 50)
}
}
watch(
messages,
async (newMessages) => {
if (newMessages.length === 0) return
await nextTick()
// Simple, reliable scroll to bottom
setTimeout(() => {
scrollToBottom()
}, 100)
},
{ deep: true },
)
onMounted(async () => { onMounted(async () => {
// 监听列表滚动,实时感知是否接近底部
if (messagesListEl.value) {
messagesListEl.value.addEventListener('scroll', updateNearBottom, { passive: true })
}
currentUser.value = await fetchCurrentUser() currentUser.value = await fetchCurrentUser()
if (currentUser.value) { if (currentUser.value) {
await fetchMessages(0) await fetchMessages(0)
@@ -345,9 +346,8 @@ onMounted(async () => {
watch(isConnected, (newValue) => { watch(isConnected, (newValue) => {
if (newValue) { if (newValue) {
// 等待一小段时间确保连接稳定
setTimeout(() => { setTimeout(() => {
subscription = subscribe(`/topic/conversation/${conversationId}`, (message) => { subscription = subscribe(`/topic/conversation/${conversationId}`, async (message) => {
// 避免重复显示当前用户发送的消息 // 避免重复显示当前用户发送的消息
if (message.sender.id !== currentUser.value.id) { if (message.sender.id !== currentUser.value.id) {
messages.value.push({ messages.value.push({
@@ -357,11 +357,10 @@ watch(isConnected, (newValue) => {
openUser(message.sender.id) openUser(message.sender.id)
}, },
}) })
// 实时收到消息时自动标记已读 // 收到消息后只标记已读,不强制滚动(符合“非发送不拉底”)
markConversationAsRead() markConversationAsRead()
setTimeout(() => { await nextTick()
scrollToBottom() updateNearBottom()
}, 100)
} }
}) })
}, 500) }, 500)
@@ -369,23 +368,12 @@ watch(isConnected, (newValue) => {
}) })
onActivated(async () => { onActivated(async () => {
// This will be called every time the component is activated (navigated to) // 返回页面时:刷新数据与已读,不做强制滚动,保持用户当前位置
if (currentUser.value) { if (currentUser.value) {
await fetchMessages(0) await fetchMessages(0)
await markConversationAsRead() await markConversationAsRead()
// 確保滾動到底部 - 使用多重延遲策略
await nextTick() await nextTick()
setTimeout(() => { updateNearBottom()
scrollToBottom()
}, 100)
setTimeout(() => {
scrollToBottom()
}, 300)
setTimeout(() => {
scrollToBottom()
}, 500)
if (!isConnected.value) { if (!isConnected.value) {
const token = getToken() const token = getToken()
if (token) connect(token) if (token) connect(token)
@@ -406,6 +394,9 @@ onUnmounted(() => {
subscription.unsubscribe() subscription.unsubscribe()
subscription = null subscription = null
} }
if (messagesListEl.value) {
messagesListEl.value.removeEventListener('scroll', updateNearBottom)
}
disconnect() disconnect()
}) })
@@ -492,6 +483,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 +589,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,202 @@
<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_LIKE_CANCELLED' && 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_LIKE_CANCELLED' && item.fromUserId">
你的评论
<NuxtLink
:to="`/posts/${item.postId}#comment-${item.commentId}`"
class="timeline-link"
>
{{ stripMarkdownLength(item.commentContent, 100) }}
</NuxtLink>
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">
{{ item.fromUserName }}
</NuxtLink>
取消点赞扣除{{ -item.amount }}积分
</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 +213,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 积分',
@@ -218,6 +252,28 @@ const iconMap = {
FEATURE: 'fas fa-star', FEATURE: 'fas fa-star',
LOTTERY_JOIN: 'fas fa-ticket-alt', LOTTERY_JOIN: 'fas fa-ticket-alt',
LOTTERY_REWARD: 'fas fa-ticket-alt', LOTTERY_REWARD: 'fas fa-ticket-alt',
POST_LIKE_CANCELLED: 'fas fa-thumbs-down',
COMMENT_LIKE_CANCELLED: 'fas fa-thumbs-down',
}
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 () => {
@@ -225,8 +281,10 @@ onMounted(async () => {
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 +370,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 +420,8 @@ const submitRedeem = async () => {
} }
.rules, .rules,
.goods { .goods,
.trend {
margin-top: 20px; margin-top: 20px;
} }

View File

@@ -411,7 +411,13 @@ const gatherPostItems = () => {
} }
} }
const mapComment = (c, parentUserName = '', level = 0) => ({ const mapComment = (
c,
parentUserName = '',
parentUserAvatar = '',
parentUserId = '',
level = 0,
) => ({
id: c.id, id: c.id,
userName: c.author.username, userName: c.author.username,
medal: c.author.displayMedal, medal: c.author.displayMedal,
@@ -421,11 +427,15 @@ const mapComment = (c, parentUserName = '', level = 0) => ({
text: c.content, text: c.content,
reactions: c.reactions || [], reactions: c.reactions || [],
pinned: Boolean(c.pinned ?? c.pinnedAt ?? c.pinned_at), pinned: Boolean(c.pinned ?? c.pinnedAt ?? c.pinned_at),
reply: (c.replies || []).map((r) => mapComment(r, c.author.username, level + 1)), reply: (c.replies || []).map((r) =>
mapComment(r, c.author.username, c.author.avatar, c.author.id, level + 1),
),
openReplies: level === 0, openReplies: level === 0,
src: c.author.avatar, src: c.author.avatar,
iconClick: () => navigateTo(`/users/${c.author.id}`, { replace: true }), iconClick: () => navigateTo(`/users/${c.author.id}`),
parentUserName: parentUserName, parentUserName: parentUserName,
parentUserAvatar: parentUserAvatar,
parentUserClick: parentUserId ? () => navigateTo(`/users/${parentUserId}`) : null,
}) })
const getTop = (el) => { const getTop = (el) => {
@@ -1225,7 +1235,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 {
@@ -1423,7 +1432,7 @@ onMounted(async () => {
} }
.info-content-text { .info-content-text {
line-height: 1.3; line-height: 1.5;
} }
.reactions-viewer-item { .reactions-viewer-item {

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,10 +92,13 @@ 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) => {
if (lang === 'mermaid') {
return `<pre class="mermaid">${str}</pre>`
}
let code = '' let code = ''
if (lang && hljs.getLanguage(lang)) { if (lang && hljs.getLanguage(lang)) {
code = hljs.highlight(str, { language: lang, ignoreIllegals: true }).value code = hljs.highlight(str, { language: lang, ignoreIllegals: true }).value
@@ -106,11 +109,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)
@@ -177,7 +185,7 @@ const SANITIZE_CFG = {
allowedClasses: { allowedClasses: {
a: ['mention-link'], a: ['mention-link'],
img: ['emoji'], img: ['emoji'],
pre: ['code-block'], pre: ['code-block', 'mermaid'],
div: ['line-numbers', 'line-number'], div: ['line-numbers', 'line-number'],
code: ['hljs', /^language-/], code: ['hljs', /^language-/],
button: ['copy-code-btn'], button: ['copy-code-btn'],
@@ -203,8 +211,15 @@ const SANITIZE_CFG = {
/** @section 渲染 & 事件 */ /** @section 渲染 & 事件 */
export function renderMarkdown(text) { export function renderMarkdown(text) {
const raw = md.render(text || '') const raw = md.render(text || '')
// ⭐ 核心:对最终 HTML 进行一次净化 const html = sanitizeHtml(raw, SANITIZE_CFG)
return sanitizeHtml(raw, SANITIZE_CFG) if (typeof window !== 'undefined') {
setTimeout(async () => {
const mermaid = await import('mermaid')
mermaid.default.initialize({ startOnLoad: false })
mermaid.default.run({ nodes: document.querySelectorAll('.mermaid') })
})
}
return html
} }
export function handleMarkdownClick(e) { export function handleMarkdownClick(e) {
@@ -221,7 +236,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')

View File

@@ -4,6 +4,17 @@ export default class TimeManager {
if (Number.isNaN(date.getTime())) return '' if (Number.isNaN(date.getTime())) return ''
const now = new Date() const now = new Date()
const diffMs = now.getTime() - date.getTime()
if (diffMs >= 0 && diffMs < 60 * 1000) {
return '刚刚'
}
if (diffMs >= 0 && diffMs < 60 * 60 * 1000) {
const mins = Math.floor(diffMs / 60_000)
return `${mins || 1}分钟前`
}
const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate()) const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate())
const startOfDate = new Date(date.getFullYear(), date.getMonth(), date.getDate()) const startOfDate = new Date(date.getFullYear(), date.getMonth(), date.getDate())
const diffDays = Math.floor((startOfToday - startOfDate) / 86400000) const diffDays = Math.floor((startOfToday - startOfDate) / 86400000)

78
package-lock.json generated
View File

@@ -8,45 +8,6 @@
"name": "openisle", "name": "openisle",
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": {
"ansi-escapes": "^7.0.0",
"ansi-regex": "^6.1.0",
"ansi-styles": "^6.2.1",
"braces": "^3.0.3",
"chalk": "^5.5.0",
"cli-cursor": "^5.0.0",
"cli-truncate": "^4.0.0",
"colorette": "^2.0.20",
"commander": "^14.0.0",
"debug": "^4.4.1",
"emoji-regex": "^10.4.0",
"environment": "^1.1.0",
"eventemitter3": "^5.0.1",
"fill-range": "^7.1.1",
"get-east-asian-width": "^1.3.0",
"is-fullwidth-code-point": "^4.0.0",
"is-number": "^7.0.0",
"lilconfig": "^3.1.3",
"listr2": "^9.0.1",
"log-update": "^6.1.0",
"micromatch": "^4.0.8",
"mimic-function": "^5.0.1",
"ms": "^2.1.3",
"nano-spawn": "^1.0.2",
"onetime": "^7.0.0",
"picomatch": "^2.3.1",
"pidtree": "^0.6.0",
"restore-cursor": "^5.1.0",
"rfdc": "^1.4.1",
"signal-exit": "^4.1.0",
"slice-ansi": "^5.0.0",
"string-argv": "^0.3.2",
"string-width": "^7.2.0",
"strip-ansi": "^7.1.0",
"to-regex-range": "^5.0.1",
"wrap-ansi": "^9.0.0",
"yaml": "^2.8.1"
},
"devDependencies": { "devDependencies": {
"husky": "^9.1.7", "husky": "^9.1.7",
"lint-staged": "^16.1.5", "lint-staged": "^16.1.5",
@@ -57,6 +18,7 @@
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
"integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"environment": "^1.0.0" "environment": "^1.0.0"
@@ -72,6 +34,7 @@
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
@@ -84,6 +47,7 @@
"version": "6.2.1", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
@@ -96,6 +60,7 @@
"version": "3.0.3", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"fill-range": "^7.1.1" "fill-range": "^7.1.1"
@@ -108,6 +73,7 @@
"version": "5.5.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.5.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.5.0.tgz",
"integrity": "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==", "integrity": "sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": "^12.17.0 || ^14.13 || >=16.0.0" "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -120,6 +86,7 @@
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
"integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"restore-cursor": "^5.0.0" "restore-cursor": "^5.0.0"
@@ -135,6 +102,7 @@
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
"integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"slice-ansi": "^5.0.0", "slice-ansi": "^5.0.0",
@@ -151,12 +119,14 @@
"version": "2.0.20", "version": "2.0.20",
"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/commander": { "node_modules/commander": {
"version": "14.0.0", "version": "14.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-14.0.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.0.tgz",
"integrity": "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==", "integrity": "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=20" "node": ">=20"
@@ -166,6 +136,7 @@
"version": "4.4.1", "version": "4.4.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
"integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ms": "^2.1.3" "ms": "^2.1.3"
@@ -183,12 +154,14 @@
"version": "10.4.0", "version": "10.4.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
"integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/environment": { "node_modules/environment": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
"integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=18" "node": ">=18"
@@ -201,12 +174,14 @@
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/fill-range": { "node_modules/fill-range": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"to-regex-range": "^5.0.1" "to-regex-range": "^5.0.1"
@@ -219,6 +194,7 @@
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
"integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=18" "node": ">=18"
@@ -247,6 +223,7 @@
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
"integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
@@ -259,6 +236,7 @@
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=0.12.0" "node": ">=0.12.0"
@@ -268,6 +246,7 @@
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
"integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=14" "node": ">=14"
@@ -308,6 +287,7 @@
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.1.tgz", "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.1.tgz",
"integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==", "integrity": "sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"cli-truncate": "^4.0.0", "cli-truncate": "^4.0.0",
@@ -325,6 +305,7 @@
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
"integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ansi-escapes": "^7.0.0", "ansi-escapes": "^7.0.0",
@@ -344,6 +325,7 @@
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
"integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"get-east-asian-width": "^1.0.0" "get-east-asian-width": "^1.0.0"
@@ -359,6 +341,7 @@
"version": "7.1.0", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
"integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ansi-styles": "^6.2.1", "ansi-styles": "^6.2.1",
@@ -375,6 +358,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"braces": "^3.0.3", "braces": "^3.0.3",
@@ -388,6 +372,7 @@
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
"integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=18" "node": ">=18"
@@ -400,12 +385,14 @@
"version": "2.1.3", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/nano-spawn": { "node_modules/nano-spawn": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-1.0.2.tgz", "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-1.0.2.tgz",
"integrity": "sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg==", "integrity": "sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=20.17" "node": ">=20.17"
@@ -418,6 +405,7 @@
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
"integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"mimic-function": "^5.0.0" "mimic-function": "^5.0.0"
@@ -433,6 +421,7 @@
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=8.6" "node": ">=8.6"
@@ -445,6 +434,7 @@
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
"integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
"dev": true,
"license": "MIT", "license": "MIT",
"bin": { "bin": {
"pidtree": "bin/pidtree.js" "pidtree": "bin/pidtree.js"
@@ -473,6 +463,7 @@
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
"integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"onetime": "^7.0.0", "onetime": "^7.0.0",
@@ -489,12 +480,14 @@
"version": "1.4.1", "version": "1.4.1",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
"integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
"dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/signal-exit": { "node_modules/signal-exit": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
"dev": true,
"license": "ISC", "license": "ISC",
"engines": { "engines": {
"node": ">=14" "node": ">=14"
@@ -507,6 +500,7 @@
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
"integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ansi-styles": "^6.0.0", "ansi-styles": "^6.0.0",
@@ -523,6 +517,7 @@
"version": "0.3.2", "version": "0.3.2",
"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
"integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
"dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">=0.6.19" "node": ">=0.6.19"
@@ -532,6 +527,7 @@
"version": "7.2.0", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
"integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"emoji-regex": "^10.3.0", "emoji-regex": "^10.3.0",
@@ -549,6 +545,7 @@
"version": "7.1.0", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ansi-regex": "^6.0.1" "ansi-regex": "^6.0.1"
@@ -564,6 +561,7 @@
"version": "5.0.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"is-number": "^7.0.0" "is-number": "^7.0.0"
@@ -576,6 +574,7 @@
"version": "9.0.0", "version": "9.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
"integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ansi-styles": "^6.2.1", "ansi-styles": "^6.2.1",
@@ -593,6 +592,7 @@
"version": "2.8.1", "version": "2.8.1",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
"integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==", "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
"dev": true,
"license": "ISC", "license": "ISC",
"bin": { "bin": {
"yaml": "bin.mjs" "yaml": "bin.mjs"