main app: remove noHeader prop

Author: tima101

lib/withAuth.js

@@ -6,7 +6,7 @@ let globalUser = null;
 
 export default function withAuth(
   BaseComponent,
-  { loginRequired = true, logoutRequired = false, adminRequired = false, noHeader = false } = {},
+  { loginRequired = true, logoutRequired = false, adminRequired = false } = {},
 ) {
   class App extends React.PureComponent {
     static propTypes = {
@@ -29,7 +29,7 @@ export default function withAuth(
         user._id = user._id.toString();
       }
 
-      const props = { user, isFromServer, noHeader };
+      const props = { user, isFromServer };
 
       if (BaseComponent.getInitialProps) {
         Object.assign(props, (await BaseComponent.getInitialProps(ctx)) || {});

pages/_app.js

@@ -41,8 +41,7 @@ class MyApp extends App {
   render() {
     const { Component, pageProps } = this.props;
 
-    // console.log(pageProps);
-    // console.log(pageProps.noHeader);
+    console.log(pageProps);
 
     return (
       <Container>
@@ -51,7 +50,12 @@ 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 ||
+          pageProps.toc ||
+          pageProps.tutorials ||
+          pageProps.indexPage ? null : (
+            <Header {...pageProps} />
+          )}
           <Component {...pageProps} />
           <Notifier />
         </ThemeProvider>

pages/book.js

@@ -49,8 +49,8 @@ const Book = ({ user, toc }) => (
           <p style={{ textAlign: 'center' }}>
             <Link
               prefetch
-              as="/books/builder-book/introduction"
-              href="/public/read-chapter?bookSlug=builder-book&chapterSlug=introduction"
+              as="/books/demo-book/introduction"
+              href="/public/read-chapter?bookSlug=demo-book&chapterSlug=introduction"
             >
               <Button variant="contained" color="primary" style={styleRaisedButton}>
                 Read Preview
@@ -198,4 +198,4 @@ Book.getInitialProps = async function getInitialProps() {
   return { toc };
 };
 
-export default withAuth(Book, { loginRequired: false, noHeader: true });
+export default withAuth(Book, { loginRequired: false });

pages/index.js

@@ -280,4 +280,9 @@ Index.defaultProps = {
   user: null,
 };
 
-export default withAuth(Index, { loginRequired: false, noHeader: true });
+Index.getInitialProps = function getInitialProps() {
+  const indexPage = true;
+  return { indexPage };
+};
+
+export default withAuth(Index, { loginRequired: false });

pages/public/read-chapter.js

@@ -495,5 +495,4 @@ class ReadChapter extends React.Component {
 
 export default withAuth(withRouter(ReadChapter), {
   loginRequired: false,
-  noHeader: true,
 });

pages/tutorials.js

@@ -76,4 +76,4 @@ Tutorials.getInitialProps = async function getInitialProps() {
   return { tutorials };
 };
 
-export default withAuth(Tutorials, { loginRequired: false, noHeader: true });
+export default withAuth(Tutorials, { loginRequired: false });

server/routesWithSlug.js

@@ -20,4 +20,3 @@ function routesWithSlug({ server, app }) {
 }
 
 module.exports = routesWithSlug;
-