diff --git a/components/Bio.js b/components/Bio.js deleted file mode 100644 index b16e7f7..0000000 --- a/components/Bio.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react' -import { rhythm } from 'utils/typography' -import { prefixLink } from 'gatsby-helpers' -import profilePic from './profile-pic.jpg' - -// Import typefaces -import 'typeface-montserrat' -import 'typeface-merriweather' - -class Bio extends React.Component { - render () { - return ( -

- {`Kyle - Written by Kyle Mathews who lives and works in San Francisco building useful things. You should follow him on Twitter -

- ) - } -} - -export default Bio diff --git a/gatsby-config.js b/gatsby-config.js index 75fec1e..c88ac72 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,18 +1,18 @@ module.exports = { siteMetadata: { - title: 'Gatsby Starter Blog', - author: 'Kyle Mathews', + title: "Gatsby Starter Blog", + author: "Kyle Mathews", }, plugins: [ { resolve: `gatsby-source-filesystem`, options: { - path: `${__dirname}/pages`, - name: 'pages', + path: `${__dirname}/src/pages`, + name: "pages", }, }, - `gatsby-parser-remark`, - `gatsby-parser-sharp`, + `gatsby-transformer-remark`, + `gatsby-transformer-sharp`, { resolve: `gatsby-typegen-remark`, options: { @@ -29,9 +29,9 @@ module.exports = { wrapperStyle: `margin-bottom: 1.0725rem`, }, }, - 'gatsby-typegen-remark-prismjs', - 'gatsby-typegen-remark-copy-linked-files', - 'gatsby-typegen-remark-smartypants', + "gatsby-typegen-remark-prismjs", + "gatsby-typegen-remark-copy-linked-files", + "gatsby-typegen-remark-smartypants", ], }, }, diff --git a/gatsby-node.js b/gatsby-node.js index 2d7df21..c87a7fe 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -1,15 +1,15 @@ -const _ = require("lodash"); -const Promise = require("bluebird"); -const path = require("path"); -const select = require(`unist-util-select`); -const fs = require(`fs-extra`); +const _ = require("lodash") +const Promise = require("bluebird") +const path = require("path") +const select = require(`unist-util-select`) +const fs = require(`fs-extra`) -exports.createPages = ({ graphql, actionCreators }) => { - const { upsertPage } = actionCreators; +exports.createPages = ({ graphql, boundActionCreators }) => { + const { upsertPage } = boundActionCreators return new Promise((resolve, reject) => { - const pages = []; - const blogPost = path.resolve("templates/template-blog-post.js"); + const pages = [] + const blogPost = path.resolve("./src/templates/template-blog-post.js") graphql( ` { @@ -24,8 +24,8 @@ exports.createPages = ({ graphql, actionCreators }) => { ` ).then(result => { if (result.errors) { - console.log(result.errors); - reject(result.errors); + console.log(result.errors) + reject(result.errors) } // Create blog posts pages. @@ -36,27 +36,28 @@ exports.createPages = ({ graphql, actionCreators }) => { context: { slug: edge.node.slug, }, - }); - }); + }) + }) - resolve(); - }); - }); -}; + resolve() + }) + }) +} // Add custom url pathname for blog posts. -exports.onNodeCreate = ({ node, actionCreators, getNode }) => { - const { updateNode } = actionCreators; +exports.onNodeCreate = ({ node, boundActionCreators, getNode }) => { + const { updateNode } = boundActionCreators if (node.type === `File` && typeof node.slug === "undefined") { - const parsedFilePath = path.parse(node.relativePath); - const slug = `/${parsedFilePath.dir}/`; - node.slug = slug; - updateNode(node); + const parsedFilePath = path.parse(node.relativePath) + const slug = `/${parsedFilePath.dir}/` + node.slug = slug + updateNode(node) } else if ( - node.type === `MarkdownRemark` && typeof node.slug === "undefined" + node.type === `MarkdownRemark` && + typeof node.slug === "undefined" ) { - const fileNode = getNode(node.parent); - node.slug = fileNode.slug; - updateNode(node); + const fileNode = getNode(node.parent) + node.slug = fileNode.slug + updateNode(node) } -}; +} diff --git a/package.json b/package.json index 8de10f7..99390a4 100644 --- a/package.json +++ b/package.json @@ -7,24 +7,24 @@ "url": "https://github.com/gatsbyjs/gatsby-starter-blog/issues" }, "dependencies": { - "gatsby": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-link": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-parser-remark": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-parser-sharp": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-plugin-google-analytics": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-plugin-manifest": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-plugin-offline": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-plugin-preact": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-plugin-sharp": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-source-filesystem": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-filesystem": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark-copy-linked-files": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark-prismjs": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark-responsive-iframe": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark-responsive-image": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-remark-smartypants": "1.0.0-alpha12-alpha.1fdb9004", - "gatsby-typegen-sharp": "1.0.0-alpha12-alpha.1fdb9004", + "gatsby": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-link": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-transformer-remark": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-transformer-sharp": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-plugin-google-analytics": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-plugin-manifest": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-plugin-offline": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-plugin-preact": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-plugin-sharp": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-source-filesystem": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-filesystem": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark-copy-linked-files": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark-prismjs": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark-responsive-iframe": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark-responsive-image": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-remark-smartypants": "1.0.0-alpha12-alpha.c0bba969", + "gatsby-typegen-sharp": "1.0.0-alpha12-alpha.c0bba969", "lodash": "^4.15.0", "moment": "^2.14.1", "react-helmet": "^4.0.0", diff --git a/pages/index.js b/pages/index.js deleted file mode 100644 index 2388d91..0000000 --- a/pages/index.js +++ /dev/null @@ -1,72 +0,0 @@ -import React from 'react' -import { Link } from 'react-router' -import get from 'lodash/get' -import Helmet from 'react-helmet' -import { rhythm } from 'utils/typography' -import include from 'underscore.string/include' -import Bio from 'components/Bio' - -class BlogIndex extends React.Component { - render () { - console.log(this.props) - const pageLinks = [] - const siteTitle = get(this, 'props.data.site.siteMetadata.title') - const posts = get(this, 'props.data.allMarkdownRemark.edges') - posts.forEach((post) => { - if (post.node.path !== '/404/') { - const title = get(post, 'node.frontmatter.title') || post.node.path - pageLinks.push( -
  • - - {post.node.frontmatter.title} - -
    • - ) - } - }) - - return ( -
    - - -
      - {pageLinks} -
    -
    - ) - } -} - -BlogIndex.propTypes = { - route: React.PropTypes.object, -} - -export default BlogIndex - -export const pageQuery = ` -{ - site { - siteMetadata { - title - } - } - allMarkdownRemark { - edges { - node { - slug - frontmatter { - title - } - } - } - } -} -` diff --git a/src/components/Bio.js b/src/components/Bio.js new file mode 100644 index 0000000..38ad02e --- /dev/null +++ b/src/components/Bio.js @@ -0,0 +1,43 @@ +import React from "react" + +// Import typefaces +import "typeface-montserrat" +import "typeface-merriweather" + +import profilePic from "./profile-pic.jpg" +import { rhythm } from "../utils/typography" + +class Bio extends React.Component { + render() { + return ( +

    + {`Kyle + Written by + {" "} + Kyle Mathews + {" "} + who lives and works in San Francisco building useful things. + {" "} + + You should follow him on Twitter + +

    + ) + } +} + +export default Bio diff --git a/components/profile-pic.jpg b/src/components/profile-pic.jpg similarity index 100% rename from components/profile-pic.jpg rename to src/components/profile-pic.jpg diff --git a/css/zenburn.css b/src/css/zenburn.css similarity index 100% rename from css/zenburn.css rename to src/css/zenburn.css diff --git a/html.js b/src/html.js similarity index 100% rename from html.js rename to src/html.js diff --git a/layouts/default.js b/src/layouts/default.js similarity index 61% rename from layouts/default.js rename to src/layouts/default.js index fdb12b2..d62cc10 100644 --- a/layouts/default.js +++ b/src/layouts/default.js @@ -1,14 +1,14 @@ -import React from 'react' -import { Link } from 'react-router' -import { Container } from 'react-responsive-grid' -import { prefixLink } from 'gatsby-helpers' -import { rhythm, scale } from 'utils/typography' +import React from "react" +import Link from "gatsby-link" +import { Container } from "react-responsive-grid" + +import { rhythm, scale } from "../utils/typography" class Template extends React.Component { - render () { + render() { const { location, children } = this.props let header - if (location.pathname === prefixLink('/')) { + if (location.pathname === "/") { header = (

    Gatsby Starter Blog @@ -33,18 +33,18 @@ class Template extends React.Component { header = (

    Gatsby Starter Blog @@ -55,7 +55,7 @@ class Template extends React.Component { {header} diff --git a/pages/2015-05-01-hello-world/index.md b/src/pages/2015-05-01-hello-world/index.md similarity index 100% rename from pages/2015-05-01-hello-world/index.md rename to src/pages/2015-05-01-hello-world/index.md diff --git a/pages/2015-05-01-hello-world/salty_egg.jpg b/src/pages/2015-05-01-hello-world/salty_egg.jpg similarity index 100% rename from pages/2015-05-01-hello-world/salty_egg.jpg rename to src/pages/2015-05-01-hello-world/salty_egg.jpg diff --git a/pages/2015-05-06-my-second-post/index.md b/src/pages/2015-05-06-my-second-post/index.md similarity index 100% rename from pages/2015-05-06-my-second-post/index.md rename to src/pages/2015-05-06-my-second-post/index.md diff --git a/pages/2015-05-28-hi-folks/index.md b/src/pages/2015-05-28-hi-folks/index.md similarity index 100% rename from pages/2015-05-28-hi-folks/index.md rename to src/pages/2015-05-28-hi-folks/index.md diff --git a/pages/favicon.ico b/src/pages/favicon.ico similarity index 100% rename from pages/favicon.ico rename to src/pages/favicon.ico diff --git a/src/pages/index.js b/src/pages/index.js new file mode 100644 index 0000000..c8fd448 --- /dev/null +++ b/src/pages/index.js @@ -0,0 +1,70 @@ +import React from "react" +import Link from "gatsby-link" +import get from "lodash/get" +import Helmet from "react-helmet" +import include from "underscore.string/include" + +import Bio from "../components/Bio" +import { rhythm } from "../utils/typography" + +class BlogIndex extends React.Component { + render() { + console.log(this.props) + const pageLinks = [] + const siteTitle = get(this, "props.data.site.siteMetadata.title") + const posts = get(this, "props.data.allMarkdownRemark.edges") + posts.forEach(post => { + if (post.node.path !== "/404/") { + const title = get(post, "node.frontmatter.title") || post.node.path + pageLinks.push( +
  • + + {post.node.frontmatter.title} + +
    • + ) + } + }) + + return ( +
    + + +
      + {pageLinks} +
    +
    + ) + } +} + +BlogIndex.propTypes = { + route: React.PropTypes.object, +} + +export default BlogIndex + +export const pageQuery = ` +{ + site { + siteMetadata { + title + } + } + allMarkdownRemark { + edges { + node { + slug + frontmatter { + title + } + } + } + } +} +` diff --git a/pages/robots.txt b/src/pages/robots.txt similarity index 100% rename from pages/robots.txt rename to src/pages/robots.txt diff --git a/templates/template-blog-post.js b/src/templates/template-blog-post.js similarity index 72% rename from templates/template-blog-post.js rename to src/templates/template-blog-post.js index 46a15a0..69f47d3 100644 --- a/templates/template-blog-post.js +++ b/src/templates/template-blog-post.js @@ -1,24 +1,25 @@ -import React from 'react' -import Helmet from 'react-helmet' -import { Link } from 'react-router' -import get from 'lodash/get' -import { rhythm, scale } from 'utils/typography' -import Bio from 'components/Bio' +import React from "react" +import Helmet from "react-helmet" +import Link from "gatsby-link" +import get from "lodash/get" + +import Bio from "../components/Bio" +import { rhythm, scale } from "../utils/typography" class BlogPostRoute extends React.Component { - render () { + render() { const post = this.props.data.markdownRemark - const siteTitle = get(this.props, 'data.site.siteMetadata.title') + const siteTitle = get(this.props, "data.site.siteMetadata.title") console.log(this.props) return (
    - +

    {post.frontmatter.title}

    = 1.24.0 < 2", mime-db@~1.26.0: version "1.26.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff" +mime-db@~1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" + mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7: version "2.1.14" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee" dependencies: mime-db "~1.26.0" +mime-types@^2.1.15: + version "2.1.15" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed" + dependencies: + mime-db "~1.27.0" + mime@1.3.4, mime@1.3.x, mime@^1.2.11, mime@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" @@ -5576,7 +5647,7 @@ mute-stream@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" -nan@^2.3.0, nan@^2.5.1: +nan@^2.3.0, nan@^2.5.1, nan@~2.5.1: version "2.5.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2" @@ -5614,6 +5685,10 @@ nlcst-to-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-2.0.0.tgz#fc9606b8c32d17caa827074f6ea44f83e3c7bd71" +node-abi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.0.tgz#443bfd151b599231028ae425e592e76cd31cb537" + node-cjsx@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-cjsx/-/node-cjsx-2.0.0.tgz#19c951b3e3d66e667e9993b457acea0a365098a4" @@ -5714,6 +5789,10 @@ node-uuid@^1.4.0, node-uuid@~1.4.0: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6717,6 +6796,25 @@ preact@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/preact/-/preact-7.2.0.tgz#8aacc97465a65509bc556604a7750d48e2fa7ad1" +prebuild-install@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.1.2.tgz#d9ae0ca85330e03962d93292f95a8b44c2ebf505" + dependencies: + expand-template "^1.0.2" + github-from-package "0.0.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + node-abi "^2.0.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + os-homedir "^1.0.1" + pump "^1.0.1" + rc "^1.1.6" + simple-get "^1.4.2" + tar-fs "^1.13.0" + tunnel-agent "^0.4.3" + xtend "4.0.1" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -6807,6 +6905,10 @@ prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -6821,7 +6923,7 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -pump@^1.0.0: +pump@^1.0.0, pump@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51" dependencies: @@ -7078,7 +7180,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@1.1, readable-stream@^1.1.12, readable-stream@~1.1.9: +readable-stream@1.1, readable-stream@^1.0.33, readable-stream@^1.1.12, readable-stream@~1.1.9: version "1.1.13" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e" dependencies: @@ -7705,6 +7807,10 @@ semver@^4.0.3, semver@^4.3.3: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19" + send@0.15.1: version "0.15.1" resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f" @@ -7843,6 +7949,14 @@ simple-backoff@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/simple-backoff/-/simple-backoff-1.0.0.tgz#a4fa290ec01969c07ca136fe8bbfb40e0ef35ac2" +simple-get@^1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-1.4.3.tgz#e9755eda407e96da40c5e5158c9ea37b33becbeb" + dependencies: + once "^1.3.1" + unzip-response "^1.0.0" + xtend "^4.0.0" + simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -8527,7 +8641,7 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -tunnel-agent@^0.4.0: +tunnel-agent@^0.4.0, tunnel-agent@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -8786,7 +8900,7 @@ untildify@^2.1.0: dependencies: os-homedir "^1.0.0" -unzip-response@^1.0.2: +unzip-response@^1.0.0, unzip-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" @@ -9300,7 +9414,7 @@ xdg-basedir@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +xtend@4.0.1, "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"