From b6572afbc0fd4b78b8551ab02fa7cd5609140f1b Mon Sep 17 00:00:00 2001
From: Kisechan <kisechan_@outlook.com>
Date: Thu, 6 Mar 2025 13:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8B=E9=93=BE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20GitHub=20=E6=97=A5=E5=8E=86=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E9=99=90=E5=88=B6=20RSS=20?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/links.yml          | 16 +----------
 src/components/NavBar.vue | 11 +++++---
 src/views/HomeView.vue    | 59 ++++++++++++++++++++++++++-------------
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/public/links.yml b/public/links.yml
index 42266b1..76be05d 100644
--- a/public/links.yml
+++ b/public/links.yml
@@ -3,18 +3,4 @@
     - avatar: "https://images.kisechan.space/icon.jpg"
       title: "Kisechan's Blog"
       description: "Kisechan 的博客"
-      url: "https://blog.kisechan.space"
-    - avatar: "https://example.com/avatar.png"
-      title: "个人博客"
-      description: "这是一个个人博客"
-      url: "https://example.com/personal-blog"
-- category: "友情链接"
-  links:
-    - avatar: "https://example.com/avatar.png"
-      title: "友情链接1"
-      description: "这是一个友情链接"
-      url: "https://example.com/friend-link-1"
-    - avatar: "https://example.com/avatar.png"
-      title: "友情链接2"
-      description: "这是一个友情链接"
-      url: "https://example.com/friend-link-2"
\ No newline at end of file
+      url: "https://blog.kisechan.space"
\ No newline at end of file
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 7dbe21f..abb5188 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -15,16 +15,19 @@
 </template>
 
 <script setup>
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
+
 // 打开外部链接
 const goToBlog = () => {
   window.open("https://blog.kisechan.space", "_blank");
 };
 
-// 打开内部链接（新标签页）
+// 打开内部链接（当前页面）
 const openLink = (path) => {
-  const fullUrl = "https://www.kisechan.space" + path; // 获取完整 URL
-  if (window.location.href === fullUrl) return; // 防止重复点击
-  window.open(fullUrl, "_blank");
+  console.log("Navigating to:", path); // 调试信息
+  router.push(path);
 };
 </script>
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 945192a..c5bd8e1 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -15,7 +15,6 @@
             <div class="github-calendar-container">
               <h3>My Github Contributions</h3>
               <div id="github-graph">
-                <p v-if="!isLoaded">Loading...</p>
               </div>
             </div>
             <hr />
@@ -116,55 +115,75 @@
 
 <script setup>
 import avatarUrl from "@/assets/avatar.png";
-import { onMounted } from "vue";
-import { ref } from "vue";
+import { ref, onMounted, onUnmounted } from "vue";
 
 const isLoaded = ref(false);
 const feedItems = ref([]);
-// 懒加载
+const githubCalendarInstance = ref(null); // 提升到组件作用域
+
 const loadGitHubCalendar = async () => {
+  await new Promise((resolve) => setTimeout(resolve, 100)); // 延迟 100ms
+  const calendarElement = document.getElementById("github-graph");
+  if (!calendarElement) {
+    console.error("Element #github-graph not found");
+    return;
+  }
+
   const GitHubCalendar = await import("github-calendar");
-  GitHubCalendar.default("#github-graph", "Kisechan", {
-    responsive: true, // 响应式设计
-    tooltips: true, // 显示提示信息
-    global_stats: false, // 显示全局统计信息
+  githubCalendarInstance.value = GitHubCalendar.default(calendarElement, "Kisechan", {
+    responsive: true,
+    tooltips: true,
+    global_stats: false,
   });
   isLoaded.value = true;
 };
 
-// 获取并解析 RSS Feed
+const cleanupGitHubCalendar = () => {
+  const calendarElement = document.getElementById("github-graph");
+  if (calendarElement) {
+    calendarElement.innerHTML = ""; // 清空日历内容
+  }
+  if (githubCalendarInstance.value) {
+    githubCalendarInstance.value = null; // 清理实例
+  }
+};
+
 const fetchRSSFeed = async () => {
-  const rssUrl = "https://blog.kisechan.space/atom.xml"; // 替换为你的 Atom Feed URL
+  const rssUrl = "https://blog.kisechan.space/atom.xml";
   try {
     const response = await fetch(rssUrl);
     const str = await response.text();
     const data = new window.DOMParser().parseFromString(str, "text/xml");
     const items = data.querySelectorAll("entry");
 
-    feedItems.value = Array.from(items).map(item => ({
-      title: item.querySelector("title").textContent,
-      link: item.querySelector("link").getAttribute("href"),
-      pubDate: item.querySelector("updated").textContent,
-      tags: Array.from(item.querySelectorAll("category")).map(
-        category => category.getAttribute("term")
-      ),
-    }));
+    feedItems.value = Array.from(items)
+      .map(item => ({
+        title: item.querySelector("title").textContent,
+        link: item.querySelector("link").getAttribute("href"),
+        pubDate: item.querySelector("updated").textContent,
+        tags: Array.from(item.querySelectorAll("category")).map(
+          category => category.getAttribute("term")
+        ),
+      }))
+      .slice(0, 6); // 只取前 6 篇文章
   } catch (error) {
     console.error("Error fetching RSS Feed:", error);
   }
 };
 
-// 格式化日期
 const formatDate = (dateString) => {
   const date = new Date(dateString);
   return date.toLocaleDateString();
 };
 
-// 在组件挂载后懒加载
 onMounted(() => {
   loadGitHubCalendar();
   fetchRSSFeed();
 });
+
+onUnmounted(() => {
+  cleanupGitHubCalendar();
+});
 </script>
 
 <style scoped>