Merge pull request #230 from recurship/bugFix/organization_detail_mis…

…sing fix: organisation detail missing
recurship · Dec 7, 2018 · 1370df5 · 1370df5
2 parents 2cc88d5 + 2a1e426
commit 1370df5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/client/src/components/SummaryContainer/SummaryContainer.js b/client/src/components/SummaryContainer/SummaryContainer.js
@@ -8,7 +8,11 @@ class SummaryContainer extends Component<Props> {
       <Col md="3">
         <Row>
           <Col md="2">
-            <i className={this.props.iconName} />
+            {this.props.logo ? (
+              <img id="organisation-logo" src={this.props.logo} />
+            ) : (
+              <i className={this.props.iconName} />
+            )}
           </Col>
           <Col md="10">
             {this.props.url === null ? (

diff --git a/client/src/containers/CurrentEvent/CurrentEvent.css b/client/src/containers/CurrentEvent/CurrentEvent.css
@@ -12,3 +12,10 @@
   right: 20px;
   z-index: 10;
 }
+
+#organisation-logo {
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  background-size: cover;
+}
diff --git a/client/src/containers/CurrentEvent/CurrentEvent.js b/client/src/containers/CurrentEvent/CurrentEvent.js
@@ -104,6 +104,7 @@ class CurrentEvent extends Component<Props> {
                 url={`/organisations/${event.organisation.id}/`}
                 iconName="fa fa-users fa-2x"
                 content={event.organisation.name}
+                logo={event.organisation.logo}
               />
             </Row>
             <DescriptionContainer description={event.description} />
@@ -133,7 +134,7 @@ class CurrentEvent extends Component<Props> {
               </Row>
             ) : null}
 
-            <ContentHeader heading="Organizer Details" />
+            <ContentHeader heading="Organiser Detail" />
             <Row className="block-content">
               <SummaryContainer
                 iconName="fa fa-envelope fa-2x"
@@ -143,17 +144,17 @@ class CurrentEvent extends Component<Props> {
               <SummaryContainer
                 iconName="fa fa-phone-square fa-2x"
                 url={null}
-                content={event.organisation.contact}
+                content={event.organisation.contactNumber}
               />
               <SummaryContainer
                 iconName="fa fa-facebook-square fa-2x"
-                url={`https://www.facebook.com/${event.organisation.facebook}`}
+                url={event.organisation.facebook}
                 content={event.organisation.facebook}
                 externalLink={true}
               />
               <SummaryContainer
                 iconName="fa fa-twitter-square fa-2x"
-                url={`https://www.twitter.com/${event.organisation.twitter}`}
+                url={event.organisation.twitter}
                 content={event.organisation.twitter}
                 externalLink={true}
               />