minearm-website 0.1.3 → 0.2.1

package/src/content/blog/it/Rust/345/237/272/346/234/254/350/257/255/346/263/225.md

@@ -23,6 +23,7 @@ category: 'Rust'
 这些基础概念将存在于每个 Rust 程序中，及早学习它们将使你以最快的速度学习 Rust 的使用。
 
 # 变量
+
 首先必须说明，Rust 是强类型语言，但具有自动判断变量类型的能力。这很容易让人与弱类型语言产生混淆。
 
 默认情况下，Rust 中的变量是不可变的，除非使用 mut 关键字声明为可变变量。
@@ -110,6 +111,7 @@ fn add(a: i32, b: i32) -> i32 {
 如果函数没有返回值，类型默认为 ()（即空元组）。
 
 **控制流**
+
 # if 表达式
 
 - 实例
@@ -121,6 +123,7 @@ if number < 5 {
     println!("大于等于 5");
 }
 ```
+
 # loop 循环
 
 loop 是 Rust 中的无限循环，可以使用 break 退出循环。
@@ -155,7 +158,9 @@ for number in 1..4 {
     println!("{}!", number);
 }
 ```
+
 # 所有权
+
 Rust 中的所有权是独特的内存管理机制，核心概念包括所有权 (ownership)、借用 (borrowing) 和引用 (reference)。
 
 所有权规则:
@@ -168,8 +173,11 @@ let s1 = String::from("hello");
 let s2 = s1; // s1 的所有权被转移给了 s2
 // println!("{}", s1); // 此处编译会报错，因为 s1 已不再拥有该值
 ```
+
 # 借用和引用
+
 借用允许引用数据而不获取所有权，通过 & 符号实现。
+
 ```rust
 fn main() {
     let s = String::from("hello");
@@ -181,6 +189,7 @@ fn calculate_length(s: &String) -> usize {
     s.len()
 }
 ```
+
 # 结构体
 
 结构体用于创建自定义类型，字段可以包含多种数据类型。
@@ -201,6 +210,7 @@ let user1 = User {
     active: true,
 };
 ```
+
 # 枚举
 
 枚举允许定义可能的几种数据类型中的一种。
@@ -215,7 +225,9 @@ enum IpAddrKind {
 let four = IpAddrKind::V4;
 let six = IpAddrKind::V6;
 ```
+
 # 模式匹配
+
 match 是 Rust 中强大的控制流工具，类似于 switch 语句。
 
 - 实例
@@ -236,6 +248,7 @@ fn value_in_cents(coin: Coin) -> u8 {
     }
 }
 ```
+
 # 错误处理
 
 Rust 有两种主要的错误处理方式：Result<T, E> 和 Option<T>。
@@ -282,6 +295,7 @@ fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
     }
 }
 ```
+
 # 重影
 
 重影的概念与其他面向对象语言里的"重写"（Override）或"重载"（Overload）是不一样的。重影就是刚才讲述的所谓"重新绑定"，之所以加引号就是为了在没有介绍这个概念的时候代替一下概念。

package/src/content/config.ts

@@ -1,6 +1,5 @@
 import { defineCollection, z } from "astro:content";
 import { utils } from "@utils/utils";
-
 const blogCollection = defineCollection({
   schema: z.object({
     title: z.string(),

package/src/layouts/BaseLayout.astro

@@ -2,6 +2,7 @@
 import "@style/global.scss";
 import "@style/components/page-content.scss";
 import HeadInsert from "@comp/HeadInject.astro";
+import { ViewTransitions } from 'astro:transitions';
 import BodyInsert from "@comp/BodyInject.astro";
 import { ThemeConfig } from "@src/theme_config";
 import Header from "@comp/header/Header.astro";
@@ -14,7 +15,6 @@ interface Props {
   class?: string;
   description?: string;
 }
-
 const { class: pageClass, description } = Astro.props;
 ---
 

package/src/layouts/DefaultMdLayout.astro

@@ -1,7 +1,9 @@
 ---
 import HeroWave from "@comp/header/heroWave.astro";
 import PostLayout from "@src/layouts/PostLayout.astro";
+import { ViewTransitions } from 'astro:transitions';
 import { ThemeConfig } from "@src/theme_config";
+import Code from '../components/icons/code.astro';
 interface FrontMatter {
   title: string;
   description?: string;
@@ -34,9 +36,11 @@ const { frontmatter } = Astro.props;
     slot="post-hero"
     heroColor={frontmatter.heroColor}
   >
+
     <div class="post-info">
       <h1 class="post-title">{frontmatter.title}</h1>
     </div>
   </HeroWave>
   <slot />
 </PostLayout>
+ <ViewTransitions />

package/src/layouts/HomeLayout.astro

@@ -1,6 +1,7 @@
 ---
 import "@style/components/main.scss";
 import BaseLayout from "./BaseLayout.astro";
+import { ViewTransitions } from 'astro:transitions';
 import Aside from "@comp/aside/aside.astro";
 import { ThemeConfig } from "@src/theme_config";
 interface Props {
@@ -23,3 +24,4 @@ const { asideDir } = Astro.props;
     </main>
   </article>
 </BaseLayout>
+ <ViewTransitions />

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

@@ -1,5 +1,6 @@
 ---
 import PostsList from "@comp/postlist/postsList.astro";
+import { ViewTransitions } from 'astro:transitions';
 import Pagination from "@comp/postlist/pagination.astro";
 import HomeLayout from "@layout/HomeLayout.astro";
 import HeroWave from "@comp/header/heroWave.astro";
@@ -41,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/[...page].astro

@@ -6,11 +6,14 @@ import { ThemeConfig } from "@src/theme_config";
 import { utils } from "@src/utils/utils";
 import { type CollectionEntry, getCollection } from "astro:content";
 
-export async function getStaticPaths({ paginate }: any) {
-  const posts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
-    (a: { data: { pubDate: string; }; }, b: { data: { pubDate: string; }; }) => utils.compareDates(a.data.pubDate, b.data.pubDate)
-  );
-  return paginate(posts, { pageSize: 10 });
+export async function getStaticPaths({ paginate }) {
+  const posts = await getCollection("blog");
+  
+  // 根据 pubDate 排序文章
+  const sortedPosts = posts.sort((a, b) => utils.compareDates(a.data.pubDate, b.data.pubDate));
+
+  // 使用 paginate 生成分页路径，每页 10 篇文章
+  return paginate(sortedPosts, { pageSize: 8 });
 }
 
 const { page } = Astro.props;
@@ -39,11 +42,11 @@ if (!page || !page.data) {
     <PostsList posts={page.data} />
     {
       page.lastPage > 1 && (
-        <Pagination
-          baseurl="/"
-          pageSize={page.pageSize}
-          activePage={page.currentPage}
-        />
+      <Pagination
+        baseurl=""
+        currentPage={page.currentPage}
+        totalPages={page.lastPage}
+      />
       )
     }
   </Fragment>

package/src/pages/about/index.md

@@ -7,11 +7,11 @@ useComments: true
 useToc: true
 ---
 # Minearm & Website
-# 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
-最新的正式版是0.1.3
+# 本主题是从[HsuBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
+最新的正式版是0.2.1
 最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.1.2
+但是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

@@ -1,24 +1,26 @@
 ---
-layout: "../../layouts/DefaultMdLayout.astro"
+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[ღꦿlove.情绪℘]{logo="/13.jpg" 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/styles/components/aside.scss

@@ -1,4 +1,4 @@
-@import "../mixin.scss";
+@use "../mixin.scss" as *;
 .aside-content {
   user-select: none;
 

package/src/styles/components/header.scss

@@ -1,4 +1,4 @@
-@import "../mixin.scss";
+@use "../mixin.scss" as *;
 #site-header {
   position: fixed;
 

package/src/styles/components/main.scss

@@ -1,4 +1,4 @@
-@import "../mixin.scss";
+@use "../mixin.scss" as *;
 .main-content {
   user-select: none;
 

package/src/styles/global.scss

@@ -1,5 +1,5 @@
-@import "./animation.scss";
-@import "./custom.scss";
+@use "./animation.scss" as animation;
+@use "./custom.scss" as custom;
 // @import "./components/index.scss";
 // @import "./blog/index.scss";
 

package/src/styles/tags/tags.scss

@@ -1,69 +1,56 @@
-@import "../mixin.scss";
+@use "../mixin.scss" as *;
+
 .tags-wrap {
   display: flex;
-
   align-items: center;
-
   justify-content: center;
-
   min-height: 300px;
+  
   .tags {
     display: flex;
-
     align-items: center;
-
     flex-wrap: wrap;
-
     justify-content: center;
-
     width: 100%;
-
     max-width: 800px;
+    
     .tag {
       margin: 0.5rem;
-
       padding: 5px 8px;
-
       text-decoration: none;
-
       color: var(--font-black-white);
-
       border-radius: 10px;
-
       background-color: var(--card-background);
-
       font-size: 20px;
-
+      
       @include card-style();
+      
       &:hover {
         transform: scale(1.2);
-
         color: white;
-
         background: var(--theme-color);
+        
         .tag-text {
           &::before {
             color: white;
           }
         }
       }
+      
       .tag-text {
         &::before {
           margin-right: 3px;
-
           content: "#";
-
           transition: 0.3s ease;
-
           color: var(--font-light-grey);
         }
       }
     }
-
+    
     &.floating {
       .tag {
         animation: floating 7s ease-in-out infinite alternate;
-
+        
         &:nth-child(3n + 1) {
           animation-delay: 0s;
         }
@@ -77,7 +64,10 @@
     }
   }
 }
+
 #inner-container {
   .main-content {
+    // 这里可以添加具体的样式或内容
+    // 例如：padding: 20px;
   }
 }

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.com",
-     },
-    //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/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>