From df868f3d21d603eed2e44480ba50444c6b9775a7 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Mon, 10 Jul 2023 11:00:29 +0800
Subject: [PATCH] fix date

---
 lib/formatDate.js                           | 4 +++-
 themes/fukasawa/components/ArticleDetail.js | 4 +---
 themes/hexo/components/HeaderArticle.js     | 8 +-------
 themes/hexo/index.js                        | 9 ---------
 themes/matery/components/ArticleInfo.js     | 4 +---
 themes/nobelium/components/ArticleInfo.js   | 5 +----
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/lib/formatDate.js b/lib/formatDate.js
index 0d752555..5eb586bf 100644
--- a/lib/formatDate.js
+++ b/lib/formatDate.js
@@ -9,10 +9,12 @@ export default function formatDate (date, local) {
   const d = new Date(date)
   const options = { year: 'numeric', month: 'short', day: 'numeric' }
   const res = d.toLocaleDateString(local, options)
-  return local.slice(0, 2).toLowerCase() === 'zh'
+  const format = local.slice(0, 2).toLowerCase() === 'zh'
     ? res.replace('年', '-').replace('月', '-').replace('日', '')
     : res
+  return format
 }
+
 export function formatDateFmt (timestamp, fmt) {
   const date = new Date(timestamp)
   const o = {
diff --git a/themes/fukasawa/components/ArticleDetail.js b/themes/fukasawa/components/ArticleDetail.js
index c874a200..21138fa1 100644
--- a/themes/fukasawa/components/ArticleDetail.js
+++ b/themes/fukasawa/components/ArticleDetail.js
@@ -2,7 +2,6 @@ import TagItemMini from './TagItemMini'
 import Comment from '@/components/Comment'
 import NotionPage from '@/components/NotionPage'
 import ShareBar from '@/components/ShareBar'
-import formatDate from '@/lib/formatDate'
 import { useGlobal } from '@/lib/global'
 import Link from 'next/link'
 import ArticleAround from './ArticleAround'
@@ -19,7 +18,6 @@ export default function ArticleDetail(props) {
   if (!post) {
     return <></>
   }
-  const date = formatDate(post?.publishTime, locale.LOCALE)
   return (
     <div id="container" className="max-w-5xl overflow-x-auto flex-grow mx-auto w-screen md:w-full ">
       {post?.type && !post?.type !== 'Page' && post?.pageCover && (
@@ -59,7 +57,7 @@ export default function ArticleDetail(props) {
                   passHref
                   className="pl-1 mr-2 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 border-b dark:border-gray-500 border-dashed">
 
-                  {date}
+                  {post?.publishTime}
 
                 </Link>
                 <span className='mr-2'>|</span>
diff --git a/themes/hexo/components/HeaderArticle.js b/themes/hexo/components/HeaderArticle.js
index 82cc1ee2..b5384a1f 100644
--- a/themes/hexo/components/HeaderArticle.js
+++ b/themes/hexo/components/HeaderArticle.js
@@ -1,7 +1,6 @@
 import Link from 'next/link'
 import TagItemMini from './TagItemMini'
 import { useGlobal } from '@/lib/global'
-import formatDate from '@/lib/formatDate'
 import BLOG from '@/blog.config'
 import NotionIcon from '@/components/NotionIcon'
 
@@ -13,11 +12,6 @@ export default function HeaderArticle({ post, siteInfo }) {
   }
   const headerImage = post?.pageCover ? `url("${post.pageCover}")` : `url("${siteInfo?.pageCover}")`
 
-  const date = formatDate(
-    post?.publishTime,
-    locale.LOCALE
-  )
-
   return (
     <div
       id="header"
@@ -53,7 +47,7 @@ export default function HeaderArticle({ post, siteInfo }) {
                     passHref
                     className="pl-1 mr-2 cursor-pointer hover:underline">
 
-                    {locale.COMMON.POST_TIME}:{date}
+                    {locale.COMMON.POST_TIME}:{post?.publishTime}
 
                   </Link>
                 </>
diff --git a/themes/hexo/index.js b/themes/hexo/index.js
index 98095ee1..3e1d6846 100644
--- a/themes/hexo/index.js
+++ b/themes/hexo/index.js
@@ -199,15 +199,6 @@ const LayoutSlug = props => {
   const { post, lock, validPassword } = props
   const drawerRight = useRef(null)
 
-  if (!post) {
-    return <LayoutBase
-            {...props}
-            showTag={false}
-            showCategory={false}
-            headerSlot={<HeaderArticle {...props} />}
-        ></LayoutBase>
-  }
-
   const targetRef = isBrowser() ? document.getElementById('article-wrapper') : null
 
   const floatSlot = <>
diff --git a/themes/matery/components/ArticleInfo.js b/themes/matery/components/ArticleInfo.js
index 4fd2cf8b..af61bb72 100644
--- a/themes/matery/components/ArticleInfo.js
+++ b/themes/matery/components/ArticleInfo.js
@@ -1,6 +1,5 @@
 import Link from 'next/link'
 import { useGlobal } from '@/lib/global'
-import formatDate from '@/lib/formatDate'
 import TagItemMiddle from './TagItemMiddle'
 import WordCount from './WordCount'
 
@@ -8,7 +7,6 @@ export const ArticleInfo = (props) => {
   const { post } = props
 
   const { locale } = useGlobal()
-  const date = formatDate(post?.publishTime, locale.LOCALE)
 
   return (
       <section className='mb-3 dark:text-gray-200'>
@@ -29,7 +27,7 @@ export const ArticleInfo = (props) => {
                         passHref
                         className="cursor-pointer whitespace-nowrap">
 
-                        <i className='far fa-calendar-minus fa-fw'/> {locale.COMMON.POST_TIME}:{date}
+                        <i className='far fa-calendar-minus fa-fw'/> {locale.COMMON.POST_TIME}:{post?.publishTime}
 
                     </Link>
                     <span className='whitespace-nowrap'>
diff --git a/themes/nobelium/components/ArticleInfo.js b/themes/nobelium/components/ArticleInfo.js
index fc6e70fc..e2b3e1c1 100644
--- a/themes/nobelium/components/ArticleInfo.js
+++ b/themes/nobelium/components/ArticleInfo.js
@@ -33,10 +33,7 @@ export const ArticleInfo = (props) => {
               <span className="block">&nbsp;/&nbsp;</span>
             </div>
             <div className="mr-2 mb-4 md:ml-0">
-              {formatDate(
-                post?.publishTime || post?.createdTime,
-                BLOG.LANG
-              )}
+              {post?.publishTime}
             </div>
             {post.tags && (
               <div className="flex flex-nowrap max-w-full overflow-x-auto article-tags">