updates

Ethan Jon · Ethan Jon · commit ebdb742f52ea · 2017-07-09T08:51:21.000-04:00
diff --git a/react/.eslintrc.js b/react/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     'react/jsx-no-bind': ['warn', {ignoreRefs: true}],
     'react/jsx-filename-extension': 'off',
     'react/jsx-indent': ['warn', 2],
-    'react/jsx-indent-props': ['warn', 2]
+    'react/jsx-indent-props': ['warn', 2],
+    'no-return-assign': 'off'
   }
 }
diff --git a/react/helpers/create-page.js b/react/helpers/create-page.js
@@ -53,7 +53,9 @@ export default function (Child: Object, {propPaths = () => ({}), fullWidth = fal
 
       let fetches = await Promise.all(pathsKeys.map(async k => {
         const input = paths[k]
-        const [path, authorize] = typeof input === 'string' ? [input, false] : [input.path, input.authorize]
+        const [path, authorize, makeSingle] = typeof input === 'string'
+          ? [input, false, false]
+          : [input.path, input.authorize, input.makeSingle]
 
         if (fetchCache[path]) {
           return fetchCache[path]
@@ -67,9 +69,13 @@ export default function (Child: Object, {propPaths = () => ({}), fullWidth = fal
           })
         })
 
-        fetchCache[path] = await res.json()
+        let json = await res.json()
 
-        return fetchCache[path]
+        if (makeSingle && Array.isArray(json)) {
+          json = json[0]
+        }
+
+        return fetchCache[path] = json
       }))
 
       const finalProps = pathsKeys.reduce((obj, key, i) => {
diff --git a/react/pages/_error.js b/react/pages/_error.js
@@ -5,9 +5,9 @@ import React from 'react'
 import createPage from '../helpers/create-page'
 
 export const Error = () => (
-  <div className='center h2'>
+  <div className='center'>
     <hr />
-    {'There was an error.'}
+    <h1 className='my4'>{'There was an error.'}</h1>
     <hr />
   </div>
 )
diff --git a/react/pages/index.js b/react/pages/index.js
@@ -11,7 +11,7 @@ import createPage from '../helpers/create-page'
 import {didPassPasswordAuthorization, getUrlObj, getFeaturedImageProps, getThumbnailImageProps} from '../helpers/post-data'
 import styles from '../styles/pages/index.scss'
 
-export const Home = ({postsData}: Object, {siteData}: Object) => {
+export const Home = ({pageData, postsData}: Object, {siteData}: Object) => {
   return (
     <div>
       <Head>
@@ -87,7 +87,6 @@ export const Home = ({postsData}: Object, {siteData}: Object) => {
                     className='my1 h5'
                     postData={postData}
                   />
-
                 </div>
               </div>
             </a>
@@ -111,6 +110,10 @@ export default createPage(Home, {
   fullWidth: true,
   maxWidth: 3,
   propPaths: ({query: {preview}}) => ({
+    pageData: {
+      path: '/wp/v2/pages?slug=home',
+      makeSingle: true
+    },
     postsData: {
       authorize: !!preview,
       path: `/wp/v2/posts?_embed&per_page=50${preview ? '&status[]=pending&status[]=publish' : ''}`
diff --git a/react/pages/singular.js b/react/pages/singular.js
@@ -3,31 +3,21 @@
 import React from 'react'
 
 import Post from '../components/post'
+import {Error} from '../pages/_error'
 import createPage from '../helpers/create-page'
 import {didFailPasswordAuthorization} from '../helpers/post-data'
 
-const extractPostData = ({postsData, revisionsData}: Object) => Object.assign({},
-  Array.isArray(postsData) ? postsData[0] : postsData,
-  revisionsData ? revisionsData[0] : {}
-)
+export const Singular = ({postData, revisionsData}: Object) => {
+  const postWithRevisionData = Object.assign({}, postData, revisionsData && revisionsData[0])
 
-export const Singular = (props: Object) => {
-  const postData = extractPostData(props)
-
-  if (!Object.keys(postData).length || didFailPasswordAuthorization(postData)) {
-    return (
-      <div>
-        <hr />
-        <h2 className='center my3'>{"We couldn't find that page."}</h2>
-        <hr />
-      </div>
-    )
+  if (!Object.keys(postWithRevisionData).length || didFailPasswordAuthorization(postWithRevisionData)) {
+    return <Error />
   }
 
   return (
     <Post
-      key={`Post${postData.id}`}
-      postData={postData}
+      key={`Post${postWithRevisionData.id}`}
+      postData={postWithRevisionData}
     />
   )
 }
@@ -39,8 +29,9 @@ export default createPage(Singular, {
   fullWidth: true,
   maxWidth: 3,
   propPaths: ({asPath, query: {p, password, page_id, preview, preview_id, type, slug}}) => ({
-    postsData: {
+    postData: {
       authorize: !!preview,
+      makeSingle: true,
       path: (p || page_id) ? `/wp/v2/${type}s/${p || page_id}/?_embed` : `/wp/v2/${type}s?_embed&slug=${slug}&password=${password}`
     },
     revisionsData: preview ? {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ module.exports = {`
`23`	`23`	`'react/jsx-no-bind': ['warn', {ignoreRefs: true}],`
`24`	`24`	`'react/jsx-filename-extension': 'off',`
`25`	`25`	`'react/jsx-indent': ['warn', 2],`
`26`		`- 'react/jsx-indent-props': ['warn', 2]`
	`26`	`+ 'react/jsx-indent-props': ['warn', 2],`
	`27`	`+ 'no-return-assign': 'off'`
`27`	`28`	`}`
`28`	`29`	`}`