diff --git a/gatsby-node.js b/gatsby-node.js index 07fc952..2d2ed7d 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -6,8 +6,7 @@ exports.createPages = ({ boundActionCreators, graphql }) => { return new Promise((resolve, reject) => { const template = path.resolve('src/components/organisms/Project.js') - resolve( - graphql(` + resolve(graphql(` { allProjectsJson { edges { @@ -20,6 +19,7 @@ exports.createPages = ({ boundActionCreators, graphql }) => { Link GitHub Info + Dribbble } description techstack @@ -51,8 +51,8 @@ exports.createPages = ({ boundActionCreators, graphql }) => { img_more, description, techstack, - links - } + links, + }, }) }) diff --git a/src/components/molecules/Head.js b/src/components/atoms/Head.js similarity index 53% rename from src/components/molecules/Head.js rename to src/components/atoms/Head.js index 9b28afc..886b819 100644 --- a/src/components/molecules/Head.js +++ b/src/components/atoms/Head.js @@ -3,14 +3,10 @@ import PropTypes from 'prop-types' import Helmet from 'react-helmet' const Head = ({ meta }) => { - return ( - + return + - ) } Head.propTypes = { diff --git a/src/components/organisms/Project.js b/src/components/organisms/Project.js index 55829bd..b351659 100644 --- a/src/components/organisms/Project.js +++ b/src/components/organisms/Project.js @@ -20,6 +20,7 @@ const Project = props => { {title} +
@@ -65,11 +66,13 @@ const Project = props => {
    {!!links && - Object.keys(links).map(key => ( -
  • - {key} -
  • - ))} + Object.keys(links).map(key => { + if (links[key]) { + return
  • + {key} +
  • + } + })}
diff --git a/src/data/projects.json b/src/data/projects.json index a3e7e10..27e1898 100644 --- a/src/data/projects.json +++ b/src/data/projects.json @@ -101,10 +101,12 @@ }, "description": "Co-designing and leading the front-end development of various ChartMogul web properties. Creating and implementing a UI design system into the ChartMogul application.", "techstack": [ - "Jekyll", - "Gulp", "SCSS", "JavaScript", + "PHP", + "Jekyll", + "Gulp", + "WordPress", "Travis", "AWS S3", "Cloudflare", @@ -144,9 +146,10 @@ "Link": "https://ezeep.com/" }, "techstack": [ - "WordPress", "SCSS", "JavaScript", + "PHP", + "WordPress", "Travis", "AWS", "Cloudflare", @@ -165,9 +168,10 @@ }, "description": "Designing, developing and writing a showcase website presenting the most beautiful and usable apps created for Android.", "techstack": [ - "WordPress", "SCSS", - "JavaScript" + "JavaScript", + "PHP", + "WordPress" ] }, { diff --git a/src/layouts/index.js b/src/layouts/index.js index 5dae686..7a517e0 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import Head from '../components/molecules/Head' +import Head from '../components/atoms/Head' import FadeIn from '../components/atoms/FadeIn' import Header from '../components/molecules/Header' import Footer from '../components/molecules/Footer' @@ -25,24 +25,21 @@ TemplateWrapper.propTypes = { export default TemplateWrapper export const query = graphql` - query pageLayoutQueryAndMetaQuery { - allDataJson { - edges { - node { - title - tagline - description - url - social { - Twitter - GitHub - Facebook - } - } - } - } - sitePage { - jsonName - } - } - ` + query metaQuery { + allDataJson { + edges { + node { + title + tagline + description + url + social { + Twitter + GitHub + Facebook + } + } + } + } + } +`