diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c938e44..adef9e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1653,8 +1653,8 @@ packages: duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} - electron-to-chromium@1.5.121: - resolution: {integrity: sha512-gpIEzIb3uvm6V8IK452TvzOvZ3EAF8D5i11SMUG7BjpF2aalh5KyKX5dO+GDW5m9Qdia1ejLm6WM5NOIOd7sbQ==} + electron-to-chromium@1.5.122: + resolution: {integrity: sha512-EML1wnwkY5MFh/xUnCvY8FrhUuKzdYhowuZExZOfwJo+Zu9OsNCI23Cgl5y7awy7HrUHSwB1Z8pZX5TI34lsUg==} emmet@2.4.11: resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==} @@ -1775,8 +1775,8 @@ packages: peerDependencies: eslint: '>=8' - eslint-plugin-import-x@4.9.0: - resolution: {integrity: sha512-qdrsei0heLV8z9QpY2/PHF/r/3fF15w3JeVXqWlLzPMiiwYx0VAwIjxN6SzdaPVuGeIMAbQHHS1Wwdn1/bsCgw==} + eslint-plugin-import-x@4.9.1: + resolution: {integrity: sha512-YJ9W12tfDBBYVUUI5FVls6ZrzbVmfrHcQkjeHrG6I7QxWAlIbueRD+G4zPTg1FwlBouunTYm9dhJMVJZdj9wwQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -2652,6 +2652,10 @@ packages: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} + minimatch@10.0.1: + resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} + engines: {node: 20 || >=22} + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -3775,7 +3779,7 @@ snapshots: eslint-merge-processors: 2.0.0(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-antfu: 3.1.1(eslint@9.22.0(jiti@2.4.2)) eslint-plugin-command: 3.1.0(eslint@9.22.0(jiti@2.4.2)) - eslint-plugin-import-x: 4.9.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) + eslint-plugin-import-x: 4.9.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) eslint-plugin-jsdoc: 50.6.8(eslint@9.22.0(jiti@2.4.2)) 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)) @@ -5259,7 +5263,7 @@ snapshots: browserslist@4.24.4: dependencies: caniuse-lite: 1.0.30001706 - electron-to-chromium: 1.5.121 + electron-to-chromium: 1.5.122 node-releases: 2.0.19 update-browserslist-db: 1.1.3(browserslist@4.24.4) @@ -5518,7 +5522,7 @@ snapshots: duplexer@0.1.2: {} - electron-to-chromium@1.5.121: {} + electron-to-chromium@1.5.122: {} emmet@2.4.11: dependencies: @@ -5661,7 +5665,7 @@ snapshots: eslint: 9.22.0(jiti@2.4.2) eslint-compat-utils: 0.5.1(eslint@9.22.0(jiti@2.4.2)) - eslint-plugin-import-x@4.9.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): + eslint-plugin-import-x@4.9.1(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2): dependencies: '@types/doctrine': 0.0.9 '@typescript-eslint/utils': 8.27.0(eslint@9.22.0(jiti@2.4.2))(typescript@5.8.2) @@ -5670,7 +5674,8 @@ snapshots: eslint: 9.22.0(jiti@2.4.2) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.10.0 - picomatch: 4.0.2 + is-glob: 4.0.3 + minimatch: 10.0.1 rspack-resolver: 1.2.2 semver: 7.7.1 stable-hash: 0.0.5 @@ -6973,6 +6978,10 @@ snapshots: min-indent@1.0.1: {} + minimatch@10.0.1: + dependencies: + brace-expansion: 2.0.1 + minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 diff --git a/public/image/back-home.svg b/public/icon/back-home.svg similarity index 100% rename from public/image/back-home.svg rename to public/icon/back-home.svg diff --git a/public/image/favicon.svg b/public/icon/favicon.svg similarity index 100% rename from public/image/favicon.svg rename to public/icon/favicon.svg diff --git a/public/image/language-switcher.svg b/public/icon/language-switcher.svg similarity index 100% rename from public/image/language-switcher.svg rename to public/icon/language-switcher.svg diff --git a/public/image/og-logo.png b/public/icon/og-logo.png similarity index 100% rename from public/image/og-logo.png rename to public/icon/og-logo.png diff --git a/public/image/theme-toggle.svg b/public/icon/theme-toggle.svg similarity index 100% rename from public/image/theme-toggle.svg rename to public/icon/theme-toggle.svg diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 7537859..9f0b2bd 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -19,7 +19,7 @@ const links = configLinks.map((link) => { if (link.name === 'RSS') { return { ...link, - url: currentLang === defaultLocale ? link.url : `/${currentLang}${link.url}/`, + url: currentLang === defaultLocale ? link.url : `/${currentLang}${link.url}`, } } return link diff --git a/src/config.ts b/src/config.ts index bb63fe6..27466b4 100644 --- a/src/config.ts +++ b/src/config.ts @@ -17,7 +17,7 @@ export const themeConfig: ThemeConfig = { url: 'https://retypeset.radishzz.cc', // favicon url // recommended formats: SVG, PNG and ICO - favicon: '/assets/favicon.svg', // or https://example.com/favicon.svg + favicon: '/icon/favicon.svg', // or https://example.com/favicon.svg }, // SITE INFORMATION >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> END diff --git a/src/layouts/Head.astro b/src/layouts/Head.astro index 9e6091f..1e1408c 100644 --- a/src/layouts/Head.astro +++ b/src/layouts/Head.astro @@ -56,7 +56,8 @@ const pageImage = postSlug {commentURL && } {imageHostURL && } {imageHostURL && } - + + diff --git a/src/pages/og/[...image].ts b/src/pages/og/[...image].ts index 230109d..11cacd2 100644 --- a/src/pages/og/[...image].ts +++ b/src/pages/og/[...image].ts @@ -25,7 +25,7 @@ export const { getStaticPaths, GET } = OGImageRoute({ title: page.title, description: page.description, logo: { - path: './public/image/og-logo.png', // Required local path and PNG format + path: './public/icon/og-logo.png', // Required local path and PNG format size: [250], }, border: {