valaxy-theme-yun 0.13.8 → 0.13.10

package/components/YunPostCard.vue

@@ -57,24 +57,12 @@ const { icon, styles } = usePostProperty(props.post.type)
     <!-- always show -->
     <div w="full" class="yun-card-actions flex justify-between" border="t" text="sm">
       <div class="inline-flex">
-        <router-link
-          :to="{
-            path: '/categories/',
-            query: { category: Array.isArray(post.categories) ? post.categories[post.categories.length - 1] : post.categories },
-          }"
-          class="post-categories inline-flex justify-center items-center" m="l-2"
-        >
-          <div m="x-1" i-ri-folder-2-line />
-          {{ Array.isArray(post.categories) ? post.categories.join(' > ') : post.categories }}
-        </router-link>
+        <YunPostCategories :categories="post.categories" />
       </div>
 
       <div class="post-tags inline-flex" m="r-2">
         <template v-if="post.tags">
-          <router-link v-for="tag, i in post.tags" :key="i" :to="{ path: '/tags/', query: { tag } }" m="x-1" class="post-tag inline-flex justify-center items-center">
-            <div m="r-1" i-ri-price-tag-3-line />
-            {{ tag }}
-          </router-link>
+          <YunPostTags :tags="post.tags" />
         </template>
       </div>
     </div>

package/components/YunPostCategories.vue

@@ -0,0 +1,20 @@
+<script lang="ts" setup>
+import type { Post } from 'valaxy'
+
+defineProps<{
+  categories: Post['categories']
+}>()
+</script>
+
+<template>
+  <router-link
+    :to="{
+      path: '/categories/',
+      query: { category: Array.isArray(categories) ? categories[categories.length - 1] : categories },
+    }"
+    class="post-categories inline-flex justify-center items-center" m="l-2"
+  >
+    <div m="x-1" i-ri-folder-2-line />
+    {{ Array.isArray(categories) ? categories.join(' > ') : categories }}
+  </router-link>
+</template>

package/components/YunPostCategoriesAndTags.vue

@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import type { Post } from 'valaxy'
+
+defineProps<{
+  frontmatter: Post
+}>()
+</script>
+
+<template>
+  <div class="inline-flex" text="sm" py="1">
+    <YunPostCategories :categories="frontmatter.categories" />
+    <span v-if="frontmatter.categories && frontmatter.tags" mx="2">-</span>
+    <template v-if="frontmatter.tags">
+      <YunPostTags :tags="frontmatter.tags" />
+    </template>
+  </div>
+</template>

package/components/YunPostList.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
+import { useSiteStore } from 'valaxy'
 import type { Post } from 'valaxy'
-import { usePostList } from 'valaxy'
 
 const props = withDefaults(defineProps<{
   type?: string
@@ -11,10 +11,11 @@ const props = withDefaults(defineProps<{
   curPage: 1,
 })
 
+const site = useSiteStore()
+
 const pageSize = ref(7)
 
-const routes = usePostList({ type: props.type || '' })
-const posts = computed(() => props.posts || routes.value)
+const posts = computed(() => props.posts || site.postList)
 const displayedPosts = computed(() => posts.value.slice((props.curPage - 1) * pageSize.value, props.curPage * pageSize.value))
 </script>
 

package/components/YunPostTags.vue

@@ -0,0 +1,14 @@
+<script lang="ts" setup>
+import type { Post } from 'valaxy'
+
+defineProps<{
+  tags: Post['tags']
+}>()
+</script>
+
+<template>
+  <router-link v-for="tag, i in tags" :key="i" :to="{ path: '/tags/', query: { tag } }" m="x-1" class="post-tag inline-flex justify-center items-center">
+    <div m="r-1" i-ri-price-tag-3-line />
+    {{ tag }}
+  </router-link>
+</template>

package/components/YunSidebarNav.vue

@@ -1,12 +1,13 @@
 <script lang="ts" setup>
-import { useCategory, usePostList, useTag } from 'valaxy'
+import { useCategory, useSiteStore, useTag } from 'valaxy'
 import { useI18n } from 'vue-i18n'
 import { useThemeConfig } from '../composables'
 
 const { t } = useI18n()
 
+const site = useSiteStore()
+
 const themeConfig = useThemeConfig()
-const posts = usePostList()
 const categories = useCategory()
 const tags = useTag()
 </script>
@@ -19,7 +20,7 @@ const tags = useTag()
 
     <router-link class="site-link-item" to="/archives/" :title="t('menu.archives')">
       <div class="icon" i-ri-archive-line />
-      <span class="count">{{ posts.length }}</span>
+      <span class="count">{{ site.postList.length }}</span>
     </router-link>
     <router-link class="site-link-item" to="/categories/" :title="t('menu.categories')">
       <div class="icon" i-ri-folder-2-line />

package/layouts/archives.vue

@@ -1,13 +1,13 @@
 <script lang="ts" setup>
-import { useFrontmatter, usePostList, usePostTitle } from 'valaxy'
+import { useFrontmatter, usePostTitle, useSiteStore } from 'valaxy'
 import { useI18n } from 'vue-i18n'
 
 const { t } = useI18n()
 
 const frontmatter = useFrontmatter()
-const postList = usePostList()
 
 const title = usePostTitle(frontmatter)
+const site = useSiteStore()
 </script>
 
 <template>
@@ -17,7 +17,7 @@ const title = usePostTitle(frontmatter)
     </template>
     <template #main-content>
       <router-view />
-      <YunPostCollapse :posts="postList" />
+      <YunPostCollapse :posts="site.postList" />
     </template>
   </Layout>
 </template>

package/layouts/categories.vue

@@ -1,20 +1,21 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
-import { useCategory, useFrontmatter, useInvisibleElement, usePostList, usePostTitle } from 'valaxy'
+import { useCategory, useFrontmatter, useInvisibleElement, usePostTitle, useSiteStore } from 'valaxy'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 
 const { t } = useI18n()
 
+const site = useSiteStore()
+
 const frontmatter = useFrontmatter()
 const categories = useCategory()
 
 const route = useRoute()
 const curCategory = computed(() => (route.query.category as string || ''))
 
-const postList = usePostList()
 const posts = computed(() => {
-  const list = postList.value.filter((post) => {
+  const list = site.postList.filter((post) => {
     if (post.categories && curCategory.value !== 'Uncategorized') {
       if (typeof post.categories === 'string')
         return post.categories === curCategory.value

package/layouts/post.vue

@@ -18,8 +18,8 @@ const showSponsor = computed(() => {
   <Layout>
     <template #main-header-after>
       <YunPostMeta :frontmatter="frontmatter" />
-
       <YunWalineMeta />
+      <YunPostCategoriesAndTags :frontmatter="frontmatter" />
     </template>
 
     <template #main-content-after>

package/layouts/tags.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useFrontmatter, useInvisibleElement, usePostList, usePostTitle, useTags } from 'valaxy'
+import { useFrontmatter, useInvisibleElement, usePostTitle, useSiteStore, useTags } from 'valaxy'
 import { useI18n } from 'vue-i18n'
 import { computed, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -16,11 +16,11 @@ const { tags, getTagStyle } = useTags({
   primary: themeConfig.value.colors.primary,
 })
 
-const postList = usePostList()
 const curTag = computed(() => route.query.tag as string || '')
+const site = useSiteStore()
 
 const posts = computed(() => {
-  const list = postList.value.filter((post) => {
+  const list = site.postList.filter((post) => {
     if (post.tags) {
       if (typeof post.tags === 'string')
         return post.tags === curTag.value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.13.8",
+  "version": "0.13.10",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -22,6 +22,6 @@
     "valaxy-addon-waline": "0.0.9"
   },
   "devDependencies": {
-    "valaxy": "0.13.8"
+    "valaxy": "0.13.10"
   }
 }

package/stores/app.ts

@@ -0,0 +1,10 @@
+import { acceptHMRUpdate, defineStore } from 'pinia'
+
+export const useYunAppStore = defineStore('yun-app', () => {
+  // global cache for yun
+
+  return {}
+})
+
+if (import.meta.hot)
+  import.meta.hot.accept(acceptHMRUpdate(useYunAppStore, import.meta.hot))