diff --git a/gatsby-node.js b/gatsby-node.js index 0328f3a..5e5deb0 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -164,10 +164,13 @@ exports.createPages = async ({ graphql, actions, reporter }) => { } // Create pages for each markdown file. const galleryImageTemplate = path.resolve('src/components/GalleryImage.js'); - const edges = R.sort((edge) => - new Date(R.path(['node', 'childImageSharp', 'fields', 'imageMeta', 'dateTaken'], edge)), - galleryImages.data.allFile.edges); + // const diffDate = (a, b) => + // new Date(R.path(['node', 'childImageSharp', 'fields', 'imageMeta', 'dateTaken'], a)).getTime() - new Date(R.path(['node', 'childImageSharp', 'fields', 'imageMeta', 'dateTaken'],b)).getTime(); + const edges = R.sort(R.descend((edge) => + new Date(R.path(['node', 'childImageSharp', 'fields', 'imageMeta', 'dateTaken'], edge))), + galleryImages.data.allFile.edges); + console.log(R.map(R.path(['node', 'childImageSharp', 'fields', 'imageMeta', 'dateTaken']), edges)); edges.forEach(({ node }, index) => { diff --git a/src/components/GalleryImage.js b/src/components/GalleryImage.js index d56156d..44a0ef2 100644 --- a/src/components/GalleryImage.js +++ b/src/components/GalleryImage.js @@ -99,36 +99,57 @@ const GalleryImage = ({ data, pageContext }) => { // minHeight: '500px', }} /> -
+

{image.base}

{hasName(image) &&

{name}

}

{meta.iptc.caption}

- {(locationString) &&
- - - - {locationString} -
} - {shutterSpeed &&
- - - - {shutterSpeed} -
} - {meta.exif.FNumber &&
- - - - f/{meta.exif.FNumber} -
} - {meta.exif.ISO &&
- - - - {meta.exif.ISO} -
} + {
} + {(locationString) && +
+ + + + {locationString} +
} + {shutterSpeed && +
+ + + + {shutterSpeed} +
} + {meta.exif.FNumber && +
+ + + + f/{meta.exif.FNumber} +
} + {meta.exif.ISO && +
+ + + + {meta.exif.ISO} +
}
diff --git a/src/pages/photogallery.js b/src/pages/photogallery.js index 0dce853..b365b0d 100644 --- a/src/pages/photogallery.js +++ b/src/pages/photogallery.js @@ -56,7 +56,7 @@ export const query = graphql` query GalleryPageQuery { allFile(filter: { sourceInstanceName: { eq: "gallery" }} - sort: {order: DESC, fields: childrenImageSharp___fields___imageMeta___dateTaken} + # sort: {order: DESC, fields: childrenImageSharp___fields___imageMeta___dateTaken} ) { edges { node {