fix(使所有主题的404能够正常运转)

(cherry picked from commit 3e3b7667d043522a3d782b804815b8f1683127d1)

themes/commerce/index.js

@@ -246,7 +246,7 @@ const LayoutSlug = props => {
       <div className='w-full max-w-screen-xl mx-auto lg:hover:shadow lg:border lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black article'>
         {lock && <ArticleLock validPassword={validPassword} />}
 
-        {!lock && (
+        {!lock && post && (
           <div
             id='article-wrapper'
             className='overflow-x-auto flex-grow mx-auto md:w-full md:px-5 '>

themes/example/index.js

@@ -178,7 +178,7 @@ const LayoutSlug = props => {
     <>
       {lock ? (
         <PostLock validPassword={validPassword} />
-      ) : (
+      ) : post && (
         <div>
           <PostMeta post={post} />
           <div id='article-wrapper'>

themes/fukasawa/index.js

@@ -159,7 +159,7 @@ const LayoutSlug = props => {
     <>
       {lock ? (
         <ArticleLock validPassword={validPassword} />
-      ) : (
+      ) : post && (
         <ArticleDetail {...props} />
       )}
     </>

themes/game/index.js

@@ -307,7 +307,7 @@ const LayoutSlug = props => {
     <>
       {lock && <ArticleLock validPassword={validPassword} />}
 
-      {!lock && (
+      {!lock && post && (
         <div id='article-wrapper'>
           <div className='game-detail-wrapper w-full grow flex'>
             <div className={`w-full md:py-2`}>

themes/heo/index.js

@@ -292,7 +292,7 @@ const LayoutSlug = props => {
         {/* 文章锁 */}
         {lock && <PostLock validPassword={validPassword} />}
 
-        {!lock && (
+        {!lock && post && (
           <div className='mx-auto md:w-full md:px-5'>
             {/* 文章主体 */}
             <article

themes/hexo/index.js

@@ -286,7 +286,7 @@ const LayoutSlug = props => {
       <div className='w-full lg:hover:shadow lg:border rounded-t-xl lg:rounded-xl lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black article'>
         {lock && <ArticleLock validPassword={validPassword} />}
 
-        {!lock && (
+        {!lock && post && (
           <div className='overflow-x-auto flex-grow mx-auto md:w-full md:px-5 '>
             <article
               id='article-wrapper'

themes/magzine/index.js

@@ -177,7 +177,7 @@ const LayoutSlug = props => {
         {/* 文章锁 */}
         {lock && <ArticleLock validPassword={validPassword} />}
 
-        {!lock && (
+        {!lock && post && (
           <div className='w-full max-w-screen-3xl mx-auto'>
             {/* 文章信息 */}
             <ArticleInfo {...props} />

themes/matery/index.js

@@ -253,7 +253,7 @@ const LayoutSlug = props => {
           className={`${fullWidth ? '' : '-mt-32'} transition-all duration-300 rounded-md mx-3 lg:border lg:rounded-xl lg:py-4 bg-white dark:bg-hexo-black-gray  dark:border-black`}>
           {lock && <ArticleLock validPassword={validPassword} />}
 
-          {!lock && (
+          {!lock && post && (
             <div className='overflow-x-auto md:w-full px-3 '>
               {/* 文章信息 */}
               {post?.type && post?.type === 'Post' && (

themes/medium/index.js

@@ -209,7 +209,7 @@ const LayoutSlug = props => {
       {/* 文章锁 */}
       {lock && <ArticleLock validPassword={validPassword} />}
 
-      {!lock && (
+      {!lock && post && (
         <div>
           {/* 文章信息 */}
           <ArticleInfo {...props} />

themes/movie/index.js

@@ -315,7 +315,7 @@ const LayoutSlug = props => {
 
   return (
     <>
-      {!lock ? (
+      {!lock ? post && (
         <div
           id='article-wrapper'
           className='px-2 max-w-5xl 2xl:max-w-[70%] mx-auto'>

themes/nobelium/index.js

@@ -243,7 +243,7 @@ const LayoutSlug = props => {
     <>
       {lock && <ArticleLock validPassword={validPassword} />}
 
-      {!lock && (
+      {!lock && post && (
         <div className='px-2'>
           <>
             <ArticleInfo post={post} />

themes/photo/index.js

@@ -315,7 +315,7 @@ const LayoutSlug = props => {
 
   return (
     <>
-      {!lock ? (
+      {!lock ? post && (
         <div
           id='article-wrapper'
           className='px-2 max-w-5xl 2xl:max-w-[70%] mx-auto'>

themes/plog/index.js

@@ -198,7 +198,7 @@ const LayoutSlug = props => {
     <>
       {lock && <ArticleLock validPassword={validPassword} />}
 
-      {!lock && (
+      {!lock && post && (
         <div className='px-2 my-16 max-w-6xl mx-auto'>
           <>
             <ArticleInfo post={post} />

themes/simple/index.js

@@ -224,35 +224,37 @@ const LayoutSlug = props => {
     <>
       {lock && <ArticleLock validPassword={validPassword} />}
 
-      <div className={`px-2  ${fullWidth ? '' : 'xl:max-w-4xl 2xl:max-w-6xl'}`}>
-        {/* 文章信息 */}
-        <ArticleInfo post={post} />
+      {!lock && post && (
+        <div className={`px-2  ${fullWidth ? '' : 'xl:max-w-4xl 2xl:max-w-6xl'}`}>
+          {/* 文章信息 */}
+          <ArticleInfo post={post} />
 
-        {/* 广告嵌入 */}
-        {/* <AdSlot type={'in-article'} /> */}
-        <WWAds orientation='horizontal' className='w-full' />
+          {/* 广告嵌入 */}
+          {/* <AdSlot type={'in-article'} /> */}
+          <WWAds orientation='horizontal' className='w-full' />
 
-        <div id='article-wrapper'>
-          {/* Notion文章主体 */}
-          {!lock && <NotionPage post={post} />}
+          <div id='article-wrapper'>
+            {/* Notion文章主体 */}
+            {!lock && <NotionPage post={post} />}
+          </div>
+
+          {/* 分享 */}
+          <ShareBar post={post} />
+
+          {/* 广告嵌入 */}
+          <AdSlot type={'in-article'} />
+
+          {post?.type === 'Post' && (
+            <>
+              <ArticleAround prev={prev} next={next} />
+              <RecommendPosts recommendPosts={recommendPosts} />
+            </>
+          )}
+
+          {/* 评论区 */}
+          <Comment frontMatter={post} />
         </div>
-
-        {/* 分享 */}
-        <ShareBar post={post} />
-
-        {/* 广告嵌入 */}
-        <AdSlot type={'in-article'} />
-
-        {post?.type === 'Post' && (
-          <>
-            <ArticleAround prev={prev} next={next} />
-            <RecommendPosts recommendPosts={recommendPosts} />
-          </>
-        )}
-
-        {/* 评论区 */}
-        <Comment frontMatter={post} />
-      </div>
+      )}
     </>
   )
 }

themes/starter/index.js

@@ -159,7 +159,7 @@ const LayoutSlug = props => {
           <div id='container-inner' className='w-full p-4'>
             {lock && <ArticleLock validPassword={validPassword} />}
 
-            {!lock && (
+            {!lock && post && (
               <div id='article-wrapper' className='mx-auto'>
                 <NotionPage {...props} />
                 <Comment frontMatter={post} />