Merge branch 'develop' into feature/event-loading-indicator

Zubair Ahmed · web-flow · commit b75c6c3c23ac · 2017-12-18T06:27:20.000+05:30
diff --git a/pages/events.js b/pages/events.js
@@ -52,15 +52,15 @@ export default class Events extends React.Component {
       } else {
         throw new Error('Failed to retieve future events');
       }
-      await this.setState({
+      this.setState({
         pastEvents,
         futureEvents,
         fetchError: null,
         loading: false,
       });
     } catch (err) {
       console.log(err);
-      await this.setState({
+      this.setState({
         pastEvents: null,
         futureEvents: null,
         fetchError: err.message,
@@ -90,12 +90,16 @@ export default class Events extends React.Component {
     return (
       <div>
         {events.slice(0, loadLimit).map(event => {
+          console.log(event);
           const regexForImageSrc = /<img.*?src="([^">]*\/([^">]*?))".*?>/g;
-          const imageSrc = regexForImageSrc.exec(event.description);
+          const imgs = regexForImageSrc.exec(event.description);
+          const imageSrc = imgs
+            ? imgs[1]
+            : event.featured_photo ? event.featured_photo.photo_link : imagePlaceholderURL;
           return (
             <EventCard
               key={event.id}
-              image={imageSrc ? imageSrc[1] : imagePlaceholderURL}
+              image={imageSrc}
               name={event.name}
               location={event.venue ? event.venue.name : 'Online'}
               online={!event.venue}
