valaxy 0.19.7 → 0.19.9

package/client/components/ValaxyLogo.vue

@@ -5,7 +5,7 @@ import valaxyLogoPng from '../assets/images/valaxy-logo.png'
 <template>
   <div class="valaxy-logo-container" relative inline-flex justify="center" items="center">
     <div class="absolute bg-img" />
-    <img w="50" aspect="420/386" m="auto" :src="valaxyLogoPng" alt="Valaxy Logo" z="1">
+    <img class="fly-animation" w="50" aspect="420/386" m="auto" :src="valaxyLogoPng" alt="Valaxy Logo" z="1">
   </div>
 </template>
 

package/client/pages/[...path].vue

@@ -6,8 +6,6 @@ const router = useRouter()
 const route = useRoute()
 
 onBeforeMount(() => {
-  router.push('/')
-
   // compatible for post url ends with slash
   if (route.path !== '/' && route.path.endsWith('/'))
     router.replace(route.path.slice(0, -1))

package/client/utils/time.ts

@@ -1,21 +1,65 @@
-import { format } from 'date-fns'
+import type { ToDateOptionsWithTZ } from 'date-fns-tz'
+import { format as formatWithTZ, toZonedTime } from 'date-fns-tz'
+import { format, toDate } from 'date-fns'
+import { useSiteConfig } from 'valaxy'
+import { useI18n } from 'vue-i18n'
+import { DateTime } from 'luxon'
 import type { Post } from '../../types'
 
+const referenceDate = new Date(1986, 3 /* Apr */, 4, 10, 32, 0, 900)
+
 /**
- * date-fns format date
- * @param date
- * @param template
+ * format the date
+ * @param date the original date
+ * @param formatStr the string of tokens
+ * @param timezone the time zone of this local time, can be an offset or IANA time zone
+ * @param options the object with options. See [Options]{@link https://date-fns.org/docs/Options}
  */
-export function formatDate(date: string | number | Date, template = 'yyyy-MM-dd') {
-  return format(date, template)
+export function formatDate(date: string | number | Date, formatStr = 'yyyy-MM-dd', timezone?: string, options?: ToDateOptionsWithTZ): string {
+  const { locale } = useI18n()
+  const siteConfig = useSiteConfig()
+
+  const mergedOptions: ToDateOptionsWithTZ = Object.assign({ locale: { code: locale.value } }, options)
+  const clientTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+
+  try {
+    /**
+     * Format the timezone-less date to ISO. If none is specified, use the client's timezone.
+     * If the input date is already in ISO format, the timezone won't be applied.
+     */
+    date = handleTimeWithZone(date, timezone || siteConfig.value.timezone || clientTimezone).toString()
+    // Convert to the client's timezone unless the user specifies otherwise
+    const zonedDate = toZonedTime(date, options?.timeZone || clientTimezone, mergedOptions)
+    // The format function will never change the underlying date
+    return formatWithTZ(zonedDate, formatStr, { timeZone: options?.timeZone })
+  }
+  catch (error) {
+    console.error(
+      'The date format provided is non-standard. The recommended format is \'yyyy-MM-dd HH:mm:ss\'',
+      '\nError formatting date:',
+      date.toString(),
+      error,
+    )
+    return format(referenceDate, formatStr)
+  }
 }
 
-/**
- * date-fns format date with 'yyyy-MM-dd HH:mm:ss'
- * @param date
- */
-export function formatTimestamp(date: string | number | Date): string {
-  return format(date, 'yyyy-MM-dd HH:mm:ss')
+function handleTimeWithZone(date: string | number | Date, timezone: string) {
+  if (typeof date !== 'string')
+    date = toDate(date).toISOString()
+
+  let dateTime = DateTime.fromISO(date, { setZone: true })
+
+  const toDateTime = (date: string, zone: string) => {
+    // Attempt to format the date using a function that handles non-ISO 8601 formats
+    const isoDate = format(date, 'yyyy-MM-dd\'T\'HH:mm:ss')
+    return DateTime.fromISO(isoDate, { zone })
+  }
+
+  if (!dateTime.isValid || !dateTime.zoneName)
+    dateTime = toDateTime(date, timezone)
+
+  return dateTime
 }
 
 /**

package/client/utils/wrap.ts

@@ -14,6 +14,8 @@ export function wrap(el: HTMLElement, className: string) {
  */
 export function wrapTable(container: HTMLElement | Document = document) {
   container.querySelectorAll('table').forEach((el) => {
+    if (el.parentElement?.classList.contains('table-container'))
+      return
     const container = document.createElement('div')
     container.className = 'table-container'
     wrap(el, 'table-container')