From 3b0f62282015262dc31682f918e4c97183c80a85 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Sun, 21 Jul 2019 13:09:19 +0200 Subject: [PATCH] Show 9 next events on front page --- src/components/EventList.js | 18 ++++++++---------- src/pages/index.js | 3 +-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/EventList.js b/src/components/EventList.js index 452ac3f..be120a8 100644 --- a/src/components/EventList.js +++ b/src/components/EventList.js @@ -97,25 +97,23 @@ export default class EventList extends React.Component { events, title, onlyUpcoming, - numDays, + maxEvents, groupBy, showMore, } = this.props - const filteredEvents = events.filter(({ node: event }) => { + let filteredEvents = events.filter(({ node: event }) => { const startTime = moment(event.start_time) if (onlyUpcoming && !startTime.isSameOrAfter(new Date(), 'day')) { return false } - if (numDays) { - const lastDay = moment().add(numDays - 1, 'days') - if (!startTime.isSameOrBefore(lastDay, 'day')) { - return false - } - } return true }) + if (maxEvents) { + filteredEvents = filteredEvents.slice(0, maxEvents) + } + return (
{title &&

{title}

} @@ -138,7 +136,7 @@ EventList.propTypes = { events: PropTypes.arrayOf(PropTypes.object), title: PropTypes.string, onlyUpcoming: PropTypes.bool, - numDays: PropTypes.number, + maxEvents: PropTypes.number, groupBy: PropTypes.string, compactDate: PropTypes.bool, showMore: PropTypes.bool, @@ -146,7 +144,7 @@ EventList.propTypes = { EventList.defaultProps = { onlyUpcoming: true, - numDays: 0, + maxEvents: 0, groupBy: null, compactDate: false, } diff --git a/src/pages/index.js b/src/pages/index.js index c6f0761..4f9d22a 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -15,8 +15,7 @@ export default class IndexPage extends React.Component {