diff --git a/components/events/event-card.js b/components/events/event-card.js index 1a1ae38ab..5365a9791 100644 --- a/components/events/event-card.js +++ b/components/events/event-card.js @@ -18,6 +18,7 @@ const Card = styled(Flex)` border: 1px solid ${graySecondary}; min-height: 120px; color: #8393a7; + text-align: left; & .eventPhoto { height: 120px; width: 100%; @@ -75,39 +76,63 @@ const CardTitle = styled.h3` export default props => ( - - - - + {props.showImg && ( + + + + )} + {truncateString(props.name, 64)} - + {truncateString(props.location, 55)} - + {format(props.time, "ddd MMM Do 'YY, h:mm A")} - + {props.tense === 'past' ? `${props.attendees} attended` : `${props.attendees} attending`} - + {props.online ? : } {props.online ? 'Free session' : 'Free entry'} - + diff --git a/pages/events.js b/pages/events.js index b92ad9438..eadae11bb 100644 --- a/pages/events.js +++ b/pages/events.js @@ -98,6 +98,7 @@ export default class Events extends React.Component { : event.featured_photo ? event.featured_photo.photo_link : imagePlaceholderURL; return ( + Loading.. + + ); + } else if (events.length === 0) { + return events__pic; + } else if (events === null) { + return events__pic; + } + return ( +
+ {events.slice(0, 1).map(event => { + const regexForImageSrc = /]*\/([^">]*?))".*?>/g; + const imageSrc = regexForImageSrc.exec(event.description); + return ( + + ); + })} +
+ ); + } +} + export default () => ( @@ -197,7 +274,7 @@ export default () => ( - events__pic + @@ -209,7 +286,7 @@ export default () => ( - events__pic +