minearm-website 0.1.2 → 0.1.3

package/src/content/config.ts

@@ -1,5 +1,6 @@
 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,7 +2,6 @@
 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";

package/src/layouts/DefaultMdLayout.astro

@@ -1,9 +1,7 @@
 ---
 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;
@@ -36,11 +34,9 @@ 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,7 +1,6 @@
 ---
 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 {
@@ -24,4 +23,3 @@ const { asideDir } = Astro.props;
     </main>
   </article>
 </BaseLayout>
- <ViewTransitions />

package/src/layouts/TagsLayout.astro

@@ -1,6 +1,5 @@
 ---
 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";

package/src/pages/404.md

@@ -6,5 +6,4 @@ heroColor: "#007aff"
 useComments: false
 useToc: false
 ---
-# 404了，非常抱歉，你要找的页面被作者吃了[doge]
-## 点击[这里](/)返回首页
+# 404了，非常抱歉，你要找的页面被作者吃了[doge]

package/src/pages/about/index.md

@@ -8,10 +8,10 @@ useToc: true
 ---
 # Minearm & Website
 # 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
-最新的正式版是0.1.2
+最新的正式版是0.1.3
 最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.0.5
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.1.2
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)
@@ -61,34 +61,38 @@ root
 ~~~bash
 # 安装主题
 npm i minearm-website
+git clone https://github.com/Minearm-RPM/Minearm.git node_modules/
 ~~~
 
 # 进入astro目录
-~~~
+~~~bash
 cd node_modules/minearm-website
+# 或者(对应上面两种方法)
+cd node_modules/
 ~~~
 
-~~~
+~~~bash
 # 安装依赖
 npm install
 # 更新
 npm update
 ~~~
 
-~~~
+~~~bash
 # 启动开发预览
 npm run dev
 ~~~
 
-~~~
+~~~bash
 # 构建和预览
 npm run build
 npm run preview
 ~~~
 
 # 许可证
+
 本项目在MIT许可证下授权，版权所有©2024
 
 由Minearm-RPM构建的
 
-# 转载时需标明出处！。
+# 转载时需标明出处

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

@@ -1,5 +1,5 @@
 ---
-import { type CollectionEntry, getCollection } from "astro:content";
+import { 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/categories/index.astro

@@ -1,11 +1,11 @@
 ---
 import "@style/tags/tags.scss";
 import TagsLayout from "@src/layouts/TagsLayout.astro";
-import { getCollection, type CollectionEntry } from "astro:content";
+import { getCollection, CollectionEntry } from "astro:content";
 import { utils } from "@src/utils/utils";
 
 const allPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
-  (a: { data: { pubDate: string; }; }, b: { data: { pubDate: string; }; }) => utils.compareDates(a.data.pubDate, b.data.pubDate)
+  (a, b) => utils.compareDates(a.data.pubDate, b.data.pubDate)
 );
 
 const categories: string[] = [

package/src/pages/friends/index.md

@@ -1,5 +1,5 @@
 ---
-layout: ../../layouts/DefaultMdLayout.astro
+layout: "../../layouts/DefaultMdLayout.astro"
 title: Minearm盟友
 description: ""
 heroColor: "#007aff"
@@ -17,8 +17,8 @@ useToc: true
 
 ::link[B站破击]{logo="/pojipao.avif" desc="全互联网最中二的傻逼" link="https://space.bilibili.com/1598534390"}
 
-::link[এ՞情绪ᮨ℘]{logo="/13.png" desc="明天要被历史肘击😭" link="mailto:2939765322@qq.com"}
+::link[ღꦿlove.情绪℘]{logo="/13.jpg" 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/pages/tags/index.astro

@@ -1,10 +1,11 @@
 ---
 import "@style/tags/tags.scss";
 import TagsLayout from "@src/layouts/TagsLayout.astro";
-import { getCollection, type CollectionEntry } from "astro:content";
+import { getCollection, CollectionEntry } from "astro:content";
 import { utils } from "@src/utils/utils";
+
 const allPosts: CollectionEntry<"blog">[] = (await getCollection("blog")).sort(
-  (a: { data: { pubDate: string; }; }, b: { data: { pubDate: string; }; }) => utils.compareDates(a.data.pubDate, b.data.pubDate)
+  (a, b) => utils.compareDates(a.data.pubDate, b.data.pubDate)
 );
 
 const uniqueTags: string[] = [

package/src/styles/blog/dist/blog.css

@@ -0,0 +1,59 @@
+.post-header {
+  width: 100%;
+  padding-top: calc(var(--header-nav-height) + 2rem);
+  font-family: var(--heading-font-family);
+  user-select: none;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background: linear-gradient(var(--theme-color), var(--body-background-color));
+}
+.post-header .post-header-waves-area {
+  position: relative;
+  bottom: 0;
+  margin-top: 2rem;
+  margin-bottom: -10px;
+}
+.post-header .post-info .post-title {
+  font-size: 50px;
+  color: var(--font-white-black);
+}
+.post-header .post-info .post-metas {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.post-header .post-info .post-metas .post-meta {
+  display: flex;
+  margin: 0.3rem 0;
+}
+.post-header .post-info .post-metas .post-meta .meta-icon {
+  font-size: 18px;
+  margin: 0 0.3rem;
+  color: var(--font-white-black);
+}
+.post-container {
+  margin-top: 2rem;
+  max-width: 1400px;
+  width: 100%;
+  display: flex;
+}
+.post-container .post-main {
+  margin: 1rem 1rem;
+  border-radius: 15px;
+  background: white;
+}
+.post-container .post-aside {
+  border-radius: 15px;
+}
+.post-container .post-main {
+  flex: 4;
+  order: 2;
+  padding: 1rem 2rem;
+  @card-style ();
+}
+.post-container .post-aside {
+  flex: 1;
+  order: 1;
+}

package/src/styles/blog/dist/code.css

@@ -0,0 +1,59 @@
+[data-theme=dark]:root {
+  --astro-code-color-background: #1f2430;
+  --astro-code-color-text: #cccac2;
+  --astro-code-token-constant: #dfbfff;
+  --astro-code-token-string: #d5ff80;
+  --astro-code-token-comment: #b8cfe6;
+  --astro-code-token-keyword: #ffad66;
+  --astro-code-token-parameter: #695380;
+  --astro-code-token-function: #ffcb6f;
+  --astro-code-token-string-expression: #5ccfe6;
+  --astro-code-token-punctuation: #cccac2;
+  --astro-code-token-link: #87d96c;
+  --astro-code-color-ansi-black: #000000;
+  --astro-code-color-ansi-black-dim: #00000080;
+  --astro-code-color-ansi-red: #bb0000;
+  --astro-code-color-ansi-red-dim: #bb000080;
+  --astro-code-color-ansi-green: #00bb00;
+  --astro-code-color-ansi-green-dim: #00bb0080;
+  --astro-code-color-ansi-yellow: #bbbb00;
+  --astro-code-color-ansi-yellow-dim: #bbbb0080;
+  --astro-code-color-ansi-blue: #0000bb;
+  --astro-code-color-ansi-blue-dim: #0000bb80;
+  --astro-code-color-ansi-magenta: #ff00ff;
+  --astro-code-color-ansi-magenta-dim: #ff00ff80;
+  --astro-code-color-ansi-cyan: #00bbbb;
+  --astro-code-color-ansi-cyan-dim: #00bbbb80;
+  --astro-code-color-ansi-white: #eeeeee;
+  --astro-code-color-ansi-white-dim: #eeeeee80;
+  --astro-code-color-ansi-bright-black: #555555;
+  --astro-code-color-ansi-bright-black-dim: #55555580;
+  --astro-code-color-ansi-bright-red: #ff5555;
+  --astro-code-color-ansi-bright-red-dim: #ff555580;
+  --astro-code-color-ansi-bright-green: #00ff00;
+  --astro-code-color-ansi-bright-green-dim: #00ff0080;
+  --astro-code-color-ansi-bright-yellow: #ffff55;
+  --astro-code-color-ansi-bright-yellow-dim: #ffff5580;
+  --astro-code-color-ansi-bright-blue: #5555ff;
+  --astro-code-color-ansi-bright-blue-dim: #5555ff80;
+  --astro-code-color-ansi-bright-magenta: #ff55ff;
+  --astro-code-color-ansi-bright-magenta-dim: #ff55ff80;
+  --astro-code-color-ansi-bright-cyan: #55ffff;
+  --astro-code-color-ansi-bright-cyan-dim: #55ffff80;
+  --astro-code-color-ansi-bright-white: #ffffff;
+  --astro-code-color-ansi-bright-white-dim: #ffffff80;
+}
+
+[data-theme=light]:root {
+  --astro-code-color-background: #fdfdfd;
+  --astro-code-color-text: #8a9199;
+  --astro-code-token-constant: #a37acc;
+  --astro-code-token-string: #86b300;
+  --astro-code-token-comment: #787b8099;
+  --astro-code-token-keyword: #fa8d3e;
+  --astro-code-token-parameter: #9f40ffcc;
+  --astro-code-token-function: #f2ae49;
+  --astro-code-token-string-expression: #55b4d4;
+  --astro-code-token-punctuation: #5c6166;
+  --astro-code-token-link: #6cbf43;
+}

package/src/styles/blog/dist/index.css

@@ -0,0 +1 @@
+@import url();

package/src/styles/blog/dist/post.css

@@ -0,0 +1,246 @@
+.post-main {
+  display: flex;
+  flex-direction: column;
+  font-size: var(--font-post-size);
+}
+.post-main h1,
+.post-main h2,
+.post-main h3,
+.post-main h4,
+.post-main h5,
+.post-main h6 {
+  cursor: default;
+  transition: 0.3s ease-in-out;
+  user-select: none;
+  font-family: var(--heading-font-family);
+}
+.post-main h1:before,
+.post-main h2:before,
+.post-main h3:before,
+.post-main h4:before,
+.post-main h5:before,
+.post-main h6:before {
+  content: "#";
+}
+.post-main h1:hover,
+.post-main h2:hover,
+.post-main h3:hover,
+.post-main h4:hover,
+.post-main h5:hover,
+.post-main h6:hover {
+  color: var(--theme-color);
+  margin-left: 10px;
+}
+.post-main img {
+  cursor: pointer;
+  width: 100%;
+  transition: 0.3s;
+}
+.post-main img:hover {
+  transform: scale(1.03);
+  filter: brightness(0.8);
+}
+.post-main .image {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.post-main .image .img-wrap {
+  width: 80%;
+  border-radius: 15px;
+  display: flex;
+  overflow: hidden;
+  box-shadow: var(--card-shadow);
+  transition: 0.3s;
+}
+.post-main .image .img-wrap:hover {
+  box-shadow: var(--card-tiny-shadow);
+}
+.post-main .image .img-comment {
+  margin-top: 5px;
+  color: var(--font-light-grey);
+}
+.post-main p > code {
+  font-size: 16px;
+  color: var(--font-code-color);
+  background: var(--font-code-background);
+  padding: 0px 4px 2px 4px;
+  border-radius: 4px;
+}
+.post-main blockquote {
+  margin: 0;
+  padding: 0.5rem 2rem;
+  margin: 0.5rem 0;
+  display: flex;
+  justify-content: center;
+}
+.post-main blockquote i {
+  margin: 0 1rem;
+  font-size: 24px;
+  color: var(--font-light-grey);
+}
+.post-main blockquote i.fa-quote-right {
+  align-self: end;
+}
+.post-main blockquote p {
+  margin: 0;
+}
+.post-main ul {
+  list-style-type: disc;
+  padding-left: 20px;
+}
+.post-main ol {
+  padding-left: 20px;
+}
+.post-main .table-wrap {
+  margin: 0 auto;
+  border-radius: 10px;
+  overflow: hidden;
+  box-shadow: var(--card-shadow);
+  transition: 0.3s;
+  user-select: none;
+}
+.post-main .table-wrap:hover {
+  box-shadow: var(--card-tiny-shadow);
+}
+.post-main table {
+  display: table;
+  border-spacing: 0px;
+  border-collapse: collapse;
+  empty-cells: show;
+}
+.post-main table thead {
+  background: #eee;
+}
+.post-main table th,
+.post-main table td {
+  border: 1px solid #e3e8f7;
+  padding: 0.3rem 0.6rem;
+  vertical-align: middle;
+}
+.post-main mark {
+  position: relative;
+  background: none;
+}
+.post-main mark:before {
+  position: absolute;
+  content: "";
+  left: 0;
+  top: calc((var(--font-post-size) / 2));
+  width: 100%;
+  height: calc((var(--font-post-size) / 2));
+  background: var(--mark-background);
+  opacity: 0.4;
+}
+.post-main a {
+  text-decoration: none;
+  color: var(--link-color);
+}
+.post-main .link i {
+  margin-left: 4px;
+  font-size: 16px;
+  height: 100%;
+}
+.post-main .contains-task-list {
+  list-style-type: none;
+  padding: 0;
+}
+
+.post-aside {
+  margin-top: 1rem;
+  width: 300px;
+}
+.post-aside .card-toc {
+  font-size: 18px;
+  padding: 0.5rem 1rem;
+}
+.post-aside .card-toc .card-toc-header {
+  font-size: 24px;
+  font-weight: 600;
+  margin: 10px 0;
+}
+.post-aside .card-toc .toc {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+  padding-left: 10px;
+  margin-left: 5px;
+  border-left: 2px solid var(--border-light-grey);
+}
+.post-aside .card-toc .toc .toc-item {
+  transition: 0.2s;
+  font-weight: 600;
+}
+.post-aside .card-toc .toc .toc-item .toc-link {
+  display: block;
+  max-width: 90%;
+  text-decoration: none;
+  color: var(--font-black-white);
+  transition: 0.3s;
+}
+.post-aside .card-toc .toc .toc-item .toc-link .toc-text {
+  width: 100%;
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: var(--font-light-grey);
+  transition: 0.2s;
+}
+.post-aside .card-toc .toc .toc-item .toc-link .toc-text:before {
+  content: "#";
+  display: inline;
+}
+.post-aside .card-toc .toc .toc-item:hover .toc-link .toc-text {
+  padding-left: 10px;
+  color: var(--theme-color);
+}
+
+.code-block {
+  position: relative;
+  margin: 0.5rem 3rem;
+  border-radius: 10px;
+  overflow: hidden;
+  user-select: none;
+  box-shadow: var(--card-shadow);
+  transition: 0.3s;
+}
+.code-block:hover {
+  box-shadow: var(--card-tiny-shadow);
+}
+.code-block .code-lang {
+  padding: 0.5rem 1rem;
+  background: var(--codeblock-background-grey);
+  font-weight: 600;
+  color: var(--font-light-grey);
+}
+.code-block .code-wrap {
+  padding: 0 1rem;
+  font-size: var(--font-code-size);
+  background: var(--astro-code-color-background);
+}
+.code-block .code-wrap pre {
+  margin: 0;
+  padding: 1rem;
+}
+.code-block .code-copy {
+  position: absolute;
+  top: 2.8rem;
+  right: 0.5rem;
+  width: 36px;
+  height: 36px;
+  color: var(--codeblock-copybutton-grey);
+  opacity: 0;
+  cursor: pointer;
+  transition: 0.3s;
+}
+.code-block .code-copy i {
+  font-size: 36px;
+}
+.code-block .code-copy:hover {
+  opacity: 1;
+}
+
+.target-to {
+  animation: 0.5s blink 3;
+}

package/src/styles/components/dist/footer.css

@@ -0,0 +1,29 @@
+#site-footer {
+  position: relative;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin-top: 1rem;
+  padding: 15px 25px;
+  user-select: none;
+  background: var(--background-white);
+}
+#site-footer .footer-container {
+  display: flex;
+  flex-basis: auto;
+  justify-content: space-between;
+  width: 100%;
+  max-width: 1400px;
+  padding: 0 2rem;
+  justify-items: center;
+}
+#site-footer .footer-container .footer-link {
+  text-decoration: none;
+  color: var(--font-black-white);
+  font-weight: 600;
+}
+#site-footer .footer-container .footer-link:hover {
+  color: var(--theme-color);
+}

package/src/styles/components/dist/index.css

@@ -0,0 +1 @@
+@import url();

package/src/styles/components/dist/page-content.css

@@ -0,0 +1,60 @@
+#main-container {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+#main-container .hero-shoot {
+  position: relative;
+  top: var(--header-nav-height);
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: calc(100vh - var(--header-nav-height));
+  margin-bottom: 1rem;
+  font-family: var(--heading-font-family);
+}
+#main-container .hero-shoot .hero-img {
+  position: absolute;
+  z-index: 1;
+  inset: 0;
+}
+#main-container .hero-shoot .hero-img::after {
+  position: absolute;
+  z-index: 2;
+  display: block;
+  content: " ";
+  opacity: 0.2;
+  background: var(--light-grey);
+  inset: 0;
+}
+#main-container .hero-shoot .hero-title {
+  position: relative;
+  z-index: 3;
+  display: block;
+  margin: calc(50vh - 80px - var(--header-nav-height) - 2rem) auto 2rem;
+  background: linear-gradient(315deg, #ff94d6 25%, #ffa238);
+  background-clip: text;
+  -webkit-background-clip: text;
+  font-size: 80px;
+  -webkit-text-fill-color: transparent;
+}
+#main-container .hero-shoot .hero-desc {
+  z-index: 3;
+  margin: 0 auto;
+  color: var(--font-white);
+  font-size: 40px;
+}
+
+#inner-container {
+  display: flex;
+  max-width: 1350px;
+  padding: 4.2rem 1.5rem 0;
+}
+#inner-container .main-content {
+  width: 930px;
+  margin: 0 0.5rem;
+}
+#inner-container .aside-content {
+  width: 300px;
+  margin: 0 0.5rem;
+}

package/src/styles/dist/animation.css

@@ -0,0 +1,8 @@
+@keyframes blink {
+  0%, 100% {
+    background: transparent;
+  }
+  50% {
+    background: yellow;
+  }
+}

package/src/styles/dist/custom.css

@@ -0,0 +1,10 @@
+#site-header .menu-items .menu-item.mine .menu-item-icon {
+  width: 20px;
+}
+#site-header .menu-items .menu-child.equipment .menu-child-icon, #site-header .menu-items .menu-child.friends .menu-child-icon {
+  width: 22px;
+}
+
+.social-media.csdn .social-icon {
+  width: 26px !important;
+}