diff --git a/.vscode/settings.json b/.vscode/settings.json index 2d1be0d..1ccaef5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -84,6 +84,7 @@ "msvalidate", "noopener", "noreferrer", + "Noto", "oklch", "overlayscrollbars", "pagefind", diff --git a/README.md b/README.md index 086fd6c..e79238e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ # Retypeset -Retypeset is a static blog theme based on the Astro framework, inspired by Typography. Retypeset establishes a new visual standard and reimagines the layout of all pages, offering a reading experience similar to paper books, reviving the beauty of typography. Details in every sight, elegance in every space. +Retypeset is a static blog theme based on the [Astro](https://astro.build/) framework, inspired by [Typography](https://astro-theme-typography.vercel.app/). Retypeset establishes a new visual standard and reimagines the layout of all pages, offering a reading experience similar to paper books, reviving the beauty of typography. Details in every sight, elegance in every space. - [Live Demo](https://retypeset.radishzz.cc/) - [Mobile design](https://mastergo.com/file/151079538766773?fileOpenFrom=home&page_id=M&source=link_share&shareId=151079538766773) diff --git a/README.zh.md b/README.zh.md index a634ee8..95a8477 100644 --- a/README.zh.md +++ b/README.zh.md @@ -19,7 +19,7 @@ # 重新编排 -Retypeset 是一款基于 Astro 框架的静态博客主题，设计灵感来自 Typography。本主题通过建立全新的视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现版式之美。所见皆为细节，方寸尽显优雅。 +Retypeset 是一款基于 [Astro](https://astro.build/) 框架的静态博客主题，设计灵感来自 [Typography](https://astro-theme-typography.vercel.app/)。本主题通过建立全新的视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现版式之美。所见皆为细节，方寸尽显优雅。 - [在线预览](https://retypeset.radishzz.cc/) - [移动端设计稿](https://mastergo.com/file/151079538766773?fileOpenFrom=home&page_id=M&source=link_share&shareId=151079538766773) diff --git a/package.json b/package.json index 918f880..880f039 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "sanitize-html": "^2.14.0", "sharp": "^0.33.5", "typescript": "~5.8.2", - "unist-util-visit": "^5.0.0", - "vite": "^6.2.1" + "unist-util-visit": "^5.0.0" }, "devDependencies": { "@antfu/eslint-config": "^4.10.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89c69d1..9fc0d62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,9 +95,6 @@ importers: unist-util-visit: specifier: ^5.0.0 version: 5.0.0 - vite: - specifier: ^6.2.1 - version: 6.2.1(@types/node@22.13.10)(jiti@2.4.2)(lightningcss@1.28.2)(terser@5.37.0)(yaml@2.7.0) devDependencies: '@antfu/eslint-config': specifier: ^4.10.1 @@ -1622,8 +1619,8 @@ packages: duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} - electron-to-chromium@1.5.114: - resolution: {integrity: sha512-DFptFef3iktoKlFQK/afbo274/XNWD00Am0xa7M8FZUepHlHT8PEuiNBoRfFHbH1okqN58AlhbJ4QTkcnXorjA==} + electron-to-chromium@1.5.115: + resolution: {integrity: sha512-MN1nahVHAQMOz6dz6bNZ7apgqc9InZy7Ja4DBEVCTdeiUcegbyOYE9bi/f2Z/z6ZxLi0RxLpyJ3EGe+4h3w73A==} emmet@2.4.11: resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==} @@ -5216,7 +5213,7 @@ snapshots: browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001703 - electron-to-chromium: 1.5.114 + electron-to-chromium: 1.5.115 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) @@ -5475,7 +5472,7 @@ snapshots: duplexer@0.1.2: {} - electron-to-chromium@1.5.114: {} + electron-to-chromium@1.5.115: {} emmet@2.4.11: dependencies: diff --git a/public/image/Astro-Icon.png b/public/image/Astro-Icon.png new file mode 100644 index 0000000..3c497fe Binary files /dev/null and b/public/image/Astro-Icon.png differ diff --git a/public/image/Logo.svg b/public/image/Logo.svg deleted file mode 100644 index c6e5989..0000000 --- a/public/image/Logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/config.ts b/src/config.ts index 2a888ae..d87ca15 100644 --- a/src/config.ts +++ b/src/config.ts @@ -14,8 +14,8 @@ export const themeConfig: ThemeConfig = { // site url url: 'https://retypeset.radishzz.cc', // favicon url - // support only webp, svg or png - favicon: '/image/Logo.svg', // https://example.com/logo.svg + // support only ico or png for best compatibility with Open Graph and RSS avatar + favicon: '/image/Astro-Icon.png', // https://example.com/logo.png }, // SITE INFORMATION >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> END diff --git a/src/content/posts/Theme Guide-en.md b/src/content/posts/Theme Guide-en.md index 5afbc80..06a110d 100644 --- a/src/content/posts/Theme Guide-en.md +++ b/src/content/posts/Theme Guide-en.md @@ -7,4 +7,4 @@ pin: 99 lang: en --- -Retypeset is a static blog theme based on the Astro framework, inspired by Typography. Retypeset establishes a new visual standard and reimagines the layout of all pages, offering a reading experience similar to paper books, reviving the beauty of typography. Details in every sight, elegance in every space. +Retypeset is a static blog theme based on the [Astro](https://astro.build/) framework, inspired by [Typography](https://astro-theme-typography.vercel.app/). Retypeset establishes a new visual standard and reimagines the layout of all pages, offering a reading experience similar to paper books, reviving the beauty of typography. Details in every sight, elegance in every space. diff --git a/src/content/posts/Theme Guide-zh.md b/src/content/posts/Theme Guide-zh.md index c2c0798..27ca8e5 100644 --- a/src/content/posts/Theme Guide-zh.md +++ b/src/content/posts/Theme Guide-zh.md @@ -7,4 +7,4 @@ pin: 99 lang: zh --- -Retypeset 是一款基于Astro框架的静态博客主题，设计灵感来自Typography。本主题通过建立全新的视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现版式之美。所见皆为细节，方寸尽显优雅。 +Retypeset 是一款基于[Astro](https://astro.build/)框架的静态博客主题，设计灵感来自[Typography](https://astro-theme-typography.vercel.app/)。本主题通过建立全新的视觉规范，对所有页面进行重新编排，打造纸质书页般的阅读体验，再现版式之美。所见皆为细节，方寸尽显优雅。 diff --git a/src/layouts/Head.astro b/src/layouts/Head.astro index 0a79ff5..eda065a 100644 --- a/src/layouts/Head.astro +++ b/src/layouts/Head.astro @@ -13,23 +13,23 @@ const { postTitle, postDescription, postSlug } = Astro.props const { title, subtitle, description, author, url, favicon } = themeConfig.site const { mode, light: { background: lightMode }, dark: { background: darkMode } } = themeConfig.color const { locale, moreLocale } = themeConfig.global -// TODO: Change openGraph image fallback url -const { verification = {}, twitterID = '', googleAnalyticsID = '', umamiAnalyticsID = '', openGraph = 'https://placehold.co/1200x630' } = themeConfig.seo ?? {} +const { verification = {}, twitterID = '', googleAnalyticsID = '', umamiAnalyticsID = '', openGraph: ogUrl } = themeConfig.seo ?? {} const { google = '', bing = '', yandex = '', baidu = '' } = verification const { commentURL = '', imageHostURL = '', customGoogleAnalyticsJS = '', customUmamiAnalyticsJS = '' } = themeConfig.preload const initMetaTheme = mode === 'dark' ? darkMode : lightMode const pageTitle = postTitle ? `${postTitle} | ${title}` : `${title} - ${subtitle}` const pageDescription = postDescription || description -const pageImage = postSlug ? `${url}/og/${postSlug}.png` : `${openGraph}` +// TODO: Change openGraph image fallback url +const openGraph = typeof ogUrl === 'string' ? ogUrl : 'https://placehold.co/1200x630' +const pageImage = postSlug ? `${url}/og/${postSlug}.png` : openGraph --- -{favicon.toLowerCase().endsWith('.webp') && } -{favicon.toLowerCase().endsWith('.svg') && } {favicon.toLowerCase().endsWith('.png') && } +{favicon.toLowerCase().endsWith('.ico') && } {pageTitle} @@ -65,7 +65,7 @@ const pageImage = postSlug ? `${url}/og/${postSlug}.png` : `${openGraph}` - + diff --git a/src/pages/[lang]/posts/[slug].astro b/src/pages/[lang]/posts/[slug].astro index 7aa3869..5eb0da1 100644 --- a/src/pages/[lang]/posts/[slug].astro +++ b/src/pages/[lang]/posts/[slug].astro @@ -2,6 +2,7 @@ import Waline from '@/components/Comments/Waline.astro' import Layout from '@/layouts/Layout.astro' import { checkSlugDuplication } from '@/utils/content' +import { generateDescription } from '@/utils/description' import { generateMultiLangPostPaths } from '@/utils/i18n/route' import { getCollection } from 'astro:content' @@ -17,10 +18,15 @@ export async function getStaticPaths() { } const { post } = Astro.props +const description = generateDescription(post) const { Content, remarkPluginFrontmatter } = await post.render() --- - +

{post.data.title}