diff --git a/gatsby/.eslintrc.js b/gatsby/.eslintrc.js index 4006ce1..3725e19 100644 --- a/gatsby/.eslintrc.js +++ b/gatsby/.eslintrc.js @@ -5,20 +5,22 @@ module.exports = { 'parser': 'babel-eslint', // uses babel-eslint transforms 'settings': { 'react': { - 'version': 'detect' // detect react version - } + 'version': 'detect', // detect react version + }, }, 'env': { - 'node': true // defines things like process.env when generating through node + 'node': true, // defines things like process.env when generating through node }, 'extends': [ 'eslint:recommended', // use recommended configs 'plugin:react/recommended', - 'plugin:react-hooks/recommended' + 'plugin:react-hooks/recommended', ], 'rules': { 'react/prop-types': 0, 'quotes': ['warn', 'single'], - 'semi': 1 - } + 'semi': 1, + 'indent': ['warn', 2], + 'comma-dangle': ['warn', 'always-multiline'], + }, }; diff --git a/gatsby/gatsby-node.js b/gatsby/gatsby-node.js index a1e4d02..1dd3f84 100644 --- a/gatsby/gatsby-node.js +++ b/gatsby/gatsby-node.js @@ -88,7 +88,7 @@ exports.createPages = async ({ graphql, actions, reporter }) => { return; } // Create pages for each markdown file. - const galleryImageTemplate = path.resolve('src/components/gallery-image.js'); + const galleryImageTemplate = path.resolve('src/components/GalleryImage.js'); galleryImages.data.allFile.edges.forEach(({ node }) => { // const path = node.base createPage({ diff --git a/gatsby/src/components/gallery-image.js b/gatsby/src/components/GalleryImage.js similarity index 98% rename from gatsby/src/components/gallery-image.js rename to gatsby/src/components/GalleryImage.js index a7751ae..0435d26 100644 --- a/gatsby/src/components/gallery-image.js +++ b/gatsby/src/components/GalleryImage.js @@ -36,7 +36,7 @@ const GalleryImage = ({ data }) => { maxWidth: `calc(max(90vh, 500px) * ${ar})`, // height: '90vh', maxHeight: '90vh', - minHeight: '500px' + minHeight: '500px', }} key={image.base} image={getImage(image)} diff --git a/gatsby/src/components/resume/ExperienceSection.js b/gatsby/src/components/resume/ExperienceSection.js new file mode 100644 index 0000000..e69de29 diff --git a/gatsby/src/components/resume-layout.js b/gatsby/src/components/resume/ResumeLayout.js similarity index 77% rename from gatsby/src/components/resume-layout.js rename to gatsby/src/components/resume/ResumeLayout.js index 431e927..e211436 100644 --- a/gatsby/src/components/resume-layout.js +++ b/gatsby/src/components/resume/ResumeLayout.js @@ -2,16 +2,16 @@ import * as React from 'react'; import classnames from 'classnames'; import { MDXProvider } from '@mdx-js/react'; -import '../styles/resume.css'; +import '../../styles/resume.css'; const MyH1 = props =>

; -const MyParagraph = props => ( -

-); +// const MyParagraph = props => ( +//

+// ); const components = { h1: MyH1, - p: MyParagraph, + // p: MyParagraph, }; diff --git a/gatsby/src/pages/photogallery.js b/gatsby/src/pages/photogallery.js index a9201be..c0585a8 100644 --- a/gatsby/src/pages/photogallery.js +++ b/gatsby/src/pages/photogallery.js @@ -22,7 +22,7 @@ const GalleryPage = ({ data }) => { } return 0; }) // TODO HERE - , [data]); + , [data]); return (<> @@ -34,26 +34,26 @@ const GalleryPage = ({ data }) => {

{/* TODO swap masonry plugin, this one makes really unbalanced columns */} {/* ...implement manually :sadge: */} - - - {images.map(image => { - console.log('ar', image.childImageSharp); - const name = getMeta(image).iptc.object_name || image.base; - return ( - - - - - - ); - })} - - + + + {images.map(image => { + console.log('ar', image.childImageSharp); + const name = getMeta(image).iptc.object_name || image.base; + return ( + + + + + + ); + })} + +
); diff --git a/gatsby/src/pages/resume.mdx b/gatsby/src/pages/resume.mdx index 06275c9..34607a8 100644 --- a/gatsby/src/pages/resume.mdx +++ b/gatsby/src/pages/resume.mdx @@ -2,7 +2,7 @@ title: Charles Dries Resume --- -import ResumeLayout from '../components/resume-layout' +import ResumeLayout from '../components/resume/ResumeLayout' export default ResumeLayout # Hello, World!