diff --git a/gatsby-node.js b/gatsby-node.js
index 92835c1..647a14a 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -3,6 +3,18 @@ const remark = require('remark')
const markdown = require('remark-parse')
const html = require('remark-html')
+function truncate(n, useWordBoundary) {
+ if (this.length <= n) {
+ return this
+ }
+ const subString = this.substr(0, n - 1)
+ return (
+ (useWordBoundary
+ ? subString.substr(0, subString.lastIndexOf(' '))
+ : subString) + '...'
+ )
+}
+
exports.onCreateNode = ({ node, actions }) => {
const { createNodeField } = actions
@@ -29,6 +41,15 @@ exports.onCreateNode = ({ node, actions }) => {
name: 'descriptionHtml',
value: descriptionHtml
})
+
+ // Create excerpt from description
+ const excerpt = truncate.apply(description, [320, true])
+
+ createNodeField({
+ node,
+ name: 'excerpt',
+ value: excerpt
+ })
}
}
diff --git a/src/components/atoms/SEO.jsx b/src/components/atoms/SEO.jsx
index 97d5d53..97be0d3 100644
--- a/src/components/atoms/SEO.jsx
+++ b/src/components/atoms/SEO.jsx
@@ -3,18 +3,6 @@ import Helmet from 'react-helmet'
import PropTypes from 'prop-types'
import { StaticQuery, graphql } from 'gatsby'
-function truncate(n, useWordBoundary) {
- if (this.length <= n) {
- return this
- }
- const subString = this.substr(0, n - 1)
- return (
- (useWordBoundary
- ? subString.substr(0, subString.lastIndexOf(' '))
- : subString) + '...'
- )
-}
-
const query = graphql`
query {
dataYaml {
@@ -22,7 +10,6 @@ const query = graphql`
tagline
description
url
- email
img {
childImageSharp {
resize(width: 980) {
@@ -31,11 +18,7 @@ const query = graphql`
}
}
social {
- Email
- Blog
Twitter
- GitHub
- Dribbble
}
gpg
addressbook
@@ -48,10 +31,6 @@ export default class SEO extends PureComponent {
project: PropTypes.object
}
- static defaultProps = {
- project: {}
- }
-
render() {
const { project } = this.props
@@ -61,24 +40,26 @@ export default class SEO extends PureComponent {
render={data => {
const meta = data.dataYaml
- const title = project.title || meta.title
- const description = project.description
- ? truncate.apply(project.description, [320, true])
- : truncate.apply(meta.description, [320, true])
- const image = project.img
- ? project.img.childImageSharp.twitterImage.src
- : meta.img.childImageSharp.resize.src
- const url = project.slug ? `${meta.url}${project.slug}` : meta.url
+ const title = (project && project.title) || meta.title
+ const description =
+ project && project.fields.excerpt
+ ? project.fields.excerpt
+ : meta.description
+ const image =
+ project && project.img
+ ? project.img.childImageSharp.twitterImage.src
+ : meta.img.childImageSharp.resize.src
+ const url =
+ project && project.slug ? `${meta.url}${project.slug}` : meta.url
return (
- {title}
-
{/* General tags */}
diff --git a/src/templates/Project.jsx b/src/templates/Project.jsx
index 4d3e2ec..db0de74 100644
--- a/src/templates/Project.jsx
+++ b/src/templates/Project.jsx
@@ -86,9 +86,9 @@ export const projectQuery = graphql`
projectsYaml(slug: { eq: $slug }) {
title
slug
- description
fields {
descriptionHtml
+ excerpt
}
links {
title