valaxy 0.25.10 → 0.26.0

package/client/composables/app/useValaxyApp.ts

@@ -5,8 +5,9 @@ import { useSeoMeta } from '@unhead/vue'
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useFrontmatter, useValaxyHead, useValaxyI18n } from '../../composables'
+import { useRoute } from 'vue-router'
 
+import { useFrontmatter, useLocale, useValaxyHead, useValaxyI18n } from '../../composables'
 import { useTimezone } from '../../composables/global'
 // https://github.com/vueuse/head
 // you can use this to manipulate the document head in any components,
@@ -23,6 +24,13 @@ export function useValaxyApp() {
 
   const title = computed(() => $tO(fm.value.title))
 
+  const route = useRoute()
+  const { toggleLocale } = useLocale()
+  // if lang exist, toggle the locale
+  if (route.query.lang) {
+    toggleLocale(route.query.lang as string)
+  }
+
   // seo
   // todo: get first image url from markdown
   const siteUrl = computed(() => fm.value.url || siteConfig.value.url)
@@ -59,6 +67,5 @@ export function useValaxyApp() {
   ])
 
   useTimezone()
-
   useValaxyHead()
 }

package/client/composables/decrypt.ts

@@ -15,7 +15,7 @@ export function getKeyMaterial(password: string) {
   )
 }
 
-export function getKey(keyMaterial: CryptoKey, salt: Uint8Array) {
+export function getKey(keyMaterial: CryptoKey, salt: BufferSource) {
   return window.crypto.subtle.deriveKey(
     {
       name: 'PBKDF2',

package/client/composables/features/collapse-code.ts

@@ -35,7 +35,7 @@ export function useCollapseCode() {
 
   useEventListener('click', (e) => {
     const el = e.target as HTMLElement
-    if (el.matches('[class*="language-"] > button.collapse')) {
+    if (el.matches('[class*="language-"] > button.code-block-unfold-btn')) {
       const parent = el.parentElement
       parent?.classList.remove('folded')
       const codeHeightLimitClass = `max-h-${codeHeightLimit}px`

package/client/composables/locale.ts

@@ -17,24 +17,32 @@ export function useLocale() {
   // setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
   dayjs.locale(locale.value === 'zh-CN' ? 'zh-cn' : 'en')
 
-  const toggleLocales = () => {
-    // change to some real logic
-    const locales = availableLocales
-
-    locale.value = locales[(locales.indexOf(locale.value) + 1) % locales.length]
+  /**
+   * toggle to new locale
+   * @param newLocale
+   */
+  function toggleLocale(newLocale: string) {
+    locale.value = newLocale
     // for localStorage
-    lang.value = locale.value
-
+    lang.value = newLocale
     // set date locale
     // setDefaultOptions({ locale: locale.value === 'zh-CN' ? zhCN : enUS })
-    dayjs.locale(locale.value === 'zh-CN' ? 'zh-cn' : 'en')
-
+    dayjs.locale(newLocale === 'zh-CN' ? 'zh-cn' : 'en')
     if (isClient)
-      document.documentElement.setAttribute('lang', locale.value)
+      document.documentElement.setAttribute('lang', newLocale)
+  }
+
+  const toggleLocales = () => {
+    // change to some real logic
+    const locales = availableLocales
+    locale.value = locales[(locales.indexOf(locale.value) + 1) % locales.length]
+    const newLocale = locale.value
+    toggleLocale(newLocale)
   }
 
   return {
     lang,
+    toggleLocale,
     toggleLocales,
   }
 }

package/client/styles/common/code.scss

@@ -227,7 +227,7 @@ html:not(.dark) .vp-code-dark {
   }
 
   // collapse
-  [class*='language-']>button.collapse {
+  [class*='language-']>button.code-block-unfold-btn {
     display: none;
     position: absolute;
     z-index: 10;
@@ -251,7 +251,7 @@ html:not(.dark) .vp-code-dark {
     }
   }
 
-  [class*='language-'].folded>button.collapse {
+  [class*='language-'].folded>button.code-block-unfold-btn {
     display: block;
   }
 }