diff --git a/src/components/LayerMap.js b/src/components/LayerMap.js index 25b5237..42dbf22 100644 --- a/src/components/LayerMap.js +++ b/src/components/LayerMap.js @@ -16,6 +16,7 @@ import LayerMapSwitches from './LayerMapSwitches'; // Helpers import GOOGLE_MAPS_API from '../utils/constants'; import Client from '../utils/feathers'; +import ClientMerchant from '../utils/feathers_merchants'; // Images import MerchantPin from '../assets/img/map/merchant_pin.png'; @@ -33,6 +34,8 @@ const propTypes = { showControls: PropTypes.bool }; +const locationObj = {"5b6235288b12017c6257536d":{"lat":30.274084,"lon":120.15507},"5b6235288b12017c6257536c":{"lat":-22.9697777,"lon":-43.1868592},"5b6235288b12017c625753b0":{"lat":37.9759033,"lon":22.9774589},"5b6235288b12017c6257538f":{"lat":37.9386365,"lon":22.9322383},"5b6235288b12017c6257536e":{"lat":37.9838096,"lon":23.7275388},"5b6235288b12017c62575372":{"lat":51.1078852,"lon":17.0385376},"5b6235288b12017c625753af":{"lat":50.0755381,"lon":14.4378005},"5b6235288b12017c62575368":{"lat":53.90453979999999,"lon":27.5615244},"5b6235288b12017c625753a9":{"lat":46.482526,"lon":30.7233095},"5b6235288b12017c625753ba":{"lat":42.2808256,"lon":-83.7430378},"5b6235288b12017c6257539a":{"lat":42.331427,"lon":-83.0457538},"5b6235288b12017c62575383":{"lat":55.947064,"lon":37.4992755},"5b6235288b12017c625753b6":{"lat":51.2980824,"lon":37.8379593},"5b6235288b12017c62575373":{"lat":51.2824173,"lon":37.5434951},"5b6235288b12017c625753b5":{"lat":53.4129429,"lon":59.00162330000001},"5b6235288b12017c62575369":{"lat":51.8857552,"lon":26.8427098},"5b6235288b12017c62575399":{"lat":50.6199,"lon":26.251617},"5b6235288b12017c62575374":{"lat":47.2357137,"lon":39.701505},"5b6235288b12017c6257538e":{"lat":45.8150108,"lon":15.9819189},"5b6235288b12017c62575370":{"lat":56.6511091,"lon":23.7213541},"5b6235288b12017c6257536f":{"lat":19.0759837,"lon":72.8776559},"5b6235288b12017c6257538b":{"lat":37.8043637,"lon":-122.2711137},"5b6235288b12017c6257539d":{"lat":32.715738,"lon":-117.1610838},"5b6235288b12017c6257537c":{"lat":-12.0463731,"lon":-77.042754},"5b6235288b12017c62575388":{"lat":48.574041,"lon":39.307815},"5b6235288b12017c62575377":{"lat":52.3679843,"lon":4.9035614},"5b6235288b12017c62575371":{"lat":47.0272282,"lon":28.8263789},"5b6235288b12017c625753a0":{"lat":53.3498053,"lon":-6.2603097},"5b6235288b12017c62575395":{"lat":43.60280789999999,"lon":39.7341543},"5b6235288b12017c62575398":{"lat":52.48624299999999,"lon":-1.890401},"5b6235288b12017c625753a1":{"lat":3.139003,"lon":101.686855},"5b6235288b12017c625753ad":{"lat":30.267153,"lon":-97.7430608},"5b6235288b12017c62575389":{"lat":33.7489954,"lon":-84.3879824},"5b6235288b12017c62575387":{"lat":13.7563309,"lon":100.5017651},"5b6235288b12017c625753b8":{"lat":58.587745,"lon":16.192421},"5b6235288b12017c6257537f":{"lat":36.4340533,"lon":28.2176379},"5b6235288b12017c62575391":{"lat":20.6596988,"lon":-103.3496092},"5b6235288b12017c62575390":{"lat":40.9875181,"lon":14.1640355},"5b6235288b12017c625753a3":{"lat":39.74953310000001,"lon":-8.807682999999999},"5b6235288b12017c625753a5":{"lat":59.9342802,"lon":30.3350986},"5b6235288b12017c62575367":{"lat":52.4411761,"lon":30.9878461},"5b6235288b12017c6257538c":{"lat":53.07929619999999,"lon":8.8016936},"5b6235288b12017c6257536b":{"lat":43.653226,"lon":-79.3831843},"5b6235288b12017c625753bc":{"lat":26.1420358,"lon":-81.7948103},"5b6235288b12017c625753ac":{"lat":27.3364347,"lon":-82.53065269999999},"5b6235288b12017c6257538a":{"lat":26.640628,"lon":-81.8723084},"5b6235288b12017c625753b9":{"lat":50.4501,"lon":30.5234},"5b6235288b12017c6257539b":{"lat":44.977753,"lon":-93.2650108},"5b6235288b12017c6257536a":{"lat":-22.8858975,"lon":-43.1152211},"5b6235288b12017c625753a2":{"lat":47.88639879999999,"lon":106.9057439},"5b6235288b12017c62575384":{"lat":55.755826,"lon":37.6172999},"5b6235288b12017c6257537b":{"lat":40.7607793,"lon":-111.8910474},"5b6235288b12017c62575366":{"lat":40.40926169999999,"lon":49.8670924},"5b6235288b12017c62575378":{"lat":48.379433,"lon":31.1655799},"5b6235288b12017c6257539c":{"lat":44.7971939,"lon":-106.9561791},"5b6235288b12017c6257539e":{"lat":9.9906919,"lon":-84.667374},"5b64aa4636a1605e5268e731":{"lat":4.710988599999999,"lon":-74.072092},"5b6235288b12017c625753a4":{"lat":54.7104264,"lon":20.4522144},"5b6235288b12017c625753b1":{"lat":35.6894875,"lon":139.6917064},"5b6235288b12017c62575382":{"lat":14.5995124,"lon":120.9842195},"5b6235288b12017c625753a8":{"lat":36.8064948,"lon":10.1815316},"5b6235288b12017c6257537d":{"lat":49.2827291,"lon":-123.1207375},"5b6235288b12017c625753b3":{"lat":33.6844202,"lon":73.04788479999999},"5b6235288b12017c6257537a":{"lat":34.7464809,"lon":-92.28959479999999},"5b6235288b12017c62575392":{"lat":5.0377396,"lon":7.9127945},"5b6235288b12017c625753a6":{"lat":51.6754966,"lon":39.2088823},"5b6235288b12017c62575381":{"lat":20.3951106,"lon":-99.9856344},"5b6235288b12017c625753a7":{"lat":41.3850639,"lon":2.1734035},"5b6235288b12017c62575375":{"lat":54.3181598,"lon":48.3837915},"5b6235288b12017c625753bd":{"lat":10.4805937,"lon":-66.90360629999999},"5b8ff695758d8900190e0871":{"lat":-36.8484597,"lon":174.7633315},"5b6235288b12017c62575380":{"lat":43.2220146,"lon":76.8512485},"5b6235288b12017c62575385":{"lat":56.85872140000001,"lon":35.9175965},"5b6235288b12017c62575397":{"lat":28.0849625,"lon":-17.3338839},"5b6235288b12017c625753b7":{"lat":-29.85868039999999,"lon":31.0218404},"5b6235288b12017c62575396":{"lat":-33.9248685,"lon":18.4240553},"5b6235288b12017c62575386":{"lat":-26.2041028,"lon":28.0473051},"5b6235288b12017c62575376":{"lat":-33.9608369,"lon":25.6022423},"5ba531ab758d8900190e0873":{"lat":50.827845,"lon":12.9213697},"5b6235288b12017c625753bb":{"lat":40.8509333,"lon":-73.9701381},"5b6235288b12017c625753b4":{"lat":18.4655394,"lon":-66.1057355},"5b6235288b12017c62575393":{"lat":18.3401514,"lon":-67.24994590000001},"5b6235288b12017c62575394":{"lat":51.6571864,"lon":35.6783297},"5b6235288b12017c625753aa":{"lat":39.7392358,"lon":-104.990251},"5b6235288b12017c62575379":{"lat":38.8338816,"lon":-104.8213634},"5b6235288b12017c625753ab":{"lat":34.0522342,"lon":-118.2436849},"5b6235288b12017c625753b2":{"lat":20.653407,"lon":-105.2253316}}; + /** * This object sets default values to the optional props. */ @@ -190,14 +193,16 @@ class LayerMap extends Component { ambassadors.find().then( (results) => { const markers = results.data.map(ambassador => { + if(locationObj[ambassador.cityId]){ const marker = { - lat: ambassador.lat, - lng: ambassador.lon, + lat: locationObj[ambassador.cityId].lat, + lng: locationObj[ambassador.cityId].lon, withInfo: true, infoTitle: ambassador.nickname, infoDescription: `${ambassador.city} - ${ambassador.country}`, }; return marker; + } }); // Once both return, update the state @@ -216,7 +221,7 @@ class LayerMap extends Component { */ getMerchants = () => { const app = this; - const merchants = Client.service('api/v1/merchants'); + const merchants = ClientMerchant.service('api/v1/merchants'); this.setState({loading: true}); diff --git a/src/components/pages/AmbassadorsPage.js b/src/components/pages/AmbassadorsPage.js index 6ef1a6f..f9b0571 100644 --- a/src/components/pages/AmbassadorsPage.js +++ b/src/components/pages/AmbassadorsPage.js @@ -20,6 +20,8 @@ import Countries from 'country-list'; import AmbassadorPin from '../../assets/img/map/ambassador_pin.png'; import LoadingGif from '../../assets/img/loading_icon.gif'; +const locationObj = {"5b6235288b12017c6257536d":{"lat":30.274084,"lon":120.15507},"5b6235288b12017c6257536c":{"lat":-22.9697777,"lon":-43.1868592},"5b6235288b12017c625753b0":{"lat":37.9759033,"lon":22.9774589},"5b6235288b12017c6257538f":{"lat":37.9386365,"lon":22.9322383},"5b6235288b12017c6257536e":{"lat":37.9838096,"lon":23.7275388},"5b6235288b12017c62575372":{"lat":51.1078852,"lon":17.0385376},"5b6235288b12017c625753af":{"lat":50.0755381,"lon":14.4378005},"5b6235288b12017c62575368":{"lat":53.90453979999999,"lon":27.5615244},"5b6235288b12017c625753a9":{"lat":46.482526,"lon":30.7233095},"5b6235288b12017c625753ba":{"lat":42.2808256,"lon":-83.7430378},"5b6235288b12017c6257539a":{"lat":42.331427,"lon":-83.0457538},"5b6235288b12017c62575383":{"lat":55.947064,"lon":37.4992755},"5b6235288b12017c625753b6":{"lat":51.2980824,"lon":37.8379593},"5b6235288b12017c62575373":{"lat":51.2824173,"lon":37.5434951},"5b6235288b12017c625753b5":{"lat":53.4129429,"lon":59.00162330000001},"5b6235288b12017c62575369":{"lat":51.8857552,"lon":26.8427098},"5b6235288b12017c62575399":{"lat":50.6199,"lon":26.251617},"5b6235288b12017c62575374":{"lat":47.2357137,"lon":39.701505},"5b6235288b12017c6257538e":{"lat":45.8150108,"lon":15.9819189},"5b6235288b12017c62575370":{"lat":56.6511091,"lon":23.7213541},"5b6235288b12017c6257536f":{"lat":19.0759837,"lon":72.8776559},"5b6235288b12017c6257538b":{"lat":37.8043637,"lon":-122.2711137},"5b6235288b12017c6257539d":{"lat":32.715738,"lon":-117.1610838},"5b6235288b12017c6257537c":{"lat":-12.0463731,"lon":-77.042754},"5b6235288b12017c62575388":{"lat":48.574041,"lon":39.307815},"5b6235288b12017c62575377":{"lat":52.3679843,"lon":4.9035614},"5b6235288b12017c62575371":{"lat":47.0272282,"lon":28.8263789},"5b6235288b12017c625753a0":{"lat":53.3498053,"lon":-6.2603097},"5b6235288b12017c62575395":{"lat":43.60280789999999,"lon":39.7341543},"5b6235288b12017c62575398":{"lat":52.48624299999999,"lon":-1.890401},"5b6235288b12017c625753a1":{"lat":3.139003,"lon":101.686855},"5b6235288b12017c625753ad":{"lat":30.267153,"lon":-97.7430608},"5b6235288b12017c62575389":{"lat":33.7489954,"lon":-84.3879824},"5b6235288b12017c62575387":{"lat":13.7563309,"lon":100.5017651},"5b6235288b12017c625753b8":{"lat":58.587745,"lon":16.192421},"5b6235288b12017c6257537f":{"lat":36.4340533,"lon":28.2176379},"5b6235288b12017c62575391":{"lat":20.6596988,"lon":-103.3496092},"5b6235288b12017c62575390":{"lat":40.9875181,"lon":14.1640355},"5b6235288b12017c625753a3":{"lat":39.74953310000001,"lon":-8.807682999999999},"5b6235288b12017c625753a5":{"lat":59.9342802,"lon":30.3350986},"5b6235288b12017c62575367":{"lat":52.4411761,"lon":30.9878461},"5b6235288b12017c6257538c":{"lat":53.07929619999999,"lon":8.8016936},"5b6235288b12017c6257536b":{"lat":43.653226,"lon":-79.3831843},"5b6235288b12017c625753bc":{"lat":26.1420358,"lon":-81.7948103},"5b6235288b12017c625753ac":{"lat":27.3364347,"lon":-82.53065269999999},"5b6235288b12017c6257538a":{"lat":26.640628,"lon":-81.8723084},"5b6235288b12017c625753b9":{"lat":50.4501,"lon":30.5234},"5b6235288b12017c6257539b":{"lat":44.977753,"lon":-93.2650108},"5b6235288b12017c6257536a":{"lat":-22.8858975,"lon":-43.1152211},"5b6235288b12017c625753a2":{"lat":47.88639879999999,"lon":106.9057439},"5b6235288b12017c62575384":{"lat":55.755826,"lon":37.6172999},"5b6235288b12017c6257537b":{"lat":40.7607793,"lon":-111.8910474},"5b6235288b12017c62575366":{"lat":40.40926169999999,"lon":49.8670924},"5b6235288b12017c62575378":{"lat":48.379433,"lon":31.1655799},"5b6235288b12017c6257539c":{"lat":44.7971939,"lon":-106.9561791},"5b6235288b12017c6257539e":{"lat":9.9906919,"lon":-84.667374},"5b64aa4636a1605e5268e731":{"lat":4.710988599999999,"lon":-74.072092},"5b6235288b12017c625753a4":{"lat":54.7104264,"lon":20.4522144},"5b6235288b12017c625753b1":{"lat":35.6894875,"lon":139.6917064},"5b6235288b12017c62575382":{"lat":14.5995124,"lon":120.9842195},"5b6235288b12017c625753a8":{"lat":36.8064948,"lon":10.1815316},"5b6235288b12017c6257537d":{"lat":49.2827291,"lon":-123.1207375},"5b6235288b12017c625753b3":{"lat":33.6844202,"lon":73.04788479999999},"5b6235288b12017c6257537a":{"lat":34.7464809,"lon":-92.28959479999999},"5b6235288b12017c62575392":{"lat":5.0377396,"lon":7.9127945},"5b6235288b12017c625753a6":{"lat":51.6754966,"lon":39.2088823},"5b6235288b12017c62575381":{"lat":20.3951106,"lon":-99.9856344},"5b6235288b12017c625753a7":{"lat":41.3850639,"lon":2.1734035},"5b6235288b12017c62575375":{"lat":54.3181598,"lon":48.3837915},"5b6235288b12017c625753bd":{"lat":10.4805937,"lon":-66.90360629999999},"5b8ff695758d8900190e0871":{"lat":-36.8484597,"lon":174.7633315},"5b6235288b12017c62575380":{"lat":43.2220146,"lon":76.8512485},"5b6235288b12017c62575385":{"lat":56.85872140000001,"lon":35.9175965},"5b6235288b12017c62575397":{"lat":28.0849625,"lon":-17.3338839},"5b6235288b12017c625753b7":{"lat":-29.85868039999999,"lon":31.0218404},"5b6235288b12017c62575396":{"lat":-33.9248685,"lon":18.4240553},"5b6235288b12017c62575386":{"lat":-26.2041028,"lon":28.0473051},"5b6235288b12017c62575376":{"lat":-33.9608369,"lon":25.6022423},"5ba531ab758d8900190e0873":{"lat":50.827845,"lon":12.9213697},"5b6235288b12017c625753bb":{"lat":40.8509333,"lon":-73.9701381},"5b6235288b12017c625753b4":{"lat":18.4655394,"lon":-66.1057355},"5b6235288b12017c62575393":{"lat":18.3401514,"lon":-67.24994590000001},"5b6235288b12017c62575394":{"lat":51.6571864,"lon":35.6783297},"5b6235288b12017c625753aa":{"lat":39.7392358,"lon":-104.990251},"5b6235288b12017c62575379":{"lat":38.8338816,"lon":-104.8213634},"5b6235288b12017c625753ab":{"lat":34.0522342,"lon":-118.2436849},"5b6235288b12017c625753b2":{"lat":20.653407,"lon":-105.2253316}}; + // List of countries const countries = Countries(); @@ -54,10 +56,10 @@ const columnData = [ { id: 'nickname', numeric: false, disablePadding: true, label: 'Nickname' }, { id: 'location', numeric: false, disablePadding: true, label: 'Location' }, { id: 'telegram', numeric: false, disablePadding: false, label: 'Telegram Account' }, - { id: 'keybase', numeric: false, disablePadding: false, label: 'Keybase' }, - { id: 'email', numeric: false, disablePadding: false, label: 'Email' }, - { id: 'phone', numeric: false, disablePadding: false, label: 'Phone' }, - { id: 'link', numeric: false, disablePadding: false, label: 'URL' }, + // { id: 'keybase', numeric: false, disablePadding: false, label: 'Keybase' }, + // { id: 'email', numeric: false, disablePadding: false, label: 'Email' }, + // { id: 'phone', numeric: false, disablePadding: false, label: 'Phone' }, + // { id: 'link', numeric: false, disablePadding: false, label: 'URL' }, { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true} ]; @@ -107,7 +109,7 @@ class AmbassadorsPage extends Component { * @param {number} [limit=10] - Max items to be returned. * @param {number} [skip=0] - Start index search */ - getAmbassadors = async (limit = 10, skip = 0) => { + getAmbassadors = async (limit = 50, skip = 0) => { const app = this; // Initially we don't know how much the total value is, so to make sure we enter the loop // at least once we're just setting it to be 1 @@ -164,26 +166,59 @@ class AmbassadorsPage extends Component { render() { const { data } = this.state.ambassadors; + + // Works for both v0, v1 and v2 API response data.map(ambassador => { - ambassador.location = `${ambassador.city} - ${ambassador.country}`; - ambassador.link = {stripProtocol(ambassador.url)}; + let cities = []; + // V0/V1 + if(ambassador.city) { + if(ambassador.lat){ + cities.push({ + city: ambassador.city, + country: ambassador.country, + lat: ambassador.lat, + lon: ambassador.lon + } + ); + } + else { + cities.push({ + city: ambassador.city, + country: ambassador.country, + lat: locationObj[ambassador.cityId].lat, + lon: locationObj[ambassador.cityId].lon + } + ); + } + + } + // v2 + else { + cities = ambassador.cities; + } + cities.forEach( location => { + ambassador.location = `${location.city} - ${location.country}`; ambassador.map = ; - return ambassador; + className="App-button" + variant="contained" + style={{ + backgroundColor: "#2069b3", + color: 'white' + }} + onClick={() => this.openMaps( + ambassador.nickname, + `${location.city} - ${location.country}`, + location.lat, + location.lon + )} + >Show on Map + ; + }); + + /*ambassador.link = {stripProtocol(ambassador.url)}; + + return ambassador;*/ }); return ( diff --git a/src/components/pages/AmbassadorsPage0.js b/src/components/pages/AmbassadorsPage0.js new file mode 100644 index 0000000..8ca808d --- /dev/null +++ b/src/components/pages/AmbassadorsPage0.js @@ -0,0 +1,286 @@ +import React, { Component } from 'react'; +import { FormattedMessage, FormattedHTMLMessage } from 'react-intl'; +import Modal from 'react-modal'; +import { Link } from 'react-router-dom'; +import Button from '@material-ui/core/Button'; + +// Custom components +import AppHeader from '../AppHeader'; +import Footer from '../Footer'; +import EnhancedTable from '../EnhancedTable'; +import LayerMap from '../LayerMap'; +import PreviewMap from '../PreviewMap'; + +// Helpers +import Client from '../../utils/feathers'; +import { stripProtocol } from '../../utils/url'; +import Countries from 'country-list'; + +// Images +import AmbassadorPin from '../../assets/img/map/ambassador_pin.png'; +import LoadingGif from '../../assets/img/loading_icon.gif'; + + + +import GOOGLE_MAPS_API from '../../utils/constants'; + +const googleMapsClient = require('@google/maps').createClient({ + key: GOOGLE_MAPS_API +}); + +// List of countries +const countries = Countries(); + +const centerStyle = { + textAlign: 'center', + marginTop: 20, + marginBottom: 20 +}; + +const loadingStyle = { + textAlign: 'center', + marginTop: 20, + marginBottom: 20, + display: 'block', + marginLeft: 'auto', + marginRight: 'auto' +}; + +const mapsStyles = { + content : { + top : '50%', + left : '50%', + right : 'auto', + bottom : 'auto', + marginRight : '-50%', + transform : 'translate(-50%, -50%)', + minWidth : '300px' + } +}; + +const columnData = [ + { id: 'nickname', numeric: false, disablePadding: true, label: 'Nickname' }, + { id: 'location', numeric: false, disablePadding: true, label: 'Location' }, + { id: 'telegram', numeric: false, disablePadding: false, label: 'Telegram Account' }, + { id: 'keybase', numeric: false, disablePadding: false, label: 'Keybase' }, + { id: 'email', numeric: false, disablePadding: false, label: 'Email' }, + { id: 'phone', numeric: false, disablePadding: false, label: 'Phone' }, + // { id: 'link', numeric: false, disablePadding: false, label: 'URL' }, + { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true} +]; + +/** + * Ambassador page component. + */ +class AmbassadorsPage extends Component { + constructor(props, context) { + super(props, context); + + /** @type {ComponentState} */ + this.state = { + ambassadors: { + total: 0, + limit: 0, + skip: 0, + data: [] + }, + loading: true, + rowsPerPage: [100,200,300], + numberOfRows: 100, + page: 1, + total: undefined, + mapsModalIsOpen: false, + mapsTitle: '', + mapsDescription: '', + mapsLat: 0, + mapsLon: 0, + cities: {} + }; + } + + /** + * Geocode an address. + * @param address + */ + async geocodeAddress(data) { + const app = this; + let aqq = {}; + return data.map( async ambassador => { + const address = `{${ambassador.city} - ${ambassador.country}`; + googleMapsClient.geocode({ + address + }, function(err, response) { + const state = { loading: false, loadingText: ''}; + if(err) { + state.resolvedGeoCode = false; + state.geocodingErrorMessage = 'Geocoding Error'; + state.lat = null; + state.lon = null; + } + else { + state.resolvedGeoCode = true; + state.geocodingErrorMessage = ''; + const location = response.json.results[0].geometry.location; + const aw = {}; + aw[ambassador.cityId] = {}; + aw[ambassador.cityId].lat = location.lat; + aw[ambassador.cityId].lon = location.lng; + aqq = { ...aw, ...aqq}; + console.log('--------------------------') + console.log(JSON.stringify(aqq)); + app.setState({ cities: { ...aw, ...this.state.cities} }); + + } + }); + return ambassador; + }); + + + } + + /** + * @description Lifecycle event handler called just after the App loads into the DOM. + */ + UNSAFE_componentWillMount() { + // Get the ambassadors list + this.getAmbassadors(); + } + + fillResults(result) { + const data = result; + return (item) => data.data.push(item); + } + + /** + * @description Get ambassadors from the web service + * @param {number} [limit=10] - Max items to be returned. + * @param {number} [skip=0] - Start index search + */ + getAmbassadors = async (limit = 50, skip = 0) => { + const app = this; + // Initially we don't know how much the total value is, so to make sure we enter the loop + // at least once we're just setting it to be 1 + let total = 1; + + const ambassadors = Client.service('api/v1/ambassadors'); + this.setState({loading: true}); + let result; + while(skip < total){ + let partialResponse = await ambassadors.find({ + query: { + $sort: { account: 1 }, + $limit: limit, + $skip: skip + } + }); + total = partialResponse.total; + result === undefined ? result = partialResponse : partialResponse.data.map(this.fillResults(result)); + skip = skip + limit; + } + + result.data.forEach(function(ambassador){ + if(ambassador.city !== undefined) ambassador.city = (ambassador.city).replace(/(^|\s)\S/g, l => l.toUpperCase()); + if(ambassador.country !== undefined) ambassador.country = countries.getName(ambassador.country); + // Setup disabled to be string + ambassador.disabled = (ambassador.disabled) ? 'yes': ''; + }); + + // Once both return, update the state + app.setState({loading: false, ambassadors: result}); + }; + + /** + * @description Close Maps modal. + */ + closeMapsModal() { + this.setState({ + mapsLat: 0, + mapsLon: 0, + mapsModalIsOpen: false + }); + } + + openMaps(name, address, lat, lon){ + this.setState({ + mapsTitle: name, + mapsDescription: address, + mapsLat: lat, + mapsLon: lon, + mapsModalIsOpen: true + }); + } + + render() { + const { data } = this.state.ambassadors; + + console.log(data); + + const city = this.geocodeAddress(data); + console.log('ola'); + console.log(this.state.cities); + + + + + // Works for both v0, v1 and v2 API response + /* + data.map(ambassador => { + let cities = []; + // V0/V1 + if(ambassador.city) { + if(ambassador.lat){ + cities.push({ + city: ambassador.city, + country: ambassador.country, + lat: ambassador.lat, + lon: ambassador.lon + } + ); + } + else{ + cities.push({ + city: ambassador.city, + country: ambassador.country, + lat: ambassador.lat, + lon: ambassador.lon + } + ); + } + + } + // v2 + else { + cities = ambassador.cities; + } + cities.forEach( location => { + ambassador.location = `${location.city} - ${location.country}`; + ambassador.map = ; + }); + + /*ambassador.link = {stripProtocol(ambassador.url)}; + + return ambassador; + });*/ + + return ( +
{JSON.stringify(this.state.cities)}
+ ); + } +} + +export { AmbassadorsPage }; diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js index be4cbf2..62288c5 100644 --- a/src/components/pages/MerchantsPage.js +++ b/src/components/pages/MerchantsPage.js @@ -12,7 +12,7 @@ import LayerMap from '../LayerMap'; import PreviewMap from '../PreviewMap'; // Helpers -import Client from '../../utils/feathers'; +import Client from '../../utils/feathers_merchants'; import Countries from 'country-list'; // Images diff --git a/src/utils/feathers.js b/src/utils/feathers.js index 7096e15..7b73139 100644 --- a/src/utils/feathers.js +++ b/src/utils/feathers.js @@ -3,7 +3,9 @@ import feathers from '@feathersjs/client'; const app = feathers(); // Change to your production ambassador web service // const restClient = feathers.rest('http://localhost:3030'); -const restClient = feathers.rest('https://palmpaybackend.leticiacamara.com'); +const restClient = feathers.rest('https://ambpay.palmpay.io'); +//const restClient = feathers.rest('https://palmpaybackend.leticiacamara.com'); + // Configure an Fetch AJAX library with that client. For fetch details see https://facebook.github.io/react-native/docs/network.html // For rest details see https://docs.feathersjs.com/api/client/rest.html app.configure(restClient.fetch(window.fetch)); diff --git a/src/utils/feathers_merchants.js b/src/utils/feathers_merchants.js new file mode 100644 index 0000000..08dde32 --- /dev/null +++ b/src/utils/feathers_merchants.js @@ -0,0 +1,21 @@ +import feathers from '@feathersjs/client'; + +const app = feathers(); +// Change to your production ambassador web service +// const restClient = feathers.rest('http://localhost:3030'); +const restClient = feathers.rest('https://palmpaybackend.leticiacamara.com'); + +// Configure an Fetch AJAX library with that client. For fetch details see https://facebook.github.io/react-native/docs/network.html +// For rest details see https://docs.feathersjs.com/api/client/rest.html +app.configure(restClient.fetch(window.fetch)); + +// Configure authentication data to be saved at the browser localstorage (see https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) +// For authentication client details see https://docs.feathersjs.com/api/authentication/client.html . +app.configure(feathers.authentication({ + storage: window.localStorage +})); + +/** + * Feathers app with client configuration + */ +export default app;