diff --git a/src/assets/css/palmpay.css b/src/assets/css/palmpay.css index 49511a3..dd0aee2 100644 --- a/src/assets/css/palmpay.css +++ b/src/assets/css/palmpay.css @@ -365,3 +365,35 @@ ul.social-buttons { padding-left: 0 !important; padding-right: 0 !important; } +.ambassadorsTitle { + margin-top: 0 !important; +} + +@media screen and (min-width: 328px) { + .ambassadorsTitle { + font-weight: bold; + } + .marketingMargin { + font-weight: bold; + } + .merchantsMargin { + font-weight: bold; + } +} + +th { + text-align: left !important; +} + +#mainNav p { + margin-left: 0 !important; + +} + +header .col-md-10, header .col-md-10 > div { + padding-left: 0 !important; +} + +.search-books-input-wrapper > div { + margin-left: 0 !important; +} \ No newline at end of file diff --git a/src/assets/img/about/ab1.png b/src/assets/img/about/ab1.png old mode 100644 new mode 100755 index 754635d..3b8c4a5 Binary files a/src/assets/img/about/ab1.png and b/src/assets/img/about/ab1.png differ diff --git a/src/assets/img/about/ab2.png b/src/assets/img/about/ab2.png old mode 100644 new mode 100755 index 015cccb..164decc Binary files a/src/assets/img/about/ab2.png and b/src/assets/img/about/ab2.png differ diff --git a/src/assets/img/about/ab3.png b/src/assets/img/about/ab3.png old mode 100644 new mode 100755 index 1ddeb5a..e6b7a41 Binary files a/src/assets/img/about/ab3.png and b/src/assets/img/about/ab3.png differ diff --git a/src/assets/img/about/ab4.png b/src/assets/img/about/ab4.png old mode 100644 new mode 100755 index d70becb..6ae8d7e Binary files a/src/assets/img/about/ab4.png and b/src/assets/img/about/ab4.png differ diff --git a/src/assets/img/about/ab5.png b/src/assets/img/about/ab5.png old mode 100644 new mode 100755 index d6b4e2b..e3d18ab Binary files a/src/assets/img/about/ab5.png and b/src/assets/img/about/ab5.png differ diff --git a/src/assets/img/footer/dtube.png b/src/assets/img/footer/dtube.png old mode 100644 new mode 100755 index 23f2c54..0ae5231 Binary files a/src/assets/img/footer/dtube.png and b/src/assets/img/footer/dtube.png differ diff --git a/src/assets/img/footer/footer_logo.png b/src/assets/img/footer/footer_logo.png old mode 100644 new mode 100755 index 630dcd1..ab620dc Binary files a/src/assets/img/footer/footer_logo.png and b/src/assets/img/footer/footer_logo.png differ diff --git a/src/assets/img/footer/steemit.png b/src/assets/img/footer/steemit.png old mode 100644 new mode 100755 index cf6c231..2ec5fc2 Binary files a/src/assets/img/footer/steemit.png and b/src/assets/img/footer/steemit.png differ diff --git a/src/assets/img/header/header-bg.jpg b/src/assets/img/header/header-bg.jpg index e209ce5..696546e 100644 Binary files a/src/assets/img/header/header-bg.jpg and b/src/assets/img/header/header-bg.jpg differ diff --git a/src/assets/img/header/logo.png b/src/assets/img/header/logo.png old mode 100644 new mode 100755 index 0d28647..4bc62c0 Binary files a/src/assets/img/header/logo.png and b/src/assets/img/header/logo.png differ diff --git a/src/assets/img/map/ambassador_cluster.png b/src/assets/img/map/ambassador_cluster.png old mode 100644 new mode 100755 index 329ff52..21130fb Binary files a/src/assets/img/map/ambassador_cluster.png and b/src/assets/img/map/ambassador_cluster.png differ diff --git a/src/assets/img/map/ambassador_pin.png b/src/assets/img/map/ambassador_pin.png old mode 100644 new mode 100755 index 2128aab..d0b5870 Binary files a/src/assets/img/map/ambassador_pin.png and b/src/assets/img/map/ambassador_pin.png differ diff --git a/src/assets/img/map/merchant_cluster.png b/src/assets/img/map/merchant_cluster.png old mode 100644 new mode 100755 index 6869864..822cc89 Binary files a/src/assets/img/map/merchant_cluster.png and b/src/assets/img/map/merchant_cluster.png differ diff --git a/src/assets/img/map/merchant_pin.png b/src/assets/img/map/merchant_pin.png old mode 100644 new mode 100755 index 462f502..4e8b955 Binary files a/src/assets/img/map/merchant_pin.png and b/src/assets/img/map/merchant_pin.png differ diff --git a/src/assets/img/services/bill_pay_counters.png b/src/assets/img/services/bill_pay_counters.png old mode 100644 new mode 100755 index 26157a0..11f9990 Binary files a/src/assets/img/services/bill_pay_counters.png and b/src/assets/img/services/bill_pay_counters.png differ diff --git a/src/assets/img/services/cafe_bars.png b/src/assets/img/services/cafe_bars.png old mode 100644 new mode 100755 index 68f49e1..ee4b131 Binary files a/src/assets/img/services/cafe_bars.png and b/src/assets/img/services/cafe_bars.png differ diff --git a/src/assets/img/services/delivery_drivers.png b/src/assets/img/services/delivery_drivers.png old mode 100644 new mode 100755 index f8125b1..656d2d7 Binary files a/src/assets/img/services/delivery_drivers.png and b/src/assets/img/services/delivery_drivers.png differ diff --git a/src/assets/img/services/gas_stations.png b/src/assets/img/services/gas_stations.png old mode 100644 new mode 100755 index 9e2e3a2..981a21e Binary files a/src/assets/img/services/gas_stations.png and b/src/assets/img/services/gas_stations.png differ diff --git a/src/assets/img/services/grocery.png b/src/assets/img/services/grocery.png old mode 100644 new mode 100755 index 016cb52..91f8d60 Binary files a/src/assets/img/services/grocery.png and b/src/assets/img/services/grocery.png differ diff --git a/src/assets/img/services/phone_orders.png b/src/assets/img/services/phone_orders.png old mode 100644 new mode 100755 index babe286..7a6d0cd Binary files a/src/assets/img/services/phone_orders.png and b/src/assets/img/services/phone_orders.png differ diff --git a/src/assets/img/services/restaurants.png b/src/assets/img/services/restaurants.png old mode 100644 new mode 100755 index 0b2a3d0..4ff4d1d Binary files a/src/assets/img/services/restaurants.png and b/src/assets/img/services/restaurants.png differ diff --git a/src/assets/img/services/retail.png b/src/assets/img/services/retail.png old mode 100644 new mode 100755 index ece9a97..8d077ce Binary files a/src/assets/img/services/retail.png and b/src/assets/img/services/retail.png differ diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index 6dac271..b0605f5 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -14,13 +14,15 @@ import AppLogo from '../assets/img/header/logo.png'; function AppHeader() { return ( +
- + Palmpay logo +
); } diff --git a/src/components/EnhancedTable.js b/src/components/EnhancedTable.js index cd7616f..c7eb76a 100644 --- a/src/components/EnhancedTable.js +++ b/src/components/EnhancedTable.js @@ -93,8 +93,22 @@ class EnhancedTable extends Component { const data = order === 'desc' - ? this.state.data.sort((a, b) => (b[orderBy] < a[orderBy] ? -1 : 1)) - : this.state.data.sort((a, b) => (a[orderBy] < b[orderBy] ? -1 : 1)); + ? this.state.data.sort((a, b) => { + let a_value = a[orderBy]; + let b_value = 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]; + 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'; + if(b_value.trim() === '') b_value = 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; + return (a_value < b_value) ? -1 : 1; + }); this.setState({ data, order, orderBy }); }; diff --git a/src/components/LayerMapSwitches.js b/src/components/LayerMapSwitches.js index f0df207..7670614 100644 --- a/src/components/LayerMapSwitches.js +++ b/src/components/LayerMapSwitches.js @@ -88,7 +88,7 @@ class LayerMapSwitches extends React.Component { onChange={this.props.onChange('ambassadorLayer')} value="ambassadors" classes={{ - switchBase: ( (this.props.ambsMap) ? classes.iOSSwitchBaseBlue : classes.iOSSwitchBaseGreen ), + switchBase: classes.iOSSwitchBaseBlue, bar: classes.iOSBar, icon: classes.iOSIcon, iconChecked: classes.iOSIconChecked, @@ -102,7 +102,7 @@ class LayerMapSwitches extends React.Component { control={ {stripProtocol(ambassador.url)}; + ambassador.telegram_original = ambassador.telegram; + ambassador.telegram = { + searchText: ambassador.telegram, + value: ( + {ambassador.telegram} + ) + }; + ambassador.map = app.addMapButton(ambassador, ambassador.cities); + ambassador.link = { + searchText: stripProtocol(ambassador.url), + value: ( + {stripProtocol(ambassador.url)} + ) + }; }); // Once both return, update the state @@ -185,12 +200,16 @@ class AmbassadorsPage extends Component { }); const markers = result.data.map(merchant => { + const infoDescription =
+
Address: {merchant.address}
+ {(merchant.phone) && (
Phone: {merchant.phone}
)} +
; const marker = { lat: merchant.lat, lng: merchant.lon, withInfo: true, infoTitle: merchant.name, - infoDescription: `${merchant.address}, ${merchant.city} - ${merchant.country}`, + infoDescription: infoDescription, }; return marker; }); @@ -245,11 +264,28 @@ class AmbassadorsPage extends Component { ); } - addMapButton(nickname, cities){ + addMapButton(ambassador, cities){ const app = this; return ( - {cities.map((location, index) => ( + {cities.map((location, index) => { + const infoDescription =
+
Location: {(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - {countries.getName(location.country)}
+ {(ambassador.nickname) && (
Nickname: {ambassador.nickname}
)} + {(ambassador.telegram_original) && (
Telegram: + {ambassador.telegram_original} +
)} + {(ambassador.keybase) && (
Keybase: {ambassador.keybase}
)} + {(ambassador.email) && (
Email: {ambassador.email}
)} + {(ambassador.phone) && (
Phone: {ambassador.phone}
)} + {(ambassador.url) && (
URL:: {stripProtocol(ambassador.url)}
)} +
; + return (
- ))} + );})} ); } @@ -285,12 +321,26 @@ class AmbassadorsPage extends Component { const ambassadorsMarkers = []; ambassadorsSearch.forEach(ambassador => { ambassador.cities.forEach(function(city) { + const infoDescription =
+
Location: {(city.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - {countries.getName(city.country)}
+ {(ambassador.nickname) && (
Nickname: {ambassador.nickname}
)} + {(ambassador.telegram_original) && (
Telegram: {ambassador.telegram_original}
)} + {(ambassador.keybase) && (
Keybase: {ambassador.keybase}
)} + {(ambassador.email) && (
Email: {ambassador.email}
)} + {(ambassador.phone) && (
Phone: {ambassador.phone}
)} + {(ambassador.url) && (
URL:: {stripProtocol(ambassador.url)}
)} +
; const marker = { lat: city.lat, lng: city.lon, withInfo: true, infoTitle: ambassador.nickname, - infoDescription: `${city.name} - ${city.country}`, + infoDescription: infoDescription, }; ambassadorsMarkers.push(marker); }); @@ -313,7 +363,7 @@ class AmbassadorsPage extends Component { Loading ): (
-

+

diff --git a/src/components/pages/HomePage.css b/src/components/pages/HomePage.css index 0aa48b1..c67b207 100644 --- a/src/components/pages/HomePage.css +++ b/src/components/pages/HomePage.css @@ -67,8 +67,4 @@ .margin-5 { padding: 3rem; -} - -.MuiNotchedOutline-focused-120 { - border-color: rgb(19, 143, 82) !important; } \ No newline at end of file diff --git a/src/components/pages/MarketingPage.js b/src/components/pages/MarketingPage.js index 49df096..f65a90d 100644 --- a/src/components/pages/MarketingPage.js +++ b/src/components/pages/MarketingPage.js @@ -6,6 +6,11 @@ import { FormattedMessage, FormattedHTMLMessage } from 'react-intl'; import AppHeader from '../AppHeader'; import Footer from '../Footer'; +const centerStyle = { + marginTop: 20, + marginBottom: 20 +}; + /** * Marketing page component. */ @@ -109,6 +114,7 @@ class MarketingPage extends React.Component {

+

Marketing