valaxy 0.20.0-beta.5 → 0.20.1

package/client/components/ValaxyApp.vue

@@ -1,14 +1,14 @@
 <script setup lang="ts">
 // TODO: add docs to override ValaxyApp
 import { computed } from 'vue'
-import { useHead, useSeoMeta } from '@unhead/vue'
+// import { useHead, useSeoMeta } from '@unhead/vue'
+import { useSeoMeta } from '@unhead/vue'
 
 // @ts-expect-error virtual module
 import ValaxyUserApp from '/@valaxyjs/UserAppVue'
 // @ts-expect-error virtual module
 import ValaxyThemeApp from '/@valaxyjs/ThemeAppVue'
 
-import pkg from 'valaxy/package.json'
 import { useI18n } from 'vue-i18n'
 import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhead/schema-org'
 
@@ -16,7 +16,7 @@ import { definePerson, defineWebPage, defineWebSite, useSchemaOrg } from '@unhea
 // you can use this to manipulate the document head in any components,
 // they will be rendered correctly in the html results with vite-ssg
 import { useSiteConfig } from '../config'
-import { useFrontmatter } from '../composables'
+import { useFrontmatter, useValaxyHead } from '../composables'
 import { useTimezone } from '../composables/global'
 import ValaxyAddons from './ValaxyAddons.vue'
 
@@ -30,38 +30,6 @@ const fm = useFrontmatter()
 const { locale } = useI18n()
 
 const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
-useHead({
-  title,
-  titleTemplate: computed(() => fm.value.titleTemplate || ((title: string) => title ? `${title} - ${siteConfig.value.title}` : siteConfig.value.title)),
-  link: [
-    {
-      rel: 'icon',
-      href: siteConfig.value.favicon,
-      type: siteConfig.value.favicon?.endsWith('svg') ? 'image/svg+xml' : 'image/png',
-    },
-  ],
-  meta: [
-    { name: 'description', content: computed(() => siteConfig.value.description) },
-    {
-      name: 'generator',
-      content: `Valaxy ${pkg.version}`,
-    },
-  ],
-
-  templateParams: {
-    schemaOrg: {
-      host: siteConfig.value.url,
-    },
-  },
-
-  script: [
-    {
-      id: 'check-mac-os',
-      innerHTML: `document.documentElement.classList.toggle('mac', /Mac|iPhone|iPod|iPad/i.test(navigator.platform))`,
-      async: true,
-    },
-  ],
-})
 
 // seo
 // todo: get first image url from markdown
@@ -99,6 +67,8 @@ useSchemaOrg([
 ])
 
 useTimezone()
+
+useValaxyHead()
 </script>
 
 <template>

package/client/components/ValaxyCopyright.vue

@@ -54,7 +54,7 @@ const licenseHtml = computed(() => {
 .post-copyright {
   font-size: 0.9rem;
   padding: 0.5rem 1rem;
-  border-left: 4px solid #ff5252;
+  border-left: 4px solid var(--va-c-primary);
   background-color: var(--va-c-bg-dark);
   list-style: none;
   word-break: break-all;

package/client/composables/app/index.ts

@@ -0,0 +1 @@
+export * from './useValaxyHead'

package/client/composables/app/useValaxyHead.ts

@@ -0,0 +1,47 @@
+import { computed } from 'vue'
+import pkg from 'valaxy/package.json'
+import { useHead } from '@unhead/vue'
+import { useI18n } from 'vue-i18n'
+
+import { useSiteConfig } from '../../config'
+import { useFrontmatter } from '../../composables'
+
+export function useValaxyHead() {
+  const { locale } = useI18n()
+
+  const fm = useFrontmatter()
+  const siteConfig = useSiteConfig()
+  const title = computed(() => fm.value[`title_${locale.value}`] || fm.value.title)
+  useHead({
+    title,
+    titleTemplate: computed(() => fm.value.titleTemplate || ((title: string) => title ? `${title} - ${siteConfig.value.title}` : siteConfig.value.title)),
+    link: [
+      {
+        rel: 'icon',
+        href: siteConfig.value.favicon,
+        type: siteConfig.value.favicon?.endsWith('svg') ? 'image/svg+xml' : 'image/png',
+      },
+    ],
+    meta: [
+      { name: 'description', content: computed(() => siteConfig.value.description) },
+      {
+        name: 'generator',
+        content: `Valaxy ${pkg.version}`,
+      },
+    ],
+
+    templateParams: {
+      schemaOrg: {
+        host: siteConfig.value.url,
+      },
+    },
+
+    script: [
+      {
+        id: 'check-mac-os',
+        innerHTML: `document.documentElement.classList.toggle('mac', /Mac|iPhone|iPod|iPad/i.test(navigator.platform))`,
+        async: true,
+      },
+    ],
+  })
+}

package/client/composables/index.ts

@@ -19,3 +19,6 @@ export * from './outline'
 // utils
 export * from './back'
 export * from './decrypt'
+
+// app
+export * from './app'

package/client/locales/zh-CN.yml

@@ -66,7 +66,7 @@ footer:
   total_visitors: 总访客量
 
 counter:
-  archives: 暂无日志 | 共计 1 篇日志 | 共计 {count} 篇日志
+  archives: 暂无文章 | 共计 1 篇文章 | 共计 {count} 篇文章
   categories: 暂无分类 | 共计 1 个分类 | 共计 {count} 个分类
   tags: 暂无标签 | 共计 1 个标签 | 共计 {count} 个标签
   albums: 暂无相册 | 共计 1 个相册 | 共计 {count} 个相册
@@ -99,7 +99,7 @@ statistics:
   word: 本文字数
   word_total: 站点总字数
   time: 阅读时长
-  time_total: 站点阅读时长
+  time_total: 站点总阅读时长
 
 time:
   day: 1 天 | {count} 天