events page updated

M-ZubairAhmed · M-ZubairAhmed · commit 1e28c4f22fe3 · 2017-10-06T17:34:41.000+05:30
diff --git a/components/row-events.js b/components/row-events.js
@@ -1,23 +1,31 @@
 import React from 'react';
-import { Card, Icon } from 'semantic-ui-react';
+import { Card, Icon, Image } from 'semantic-ui-react';
 
 const convertTime = time => {
   const date = new Date(time);
   return date.toDateString();
 };
 
-const RowEvent = props => (
-  <Card fluid>
-    <Card.Content>
-      <Card.Header>{props.name}</Card.Header>
-      <Card.Meta>{convertTime(props.time)}</Card.Meta>
-      {/* <Card.Description as="string">{props.description}</Card.Description> */}
-    </Card.Content>
-    <Card.Content extra>
-      <Icon circular name="users" />
-      {`${props.yesCount} attended`}
-    </Card.Content>
-  </Card>
-);
+const RowEvent = props => {
+  const matchForImage = props.description.match(
+    /<img.+src=(?:"|')(.+?)(?:"|')(?:.+?)>/,
+  );
+  return (
+    <Card fluid>
+      <Card.Content>
+        <Image src={matchForImage === null ? '' : matchForImage[1]} />
+        <Card.Header>{props.name}</Card.Header>
+        <Card.Meta>{convertTime(props.time)}</Card.Meta>
+        <Card.Description as="string">
+          {props.description.replace(/<\/?[a-z][a-z0-9]*[^<>]*>/gi, '')}
+        </Card.Description>
+      </Card.Content>
+      <Card.Content extra>
+        <Icon circular name="users" />
+        {`${props.yesCount} attended`}
+      </Card.Content>
+    </Card>
+  );
+};
 
 export default RowEvent;
diff --git a/pages/events.js b/pages/events.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Card } from 'semantic-ui-react';
+import axios from 'axios';
 
 import publicPage from '../hocs/public-page';
 import pastEventsMeetupURL from '../common/urls';
@@ -13,17 +14,12 @@ export default publicPage(
 
     async componentDidMount() {
       try {
-        const request = await fetch(pastEventsMeetupURL);
-        if (request.ok) {
-          const response = await request.json();
-          this.setState({
-            pastEvents: response,
-          });
-        } else {
-          console.log('server responded with ', request.status);
-        }
+        const request = await axios.get(pastEventsMeetupURL);
+        this.setState({
+          pastEvents: request.data,
+        });
       } catch (err) {
-        console.log('error in fetch');
+        console.log(err);
       }
     }
 
