refactor: various improvements

Author: gregberge

.eslintrc.json

@@ -14,7 +14,13 @@
     "no-underscore-dangle": [
       "error",
       {
-        "allow": ["__SMOOTH_ERROR__", "__APOLLO_STATE__", "__schema"]
+        "allow": [
+          "__SMOOTH_ERROR__",
+          "__APOLLO_STATE__",
+          "__schema",
+          "__smooth_pages",
+          "__smooth_blocks"
+        ]
       }
     ],
     "react/jsx-filename-extension": ["error", { "extensions": [".js"] }],

examples/wordpress/.gitignore

@@ -2,5 +2,5 @@
 /wordpress/wp-content/plugins/smooth-js
 /wordpress/wp-content/themes/smooth-js
 /wordpress/wp-content/themes/twenty*
-/wordpress/wp-content/themes/akismet
-/wordpress/wp-content/themes/hello.php
+/wordpress/wp-content/plugins/akismet
+/wordpress/wp-content/plugins/hello.php

examples/wordpress/package.json

@@ -4,8 +4,7 @@
     "graphql-tag": "^2.10.0",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
-    "smooth-backend-wordpress": "../../packages/smooth-backend-wordpress",
-    "smooth-core": "../../packages/smooth-core",
-    "smooth-dev-cli": "../../packages/smooth-dev-cli"
+    "smooth-backend-wordpress": "^0.1.1-alpha.2",
+    "smooth-core": "^0.1.1-alpha.2"
   }
 }

examples/wordpress/src/blocks/SimpleBlock.js

@@ -0,0 +1,12 @@
+import React from 'react'
+import gql from 'graphql-tag'
+
+export const blockFragment = gql`
+  fragment SimpleBlockProps on SimpleBlock {
+    text
+  }
+`
+
+export default function SimpleBlock({ text }) {
+  return <div>{text}</div>
+}

examples/wordpress/src/contents/Book.js renamed to examples/wordpress/src/pages/books.js

@@ -2,7 +2,7 @@ import React from 'react'
 import gql from 'graphql-tag'
 
 export const contentFragment = gql`
-  fragment BookFragment on Book {
+  fragment BookProps on Book {
     name
   }
 `

examples/wordpress/src/pages/foo$.js

@@ -0,0 +1 @@
+export default () => 'hello'

examples/wordpress/src/contents/Page.js renamed to examples/wordpress/src/pages/index.js

@@ -1,8 +1,9 @@
 import React from 'react'
 import gql from 'graphql-tag'
+import { BlockFragment, Blocks } from 'smooth-core/blocks'
 
 export const contentFragment = gql`
-  fragment PageFragment on Page {
+  fragment PageProps on Page {
     title
     date
     dateTime
@@ -21,23 +22,24 @@ export const contentFragment = gql`
       }
       name
     }
+    link {
+      url
+    }
+    blocks {
+      ...BlockFragment
+    }
   }
+
+  ${BlockFragment}
 `
 
-export default function Page({
-  title,
-  book,
-  specificBook,
-  allBooks,
-  ...props
-}) {
-  console.log(props)
+export default function Page({ title, book, specificBook, allBooks, blocks }) {
   return (
     <div>
       <h2>Title</h2>
       <div>{title}</div>
       <h2>ACF book</h2>
-      <div>{book.name}</div>
+      <div>{book && book.name}</div>
       <h2>Specific book</h2>
       <div>{specificBook && specificBook.name}</div>
       <h2>All books</h2>
@@ -46,6 +48,7 @@ export default function Page({
           <li key={b.metadata.id}>{b.name}</li>
         ))}
       </ul>
+      <Blocks blocks={blocks} />
     </div>
   )
 }

examples/wordpress/src/schemas/blocks/SimpleBlock.js

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const typeDefs = gql`
+  type SimpleBlock @block {
+    text: String @field
+  }
+`

examples/wordpress/src/schemas/models/Book.js renamed to examples/wordpress/src/schemas/contents/Book.js

@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const typeDefs = gql`
-  type Book @model {
+  type Book @content {
     name: String @field
   }
 `

examples/wordpress/src/schemas/models/Page.js renamed to examples/wordpress/src/schemas/contents/Page.js

@@ -1,13 +1,15 @@
 import gql from 'graphql-tag'
 
 export const typeDefs = gql`
-  type Page @model {
+  type Page @content {
     title: String @field
     book: Book @field
     specificBook: Book
     allBooks: [Book]
     date: Date @field
     dateTime: DateTime @field
+    link: Link @field
+    blocks: [Block] @field
   }
 `