From 57895632421ccbddcb12859da06b77997ffee11c Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 24 Nov 2018 16:28:25 +0100 Subject: [PATCH 1/3] concept for showing project images count --- src/images/images.svg | 3 +++ src/pages/index.jsx | 32 ++++++++++++++++++++++++++++++++ src/pages/index.module.scss | 13 +++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 src/images/images.svg diff --git a/src/images/images.svg b/src/images/images.svg new file mode 100644 index 0000000..5c008cc --- /dev/null +++ b/src/images/images.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/pages/index.jsx b/src/pages/index.jsx index dd1b4ad..73890fe 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -2,21 +2,45 @@ import React from 'react' import PropTypes from 'prop-types' import { Link, graphql } from 'gatsby' import ProjectImage from '../components/molecules/ProjectImage' +import { ReactComponent as Images } from '../images/images.svg' import styles from './index.module.scss' +const getImageCount = (imageEdges, slug) => { + let array = [] + + imageEdges.map(({ node }) => { + if (node.name.includes(slug.replace(/\//g, ''))) { + array.push(node) + } + }) + + return array +} + const Home = ({ data }) => { const projects = data.allProjectsYaml.edges + const imageEdges = data.projectImageFiles.edges return (
{projects.map(({ node }) => { const { slug, title, img } = node + const imageCount = getImageCount(imageEdges, slug).length return (

{title}

+ + {imageCount > 0 && ( + + {imageCount} + + )}
) @@ -49,5 +73,13 @@ export const IndexQuery = graphql` } } } + + projectImageFiles: allFile(filter: { name: { regex: "/portfolio/" } }) { + edges { + node { + name + } + } + } } ` diff --git a/src/pages/index.module.scss b/src/pages/index.module.scss index 558b240..4d39f43 100644 --- a/src/pages/index.module.scss +++ b/src/pages/index.module.scss @@ -60,3 +60,16 @@ } } } + +.imageCount { + position: absolute; + bottom: $spacer / 4; + right: $spacer / 2; + color: $brand-light; + font-size: $font-size-mini; + opacity: .85; + + svg { + fill: $brand-light; + } +} From 9ce80bd75be8955c5366f5ec084ddce0867193e9 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 24 Nov 2018 17:36:16 +0100 Subject: [PATCH 2/3] tweaks --- .stylelintrc | 3 ++- src/pages/index.jsx | 15 ++++++++------- src/pages/index.module.scss | 20 +++++++++++++++----- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 54edb73..36225c9 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -7,6 +7,7 @@ "syntax": "scss", "rules": { "indentation": 4, - "number-leading-zero": "never" + "number-leading-zero": "never", + "no-descending-specificity": null } } diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 73890fe..22e3917 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -5,27 +5,28 @@ import ProjectImage from '../components/molecules/ProjectImage' import { ReactComponent as Images } from '../images/images.svg' import styles from './index.module.scss' -const getImageCount = (imageEdges, slug) => { +const getImageCount = (images, slug) => { let array = [] + let slugWithoutSlashes = slug.replace(/\//g, '') - imageEdges.map(({ node }) => { - if (node.name.includes(slug.replace(/\//g, ''))) { + images.map(({ node }) => { + if (node.name.includes(slugWithoutSlashes)) { array.push(node) } }) - return array + return array.length } const Home = ({ data }) => { const projects = data.allProjectsYaml.edges - const imageEdges = data.projectImageFiles.edges + const images = data.projectImageFiles.edges return (
{projects.map(({ node }) => { const { slug, title, img } = node - const imageCount = getImageCount(imageEdges, slug).length + const imageCount = getImageCount(images, slug) return (
@@ -33,7 +34,7 @@ const Home = ({ data }) => {

{title}

- {imageCount > 0 && ( + {imageCount > 1 && ( Date: Sat, 24 Nov 2018 18:18:43 +0100 Subject: [PATCH 3/3] remove codacy --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0afd54a..e490292 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@

-