valaxy-theme-hairy 1.0.2 → 1.0.4

package/components/HairyFooter.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { capitalize, computed } from 'vue'
-import { useConfig, useSiteConfig, useThemeConfig } from 'valaxy'
+import { useConfig, useSiteConfig, useThemeConfig, useRuntimeConfig } from 'valaxy'
 import { useI18n } from 'vue-i18n'
 import pkg from 'valaxy/package.json'
 import type { HairyTheme } from 'valaxy-theme-hairy'
@@ -19,8 +19,8 @@ const isThisYear = computed(() => {
 
 const poweredHtml = computed(() => t('footer.powered', [`<a href="${pkg.repository}" target="_blank" rel="noopener">Valaxy</a> v${pkg.version}`]))
 const footerIcon = computed(() => themeConfig.value.footer?.icon)
-
-// const frontmatter = useFrontmatter()
+const runtimeConfig = useRuntimeConfig()
+const addonWaline = computed(() => runtimeConfig.value.addons['valaxy-addon-waline'])
 </script>
 
 <template>
@@ -45,11 +45,14 @@ const footerIcon = computed(() => themeConfig.value.footer?.icon)
         </a>
 
         <span>{{ sideConfig.author.name }}</span>
-        <span class="mx-2">|</span>
-        <span class="flex items-center">
-          <div class="i-ri-eye-fill mr-1" />
-          <span class="waline-pageview-count" data-path="/">-</span>
-        </span>
+        <template v-if="addonWaline.options?.pageview">
+          <span class="mx-2">|</span>
+          <span class="flex items-center">
+            <div class="i-ri-eye-fill mr-1" />
+            <span class="waline-pageview-count" data-path="/" />
+          </span>
+        </template>
+        
       </div>
       <div v-if="themeConfig.footer.powered" class="powered" m="2">
         <span v-html="poweredHtml" /> | <span>{{ t('footer.theme') }} - <a :href="themeConfig.pkg.homepage" :title="`valaxy-theme-${config.theme}`" target="_blank">{{ capitalize(config.theme) }}</a> v{{ themeConfig.pkg.version }}</span>

package/components/HairyImageGroup.vue

@@ -2,8 +2,8 @@
 import { computed, provide, useCssVars, useSlots } from 'vue'
 import { renderOverlay } from '@overlastic/vue'
 import type { ImageViewerProps } from 'element-plus'
-import { atWillToUnit } from '@hairy/utils'
 import HairyImageViewer from './parts/HairyImageViewer.vue'
+import { atWillToUnit } from '../utils';
 
 const props = withDefaults(defineProps<{
   row?: string | number

package/components/parts/HairyImageGlobal.vue

@@ -2,8 +2,8 @@
 import { provide, useCssVars } from 'vue'
 import { renderOverlay } from '@overlastic/vue'
 import type { ImageViewerProps } from 'element-plus'
-import { atWillToUnit } from '@hairy/utils'
 import HairyImageViewer from './HairyImageViewer.vue'
+import { atWillToUnit } from '../../utils';
 
 const props = withDefaults(defineProps<{
   row?: string | number

package/components/posts/HairyArticleImage.vue

@@ -59,7 +59,7 @@ function displayCategory(keys: string | string[] = []) {
               </span>
             </a>
             <div class="text-base leading-6 font-medium">
-              <a class="link cursor-pointer" aria-label="read more" @click="onReadMore">
+              <a class="link flex gap-2 cursor-pointer" aria-label="read more" @click="onReadMore">
                 <span v-if="reverse">←</span>
                 <span class="hidden md:block">Read more</span>
                 <span v-if="!reverse">→</span>

package/components/posts/HairyPostFooter.vue

@@ -9,7 +9,7 @@ const route = useRoute()
     <div class="border-t border-gray-200 dark:border-gray-600" />
     <div class="flex items-center justify-end mt-2">
       <div class="i-ri-eye-fill mr-2" />
-      阅读次数 <span class="waline-pageview-count mx-2" :data-path="route.path"> - </span> 次
+      阅读次数 <span class="waline-pageview-count mx-2" :data-path="route.path" /> 次
     </div>
   </div>
 </template>

package/layouts/post.vue

@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { ElTag, dayjs } from 'element-plus'
-import { useFrontmatter } from 'valaxy'
+import { useFrontmatter, useRuntimeConfig } from 'valaxy'
 import { useRouter } from 'vue-router'
+import { computed } from 'vue'
 
 import 'element-plus/theme-chalk/el-tag.css'
 
@@ -13,6 +14,8 @@ defineProps<{
   }
 }>()
 
+const runtimeConfig = useRuntimeConfig()
+const addonWaline = computed(() => runtimeConfig.value.addons['valaxy-addon-waline'])
 const router = useRouter()
 const post = useFrontmatter()
 
@@ -43,7 +46,7 @@ function displayTag(tag: string) {
         <HairyImageGlobal>
           <router-view />
         </HairyImageGlobal>
-        <HairyPostFooter />
+        <HairyPostFooter v-if="addonWaline.options?.pageview" />
       </template>
       <template #slide>
         <HairyTabbar />

package/library/loading.ts

@@ -1,8 +1,8 @@
 import './loading.scss'
 import { ref } from 'vue'
 import type { ViteSSGContext } from 'vite-ssg'
-import { createDeferred } from '@hairy/utils'
 import Seto from '../styles/fonts/Seto.ttf?url'
+import { createDeferred } from '../utils'
 
 export const fontFaceDeferred = createDeferred<void>()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-hairy",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "packageManager": "pnpm@8.10.5",
   "author": {
     "email": "wwu710632@gmail.com",
@@ -21,7 +21,6 @@
   "main": "client/index.ts",
   "types": "types/index.d.ts",
   "dependencies": {
-    "@hairy/utils": "^0.6.8",
     "@overlastic/vue": "^0.4.7",
     "element-plus": "^2.7.6",
     "pinia": "^2.1.7",

package/utils/index.ts

@@ -1,37 +1,2 @@
-export function ejectWindow(url: string) {
-  const link = document.createElement('a')
-  link.href = url
-  link.target = '_blank'
-  link.click()
-  link.remove()
-}
-
-export function riposte<T>(...args: [cond: boolean, value: T][]) {
-  for (const [cond, value] of args) {
-    if (cond)
-      return value
-  }
-}
-
-export function toArray<T>(value: T | T[]): T[] {
-  if (Array.isArray(value))
-    return value as any
-  else return [value].filter(Boolean) as any
-}
-
-export function removeTags(content = '') {
-  return content
-    .replace(/<\/?[^>]*>/g, '')
-    .replace(/[|]*\n/, '')
-}
-
-export function getArchiveLink(year?: string, month?: string) {
-  if (!year)
-    return '/archives/'
-  if (!month)
-    return `/archives/${year}`
-  if (month)
-    return `/archives/${year}/${month}`
-
-  return ''
-}
+export * from './size'
+export * from './util'

package/utils/size.ts

@@ -0,0 +1,40 @@
+
+function isString(val: any) {
+  return typeof val === 'string'
+}
+
+function isNumber(val: any) {
+  return typeof val === 'number'
+}
+
+export function atWillToUnit(value: any, unit = 'px') {
+  if (!(isString(value) || isNumber(value)))
+    return ''
+  return (isString(value) && /\D/g.test(value)) ? value : value + unit
+}
+
+/** size 转换配置 */
+export type AtWillSize = any | [any, any] | { width: any; height: any }
+export interface Size { width: string; height: string }
+
+/**
+ * 将 size 转换为宽高，用于元素宽高
+ * @param size AtWillSize
+ * @returns
+ */
+export function atWillToSize(size: AtWillSize, unit?: string): Size {
+  const _atWillToUnit = (value: any) => atWillToUnit(value, unit)
+  // 单数值正方形
+  if (typeof size === 'string' || typeof size === 'number')
+    return { width: _atWillToUnit(size), height: _atWillToUnit(size) }
+
+  // 数组形式尺寸
+  if (Array.isArray(size))
+    return { width: _atWillToUnit(size[0]), height: _atWillToUnit(size[1]) }
+
+  // 对象形式尺寸
+  if (typeof size === 'object')
+    return { width: _atWillToUnit(size.width), height: _atWillToUnit(size.height) }
+
+  return { width: '', height: '' }
+}

package/utils/util.ts

@@ -0,0 +1,59 @@
+export function ejectWindow(url: string) {
+  const link = document.createElement('a')
+  link.href = url
+  link.target = '_blank'
+  link.click()
+  link.remove()
+}
+
+export function riposte<T>(...args: [cond: boolean, value: T][]) {
+  for (const [cond, value] of args) {
+    if (cond)
+      return value
+  }
+}
+
+export function toArray<T>(value: T | T[]): T[] {
+  if (Array.isArray(value))
+    return value as any
+  else return [value].filter(Boolean) as any
+}
+
+export function removeTags(content = '') {
+  return content
+    .replace(/<\/?[^>]*>/g, '')
+    .replace(/[|]*\n/, '')
+}
+
+export function getArchiveLink(year?: string, month?: string) {
+  if (!year)
+    return '/archives/'
+  if (!month)
+    return `/archives/${year}`
+  if (month)
+    return `/archives/${year}/${month}`
+
+  return ''
+}
+
+export type Deferred<T = void> = Promise<T> & {
+  resolve: (value: T) => void
+  reject: (value?: any) => void
+}
+
+export function createDeferred<T = void>(): Deferred<T> {
+  let resolve: any, reject: any
+
+  const promise = new Promise<any>((_resolve, _reject) => {
+    resolve = _resolve
+    reject = _reject
+  }) as unknown as any
+
+  promise.resolve = (v: any) => {
+    resolve(v)
+    return promise
+  }
+  promise.reject = reject
+
+  return promise
+}