minearm-website 0.0.3-beta.3 → 0.1.2

package/Dockerfile

@@ -0,0 +1,12 @@
+# Base stage for building the static files
+FROM node:lts AS base
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+# Runtime stage for serving the application
+FROM nginx:mainline-alpine-slim AS runtime
+COPY --from=base ./app/dist /usr/share/nginx/html
+EXPOSE 80

package/{LICENSE → LICENSE.md}

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 KraHsu
-
-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.
+MIT License
+
+Copyright (c) 2024 onWidget
+
+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.

package/README.md

@@ -1,11 +1,17 @@
 # Minearm & Website
 # 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
+最新的正式版是0.1.2
+最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到4.16.13
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.0.5
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)
 
+# node(环境)
+
+要让 Astro 在你的系统上运行，你还需要安装 Node.js，版本 v18.17.1 或 v20.3.0 或更高版本。(不支持 v19)
+
 # 文件结构
 
 ```bash
@@ -49,6 +55,11 @@ root
 npm i minearm-website
 ~~~
 
+# 进入astro目录
+~~~
+cd node_modules/minearm-website
+~~~
+
 ~~~
 # 安装依赖
 npm install
@@ -72,4 +83,4 @@ npm run preview
 
 由Minearm-RPM构建的
 
-# 转载时需标明出处！。
+# 转载时需标明出处！。

package/astro.config.ts

@@ -9,6 +9,7 @@ import remarkDirective from "remark-directive";
 import vue from "@astrojs/vue";
 import { SiteConfig } from "./src/site_config";
 import { generateSearchData } from "./src/utils/generateSearchData.ts";
+//import netlify from "@astrojs/netlify";
 const remarkPlugins: any = [remarkFrontmatter, remarkGfm, SiteConfig.markdownMath !== false && remarkMath, remarkRestyling, remarkDirective, markdownDirectives, SiteConfig.localSearch && generateSearchData].filter(Boolean);
 const rehypePlugins: any = [rehypeFrontmatter, rehypeRestyling, SiteConfig.markdownMath === "Katex" && rehypeKatex, SiteConfig.markdownMath === "Mathjax" && rehypeMathjax].filter(Boolean);
 // https://astro.build/config
@@ -16,9 +17,11 @@ export default defineConfig({
   site: SiteConfig.site,
   integrations: [sitemap(), vue()],
   output: "static",
+
   build: {
     format: "directory"
   },
+
   markdown: {
     syntaxHighlight: "shiki",
     shikiConfig: {
@@ -29,5 +32,7 @@ export default defineConfig({
     remarkPlugins: remarkPlugins,
     rehypePlugins: rehypePlugins
   },
-  trailingSlash: "ignore"
+
+  trailingSlash: "ignore",
+ // adapter: netlify()
 });

package/cz.yaml

@@ -0,0 +1,7 @@
+---
+commitizen:
+  name: cz_conventional_commits
+  tag_format: v$version
+  update_changelog_on_bump: true
+  version_provider: npm
+  version_scheme: semver

package/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+
+services:
+  app:
+    image: node:20
+    ports:
+      - 4321:4321
+    working_dir: /app
+    command: npm run dev -- --host 0.0.0.0
+    volumes:
+      - ./:/app

package/netlify.toml

@@ -0,0 +1,4 @@
+[build]
+  command = "npm ci"
+  command2 = "npm run build"
+  publish = "dist"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minearm-website",
   "description": "Welcome to Minearm & Website.",
-  "version": "0.0.3-beta.3",
+  "version": "0.1.2",
   "homepage": "https://github.com/Minearm-RPM/minearm",
   "type": "module",
   "license": "MIT",
@@ -18,14 +18,14 @@
     "pu": "ts-node ./pu.ts"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^5.3.0",
-    "@astrojs/mdx": "^3.1.9",
-    "@astrojs/rss": "^4.0.9",
+    "@astrojs/markdown-remark": "^6.0.1",
+    "@astrojs/mdx": "^4.0.2",
+    "@astrojs/rss": "^4.0.10",
     "@duannx/vue-client-only": "^1.0.3",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@iconify-json/tabler": "^1.2.8",
-    "astro": "^4.16.13",
+    "astro": "^5.0.5",
     "astro-i18next": "^1.0.0-beta.21",
     "astro-icon": "^1.1.2",
     "fuse.js": "^6.6.2",
@@ -47,12 +47,12 @@
   },
   "devDependencies": {
     "@astrojs/sitemap": "^3.2.1",
-    "@astrojs/vue": "^4.5.2",
+    "@astrojs/vue": "^5.0.2",
     "@types/yargs": "^17.0.24",
     "sass": "1.70.0",
     "scss": "^0.2.4",
     "ts-node": "10.9.2",
-    "vue": "3.5.0"
+    "vue": "^3.5.13"
   },
   "keywords": [
     "astro-component",

package/public/scripts/mdata.json

@@ -1,4 +1,4 @@
 {
-  "totalWordCounts": 900,
+  "totalWordCounts": 896,
   "totalPostCounts": 2
 }

package/src/components/loading/loading.vue

@@ -139,7 +139,7 @@ document.onreadystatechange = async () => {
   filter: drop-shadow(0 0 10px yellow);
   animation-delay: -0.5s;
 }
-.load :last-child {
+.load :last-child { 
   background: #99ff00;
   border: 5px solid #99ff00;
   filter: drop-shadow(0 0 10px #99ff00);

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

@@ -14,13 +14,15 @@ category: 'Rust'
 ---
 # Rust 基础语法
 
-(说明) 复制滴别想，抄作业滴不要，若需要，滴开启超级复制插件
+# 说明
+
+复制滴别想，抄作业滴不要，若需要，滴开启超级复制插件
 
 变量，基本类型，函数，注释和控制流，这些几乎是每种编程语言都具有的编程概念。
 
 这些基础概念将存在于每个 Rust 程序中，及早学习它们将使你以最快的速度学习 Rust 的使用。
 
-变量
+# 变量
 首先必须说明，Rust 是强类型语言，但具有自动判断变量类型的能力。这很容易让人与弱类型语言产生混淆。
 
 默认情况下，Rust 中的变量是不可变的，除非使用 mut 关键字声明为可变变量。
@@ -81,22 +83,25 @@ let a: u64 = 114;
 
 这里声明了 a 为无符号 64 位整型变量，如果没有声明类型，a 将自动被判断为有符号 32 位整型变量，这对于 a 的取值范围有很大的影响。
 
-数据类型
+# 数据类型
+
 Rust 是静态类型语言，在变量声明时可以显式指定类型，但通常可以依赖类型推断。
 
 基本类型: i32 (32位有符号整数), u32 (32位无符号整数), f64 (64位浮点数), bool (布尔类型), char (字符)
 
-实例
+- 实例
 ```rust
 let x: i32 = 42;
 let y: f64 = 3.14;
 let is_true: bool = true;
 let letter: char = 'A';
 ```
-函数
+
+# 函数
+
 Rust 函数通过 fn 关键字定义，函数的返回类型通过箭头符号 -> 指定。
 
-实例
+- 实例
 ```rust
 fn add(a: i32, b: i32) -> i32 {
     a + b
@@ -104,10 +109,10 @@ fn add(a: i32, b: i32) -> i32 {
 ```
 如果函数没有返回值，类型默认为 ()（即空元组）。
 
-控制流
-if 表达式
+**控制流**
+# if 表达式
 
-实例
+- 实例
 ```rust
 let number = 7;
 if number < 5 {
@@ -116,9 +121,11 @@ if number < 5 {
     println!("大于等于 5");
 }
 ```
-loop 循环: loop 是 Rust 中的无限循环，可以使用 break 退出循环。
+# loop 循环
+
+loop 是 Rust 中的无限循环，可以使用 break 退出循环。
 
-实例
+- 实例
 ```rust
 let mut counter = 0;
 loop {
@@ -128,9 +135,10 @@ loop {
     }
 }
 ```
-while 循环
 
-实例
+# while 循环
+
+- 实例
 ```rust
 let mut number = 3;
 while number != 0 {
@@ -139,15 +147,15 @@ while number != 0 {
 }
 ```
 
-for 循环
+# for 循环
 
-实例
+- 实例
 ```rust
 for number in 1..4 {
     println!("{}!", number);
 }
 ```
-所有权 (Ownership)
+# 所有权
 Rust 中的所有权是独特的内存管理机制，核心概念包括所有权 (ownership)、借用 (borrowing) 和引用 (reference)。
 
 所有权规则:
@@ -160,7 +168,8 @@ let s1 = String::from("hello");
 let s2 = s1; // s1 的所有权被转移给了 s2
 // println!("{}", s1); // 此处编译会报错，因为 s1 已不再拥有该值
 ```
-借用和引用: 借用允许引用数据而不获取所有权，通过 & 符号实现。
+# 借用和引用
+借用允许引用数据而不获取所有权，通过 & 符号实现。
 ```rust
 fn main() {
     let s = String::from("hello");
@@ -172,10 +181,11 @@ fn calculate_length(s: &String) -> usize {
     s.len()
 }
 ```
-结构体 (Structs)
+# 结构体
+
 结构体用于创建自定义类型，字段可以包含多种数据类型。
 
-实例
+- 实例
 ```rust
 struct User {
     username: String,
@@ -191,10 +201,11 @@ let user1 = User {
     active: true,
 };
 ```
-枚举 (Enums)
+# 枚举
+
 枚举允许定义可能的几种数据类型中的一种。
 
-实例
+- 实例
 ```rust
 enum IpAddrKind {
     V4,
@@ -204,10 +215,10 @@ enum IpAddrKind {
 let four = IpAddrKind::V4;
 let six = IpAddrKind::V6;
 ```
-模式匹配 (match)
+# 模式匹配
 match 是 Rust 中强大的控制流工具，类似于 switch 语句。
 
-实例
+- 实例
 ```rust
 enum Coin {
     Penny,
@@ -225,13 +236,13 @@ fn value_in_cents(coin: Coin) -> u8 {
     }
 }
 ```
-错误处理
+# 错误处理
 
 Rust 有两种主要的错误处理方式：Result<T, E> 和 Option<T>。
 
 Result:
 
-实例
+- 实例
 ```rust
 enum Result<T, E> {
     Ok(T),
@@ -248,7 +259,7 @@ fn divide(a: i32, b: i32) -> Result<i32, String> {
 ```
 Option:
 
-实例
+- 实例
 ```rust
 fn get_element(index: usize, vec: &Vec<i32>) -> Option<i32> {
     if index < vec.len() {
@@ -261,7 +272,7 @@ fn get_element(index: usize, vec: &Vec<i32>) -> Option<i32> {
 所有权与借用的生命周期
 Rust 使用生命周期来确保引用的有效性。生命周期标注用 'a 等来表示，但常见的情况下，编译器会自动推导。
 
-实例
+- 实例
 ```rust
 fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
     if x.len() > y.len() {
@@ -271,12 +282,13 @@ fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
     }
 }
 ```
-重影（Shadowing）
+# 重影
+
 重影的概念与其他面向对象语言里的"重写"（Override）或"重载"（Overload）是不一样的。重影就是刚才讲述的所谓"重新绑定"，之所以加引号就是为了在没有介绍这个概念的时候代替一下概念。
 
 重影就是指变量的名称可以被重新使用的机制：
 
-实例
+- 实例
 ```rust
 fn main() {
     let x = 5;

package/src/lib/posts.js

@@ -0,0 +1,21 @@
+import fs from 'fs';
+import path from 'path';
+import matter from 'gray-matter';
+
+const postsDirectory = path.join(process.cwd(), 'src/posts');
+
+export function getPosts() {
+  const fileNames = fs.readdirSync(postsDirectory);
+  const allPostsData = fileNames.map(fileName => {
+    const fullPath = path.join(postsDirectory, fileName);
+    const fileContents = fs.readFileSync(fullPath, 'utf8');
+    const matterResult = matter(fileContents);
+
+    return {
+      data: matterResult.data,
+      content: matterResult.content,
+      url: `/posts/${fileName.replace(/\.md$/, '')}`
+    };
+  });
+  return allPostsData.sort((a, b) => b.data.pubDate.localeCompare(a.data.pubDate));
+}

package/src/pages/[...page].astro

@@ -3,9 +3,9 @@ import HomeLayout from "@src/layouts/HomeLayout.astro";
 import PostsList from "@comp/postlist/postsList.astro";
 import Pagination from "@comp/postlist/pagination.astro";
 import { ThemeConfig } from "@src/theme_config";
-import { ViewTransitions } from 'astro:transitions';
 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)
@@ -14,8 +14,12 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 const { page } = Astro.props;
----
 
+// 确保 page 对象包含正确的数据
+if (!page || !page.data) {
+  throw new Error("Invalid page data");
+}
+---
 <HomeLayout>
   {
     ThemeConfig.homePage.heroShoot && (
@@ -37,10 +41,10 @@ const { page } = Astro.props;
       page.lastPage > 1 && (
         <Pagination
           baseurl="/"
-          pageSize={page.lastPage}
+          pageSize={page.pageSize}
           activePage={page.currentPage}
         />
       )
     }
   </Fragment>
-</HomeLayout>
+</HomeLayout>

package/src/pages/about/index.md

@@ -7,14 +7,19 @@ useComments: true
 useToc: true
 ---
 # Minearm & Website
-
 # 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
+最新的正式版是0.1.2
+最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到4.16.13
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.0.5
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)
 
+# node(环境)
+
+要让 Astro 在你的系统上运行，你还需要安装 Node.js，版本 v18.17.1 或 v20.3.0 或更高版本。(不支持 v19)
+
 # 文件结构
 
 ```bash
@@ -58,6 +63,11 @@ root
 npm i minearm-website
 ~~~
 
+# 进入astro目录
+~~~
+cd node_modules/minearm-website
+~~~
+
 ~~~
 # 安装依赖
 npm install
@@ -81,4 +91,4 @@ npm run preview
 
 由Minearm-RPM构建的
 
-# 转载时需标明出处！。
+# 转载时需标明出处！。

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";

package/src/pages/friends/index.md

@@ -17,8 +17,8 @@ useToc: true
 
 ::link[B站破击]{logo="/pojipao.avif" desc="全互联网最中二的傻逼" link="https://space.bilibili.com/1598534390"}
 
-::link[ღꦿlove.情绪℘]{logo="/13.jpg" desc="明天要被历史肘击😭" link="mailto:2939765322@qq.com"}
+::link[এ՞情绪ᮨ℘]{logo="/13.png" desc="明天要被历史肘击😭" link="mailto:2939765322@qq.com"}
 
 ::link[三的根号]{logo="/3.png" desc="√3每日发疯" link="https://space.bilibili.com/1832902560"}
 
-::link[智宇]{logo="https://zhiyuhub.top/upload/be2bb1bb-8d91-4e9b-8b4d-00d4c45774ae.png" desc="root@kali:/#" link="https://zhiyuhub.top/"}
+::link[智宇]{logo="https://zhiyuhub.top/upload/be2bb1bb-8d91-4e9b-8b4d-00d4c45774ae.png" desc="root@kali:/#" link="https://zhiyuhub.top/"}

package/src/theme_config.ts

@@ -2,7 +2,7 @@ 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 Code from './components/c.astro';
 // library.add(faStar);
 // const starIcon = icon({ prefix: "fas", iconName: "star" });
 
@@ -170,9 +170,10 @@ export const ThemeConfig: Configs = {
     // },
   	 type: "waline",
   	 options: {
-	   serverURL: "https://api.minearm.org",
+	   serverURL: "https://comments.minearm.org",
      },
     //type: true,
     //options: null,
   },
 };
+  

package/src/content/blog/default/Extended Search.md

@@ -1,50 +0,0 @@
----
-title: Extended Search
-description: '关于Minearm-RPM & Website所使用的fusejs的扩展搜索语法'
-heroColor: ''
-pubDate: 2024-09-25
-abbrlink: Search-help
-cover: "/help1.png"
-coverAlt: "help1"
-tags: 
-    - 'localSearch'
-    - 'Extended Search'
-category: 'Help'
----
-
-## Extended Search
-
-This site uses [fusejs](https://www.fusejs.io) to provide local search services, allowing you to use extended search - a search format that can fine-tune search results, similar to:color[unix]{color="green"}
-
-Space represents logical `AND`, pipe symbol | represents logical `OR`, and to escape spaces, use double quotes `""`.
-
-| **Token**   | **Match type**             | **Description**                        |
-| ----------- | -------------------------- | -------------------------------------- |
-| `jscript`   | fuzzy-match                | Items that fuzzy match `jscript`       |
-| `=scheme`   | exact-match                | Items that are `scheme`                |
-| `'python`   | include-match              | Items that include `python`            |
-| `!ruby`     | inverse-exact-match        | Items that do not include `ruby`       |
-| `^java`     | prefix-exact-match         | Items that start with `java`           |
-| `!^earlang` | inverse-prefix-exact-match | Items that do not start with `earlang` |
-| `.js$`      | suffix-exact-match         | Items that end with `.js`              |
-| `!.go$`     | inverse-suffix-exact-match | Items that do not end with `.go`       |
-
-## 扩展搜索
-
-本站使用[fusejs](https://www.fusejs.io)提供本地搜索服务，允许您使用扩展搜索——一种可以微调搜索结果的搜索格式，类似于:color[unix]{color="green"}
-
-空格代表逻辑与`AND`，管道符|代表逻辑或`OR`，如要转义空格请使用双引号`""`
-| **令牌**    | **匹配类型**     | **描述**                    |
-| ----------- | ---------------- | --------------------------- |
-| `jscript`   | 模糊匹配         | 与 `jscript` 模糊匹配的项目 |
-| `=scheme`   | 精确匹配         | 是 `scheme` 的项目          |
-| `'python`   | 包含匹配         | 包含 `python` 的项目        |
-| `!ruby`     | 反向精确匹配     | 不包含 `ruby` 的项目        |
-| `^java`     | 前缀精确匹配     | 以 `java` 开头的项目        |
-| `!^earlang` | 反向前缀精确匹配 | 不以 `earlang` 开头的项目   |
-| `.js$`      | 后缀精确匹配     | 以 `.js` 结尾的项目         |
-| `!.go$`     | 反向后缀精确匹配 | 不以 `.go` 结尾的项目       |
-
-
-
-

package/src/content/blog/default/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