From 6870de4c7b173f6575f0e8ab79ad6718c38e1aae Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 8 Feb 2018 00:00:53 +0100 Subject: [PATCH 001/330] Style and text minor changes in home --- imports/ui/pages/Index/Index-custom.scss | 22 ++++++++++++++++++---- imports/ui/pages/Index/Index.js | 6 ++++++ private/pages/credits-es.md | 4 ++-- public/locales/en/common.json | 6 +++++- public/locales/es/common.json | 7 ++++++- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/imports/ui/pages/Index/Index-custom.scss b/imports/ui/pages/Index/Index-custom.scss index a47e09b..7273007 100644 --- a/imports/ui/pages/Index/Index-custom.scss +++ b/imports/ui/pages/Index/Index-custom.scss @@ -57,7 +57,7 @@ @include breakpoint(mobile) { .carousel-caption > h3 { - font-size: 2.0rem; + font-size: 1.8rem; } } @@ -72,7 +72,7 @@ color: #280B0B; font-weight: bold; text-transform: uppercase; - font-size: 10px; + font-size: 20px; } p { padding-top: 10px; @@ -103,7 +103,7 @@ width: 30%; left: 35%; border: 14px solid #FFF; - opacity: .8; + opacity: .6; &:after { content: ""; display: block; @@ -125,7 +125,7 @@ /* position: absolute; */ font-size: 140px; color: white; - opacity: .8; + opacity: .6; /* right: 35%; */ text-shadow: 2px 2px #280B0B; } @@ -287,12 +287,26 @@ text-align: left; } +.slides-footer { + position: relative; + bottom: 0px; + left: 0px; + text-align: left; +} + +.slides-footer > p, .crowd-footer > p { font-size: 13px; margin-left: 20px; margin-right: 20px; } +.slides-footer > p > a, +.slides-footer > p > a:hover { + color: #868e96 !important; + text-shadow: 2px 2px 1px #280B0B; +} + #carouselSndIndicators > div > div.carousel-item.carousel-snd-item-1 > div > h3 > span > a { color: white; } diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js index 04afd4f..270800c 100644 --- a/imports/ui/pages/Index/Index.js +++ b/imports/ui/pages/Index/Index.js @@ -197,12 +197,18 @@ class Index extends Component {

¿Sabías que los fuegos producen tanto CO² como los coches y aproximadamente ⅕ de todas nuestras emisiones?

+

+

Fuego en La Tuna, Los Ángeles, Estados Unidos, septiembre de 2017

+

Ayúdanos a combatir el cambio climático y a proteger el medioambiente

+

+

Polución en la ciudad de Almaty, Kazakhstan, enero de 2014

+
diff --git a/private/pages/credits-es.md b/private/pages/credits-es.md index a1202f2..b1ada88 100644 --- a/private/pages/credits-es.md +++ b/private/pages/credits-es.md @@ -8,8 +8,8 @@ Reconocemos el uso de datos e imágenes de LANCE FIRMS operadas por NASA/GSFC/Ea * Diapositiva 2 del Inicio: Silverhorne, Estados Unidos, foto de Nathan Anderson [fuente](https://unsplash.com/photos/ZLOZC1uUdns). * Diapositiva 3 del Inicio: Bitterroot National Forest, Montana, Estados Unidos, foto de John McColgan, Public Domain, [fuente](https://commons.wikimedia.org/wiki/File:Deerfire_high_res.jpg). * Diapositiva 4 del Inicio: Cox Valley Fire, Olympic NP, Estados Unidos, agosto de 2016, [fuente](https://www.nps.gov/olym/learn/management/current-fire-status.htm). -* Diapositiva secundaria 1 del Inicio: La Tuna fire and nighttime city lights, LA, Estados Unidos, septiembre de 2017, foto de Scott L, CC-BY-SA 2.0, [source](https://commons.wikimedia.org/wiki/File:La_Tuna_fire_and_cityscape_1.jpg) -* Diapositiva secundaria 2 del Inicio: Smog over Almaty city, Kazakhstan, enero de 2014, foto de Igors Jefimovs, CC-BY 3.0, [source](https://commons.wikimedia.org/wiki/File:Smog_over_Almaty.jpg) +* Diapositiva secundaria 1 del Inicio: Fuego en La Tuna y luces nocturnas de ciudad, LA, Estados Unidos, septiembre de 2017, foto de Scott L, CC-BY-SA 2.0, [source](https://commons.wikimedia.org/wiki/File:La_Tuna_fire_and_cityscape_1.jpg) +* Diapositiva secundaria 2 del Inicio: Polución en la ciudad de Almaty, Kazakhstan, enero de 2014, foto de Igors Jefimovs, CC-BY 3.0, [source](https://commons.wikimedia.org/wiki/File:Smog_over_Almaty.jpg) * Foto de inicio de fuego forestal: [Incendios forestales de California, 23 de octubre de 2007](https://commons.wikimedia.org/wiki/File:California_Wildfires_October_23_2007.jpg), [fuente](http://www.nasa.gov/vision/earth/lookingatearth/socal_wildfires_oct07.html). * Avatar predeterminado: un Emoji coloreado del proyecto Noto, publicado bajo licencia Apache, [fuente](https://commons.wikimedia.org/wiki/File:Emoji_u1f469_1f3fd_200d_1f692.svg). diff --git a/public/locales/en/common.json b/public/locales/en/common.json index df512c3..09ff3b9 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -165,5 +165,9 @@ "Información adicional sobre fuego": "Additional information about fire", "CO2emisions": "Did you know that wildfires <1>produce as much CO² as cars and <3>about ⅕ of all our carbon emissions?", - "Ayúdanos a combatir el cambio climático y a proteger el medioambiente": "Help us fight climate change and protect the environment" + "Ayúdanos a combatir el cambio climático y a proteger el medioambiente": "Help us fight climate change and protect the environment", + "Fuego en La Tuna, Los Ángeles, Estados Unidos, septiembre de 2017": + "La Tuna fire, LA, United States, September 2017", + "Polución en la ciudad de Almaty, Kazakhstan, enero de 2014": + "Smog over Almaty city, Kazakhstan, January 2014" } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index ffefe05..e90c4a0 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -256,5 +256,10 @@ "Información adicional sobre fuego", "CO2emisions": "¿Sabías que los fuegos <1>producen tanto CO² como los coches y <3>aproximadamente ⅕ de todas nuestras emisiones?", - "Ayúdanos a combatir el cambio climático": "Ayúdanos a combatir el cambio climático" + "Ayúdanos a combatir el cambio climático y a proteger el medioambiente": + "Ayúdanos a combatir el cambio climático y a proteger el medioambiente", + "Fuego en La Tuna, Los Ángeles, Estados Unidos, septiembre de 2017": + "Fuego en La Tuna, Los Ángeles, Estados Unidos, septiembre de 2017", + "Polución en la ciudad de Almaty, Kazakhstan, enero de 2014": + "Polución en la ciudad de Almaty, Kazakhstan, enero de 2014" } From eca58df6c2de24d9bc6f0e49ddbbe1faadd7939e Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 8 Feb 2018 11:15:23 +0100 Subject: [PATCH 002/330] Fire popupsand active/archive urls --- .../api/ActiveFires/server/publications.js | 1 + imports/api/Fires/server/publications.js | 99 ++++++++++++++----- imports/startup/client/i18n.js | 2 +- imports/startup/server/i18n.js | 2 +- imports/ui/components/Maps/FireCircleMark.js | 19 +++- imports/ui/components/Maps/FireIconMark.js | 24 ++++- imports/ui/components/Maps/FireList.js | 10 +- imports/ui/components/Maps/FirePopup.js | 43 ++++++++ imports/ui/layouts/App/App.js | 1 + imports/ui/pages/Fires/Fires.js | 31 +++++- imports/ui/pages/FiresMap/FiresMap.js | 5 + imports/ui/pages/Index/Index.js | 6 +- imports/ui/stylesheets/custom.scss | 12 ++- public/locales/en/common.json | 8 +- public/locales/es/common.json | 8 +- 15 files changed, 222 insertions(+), 49 deletions(-) create mode 100644 imports/ui/components/Maps/FirePopup.js diff --git a/imports/api/ActiveFires/server/publications.js b/imports/api/ActiveFires/server/publications.js index 0b9b2d7..278d937 100644 --- a/imports/api/ActiveFires/server/publications.js +++ b/imports/api/ActiveFires/server/publications.js @@ -27,6 +27,7 @@ const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => fields: { lat: 1, lon: 1, + when: 1, scan: 1 } }); diff --git a/imports/api/Fires/server/publications.js b/imports/api/Fires/server/publications.js index 68eb4c8..575c7af 100644 --- a/imports/api/Fires/server/publications.js +++ b/imports/api/Fires/server/publications.js @@ -7,6 +7,7 @@ import urlEnc from '/imports/modules/url-encode'; import { Promise } from 'meteor/promise'; import NodeGeocoder from 'node-geocoder'; import { gmapServerKey } from '/imports/startup/server/IPGeocoder'; +import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import FiresCollection from '../Fires'; function findFire(unsealed) { @@ -36,6 +37,75 @@ const unseal = async (obj) => { const unsealW = obj => unseal(obj); +const fixConfidence = (obj) => { + if (typeof obj.confidence === 'string') { + obj.confidence = Number.parseInt(obj.confidence, 10); + } + if (typeof obj.confidence === 'undefined' || isNaN(obj.confidence)) { + delete obj.confidence; + } + return obj; +}; + +const findOrCreateFire = (obj) => { + const fire = findFire(obj); + // console.log(`Found: ${fire.count()}`); + if (!obj.address) { + try { + const rev = Promise.await(geocoder.reverse({ lat: obj.lat, lon: obj.lon })); + if (rev[0]) { + obj.address = rev[0].formattedAddress; + } + // console.log(obj.address); + } catch (reve) { + console.warn(reve); + } + } + if (fire.count() === 0) { + // const result = + // console.log('Creating new fire'); + FiresCollection.upsert({ ourid: obj.ourid, when: obj.when, type: obj.type }, { $set: obj }, { multi: false, upsert: true }); + // console.log(JSON.stringify(result)); + } + return findFire(obj); +}; + +Meteor.publish('fireFromActiveId', function fireFromActiveId(_id) { + try { + check(_id, String); + // console.log(`Looking for active fire ${_id}`); + const fire = ActiveFiresCollection.findOne(new Meteor.Collection.ObjectID(_id)); + if (fire) { + // console.info(`Active fire found: ${_id}`); + return findOrCreateFire(fixConfidence(fire)); + } + console.info(`Active fire not found: ${_id}`); + // Not found in active fires! + return this.ready(); + } catch (e) { + console.info(`Active fire not found (with error): ${_id}`); + return this.ready(); + } +}); + +Meteor.publish('fireFromId', function fireFromId(_id) { + try { + check(_id, String); + // console.log(`Looking for archive fire ${_id}`); + const fire = FiresCollection.find(new Meteor.Collection.ObjectID(_id)); + if (fire.count() !== 0) { + // console.info(`Archive fire found: ${_id}`); + return fire; + } + console.info(`Fire not found: ${_id}`); + // Not found in active fires! + return this.ready(); + } catch (e) { + console.info(`Active fire not found (with error): ${_id}`); + return this.ready(); + } +}); + Meteor.publish('fireFromHash', function fireFromHash(fireEnc) { check(fireEnc, String); try { @@ -55,32 +125,9 @@ Meteor.publish('fireFromHash', function fireFromHash(fireEnc) { unsealed.updatedAt = !u ? new Date() : new Date(u); // console.log(unsealed); // FIXME: - if (typeof unsealed.confidence === 'string') { - unsealed.confidence = Number.parseInt(unsealed.confidence, 10); - } - if (typeof unsealed.confidence === 'undefined' || isNaN(unsealed.confidence)) { - delete unsealed.confidence; - } - FiresCollection.schema.validate(unsealed); - const fire = findFire(unsealed); - // console.log(`Found: ${fire.count()}`); - if (!unsealed.address) { - try { - const rev = Promise.await(geocoder.reverse({ lat: unsealed.lat, lon: unsealed.lon })); - if (rev[0]) { - unsealed.address = rev[0].formattedAddress; - } - // console.log(unsealed.address); - } catch (reve) { - console.warn(reve); - } - } - if (fire.count() === 0) { - // const result = - FiresCollection.upsert({ ourid: unsealed.ourid, when: unsealed.when, type: unsealed.type }, { $set: unsealed }, { multi: false, upsert: true }); - // console.log(JSON.stringify(result)); - } - return findFire(unsealed); + const unsealedFix = fixConfidence(unsealed); + FiresCollection.schema.validate(unsealedFix); + return findOrCreateFire(unsealedFix); /* console.log(`fires: ${fire.count()}`); * return fire; */ } catch (e) { diff --git a/imports/startup/client/i18n.js b/imports/startup/client/i18n.js index 2a3398d..d4e3fcc 100644 --- a/imports/startup/client/i18n.js +++ b/imports/startup/client/i18n.js @@ -53,7 +53,7 @@ i18nOpts.react = { nsMode: 'default' */ }; -const sendMissing = true; +const sendMissing = Meteor.isDevelopment; if (sendMissing && !Meteor.isProduction) { i18nOpts.sendMissing = true; i18nOpts.sendMissingTo = 'fallback'; diff --git a/imports/startup/server/i18n.js b/imports/startup/server/i18n.js index e6f3172..053d487 100644 --- a/imports/startup/server/i18n.js +++ b/imports/startup/server/i18n.js @@ -11,7 +11,7 @@ i18nOpts.backend.addPath = `${Meteor.rootPath}/../web.browser/app/${i18nOpts.bac // console.log(i18nOpts.backend.loadPath); i18nOpts.debug = false; -i18nOpts.saveMissing = true; +i18nOpts.saveMissing = Meteor.isDevelopment; i18nOpts.initImmediate = false; i18n diff --git a/imports/ui/components/Maps/FireCircleMark.js b/imports/ui/components/Maps/FireCircleMark.js index 477fba7..d90e312 100644 --- a/imports/ui/components/Maps/FireCircleMark.js +++ b/imports/ui/components/Maps/FireCircleMark.js @@ -1,19 +1,32 @@ import React from 'react'; import { Circle } from 'react-leaflet'; import PropTypes from 'prop-types'; +import FirePopup from './FirePopup'; const FireCircleMark = ({ lat, lon, - scan + nasa, + scan, + id, + when, + history, + t }) => ( - + + + ); FireCircleMark.propTypes = { scan: PropTypes.number.isRequired, lat: PropTypes.number.isRequired, - lon: PropTypes.number.isRequired + lon: PropTypes.number.isRequired, + nasa: PropTypes.bool.isRequired, + id: PropTypes.object.isRequired, + history: PropTypes.object.isRequired, + when: PropTypes.instanceOf(Date).isRequired, + t: PropTypes.func.isRequired }; export default FireCircleMark; diff --git a/imports/ui/components/Maps/FireIconMark.js b/imports/ui/components/Maps/FireIconMark.js index 65f588d..f83b4bf 100644 --- a/imports/ui/components/Maps/FireIconMark.js +++ b/imports/ui/components/Maps/FireIconMark.js @@ -3,15 +3,25 @@ import React from 'react'; import { CircleMarker, Marker } from 'react-leaflet'; import PropTypes from 'prop-types'; import { fireIcon, nFireIcon } from '/imports/ui/components/Maps/Icons'; +import { translate } from 'react-i18next'; +import FirePopup from './FirePopup'; const FireIconMark = ({ lat, lon, - nasa + nasa, + id, + history, + when, + t }) => (
- - + + + + + +
); @@ -19,7 +29,11 @@ FireIconMark.propTypes = { // https://github.com/PaulLeCam/react-leaflet/tree/master/src/propTypes lat: PropTypes.number.isRequired, lon: PropTypes.number.isRequired, - nasa: PropTypes.bool.isRequired + nasa: PropTypes.bool.isRequired, + id: PropTypes.object.isRequired, + history: PropTypes.object.isRequired, + when: PropTypes.instanceOf(Date).isRequired, + t: PropTypes.func.isRequired }; -export default FireIconMark; +export default translate([], { wait: true })(FireIconMark); diff --git a/imports/ui/components/Maps/FireList.js b/imports/ui/components/Maps/FireList.js index 60d8b3e..be20855 100644 --- a/imports/ui/components/Maps/FireList.js +++ b/imports/ui/components/Maps/FireList.js @@ -9,18 +9,18 @@ import FirePixel from '/imports/ui/components/Maps/FirePixel'; export default function FireList(props) { const { - fires, scale, useMarkers, nasa + fires, scale, useMarkers, nasa, t, history } = props; const useMarks = useMarkers && scale; const usePixel = !nasa || !scale; /* console.log(`Using marks: ${useMarks}, using pixels: ${usePixel}`); */ let items; if (useMarks) { - items = fires.map(({ _id, ...otherProps }) => ()); + items = fires.map(({ _id, ...otherProps }) => ()); } else if (usePixel) { items = fires.map(({ _id, ...otherProps }) => ()); } else { - items = fires.map(({ _id, ...otherProps }) => ()); + items = fires.map(({ _id, ...otherProps }) => ()); } return (
{items}
); } @@ -29,5 +29,7 @@ FireList.propTypes = { fires: PropTypes.array.isRequired, scale: PropTypes.bool.isRequired, useMarkers: PropTypes.bool.isRequired, - nasa: PropTypes.bool.isRequired + nasa: PropTypes.bool.isRequired, + history: PropTypes.object.isRequired, + t: PropTypes.func.isRequired }; diff --git a/imports/ui/components/Maps/FirePopup.js b/imports/ui/components/Maps/FirePopup.js new file mode 100644 index 0000000..c3f2f52 --- /dev/null +++ b/imports/ui/components/Maps/FirePopup.js @@ -0,0 +1,43 @@ +/* eslint-disable import/no-absolute-path */ +import React, { Fragment } from 'react'; +import { Popup, Tooltip } from 'react-leaflet'; +import PropTypes from 'prop-types'; +import { translate } from 'react-i18next'; +import moment from 'moment'; + +const FirePopup = ({ + lat, + lon, + nasa, + id, + history, + when, + t +}) => ( + + + + {t('Coordenadas:')} {lat}, {lon}
+ {t('Fuente')}: {t(nasa ? 'NASA' : 'nuestros usuarios/as')}
+ {t('Detectado')}: {moment(when).fromNow()}
+ + history.push(`/fire/active/${id}`)}>{t('Más información sobre este fuego')} + + + + {t('Pulsa para más información')} + +); + +FirePopup.propTypes = { + // https://github.com/PaulLeCam/react-leaflet/tree/master/src/propTypes + lat: PropTypes.number.isRequired, + lon: PropTypes.number.isRequired, + nasa: PropTypes.bool.isRequired, + id: PropTypes.object.isRequired, + history: PropTypes.object.isRequired, + when: PropTypes.instanceOf(Date).isRequired, + t: PropTypes.func.isRequired +}; + +export default translate([], { wait: true })(FirePopup); diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index 4b1eb86..4e3ff27 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -83,6 +83,7 @@ const App = props => ( + diff --git a/imports/ui/pages/Fires/Fires.js b/imports/ui/pages/Fires/Fires.js index 3196865..52d1b81 100644 --- a/imports/ui/pages/Fires/Fires.js +++ b/imports/ui/pages/Fires/Fires.js @@ -34,6 +34,10 @@ class Fire extends React.Component { componentWillReceiveProps(nextProps) { if (this.props.when !== nextProps.when || this.props.loading !== nextProps.loading || this.props.notfound !== nextProps.notfound) { // console.log(`Next when ${nextProps.when}`); + if (nextProps.fire && (nextProps.active || nextProps.fromHash)) { + // change url to archive with new _id + nextProps.history.replace(`/fire/archive/${nextProps.fire._id}`); + } this.setState({ loading: nextProps.loading, notfound: nextProps.notfound, @@ -124,7 +128,7 @@ class Fire extends React.Component { {Object.keys(FalsePositiveTypes).map(key => (
{Object.keys(FalsePositiveTypes).map(key => ( diff --git a/public/locales/en/common.json b/public/locales/en/common.json index c46033e..dffcc24 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -185,5 +185,7 @@ "Parece una falsa alarma": "It seems a false alarm", "Fuegos activos en el mundo actualizados en tiempo real": "Active fires in the world updated in real time", "Zonas vigiladas por nuestros usuari@s actualmente": "Areas currently monitored by our users", - "Iniciar sesión con Facebook": "Login With Facebook" + "Iniciar sesión con Facebook": "Login With Facebook", + "Elige un tipo": + "Choose a type" } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 38d75b8..d4304e7 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -272,5 +272,7 @@ "Zonas vigiladas por nuestros usuari@s actualmente": "Zonas vigiladas por nuestros usuari@s actualmente", "Iniciar sesión con Facebook": - "Iniciar sesión con Facebook" + "Iniciar sesión con Facebook", + "Elige un tipo": + "Elige un tipo" } From b5e9e301b93d0da7f6f4af97c05e0448268f22d7 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 09:57:06 +0100 Subject: [PATCH 032/330] Test docs --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 29a6a62..56a40d5 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,15 @@ More platforms and services in the future... We do tests via: ``` TEST_WATCH=1 MONGO_URL=mongodb://localhost:27017/fuegos meteor --settings settings-development.json test --driver-package meteortesting:mocha --port 3010 + +# and + +chimp --watch --ddp=http://localhost:3000 --path=cucumber + +# and + +chimp --ddp=http://localhost:3000 --path=cucumber + ``` ## Data source acknowledgements From fc4155ea49efc8eac97b9dd7da2fdeefbee8600a Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 09:57:37 +0100 Subject: [PATCH 033/330] Prevent QT error in phantom --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68b572a..3fd1c7b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "tcef", "private": true, "scripts": { - "start": "MONGO_URL=mongodb://localhost:27017/fuegos meteor --settings settings-development.json", + "start": "QT_QPA_PLATFORM='' MONGO_URL=mongodb://localhost:27017/fuegos meteor --settings settings-development.json", "test": "jest" }, "dependencies": { From 8809a3e3c8351d47b3fa7437322360a2471cf092 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 10:26:22 +0100 Subject: [PATCH 034/330] Some work with spiderable --- cucumber/features/general.feature | 1 - cucumber/features/pages.feature | 2 ++ cucumber/features/steps_definitions/pages.js | 9 ++++++ imports/ui/components/History/History.js | 7 ----- imports/ui/layouts/App/App.js | 32 +++++++++++++++++++- 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/cucumber/features/general.feature b/cucumber/features/general.feature index c3ea6a8..3cf078d 100644 --- a/cucumber/features/general.feature +++ b/cucumber/features/general.feature @@ -11,4 +11,3 @@ Feature: This app should generate a correct sitemap, etc | fires | Active Fires | | login | Login | | signup | Signup | - # And should be spiderables diff --git a/cucumber/features/pages.feature b/cucumber/features/pages.feature index 9814434..ed3f4fe 100644 --- a/cucumber/features/pages.feature +++ b/cucumber/features/pages.feature @@ -9,6 +9,7 @@ Feature: Test all secundary pages | activeFires | Active Fires | Then I check that all pages works properly + @watch Scenario: Check that all secondary pages work well Given a list of page urls and contents | login | Login | true | @@ -20,6 +21,7 @@ Feature: Test all secundary pages | fire/inexistent | This page doesn't exist | false | | fire/Fe26.2**1a0361ed0384f741403682e26b4bbc3850bee24e775da13c9782b22365ea895f*r_3gmVad5vzkeyqPpo6UcA*1s5fFz3iDGKTYP2RCvXMshof00QCHf4ErDl9K2dxoX0u-J-t6scyOWG8pGp3ehg_FfEtyR_kYcEKU3rE0jaSlZbD09TIvhiIJeS3C6Uc8YD-rit0XBrgsVKfYSxKzTRoOYiYFJ8JYd298hMtfiASePjS05Z58hhicyCcJYYRlarqDScG3LiVY3lL5y2nfcdIMNuSjCiKOJWuMkxwd9nR1UHMudLl0hEoy56mPdnHpDYtP9IYUlIOk1LlWBxcmHKifbXeqHu94p8j13Kk20dh2R49Hw3KsSoE9UbWmGQA9wAZXT82301i3rGF5GPAKjlTlRYcWisQurnPwHSVmx3DhUdiYwKGxt4KeaM5QVI4BE9octvE41OOprB_-Il105diQEh2Y9vdvX51ZVWIRfCboICPM6rJb0Oin7U7F1iM-oD_5s3DGnelfM5LGBcKwiB5paMo5M5vdBMaO-zR216cW9yGVXw9IZqHx8xDQWnoHAZjt8NLHeiGF2QOmIGtEUH7qnwhGpkcvszajmAZzR8saZgoH1qfBfvpVA41YfV14gU**4d030f05e23ad75409cebc609107467fc60be5077d52cf041087cd024fc4dc45*GY97aGFc1MyAsoO3Qxqtgwk9j-MbAPdEGBmEHq6r8VU | Additional information | false | Then I check that all page urls works properly + # And they are spiderable Scenario: Check that other non visible pages work well Given a list of non visible pages ids and contents diff --git a/cucumber/features/steps_definitions/pages.js b/cucumber/features/steps_definitions/pages.js index 1ce3c8c..5074d52 100644 --- a/cucumber/features/steps_definitions/pages.js +++ b/cucumber/features/steps_definitions/pages.js @@ -71,4 +71,13 @@ module.exports = function () { } callback(); }); + + this.Then(/^they are spiderable$/, (callback) => { + // Write code here that turns the phrase above into concrete actions + for (let i = 0; i < pages.length; i += 1) { + client.url(`${process.env.ROOT_URL}/${pages[i][0]}?_escaped_fragment_=`); + client.waitForText('#react-root', pages[i][1]); + } + callback(); + }); }; diff --git a/imports/ui/components/History/History.js b/imports/ui/components/History/History.js index f72523c..a33464f 100644 --- a/imports/ui/components/History/History.js +++ b/imports/ui/components/History/History.js @@ -1,12 +1,5 @@ -import { Meteor } from 'meteor/meteor'; import createHistory from 'history/createBrowserHistory'; const history = createHistory(); -history.listen((location) => { // , action ) => { - // console.log(location.pathname); - // console.log(action); // PUSH, etc - Meteor.Piwik.trackPage(location.pathname); -}); - export default history; diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index 9a11c69..f4cfc36 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -1,7 +1,7 @@ /* eslint-disable jsx-a11y/no-href */ /* eslint import/no-absolute-path: [2, { esmodule: false, commonjs: false, amd: false }] */ -import React from 'react'; +import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Router, Switch, Route } from 'react-router-dom'; import { Grid } from 'react-bootstrap'; @@ -54,11 +54,40 @@ import history from '../../components/History/History'; import '../../components/NotificationsObserver/NotificationsObserver'; import './App.scss'; +class LocationListener extends Component { + // https://stackoverflow.com/questions/43512450/react-router-v4-route-onchange-event + static contextTypes = { + router: PropTypes.object + }; + + componentDidMount() { + this.handleLocationChange(this.context.router.history.location); + this.unlisten = + this.context.router.history.listen(this.handleLocationChange); + } + + componentWillUnmount() { + this.unlisten(); + } + + handleLocationChange(location) { + // your staff here + console.log(`----- location: '${location.pathname}'`); + Meteor.Piwik.trackPage(location.pathname); + // Meteor.isReadyForSpiderable = true; + } + + render() { + return this.props.children; + } +} + const App = props => ( /* https://react.i18next.com/components/i18nextprovider.html */ + { !props.loading ?
@@ -112,6 +141,7 @@ const App = props => ( }
: ''} + From 078931b4f94985eb99a71d7516bbe993e7362578 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 10:31:19 +0100 Subject: [PATCH 035/330] Translation link --- imports/ui/pages/Profile/Profile.js | 1 + public/locales/en/common.json | 4 +++- public/locales/es/common.json | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/imports/ui/pages/Profile/Profile.js b/imports/ui/pages/Profile/Profile.js index 4800200..3f3dbb2 100644 --- a/imports/ui/pages/Profile/Profile.js +++ b/imports/ui/pages/Profile/Profile.js @@ -214,6 +214,7 @@ class Profile extends React.Component { }
+ {this.t('Puedes participar en las traducciones')} {this.t('Contraseña actual')} diff --git a/public/locales/en/common.json b/public/locales/en/common.json index dffcc24..7c2740b 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -187,5 +187,7 @@ "Zonas vigiladas por nuestros usuari@s actualmente": "Areas currently monitored by our users", "Iniciar sesión con Facebook": "Login With Facebook", "Elige un tipo": - "Choose a type" + "Choose a type", + "Puedes participar en las traducciones": + "You can help with the translations" } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index d4304e7..5d1a46d 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -274,5 +274,7 @@ "Iniciar sesión con Facebook": "Iniciar sesión con Facebook", "Elige un tipo": - "Elige un tipo" + "Elige un tipo", + "Puedes participar en las traducciones": + "Puedes participar en las traducciones" } From 9ebbe5482a62908d001cfe084dc868f1d4ab5e14 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 11:22:11 +0100 Subject: [PATCH 036/330] SiteSettings isPublic --- imports/api/SiteSettings/SiteSettings.js | 1 + imports/api/SiteSettings/server/publications.js | 2 +- imports/startup/server/migrations.js | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/imports/api/SiteSettings/SiteSettings.js b/imports/api/SiteSettings/SiteSettings.js index e690671..2bbd95f 100644 --- a/imports/api/SiteSettings/SiteSettings.js +++ b/imports/api/SiteSettings/SiteSettings.js @@ -40,6 +40,7 @@ SiteSettings.getSchema = type => new SimpleSchema({ type: String, description: String, value: SiteSettingsTypes[type].value, + isPublic: Boolean, createdAt: defaultCreatedAt, updatedAt: defaultUpdateAt }); diff --git a/imports/api/SiteSettings/server/publications.js b/imports/api/SiteSettings/server/publications.js index cd7f33d..ab9f1b2 100644 --- a/imports/api/SiteSettings/server/publications.js +++ b/imports/api/SiteSettings/server/publications.js @@ -3,4 +3,4 @@ import { Meteor } from 'meteor/meteor'; import SiteSettings from '../SiteSettings'; -Meteor.publish('settings', () => SiteSettings.find()); +Meteor.publish('settings', () => SiteSettings.find({ isPublic: true })); diff --git a/imports/startup/server/migrations.js b/imports/startup/server/migrations.js index 6002d4d..e58605f 100644 --- a/imports/startup/server/migrations.js +++ b/imports/startup/server/migrations.js @@ -117,6 +117,16 @@ Meteor.startup(() => { } }); + Migrations.add({ + version: 8, + up: function siteSettingsAddIndex() { + SiteSettings._ensureIndex({ isPublic: 1 }, { unique: 1 }); + SiteSettings.find({ isPublic: null }).forEach((setting) => { + SiteSettings.update({ _id: setting._id }, { $set: { isPublic: true } }); + }); + } + }); + // Set createdAt in users & subs Migrations.migrateTo('latest'); From ed7c89476fd6f63f070bc6fbda9099d36e8b98d1 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 11:26:14 +0100 Subject: [PATCH 037/330] Disable sitesettings methods --- imports/api/SiteSettings/methods.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/imports/api/SiteSettings/methods.js b/imports/api/SiteSettings/methods.js index 737bc3a..5f9d73d 100644 --- a/imports/api/SiteSettings/methods.js +++ b/imports/api/SiteSettings/methods.js @@ -1,11 +1,11 @@ import { Meteor } from 'meteor/meteor'; -import { check } from 'meteor/check'; +/* import { check } from 'meteor/check'; import SiteSettings from './SiteSettings'; -import SiteSettingsTypes from './SiteSettingsTypes'; +import SiteSettingsTypes from './SiteSettingsTypes'; */ import rateLimit from '../../modules/rate-limit'; Meteor.methods({ - 'siteSettings.insert': function siteSettingsInsert(setting) { +/* 'siteSettings.insert': function siteSettingsInsert(setting) { check(setting, { name: String, type: String, @@ -46,14 +46,14 @@ Meteor.methods({ } catch (exception) { throw new Meteor.Error('500', exception); } - } + } */ }); rateLimit({ methods: [ - 'siteSettings.insert', + /* 'siteSettings.insert', 'siteSettings.update', - 'siteSettings.remove' + 'siteSettings.remove' */ ], limit: 5, timeRange: 1000 From ac4331edbd8477cebfb728353043f8380fc480c3 Mon Sep 17 00:00:00 2001 From: vjrj Date: Wed, 14 Feb 2018 18:21:50 +0100 Subject: [PATCH 038/330] Subs union to server side --- .../api/Subscriptions/server/publications.js | 35 ---- imports/startup/server/index.js | 1 + imports/startup/server/migrations.js | 4 +- imports/startup/server/subsUnion.js | 84 ++++++++++ .../ui/components/Maps/SubsUnion/SubsUnion.js | 92 +++------- imports/ui/components/Maps/SubsUnion/Unify.js | 48 ++++++ imports/ui/pages/FiresMap/FiresMap.js | 20 ++- .../pages/Subscriptions/SubscriptionsMap.js | 18 +- package-lock.json | 158 +++++++++++++----- package.json | 1 + 10 files changed, 299 insertions(+), 162 deletions(-) create mode 100644 imports/startup/server/subsUnion.js create mode 100644 imports/ui/components/Maps/SubsUnion/Unify.js diff --git a/imports/api/Subscriptions/server/publications.js b/imports/api/Subscriptions/server/publications.js index f67fc3a..adf6e13 100644 --- a/imports/api/Subscriptions/server/publications.js +++ b/imports/api/Subscriptions/server/publications.js @@ -3,43 +3,8 @@ import { Meteor } from 'meteor/meteor'; import { Mongo } from 'meteor/mongo'; import { check } from 'meteor/check'; -import Perlin from 'loms.perlin'; import Subscriptions from '../Subscriptions'; -Perlin.seed(Math.random()); - -Meteor.publishTransformed('userSubsToFires', function transform() { - // https://en.wikipedia.org/wiki/Location_obfuscation - // https://en.wikipedia.org/wiki/Decimal_degrees#Precision - // https://gis.stackexchange.com/questions/27792/what-simple-effective-techniques-for-obfuscating-points-are-available - return Subscriptions.find().serverTransform(function transformDoc(odoc) { - const doc = odoc; - // Destructuring gives me an error: "Cannot destructure property `location` of 'undefined'" - const location = doc.location; - /* doc.lat = location.lat; - * doc.lon = location.lon; */ - let lat; - let lon; - if (location) { - lat = Math.round(location.lat * 10) / 10; - lon = Math.round(location.lon * 10) / 10; - // console.log(`[${lat}, ${lon}]`); - const noiseBase = Perlin.perlin2(lat, lon); - const noise = Math.abs(noiseBase / 3); - // console.log(`Noise ${noise}, abs: ${Math.abs(noise)}`); - lat += noise; - lon += noise; - doc.location.lat = lat; - doc.location.lon = lon; - doc.distance += noiseBase; - } - // console.log(`with noise: [${doc.lat}, ${doc.lon}]`); - delete doc.chatId; - delete doc.geo; - return doc; - }); -}); - Meteor.publish('mysubscriptions', function subscriptions() { return Subscriptions.find({ owner: this.userId }); // type: 'web' }); diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index aa32e9d..b331b73 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -9,3 +9,4 @@ import './notificationsObserver'; import './facts'; import '../common/comments'; import './sitemaps'; +import './subsUnion'; diff --git a/imports/startup/server/migrations.js b/imports/startup/server/migrations.js index e58605f..f420f82 100644 --- a/imports/startup/server/migrations.js +++ b/imports/startup/server/migrations.js @@ -13,7 +13,7 @@ Meteor.startup(() => { Migrations.config({ // Log job run details to console - log: true + log: Meteor.isProduction }); Migrations.add({ @@ -120,7 +120,7 @@ Meteor.startup(() => { Migrations.add({ version: 8, up: function siteSettingsAddIndex() { - SiteSettings._ensureIndex({ isPublic: 1 }, { unique: 1 }); + SiteSettings._ensureIndex({ isPublic: 1 }); SiteSettings.find({ isPublic: null }).forEach((setting) => { SiteSettings.update({ _id: setting._id }, { $set: { isPublic: true } }); }); diff --git a/imports/startup/server/subsUnion.js b/imports/startup/server/subsUnion.js new file mode 100644 index 0000000..d527f50 --- /dev/null +++ b/imports/startup/server/subsUnion.js @@ -0,0 +1,84 @@ +/* eslint-disable import/no-absolute-path */ + +import { Meteor } from 'meteor/meteor'; +import Subscriptions from '/imports/api/Subscriptions/Subscriptions'; +import SiteSettings from '/imports/api/SiteSettings/SiteSettings'; +import Perlin from 'loms.perlin'; +import L from 'leaflet-headless'; +import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; + +// sudo apt-get install libcairo2-dev libjpeg-dev libgif-dev + +Meteor.startup(() => { + Perlin.seed(Math.random()); + + const addNoisy = (osub) => { + const sub = osub; + let lat = Math.round(sub.location.lat * 10) / 10; + let lon = Math.round(sub.location.lon * 10) / 10; + const noiseBase = Perlin.perlin2(lat, lon); + const noise = Math.abs(noiseBase / 3); + lat += noise; + lon += noise; + sub.location.lat = lat; + sub.location.lon = lon; + sub.distance += noiseBase; + return sub; + }; + + const process = () => { + const group = new L.FeatureGroup(); + const result = calcUnion(Subscriptions.find().fetch(), group, addNoisy); + const union = result[0]; + const bounds = result[1]; + + if (typeof union === 'object') { + const unionSet = { + $set: { + name: 'subs-public-union', + value: JSON.stringify(union), + isPublic: true, + description: 'Public subscriptions union', + type: 'string' + } + }; + const boundsSet = { + $set: { + name: 'subs-public-union-bounds', + value: JSON.stringify(bounds), + isPublic: true, + description: 'Public subscriptions union bounds', + type: 'string' + } + }; + // FIXME, take care of object size: + // https://stackoverflow.com/questions/10827812/what-is-the-length-maximum-for-a-string-data-type-in-mongodb-used-with-ruby + SiteSettings.upsert({ name: 'subs-public-union' }, unionSet, { multi: false }); + SiteSettings.upsert({ name: 'subs-public-union-bounds' }, boundsSet, { multi: false }); + if (Meteor.isDevelopment) console.log('Subscription union calculated'); + } else { + console.log('Subscription union failed!'); + } + }; + + // At startup + process(); + + Subscriptions.find({ createdAt: { $gt: new Date() } }).observe({ + added: function newSubAdded() { // doc) { + if (Meteor.isDevelopment) console.log('Subs added so recreate union'); + process(); + } + }); + + Subscriptions.find().observe({ + changed: function subsChanged() { // updatedDoc, oldDoc) { + if (Meteor.isDevelopment) console.log('Subs changed so recreate union'); + process(); + }, + removed: function subsRemoved() { // oldDoc) { + if (Meteor.isDevelopment) console.log('Subs removed so recreate union'); + process(); + } + }); +}); diff --git a/imports/ui/components/Maps/SubsUnion/SubsUnion.js b/imports/ui/components/Maps/SubsUnion/SubsUnion.js index 60cbd26..c624759 100644 --- a/imports/ui/components/Maps/SubsUnion/SubsUnion.js +++ b/imports/ui/components/Maps/SubsUnion/SubsUnion.js @@ -3,89 +3,43 @@ /* eslint-disable import/no-absolute-path */ /* global L */ -import { Map } from 'react-leaflet'; -import LGeo from 'leaflet-geodesy'; -import tunion from '@turf/union'; -import ttrunc from '@turf/truncate'; -import { check, Match } from 'meteor/check'; - -// https://stackoverflow.com/questions/35394577/leaflet-js-union-merge-circles -const truncOptions = { precision: 6, coordinates: 2 }; - -function unify(polyList) { - let unionTemp; - for (let i = 0; i < polyList.length; i += 1) { - const pol = polyList[i].toGeoJSON(); - const cleanPol = ttrunc(pol, truncOptions); - if (i === 0) { - unionTemp = cleanPol; - } else { - unionTemp = ttrunc(tunion(unionTemp, cleanPol), truncOptions); - } - } - return unionTemp; -} +import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; const subsUnion = (union, options) => { - // check(union, Match.Optional(Object)); - check(options, { - map: Map, - show: Boolean, - subs: [Object], - color: Match.Optional(String), - fillcolor: Match.Optional(String), - opacity: Match.Optional(Number), - fit: Boolean - }); - const color = options.color || '#145A32'; const fillColor = options.fillColor || 'green'; const opacity = options.options || 0.1; if (options.subs) { const lmap = options.map.leafletElement; - // http://leafletjs.com/reference-1.2.0.html#layergroup - // FeatureGroup has getBounds - const unionGroup = new L.FeatureGroup(); - if (union) { lmap.removeLayer(union); } union = null; - - if (options.subs.length > 0 && options.show) { - // http://leafletjs.com/reference-1.2.0.html#path - const copts = { - parts: 144 - }; - options.subs.forEach((sub) => { - try { - if (sub.location && sub.location.lat && sub.location.lon && sub.distance) { - check(sub.location.lon, Number); - check(sub.location.lat, Number); - check(sub.distance, Number); - const circle = LGeo.circle([sub.location.lat, sub.location.lon], sub.distance * 1000, copts); - circle.addTo(unionGroup); - } else { - console.error(`Wrong subscription ${JSON.stringify(sub)}`); - } - } catch (e) { - console.error(e); - console.error(`Wrong subscription trying to make union ${JSON.stringify(sub)}`); + if (options.show) { + if (options.fromServer) { + // We get the json from server side + union = L.geoJson(JSON.parse(options.subs)); + union.setStyle({ color, fillColor, fillOpacity: opacity }); + union.addTo(lmap); + if (options.fit && options.bounds) { + // console.log(options.bounds); + const bounds = JSON.parse(options.bounds); + options.map.leafletElement.fitBounds(L.latLngBounds(bounds._northEast, bounds._southWest)); + } + } else if (options.subs.length > 0) { + const unionGroup = new L.FeatureGroup(); + const result = calcUnion(options.subs, unionGroup, sub => sub); + const unionJson = result[0]; + const bounds = result[1]; + + union = L.geoJson(unionJson); + union.setStyle({ color, fillColor, fillOpacity: opacity }); + union.addTo(lmap); + if (options.fit) { + options.map.leafletElement.fitBounds(bounds); } - }); - const unionJson = unify(unionGroup.getLayers()); - union = L.geoJson(unionJson); - union.setStyle({ - color, - fillColor, - fillOpacity: opacity - }); - union.addTo(lmap); - if (options.fit) { - options.map.leafletElement.fitBounds(unionGroup.getBounds()); } - return union; } } return union; diff --git a/imports/ui/components/Maps/SubsUnion/Unify.js b/imports/ui/components/Maps/SubsUnion/Unify.js new file mode 100644 index 0000000..68f602a --- /dev/null +++ b/imports/ui/components/Maps/SubsUnion/Unify.js @@ -0,0 +1,48 @@ +import { check } from 'meteor/check'; +import LGeo from 'leaflet-geodesy'; +import tunion from '@turf/union'; +import ttrunc from '@turf/truncate'; + +// https://stackoverflow.com/questions/35394577/leaflet-js-union-merge-circles +const truncOptions = { precision: 6, coordinates: 2 }; + +const unify = (polyList) => { + let unionTemp; + for (let i = 0; i < polyList.length; i += 1) { + const pol = polyList[i].toGeoJSON(); + const cleanPol = ttrunc(pol, truncOptions); + if (i === 0) { + unionTemp = cleanPol; + } else { + unionTemp = ttrunc(tunion(unionTemp, cleanPol), truncOptions); + } + } + return unionTemp; +}; + +const calcUnion = (subs, group, decorated) => { + const unionGroup = group; + const copts = { + parts: 144 + }; + subs.forEach((osub) => { + try { + if (osub.location && osub.location.lat && osub.location.lon && osub.distance) { + check(osub.location.lon, Number); + check(osub.location.lat, Number); + check(osub.distance, Number); + const dsub = decorated(osub); + const circle = LGeo.circle([dsub.location.lat, dsub.location.lon], dsub.distance * 1000, copts); + circle.addTo(unionGroup); + } else { + console.error(`Wrong subscription ${JSON.stringify(osub)}`); + } + } catch (e) { + console.error(e, `Wrong subscription trying to make union ${JSON.stringify(osub)}`); + } + }); + const unionJson = unify(unionGroup.getLayers()); + return [unionJson, unionGroup.getBounds()]; +}; + +export default calcUnion; diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index b75d26b..f577e08 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -29,7 +29,6 @@ import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import FalsePositivesCollection from '/imports/api/FalsePositives/FalsePositives'; import SiteSettings from '/imports/api/SiteSettings/SiteSettings'; -import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; import { isNotHomeAndMobile, isChrome } from '/imports/ui/components/Utils/isMobile'; import { isHome } from '/imports/ui/components/Utils/location'; import ShareIt from '/imports/ui/components/ShareIt/ShareIt'; @@ -174,6 +173,8 @@ class FiresMap extends React.Component { map, subs: this.props.userSubs, show: this.state.showSubsUnion, + bounds: this.props.userSubsBounds, + fromServer: true, fit: false }); } @@ -181,7 +182,7 @@ class FiresMap extends React.Component { render() { const { t } = this.props; - console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'} map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Subs users ready ${this.props.subsready} (${this.props.userSubs.length}), reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); + console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'} map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); const title = `${t('AppName')}: ${t('Fuegos activos')}`; if (Meteor.isDevelopment) { console.log(`False positives total: ${this.props.falsePositivesTotal}`); @@ -315,7 +316,8 @@ class FiresMap extends React.Component { FiresMap.propTypes = { loading: PropTypes.bool.isRequired, subsready: PropTypes.bool.isRequired, - userSubs: PropTypes.arrayOf(PropTypes.object).isRequired, + userSubs: PropTypes.string, + userSubsBounds: PropTypes.string, activefires: PropTypes.arrayOf(PropTypes.object).isRequired, firealerts: PropTypes.arrayOf(PropTypes.object).isRequired, falsePositives: PropTypes.arrayOf(PropTypes.object).isRequired, @@ -379,15 +381,17 @@ export default translate([], { wait: true })(withTracker(() => { Meteor.subscribe('activefirestotal'); Meteor.subscribe('falsePositivesTotal'); - Meteor.subscribe('settings'); - const userSubs = Meteor.subscribe('userSubsToFires'); + const settingsSubs = Meteor.subscribe('settings'); const lastCheck = SiteSettings.findOne({ name: 'last-fire-check' }); + const userSubs = SiteSettings.findOne({ name: 'subs-public-union' }); + const userSubsBounds = SiteSettings.findOne({ name: 'subs-public-union-bounds' }); const fireAlerts = FireAlertsCollection.find().fetch(); const falsePositives = FalsePositivesCollection.find().fetch(); return { - loading: !subscription ? true : !subscription.ready(), - userSubs: UserSubsToFiresCollection.find().fetch(), - subsready: userSubs.ready(), + loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready()), + userSubs: userSubs ? userSubs.value : null, + userSubsBounds: userSubs ? userSubsBounds.value : null, + subsready: settingsSubs.ready(), // Not reactive query depending on zoom level activefires: ActiveFiresCollection.find({}, { reactive: zoom.get() >= MAXZOOMREACTIVE }).fetch(), activefirestotal: Counter.get('countActiveFires') + fireAlerts.length, diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js index ce675fd..5d162a9 100644 --- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js +++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js @@ -19,7 +19,7 @@ import CenterInMyPosition from '/imports/ui/components/CenterInMyPosition/Center import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; import Loading from '/imports/ui/components/Loading/Loading'; -import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; +import SiteSettings from '/imports/api/SiteSettings/SiteSettings'; import { isChrome } from '/imports/ui/components/Utils/isMobile'; import { isHome } from '/imports/ui/components/Utils/location'; import ShareIt from '/imports/ui/components/ShareIt/ShareIt'; @@ -66,6 +66,8 @@ class SubscriptionsMap extends React.Component { this.state.union = subsUnion(this.state.union, { map, subs: this.props.userSubs, + bounds: this.props.userSubsBounds, + fromServer: true, show: true, fit: this.state.init }); @@ -89,7 +91,7 @@ class SubscriptionsMap extends React.Component { render() { const { t } = this.props; const title = `${t('AppName')}: ${t('Zonas vigiladas')}`; - console.log(`Rendering Subs users ready ${this.props.subsready} subs: ${this.props.userSubs.length} viewport: ${JSON.stringify(this.state.viewport)}`); + console.log(`Rendering Subs users ready ${this.props.subsready} viewport: ${JSON.stringify(this.state.viewport)}`); return ( { !isHome() && @@ -153,16 +155,20 @@ class SubscriptionsMap extends React.Component { } SubscriptionsMap.propTypes = { + userSubs: PropTypes.string, + userSubsBounds: PropTypes.string, subsready: PropTypes.bool.isRequired, - userSubs: PropTypes.arrayOf(PropTypes.object).isRequired, history: PropTypes.object.isRequired, t: PropTypes.func.isRequired }; export default translate([], { wait: true })(withTracker(() => { - const userSubs = Meteor.subscribe('userSubsToFires'); + const settingsSubs = Meteor.subscribe('settings'); + const userSubs = SiteSettings.findOne({ name: 'subs-public-union' }); + const userSubsBounds = SiteSettings.findOne({ name: 'subs-public-union-bounds' }); return { - userSubs: UserSubsToFiresCollection.find().fetch(), - subsready: userSubs.ready() + userSubs: userSubs ? userSubs.value : null, + userSubsBounds: userSubs ? userSubsBounds.value : null, + subsready: settingsSubs.ready() }; })(SubscriptionsMap)); diff --git a/package-lock.json b/package-lock.json index 5581dfe..174ad76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,8 +60,7 @@ "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", - "dev": true + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" }, "acorn": { "version": "5.2.1", @@ -282,8 +281,7 @@ "array-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", - "dev": true + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, "array-includes": { "version": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", @@ -2247,6 +2245,14 @@ "integrity": "sha1-H5CV8u/UlA4LpsWZKreptkzDW6Q=", "dev": true }, + "canvas": { + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-1.6.9.tgz", + "integrity": "sha1-4/lc7HsWvy1vP8clwC2UDTJY9ps=", + "requires": { + "nan": "2.6.2" + } + }, "caseless": { "version": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" @@ -2778,8 +2784,7 @@ "content-type-parser": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz", - "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==", - "dev": true + "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==" }, "convert-source-map": { "version": "1.5.1", @@ -2909,14 +2914,12 @@ "cssom": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", - "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=", - "dev": true + "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=" }, "cssstyle": { "version": "0.2.37", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", - "dev": true, "requires": { "cssom": "0.3.2" } @@ -2930,6 +2933,11 @@ "es5-ext": "0.10.37" } }, + "d3-queue": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz", + "integrity": "sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=" + }, "damerau-levenshtein": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz", @@ -3331,7 +3339,6 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "dev": true, "requires": { "esprima": "3.1.3", "estraverse": "4.2.0", @@ -3343,38 +3350,32 @@ "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "esprima": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" }, "estraverse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" }, "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "1.1.2", "type-check": "0.3.2" @@ -3384,7 +3385,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, "requires": { "deep-is": "0.1.3", "fast-levenshtein": "2.0.6", @@ -3397,21 +3397,18 @@ "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, "optional": true }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "1.1.2" } @@ -3419,8 +3416,7 @@ "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" } } }, @@ -4941,7 +4937,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", - "dev": true, "requires": { "whatwg-encoding": "1.0.3" } @@ -7451,6 +7446,92 @@ "resolved": "https://registry.npmjs.org/leaflet-graphicscale/-/leaflet-graphicscale-0.0.2.tgz", "integrity": "sha1-q2INKJ6acETC9RB8g74XhDrsUwM=" }, + "leaflet-headless": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/leaflet-headless/-/leaflet-headless-0.2.6.tgz", + "integrity": "sha1-Hqh4c/fuJj/JyI3xXsx4qZUdcsk=", + "requires": { + "canvas": "1.6.9", + "jsdom": "9.8.3", + "leaflet": "1.3.1", + "leaflet-image": "0.4.0", + "request": "2.83.0" + }, + "dependencies": { + "acorn": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" + }, + "acorn-globals": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", + "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", + "requires": { + "acorn": "2.7.0" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + }, + "jsdom": { + "version": "9.8.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.8.3.tgz", + "integrity": "sha1-/eKcEJwyoRMeC2xlkU5kGY+Xw3A=", + "requires": { + "abab": "1.0.4", + "acorn": "2.7.0", + "acorn-globals": "1.0.9", + "array-equal": "1.0.0", + "content-type-parser": "1.0.2", + "cssom": "0.3.2", + "cssstyle": "0.2.37", + "escodegen": "1.9.0", + "html-encoding-sniffer": "1.0.2", + "iconv-lite": "0.4.19", + "nwmatcher": "1.4.3", + "parse5": "1.5.1", + "request": "2.83.0", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.3.3", + "webidl-conversions": "3.0.1", + "whatwg-encoding": "1.0.3", + "whatwg-url": "3.1.0", + "xml-name-validator": "2.0.1" + } + }, + "parse5": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-3.1.0.tgz", + "integrity": "sha1-e9yuSQ+SGu9kUftnOexrvY6Qe/Y=", + "requires": { + "tr46": "0.0.3", + "webidl-conversions": "3.0.1" + } + } + } + }, + "leaflet-image": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/leaflet-image/-/leaflet-image-0.4.0.tgz", + "integrity": "sha1-6E8i/2KI8JubDi9RpIUKnweWjME=", + "requires": { + "d3-queue": "2.0.3" + } + }, "leaflet-sleep": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/leaflet-sleep/-/leaflet-sleep-0.5.1.tgz", @@ -9028,8 +9109,7 @@ "nwmatcher": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", - "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==", - "dev": true + "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==" }, "oauth-sign": { "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -10887,8 +10967,7 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "semver": { "version": "5.4.1", @@ -11291,8 +11370,7 @@ "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", - "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", - "dev": true + "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=" }, "table": { "version": "4.0.2", @@ -11479,8 +11557,7 @@ "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", - "dev": true + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" }, "trim-right": { "version": "1.0.1", @@ -11688,7 +11765,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", - "dev": true, "requires": { "iconv-lite": "0.4.19" }, @@ -11696,8 +11772,7 @@ "iconv-lite": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" } } }, @@ -11865,8 +11940,7 @@ "xml-name-validator": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", - "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", - "dev": true + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" }, "xtend": { "version": "4.0.1", diff --git a/package.json b/package.json index 3fd1c7b..43ffaf6 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "leaflet": "^1.3.1", "leaflet-geodesy": "^0.2.1", "leaflet-graphicscale": "0.0.2", + "leaflet-headless": "^0.2.6", "leaflet-sleep": "^0.5.1", "lodash": "^4.17.4", "loms.perlin": "^1.0.1", From 4f9e0cc63da333600df44e0a089474ab70e8944a Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 12:48:33 +0100 Subject: [PATCH 039/330] Added prerender --- .meteor/packages | 1 + .meteor/versions | 1 + 2 files changed, 2 insertions(+) diff --git a/.meteor/packages b/.meteor/packages index de1e606..823ac22 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -62,3 +62,4 @@ barbatus:stars-rating arkham:comments-ui facts gadicohen:sitemaps +dferber:prerender diff --git a/.meteor/versions b/.meteor/versions index e9ae166..f6a33ef 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -35,6 +35,7 @@ ddp-common@1.3.0 ddp-rate-limiter@1.0.7 ddp-server@2.1.0 deps@1.0.12 +dferber:prerender@2.2.2_3 diff-sequence@1.0.7 dynamic-import@0.2.0 ecmascript@0.9.0 From dbfbba1067dfb03060fe30711ca69b93dd98ea43 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 13:27:09 +0100 Subject: [PATCH 040/330] Added unstranslated cookie message --- imports/startup/client/i18n.js | 2 +- public/locales/en/common.json | 3 ++- public/locales/es/common.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/imports/startup/client/i18n.js b/imports/startup/client/i18n.js index 63abf76..69771e2 100644 --- a/imports/startup/client/i18n.js +++ b/imports/startup/client/i18n.js @@ -90,7 +90,7 @@ i18n.use(backend) position: 'bottom', linkText: 'Lee más', linkRouteName: '/privacy', - acceptButtonText: 'Aceptar', + acceptButtonText: t('Aceptar'), html: false, expirationInDays: 70, forceShow: false diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 7c2740b..fd4fcd3 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -189,5 +189,6 @@ "Elige un tipo": "Choose a type", "Puedes participar en las traducciones": - "You can help with the translations" + "You can help with the translations", + "Aceptar": "Accept" } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 5d1a46d..49ae9e0 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -276,5 +276,6 @@ "Elige un tipo": "Elige un tipo", "Puedes participar en las traducciones": - "Puedes participar en las traducciones" + "Puedes participar en las traducciones", + "Aceptar": "Aceptar" } From 79bdc189347c1559d1d15bd216d9b0ece5f825ee Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 16:53:12 +0100 Subject: [PATCH 041/330] Migrated to prerender node-module --- .meteor/packages | 1 - .meteor/versions | 1 - client/main.html | 1 + imports/startup/server/index.js | 1 + imports/startup/server/prerender.js | 46 ++++++ package-lock.json | 232 +++++++++++++++++++++++++++- package.json | 1 + 7 files changed, 278 insertions(+), 5 deletions(-) create mode 100644 imports/startup/server/prerender.js diff --git a/.meteor/packages b/.meteor/packages index 823ac22..de1e606 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -62,4 +62,3 @@ barbatus:stars-rating arkham:comments-ui facts gadicohen:sitemaps -dferber:prerender diff --git a/.meteor/versions b/.meteor/versions index f6a33ef..e9ae166 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -35,7 +35,6 @@ ddp-common@1.3.0 ddp-rate-limiter@1.0.7 ddp-server@2.1.0 deps@1.0.12 -dferber:prerender@2.2.2_3 diff-sequence@1.0.7 dynamic-import@0.2.0 ecmascript@0.9.0 diff --git a/client/main.html b/client/main.html index 90fe4b1..5f2bc53 100644 --- a/client/main.html +++ b/client/main.html @@ -1,5 +1,6 @@ + All against Fire | Tod@s contra el Fuego diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index b331b73..2a0cebb 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -10,3 +10,4 @@ import './facts'; import '../common/comments'; import './sitemaps'; import './subsUnion'; +import './prerender'; diff --git a/imports/startup/server/prerender.js b/imports/startup/server/prerender.js new file mode 100644 index 0000000..4942165 --- /dev/null +++ b/imports/startup/server/prerender.js @@ -0,0 +1,46 @@ +/* global WebApp */ + +import { Meteor } from 'meteor/meteor'; +import prerenderIO from 'prerender-node'; + +// NOTE: Fetch as Google needs the /?_escaped_fragment_= +// https://webmasters.stackexchange.com/questions/72819/fetch-as-google-doesnt-find-the-html-snapshot-for-my-ajax-content + +// https://forums.meteor.com/t/any-guide-for-prerender-node-and-your-own-server-on-meteor/22054/9 +const settings = Meteor.settings.PrerenderIO; + +// https://github.com/dferber90/meteor-prerender/blob/master/server/prerender.js +const token = process.env.PRERENDERIO_TOKEN || (settings && settings.token); +const protocol = process.env.PRERENDERIO_PROTOCOL || (settings && settings.protocol); +// service url (support `prerenderServiceUrl` (for historical reasons) and `serviceUrl`) +let serviceUrl = settings && (settings.prerenderServiceUrl || settings.serviceUrl); +serviceUrl = process.env.PRERENDERIO_SERVICE_URL || serviceUrl; + +Meteor.startup(() => { + /* TODO if (!__meteor_runtime_config__.ROOT_URL.match(/www|stg|app/)) return; */ + + prerenderIO.set('prerenderToken', token); + + if (serviceUrl) prerenderIO.set('prerenderServiceUrl', serviceUrl); + prerenderIO.set('prerenderToken', token); + if (protocol) prerenderIO.set('protocol', protocol); + + prerenderIO.set('beforeRender', (req, done) => { + if (Meteor.isDevelopment) console.log('\nprerender before', req.headers, '\n\n'); + /* This method is intended to be used for caching, but could be used to save analytics or anything else you need to do for each crawler request. If you return a string from beforeRender, the middleware will serve that to the crawler (with status 200) instead of making a request to the prerender service. If you return an object the middleware will look for a status and body property (defaulting to 200 and "" respectively) and serve those instead. */ + done(); + }); + + prerenderIO.set('afterRender', (err, req, prerender_res) => { + /* This method is intended to be used for caching, but could be used to save analytics or anything else you need to do for each crawler request. This method is a noop and is called after the prerender service returns HTML. */ + if (err) { + console.log('prerenderio error', err); + return; + } + if (Meteor.isDevelopment) console.log('prerender after', req.url, '\nheaders:', req.headers, '\nres complete:', prerender_res.complete, prerender_res.statusCode, prerender_res.statusMessage, '\nres headers:', prerender_res.headers, '\nres body', prerender_res); + }); + + WebApp.rawConnectHandlers.use(prerenderIO); + + console.log('\nprerender service:', settings); +}); diff --git a/package-lock.json b/package-lock.json index 174ad76..7aeb4b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7313,7 +7313,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "dev": true, "requires": { "jsonify": "0.0.0" } @@ -7337,8 +7336,7 @@ "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" }, "jsonp": { "version": "0.2.1", @@ -9654,6 +9652,234 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, + "prerender-node": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/prerender-node/-/prerender-node-2.7.4.tgz", + "integrity": "sha1-L7PEHRRHjxemCfWpAM0XvwDjy3E=", + "requires": { + "request": "2.81.0" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "combined-stream": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.10.1" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.17" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + } + } + }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", diff --git a/package.json b/package.json index 43ffaf6..32d4fbb 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "node-geocoder": "^3.21.1", "nodemailer": "^4.4.2", "popper.js": "^1.12.7", + "prerender-node": "^2.7.4", "prop-types": "^15.6.0", "push.js": "^1.0.5", "rc-slider": "^8.5.0", From aec4c2a0b02150f3491325a7d84f3fc018ba5de3 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 17:13:54 +0100 Subject: [PATCH 042/330] Added meta hreflang --- imports/ui/layouts/App/App.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index f4cfc36..7e14c91 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -94,6 +94,8 @@ const App = props => ( {i18n.t('AppName')} + + From 2477c985d6cf95cdefd086cfabbecd6fe1608b78 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 18:10:38 +0100 Subject: [PATCH 043/330] Added popup to alerts --- imports/api/Fires/server/publications.js | 19 +++++++++++++++++++ imports/ui/components/Maps/FireList.js | 2 +- imports/ui/components/Maps/FirePixel.js | 18 ++++++++++++++---- imports/ui/components/Maps/FirePopup.js | 2 +- imports/ui/layouts/App/App.js | 2 +- imports/ui/pages/Fires/Fires.js | 7 ++++++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/imports/api/Fires/server/publications.js b/imports/api/Fires/server/publications.js index 575c7af..0f0b80c 100644 --- a/imports/api/Fires/server/publications.js +++ b/imports/api/Fires/server/publications.js @@ -8,6 +8,7 @@ import { Promise } from 'meteor/promise'; import NodeGeocoder from 'node-geocoder'; import { gmapServerKey } from '/imports/startup/server/IPGeocoder'; import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; +import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import FiresCollection from '../Fires'; function findFire(unsealed) { @@ -70,6 +71,24 @@ const findOrCreateFire = (obj) => { return findFire(obj); }; +Meteor.publish('fireFromAlertId', function fireFromAlertId(_id) { + try { + check(_id, String); + // console.log(`Looking for alert fire ${_id}`); + const fire = FireAlertsCollection.findOne(new Meteor.Collection.ObjectID(_id)); + if (fire) { + // console.info(`Active fire found: ${_id}`); + return findOrCreateFire(fixConfidence(fire)); + } + console.info(`Alert fire not found: ${_id}`); + // Not found in active fires! + return this.ready(); + } catch (e) { + console.info(`Alert fire not found (with error): ${_id}`); + return this.ready(); + } +}); + Meteor.publish('fireFromActiveId', function fireFromActiveId(_id) { try { check(_id, String); diff --git a/imports/ui/components/Maps/FireList.js b/imports/ui/components/Maps/FireList.js index f4a851c..ecf22f1 100644 --- a/imports/ui/components/Maps/FireList.js +++ b/imports/ui/components/Maps/FireList.js @@ -18,7 +18,7 @@ export default function FireList(props) { if (useMarks) { items = fires.map(({ _id, ...otherProps }) => ()); } else if (usePixel && !falsePositives) { - items = fires.map(({ _id, ...otherProps }) => ()); + items = fires.map(({ _id, ...otherProps }) => ()); } else if (!falsePositives) { items = fires.map(({ _id, ...otherProps }) => ()); } diff --git a/imports/ui/components/Maps/FirePixel.js b/imports/ui/components/Maps/FirePixel.js index 57f2092..c81b547 100644 --- a/imports/ui/components/Maps/FirePixel.js +++ b/imports/ui/components/Maps/FirePixel.js @@ -3,9 +3,13 @@ import React from 'react'; import { CircleMarker } from 'react-leaflet'; import PropTypes from 'prop-types'; +import FirePopup from './FirePopup'; +import { translate } from 'react-i18next'; /* Less acurate (1 pixel per fire) but faster */ -const FirePixel = ({ lat, lon, nasa }) => ( +const FirePixel = ({ + lat, lon, nasa, id, when, t, history +}) => ( ( fillOpacity="1" fill radius={nasa ? 1 : 2} - /> + > + + ); FirePixel.propTypes = { lat: PropTypes.number.isRequired, lon: PropTypes.number.isRequired, - nasa: PropTypes.bool.isRequired + id: PropTypes.object.isRequired, + history: PropTypes.object.isRequired, + when: PropTypes.instanceOf(Date), + nasa: PropTypes.bool.isRequired, + t: PropTypes.func.isRequired }; -export default FirePixel; +export default translate([], { wait: true })(FirePixel); diff --git a/imports/ui/components/Maps/FirePopup.js b/imports/ui/components/Maps/FirePopup.js index 8e7d2a8..c917a6b 100644 --- a/imports/ui/components/Maps/FirePopup.js +++ b/imports/ui/components/Maps/FirePopup.js @@ -22,7 +22,7 @@ const FirePopup = ({ {when && {t('Detectado')}: {moment(when).fromNow()}
 } { /* if nasa === null means that the is a false positive fire */ } - history.push(`/fire/${nasa ? 'active' : 'archive'}/${id}`)}>{t('Más información sobre este fuego')} + history.push(`/fire/${nasa ? 'active' : 'alert'}/${id}`)}>{t('Más información sobre este fuego')} diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index 7e14c91..e80d8cc 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -116,7 +116,7 @@ const App = props => ( - + diff --git a/imports/ui/pages/Fires/Fires.js b/imports/ui/pages/Fires/Fires.js index fe423a5..a892181 100644 --- a/imports/ui/pages/Fires/Fires.js +++ b/imports/ui/pages/Fires/Fires.js @@ -35,7 +35,7 @@ class Fire extends React.Component { componentWillReceiveProps(nextProps) { if (this.props.when !== nextProps.when || this.props.loading !== nextProps.loading || this.props.notfound !== nextProps.notfound) { // console.log(`Next when ${nextProps.when}`); - if (nextProps.fire && (nextProps.active || nextProps.fromHash)) { + if (nextProps.fire && (nextProps.alert || nextProps.active || nextProps.fromHash)) { // change url to archive with new _id nextProps.history.replace(`/fire/archive/${nextProps.fire._id}`); } @@ -173,6 +173,7 @@ Fire.propTypes = { notfound: PropTypes.bool.isRequired, fromHash: PropTypes.bool.isRequired, active: PropTypes.bool.isRequired, + alert: PropTypes.bool.isRequired, when: PropTypes.instanceOf(Date), fire: PropTypes.object }; @@ -188,10 +189,13 @@ const FireContainer = withTracker(({ match }) => { let subscription; const active = fireType === 'active'; const archive = fireType === 'archive'; + const alert = fireType === 'alert'; let fromHash = false; if (active) { subscription = Meteor.subscribe('fireFromActiveId', id); + } else if (alert) { + subscription = Meteor.subscribe('fireFromAlertId', id); } else if (archive) { subscription = Meteor.subscribe('fireFromId', id); } else { @@ -209,6 +213,7 @@ const FireContainer = withTracker(({ match }) => { return { loading, active, + alert, fromHash, fire: FiresCollection.findOne(), notfound, From 44428be8aa87c60d1551b96734f9ea1cf8731600 Mon Sep 17 00:00:00 2001 From: vjrj Date: Thu, 15 Feb 2018 22:35:23 +0100 Subject: [PATCH 044/330] Comments config --- imports/startup/client/comments.js | 2 +- imports/startup/common/comments.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/imports/startup/client/comments.js b/imports/startup/client/comments.js index 62fc868..94cbe90 100644 --- a/imports/startup/client/comments.js +++ b/imports/startup/client/comments.js @@ -37,6 +37,6 @@ i18n.init((err, t) => { template: 'bootstrap', // default 'semantic-ui' // default 'http://s3.amazonaws.com/37assets/svn/765-default-avatar.png' defaultAvatar: '/default-avatar.png', - markdown: false + markdown: true }); }); diff --git a/imports/startup/common/comments.js b/imports/startup/common/comments.js index 09fa297..728ec88 100644 --- a/imports/startup/common/comments.js +++ b/imports/startup/common/comments.js @@ -8,6 +8,10 @@ Comments.config({ publishUserFields: { profile: 1 }, + mediaAnalyzers: [ + Comments.analyzers.image, + Comments.analyzers.youtube + ], generateUsername: function genUser(user) { // console.log(JSON.stringify(user)); // FIXME From 45a63548c7837de386271635ce18bb1039c075f8 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 13:12:06 +0100 Subject: [PATCH 045/330] Added raven/sentry to server side --- imports/startup/client/ravenLogger.js | 3 +-- imports/startup/server/index.js | 1 + imports/startup/server/ravenLogger.js | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 imports/startup/server/ravenLogger.js diff --git a/imports/startup/client/ravenLogger.js b/imports/startup/client/ravenLogger.js index 509121a..304b1e8 100644 --- a/imports/startup/client/ravenLogger.js +++ b/imports/startup/client/ravenLogger.js @@ -5,9 +5,8 @@ const ravenOptions = {}; const ravenLogger = new RavenLogger({ publicDSN: Meteor.settings.public.sentryPublicDSN, // will be used on the client - privateDSN: Meteor.settings.sentryPrivateDSN, // will be used on the server shouldCatchConsoleError: true, // default - trackUser: false // default + trackUser: true // default }, ravenOptions); export default ravenLogger; diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index 2a0cebb..6db3588 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -1,3 +1,4 @@ +import './ravenLogger'; import './i18n'; import './accounts'; import './api'; diff --git a/imports/startup/server/ravenLogger.js b/imports/startup/server/ravenLogger.js new file mode 100644 index 0000000..d722dcf --- /dev/null +++ b/imports/startup/server/ravenLogger.js @@ -0,0 +1,13 @@ +import RavenLogger from 'meteor/flowkey:raven'; +import { Meteor } from 'meteor/meteor'; + +const ravenOptions = {}; + +const ravenLogger = new RavenLogger({ + publicDSN: Meteor.settings.public.sentryPublicDSN, + privateDSN: Meteor.settings.sentryPrivateDSN, + shouldCatchConsoleError: true, // default + trackUser: true // default +}, ravenOptions); + +export default ravenLogger; From c35349670ab92f6a497178282aea36290c0dcd78 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 16:45:07 +0100 Subject: [PATCH 046/330] Fix test timming --- cucumber/features/steps_definitions/pages.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cucumber/features/steps_definitions/pages.js b/cucumber/features/steps_definitions/pages.js index 5074d52..e309e15 100644 --- a/cucumber/features/steps_definitions/pages.js +++ b/cucumber/features/steps_definitions/pages.js @@ -43,6 +43,7 @@ module.exports = function () { for (let i = 0; i < pages.length; i += 1) { client.url(`${process.env.ROOT_URL}/${pages[i][0]}`); const content = pages[i][1]; + client.waitForVisible('#react-root', 5000); client.waitForText('#react-root', content); } callback(); From 79eed373d41bdcb8e09edd0014eb456435ca0d04 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 16:46:06 +0100 Subject: [PATCH 047/330] Make subs union no clickable (interactive) and wait for fire alerts --- imports/ui/components/Maps/SubsUnion/SubsUnion.js | 11 +++++++++-- imports/ui/pages/FiresMap/FiresMap.js | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/imports/ui/components/Maps/SubsUnion/SubsUnion.js b/imports/ui/components/Maps/SubsUnion/SubsUnion.js index c624759..ab28b21 100644 --- a/imports/ui/components/Maps/SubsUnion/SubsUnion.js +++ b/imports/ui/components/Maps/SubsUnion/SubsUnion.js @@ -9,6 +9,7 @@ const subsUnion = (union, options) => { const color = options.color || '#145A32'; const fillColor = options.fillColor || 'green'; const opacity = options.options || 0.1; + const interactive = options.interactive || false; if (options.subs) { const lmap = options.map.leafletElement; @@ -18,10 +19,14 @@ const subsUnion = (union, options) => { union = null; if (options.show) { if (options.fromServer) { + // http://leafletjs.com/reference-1.3.0.html#geojson // We get the json from server side union = L.geoJson(JSON.parse(options.subs)); - union.setStyle({ color, fillColor, fillOpacity: opacity }); + union.setStyle({ + color, fillColor, fillOpacity: opacity, interactive + }); union.addTo(lmap); + union.bringToBack(); if (options.fit && options.bounds) { // console.log(options.bounds); const bounds = JSON.parse(options.bounds); @@ -34,7 +39,9 @@ const subsUnion = (union, options) => { const bounds = result[1]; union = L.geoJson(unionJson); - union.setStyle({ color, fillColor, fillOpacity: opacity }); + union.setStyle({ + color, fillColor, fillOpacity: opacity, interactive + }); union.addTo(lmap); if (options.fit) { options.map.leafletElement.fitBounds(bounds); diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index f577e08..3319841 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -336,6 +336,7 @@ let geoInit = true; export default translate([], { wait: true })(withTracker(() => { let subscription; + let alertSubscription; const centerStored = store.get('firesmap_center'); const zoomStored = store.get('firesmap_zoom'); @@ -362,7 +363,7 @@ export default translate([], { wait: true })(withTracker(() => { mapSize.get()[1].lng, mapSize.get()[1].lat ); - Meteor.subscribe( + alertSubscription = Meteor.subscribe( 'fireAlerts', mapSize.get()[0].lng, mapSize.get()[0].lat, @@ -388,7 +389,7 @@ export default translate([], { wait: true })(withTracker(() => { const fireAlerts = FireAlertsCollection.find().fetch(); const falsePositives = FalsePositivesCollection.find().fetch(); return { - loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready()), + loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready() && alertSubscription.ready()), userSubs: userSubs ? userSubs.value : null, userSubsBounds: userSubs ? userSubsBounds.value : null, subsready: settingsSubs.ready(), From ee427758c26d1f1e55db0704fa38ed27edebc966 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 17:07:18 +0100 Subject: [PATCH 048/330] i18n whitelist langs --- imports/startup/common/i18n.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imports/startup/common/i18n.js b/imports/startup/common/i18n.js index e72a81f..9be09fd 100644 --- a/imports/startup/common/i18n.js +++ b/imports/startup/common/i18n.js @@ -35,8 +35,7 @@ const i18nOpts = { return value; } }, - whitelist: false, - // whitelist: ['es', 'en'], // allowed languages + whitelist: ['es', 'en'], // allowed languages load: 'languageOnly', // 'es' o 'en', previously: 'all', // es-ES -> es, en-US -> en debug: shouldDebug, ns: 'common', From eee1abf3edde8afae96ef7de8b29e143d9f17ff0 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 20:40:17 +0100 Subject: [PATCH 049/330] Fix some minor bug in SubsMap --- imports/ui/pages/Subscriptions/SubscriptionsMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js index 5d162a9..69f5bdf 100644 --- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js +++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js @@ -168,7 +168,7 @@ export default translate([], { wait: true })(withTracker(() => { const userSubsBounds = SiteSettings.findOne({ name: 'subs-public-union-bounds' }); return { userSubs: userSubs ? userSubs.value : null, - userSubsBounds: userSubs ? userSubsBounds.value : null, + userSubsBounds: userSubsBounds ? userSubsBounds.value : null, subsready: settingsSubs.ready() }; })(SubscriptionsMap)); From 2a6d8bea7841fb5551196110c4e0dd611fe42ca0 Mon Sep 17 00:00:00 2001 From: vjrj Date: Fri, 16 Feb 2018 20:40:41 +0100 Subject: [PATCH 050/330] False positives only for active fires --- .../api/ActiveFires/server/publications.js | 34 ++++++++++++++++++- imports/ui/components/Maps/SubsUnion/Unify.js | 2 +- imports/ui/pages/FiresMap/FiresMap.js | 23 ++++++------- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/imports/api/ActiveFires/server/publications.js b/imports/api/ActiveFires/server/publications.js index 278d937..d4b389a 100644 --- a/imports/api/ActiveFires/server/publications.js +++ b/imports/api/ActiveFires/server/publications.js @@ -4,7 +4,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; +import L from 'leaflet-headless'; import { NumberBetween } from '/imports/modules/server/other-checks'; +import FalsePositives from '/imports/api/FalsePositives/FalsePositives'; +import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; import ActiveFires from '../ActiveFires'; const counter = new Counter('countActiveFires', ActiveFires.find({})); @@ -13,6 +16,27 @@ Meteor.publish('activefirestotal', function total() { return counter; }); +const falsePositives = (fires) => { + const falsePos = FalsePositives.find({ + geo: { + $geoWithin: { + $geometry: fires.geometry + } + } + }, { + fields: { + geo: 1, + // type: 1, + // when: 1, + fireId: 1 + } + }); + + /* console.log(`False positive total: ${falsePos.count()}`); + * console.log(`False positives: ${JSON.stringify(falsePos.fetch())}`); */ + return falsePos; +}; + const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => { const fires = ActiveFires.find({ ourid: { @@ -31,8 +55,16 @@ const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => scan: 1 } }); + + const group = new L.FeatureGroup(); + const remap = fires.fetch().map(function remap(doc) { + return { location: { lat: doc.lat, lon: doc.lon }, distance: doc.scan }; + }); + const result = calcUnion(remap, group, sub => sub); + const falsePos = falsePositives(result[0]); + // console.log(JSON.stringify(result)); // console.log(`Fires total: ${fires.count()}`); - return fires; + return [fires, falsePos]; }; Meteor.publish('activefiresmyloc', function activeInMyLoc(northEastLng, northEastLat, southWestLng, southWestLat) { diff --git a/imports/ui/components/Maps/SubsUnion/Unify.js b/imports/ui/components/Maps/SubsUnion/Unify.js index 68f602a..46586b7 100644 --- a/imports/ui/components/Maps/SubsUnion/Unify.js +++ b/imports/ui/components/Maps/SubsUnion/Unify.js @@ -35,7 +35,7 @@ const calcUnion = (subs, group, decorated) => { const circle = LGeo.circle([dsub.location.lat, dsub.location.lon], dsub.distance * 1000, copts); circle.addTo(unionGroup); } else { - console.error(`Wrong subscription ${JSON.stringify(osub)}`); + console.info(`Wrong subscription ${JSON.stringify(osub)}`); } } catch (e) { console.error(e, `Wrong subscription trying to make union ${JSON.stringify(osub)}`); diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index 3319841..8520068 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -185,7 +185,7 @@ class FiresMap extends React.Component { console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'} map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); const title = `${t('AppName')}: ${t('Fuegos activos')}`; if (Meteor.isDevelopment) { - console.log(`False positives total: ${this.props.falsePositivesTotal}`); + console.log(`False positives total: ${this.props.falsePositives.length}`); } return ( /* Large number of markers: @@ -321,7 +321,6 @@ FiresMap.propTypes = { activefires: PropTypes.arrayOf(PropTypes.object).isRequired, firealerts: PropTypes.arrayOf(PropTypes.object).isRequired, falsePositives: PropTypes.arrayOf(PropTypes.object).isRequired, - falsePositivesTotal: PropTypes.number.isRequired, lastCheck: PropTypes.instanceOf(Date), activefirestotal: PropTypes.number.isRequired, center: PropTypes.arrayOf(PropTypes.number), @@ -370,24 +369,25 @@ export default translate([], { wait: true })(withTracker(() => { mapSize.get()[1].lng, mapSize.get()[1].lat ); - Meteor.subscribe( - 'falsePositivesMyloc', - mapSize.get()[0].lng, - mapSize.get()[0].lat, - mapSize.get()[1].lng, - mapSize.get()[1].lat - ); } }); Meteor.subscribe('activefirestotal'); - Meteor.subscribe('falsePositivesTotal'); const settingsSubs = Meteor.subscribe('settings'); const lastCheck = SiteSettings.findOne({ name: 'last-fire-check' }); const userSubs = SiteSettings.findOne({ name: 'subs-public-union' }); const userSubsBounds = SiteSettings.findOne({ name: 'subs-public-union-bounds' }); const fireAlerts = FireAlertsCollection.find().fetch(); - const falsePositives = FalsePositivesCollection.find().fetch(); + const falsePositives = FalsePositivesCollection.find().fetch().map((odoc) => { + const doc = odoc; + const geo = doc.geo; + doc.lat = geo.coordinates[1]; + doc.lon = geo.coordinates[0]; + doc._id = doc.fireId; + doc.id = doc.fireId; + delete doc.geo; + return doc; + }); return { loading: !subscription ? true : !(subscription.ready() && settingsSubs.ready() && alertSubscription.ready()), userSubs: userSubs ? userSubs.value : null, @@ -396,7 +396,6 @@ export default translate([], { wait: true })(withTracker(() => { // Not reactive query depending on zoom level activefires: ActiveFiresCollection.find({}, { reactive: zoom.get() >= MAXZOOMREACTIVE }).fetch(), activefirestotal: Counter.get('countActiveFires') + fireAlerts.length, - falsePositivesTotal: Counter.get('countFalsePositives') + fireAlerts.length, firealerts: fireAlerts, falsePositives, lastCheck: lastCheck ? lastCheck.value : null, From 824f66df038f1427f06b8bf519401e96b61df63d Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 08:26:46 +0100 Subject: [PATCH 051/330] import L --- imports/ui/components/Maps/SubsUnion/SubsUnion.js | 2 +- imports/ui/pages/FiresMap/FiresMap.js | 3 ++- imports/ui/pages/Subscriptions/SubscriptionsMap.js | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/imports/ui/components/Maps/SubsUnion/SubsUnion.js b/imports/ui/components/Maps/SubsUnion/SubsUnion.js index ab28b21..dab127a 100644 --- a/imports/ui/components/Maps/SubsUnion/SubsUnion.js +++ b/imports/ui/components/Maps/SubsUnion/SubsUnion.js @@ -1,8 +1,8 @@ /* eslint-disable react/jsx-indent-props */ /* eslint-disable import/no-absolute-path */ /* eslint-disable import/no-absolute-path */ -/* global L */ +import L from 'leaflet'; import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; const subsUnion = (union, options) => { diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index 8520068..caf011e 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -1,4 +1,4 @@ -/* global L Counter */ +/* global Counter */ /* eslint-disable import/no-absolute-path */ /* eslint-disable react/jsx-indent-props */ /* eslint-disable react/jsx-indent */ @@ -14,6 +14,7 @@ import { Map } from 'react-leaflet'; import Control from 'react-leaflet-control'; import _ from 'lodash'; import store from 'store'; +import L from 'leaflet'; import 'leaflet/dist/leaflet.css'; import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css'; import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js'; diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js index 69f5bdf..60bb37f 100644 --- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js +++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js @@ -1,7 +1,7 @@ -/* global L */ /* eslint-disable import/no-absolute-path */ /* eslint-disable react/jsx-indent-props */ /* eslint-disable react/jsx-indent */ + import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import { Button, ButtonGroup, Row, Col } from 'react-bootstrap'; @@ -10,6 +10,7 @@ import { withTracker } from 'meteor/react-meteor-data'; import { Trans, translate } from 'react-i18next'; import { Map } from 'react-leaflet'; import { Helmet } from 'react-helmet'; +import L from 'leaflet'; import 'leaflet/dist/leaflet.css'; import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css'; import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js'; From 237269f76123c6fd9216b43e94376f478c31f311 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 08:43:01 +0100 Subject: [PATCH 052/330] Fix some FireMaps data retrieving --- .../api/ActiveFires/server/publications.js | 30 +++++++++++-------- imports/ui/pages/FiresMap/FiresMap.js | 6 ++-- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/imports/api/ActiveFires/server/publications.js b/imports/api/ActiveFires/server/publications.js index d4b389a..b0b2329 100644 --- a/imports/api/ActiveFires/server/publications.js +++ b/imports/api/ActiveFires/server/publications.js @@ -32,12 +32,12 @@ const falsePositives = (fires) => { } }); - /* console.log(`False positive total: ${falsePos.count()}`); - * console.log(`False positives: ${JSON.stringify(falsePos.fetch())}`); */ + /* console.log(`False positive total: ${falsePos.count()}`); + console.log(`False positives: ${JSON.stringify(falsePos.fetch())}`); */ return falsePos; }; -const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => { +const activefires = (northEastLng, northEastLat, southWestLng, southWestLat, withMarks) => { const fires = ActiveFires.find({ ourid: { $geoWithin: { @@ -56,23 +56,29 @@ const activefires = (northEastLng, northEastLat, southWestLng, southWestLat) => } }); - const group = new L.FeatureGroup(); - const remap = fires.fetch().map(function remap(doc) { - return { location: { lat: doc.lat, lon: doc.lon }, distance: doc.scan }; - }); - const result = calcUnion(remap, group, sub => sub); - const falsePos = falsePositives(result[0]); // console.log(JSON.stringify(result)); // console.log(`Fires total: ${fires.count()}`); - return [fires, falsePos]; + + if (withMarks && fires.fetch().length > 0) { + const group = new L.FeatureGroup(); + const remap = fires.fetch().map(function remap(doc) { + return { location: { lat: doc.lat, lon: doc.lon }, distance: doc.scan }; + }); + const result = calcUnion(remap, group, sub => sub); + const falsePos = falsePositives(result[0]); + return [fires, falsePos]; + } + + return fires; }; -Meteor.publish('activefiresmyloc', function activeInMyLoc(northEastLng, northEastLat, southWestLng, southWestLat) { +Meteor.publish('activefiresmyloc', function activeInMyLoc(northEastLng, northEastLat, southWestLng, southWestLat, withMarks) { // latitude -90 and 90 and the longitude between -180 and 180 check(northEastLng, NumberBetween(-180, 180)); check(southWestLat, NumberBetween(-90, 90)); check(southWestLng, NumberBetween(-180, 180)); check(northEastLat, NumberBetween(-90, 90)); + check(withMarks, Boolean); - return activefires(northEastLng, northEastLat, southWestLng, southWestLat); + return activefires(northEastLng, northEastLat, southWestLng, southWestLat, withMarks); }); diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index caf011e..c1b3b7b 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -146,6 +146,7 @@ class FiresMap extends React.Component { useMarkers(use) { this.setState({ useMarkers: use }); store.set('firesmap_marks', use); + marks.set(use); } addScale(map) { @@ -183,7 +184,7 @@ class FiresMap extends React.Component { render() { const { t } = this.props; - console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'} map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); + console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'}, zoom ${this.state.viewport.zoom}, map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); const title = `${t('AppName')}: ${t('Fuegos activos')}`; if (Meteor.isDevelopment) { console.log(`False positives total: ${this.props.falsePositives.length}`); @@ -361,7 +362,8 @@ export default translate([], { wait: true })(withTracker(() => { mapSize.get()[0].lng, mapSize.get()[0].lat, mapSize.get()[1].lng, - mapSize.get()[1].lat + mapSize.get()[1].lat, + marks.get() && zoom.get() >= MAXZOOM ); alertSubscription = Meteor.subscribe( 'fireAlerts', From 53ab69555edfd13ddb653ecbf6e7b1c21ab8d9b4 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 08:48:04 +0100 Subject: [PATCH 053/330] Don't query again if zoom in --- imports/ui/pages/FiresMap/FiresMap.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index c1b3b7b..7076c60 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -127,9 +127,8 @@ class FiresMap extends React.Component { mapSize.set([bounds.getNorthEast(), bounds.getSouthWest()]); store.set('firesmap_center', viewport.center); store.set('firesmap_zoom', viewport.zoom); - if (viewport.center === this.state.viewport.center && - viewport.zoom === this.state.viewport.zoom) { - // Do nothing, in same point + if (viewport.zoom >= this.state.viewport.zoom) { + if (Meteor.isDevelopment) console.log('Don\'t query we are in the same point'); return; } zoom.set(viewport.zoom); From f5d105fbc0543205dc2d7885a199e45002d3b5e1 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 08:52:50 +0100 Subject: [PATCH 054/330] Remove log --- imports/startup/server/prerender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/startup/server/prerender.js b/imports/startup/server/prerender.js index 4942165..dedee0b 100644 --- a/imports/startup/server/prerender.js +++ b/imports/startup/server/prerender.js @@ -42,5 +42,5 @@ Meteor.startup(() => { WebApp.rawConnectHandlers.use(prerenderIO); - console.log('\nprerender service:', settings); + // console.log('\nprerender service:', settings); }); From 79222eb97833eab833b6810890ba5ad86d118553 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 09:30:44 +0100 Subject: [PATCH 055/330] Removed loading in FireMap. Improve data retrieving --- imports/ui/pages/FiresMap/FiresMap.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/imports/ui/pages/FiresMap/FiresMap.js b/imports/ui/pages/FiresMap/FiresMap.js index 7076c60..afd5dcd 100644 --- a/imports/ui/pages/FiresMap/FiresMap.js +++ b/imports/ui/pages/FiresMap/FiresMap.js @@ -25,7 +25,6 @@ import FireList from '/imports/ui/components/Maps/FireList'; import subsUnion from '/imports/ui/components/Maps/SubsUnion/SubsUnion'; import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers'; import FromNow from '/imports/ui/components/FromNow/FromNow'; -import Loading from '/imports/ui/components/Loading/Loading'; import ActiveFiresCollection from '/imports/api/ActiveFires/ActiveFires'; import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; import FalsePositivesCollection from '/imports/api/FalsePositives/FalsePositives'; @@ -127,13 +126,13 @@ class FiresMap extends React.Component { mapSize.set([bounds.getNorthEast(), bounds.getSouthWest()]); store.set('firesmap_center', viewport.center); store.set('firesmap_zoom', viewport.zoom); - if (viewport.zoom >= this.state.viewport.zoom) { + if (viewport.zoom > this.state.viewport.zoom) { + this.state.viewport = viewport; if (Meteor.isDevelopment) console.log('Don\'t query we are in the same point'); return; } zoom.set(viewport.zoom); center.set(viewport.center); - // this.setState({ viewport }); this.state.viewport = viewport; } } @@ -185,6 +184,7 @@ class FiresMap extends React.Component { const { t } = this.props; console.log(`Rendering ${this.props.loading ? 'loading' : 'LOADED'}, zoom ${this.state.viewport.zoom}, map ${this.props.activefires.length + this.props.firealerts.length} of ${this.props.activefirestotal} total. False positives: ${this.props.falsePositives.length}. Reactive ${this.state.viewport.zoom >= MAXZOOMREACTIVE}`); const title = `${t('AppName')}: ${t('Fuegos activos')}`; + if (Meteor.isDevelopment) { console.log(`False positives total: ${this.props.falsePositives.length}`); } @@ -199,11 +199,6 @@ class FiresMap extends React.Component { {title} } - {this.props.loading || !this.props.subsready ? - - - - : ''}

Fuegos activos

From 308ad08e742e209773c6c432f2a356912449e20e Mon Sep 17 00:00:00 2001 From: vjrj Date: Sat, 17 Feb 2018 09:41:21 +0100 Subject: [PATCH 056/330] Tooltip in industries --- imports/ui/components/Maps/FireIconMark.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imports/ui/components/Maps/FireIconMark.js b/imports/ui/components/Maps/FireIconMark.js index 5082edf..5e8af68 100644 --- a/imports/ui/components/Maps/FireIconMark.js +++ b/imports/ui/components/Maps/FireIconMark.js @@ -1,6 +1,6 @@ /* eslint-disable import/no-absolute-path */ -import React from 'react'; -import { CircleMarker, Marker } from 'react-leaflet'; +import React, { Fragment } from 'react'; +import { CircleMarker, Marker, Tooltip } from 'react-leaflet'; import PropTypes from 'prop-types'; import { fireIcon, nFireIcon, industryIcon } from '/imports/ui/components/Maps/Icons'; import { translate } from 'react-i18next'; @@ -23,6 +23,7 @@ const FireIconMark = ({ } { falsePositives && + {t('Es una industria')} { /* disabled because was a past fire (and can be marked multiple times) */ false && } } From 5c7380a1996b0071e3294c161317b5f0598f9f63 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sun, 18 Feb 2018 13:11:40 +0100 Subject: [PATCH 057/330] Fix error message --- imports/ui/pages/Profile/Profile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imports/ui/pages/Profile/Profile.js b/imports/ui/pages/Profile/Profile.js index 3f3dbb2..cb58761 100644 --- a/imports/ui/pages/Profile/Profile.js +++ b/imports/ui/pages/Profile/Profile.js @@ -25,6 +25,7 @@ class Profile extends React.Component { this.t = this.props.t; this.getUserType = this.getUserType.bind(this); this.handleSubmit = this.handleSubmit.bind(this); + this.renderOAuthUser = this.renderOAuthUser.bind(this); this.renderPasswordUser = this.renderPasswordUser.bind(this); this.renderProfileForm = this.renderProfileForm.bind(this); @@ -67,7 +68,7 @@ class Profile extends React.Component { required: this.t('¿Cuál es tu apellido?') }, emailAddress: { - required: this.t('Necesitamos una contraseña aquí.'), + required: this.t('Necesitamos un correo aquí.'), email: this.t('¿Es correcto este correo?') }, currentPassword: { From ba32c4fd0dd89ba7a8e51647ee563fe9852eb771 Mon Sep 17 00:00:00 2001 From: vjrj Date: Sun, 18 Feb 2018 17:00:54 +0100 Subject: [PATCH 058/330] Feedback button --- imports/startup/server/feedback.js | 25 ++++ imports/startup/server/index.js | 1 + imports/ui/components/Feedback/Feedback.js | 120 +++++++++++++++++++ imports/ui/components/Feedback/Feedback.scss | 71 +++++++++++ imports/ui/layouts/App/App.js | 4 +- public/locales/en/common.json | 10 +- public/locales/es/common.json | 10 +- 7 files changed, 238 insertions(+), 3 deletions(-) create mode 100644 imports/startup/server/feedback.js create mode 100644 imports/ui/components/Feedback/Feedback.js create mode 100644 imports/ui/components/Feedback/Feedback.scss diff --git a/imports/startup/server/feedback.js b/imports/startup/server/feedback.js new file mode 100644 index 0000000..98ebaca --- /dev/null +++ b/imports/startup/server/feedback.js @@ -0,0 +1,25 @@ +/* eslint-disable prefer-arrow-callback */ +/* eslint-disable import/no-absolute-path */ + +import { Meteor } from 'meteor/meteor'; +import i18n from 'i18next'; +import { check } from 'meteor/check'; +import sendEmail from '/imports/startup/server/email'; + +Meteor.methods({ + 'send-feedback': function sendFeedback(email, feedback) { + check(email, String); + check(feedback, String); + const appName = i18n.t('AppName'); + sendEmail({ + to: 'info@comunes.org', + from: `${appName} `, + subject: `Feedback de ${email}!`, + sendAt: new Date(), + text: `Feedback de ${email}\n\n${feedback}`, + html: `

${feedback}

`, + template: '{{appName}}

{{{subject}}}

{{{html}}}', + appName + }, true); + } +}); diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index 6db3588..101d249 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -12,3 +12,4 @@ import '../common/comments'; import './sitemaps'; import './subsUnion'; import './prerender'; +import './feedback'; diff --git a/imports/ui/components/Feedback/Feedback.js b/imports/ui/components/Feedback/Feedback.js new file mode 100644 index 0000000..af2f845 --- /dev/null +++ b/imports/ui/components/Feedback/Feedback.js @@ -0,0 +1,120 @@ +/* eslint-disable react/jsx-indent-props */ +/* eslint-disable import/no-absolute-path */ +/* eslint-disable import/no-absolute-path */ + +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; +import { Meteor } from 'meteor/meteor'; +import { translate } from 'react-i18next'; +import { FormGroup, Button, FormControl } from 'react-bootstrap'; +import { Bert } from 'meteor/themeteorchef:bert'; +import validate from '../../../modules/validate'; + +import './Feedback.scss'; + +class Feedback extends Component { + constructor(props) { + super(props); + this.t = props.t; + this.handleSubmit = this.handleSubmit.bind(this); + this.onTabClick = this.onTabClick.bind(this); + } + + componentDidMount() { + const component = this; + + validate(component.form, { + rules: { + email: { + required: true, + email: true + }, + feedbackText: { + required: true + } + }, + messages: { + feedbackText: { + required: this.t('Por favor, escribe aquí tu feedback...') + }, + email: { + required: this.t('Tu correo'), + email: this.t('¿Es correcto este correo?') + } + }, + submitHandler() { component.handleSubmit(); } + }); + } + + onTabClick() { + $('#feedback-form').toggle('slide'); + } + + handleSubmit() { + const email = this.email.value.trim(); + const feedbackText = this.feedbackText.value.trim(); + + Meteor.call('send-feedback', email, feedbackText, (error) => { + if (error) { + Bert.alert(error.reason, 'danger'); + } else { + this.form.reset(); + Bert.alert('Feedback recibido, gracias...', 'success'); + this.onTabClick(); + } + }); + } + + render() { + return ( +
+
(this.formdiv = formdiv)} style={{ display: 'none' }} className="card"> +
(this.form = form)} + className="form card-body" + onSubmit={event => event.preventDefault()} + > + + (this.email = email)} + placeholder={this.t('Tu correo')} + type="email" + /> + + +