From b958da3bc49ee37caead791b7192445784002c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Tue, 30 Oct 2018 21:17:51 -0300
Subject: [PATCH 01/11] Fix ambassadors and merchant sort undefined error

---
 src/components/EnhancedTable.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js
index c7eb76a..a878a7a 100644
--- a/src/components/EnhancedTable.js
+++ b/src/components/EnhancedTable.js
@@ -94,15 +94,15 @@ class EnhancedTable extends Component {
     const data =
       order === 'desc'
         ? this.state.data.sort((a, b) => {
-          let a_value = a[orderBy];
-          let b_value = b[orderBy];
+          let a_value = (a[orderBy] !== undefined) ? a[orderBy]: '';
+          let b_value = (b[orderBy] !== undefined) ? b[orderBy]: '';
           a_value = a_value.hasOwnProperty('searchText') ?  a_value.searchText.toLowerCase() : a_value.toLowerCase();
           b_value = b_value.hasOwnProperty('searchText') ?  b_value.searchText.toLowerCase() : b_value.toLowerCase();
           return (b_value < a_value) ? -1 : 1;
         })
         : this.state.data.sort((a, b) => {
-          let a_value = a[orderBy];
-          let b_value = b[orderBy];
+          let a_value = (a[orderBy] !== undefined) ? a[orderBy]: '';
+          let b_value = (b[orderBy] !== undefined) ? b[orderBy]: '';
           a_value = a_value.hasOwnProperty('searchText') ?  a_value.searchText.toLowerCase() : a_value.toLowerCase();
           b_value = b_value.hasOwnProperty('searchText') ?  b_value.searchText.toLowerCase() : b_value.toLowerCase();
           if(a_value.trim() === '') a_value = 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';

From 3b4593540f6be5e93563a76fc79d618748885f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Wed, 31 Oct 2018 14:28:06 -0300
Subject: [PATCH 02/11] Remove sort link on the Map column

---
 src/components/EnhancedTable.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js
index a878a7a..8eb820d 100644
--- a/src/components/EnhancedTable.js
+++ b/src/components/EnhancedTable.js
@@ -87,6 +87,8 @@ class EnhancedTable extends Component {
     const orderBy = property;
     let order = 'desc';
 
+    if(orderBy === 'map') return;
+
     if (this.state.orderBy === property && this.state.order === 'desc') {
       order = 'asc';
     }

From 57a63fa711a5e5f722ca427fc30229e7e3bcb8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Wed, 31 Oct 2018 19:53:04 -0300
Subject: [PATCH 03/11] Replace city and country by sortable location

---
 src/components/pages/AmbassadorsPage.js | 2 +-
 src/components/pages/MerchantsPage.js   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index b25c16a..9b34dd7 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -394,7 +394,7 @@ class AmbassadorsPage extends Component {
                 <EnhancedTable
                   columnData={columnData}
                   data={data}
-                  orderBy="nickname"
+                  orderBy="location"
                   showSearchColumns={false}
                   rowsPerPage={10}
                   isAdmin={false}
diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js
index 1c0170d..9bf2adb 100644
--- a/src/components/pages/MerchantsPage.js
+++ b/src/components/pages/MerchantsPage.js
@@ -54,8 +54,7 @@ const mapsStyles = {
 const columnData = [
   { id: 'name', numeric: false, disablePadding: true, label: 'Name' },
   { id: 'address', numeric: false, disablePadding: true, label: 'Address' },
-  { id: 'city', numeric: false, disablePadding: false, label: 'City' },
-  { id: 'country', numeric: false, disablePadding: false, label: 'Country' },
+  { id: 'location', numeric: false, disablePadding: false, label: 'Location' },
   { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true}
 ];
 
@@ -203,6 +202,10 @@ class MerchantsPage extends Component {
         <div><b>Address</b>: {merchant.address}</div>
         {(merchant.phone) && (<div><b>Phone</b>: {merchant.phone}</div>)}
         </div>;
+      merchant.location = {
+        searchText: `${merchant.country} - ${merchant.city}`,
+        value: (merchant.city) ? `${merchant.city} - ${merchant.country}`: merchant.country
+      }
       merchant.map = <Button
         className="App-button"
         variant="contained"

From ba65b67aaa812bf7e98131e848b99899da8193b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Thu, 1 Nov 2018 14:05:53 -0300
Subject: [PATCH 04/11] Location sort based on Country first and city

---
 src/components/EnhancedTable.js         | 2 ++
 src/components/pages/AmbassadorsPage.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js
index 8eb820d..141465c 100644
--- a/src/components/EnhancedTable.js
+++ b/src/components/EnhancedTable.js
@@ -81,6 +81,8 @@ class EnhancedTable extends Component {
         };
       }).sort(sortBy('name'))
     };
+
+    this.handleRequestSort('', this.props.orderBy);
   }
 
   handleRequestSort = (event, property) => {
diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index 9b34dd7..0c8b90a 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -244,7 +244,7 @@ class AmbassadorsPage extends Component {
   addLocationSearchText(cities){
     let searchText = '';
     cities.forEach((location) => {
-      searchText += `${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - ${countries.getName(location.country)} `;
+      searchText += `${countries.getName(location.country)} - ${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())}`;
     });
 
     return searchText;
@@ -394,7 +394,7 @@ class AmbassadorsPage extends Component {
                 <EnhancedTable
                   columnData={columnData}
                   data={data}
-                  orderBy="location"
+                  orderBy="Location"
                   showSearchColumns={false}
                   rowsPerPage={10}
                   isAdmin={false}

From 8fe0954587bba3b1c21cc12b51ee6c5f69b9c3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Fri, 2 Nov 2018 03:24:32 -0300
Subject: [PATCH 05/11] Fixed the anchor in services and uppercase in slogan

---
 src/assets/css/palmpay.css                 | 10 ++++++++++
 src/components/Footer.js                   |  2 +-
 src/components/sections/ServicesSection.js |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/assets/css/palmpay.css b/src/assets/css/palmpay.css
index dd0aee2..2698eb0 100644
--- a/src/assets/css/palmpay.css
+++ b/src/assets/css/palmpay.css
@@ -396,4 +396,14 @@ header .col-md-10, header .col-md-10 > div {
 
 .search-books-input-wrapper > div {
   margin-left: 0 !important;
+}
+.text-box-top {
+  margin-top: 60px;
+}
+
+.text-box-bottom {
+  margin-bottom: 60px;
+}
+.uppercase-text {
+  text-transform: uppercase;
 }
\ No newline at end of file
diff --git a/src/components/Footer.js b/src/components/Footer.js
index aeda4b8..e828b2d 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -75,7 +75,7 @@ function Footer() {
             </ul>
           </Col>
           <Col className="brandTextFooter" md="4">
-            <p className="mb-0">
+            <p className="mb-0 uppercase-text">
               <span id="ft_lang1">
                 <FormattedMessage id="footer.title" />
               </span>
diff --git a/src/components/sections/ServicesSection.js b/src/components/sections/ServicesSection.js
index 4f017b5..bb64e1b 100644
--- a/src/components/sections/ServicesSection.js
+++ b/src/components/sections/ServicesSection.js
@@ -17,7 +17,7 @@ import Retail from '../../assets/img/services/retail.png';
 function ServicesSection() {
   return (
     <section data-spy="scroll" data-target="#mainNav" id="services">
-      <div className="col-md-10 mx-md-auto">
+      <div className="col-md-10 mx-md-auto text-box-top">
         <div className="row">
           <div className="col-lg-12 text-center">
             <h2 className="section-heading">
@@ -29,7 +29,7 @@ function ServicesSection() {
           </div>
         </div>
       </div>
-      <div className="containerfix">
+      <div className="containerfix text-box-bottom">
         <div className="row"  style={{ margin: 'auto' }}>
           <div className="col-lg-3 col-md-6 text-center">
             <div className="service-box mt-5 mx-auto">

From b782cfcd84f9dd116f49e1a46a055bda54bfc009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Fri, 2 Nov 2018 18:25:50 -0300
Subject: [PATCH 06/11] Sort ambassador by country and city on component load

---
 src/components/pages/AmbassadorsPage.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index 0c8b90a..971cc27 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -3,6 +3,7 @@ import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
 import Modal from 'react-modal';
 import { Link } from 'react-router-dom';
 import Button from '@material-ui/core/Button';
+import sortBy from 'sort-by';
 
 // Custom components
 import AppHeader from '../AppHeader';
@@ -143,7 +144,8 @@ class AmbassadorsPage extends Component {
         searchText: ambassador.telegram,
         value: (
           <a
-            href={`https://t.me/${(ambassador.telegram.trim().charAt(0) === '@') ? ambassador.telegram.trim().slice(1): ambassador.telegram.trim()}`}
+            href={`https://t.me/${(ambassador.telegram.trim().charAt(0) === '@') ?
+              ambassador.telegram.trim().slice(1): ambassador.telegram.trim()}`}
             target="_blank"
             rel="noopener noreferrer"
           >{ambassador.telegram}</a>
@@ -315,7 +317,7 @@ class AmbassadorsPage extends Component {
   }
 
   render() {
-    const { data } = this.state.ambassadors;
+    let { data } = this.state.ambassadors;
     const { ambassadorsSearch, merchantMarkers } = this.state;
 
     const ambassadorsMarkers = [];
@@ -346,6 +348,8 @@ class AmbassadorsPage extends Component {
       });
     });
 
+    data = data.sort(sortBy('location.searchText'));
+
     return (
       <div>
         <AppHeader />

From 23318a59e873b4d47f7e914e85e95a7f4065239b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Fri, 2 Nov 2018 19:11:40 -0300
Subject: [PATCH 07/11] Sort merchants by country and city on component load

---
 src/components/pages/MerchantsPage.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js
index 9bf2adb..b3e3c5a 100644
--- a/src/components/pages/MerchantsPage.js
+++ b/src/components/pages/MerchantsPage.js
@@ -3,6 +3,7 @@ import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
 import Modal from 'react-modal';
 import { Link } from 'react-router-dom';
 import Button from '@material-ui/core/Button';
+import sortBy from 'sort-by';
 
 // Custom components
 import AppHeader from '../AppHeader';
@@ -258,7 +259,7 @@ class MerchantsPage extends Component {
   }
 
   render() {
-    const { data: merchantsData } = this.state.merchants;
+    let { data: merchantsData } = this.state.merchants;
     const { ambassadorsMarkers, merchantsSearch } = this.state;
 
     const merchantMarkers = merchantsSearch.map(merchant => {
@@ -276,6 +277,8 @@ class MerchantsPage extends Component {
       return marker;
     });
 
+    merchantsData = merchantsData.sort(sortBy('location.searchText'));
+
 
     return (
       <div>

From 8fbd72bb1a68c00ff1f1e802462ada4cda81523a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Sun, 4 Nov 2018 17:42:22 -0200
Subject: [PATCH 08/11] Move the search box up so that it is in line (to the
 left) of the paragraph of ambassador text

---
 src/components/EnhancedSearch.js        |  3 ++-
 src/components/EnhancedTable.js         |  4 ++--
 src/components/pages/AmbassadorsPage.js | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/EnhancedSearch.js b/src/components/EnhancedSearch.js
index d3d43dc..e2cc4f6 100644
--- a/src/components/EnhancedSearch.js
+++ b/src/components/EnhancedSearch.js
@@ -42,7 +42,7 @@ const styles = theme => ({
 class EnhancedSearch extends Component {
 
 	render() {
-		const {query, onUpdateQuery, onColumnChange} = this.props;
+		const {query, onUpdateQuery, onColumnChange, textComponent} = this.props;
 		const { classes } = this.props;
 
 		return (
@@ -62,6 +62,7 @@ class EnhancedSearch extends Component {
 		            startAdornment: <InputAdornment position="start"><Search /></InputAdornment>,
 		          }}
 		        />
+            {textComponent}
 						<br />
             {this.props.showSearchColumns && this.props.columns.map(column => (
               <FormControlLabel
diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js
index 141465c..1dec23f 100644
--- a/src/components/EnhancedTable.js
+++ b/src/components/EnhancedTable.js
@@ -57,6 +57,7 @@ const defaultProps = {
   onEdit: () => {},
   onDelete: () => {},
   onMultipleDelete: () => {},
+  description: ''
 };
 
 /**
@@ -81,8 +82,6 @@ class EnhancedTable extends Component {
         };
       }).sort(sortBy('name'))
     };
-
-    this.handleRequestSort('', this.props.orderBy);
   }
 
   handleRequestSort = (event, property) => {
@@ -254,6 +253,7 @@ class EnhancedTable extends Component {
     return (
       <div style={styles.root}>
         <EnhancedSearch
+          textComponent={this.props.description}
           query={searchQuery}
           columns={searchColumns}
           showSearchColumns={showSearchColumns}
diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index 971cc27..f513740 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -350,6 +350,16 @@ class AmbassadorsPage extends Component {
 
     data = data.sort(sortBy('location.searchText'));
 
+    const textComponent = (
+      <span>
+        <FormattedHTMLMessage id="ambassadors.description1" />
+        <Link to="/merchants">
+        <FormattedMessage id="ambassadors.merchants_link_description" />
+        </Link>
+        <FormattedHTMLMessage id="ambassadors.description2" />
+      </span>
+    );
+
     return (
       <div>
         <AppHeader />
@@ -367,14 +377,6 @@ class AmbassadorsPage extends Component {
               <img src={LoadingGif} alt="Loading" style={loadingStyle} />
         ): (
           <div>
-            <p style={{ textAlign: 'left', marginRight: 20 }}>
-              <FormattedHTMLMessage id="ambassadors.description1" />
-              <Link to="/merchants">
-                <FormattedMessage id="ambassadors.merchants_link_description" />
-              </Link>
-              <FormattedHTMLMessage id="ambassadors.description2" />
-            </p>
-
             <Modal
               isOpen={this.state.mapsModalIsOpen}
               onRequestClose={() => this.closeMapsModal()}
@@ -396,6 +398,7 @@ class AmbassadorsPage extends Component {
               <div>
                 <br />
                 <EnhancedTable
+                  description={textComponent}
                   columnData={columnData}
                   data={data}
                   orderBy="Location"

From 5af3a3acde18442237b9f2a7e4b78af90c9ad287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Sun, 4 Nov 2018 18:26:38 -0200
Subject: [PATCH 09/11] Move the search box up so that it is in line (to the
 left) of the paragraph of merchant text

---
 src/components/pages/AmbassadorsPage.js |  1 -
 src/components/pages/MerchantsPage.js   | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js
index f513740..161cc77 100644
--- a/src/components/pages/AmbassadorsPage.js
+++ b/src/components/pages/AmbassadorsPage.js
@@ -370,7 +370,6 @@ class AmbassadorsPage extends Component {
       <div className="row">
       <div className="col-md-10 mx-md-auto">
 
-
         <h2 className="ambassadorsTitle" style={centerStyle}><FormattedMessage id="ambassadors.title" /></h2>
         { /* Conditional Rendering */}
             {(this.state.loading) ? (
diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js
index b3e3c5a..0afe1cb 100644
--- a/src/components/pages/MerchantsPage.js
+++ b/src/components/pages/MerchantsPage.js
@@ -279,6 +279,15 @@ class MerchantsPage extends Component {
 
     merchantsData = merchantsData.sort(sortBy('location.searchText'));
 
+    const textComponent = (
+      <span>
+        <FormattedHTMLMessage id="merchants.description1" />
+        <Link to="/ambs">
+          <FormattedMessage id="merchants.ambassadors_link_description" />
+        </Link>
+        <FormattedHTMLMessage id="merchants.description2" />
+      </span>
+    );
 
     return (
       <div>
@@ -295,13 +304,6 @@ class MerchantsPage extends Component {
               <img src={LoadingGif} alt="Loading" style={loadingStyle} />
         ): (
           <div>
-            <p style={{ textAlign: 'left', marginRight: 20 }}>
-              <FormattedHTMLMessage id="merchants.description1" />
-              <Link to="/ambs">
-                <FormattedMessage id="merchants.ambassadors_link_description" />
-              </Link>
-              <FormattedHTMLMessage id="merchants.description2" />
-            </p>
 
             <Modal
               isOpen={this.state.mapsModalIsOpen}
@@ -325,6 +327,7 @@ class MerchantsPage extends Component {
               <div>
                 <br />
                 <EnhancedTable
+                  description={textComponent}
                   columnData={columnData}
                   data={merchantsData}
                   orderBy="account"

From 4a2c8f76dd52d8d6f362466e3bc92f8f9260eb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Sun, 4 Nov 2018 21:33:55 -0200
Subject: [PATCH 10/11] Add contact info at merchants table

---
 src/components/pages/MerchantsPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js
index 0afe1cb..4875c04 100644
--- a/src/components/pages/MerchantsPage.js
+++ b/src/components/pages/MerchantsPage.js
@@ -54,6 +54,7 @@ const mapsStyles = {
 
 const columnData = [
   { id: 'name', numeric: false, disablePadding: true, label: 'Name' },
+  { id: 'phone', numeric: false, disablePadding: true, label: 'Contact' },
   { id: 'address', numeric: false, disablePadding: true, label: 'Address' },
   { id: 'location', numeric: false, disablePadding: false, label: 'Location' },
   { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true}

From 6aee805673e66e66a5b28a4e3c83b02fb9c2df9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Let=C3=ADcia=20Camara?= <lettcamara@gmail.com>
Date: Mon, 5 Nov 2018 01:38:34 -0200
Subject: [PATCH 11/11] Update google maps API key

---
 src/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/constants.js b/src/utils/constants.js
index b9be2bb..07fa415 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -1,3 +1,3 @@
-const GOOGLE_MAPS_API = 'AIzaSyD5BzjBYtpnQcztK18LEIvDZr9Y0L99k0s';
+const GOOGLE_MAPS_API = 'AIzaSyAwVFmgFPt_0fji8qFH5ecGG1A_ZviHe7M';
 
 export default GOOGLE_MAPS_API;