diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 607be0b..46fd51a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1325,8 +1325,8 @@ packages: resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==} engines: {node: '>=16'} - caniuse-lite@1.0.30001702: - resolution: {integrity: sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==} + caniuse-lite@1.0.30001703: + resolution: {integrity: sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -1359,8 +1359,8 @@ packages: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} - ci-info@4.1.0: - resolution: {integrity: sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==} + ci-info@4.2.0: + resolution: {integrity: sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==} engines: {node: '>=8'} clean-css@5.3.3: @@ -1753,8 +1753,8 @@ packages: resolution: {integrity: sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==} engines: {node: '>=5.0.0'} - eslint-plugin-perfectionist@4.10.0: - resolution: {integrity: sha512-7sH4rXjIS6ekf/9YL25099Ja09aTqKM00VmN0de/JicSFU5h0GmkjpYuqm1stti0L/baDos7jcTbxt28o1pkJw==} + eslint-plugin-perfectionist@4.10.1: + resolution: {integrity: sha512-GXwFfL47RfBLZRGQdrvGZw9Ali2T2GPW8p4Gyj2fyWQ9396R/HgJMf0m9kn7D6WXRwrINfTDGLS+QYIeok9qEg==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: eslint: '>=8.45.0' @@ -3832,7 +3832,7 @@ snapshots: eslint-plugin-jsonc: 2.19.1(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-n: 17.16.2(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-no-only-tests: 3.3.0 - eslint-plugin-perfectionist: 4.10.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) + eslint-plugin-perfectionist: 4.10.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) eslint-plugin-pnpm: 0.1.2(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-regexp: 2.7.0(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-toml: 0.12.0(eslint@9.22.0(jiti@2.4.2)) @@ -3972,7 +3972,7 @@ snapshots: '@astrojs/telemetry@3.2.0': dependencies: - ci-info: 4.1.0 + ci-info: 4.2.0 debug: 4.4.0 dlv: 1.1.3 dset: 3.1.4 @@ -5123,7 +5123,7 @@ snapshots: aria-query: 5.3.2 axobject-query: 4.1.0 boxen: 8.0.1 - ci-info: 4.1.0 + ci-info: 4.2.0 clsx: 2.1.1 common-ancestor-path: 1.0.1 cookie: 0.7.2 @@ -5252,7 +5252,7 @@ snapshots: browserslist@4.24.4: dependencies: - caniuse-lite: 1.0.30001702 + caniuse-lite: 1.0.30001703 electron-to-chromium: 1.5.113 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) @@ -5272,7 +5272,7 @@ snapshots: camelcase@8.0.0: {} - caniuse-lite@1.0.30001702: {} + caniuse-lite@1.0.30001703: {} ccount@2.0.1: {} @@ -5307,7 +5307,7 @@ snapshots: dependencies: readdirp: 4.1.2 - ci-info@4.1.0: {} + ci-info@4.2.0: {} clean-css@5.3.3: dependencies: @@ -5716,7 +5716,7 @@ snapshots: eslint-plugin-no-only-tests@3.3.0: {} - eslint-plugin-perfectionist@4.10.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): + eslint-plugin-perfectionist@4.10.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): dependencies: '@typescript-eslint/types': 8.26.0 '@typescript-eslint/utils': 8.26.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) @@ -5758,7 +5758,7 @@ snapshots: dependencies: '@babel/helper-validator-identifier': 7.25.9 '@eslint-community/eslint-utils': 4.4.1(eslint@9.22.0(jiti@2.4.2)) - ci-info: 4.1.0 + ci-info: 4.2.0 clean-regexp: 1.0.0 core-js-compat: 3.41.0 eslint: 9.22.0(jiti@2.4.2) diff --git a/src/content/config.ts b/src/content/config.ts index 4eb75b1..ed4bfeb 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -10,7 +10,7 @@ const postsCollection = defineCollection({ description: z.string().optional().default(''), image: z.string().optional().default(''), // Advanced - pin: z.boolean().optional().default(false), + pin: z.number().int().min(0).max(99).optional().default(0), toc: z.boolean().optional().default(false), draft: z.boolean().optional().default(false), lang: z.string().optional().default(''), diff --git a/src/content/posts/Hello World.md b/src/content/posts/Hello World.md deleted file mode 100644 index 1c500ce..0000000 --- a/src/content/posts/Hello World.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 Writing Style.mdx b/src/content/posts/Markdown Style Guide.mdx similarity index 96% rename from src/content/posts/Markdown Writing Style.mdx rename to src/content/posts/Markdown Style Guide.mdx index c4c366d..b2bc669 100644 --- a/src/content/posts/Markdown Writing Style.mdx +++ b/src/content/posts/Markdown Style Guide.mdx @@ -1,7 +1,8 @@ --- -title: Markdown 写作样式 +title: Markdown 样式指南 published: 2025-03-08 -tags: ["主题指南"] +tags: ["指南"] +pin: 1 --- FROM https://github.com/saicaca/fuwari diff --git a/src/content/posts/Theme Guide-en.mdx b/src/content/posts/Theme Guide-en.mdx index 2c1b2e0..ffb901d 100644 --- a/src/content/posts/Theme Guide-en.mdx +++ b/src/content/posts/Theme Guide-en.mdx @@ -1,7 +1,9 @@ --- title: Theme Guide published: 2025-01-26 +updated: 2025-03-09 tags: ["Astro Blog Theme","Theme Guide"] +pin: 99 lang: en --- diff --git a/src/content/posts/Theme Guide-zh.mdx b/src/content/posts/Theme Guide-zh.mdx index ae1b24e..46a0a59 100644 --- a/src/content/posts/Theme Guide-zh.mdx +++ b/src/content/posts/Theme Guide-zh.mdx @@ -1,8 +1,10 @@ --- -title: 主题指南 +title: 主题上手指南 published: 2025-01-26 -tags: ["Astro 博客主题","主题指南"] -pin: true +updated: 2025-03-09 +tags: ["Astro 博客主题","指南"] +pin: 99 +lang: zh --- 一款基于Astro框架的静态博客主题，灵感来自Typography。本主题以活版印刷风格为基础，通过建立全新视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现传统版式之美。 diff --git a/src/content/posts/Theme Showcase.mdx b/src/content/posts/Theme Showcase.mdx deleted file mode 100644 index 0e17d0a..0000000 --- a/src/content/posts/Theme Showcase.mdx +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 596351d..52de4a8 100644 --- a/src/content/posts/容忍与自由.mdx +++ b/src/content/posts/容忍与自由.mdx @@ -1,7 +1,7 @@ --- title: 容忍与自由 published: 1959-03-16 -tags: ["胡适"] +tags: ["胡适","经典读本"] --- import { Image } from 'astro:assets'; diff --git a/src/content/posts/故乡.mdx b/src/content/posts/故乡.mdx index 08dd832..111fab8 100644 --- a/src/content/posts/故乡.mdx +++ b/src/content/posts/故乡.mdx @@ -1,7 +1,7 @@ --- title: 故鄉 published: 1921-01-10 -tags: ["鲁迅"] +tags: ["鲁迅","经典读本"] --- import { Image } from 'astro:assets'; diff --git a/src/content/posts/羅生門.mdx b/src/content/posts/羅生門.mdx index 139a579..8b10587 100644 --- a/src/content/posts/羅生門.mdx +++ b/src/content/posts/羅生門.mdx @@ -1,7 +1,7 @@ --- title: 羅生門 published: 1971-03-05 -tags: ["芥川龙之介"] +tags: ["芥川龙之介","经典读本"] --- import { Image } from 'astro:assets'; diff --git a/src/pages/index.astro b/src/pages/index.astro index 8177e1d..3894cdf 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,7 +1,7 @@ --- +import PostTitleList from '@/components/PostTitleList.astro' 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() diff --git a/src/pages/posts/[slug].astro b/src/pages/posts/[slug].astro index 4deb956..6ecb210 100644 --- a/src/pages/posts/[slug].astro +++ b/src/pages/posts/[slug].astro @@ -43,9 +43,14 @@ const { Content, remarkPluginFrontmatter } = await post.render() - + {remarkPluginFrontmatter.minutes} min + {post.data.updated && ( + + updated {post.data.updated.toLocaleDateString('zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit' }).replace(/\//g, '-')} + + )} diff --git a/src/pages/tags/[tag].astro b/src/pages/tags/[tag].astro index ffd0fd3..276abd7 100644 --- a/src/pages/tags/[tag].astro +++ b/src/pages/tags/[tag].astro @@ -1,7 +1,7 @@ --- +import PostTitleList from '@/components/PostTitleList.astro' 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() @@ -24,8 +24,8 @@ const allTags = await getAllTags() href={`/tags/${tag}/`} class={`uno-tags-style ${ Astro.props.tag === tag - ? "uno-tag-active" - : "" + ? 'uno-tag-active' + : '' }`} > {tag} diff --git a/src/utils/content.ts b/src/utils/content.ts index 955bda6..3e82f3e 100644 --- a/src/utils/content.ts +++ b/src/utils/content.ts @@ -69,13 +69,15 @@ export async function getPosts(lang?: string) { // Get all posts except drafts (not pinned) export async function getRegularPosts(lang?: string) { const posts = await getPosts(lang) - return posts.filter(post => !post.data.pin) + return posts.filter(post => !post.data.pin || post.data.pin === 0) } // Get pinned posts export async function getPinnedPosts(lang?: string) { const posts = await getPosts(lang) - return posts.filter(post => post.data.pin) + return posts + .filter(post => post.data.pin && post.data.pin > 0) + .sort((a, b) => (b.data.pin || 0) - (a.data.pin || 0)) } // Get posts grouped by year (not pinned) @@ -107,23 +109,18 @@ export async function getPostsByYear(lang?: string): Promise { return new Map([...yearMap.entries()].sort((a, b) => b[0] - a[0])) } -// Get all tags +// Get all tags sorted by post count export async function getAllTags(lang?: string) { - const posts = await getPosts(lang) - const tags = new Set() + const tagMap = await getPostsGroupByTags(lang) + const tagsWithCount = Array.from(tagMap.entries()) - posts.forEach((post: Post) => { - post.data.tags?.forEach((tag: string) => - tags.add(tag), - ) - }) - - return Array.from(tags) + tagsWithCount.sort((a, b) => b[1].length - a[1].length) + return tagsWithCount.map(([tag]) => tag) } // Get posts grouped by tags export async function getPostsGroupByTags(lang?: string) { - const posts = await getRegularPosts(lang) + const posts = await getPosts(lang) const tagMap = new Map() posts.forEach((post: Post) => {