Docs: use isLoading instead of PageLoading

MoOx · Nov 2, 2016 · 5d8a602 · 5d8a602
1 parent bda5dbd
commit 5d8a602
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/docs/content/loading.md b/docs/content/loading.md
diff --git a/docs/src/components/Footer/index.js b/docs/src/components/Footer/index.js
@@ -54,13 +54,6 @@ const Footer = () => (
       >
         { "404" }
       </Link>
-      { ", " }
-      <Link
-        className={ styles.link }
-        to="/loading/"
-      >
-        { "Loading" }
-      </Link>
     </Banner>
   </footer>
 )

diff --git a/docs/src/layouts/PageLoading/index.css → docs/src/components/Loading/index.css b/docs/src/layouts/PageLoading/index.css → docs/src/components/Loading/index.css
diff --git a/docs/src/layouts/PageLoading/index.js → docs/src/components/Loading/index.js b/docs/src/layouts/PageLoading/index.js → docs/src/components/Loading/index.js
@@ -14,7 +14,7 @@ TopBarProgressIndicator.config({
   shadowBlur: 5,
 })
 
-const PageLoading = () => (
+const Loading = () => (
   <div>
     <Helmet
       title={ "Loading..." }
@@ -29,4 +29,4 @@ const PageLoading = () => (
   </div>
 )
 
-export default PageLoading
+export default Loading
diff --git a/docs/src/layouts/Page/index.js b/docs/src/layouts/Page/index.js
@@ -3,6 +3,7 @@ import Helmet from "react-helmet"
 import invariant from "invariant"
 import { joinUri, BodyContainer } from "phenomic"
 
+import Loading from "../../components/Loading"
 import EditThisPage from "../../components/EditThisPage"
 import Banner from "../../components/Banner"
 import ContentWrapper from "../../components/ContentWrapper"
@@ -11,6 +12,7 @@ import styles from "./index.css"
 
 const Page = (
   {
+    isLoading,
     __filename,
     __url,
     head,
@@ -86,7 +88,9 @@ const Page = (
           </div>
         }
         {
-          body &&
+          isLoading
+          ? <Loading />
+          : body &&
           <div className={ styles.content }>
             <BodyContainer>{ body }</BodyContainer>
           </div>
@@ -100,6 +104,7 @@ const Page = (
 
 Page.propTypes = {
   children: PropTypes.node,
+  isLoading: PropTypes.boolean,
   __filename: PropTypes.string.isRequired,
   __url: PropTypes.string.isRequired,
   head: PropTypes.object.isRequired,

diff --git a/docs/src/routes.js b/docs/src/routes.js
@@ -5,7 +5,6 @@ import { PageContainer as PhenomicPageContainer } from "phenomic"
 import AppContainer from "./AppContainer.js"
 import Page from "./layouts/Page"
 import PageError from "./layouts/PageError"
-import PageLoading from "./layouts/PageLoading"
 import Homepage from "./layouts/Homepage"
 import Showcase from "./components/Showcase"
 
@@ -15,7 +14,6 @@ const DocsPageContainer = (props) => (
     layouts={{
       Page,
       PageError,
-      PageLoading,
       Homepage,
     }}
   />