book: retire noHeader prop

tima101 · tima101 · commit 8f794840476e · 2019-06-27T11:56:01.000-07:00
diff --git a/book/4-end/lib/withAuth.js b/book/4-end/lib/withAuth.js
@@ -65,4 +65,4 @@ export default (Page, { loginRequired = true, logoutRequired = false } = {}) =>
 
       return <Page {...this.props} />;
     }
-};
+  };
diff --git a/book/7-end/lib/withAuth.js b/book/7-end/lib/withAuth.js
@@ -6,8 +6,9 @@ let globalUser = null;
 
 export default (
   Page,
-  { loginRequired = true, logoutRequired = false, adminRequired = false, noHeader = false } = {},
-) => class BaseComponent extends React.Component {
+  { loginRequired = true, logoutRequired = false, adminRequired = false } = {},
+) =>
+  class BaseComponent extends React.Component {
     static propTypes = {
       user: PropTypes.shape({
         id: PropTypes.string,
@@ -49,7 +50,7 @@ export default (
         user._id = user._id.toString();
       }
 
-      const props = { user, isFromServer, noHeader };
+      const props = { user, isFromServer };
 
       if (Page.getInitialProps) {
         Object.assign(props, (await Page.getInitialProps(ctx)) || {});
diff --git a/book/7-end/pages/_app.js b/book/7-end/pages/_app.js
@@ -37,7 +37,6 @@ class MyApp extends App {
     const { Component, pageProps } = this.props;
 
     // console.log(pageProps);
-    // console.log(pageProps.noHeader);
 
     return (
       <Container>
@@ -46,7 +45,7 @@ class MyApp extends App {
         <ThemeProvider theme={theme}>
           {/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
           <CssBaseline />
-          {pageProps.noHeader ? null : <Header {...pageProps} />}
+          {pageProps.chapter ? null : <Header {...pageProps} />}
           <Component {...pageProps} />
           <Notifier />
         </ThemeProvider>
diff --git a/book/7-end/pages/public/read-chapter.js b/book/7-end/pages/public/read-chapter.js
@@ -328,4 +328,4 @@ class ReadChapter extends React.Component {
   }
 }
 
-export default withAuth(ReadChapter, { loginRequired: false, noHeader: true });
+export default withAuth(ReadChapter, { loginRequired: false });
diff --git a/book/8-begin/lib/withAuth.js b/book/8-begin/lib/withAuth.js
@@ -6,7 +6,7 @@ let globalUser = null;
 
 export default (
   Page,
-  { loginRequired = true, logoutRequired = false, adminRequired = false, noHeader = false } = {},
+  { loginRequired = true, logoutRequired = false, adminRequired = false } = {},
 ) =>
   class BaseComponent extends React.Component {
     static propTypes = {
@@ -50,7 +50,7 @@ export default (
         user._id = user._id.toString();
       }
 
-      const props = { user, isFromServer, noHeader };
+      const props = { user, isFromServer };
 
       if (Page.getInitialProps) {
         Object.assign(props, (await Page.getInitialProps(ctx)) || {});
diff --git a/book/8-begin/pages/_app.js b/book/8-begin/pages/_app.js
@@ -37,7 +37,6 @@ class MyApp extends App {
     const { Component, pageProps } = this.props;
 
     // console.log(pageProps);
-    // console.log(pageProps.noHeader);
 
     return (
       <Container>
@@ -46,7 +45,7 @@ class MyApp extends App {
         <ThemeProvider theme={theme}>
           {/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
           <CssBaseline />
-          {pageProps.noHeader ? null : <Header {...pageProps} />}
+          {pageProps.chapter ? null : <Header {...pageProps} />}
           <Component {...pageProps} />
           <Notifier />
         </ThemeProvider>
diff --git a/book/8-begin/pages/public/read-chapter.js b/book/8-begin/pages/public/read-chapter.js
@@ -21,7 +21,7 @@ class ReadChapter extends React.Component {
   static propTypes = {
     chapter: PropTypes.shape({
       _id: PropTypes.string.isRequired,
-      isPurchased: PropTypes.bool.isRequired,
+      isPurchased: PropTypes.bool,
       isFree: PropTypes.bool.isRequired,
       htmlContent: PropTypes.string,
       htmlExcerpt: PropTypes.string,
@@ -330,4 +330,4 @@ class ReadChapter extends React.Component {
   }
 }
 
-export default withAuth(ReadChapter, { loginRequired: false, noHeader: true });
+export default withAuth(ReadChapter, { loginRequired: false });
diff --git a/book/8-end/lib/withAuth.js b/book/8-end/lib/withAuth.js
@@ -6,8 +6,9 @@ let globalUser = null;
 
 export default (
   Page,
-  { loginRequired = true, logoutRequired = false, adminRequired = false, noHeader = false } = {},
-) => class BaseComponent extends React.Component {
+  { loginRequired = true, logoutRequired = false, adminRequired = false } = {},
+) =>
+  class BaseComponent extends React.Component {
     static propTypes = {
       user: PropTypes.shape({
         id: PropTypes.string,
@@ -49,7 +50,7 @@ export default (
         user._id = user._id.toString();
       }
 
-      const props = { user, isFromServer, noHeader };
+      const props = { user, isFromServer };
 
       if (Page.getInitialProps) {
         Object.assign(props, (await Page.getInitialProps(ctx)) || {});
diff --git a/book/8-end/pages/_app.js b/book/8-end/pages/_app.js
@@ -37,7 +37,6 @@ class MyApp extends App {
     const { Component, pageProps } = this.props;
 
     // console.log(pageProps);
-    // console.log(pageProps.noHeader);
 
     return (
       <Container>
@@ -46,7 +45,7 @@ class MyApp extends App {
         <ThemeProvider theme={theme}>
           {/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
           <CssBaseline />
-          {pageProps.noHeader ? null : <Header {...pageProps} />}
+          {pageProps.chapter ? null : <Header {...pageProps} />}
           <Component {...pageProps} />
           <Notifier />
         </ThemeProvider>
diff --git a/book/8-end/pages/public/read-chapter.js b/book/8-end/pages/public/read-chapter.js
@@ -23,7 +23,7 @@ class ReadChapter extends React.Component {
   static propTypes = {
     chapter: PropTypes.shape({
       _id: PropTypes.string.isRequired,
-      isPurchased: PropTypes.bool.isRequired,
+      isPurchased: PropTypes.bool,
       isFree: PropTypes.bool.isRequired,
       htmlContent: PropTypes.string,
       htmlExcerpt: PropTypes.string,
@@ -35,11 +35,13 @@ class ReadChapter extends React.Component {
       asPath: PropTypes.string.isRequired,
     }).isRequired,
     showStripeModal: PropTypes.bool.isRequired,
+    noHeader: PropTypes.bool,
   };
 
   static defaultProps = {
     chapter: null,
     user: null,
+    noHeader: true,
   };
 
   constructor(props, ...args) {
@@ -353,5 +355,4 @@ class ReadChapter extends React.Component {
 
 export default withAuth(withRouter(ReadChapter), {
   loginRequired: false,
-  noHeader: true,
 });

Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,4 @@ export default (Page, { loginRequired = true, logoutRequired = false } = {}) =>`
`65`	`65`
`66`	`66`	`return <Page {...this.props} />;`
`67`	`67`	`}`
`68`		`-};`
	`68`	`+ };`
Original file line number	Diff line number	Diff line change
`@@ -328,4 +328,4 @@ class ReadChapter extends React.Component {`
`328`	`328`	`}`
`329`	`329`	`}`
`330`	`330`
`331`		`-export default withAuth(ReadChapter, { loginRequired: false, noHeader: true });`
	`331`	`+export default withAuth(ReadChapter, { loginRequired: false });`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ReadChapter extends React.Component {`
`21`	`21`	`static propTypes = {`
`22`	`22`	`chapter: PropTypes.shape({`
`23`	`23`	`_id: PropTypes.string.isRequired,`
`24`		`- isPurchased: PropTypes.bool.isRequired,`
	`24`	`+ isPurchased: PropTypes.bool,`
`25`	`25`	`isFree: PropTypes.bool.isRequired,`
`26`	`26`	`htmlContent: PropTypes.string,`
`27`	`27`	`htmlExcerpt: PropTypes.string,`
`@@ -330,4 +330,4 @@ class ReadChapter extends React.Component {`
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`
`333`		`-export default withAuth(ReadChapter, { loginRequired: false, noHeader: true });`
	`333`	`+export default withAuth(ReadChapter, { loginRequired: false });`