♻️ layout

vantezzen · Jun 20, 2021 · 2f6f331 · 2f6f331
1 parent 16bf35d
commit 2f6f331
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 167 deletions.
diff --git a/layouts/fullwidth.js b/layouts/fullwidth.js
diff --git a/layouts/default.js → layouts/layout.js b/layouts/default.js → layouts/layout.js
@@ -32,7 +32,7 @@ const mapPageUrl = id => {
   return 'https://www.notion.so/' + id.replace(/-/g, '')
 }
 
-const DefaultLayout = ({ children, blockMap, frontMatter, emailHash }) => {
+const Layout = ({ children, blockMap, frontMatter, emailHash, fullWidth = false }) => {
   const locale = useLocale()
   const router = useRouter()
   const cusdisI18n = ['zh-cn', 'es', 'tr', 'pt-BR', 'oc']
@@ -43,6 +43,7 @@ const DefaultLayout = ({ children, blockMap, frontMatter, emailHash }) => {
       description={frontMatter.summary}
       // date={new Date(frontMatter.publishedAt).toISOString()}
       type="article"
+      fullWidth={fullWidth}
     >
       <article>
         <h1 className="font-bold text-3xl text-black dark:text-white">
@@ -144,4 +145,4 @@ const DefaultLayout = ({ children, blockMap, frontMatter, emailHash }) => {
   )
 }
 
-export default DefaultLayout
+export default Layout
diff --git a/pages/[slug].js b/pages/[slug].js
@@ -1,27 +1,17 @@
-import DefaultLayout from '@/layouts/default'
-import FullWidthLayout from '@/layouts/fullwidth'
+import Layout from '@/layouts/layout'
 import { getAllPosts, getPostBlocks } from '@/lib/notion'
 import BLOG from '@/blog.config'
 import { createHash } from 'crypto'
 
 const BlogPost = ({ post, blockMap, emailHash }) => {
   if (!post) return null
   return (
-    <>
-      {post.fullWidth ? (
-        <FullWidthLayout
-          blockMap={blockMap}
-          frontMatter={post}
-          emailHash={emailHash}
-        ></FullWidthLayout>
-      ) : (
-        <DefaultLayout
-          blockMap={blockMap}
-          frontMatter={post}
-          emailHash={emailHash}
-        ></DefaultLayout>
-      )}
-    </>
+    <Layout
+      blockMap={blockMap}
+      frontMatter={post}
+      emailHash={emailHash}
+      fullWidth={post.fullWidth}
+    />
   )
 }