From 2d083d89180df6135a922989fb07eb3c295656eb Mon Sep 17 00:00:00 2001
From: sup39 <sup39@sup39.dev>
Date: Fri, 4 Nov 2022 22:05:14 +0900
Subject: [PATCH] add Footer, site name

---
 components/Footer.tsx    |  6 +++---
 components/MDXRoot.tsx   | 10 +++++++---
 components/NavHeader.tsx |  4 +++-
 package.json             |  2 +-
 supMDX-env.d.ts          |  7 +++++--
 supMDX.yml               |  6 ++++--
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/components/Footer.tsx b/components/Footer.tsx
index da64091..7321a86 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -1,10 +1,10 @@
 import config from '#config';
 
 export default function Footer() {
-  const {startYear: year0, siteAuthor} = config;
   const year = new Date().getFullYear();
+  const {site: {startYear: year0 = year, author} = {}} = config;
 
-  return <footer>{siteAuthor &&
-    <div>Copyright © {year>year0 ? `${year0}-${year}` : year} {siteAuthor} All rights reserved.</div>
+  return <footer>{author &&
+    <div>Copyright © {year>year0 ? `${year0}-${year}` : year} {author} All rights reserved.</div>
   }</footer>;
 }
diff --git a/components/MDXRoot.tsx b/components/MDXRoot.tsx
index c83be36..d078d9b 100644
--- a/components/MDXRoot.tsx
+++ b/components/MDXRoot.tsx
@@ -1,5 +1,6 @@
 import Head from 'next/head';
 import Nav from './Nav';
+import Footer from './Footer';
 import MetaInfo from './MetaInfo';
 import type {HeadingInfo} from '@sup39/rehype-mdx-export-headings';
 
@@ -27,9 +28,12 @@ export default function MDXRoot({children, data: {pathname}, meta={}, headings}:
     </Head>
     <Nav pathname={pathname} headings={headings} />
     <main>
-      {h1 ? <h1>{h1}</h1> : <></>}
-      <MetaInfo data={meta} />
-      {children}
+      <article>
+        {h1 ? <h1>{h1}</h1> : <></>}
+        <MetaInfo data={meta} />
+        {children}
+      </article>
     </main>
+    <Footer />
   </>;
 }
diff --git a/components/NavHeader.tsx b/components/NavHeader.tsx
index 2224984..60e5222 100644
--- a/components/NavHeader.tsx
+++ b/components/NavHeader.tsx
@@ -1,9 +1,11 @@
 import Link from 'next/link';
+import config from '#config';
 
 export default function NavHeader({onToggleFold}: {onToggleFold?: ()=>void}) {
+  const {site: {name: siteName = 'supMDX'} = {}} = config;
   return <header>
     <Link href="/" id="icon-link">
-      <div style={{fontSize: '1.5em'}}>supMDX</div>
+      <div style={{fontSize: '1.5em'}}>{siteName}</div>
     </Link>
     <div className="menu-toggle" onClick={onToggleFold} />
   </header>;
diff --git a/package.json b/package.json
index fde51ae..1fbebb4 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.md,.mdx ."
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx,.mdx ."
   },
   "eslintConfig": {
     "extends": [
diff --git a/supMDX-env.d.ts b/supMDX-env.d.ts
index f352d95..9fbd2da 100644
--- a/supMDX-env.d.ts
+++ b/supMDX-env.d.ts
@@ -1,8 +1,11 @@
 declare module '#config' {
   import type {NavEntry} from '@/Nav';
   type Config = {
-    startYear: number
-    siteAuthor?: string
+    site: {
+      startYear: number
+      author: string
+      name: string
+    }
     metaFields?: {label: string, prop: string}[]
     nav: NavEntry[]
   };
diff --git a/supMDX.yml b/supMDX.yml
index fa3330e..f7a66ce 100644
--- a/supMDX.yml
+++ b/supMDX.yml
@@ -1,5 +1,7 @@
-startYear: 2022
-siteAuthor: <Edit author name in supMDX.yml>
+site:
+  startYear: 2022
+  author: <Edit author name in supMDX.yml>
+  name: <Site Name>
 metaFields:
   - {prop: author, label: 'Author: '}
   - {prop: createdAt, label: 'Created at '}