clean up photogallery query

This commit is contained in:
Chuck Dries 2022-07-09 21:30:35 -07:00
parent 88e8f57e9d
commit 3bc06cc0c8
No known key found for this signature in database
GPG Key ID: A00B7AEAE1DC5BE6

View File

@ -19,16 +19,19 @@ const GalleryPage = ({ data }) => {
const [keyword, _setKeyword] = React.useState(null); const [keyword, _setKeyword] = React.useState(null);
const [sortKey, _setSortKey] = React.useState("rating"); const [sortKey, _setSortKey] = React.useState("rating");
const setKeyword = React.useCallback((keyword) => { const setKeyword = React.useCallback(
try { (keyword) => {
window.plausible("Filter Keyword", { try {
props: { keyword }, window.plausible("Filter Keyword", {
}); props: { keyword },
} catch (e) { });
// do nothing } catch (e) {
} // do nothing
_setKeyword(keyword); }
}, [_setKeyword]); _setKeyword(keyword);
},
[_setKeyword]
);
const setSortKey = React.useCallback( const setSortKey = React.useCallback(
(key) => { (key) => {
@ -55,7 +58,6 @@ const GalleryPage = ({ data }) => {
const images = React.useMemo( const images = React.useMemo(
() => () =>
R.pipe( R.pipe(
R.map((edge) => edge.node),
sortKey === "date" sortKey === "date"
? R.sort((node1, node2) => { ? R.sort((node1, node2) => {
const date1 = new Date( const date1 = new Date(
@ -75,7 +77,7 @@ const GalleryPage = ({ data }) => {
) )
) )
: R.identity : R.identity
)(data.allFile.edges), )(data.allFile.nodes),
[data, sortKey, keyword] [data, sortKey, keyword]
); );
@ -169,33 +171,31 @@ export const query = graphql`
filter: { sourceInstanceName: { eq: "gallery" } } filter: { sourceInstanceName: { eq: "gallery" } }
sort: { fields: fields___imageMeta___dateTaken, order: DESC } sort: { fields: fields___imageMeta___dateTaken, order: DESC }
) { ) {
edges { nodes {
node { relativePath
relativePath base
base childImageSharp {
childImageSharp { fluid {
fluid { aspectRatio
aspectRatio
}
gatsbyImageData(
layout: CONSTRAINED
height: 550
placeholder: DOMINANT_COLOR
)
} }
fields { gatsbyImageData(
imageMeta { layout: CONSTRAINED
vibrantHue height: 550
dominantHue placeholder: DOMINANT_COLOR
dateTaken )
meta { }
Keywords fields {
Rating imageMeta {
ObjectName vibrantHue
} dominantHue
vibrant { dateTaken
Vibrant meta {
} Keywords
Rating
ObjectName
}
vibrant {
Vibrant
} }
} }
} }