diff --git a/gatsby-node.js b/gatsby-node.js index e766ac0..b85e6ba 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -245,6 +245,9 @@ exports.createPages = ({ actions, graphql }) => { name slug description + association { + path + } } } } @@ -271,6 +274,7 @@ exports.createPages = ({ actions, graphql }) => { name: eventOrganizer.name, slug: eventOrganizer.slug, description: eventOrganizer.description, + association: eventOrganizer.association, }, }) } diff --git a/src/components/EventList.js b/src/components/EventList.js index 891a2b2..917e692 100644 --- a/src/components/EventList.js +++ b/src/components/EventList.js @@ -121,6 +121,7 @@ const EventList = props => { showMore, showFilter, filterOrganizer, + children, } = props let filteredEvents = events.filter(({ node: event }) => { @@ -155,6 +156,7 @@ const EventList = props => { return (
{title &&

{title}

} + {children} {showFilter && organizers && (
{ } EventList.propTypes = { + children: PropTypes.shape({}), events: PropTypes.arrayOf(PropTypes.object), classes: PropTypes.string, title: PropTypes.string, diff --git a/src/templates/event-organizer.js b/src/templates/event-organizer.js index 6cb4dfa..23fe700 100644 --- a/src/templates/event-organizer.js +++ b/src/templates/event-organizer.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import Helmet from 'react-helmet' -import { graphql } from 'gatsby' +import { graphql, Link } from 'gatsby' import moment from 'moment' import 'moment/locale/nb' @@ -14,10 +14,10 @@ export default class EventOrganizerPage extends React.Component { render() { const { data, pageContext } = this.props const { edges: events, totalCount } = data.allWordpressWpEvents - const { name, description, slug } = pageContext + const { name, description, slug, association } = pageContext return ( - + - {/*
-

{name}

-
- -
*/} + > +
+
+ {association && ( +
+ Les mer om {name} +
+ )} +
+ ) } @@ -49,16 +53,12 @@ EventOrganizerPage.propTypes = { name: PropTypes.string, slug: PropTypes.string, description: PropTypes.string, + association: PropTypes.shape({}), }), } export const pageQuery = graphql` query EventOrganizerPage($slug: String!) { - site { - siteMetadata { - title - } - } allWordpressWpEvents( filter: { event_organizers: { elemMatch: { slug: { eq: $slug } } } } sort: { fields: date, order: DESC }