feat: add poll post type

fix: UI部份美化

.github/ISSUE_TEMPLATE/新功能建议.md

@@ -0,0 +1,20 @@
+---
+name: 新功能建议
+about: 请为该项目提出一个想法
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**你的功能请求是否与某个问题相关？请描述。**
+请清晰、简洁地说明问题。例如：“我经常因为……而感到困扰。”
+
+**你期望的解决方案**
+请清晰、简洁地描述你希望发生的事情/功能如何工作。
+
+**你考虑过的替代方案**
+请清晰、简洁地说明你已考虑过的其他解决方案或功能。
+
+**其他上下文**
+在此添加与功能请求相关的其他信息或截图。

.github/ISSUE_TEMPLATE/错误-bug报告.md

@@ -0,0 +1,41 @@
+---
+name: 错误/Bug报告
+about: 创建报告以帮助我们改进
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**描述 Bug**
+对该 Bug 进行清晰简明的描述。
+
+**复现步骤**
+复现该问题的步骤：
+
+1. 进入 '...'
+2. 点击 '...'
+3. 下拉到 '...'
+4. 看到错误
+
+**预期行为**
+清晰简明地描述你期望发生的情况。
+
+**截图**
+如果适用，请添加截图以帮助解释问题。
+
+**桌面端（请完成以下信息）：**
+
+* 操作系统：\[例如 iOS]
+* 浏览器：\[例如 Chrome、Safari]
+* 版本：\[例如 22]
+
+**移动端（请完成以下信息）：**
+
+* 设备：\[例如 iPhone6]
+* 操作系统：\[例如 iOS8.1]
+* 浏览器：\[例如 系统自带浏览器、Safari]
+* 版本：\[例如 22]
+
+**附加上下文**
+在此添加与问题相关的其他上下文信息。

CODE_OF_CONDUCT.md

@@ -0,0 +1,32 @@
+# OpenIsle Code of Conduct
+
+Like the technical community as a whole, the OpenIsle team and community is made up of a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people.
+
+Diversity is one of our huge strengths, but it can also lead to communication issues and unhappiness. To that end, we have a few ground rules that we ask people to adhere to. This code applies equally to founders, mentors and those seeking help and guidance.
+
+This isn’t an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it’s intended - a guide to make it easier to enrich all of us and the technical communities in which we participate.
+
+This code of conduct applies to all spaces managed by the OpenIsle project or . This includes IRC, the mailing lists, the issue tracker, DSF events, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.
+
+If you believe someone is violating the code of conduct, we ask that you report it by emailing [](mailto:). For more details please see our 
+
+- **Be friendly and patient.**
+- **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
+- **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
+- **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the OpenIsle community should be respectful when dealing with other members as well as with people outside the OpenIsle community.
+- **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to: 
+ - Violent threats or language directed against another person.
+ - Discriminatory jokes and language.
+ - Posting sexually explicit or violent material.
+ - Posting (or threatening to post) other people's personally identifying information ("doxing").
+ - Personal insults, especially those using racist or sexist terms.
+ - Unwelcome sexual attention.
+ - Advocating for, or encouraging, any of the above behavior.
+ - Repeated harassment of others. In general, if someone asks you to stop, then stop.
+- **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and OpenIsle is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of OpenIsle comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
+
+Original text courtesy of the [Speak Up! project](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html).
+
+## Questions?
+
+If you have questions, please see . If that doesn't answer your questions, feel free to [contact us](mailto:).

CONTRIBUTING.md

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

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Tim
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,9 +1,9 @@
 <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>
-  <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>
 
 ## 💡 简介

backend/src/main/java/com/openisle/controller/PostController.java

@@ -3,6 +3,7 @@ package com.openisle.controller;
 import com.openisle.dto.PostDetailDto;
 import com.openisle.dto.PostRequest;
 import com.openisle.dto.PostSummaryDto;
+import com.openisle.dto.PollDto;
 import com.openisle.mapper.PostMapper;
 import com.openisle.model.Post;
 import com.openisle.service.*;
@@ -42,7 +43,8 @@ public class PostController {
                 req.getTitle(), req.getContent(), req.getTagIds(),
                 req.getType(), req.getPrizeDescription(), req.getPrizeIcon(),
                 req.getPrizeCount(), req.getPointCost(),
-                req.getStartTime(), req.getEndTime());
+                req.getStartTime(), req.getEndTime(),
+                req.getQuestion(), req.getOptions());
         draftService.deleteDraft(auth.getName());
         PostDetailDto dto = postMapper.toDetailDto(post, auth.getName());
         dto.setReward(levelService.awardForPost(auth.getName()));
@@ -86,6 +88,17 @@ public class PostController {
         return ResponseEntity.ok().build();
     }
 
+    @GetMapping("/{id}/poll/progress")
+    public ResponseEntity<PollDto> pollProgress(@PathVariable Long id) {
+        return ResponseEntity.ok(postMapper.toSummaryDto(postService.getPoll(id)).getPoll());
+    }
+
+    @PostMapping("/{id}/poll/vote")
+    public ResponseEntity<Void> vote(@PathVariable Long id, @RequestParam("option") int option, Authentication auth) {
+        postService.votePoll(id, auth.getName(), option);
+        return ResponseEntity.ok().build();
+    }
+
     @GetMapping
     public List<PostSummaryDto> listPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
                                    @RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,

backend/src/main/java/com/openisle/controller/ReactionController.java

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

backend/src/main/java/com/openisle/dto/PollDto.java

@@ -0,0 +1,16 @@
+package com.openisle.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class PollDto {
+    private String question;
+    private List<String> options;
+    private Map<Integer, Integer> votes;
+    private LocalDateTime endTime;
+    private List<AuthorDto> participants;
+}

backend/src/main/java/com/openisle/dto/PostRequest.java

@@ -26,5 +26,8 @@ public class PostRequest {
     private Integer pointCost;
     private LocalDateTime startTime;
     private LocalDateTime endTime;
+    // fields for poll posts
+    private String question;
+    private List<String> options;
 }
 

backend/src/main/java/com/openisle/dto/PostSummaryDto.java

@@ -31,6 +31,7 @@ public class PostSummaryDto {
     private int pointReward;
     private PostType type;
     private LotteryDto lottery;
+    private PollDto poll;
     private boolean rssExcluded;
     private boolean closed;
 }

backend/src/main/java/com/openisle/mapper/PostMapper.java

@@ -5,9 +5,11 @@ import com.openisle.dto.PostDetailDto;
 import com.openisle.dto.PostSummaryDto;
 import com.openisle.dto.ReactionDto;
 import com.openisle.dto.LotteryDto;
+import com.openisle.dto.PollDto;
 import com.openisle.model.CommentSort;
 import com.openisle.model.Post;
 import com.openisle.model.LotteryPost;
+import com.openisle.model.PollPost;
 import com.openisle.model.User;
 import com.openisle.service.CommentService;
 import com.openisle.service.ReactionService;
@@ -93,5 +95,15 @@ public class PostMapper {
             l.setWinners(lp.getWinners().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
             dto.setLottery(l);
         }
+
+        if (post instanceof PollPost pp) {
+            PollDto p = new PollDto();
+            p.setQuestion(pp.getQuestion());
+            p.setOptions(pp.getOptions());
+            p.setVotes(pp.getVotes());
+            p.setEndTime(pp.getEndTime());
+            p.setParticipants(pp.getParticipants().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
+            dto.setPoll(p);
+        }
     }
 }

backend/src/main/java/com/openisle/model/Draft.java

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

backend/src/main/java/com/openisle/model/PointHistoryType.java

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

backend/src/main/java/com/openisle/model/PollPost.java

@@ -0,0 +1,41 @@
+package com.openisle.model;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Entity
+@Table(name = "poll_posts")
+@Getter
+@Setter
+@NoArgsConstructor
+@PrimaryKeyJoinColumn(name = "post_id")
+public class PollPost extends Post {
+
+    @Column(nullable = false)
+    private String question;
+
+    @ElementCollection
+    @CollectionTable(name = "poll_post_options", joinColumns = @JoinColumn(name = "post_id"))
+    @Column(name = "option_text")
+    private List<String> options = new ArrayList<>();
+
+    @ElementCollection
+    @CollectionTable(name = "poll_post_votes", joinColumns = @JoinColumn(name = "post_id"))
+    @MapKeyColumn(name = "option_index")
+    @Column(name = "vote_count")
+    private Map<Integer, Integer> votes = new HashMap<>();
+
+    @ManyToMany
+    @JoinTable(name = "poll_participants",
+            joinColumns = @JoinColumn(name = "post_id"),
+            inverseJoinColumns = @JoinColumn(name = "user_id"))
+    private Set<User> participants = new HashSet<>();
+
+    @Column
+    private LocalDateTime endTime;
+}

backend/src/main/java/com/openisle/model/Post.java

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

backend/src/main/java/com/openisle/model/PostType.java

@@ -2,5 +2,6 @@ package com.openisle.model;
 
 public enum PostType {
     NORMAL,
-    LOTTERY
+    LOTTERY,
+    POLL
 }

backend/src/main/java/com/openisle/repository/NotificationRepository.java

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

backend/src/main/java/com/openisle/repository/PollPostRepository.java

@@ -0,0 +1,7 @@
+package com.openisle.repository;
+
+import com.openisle.model.PollPost;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PollPostRepository extends JpaRepository<PollPost, Long> {
+}

backend/src/main/java/com/openisle/service/NotificationService.java

@@ -114,6 +114,14 @@ public class NotificationService {
         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.
      * Old register request notifications from the same applicant are removed first.

backend/src/main/java/com/openisle/service/PointService.java

@@ -150,6 +150,16 @@ public class PointService {
         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) {
         // 根据帖子id找到评论者
@@ -169,6 +179,17 @@ public class PointService {
         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) {
         User user = userRepository.findByUsername(userName).orElseThrow();
         if (pointHistoryRepository.countByUser(user) == 0) {

backend/src/main/java/com/openisle/service/PostService.java

@@ -9,8 +9,10 @@ import com.openisle.model.Category;
 import com.openisle.model.Comment;
 import com.openisle.model.NotificationType;
 import com.openisle.model.LotteryPost;
+import com.openisle.model.PollPost;
 import com.openisle.repository.PostRepository;
 import com.openisle.repository.LotteryPostRepository;
+import com.openisle.repository.PollPostRepository;
 import com.openisle.repository.UserRepository;
 import com.openisle.repository.CategoryRepository;
 import com.openisle.repository.TagRepository;
@@ -54,6 +56,7 @@ public class PostService {
     private final CategoryRepository categoryRepository;
     private final TagRepository tagRepository;
     private final LotteryPostRepository lotteryPostRepository;
+    private final PollPostRepository pollPostRepository;
     private PublishMode publishMode;
     private final NotificationService notificationService;
     private final SubscriptionService subscriptionService;
@@ -78,6 +81,7 @@ public class PostService {
                        CategoryRepository categoryRepository,
                        TagRepository tagRepository,
                        LotteryPostRepository lotteryPostRepository,
+                       PollPostRepository pollPostRepository,
                        NotificationService notificationService,
                        SubscriptionService subscriptionService,
                        CommentService commentService,
@@ -97,6 +101,7 @@ public class PostService {
         this.categoryRepository = categoryRepository;
         this.tagRepository = tagRepository;
         this.lotteryPostRepository = lotteryPostRepository;
+        this.pollPostRepository = pollPostRepository;
         this.notificationService = notificationService;
         this.subscriptionService = subscriptionService;
         this.commentService = commentService;
@@ -166,7 +171,9 @@ public class PostService {
                            Integer prizeCount,
                            Integer pointCost,
                            LocalDateTime startTime,
-                           LocalDateTime endTime) {
+                           LocalDateTime endTime,
+                           String question,
+                           java.util.List<String> options) {
         long recent = postRepository.countByAuthorAfter(username,
                 java.time.LocalDateTime.now().minusMinutes(5));
         if (recent >= 1) {
@@ -200,6 +207,15 @@ public class PostService {
             lp.setStartTime(startTime);
             lp.setEndTime(endTime);
             post = lp;
+        } else if (actualType == PostType.POLL) {
+            if (options == null || options.size() < 2) {
+                throw new IllegalArgumentException("At least two options required");
+            }
+            PollPost pp = new PollPost();
+            pp.setQuestion(question);
+            pp.setOptions(options);
+            pp.setEndTime(endTime);
+            post = pp;
         } else {
             post = new Post();
         }
@@ -212,6 +228,8 @@ public class PostService {
         post.setStatus(publishMode == PublishMode.REVIEW ? PostStatus.PENDING : PostStatus.PUBLISHED);
         if (post instanceof LotteryPost) {
             post = lotteryPostRepository.save((LotteryPost) post);
+        } else if (post instanceof PollPost) {
+            post = pollPostRepository.save((PollPost) post);
         } else {
             post = postRepository.save(post);
         }
@@ -261,6 +279,31 @@ public class PostService {
         }
     }
 
+    public PollPost getPoll(Long postId) {
+        return pollPostRepository.findById(postId)
+                .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
+    }
+
+    @Transactional
+    public PollPost votePoll(Long postId, String username, int optionIndex) {
+        PollPost post = pollPostRepository.findById(postId)
+                .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
+        if (post.getEndTime() != null && post.getEndTime().isBefore(LocalDateTime.now())) {
+            throw new IllegalStateException("Poll has ended");
+        }
+        User user = userRepository.findByUsername(username)
+                .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
+        if (post.getParticipants().contains(user)) {
+            throw new IllegalArgumentException("User already voted");
+        }
+        if (optionIndex < 0 || optionIndex >= post.getOptions().size()) {
+            throw new IllegalArgumentException("Invalid option");
+        }
+        post.getParticipants().add(user);
+        post.getVotes().merge(optionIndex, 1, Integer::sum);
+        return pollPostRepository.save(post);
+    }
+
     @Transactional
     public void finalizeLottery(Long postId) {
         log.info("start to finalizeLottery for {}", postId);

backend/src/main/java/com/openisle/service/ReactionService.java

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

frontend_nuxt/app.vue

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

frontend_nuxt/assets/global.css

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

frontend_nuxt/components/AvatarCropper.vue

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

frontend_nuxt/components/CommentItem.vue

@@ -23,9 +23,13 @@
             >{{ getMedalTitle(comment.medal) }}</NuxtLink
           >
           <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>
-            <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>
           <div class="post-time">{{ comment.time }}</div>
         </div>
@@ -250,6 +254,7 @@ const submitReply = async (parentUserName, text, clear) => {
         medal: data.author.displayMedal,
         text: data.content,
         parentUserName: parentUserName,
+        parentUserAvatar: props.comment.avatar,
         reactions: [],
         reply: (data.replies || []).map((r) => ({
           id: r.id,
@@ -376,7 +381,22 @@ const handleContentClick = (e) => {
   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 {
+  color: var(--primary-color);
   margin-right: 10px;
   margin-left: 10px;
   opacity: 0.5;

frontend_nuxt/components/HeaderComponent.vue

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

frontend_nuxt/components/MenuComponent.vue

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

frontend_nuxt/components/MessageFloatWindow.vue

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

frontend_nuxt/package.json

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

frontend_nuxt/pages/index.vue

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

frontend_nuxt/pages/message-box/[id].vue

@@ -113,17 +113,23 @@ const error = ref(null)
 const conversationId = route.params.id
 const currentUser = ref(null)
 const messagesListEl = ref(null)
-let lastMessageEl = null
 const currentPage = ref(0)
 const totalPages = ref(0)
 const loadingMore = ref(false)
-let scrollInterval = null
 const conversationName = ref('')
 const isChannel = ref(false)
 const isFloatMode = computed(() => route.query.float !== undefined)
 const floatRoute = useState('messageFloatRoute')
 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 otherParticipant = computed(() => {
@@ -133,20 +139,37 @@ const otherParticipant = computed(() => {
   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) {
   replyTo.value = message
 }
 
-// No changes needed here, as renderMarkdown is now imported.
-// The old function is removed.
+/** 改造：滚动函数 —— smooth & instant */
+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) {
   if (page === 0) {
@@ -181,7 +204,6 @@ async function fetchMessages(page = 0) {
       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) => ({
       ...item,
       src: item.sender.avatar,
@@ -202,12 +224,16 @@ async function fetchMessages(page = 0) {
     currentPage.value = pageData.number
     totalPages.value = pageData.totalPages
 
-    // Scrolling is now fully handled by the watcher
     await nextTick()
     if (page > 0 && list) {
+      // 加载更多：保持原视口位置
       const newScrollHeight = list.scrollHeight
       list.scrollTop = newScrollHeight - oldScrollHeight
+    } else if (page === 0) {
+      // 首次加载：定位到底部（不用动画，避免“闪动感”）
+      scrollToBottomInstant()
     }
+    updateNearBottom()
   } catch (e) {
     error.value = e.message
     toast.error(e.message)
@@ -272,9 +298,10 @@ async function sendMessage(content, clearInput) {
     })
     clearInput()
     replyTo.value = null
-    setTimeout(() => {
-      scrollToBottom()
-    }, 100)
+
+    await nextTick()
+    // 仅“发送消息成功后”才平滑滚动到底部
+    scrollToBottomSmooth()
   } catch (e) {
     toast.error(e.message)
   } finally {
@@ -290,7 +317,6 @@ async function markConversationAsRead() {
       method: 'POST',
       headers: { Authorization: `Bearer ${token}` },
     })
-    // After marking as read, refresh the global unread count
     refreshGlobalUnreadCount()
     refreshChannelUnread()
   } 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 () => {
+  // 监听列表滚动，实时感知是否接近底部
+  if (messagesListEl.value) {
+    messagesListEl.value.addEventListener('scroll', updateNearBottom, { passive: true })
+  }
+
   currentUser.value = await fetchCurrentUser()
   if (currentUser.value) {
     await fetchMessages(0)
@@ -345,9 +346,8 @@ onMounted(async () => {
 
 watch(isConnected, (newValue) => {
   if (newValue) {
-    // 等待一小段时间确保连接稳定
     setTimeout(() => {
-      subscription = subscribe(`/topic/conversation/${conversationId}`, (message) => {
+      subscription = subscribe(`/topic/conversation/${conversationId}`, async (message) => {
         // 避免重复显示当前用户发送的消息
         if (message.sender.id !== currentUser.value.id) {
           messages.value.push({
@@ -357,11 +357,10 @@ watch(isConnected, (newValue) => {
               openUser(message.sender.id)
             },
           })
-          // 实时收到消息时自动标记为已读
+          // 收到消息后只标记已读，不强制滚动（符合“非发送不拉底”）
           markConversationAsRead()
-          setTimeout(() => {
-            scrollToBottom()
-          }, 100)
+          await nextTick()
+          updateNearBottom()
         }
       })
     }, 500)
@@ -369,23 +368,12 @@ watch(isConnected, (newValue) => {
 })
 
 onActivated(async () => {
-  // This will be called every time the component is activated (navigated to)
+  // 返回页面时：刷新数据与已读，不做强制滚动，保持用户当前位置
   if (currentUser.value) {
     await fetchMessages(0)
     await markConversationAsRead()
-
-    // 確保滾動到底部 - 使用多重延遲策略
     await nextTick()
-    setTimeout(() => {
-      scrollToBottom()
-    }, 100)
-    setTimeout(() => {
-      scrollToBottom()
-    }, 300)
-    setTimeout(() => {
-      scrollToBottom()
-    }, 500)
-
+    updateNearBottom()
     if (!isConnected.value) {
       const token = getToken()
       if (token) connect(token)
@@ -406,6 +394,9 @@ onUnmounted(() => {
     subscription.unsubscribe()
     subscription = null
   }
+  if (messagesListEl.value) {
+    messagesListEl.value.removeEventListener('scroll', updateNearBottom)
+  }
   disconnect()
 })
 

frontend_nuxt/pages/points.vue

@@ -104,6 +104,31 @@
                     ，获得{{ 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">{{
@@ -227,6 +252,8 @@ const iconMap = {
   FEATURE: 'fas fa-star',
   LOTTERY_JOIN: '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 () => {

frontend_nuxt/pages/posts/[id]/index.vue

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

frontend_nuxt/utils/markdown.js

@@ -96,6 +96,9 @@ const md = new MarkdownIt({
   linkify: true,
   breaks: true,
   highlight: (str, lang) => {
+    if (lang === 'mermaid') {
+      return `<pre class="mermaid">${str}</pre>`
+    }
     let code = ''
     if (lang && hljs.getLanguage(lang)) {
       code = hljs.highlight(str, { language: lang, ignoreIllegals: true }).value
@@ -182,7 +185,7 @@ const SANITIZE_CFG = {
   allowedClasses: {
     a: ['mention-link'],
     img: ['emoji'],
-    pre: ['code-block'],
+    pre: ['code-block', 'mermaid'],
     div: ['line-numbers', 'line-number'],
     code: ['hljs', /^language-/],
     button: ['copy-code-btn'],
@@ -208,8 +211,15 @@ const SANITIZE_CFG = {
 /** @section 渲染 & 事件 */
 export function renderMarkdown(text) {
   const raw = md.render(text || '')
-  // ⭐ 核心：对最终 HTML 进行一次净化
-  return sanitizeHtml(raw, SANITIZE_CFG)
+  const html = 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) {

frontend_nuxt/utils/time.js

@@ -4,6 +4,17 @@ export default class TimeManager {
     if (Number.isNaN(date.getTime())) return ''
 
     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 startOfDate = new Date(date.getFullYear(), date.getMonth(), date.getDate())
     const diffDays = Math.floor((startOfToday - startOfDate) / 86400000)

package-lock.json

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