diff --git a/README.md b/README.md index efb081d..39610b1 100644 --- a/README.md +++ b/README.md @@ -54,11 +54,15 @@ yarn preview ### 近期 +✅ - 已完成 | 🚧 - 进行中 | ⏳ - 计划中 + | 状态 | 项目 | | --- | --- | -| ⏳ | 重构部分代码，优化总体结构 | -| ⏳ | 优化动画效果 | -| ⏳ | 优化网站性能 | +| ✅ | 基础功能实现 | +| 🚧 | 重构部分代码，优化总体结构 | +| 🚧 | 优化动画效果 | +| 🚧 | 移动端适配 | +| 🚧 | 优化网站性能 | | ⏳ | 可调的颜色 | | ⏳ | 添加 RSS、SiteMap 等功能 | | ⏳ | 更多构建选项（如 SLUG 生成方法） | diff --git a/README_en.md b/README_en.md index eb71035..4256c40 100644 --- a/README_en.md +++ b/README_en.md @@ -51,14 +51,18 @@ yarn preview ### Short-term +✅ - Completed | 🚧 - In Progress | ⏳ - Planned + | Status | Project | | --- | --- | -| ⏳ | Refactor some code and optimize the overall structure | -| ⏳ | Optimize animation effects | -| ⏳ | Optimize website performance | +| ✅ | Basic functionality implementation | +| 🚧 | Refactor some code and optimize overall structure | +| 🚧 | Optimize animation effects | +| 🚧 | Mobile adaptation | +| 🚧 | Optimize website performance | | ⏳ | Adjustable colors | -| ⏳ | Add RSS, SiteMap, and other features | -| ⏳ | More build options (e.g., SLUG generation methods) | +| ⏳ | Add RSS, SiteMap, etc. | +| ⏳ | More build options (e.g., SLUG generation method) | | ⏳ | Add Live2D character | | ⏳ | Search functionality | | ⏳ | i18n | diff --git a/astro.config.mjs b/astro.config.mjs index d65cfb4..874a43c 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -18,8 +18,10 @@ export default defineConfig({ containers: ['main', '.dynamic-ele'], smoothScrolling: true, progress: true, - // cache: true, - // preload: true, + cache: true, + preload: true, + updateHead: true, + updateBodyClass: false, // accessibility: true, globalInstance: true, }), diff --git a/src/components/Copyright.astro b/src/components/Copyright.astro index 1cd69e2..70d3a7d 100644 --- a/src/components/Copyright.astro +++ b/src/components/Copyright.astro @@ -21,35 +21,37 @@ const { title, published } = Astro.props; ---
-
-

{title}

- -
-
-
- 作者 -

{YukinaConfig.Username}

-
-
- 发布日期 -

{formatDate(published)}

-
-
- 许可协议 +
+
+

{title}

CC BY-NC-SA 4.0 + class="text-sm px-1 py-0.5 rounded-md transition-all hover:bg-[var(--primary-color-lighten)]" + id="post-url" + href=""> +
+
+
+ 作者 +

{YukinaConfig.Username}

+
+
+ 发布日期 +

{formatDate(published)}

+
+
+ 许可协议 + CC BY-NC-SA 4.0 +
- - diff --git a/src/components/NavBar.astro b/src/components/NavBar.astro index 48fb517..ea9b16d 100644 --- a/src/components/NavBar.astro +++ b/src/components/NavBar.astro @@ -31,9 +31,9 @@ import { YukinaConfig } from "../../yukina.config";

关于

 - +
@@ -56,6 +56,7 @@ import { YukinaConfig } from "../../yukina.config"; transform: translateX(-50%); animation: 500ms nav-onload-animation; animation-delay: var(--onload-animation-delay); + animation-timing-function: ease-in; } .nav-hidden { diff --git a/src/layouts/ArticleLayout.astro b/src/layouts/ArticleLayout.astro deleted file mode 100644 index 9ec5a83..0000000 --- a/src/layouts/ArticleLayout.astro +++ /dev/null @@ -1,39 +0,0 @@ ---- -import Main from "../layouts/MainLayout.astro"; -import Markdown from "../components/Markdown.astro"; -import SideBar from "../components/SideBar.astro"; -import Copyright from "../components/Copyright.astro"; - -interface Props { - title?: string; - subTitle?: string; - headerImg?: string; -} - -const { title, subTitle, headerImg } = Astro.props; ---- - -
- -
-
- -
-
- - - - -
-
-
- - diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index e38b756..33c2067 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -9,7 +9,7 @@ import BaseHead from "../components/BaseHead.astro"; - diff --git a/src/layouts/PostArchiveLayout.astro b/src/layouts/PostArchiveLayout.astro index fa20d57..c255e0c 100644 --- a/src/layouts/PostArchiveLayout.astro +++ b/src/layouts/PostArchiveLayout.astro @@ -25,46 +25,31 @@ const { archiveMap, title, subTitle, headerImg, hashedSlug } = Astro.props; headerImg={headerImg} hashedSlug={hashedSlug} > -
-
- -
-
-
- { - archiveMap.keys().map((year) => ( -
- -
    - {archiveMap.get(year)?.map((entry) => ( -
  • - -
    • - ))} -
-
- )) - } -
-
-
+
+ { + archiveMap.keys().map((year) => ( +
+ +
    + {archiveMap.get(year)?.map((entry) => ( +
  • + +
    • + ))} +
+
+ )) + }
diff --git a/src/layouts/PostLayout.astro b/src/layouts/PostLayout.astro new file mode 100644 index 0000000..edd49f9 --- /dev/null +++ b/src/layouts/PostLayout.astro @@ -0,0 +1,35 @@ +--- +import Main from "../layouts/MainLayout.astro"; +import Markdown from "../components/Markdown.astro"; +import Copyright from "../components/Copyright.astro"; + +interface Props { + title?: string; + subTitle?: string; + headerImg?: string; + published?: Date; +} + +const { title, subTitle, headerImg, published } = Astro.props; +--- + +
+ +
+
+ + + + {published && title && } +
+
+
+ + diff --git a/src/pages/[...page].astro b/src/pages/[...page].astro index 0b09f90..88c42fb 100644 --- a/src/pages/[...page].astro +++ b/src/pages/[...page].astro @@ -1,14 +1,12 @@ --- // Component Imports import Main from "../layouts/MainLayout.astro"; -import SideBar from "../components/SideBar.astro"; import PostCard from "../components/PostCard.astro"; import Pagination from "../components/control/Pagination.astro"; // Utils import type { PaginateFunction } from "astro"; import { GetSortedPosts } from "../utils/content"; -import Footer from "../components/Footer.astro"; export async function getStaticPaths({ paginate, @@ -23,58 +21,40 @@ const { page } = Astro.props; ---
-
-
- -
-
-
- { - page.data.map((entry, index) => ( -
- -
- )) - } -
- -
+
+
+ { + page.data.map((entry, index) => ( +
+ +
+ )) + }
+
+ + diff --git a/src/scripts/global.ts b/src/scripts/global.ts index 3e99ff8..8b4e13c 100644 --- a/src/scripts/global.ts +++ b/src/scripts/global.ts @@ -1,22 +1,3 @@ -import lozad from "lozad"; import "./fireworks.js"; import "./nav"; - - -const setup = () => { - const observer = lozad(".lozad", { - loaded: (el) => { - el.classList.add("loaded"); - }, - }); - - observer.observe(); -}; - -document.addEventListener("DOMContentLoaded", setup); - -if (window.swup?.hooks) { - setup(); -} else { - document.addEventListener("swup:enable", () => { window.swup.hooks.on("content:replace", setup) }); -} +import "./setup" diff --git a/src/scripts/setup.ts b/src/scripts/setup.ts new file mode 100644 index 0000000..d375d15 --- /dev/null +++ b/src/scripts/setup.ts @@ -0,0 +1,33 @@ +import lozad from "lozad"; + +const setupUrlAnchor = () => { + const url = window.location.href; + const urlElement = document.getElementById("post-url") as HTMLAnchorElement | null; + if (urlElement) { + urlElement.href = url; + urlElement.innerText = url; + } +} + +const setupLozad = () => { + const observer = lozad(".lozad", { + loaded: (el) => { + el.classList.add("loaded"); + }, + }); + + observer.observe(); +}; + +const setup = () => { + setupUrlAnchor(); + setupLozad(); +} + +document.addEventListener("DOMContentLoaded", setup); + +if (window.swup?.hooks) { + setup(); +} else { + document.addEventListener("swup:enable", () => { window.swup.hooks.on("content:replace", setup) }); +} diff --git a/src/styles/markdown.css b/src/styles/markdown.css index d0255e0..72dcfae 100644 --- a/src/styles/markdown.css +++ b/src/styles/markdown.css @@ -116,10 +116,6 @@ display: none; } -.article pre { - max-width: 100%; -} - .article p { font-family: 'Noto Sans SC', sans-serif; } @@ -127,5 +123,4 @@ .article .astro-code { border-radius: 0.75rem !important; scrollbar-width: thin; -} - +} \ No newline at end of file diff --git a/src/styles/transitions.css b/src/styles/transitions.css index f2c4b4c..c6f160c 100644 --- a/src/styles/transitions.css +++ b/src/styles/transitions.css @@ -1,3 +1,7 @@ +.transition-leaving { + transition: transform 300ms, opacity 300ms; +} + html.is-changing .transition-main { transition: opacity 250ms ease-in-out; } @@ -10,10 +14,6 @@ html.is-animating .transition-main { opacity: 0; } -.transition-leaving { - transition: transform 300ms, opacity 300ms; -} - html.is-animating.is-leaving .transition-leaving { transform: translateY(2rem); opacity: 0;