Clean up variables

cassidoo · cassidoo · commit 50b811537833 · 2020-05-01T20:26:19.000-07:00
diff --git a/components/Header.js b/components/Header.js
@@ -1,12 +1,12 @@
 import Link from 'next/link'
 
-export default function Header({ siteTitle = 'Demo Blog' }) {
+export default function Header() {
   return (
     <>
       <header className="header">
         <nav className="nav" role="navigation" aria-label="main navigation">
           <Link href="/">
-            <a>{siteTitle}</a>
+            <a>Demo Blog</a>
           </Link>
           <Link href="/about">
             <a>About</a>
diff --git a/components/Layout.js b/components/Layout.js
@@ -2,13 +2,7 @@ import Head from 'next/head'
 
 import Header from './Header'
 
-export default function Layout({
-  children,
-  pageTitle,
-  description,
-  siteTitle,
-  ...props
-}) {
+export default function Layout({ children, pageTitle, description, ...props }) {
   return (
     <>
       <Head>
@@ -67,7 +61,7 @@ export default function Layout({
         }
       `}</style>
       <section className="layout">
-        <Header siteTitle={siteTitle} />
+        <Header />
         <div className="content">{children}</div>
       </section>
       <footer>
diff --git a/pages/about.js b/pages/about.js
@@ -3,11 +3,7 @@ import Layout from '../components/Layout'
 const About = ({ title, description, ...props }) => {
   return (
     <>
-      <Layout
-        pathname="/about"
-        pageTitle={`${title} | About`}
-        description={description}
-      >
+      <Layout pageTitle={`${title} | About`} description={description}>
         <h1 className="title">Welcome to this demo blog!</h1>
 
         <p className="description">
diff --git a/pages/index.js b/pages/index.js
@@ -6,7 +6,7 @@ import getPosts from '../utils/getPosts'
 const Index = ({ posts, title, description, ...props }) => {
   return (
     <>
-      <Layout pathname="/" pageTitle={title} description={description}>
+      <Layout pageTitle={title} description={description}>
         <h1 className="title">Welcome to this demo blog!</h1>
 
         <p className="description">
diff --git a/pages/post/[postname].js b/pages/post/[postname].js
@@ -5,29 +5,29 @@ import ReactMarkdown from 'react-markdown'
 import Layout from '../../components/Layout'
 import getSlugs from '../../utils/getSlugs'
 
-export default function BlogTemplate(props) {
-  if (!props.frontmatter) return <></>
+export default function BlogPost({ siteTitle, frontmatter, markdownBody }) {
+  if (!frontmatter) return <></>
 
   return (
     <>
-      <Layout pageTitle={`${props.siteTitle} | ${props.frontmatter.title}`}>
+      <Layout pageTitle={`${siteTitle} | ${frontmatter.title}`}>
         <div className="back">
           ←{' '}
           <Link href="/">
             <a>Back to post list</a>
           </Link>
         </div>
         <article>
-          <h1>{props.frontmatter.title}</h1>
-          {props.frontmatter.hero_image && (
+          <h1>{frontmatter.title}</h1>
+          {frontmatter.hero_image && (
             <img
-              src={props.frontmatter.hero_image}
+              src={frontmatter.hero_image}
               className="hero"
-              alt={props.frontmatter.title}
+              alt={frontmatter.title}
             />
           )}
           <div>
-            <ReactMarkdown source={props.markdownBody} />
+            <ReactMarkdown source={markdownBody} />
           </div>
         </article>
       </Layout>
