Remove blog content from theme

becca-bailey · Jul 30, 2019 · b6b9666 · b6b9666
1 parent 9956191
commit b6b9666
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 35 deletions.
diff --git a/demo/content/blog/my-first-post/index.md b/demo/content/blog/my-first-post/index.md
@@ -1,7 +1,7 @@
 ---
 title: My First Blog Post!
 date: "2019-07-28"
-featuredImage: "./featured.jpeg"
+featuredImage: "./featured.jpg"
 featured: true
 ---
 

diff --git a/...iter/content/blog/my-second-post/cat.jpeg → demo/content/blog/my-second-post/cat.jpeg b/...iter/content/blog/my-second-post/cat.jpeg → demo/content/blog/my-second-post/cat.jpeg
diff --git a/demo/content/blog/my-second-post/index.md b/demo/content/blog/my-second-post/index.md
@@ -1,10 +1,12 @@
 ---
 title: My Second Blog Post!
 date: "2019-07-29"
-featuredImage: "./featured.jpeg"
+featuredImage: "./featured.jpg"
 featured: true
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent varius fringilla quam ultrices tincidunt. Etiam imperdiet massa a libero dignissim efficitur. Suspendisse tempor dictum nisi, sed tincidunt lorem blandit in. Morbi est diam, gravida vitae condimentum id, finibus imperdiet leo. Donec at tortor placerat, ullamcorper leo non, rutrum purus. Aenean varius luctus sapien, in sollicitudin augue blandit vestibulum. Cras elementum orci vel metus venenatis faucibus. Cras tempus cursus eros, vel consequat diam placerat et. Vestibulum ornare laoreet vulputate. In tellus orci, viverra a massa id, tristique fermentum arcu. Ut in velit lacus.
 
+![cat](cat.jpeg)
+
 Mauris commodo nisi mauris, imperdiet finibus tortor viverra non. Sed sit amet purus quis nibh lacinia consequat ac efficitur tellus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Proin egestas malesuada orci non porta. Aliquam erat volutpat. Sed hendrerit semper lacus porta sollicitudin. Nam tristique diam sem, sit amet condimentum tortor lacinia id. Donec ac mauris arcu. Praesent sodales sed nibh vel suscipit. In venenatis pretium gravida. Mauris ante lorem, imperdiet id iaculis nec, auctor sed dui. Aenean sagittis, purus vel aliquet condimentum, quam felis aliquet elit, nec dictum velit justo id nibh. Mauris non ex ac lacus condimentum rhoncus. Etiam hendrerit pretium mi. Morbi accumsan quis orci at viverra.
diff --git a/demo/gatsby-config.js b/demo/gatsby-config.js
@@ -10,11 +10,11 @@ module.exports = {
     author: `Becca Bailey`,
     description:
       "Proin at viverra nisi. Praesent vehicula dolor non enim tempor pharetra. Aenean sed fermentum massa. In posuere consequat sapien a volutpat. Vivamus quis egestas augue. Nulla eros leo, interdum vel maximus aliquet, suscipit quis purus. ",
-    siteUrl: `http://becca.is`,
+    siteUrl: `http://gatsby-theme-writer.netlify.com`,
     social: {
       twitter: `beccaliz`,
       instagram: `beccamakesthings`,
     },
   },
-  plugins: ["gatsby-theme-writer"],
+  plugins: ["@beccanelson/gatsby-theme-writer"],
 }
diff --git a/gatsby-theme-writer/content/assets/avatar.png b/gatsby-theme-writer/content/assets/avatar.png
diff --git a/gatsby-theme-writer/content/blog/my-first-post/featured.jpg b/gatsby-theme-writer/content/blog/my-first-post/featured.jpg
diff --git a/gatsby-theme-writer/content/blog/my-first-post/index.md b/gatsby-theme-writer/content/blog/my-first-post/index.md
diff --git a/gatsby-theme-writer/content/blog/my-second-post/featured.jpg b/gatsby-theme-writer/content/blog/my-second-post/featured.jpg
diff --git a/gatsby-theme-writer/content/blog/my-second-post/index.md b/gatsby-theme-writer/content/blog/my-second-post/index.md
diff --git a/gatsby-theme-writer/gatsby-config.js b/gatsby-theme-writer/gatsby-config.js
@@ -1,4 +1,4 @@
-module.exports = {
+module.exports = options => ({
   siteMetadata: {
     title: "Gatsby Theme Writer",
   },
@@ -7,15 +7,15 @@ module.exports = {
     {
       resolve: `gatsby-source-filesystem`,
       options: {
-        path: `${__dirname}/content/blog`,
-        name: `blog`,
+        path: options.contentPath || `content/blog`,
+        name: options.contentPath || `content/blog`,
       },
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
-        path: `${__dirname}/content/assets`,
-        name: `assets`,
+        path: options.assetsPath || `content/assets`,
+        name: options.assetsPath || `content/assets`,
       },
     },
     {
@@ -44,4 +44,4 @@ module.exports = {
     `gatsby-plugin-sharp`,
     `gatsby-plugin-offline`,
   ],
-}
+})
diff --git a/gatsby-theme-writer/gatsby-node.js b/gatsby-theme-writer/gatsby-node.js
@@ -1,15 +1,21 @@
 const fs = require("fs")
 const mkdirp = require("mkdirp")
+const path = require("path")
 const { createFilePath } = require("gatsby-source-filesystem")
 
 let basePath
 
-exports.onPreBootstrap = ({ reporter }, options) => {
+exports.onPreBootstrap = ({ reporter, store }, options) => {
+  const { program } = store.getState()
+
   basePath = options.basePath || "/"
   const contentPath = options.contentPath || "content/blog"
   const assetsPath = options.assetsPath || "content/assets"
 
-  const paths = [contentPath, assetsPath]
+  const paths = [
+    path.join(program.directory, contentPath),
+    path.join(program.directory, assetsPath),
+  ]
 
   // each of these paths must exist, or gatsby-source-filesystem will throw an error
   paths.forEach(path => {

diff --git a/gatsby-theme-writer/package.json b/gatsby-theme-writer/package.json
@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/beccanelson/gatsby-theme-writer.git"
   },
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {