From d6cff842e162059aef0dc01747aa3ced1f15688e Mon Sep 17 00:00:00 2001 From: radishzzz Date: Sat, 8 Mar 2025 21:38:08 +0000 Subject: [PATCH] refactor: refactoring project structure and components, optimizing internationalization and page presentation --- astro.config.ts | 2 +- src/components/Comments/Waline.astro | 6 +- src/components/MainHeader.astro | 2 +- src/components/MobileHeader.astro | 2 +- src/components/Navbar.astro | 4 +- src/components/PostTitleList.astro | 61 +++++++++++++++++ .../{Buttons => Widgets}/BackToTop.astro | 0 .../LanguageSwitcher.astro | 0 src/components/{ => Widgets}/PhotoSwipe.astro | 0 src/components/{ => Widgets}/Scrollbar.astro | 0 .../{Buttons => Widgets}/ThemeToggle.astro | 0 src/config.ts | 2 +- src/content/posts/Hello World.md | 13 ++++ ...展样式.mdx => Markdown Writing Style.mdx} | 6 +- .../{retypeset_en.md => Theme Guide-en.mdx} | 6 +- .../{retypeset_zh.md => Theme Guide-zh.mdx} | 7 +- src/content/posts/Theme Showcase.mdx | 13 ++++ src/content/posts/容忍与自由.mdx | 4 +- src/content/posts/故乡.mdx | 4 +- src/content/posts/羅生門.mdx | 4 +- src/layouts/Layout.astro | 10 +-- src/pages/[lang]/about.astro | 2 +- src/pages/[lang]/posts/[slug].astro | 2 +- src/pages/[lang]/tags/[tag].astro | 2 +- src/pages/[lang]/tags/index.astro | 2 +- src/pages/about.astro | 2 +- src/pages/index.astro | 66 +++---------------- src/pages/posts/[slug].astro | 8 +-- src/pages/tags/[tag].astro | 48 ++------------ src/pages/tags/index.astro | 6 +- src/styles/heti.css | 2 +- src/types/index.d.ts | 2 +- src/utils/content.ts | 4 +- src/utils/{ => i18n}/path.ts | 0 src/utils/{i18n.ts => i18n/route.ts} | 0 src/utils/{ => i18n}/ui.ts | 0 uno.config.ts | 10 ++- 37 files changed, 156 insertions(+), 146 deletions(-) create mode 100644 src/components/PostTitleList.astro rename src/components/{Buttons => Widgets}/BackToTop.astro (100%) rename src/components/{Buttons => Widgets}/LanguageSwitcher.astro (100%) rename src/components/{ => Widgets}/PhotoSwipe.astro (100%) rename src/components/{ => Widgets}/Scrollbar.astro (100%) rename src/components/{Buttons => Widgets}/ThemeToggle.astro (100%) create mode 100644 src/content/posts/Hello World.md rename src/content/posts/{Markdown 扩展样式.mdx => Markdown Writing Style.mdx} (94%) rename src/content/posts/{retypeset_en.md => Theme Guide-en.mdx} (84%) rename src/content/posts/{retypeset_zh.md => Theme Guide-zh.mdx} (80%) create mode 100644 src/content/posts/Theme Showcase.mdx rename src/utils/{ => i18n}/path.ts (100%) rename src/utils/{i18n.ts => i18n/route.ts} (100%) rename src/utils/{ => i18n}/ui.ts (100%) diff --git a/astro.config.ts b/astro.config.ts index 2eca494..e45819c 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -25,7 +25,7 @@ import { GithubCardComponent } from './src/plugins/rehype-component-github-card. import { parseDirectiveNode } from './src/plugins/remark-directive-rehype.js' import { remarkExcerpt } from './src/plugins/remark-excerpt.js' import { remarkReadingTime } from './src/plugins/remark-reading-time.js' -import { langMap } from './src/utils/ui' +import { langMap } from './src/utils/i18n/ui.js' const { url } = themeConfig.site const { light, dark } = themeConfig.color diff --git a/src/components/Comments/Waline.astro b/src/components/Comments/Waline.astro index 55e9474..51dfca0 100644 --- a/src/components/Comments/Waline.astro +++ b/src/components/Comments/Waline.astro @@ -1,6 +1,6 @@ --- import { themeConfig } from '@/config' -import { getWalineLang } from '@/utils/ui' +import { getWalineLang } from '@/utils/i18n/ui' const { serverURL = '', @@ -184,7 +184,7 @@ document.addEventListener('astro:after-swap', initWaline) --waline-bg-color-light: var(--lightBackground); --waline-bg-color-hover: var(--lightBackground); --waline-border-color: color-mix(in oklch, var(--lightPrimary), transparent 75%); - --waline-disable-bg-color: color-mix(in oklch, var(--lightSecondary), transparent 85%); + --waline-disable-bg-color: color-mix(in oklch, var(--lightSecondary), transparent 92%); --waline-disable-color: var(--lightPrimary); /* Special Colors */ @@ -214,7 +214,7 @@ html.dark #waline { --waline-bg-color-light: var(--darkBackground); --waline-bg-color-hover: var(--darkBackground); --waline-border-color: color-mix(in oklch, var(--darkPrimary), transparent 75%); - --waline-disable-bg-color: color-mix(in oklch, var(--darkSecondary), transparent 85%); + --waline-disable-bg-color: color-mix(in oklch, var(--darkSecondary), transparent 92%); --waline-disable-color: var(--darkPrimary); /* Special Colors */ diff --git a/src/components/MainHeader.astro b/src/components/MainHeader.astro index 97b74ab..9df0368 100644 --- a/src/components/MainHeader.astro +++ b/src/components/MainHeader.astro @@ -1,6 +1,6 @@ --- import themeConfig from '@/config' -import { getPagePath } from '@/utils/path' +import { getPagePath } from '@/utils/i18n/path' const { title, subtitle } = themeConfig.site const { titleSpace } = themeConfig.global diff --git a/src/components/MobileHeader.astro b/src/components/MobileHeader.astro index cf2fe97..528c8ce 100644 --- a/src/components/MobileHeader.astro +++ b/src/components/MobileHeader.astro @@ -1,6 +1,6 @@ --- import themeConfig from '@/config' -import { getPagePath } from '@/utils/path' +import { getPagePath } from '@/utils/i18n/path' const { title, subtitle } = themeConfig.site const { titleSpace } = themeConfig.global diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro index 3fe7d38..d8b88e6 100644 --- a/src/components/Navbar.astro +++ b/src/components/Navbar.astro @@ -1,6 +1,6 @@ --- -import { getPagePath } from '@/utils/path' -import { ui } from '@/utils/ui' +import { getPagePath } from '@/utils/i18n/path' +import { ui } from '@/utils/i18n/ui' const currentPath = Astro.url.pathname const { currentLang, isHome, isPost, isTag, isAbout, getLocalizedPath } diff --git a/src/components/PostTitleList.astro b/src/components/PostTitleList.astro new file mode 100644 index 0000000..88d4da6 --- /dev/null +++ b/src/components/PostTitleList.astro @@ -0,0 +1,61 @@ +--- +// Define props received by the component +interface Post { + data: { + title: string; + slug?: string; + published: Date; + }; + slug?: string; + remarkPluginFrontmatter?: { + minutes?: number; + }; +} + +// Receive posts parameter passed from outside +const { posts } = Astro.props; + +// Declare the type of props +export interface Props { + posts: Post[]; +} +--- + diff --git a/src/components/Buttons/BackToTop.astro b/src/components/Widgets/BackToTop.astro similarity index 100% rename from src/components/Buttons/BackToTop.astro rename to src/components/Widgets/BackToTop.astro diff --git a/src/components/Buttons/LanguageSwitcher.astro b/src/components/Widgets/LanguageSwitcher.astro similarity index 100% rename from src/components/Buttons/LanguageSwitcher.astro rename to src/components/Widgets/LanguageSwitcher.astro diff --git a/src/components/PhotoSwipe.astro b/src/components/Widgets/PhotoSwipe.astro similarity index 100% rename from src/components/PhotoSwipe.astro rename to src/components/Widgets/PhotoSwipe.astro diff --git a/src/components/Scrollbar.astro b/src/components/Widgets/Scrollbar.astro similarity index 100% rename from src/components/Scrollbar.astro rename to src/components/Widgets/Scrollbar.astro diff --git a/src/components/Buttons/ThemeToggle.astro b/src/components/Widgets/ThemeToggle.astro similarity index 100% rename from src/components/Buttons/ThemeToggle.astro rename to src/components/Widgets/ThemeToggle.astro diff --git a/src/config.ts b/src/config.ts index 960f3ee..4ed52a9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -45,7 +45,7 @@ export const themeConfig: ThemeConfig = { // Not fill in the default locale code again moreLocale: ['zh-tw', 'ja', 'en', 'es', 'ru'], // ['zh', 'zh-tw', 'ja', 'en', 'es', 'ru'] // Font styles for post content - fontStyle: 'serif', // sans, serif + fontStyle: 'sans', // sans, serif // Space between title and subtitle titleSpace: 3, // 1, 2, 3 }, diff --git a/src/content/posts/Hello World.md b/src/content/posts/Hello World.md new file mode 100644 index 0000000..1c500ce --- /dev/null +++ b/src/content/posts/Hello World.md @@ -0,0 +1,13 @@ +--- +title: Hello World +published: 2025-01-13 +--- +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. + +Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi. + +Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim. + +Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. + +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/src/content/posts/Markdown 扩展样式.mdx b/src/content/posts/Markdown Writing Style.mdx similarity index 94% rename from src/content/posts/Markdown 扩展样式.mdx rename to src/content/posts/Markdown Writing Style.mdx index 158d432..c4c366d 100644 --- a/src/content/posts/Markdown 扩展样式.mdx +++ b/src/content/posts/Markdown Writing Style.mdx @@ -1,7 +1,7 @@ --- -title: Markdown 扩展样式 -published: 2022-04-01 -tags: ["Markdown", "博客主题"] +title: Markdown 写作样式 +published: 2025-03-08 +tags: ["主题指南"] --- FROM https://github.com/saicaca/fuwari diff --git a/src/content/posts/retypeset_en.md b/src/content/posts/Theme Guide-en.mdx similarity index 84% rename from src/content/posts/retypeset_en.md rename to src/content/posts/Theme Guide-en.mdx index 5784d6f..2c1b2e0 100644 --- a/src/content/posts/retypeset_en.md +++ b/src/content/posts/Theme Guide-en.mdx @@ -1,7 +1,7 @@ --- -title: Retypeset Theme Introduction -published: 2024-01-25 -tags: ["Astro", "Markdown"] +title: Theme Guide +published: 2025-01-26 +tags: ["Astro Blog Theme","Theme Guide"] lang: en --- diff --git a/src/content/posts/retypeset_zh.md b/src/content/posts/Theme Guide-zh.mdx similarity index 80% rename from src/content/posts/retypeset_zh.md rename to src/content/posts/Theme Guide-zh.mdx index cd0281e..ae1b24e 100644 --- a/src/content/posts/retypeset_zh.md +++ b/src/content/posts/Theme Guide-zh.mdx @@ -1,7 +1,8 @@ --- -title: 主题介绍 -published: 2024-01-25 -tags: ["Astro", "Markdown"] +title: 主题指南 +published: 2025-01-26 +tags: ["Astro 博客主题","主题指南"] +pin: true --- 一款基于Astro框架的静态博客主题，灵感来自Typography。本主题以活版印刷风格为基础，通过建立全新视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现传统版式之美。 diff --git a/src/content/posts/Theme Showcase.mdx b/src/content/posts/Theme Showcase.mdx new file mode 100644 index 0000000..0e17d0a --- /dev/null +++ b/src/content/posts/Theme Showcase.mdx @@ -0,0 +1,13 @@ +--- +title: 主题展示区 +published: 2025-03-08 +--- +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae ultricies leo integer malesuada nunc vel risus commodo viverra. Adipiscing enim eu turpis egestas pretium. Euismod elementum nisi quis eleifend quam adipiscing. In hac habitasse platea dictumst vestibulum. Sagittis purus sit amet volutpat. Netus et malesuada fames ac turpis egestas. Eget magna fermentum iaculis eu non diam phasellus vestibulum lorem. Varius sit amet mattis vulputate enim. Habitasse platea dictumst quisque sagittis. Integer quis auctor elit sed vulputate mi. Dictumst quisque sagittis purus sit amet. + +Morbi tristique senectus et netus. Id semper risus in hendrerit gravida rutrum quisque non tellus. Habitasse platea dictumst quisque sagittis purus sit amet. Tellus molestie nunc non blandit massa. Cursus vitae congue mauris rhoncus. Accumsan tortor posuere ac ut. Fringilla urna porttitor rhoncus dolor. Elit ullamcorper dignissim cras tincidunt lobortis. In cursus turpis massa tincidunt dui ut ornare lectus. Integer feugiat scelerisque varius morbi enim nunc. Bibendum neque egestas congue quisque egestas diam. Cras ornare arcu dui vivamus arcu felis bibendum. Dignissim suspendisse in est ante in nibh mauris. Sed tempus urna et pharetra pharetra massa massa ultricies mi. + +Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam sit amet nisl suscipit. Lacus viverra vitae congue eu consequat ac felis donec. Egestas integer eget aliquet nibh praesent tristique magna sit amet. Eget magna fermentum iaculis eu non diam. In vitae turpis massa sed elementum. Tristique et egestas quis ipsum suspendisse ultrices. Eget lorem dolor sed viverra ipsum. Vel turpis nunc eget lorem dolor sed viverra. Posuere ac ut consequat semper viverra nam. Laoreet suspendisse interdum consectetur libero id faucibus. Diam phasellus vestibulum lorem sed risus ultricies tristique. Rhoncus dolor purus non enim praesent elementum facilisis. Ultrices tincidunt arcu non sodales neque. Tempus egestas sed sed risus pretium quam vulputate. Viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare. Fringilla urna porttitor rhoncus dolor purus non. Amet dictum sit amet justo donec enim. + +Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. + +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/src/content/posts/容忍与自由.mdx b/src/content/posts/容忍与自由.mdx index 0e1f6f9..596351d 100644 --- a/src/content/posts/容忍与自由.mdx +++ b/src/content/posts/容忍与自由.mdx @@ -1,7 +1,7 @@ --- title: 容忍与自由 -published: 2022-06-17 -tags: ["胡适","Markdown"] +published: 1959-03-16 +tags: ["胡适"] --- import { Image } from 'astro:assets'; diff --git a/src/content/posts/故乡.mdx b/src/content/posts/故乡.mdx index 0026cbf..08dd832 100644 --- a/src/content/posts/故乡.mdx +++ b/src/content/posts/故乡.mdx @@ -1,7 +1,7 @@ --- title: 故鄉 -published: 2024-01-10 -tags: ["鲁迅", "Markdown"] +published: 1921-01-10 +tags: ["鲁迅"] --- import { Image } from 'astro:assets'; diff --git a/src/content/posts/羅生門.mdx b/src/content/posts/羅生門.mdx index f585e05..139a579 100644 --- a/src/content/posts/羅生門.mdx +++ b/src/content/posts/羅生門.mdx @@ -1,7 +1,7 @@ --- title: 羅生門 -published: 2022-03-05 -tags: ["芥川龙之介", "Markdown"] +published: 1971-03-05 +tags: ["芥川龙之介"] --- import { Image } from 'astro:assets'; diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 886e518..5146970 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,16 +1,16 @@ --- -import LanguageSwitcher from '@/components/Buttons/LanguageSwitcher.astro' -// import PhotoSwipe from '@/components/PhotoSwipe.astro' -// import Scrollbar from '@/components/Scrollbar.astro' -import ThemeToggle from '@/components/Buttons/ThemeToggle.astro' // import BackToTop from '@/components/BackToTop.astro' import Footer from '@/components/Footer.astro' import MainHeader from '@/components/MainHeader.astro' import MobileHeader from '@/components/MobileHeader.astro' import Navigation from '@/components/Navbar.astro' +import LanguageSwitcher from '@/components/Widgets/LanguageSwitcher.astro' +// import PhotoSwipe from '@/components/PhotoSwipe.astro' +// import Scrollbar from '@/components/Scrollbar.astro' +import ThemeToggle from '@/components/Widgets/ThemeToggle.astro' import themeConfig from '@/config' import Head from '@/layouts/Head.astro' -import { getPagePath } from '@/utils/path' +import { getPagePath } from '@/utils/i18n/path' import '@/styles/font.css' import '@/styles/global.css' import '@/styles/heti.css' diff --git a/src/pages/[lang]/about.astro b/src/pages/[lang]/about.astro index 988602d..1c20340 100644 --- a/src/pages/[lang]/about.astro +++ b/src/pages/[lang]/about.astro @@ -1,6 +1,6 @@ --- import Layout from '@/layouts/Layout.astro' -import { generateLanguagePaths } from '@/utils/i18n' +import { generateLanguagePaths } from '@/utils/i18n/route' export function getStaticPaths() { return generateLanguagePaths() diff --git a/src/pages/[lang]/posts/[slug].astro b/src/pages/[lang]/posts/[slug].astro index dec4fe2..a07f6f3 100644 --- a/src/pages/[lang]/posts/[slug].astro +++ b/src/pages/[lang]/posts/[slug].astro @@ -2,7 +2,7 @@ import Waline from '@/components/Comments/Waline.astro' import Layout from '@/layouts/Layout.astro' import { checkSlugDuplication } from '@/utils/content' -import { generateMultiLangPostPaths } from '@/utils/i18n' +import { generateMultiLangPostPaths } from '@/utils/i18n/route' import { getCollection } from 'astro:content' export async function getStaticPaths() { diff --git a/src/pages/[lang]/tags/[tag].astro b/src/pages/[lang]/tags/[tag].astro index 931583d..08492b6 100644 --- a/src/pages/[lang]/tags/[tag].astro +++ b/src/pages/[lang]/tags/[tag].astro @@ -1,7 +1,7 @@ --- import Layout from '@/layouts/Layout.astro' import { getAllTags, getPostsByTag } from '@/utils/content' -import { generateMultiLangTagPaths } from '@/utils/i18n' +import { generateMultiLangTagPaths } from '@/utils/i18n/route' export async function getStaticPaths() { const tags = await getAllTags() diff --git a/src/pages/[lang]/tags/index.astro b/src/pages/[lang]/tags/index.astro index de5f96d..c81003a 100644 --- a/src/pages/[lang]/tags/index.astro +++ b/src/pages/[lang]/tags/index.astro @@ -1,7 +1,7 @@ --- import Layout from '@/layouts/Layout.astro' import { getAllTags } from '@/utils/content' -import { generateLanguagePaths } from '@/utils/i18n' +import { generateLanguagePaths } from '@/utils/i18n/route' export function getStaticPaths() { return generateLanguagePaths() diff --git a/src/pages/about.astro b/src/pages/about.astro index fb47d9c..3461435 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -3,7 +3,7 @@ import Layout from '@/layouts/Layout.astro' --- -
+

一款基于Astro框架的静态博客主题，灵感来自Typography。本主题以活版印刷风格为基础，通过建立全新视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现传统版式之美。

所见皆为细节，方寸尽显优雅。

diff --git a/src/pages/index.astro b/src/pages/index.astro index ce7e115..8177e1d 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,6 +1,7 @@ --- import Layout from '@/layouts/Layout.astro' import { getPinnedPosts, getPostsByYear } from '@/utils/content' +import PostTitleList from '@/components/PostTitleList.astro' const pinnedPosts = await getPinnedPosts() const postsByYear = await getPostsByYear() @@ -8,69 +9,18 @@ const postsByYear = await getPostsByYear()
+ {pinnedPosts.length > 0 && ( -
- +
+
+
)} - + {[...postsByYear.entries()].map(([_year, posts]) => ( - // Year Group
- {/* Decorative Line */} -
- {/* Posts List */} -
    - {posts.map(post => ( - // Single Post -
  • - - - {post.data.title} - - -
    - - - {post.remarkPluginFrontmatter?.minutes} min - -
    - - - -
    • - ))} -
+
+
))}
diff --git a/src/pages/posts/[slug].astro b/src/pages/posts/[slug].astro index 3949ef2..354ce4d 100644 --- a/src/pages/posts/[slug].astro +++ b/src/pages/posts/[slug].astro @@ -2,7 +2,7 @@ import Comments from '@/components/Comments/index.astro' import Layout from '@/layouts/Layout.astro' import { checkSlugDuplication } from '@/utils/content' -import { generatePostPaths } from '@/utils/i18n' +import { generatePostPaths } from '@/utils/i18n/route' import { getCollection } from 'astro:content' export async function getStaticPaths() { @@ -53,12 +53,12 @@ const { Content, remarkPluginFrontmatter } = await post.render() {post.data.tags && post.data.tags.length > 0 && (
-
-
+
+
{post.data.tags.map(tag => ( {tag} diff --git a/src/pages/tags/[tag].astro b/src/pages/tags/[tag].astro index e0dee7d..ffd0fd3 100644 --- a/src/pages/tags/[tag].astro +++ b/src/pages/tags/[tag].astro @@ -1,6 +1,7 @@ --- import Layout from '@/layouts/Layout.astro' import { getAllTags, getPostsByTag } from '@/utils/content' +import PostTitleList from '@/components/PostTitleList.astro' export async function getStaticPaths() { const tags = await getAllTags() @@ -16,15 +17,15 @@ const allTags = await getAllTags() --- -
-
+
+
{allTags.map(tag => ( {tag} @@ -33,41 +34,6 @@ const allTags = await getAllTags()
-
    - {posts.map(post => ( -
  • - - {post.data.title} - - -
    - - - {post.remarkPluginFrontmatter?.minutes} min - -
    - - -
    • - ))} -
+
diff --git a/src/pages/tags/index.astro b/src/pages/tags/index.astro index 4f803ee..bbd4785 100644 --- a/src/pages/tags/index.astro +++ b/src/pages/tags/index.astro @@ -6,12 +6,12 @@ const allTags = await getAllTags() --- -
-
+
+
{allTags.map(tag => ( {tag} diff --git a/src/styles/heti.css b/src/styles/heti.css index f9bb8b0..edc4473 100644 --- a/src/styles/heti.css +++ b/src/styles/heti.css @@ -24,7 +24,7 @@ margin-block-end:0 !important } .heti a { - --at-apply: 'uno-custom-underline'; + --at-apply: 'uno-article-underline'; } .heti blockquote { margin-block-start:12px; diff --git a/src/types/index.d.ts b/src/types/index.d.ts index 4f0f48a..7c67cf3 100644 --- a/src/types/index.d.ts +++ b/src/types/index.d.ts @@ -1,4 +1,4 @@ -import type { langPath } from '@/utils/ui' +import type { langPath } from '@/utils/i18n/ui' type Exclude = T extends U ? never : T diff --git a/src/utils/content.ts b/src/utils/content.ts index d4e37e7..955bda6 100644 --- a/src/utils/content.ts +++ b/src/utils/content.ts @@ -1,6 +1,6 @@ import type { CollectionEntry } from 'astro:content' import themeConfig from '@/config' -import { langPath } from '@/utils/ui' +import { langPath } from '@/utils/i18n/ui' import { getCollection } from 'astro:content' // Type definitions @@ -142,7 +142,7 @@ export async function getPostsGroupByTags(lang?: string) { // Get all posts by specific tag export async function getPostsByTag(tag: string, lang?: string) { - const posts = await getRegularPosts(lang) + const posts = await getPosts(lang) return posts.filter((post: Post) => post.data.tags?.includes(tag), ) diff --git a/src/utils/path.ts b/src/utils/i18n/path.ts similarity index 100% rename from src/utils/path.ts rename to src/utils/i18n/path.ts diff --git a/src/utils/i18n.ts b/src/utils/i18n/route.ts similarity index 100% rename from src/utils/i18n.ts rename to src/utils/i18n/route.ts diff --git a/src/utils/ui.ts b/src/utils/i18n/ui.ts similarity index 100% rename from src/utils/ui.ts rename to src/utils/i18n/ui.ts diff --git a/uno.config.ts b/uno.config.ts index 5f8742e..f5274f0 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -33,8 +33,14 @@ export default defineConfig({ }, }, shortcuts: { - 'uno-custom-underline': 'underline mx-0.3em decoration-secondary/35 font-medium underline-0.075em underline-offset-0.2em hover:(c-primary decoration-primary/70 transition)', - }, + 'uno-article-underline': 'underline mx-0.3em decoration-secondary/25 font-medium underline-0.075em underline-offset-0.2em hover:(c-primary decoration-primary/60 transition)', + 'uno-tags-style': 'inline-block whitespace-nowrap border border-secondary/25 rounded-full px-3.2 py-0.7 c-secondary transition-colors hover:(border-secondary/60 text-primary)', + 'uno-tag-active': 'border-secondary/60 text-primary', + 'uno-decorative-line': 'h-0.25 w-10 bg-secondary opacity-25', + 'uno-mobile-time': 'mb-5.625 text-3.5 leading-6.875 font-time lg:(hidden)', + 'uno-desktop-time': 'mb-5.625 hidden text-3.65 leading-6.875 font-time lg:(ml-2.5 inline)', + 'uno-tags-wrapper': 'mt-4.375 w-95% flex flex-wrap gap-3', + }, rules: [ ['scrollbar-hidden', { 'scrollbar-width': 'none',