diff --git a/client/gatsby-browser.js b/client/gatsby-browser.js index 53a5bb9355..7a94672a1e 100644 --- a/client/gatsby-browser.js +++ b/client/gatsby-browser.js @@ -6,7 +6,7 @@ import { createStore } from './src/redux/createStore'; import AppMountNotifier from './src/components/AppMountNotifier'; import GuideNavContextProvider from './src/contexts/GuideNavigationContext'; import DefaultLayout from './src/components/layouts/Default'; -import GuideLayout from './src/components/layouts/GuideLayout'; +import GuideLayout from './src/components/layouts/Guide'; const store = createStore(); @@ -30,18 +30,29 @@ export const wrapPageElement = ({ element, props }) => { } = props; if (pathname === '/') { return ( - + {element} ); } if ((/^\/guide(\/.*)*/).test(pathname)) { return ( - + {element} ); } + if (false === (/^\/learn(\/.*)*/).test(pathname)) { + return ( + + {element} + + ); + } return {element}; }; diff --git a/client/gatsby-ssr.js b/client/gatsby-ssr.js index df05dff15f..ee63f7c572 100644 --- a/client/gatsby-ssr.js +++ b/client/gatsby-ssr.js @@ -8,7 +8,7 @@ import { createStore } from './src/redux/createStore'; import GuideNavContextProvider from './src/contexts/GuideNavigationContext'; import DefaultLayout from './src/components/layouts/Default'; -import GuideLayout from './src/components/layouts/GuideLayout'; +import GuideLayout from './src/components/layouts/Guide'; const store = createStore(); @@ -30,18 +30,29 @@ export const wrapPageElement = ({ element, props }) => { } = props; if (pathname === '/') { return ( - + {element} ); } if ((/^\/guide(\/.*)*/).test(pathname)) { return ( - + {element} ); } + if (false === (/^\/learn(\/.*)*/).test(pathname)) { + return ( + + {element} + + ); + } return {element}; }; diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js index 8b820eb598..172bf475e5 100644 --- a/client/src/components/layouts/Default.js +++ b/client/src/components/layouts/Default.js @@ -21,7 +21,6 @@ import OfflineWarning from '../OfflineWarning'; import Flash from '../Flash'; import Header from '../Header'; import Footer from '../Footer'; -import Spacer from '../helpers/Spacer'; import './global.css'; import './layout.css'; @@ -70,6 +69,7 @@ const propTypes = { isOnline: PropTypes.bool.isRequired, isSignedIn: PropTypes.bool, landingPage: PropTypes.bool, + nonLearnPage: PropTypes.bool, onlineStatusChange: PropTypes.func.isRequired, removeFlashMessage: PropTypes.func.isRequired }; @@ -139,6 +139,7 @@ class DefaultLayout extends Component { flashMessages = [], removeFlashMessage, landingPage, + nonLearnPage, isOnline, isSignedIn } = this.props; @@ -165,9 +166,7 @@ class DefaultLayout extends Component { ) : null} {children} -
- -