minearm-website 0.2.0 → 0.2.1

package/src/components/client/searchCore.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted, Ref } from "vue";
-import Fuse from "fuse.js";
+import { ref, computed, onMounted } from 'vue';
+import Fuse from 'fuse.js';
 
 interface Result {
   content: string;
@@ -8,70 +8,192 @@ interface Result {
   url: string;
 }
 
-const fuseOptions = {
+const fuseOptions: Fuse.IFuseOptions<Result> = {
   isCaseSensitive: false,
   includeScore: true,
   includeMatches: true,
   minMatchCharLength: 1,
   shouldSort: true,
   findAllMatches: false,
-  // location: 0,
-  // distance: 100,
-  // ignoreLocation: false,
   threshold: 0.6,
   useExtendedSearch: false,
   ignoreFieldNorm: false,
   fieldNormWeight: 1,
-  keys: ["title", "content"],
+  keys: ['title', 'content'],
 };
 
-const keywords = ref("");
-const result: Ref<Fuse.FuseResult<Result>[][]> = ref([]);
-const pageNumber: Ref<number> = ref(1);
-const pageSize: Ref<number> = ref(0);
+const keywords = ref<string>(''); // 搜索关键词
+const result = ref<Fuse.FuseResult<Result>[]>([]); // 搜索结果
+const pageNumber = ref<number>(1); // 当前页码
+const pageSize = ref<number>(10); // 每页显示结果数量
+const totalPages = computed(() => Math.ceil(result.value.length / pageSize.value)); // 总页数
 
-const list = await hsu.getJson("/scripts/searchData.json");
-const fuse = new Fuse(list, fuseOptions);
-const search = () => {
-  let tmp: Fuse.FuseResult<Result>[] = fuse.search(keywords.value);
-  result.value = [];
+let list: Result[] = []; // 原始数据列表
 
-  for (let i = 0; i < tmp.length; i += 10) {
-    result.value.push(tmp.slice(i, i + 10));
+// 异步获取数据
+onMounted(async () => {
+  try {
+    const response = await fetch('/scripts/searchData.json');
+    if (!response.ok) {
+      throw new Error('Failed to fetch searchData.json');
+    }
+    list = await response.json();
+    // 初始化搜索，显示所有结果
+    search('', 1);
+  } catch (error) {
+    console.error('Error fetching searchData.json:', error);
   }
+});
 
-  pageNumber.value = 1;
+// 搜索函数
+const search = (query: string, page: number = 1) => {
+  if (!query.trim()) {
+    result.value = [];
+    pageNumber.value = 1;
+    return;
+  }
+
+  const fuse = new Fuse(list, fuseOptions);
+  const tmp = fuse.search(query);
+
+  // 计算总页数
+  totalPages.value = Math.ceil(tmp.length / pageSize.value);
+
+  // 分页逻辑
+  const start = (page - 1) * pageSize.value;
+  const end = start + pageSize.value;
+  result.value = tmp.slice(start, end);
 
-  pageSize.value = result.value.length;
+  // 设置当前页码
+  pageNumber.value = page;
 };
+
+// 计算属性：当前页的结果
+const currentPageResults = computed(() => {
+  const start = (pageNumber.value - 1) * pageSize.value;
+  const end = start + pageSize.value;
+  return result.value.slice(start, end);
+});
 </script>
 
 <template>
-  <input
-    class="search-input"
-    type="text"
-    placeholder=""
-    v-model="keywords"
-    @keydown.enter="search"
-  />
-  <div class="search-results">
-    <a
-      v-if="result.length"
-      v-for="i in 10"
-      class="search-result"
-      :href="result[pageNumber - 1][i - 1]?.item.url"
-      >{{ result[pageNumber - 1][i - 1]?.item.title }}</a
-    >
-  </div>
-  <div class="search-pagination">
-    <span
-      v-for="num in pageSize"
-      :class="{ 'search-pagenumber': true, active: pageNumber == num }"
-      @click="pageNumber = num"
-    >
-      <span>{{ num }}</span>
-    </span>
+  <div class="search-container">
+    <!-- 输入框，绑定回车键事件 -->
+    <input
+      class="search-input"
+      type="text"
+      placeholder="请输入搜索关键词..."
+      v-model="keywords"
+      @keydown.enter="search(keywords, pageNumber)"
+    />
+    <!-- 搜索结果列表 -->
+    <div class="search-results" v-if="currentPageResults.length">
+      <a
+        v-for="(item, index) in currentPageResults"
+        :key="index"
+        class="search-result"
+        :href="item.item.url"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        {{ item.item.title }}
+      </a>
+    </div>
+
+    <!-- 分页控件 -->
+    <div class="search-pagination" v-if="totalPages > 1">
+      <span
+        v-for="num in Array.from({ length: totalPages }, (_, i) => i + 1)"
+        :key="num"
+        :class="{ 'search-pagenumber': true, active: pageNumber === num }"
+        @click="pageNumber = num"
+      >
+        {{ num }}
+      </span>
+    </div>
+    <p v-if="currentPageResults.length === 0 && keywords" class="no-results">
+      没有找到相关结果。
+    </p>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.search-container {
+  max-width: 800px;
+  margin: 50px auto;
+  padding: 0 20px;
+  box-sizing: border-box;
+}
+
+.search-input {
+  width: 100%;
+  padding: 12px 20px;
+  font-size: 18px;
+  border: 2px solid var(--border-color);
+  border-radius: 25px;
+  outline: none;
+  transition: border-color 0.3s ease;
+}
+
+.search-input:focus {
+  border-color: var(--button-bg);
+  box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
+}
+
+.search-results {
+  margin-top: 20px;
+}
+
+.search-result {
+  display: block;
+  padding: 15px 0;
+  border-bottom: 1px solid var(--border-color);
+  transition: background-color 0.3s ease;
+}
+
+.search-result a {
+  color: var(--text-color);
+  text-decoration: none;
+  font-size: 18px;
+}
+
+.search-result a:hover {
+  color: var(--button-bg);
+}
+
+.search-pagination {
+  margin-top: 30px;
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+}
+
+.search-pagenumber {
+  padding: 10px 15px;
+  border: 2px solid var(--button-bg);
+  border-radius: 25px;
+  background-color: var(--background-color);
+  color: var(--button-text);
+  cursor: pointer;
+  transition: background-color 0.3s ease, color 0.3s ease, transform 0.3s ease;
+}
+
+.search-pagenumber:hover {
+  background-color: var(--button-bg);
+  color: var(--background-color);
+  transform: scale(1.05);
+}
+
+.search-pagenumber.active {
+  background-color: var(--button-bg);
+  color: var(--background-color);
+  border-color: var(--button-bg);
+  font-weight: 700;
+}
+
+.no-results {
+  margin-top: 20px;
+  color: var(--text-color);
+  font-style: italic;
+}
+</style>

package/src/components/icons/cube.astro

@@ -1,6 +1,5 @@
 ---
 ---
-
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"
   ><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
   <path

package/src/layouts/BaseLayout.astro

@@ -15,7 +15,6 @@ interface Props {
   class?: string;
   description?: string;
 }
-
 const { class: pageClass, description } = Astro.props;
 ---
 

package/src/layouts/PostLayout.astro

@@ -4,6 +4,7 @@ import BaseLayout from "@layout/BaseLayout.astro";
 import BlogToc from "@comp/aside/blogToc.astro";
 import Aside from "@comp/aside/aside.astro";
 import PostComment from "@comp/postComment.astro";
+import { ViewTransitions } from 'astro:transitions';
 import type { CollectionEntry } from "astro:content";
 import { ThemeConfig } from "@src/theme_config";
 
@@ -58,3 +59,4 @@ const { toc, useComments = true, postData, desc } = Astro.props;
     </script>
   </Fragment>
 </BaseLayout>
+<ViewTransitions />

package/src/layouts/TagsLayout.astro

@@ -42,3 +42,4 @@ const { tags, baseurl, activeTag, page } = Astro.props;
     }
   </Fragment>
 </HomeLayout>
+<ViewTransitions />

package/src/pages/404.md

@@ -6,4 +6,6 @@ heroColor: "#007aff"
 useComments: false
 useToc: false
 ---
+# 404 Not Found
+
 # 404了，非常抱歉，你要找的页面被作者吃了[doge]

package/src/pages/about/index.md

@@ -7,11 +7,11 @@ useComments: true
 useToc: true
 ---
 # Minearm & Website
-# 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
-最新的正式版是0.2.0
+# 本主题是从[HsuBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
+最新的正式版是0.2.1
 最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.1.10
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.5.4
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)

package/src/pages/blog/[...slug].astro

@@ -1,5 +1,5 @@
 ---
-import { CollectionEntry, getCollection } from "astro:content";
+import { type CollectionEntry, getCollection } from "astro:content";
 import PostLayout from "@src/layouts/PostLayout.astro";
 import HeroWave from "@comp/header/heroWave.astro";
 import GetIcon from "@comp/icons/getIcon.astro";
@@ -66,3 +66,12 @@ const { Content, remarkPluginFrontmatter } = await post.render();
   </HeroWave>
   <Content />
 </PostLayout>
+<article>
+  <!-- 文章正文 -->
+  <h1>{post.title}</h1>
+  <div>{post.content}</div>
+
+  <!-- 评论区域 -->
+  <div class="comments-section">
+  </div>
+</article>

package/src/pages/friends/index.md

@@ -2,23 +2,25 @@
 layout: ../../layouts/DefaultMdLayout.astro
 title: Minearm盟友
 description: ""
-heroColor: "#007aff"
+heroColor: "#00FF99"
 useComments: true
 useToc: true
 ---
-
 ## Minearm-RPM的盟友
 
 谁想成为盟友的来[这里](https://github.com/Minearm-RPM/minearm/issues/3)申请一下
 
-:::links[The Autor of Minearm-RPM & Website]
-
-::link[纳西妲]{logo="/nahida.png" desc="我会为世界上所有的美好而战" link="https://nahida.im"}
+<h2>或者发评论</h2>
 
-::link[B站破击]{logo="/pojipao.avif" desc="全互联网最中二的傻逼" link="https://space.bilibili.com/1598534390"}
+- 格式
 
-::link[এ՞情绪ᮨ℘]{logo="/13.png" desc="明天要被历史肘击😭" link="mailto:2939765322@qq.com"}
+```yaml
+- name: 名称
+  link: 跳转链接
+  avatar: 头像链接
+  descr: 描述
+```
 
-::link[三的根号]{logo="/3.png" desc="√3每日发疯" link="https://space.bilibili.com/1832902560"}
+:::links[The Autor of Minearm-RPM & Website]
 
-::link[智宇]{logo="https://zhiyuhub.top/upload/be2bb1bb-8d91-4e9b-8b4d-00d4c45774ae.png" desc="root@kali:/#" link="https://zhiyuhub.top/"}
+::link[Minearm-RPM]{logo="/avatar.avif" desc="localhost@root #~" link="https://www.minearm.org/"}

package/src/styles/blog/code.scss

@@ -18,7 +18,7 @@
   --astro-code-token-string-expression: #5ccfe6;
 
   --astro-code-token-punctuation: #cccac2;
-
+//I love kunkun!
   --astro-code-token-link: #87d96c;
 
   --astro-code-color-ansi-black: #000000;

package/src/theme_config.ts

@@ -1,8 +1,8 @@
 import { Icons } from "@comp/icons/icon";
 import { SiteConfig } from "./site_config";
 // import { faStar } from "@fortawesome/free-solid-svg-icons";
-// import { library, icon } from "@fortawesome/fontawesome-svg-core";
-//import Code from '~/components/code.astro';
+//import { library, icon } from "@fortawesome/fontawesome-svg-core";
+// import Code from '~/components/code.astro';
 // library.add(faStar);
 // const starIcon = icon({ prefix: "fas", iconName: "star" });
 
@@ -17,7 +17,7 @@ export const ThemeConfig: Configs = {
     localSearch: {
       enable: true,
       comment: "你可以使用类似 unix 的格式：[扩展搜索](/blog/Search-help/)",
-      hits: ["[扩展搜索](/blogSearch-help//)", "[Help](/blog/Search-help/)"],
+      hits: ["[扩展搜索](/blog/Search-help/)", "[Help](/blog/Search-help/)"],
     },
     backgroundBubbles: 20,
   },
@@ -65,7 +65,7 @@ export const ThemeConfig: Configs = {
             name: "MC",
             customClass: "MC",
             icon: "local:solid.paper-plane",
-            link: "https://game.minearm.org",
+            link: "https://minecraft.minearm.org",
           },
         ],
       },
@@ -118,7 +118,7 @@ export const ThemeConfig: Configs = {
     announcement: {
       headline: "看公告啦！",
       content:
-        "欢迎各位[找茬](https://github.com/Minearm-RPM/minearm-rpm-arch/issues)~",
+        "欢迎各位[找茬](https://github.com/Minearm-RPM/Minearm/issues)~",
     },
     siteInfo: {
       busuanzi: false,
@@ -137,8 +137,6 @@ export const ThemeConfig: Configs = {
   footer: {
     text: "Design & Build with ❤ by Minearm-RPM",
     copyright: `© 2023-${today.getFullYear()} By [Minearm-RPM](/about)`,
-    // 也可以使用 {{}} 包裹函数体，并返回替换值
-    // You can also use {{}} to wrap the function body and return the replacement value.
     // copyright: `© 2023-{{const today = new Date();return today.getFullYear();}} By [Minearm-RPM](/about)`,
   },
   homePage: {
@@ -168,11 +166,11 @@ export const ThemeConfig: Configs = {
     //  envId: "",
     //   lang: "zh-CN",
     // },
-  	 type: "waline",
-  	 options: {
-	   serverURL: "https://youserver",
-     },
-    //type: true,
-    //options: null,
+  	type: "waline",
+  	options: {
+	  serverURL: "https://comments.example.com/",
+    },
+    // type: false,
+    // options: null,
   },
 };

package/tsconfig.json

@@ -1,32 +1,22 @@
 {
-  "ts-node": {
-    "esm": true
-  },
   "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "baseUrl": ".",
     "strictNullChecks": true,
     "jsx": "preserve",
     "paths": {
-      "@comp/*": [
-        "src/components/*"
-      ],
-      "@ass/*": [
-        "src/assets/*"
-      ],
-      "@style/*": [
-        "src/styles/*"
-      ],
-      "@src/*": [
-        "src/*"
-      ],
-      "@utils/*": [
-        "src/utils/*"
-      ],
-      "@layout/*": [
-        "src/layouts/*"
-      ]
-    }
-  }
+      "@comp/*": ["src/components/*"],
+      "@ass/*": ["src/assets/*"],
+      "@style/*": ["src/styles/*"],
+      "@src/*": ["src/*"],
+      "@utils/*": ["src/utils/*"],
+      "@layout/*": ["src/layouts/*"]
+    },
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["src"]
 }

package/.hintrc

@@ -1,16 +0,0 @@
-{
-  "extends": [
-    "development"
-  ],
-  "hints": {
-    "compat-api/css": [
-      "default",
-      {
-        "ignore": [
-          "backdrop-filter",
-          "user-select"
-        ]
-      }
-    ]
-  }
-}

package/src/content/blog/Mail.md

@@ -1,15 +0,0 @@
----
-title: Mail
-description: ''
-pubDate: 2024-09-30
-heroColor: ''
-abbrlink: mail
-cover: "/mail.png"
-coverAlt: "mail"
-tags: 
-    - 'Tutorial'
-category: 'Mail'
----
-
-## Mali
-minearm@minearm.org

package/src/layouts/c.astro

@@ -1,42 +0,0 @@
----
-import HeroWave from "@comp/header/heroWave.astro";
-import PostLayout from "@src/layouts/h.astro";
-import { ThemeConfig } from "@src/theme_config";
-interface FrontMatter {
-  title: string;
-  description?: string;
-  heroColor?: string;
-  useComments?: boolean;
-  useToc?: boolean;
-  toc?: {
-    level: string;
-    id: string;
-    value: string;
-  }[];
-  file: string;
-  url: string;
-}
-
-interface Props {
-  frontmatter: FrontMatter;
-}
-
-const { frontmatter } = Astro.props;
----
-
-<PostLayout
-  useComments={frontmatter.useComments && ThemeConfig.comments.type !== false}
-  toc={frontmatter.useToc ? frontmatter.toc : undefined}
-  desc={frontmatter.description}
->
-  <HeroWave
-    class="post-header"
-    slot="post-hero"
-    heroColor={frontmatter.heroColor}
-  >
-    <div class="post-info">
-      <h1 class="post-title">{frontmatter.title}</h1>
-    </div>
-  </HeroWave>
-  <slot />
-</PostLayout>

package/src/layouts/h.astro

@@ -1,60 +0,0 @@
----
-import "@style/blog/index.scss";
-import BaseLayout from "@layout/BaseLayout.astro";
-import BlogToc from "@comp/aside/blogToc.astro";
-import Aside from "@comp/aside/aside.astro";
-import PostComment from "@comp/postComment.astro";
-import type { CollectionEntry } from "astro:content";
-import { ThemeConfig } from "@src/theme_config";
-
-interface Props {
-  postData?: CollectionEntry<"blog">["data"];
-  toc?: {
-    level: string;
-    id: string;
-    value: string;
-  }[];
-  useComments?: boolean;
-  desc?: string;
-}
-
-const { toc, useComments = true, postData, desc } = Astro.props;
----
-
-<BaseLayout class="post-page" description={postData?.description || desc}>
-  <Fragment slot="head-end">
-    <script
-      is:inline
-      async
-      src="https://cdn.staticfile.org/fancyapps-ui/5.0.20/fancybox/fancybox.umd.min.js"
-    ></script>
-    <link
-      rel="stylesheet"
-      href="https://cdn.staticfile.org/fancyapps-ui/5.0.20/fancybox/fancybox.min.css"
-    />
-  </Fragment>
-  <slot name="post-hero" />
-  <article class="post-container">
-    <main class="post-main">
-      <slot />
-      {useComments && <PostComment />}
-    </main>
-    <Aside
-      comps={ThemeConfig.postPage.aside.comps}
-      stickyComps={ThemeConfig.postPage.aside.stickyComps}
-      class="post-aside"
-    >
-      {toc && <BlogToc toc={toc} />}
-    </Aside>
-  </article>
-  <Fragment slot="body-end">
-    <script is:inline>
-      Fancybox.bind("[data-fancybox]", {
-        closeButton: true,
-        Thumbs: {
-          type: "modern",
-        },
-      });
-    </script>
-  </Fragment>
-</BaseLayout>