})
`;
- } */
-
-// Cutover flag (fase 1a): channels listed in
-// Meteor.settings.private.notifDisabledChannels (e.g. ['mobile','web']) are
-// handled by the tcef-notifications microservice, so the old observer/cron must
-// NOT send them. Mutual exclusion per channel — reversible by editing settings,
-// no code deploy needed. ES5-compatible on purpose (Meteor 1.6 / Node 8).
-const notifDisabledChannels = (Meteor.settings.private && Meteor.settings.private.notifDisabledChannels) || [];
-
-const processNotif = (notif) => {
- if (notifDisabledChannels.indexOf(notif.type) !== -1) {
- // This channel was migrated to tcef-notifications; do nothing here.
- return;
- }
- if (isMailServerMaster && validFcmSender && notif.type === 'mobile' && notif.notified !== true) {
- const fcmSender = new gcm.Sender(Meteor.settings.private.fcmApiToken);
- const user = Meteor.users.findOne({ _id: notif.userId });
- moment.locale(user.lang);
- // duplicate code below
- const body = `${trim(notif.content)}`;
-
- // https://firebase.google.com/docs/cloud-messaging/concept-options
- const msg = new gcm.Message();
-
- msg.addNotification({
- title: i18n.t('Alerta de fuego'),
- body,
- click_action: 'FLUTTER_NOTIFICATION_CLICK',
- tag: notif._id, // prevent duplication of fire notifications
- sound: 'default', // Indicates sound to be played. Supports only default currently.
- icon: 'launch_image' // 'ic_launcher'
- });
-
- msg.addData('id', notif._id._str);
- msg.addData('description', body);
- msg.addData('lat', notif.geo.coordinates[1]);
- msg.addData('lon', notif.geo.coordinates[0]);
- msg.addData('when', notif.when);
- msg.addData('subsId', notif.subsId._str);
- msg.addData('sealed', notif.sealed);
-
- const registrationTokens = [];
- if (!user.fireBaseToken) {
- console.warn('This mobile user doesn\'t have a firebase registration token');
- } else {
- registrationTokens.push(user.fireBaseToken);
- // FIXME: better join users
- if (validFcmSender) {
- fcmSender.send(msg, { registrationTokens }, Meteor.bindEnvironment(function processResult(err, response) {
- if (err) {
- console.error(`FCM error: ${err}`);
- // FIXME send to sentry
- ravenLogger.log(err);
- } else {
- // console.log(`FCM response: ${response}`);
- Notifications.update(notif._id, { $set: { notified: true, notifiedAt: new Date() } });
- }
- }));
- }
- }
- }
- if (isMailServerMaster && notif.type === 'web' && notif.emailNotified !== true) {
- const user = Meteor.users.findOne({ _id: notif.userId });
- const { firstName, emailAddress } = getEmailOf(user);
-
- if (emailAddress) {
- const img = imgUrl(notif.geo.coordinates[1], notif.geo.coordinates[0]);
- // const url = imgUrl(notif.geo.coordinates[1], notif.geo.coordinates[0]);
- const fireUrl = `${Meteor.absoluteUrl('fire/')}${notif.sealed}`;
- // const fireHtmlUrl = `${i18n.t('Más información sobre este fuego')}`;
- // TODO get _id of fire
- // const fireTextUrl = `${i18n.t('Más información sobre este fuego')}:\n${fireUrl}`;
- // FIXME use our map as url and static map as img
- moment.locale(user.lang);
- // moment user tz ?
- const message = `${trim(notif.content)} (${i18n.t('fireDetectedAt', { when: dateLongFormat(notif.when) })}).`;
-
- // TODO Comunes Address
-
- const emailOpts = {
- to: emailAddress,
- // userName: firstName,
- // sendAt: new Date(),
- subject: subjectTruncate.apply(message),
- // text: `${message}\n\n${fireTextUrl}\n\n`,
- // template: '{{appName}}
{{{html}}}', - lang: user.lang, - template: 'new-fire', - templateVars: { - applicationName: i18n.t('AppName'), - firstName, - message, - fireUrl, - img, - subsUrl: Meteor.absoluteUrl('subscriptions') - } - }; - sendEmail(emailOpts).catch((error) => { - throw new Meteor.Error('500', `${error}`); - }); - // sendMail(emailOpts, true); - Notifications.update(notif._id, { $set: { emailNotified: true, emailNotifiedAt: new Date() } }); - } else { - // Not email or not verified -> remove notif so we don't retry to send it - Notifications.remove({ _id: notif._id }); - } - } -}; - -export default processNotif; diff --git a/imports/modules/server/other-checks.js b/imports/modules/server/other-checks.js deleted file mode 100644 index 85dcbbe..0000000 --- a/imports/modules/server/other-checks.js +++ /dev/null @@ -1,25 +0,0 @@ -import { check, Match } from 'meteor/check'; - -export const validZoom = Match.Where((zoom) => { - // http://wiki.openstreetmap.org/wiki/Zoom_levels - check(zoom, Number); - return zoom >= 0 && zoom <= 19; -}); - -// https://github.com/3stack-software/meteor-match-library -export function NumberBetween(min, max) { - return Match.Where((x) => { - check(x, Number); - return min <= x && x <= max; - }); -} - -export function NullOr(type) { - return Match.Where((x) => { - if (x === null) { - return true; - } - check(x, type); - return true; - }); -} diff --git a/imports/modules/server/send-email.js b/imports/modules/server/send-email.js deleted file mode 100644 index 8fc4629..0000000 --- a/imports/modules/server/send-email.js +++ /dev/null @@ -1,56 +0,0 @@ -/* eslint-disable import/no-absolute-path */ - -import { Meteor } from 'meteor/meteor'; -import i18n from 'i18next'; -import { getFileNameOfLang } from '/imports/api/Utility/server/files.js'; -import sendMail from '/imports/startup/server/email'; -import getPrivateFile from './get-private-file'; -import templateToText from './handlebars-email-to-text'; -import templateToHTML from './handlebars-email-to-html'; - -export function subjectTruncate(n = 70, useWordBoundary = true) { - // https://stackoverflow.com/questions/1199352/smart-way-to-shorten-long-strings-with-javascript - if (this.length <= n) { - return `${this}`; - } - const subString = this.substr(0, n - 1); - return `${useWordBoundary ? subString.substr(0, subString.lastIndexOf(' ')) : subString}...`; -} - -const sendEmail = (options, { resolve, reject }) => { - try { - Meteor.defer(() => { - // console.log(`Current user lang ${options.lang}`); - i18n.changeLanguage(options.lang); - // Meteor email options: - // basic: from, to/cc/bcc/replyTo, subject, html, text, - // others: watchHtml, icalEvent, headers, attachments, mailComposer, inReplyTo, references, messageId - const opts = options; - // opts.template = '{{appName}}
{{{html}}}'; - opts.template = '{{{html}}}'; - opts.appName = i18n.t('AppName'); - // console.log(`Email options: ${JSON.stringify(opts)}`); - sendMail(opts, true); - // Email.send(options); - resolve(); - }); - } catch (exception) { - reject(exception); - } -}; - -export default ({ - text, html, lang, template, templateVars, ...rest -}) => { - if (text || html || template) { - return new Promise((resolve, reject) => { - sendEmail({ - lang, - ...rest, - text: template ? templateToText(getPrivateFile(getFileNameOfLang('email-templates', template, 'txt', lang)), (templateVars || {})) : text, - html: template ? templateToHTML(getPrivateFile(getFileNameOfLang('email-templates', template, 'html', lang)), (templateVars || {})) : html - }, { resolve, reject }); - }); - } - throw new Error('Please pass an HTML string, text, or template name to compile for your message\'s body.'); -}; diff --git a/imports/modules/server/twitter.js b/imports/modules/server/twitter.js deleted file mode 100644 index bff6c15..0000000 --- a/imports/modules/server/twitter.js +++ /dev/null @@ -1,27 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import Twit from 'twit'; - -// https://www.npmjs.com/package/twit -const confTwitter = (lang) => { - const tConf = Meteor.settings.private.twitter[lang]; - - const T = new Twit({ - consumer_key: tConf.consumer_key, - consumer_secret: tConf.consumer_secret, - access_token: tConf.access_token, - access_token_secret: tConf.access_token_secret - // timeout_ms: 60*1000, // optional HTTP request timeout to apply to all requests. - }); - - return T; -}; - -const tweet = (message, lang) => { - const T = confTwitter(lang); - T.post('statuses/update', { status: message }, (err, data, response) => { - // console.log(data); - // console.log(response); - }); -}; - -export default tweet; diff --git a/imports/modules/url-encode.js b/imports/modules/url-encode.js deleted file mode 100644 index 291514a..0000000 --- a/imports/modules/url-encode.js +++ /dev/null @@ -1,6 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import Iron from 'iron'; - -exports.encrypt = obj => Iron.seal(obj, Meteor.settings.private.ironPassword, Iron.defaults); - -exports.decrypt = obj => Iron.unseal(obj, Meteor.settings.private.ironPassword, Iron.defaults); diff --git a/imports/startup/client/Gkeys.js b/imports/startup/client/Gkeys.js deleted file mode 100644 index 0a1f83e..0000000 --- a/imports/startup/client/Gkeys.js +++ /dev/null @@ -1,50 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { ReactiveVar } from 'meteor/reactive-var'; -import { Tracker } from 'meteor/tracker'; -import GoogleMapsLoader from 'google-maps'; - -class GkeysC { - constructor() { - this.gmapkey = new ReactiveVar(null); - const self = this; - this.callbacks = []; - Meteor.startup(() => { - Meteor.call('getMapKey', (error, key) => { - // console.log(google.maps); - GoogleMapsLoader.KEY = key; - GoogleMapsLoader.LIBRARIES = ['places']; - GoogleMapsLoader.load(() => { - self.gmapkey.set(key); - console.log('GMaps script just loaded'); - self.doCallbacks(key); - }); - }); - }); - } - - doCallbacks(key) { - for (let i = 0; i < this.callbacks.length; i += 1) { - this.callbacks[i](null, key); - } - this.callbacks = []; - } - - load(callback) { - this.callbacks.push(callback); - Tracker.autorun((computation) => { - const key = this.gmapkey.get(); - if (key) { - // already loaded - // console.log('GMaps already loaded'); - this.doCallbacks(key); - computation.stop(); - } else { - console.log('Waiting for the gkey'); - } - }); - } -} - -const Gkeys = new GkeysC(); - -export default Gkeys; diff --git a/imports/startup/client/comments.js b/imports/startup/client/comments.js deleted file mode 100644 index 94cbe90..0000000 --- a/imports/startup/client/comments.js +++ /dev/null @@ -1,42 +0,0 @@ -/* global Comments */ -/* eslint-disable import/no-absolute-path */ - -import i18n from '/imports/startup/client/i18n'; -import '/imports/startup/common/comments'; - -import './comments.scss'; - -i18n.init((err, t) => { - Comments.ui.setContent({ - title: ' ', // i18n.t('Comentarios'), - save: t('Guardar'), - reply: t('Responder'), - edit: t('Editar'), - remove: t('Borrar'), - 'placeholder-textarea': t('Añadir un comentario'), - 'add-button-reply': t('Añadir una respuesta'), - 'add-button': t('Añadir comentario'), - 'you-need-to-login': t('Necesitas iniciar sesión para'), - 'add comments': t('añadir comentarios'), - 'like comments': t('puntuar comentarios'), - 'rate comments': t('puntuar comentarios'), - 'add replies': t('responder'), - 'load-more': t('Más comentarios') - }); - - /* This in client side */ - Comments.ui.config({ - limit: 20, // default 10 - loadMoreCount: 20, // default 20 - /* generateAvatar: function genAvatar(user, isAnonymous) { - if (isAnonymous) { - return i18n.t('Anónimo'); - } - return user.profile && user.profile.name && user.profile.name.first ? user.profile.name.first : null; - }, */ - template: 'bootstrap', // default 'semantic-ui' - // default 'http://s3.amazonaws.com/37assets/svn/765-default-avatar.png' - defaultAvatar: '/default-avatar.png', - markdown: true - }); -}); diff --git a/imports/startup/client/comments.scss b/imports/startup/client/comments.scss deleted file mode 100644 index de93e65..0000000 --- a/imports/startup/client/comments.scss +++ /dev/null @@ -1,29 +0,0 @@ -.comments-section { - width: 100%; -} - -.comments-box { - max-width: inherit; - padding: 0; -} - -p.comment-content { - /* white-space: pre-line; */ -} - -/* remove comment btn danger style */ - -div.media-body.comment> div> div> div.btn.btn-danger.remove-action { - background-color: white; - border: 1px solid rgb(204, 204, 204); - color: rgb(51, 51, 51); -} - -/* text-area height */ -.form-control .create-comment { - height: 9em; -} - -.img-avatar { - margin-right: 5px; -} \ No newline at end of file diff --git a/imports/startup/client/geolocation.js b/imports/startup/client/geolocation.js deleted file mode 100644 index a43d784..0000000 --- a/imports/startup/client/geolocation.js +++ /dev/null @@ -1,20 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import { ReactiveVar } from 'meteor/reactive-var'; - -const geolocation = new ReactiveVar(); - -Meteor.startup(() => { - Meteor.call('geo', (error, response) => { - if (error) { - console.warn(error); - } else { - const pos = [ - response.location.latitude, - response.location.longitude - ]; - geolocation.set(pos); - } - }); -}); - -export default geolocation; diff --git a/imports/startup/client/i18n.js b/imports/startup/client/i18n.js deleted file mode 100644 index 384053f..0000000 --- a/imports/startup/client/i18n.js +++ /dev/null @@ -1,137 +0,0 @@ -/* global CookieConsent Intl */ -import i18n from 'i18next'; -import { Meteor } from 'meteor/meteor'; -import { Tracker } from 'meteor/tracker'; -import { ReactiveVar } from 'meteor/reactive-var'; -import backend from 'i18next-xhr-backend'; -import LngDetector from 'i18next-browser-languagedetector'; -import Cache from 'i18next-localstorage-cache'; -import { T9n } from 'meteor-accounts-t9n'; -import moment from 'moment'; -import 'moment/locale/es'; -import 'moment/locale/pt'; -import 'moment/locale/gl'; -import i18nOpts from '../common/i18n'; - -// Adapted from: https://github.com/appigram/ryfma-boilerplate/blob/44c1eabfb9928b5623afab36a23997969e5beb02/imports/startup/client/i18n.js - -const detectorOptions = { - // order and from where user language should be detected - order: ['querystring', 'navigator', 'cookie', 'localStorage', 'htmlTag'], - - // keys or params to lookup language from - lookupQuerystring: 'lng', - lookupCookie: 'i18next', - lookupLocalStorage: 'i18nextLng', - - // cache user language on - caches: ['localStorage', 'cookie'], - excludeCacheFor: ['cimode'] // languages to not persist (cookie, localStorage) -}; - -export const i18nReady = new ReactiveVar(false); - -const cacheOptions = { - // turn on or off - enabled: false, - // prefix for stored languages - prefix: 'i18next_res_', - // expiration - expirationTime: 7 * 24 * 60 * 60 * 1000, - // language versions - versions: {} -}; - -i18nOpts.cache = cacheOptions; -i18nOpts.detection = detectorOptions; -i18nOpts.react = { - wait: true, - defaultTransParent: 'span' - // https://react.i18next.com/components/i18next-instance.ht - /* bindI18n: 'languageChanged loaded', - bindStore: 'added removed', - nsMode: 'default' */ -}; - -const sendMissing = true; // Meteor.isDevelopment; -if (sendMissing && Meteor.isDevelopment) { - i18nOpts.sendMissing = true; - i18nOpts.missingKeyHandler = function miss(lng, ns, key, defaultValue) { - Meteor.call('utility.saveMissingI18n', key, defaultValue); - }; -} - -function setT9(lang) { - if (lang === 'gl') { - T9n.setLanguage('es'); - } else { - T9n.setLanguage(lang); - } -} - -i18n.use(backend) - .use(LngDetector) - .use(Cache) - .init(i18nOpts, (err, t) => { - // initialized and ready to - if (err) { - console.error(err); - return; - } - console.log(`Language initialized: ${i18n.language}`); - - // document.title = t('AppName'); - // Accounts translation - // https://github.com/softwarerero/meteor-accounts-t9n - setT9(i18n.language); - // console.log(T9n.get('error.accounts.User not found')); - moment.locale(i18n.language); - - i18nReady.set(true); - - // cookies eu consent - const cookiesOpt = { - cookieTitle: t('Uso de Cookies'), - cookieMessage: t('Utilizamos cookies para asegurar un mejor uso de nuestra web. Si continúas navegando, consideramos que aceptas su uso'), - /* cookieMessage: t('Uso de Cookies'), - cookieMessageImply: t('Utilizamos cookies para asegurar un mejor uso de nuestra web. Si continúas navegando, consideramos que aceptas su uso'), */ - showLink: false, - position: 'bottom', - linkText: 'Lee más', - linkRouteName: '/privacy', - acceptButtonText: t('Aceptar'), - html: false, - expirationInDays: 70, - forceShow: false - }; - - CookieConsent.init(cookiesOpt); - }); - -Meteor.subscribe('userData'); // lang is there - -i18n.on('languageChanged', (lng) => { - moment.locale(lng); - // TODO fix this when gl is translated - setT9(lng); - Tracker.autorun((computation) => { - if (Meteor.userId()) { - // logged - if (Meteor.user() && (typeof Meteor.user().lang === 'undefined' || - Meteor.user().lang !== lng) - ) { - // Set the autodetected/changed lang - console.log(`Setting the autodetected lang ${lng}, from previous ${Meteor.user().lang}`); - // console.log(Meteor.user()); - Meteor.call('users.setLang', lng, (error) => { - if (error) { - console.error(error); - } - }); - computation.stop(); // not need it again til new lang change - } - } - }); -}); - -export default i18n; diff --git a/imports/startup/client/index.js b/imports/startup/client/index.js index 147cf4f..ccebfda 100644 --- a/imports/startup/client/index.js +++ b/imports/startup/client/index.js @@ -1,19 +1,8 @@ -/* global */ import React from 'react'; import { render } from 'react-dom'; import { Meteor } from 'meteor/meteor'; -import '/imports/startup/client/modernizr'; import App from '../../ui/layouts/App/App'; import '../../ui/stylesheets/app.scss'; -// https://stackoverflow.com/questions/19562207/jquery-detect-browser-ie9-and-below-and-throw-up-a-modal-to-upgrade -const isIE9OrBelow = () => /MSIE\s/.test(navigator.userAgent) && parseFloat(navigator.appVersion.split('MSIE')[1]) < 10; - -if (isIE9OrBelow()) window.alert('You are using an outdated browser. Please use Chrome or Firefox to display this site.'); -else { - Modernizr.on('webp', (result) => { - if (Meteor.isDevelopment) console.log(`webp ${result ? '' : 'not '}supported`); - }); - Meteor.startup(() => render(| - |
{{{subject}}}
', // Start each concatenated email with it's own subject - /* eslint-enable */ - // concatThrottling: 30, - template: MailTime.Template // Use default template - }); -} else { - console.log('I\'m a mail client'); - MailQueue = new MailTime({ - db, - type: 'client', - debug: Meteor.settings.private.debugMailer, - strategy: 'balancer', // Transports will be used in round robin chain - concatEmails: true // Concatenate emails to the same address - }); -} - -export default function sendMail(opts, debug) { - if (debug) { - MailQueue.sendMail(opts, (err, info) => { if (err) { console.error(err); } else { console.log(info); } }); - } else { - MailQueue.sendMail(opts); - } -} - -if (Meteor.settings.private.testMailer) { - const emailOpts = { - to: Meteor.settings.private.testEmail, - userName: 'someone', - sendAt: new Date(), - subject: 'Some new notification', - text: 'Plain text message', - template: '{{appName}}{{{subject}}}
{{{html}}}', - appName: i18n.t('AppName'), - html: 'Styled message
' - }; - sendMail(emailOpts, true); - sendMail(emailOpts, true); - sendMail(emailOpts, true); - sendMail(emailOpts, true); -} - -export const sendEmailsFromQueue = () => { - MailQueue.___send(() => { }); -}; +if (Meteor.isDevelopment) process.env.MAIL_URL = Meteor.settings.private.MAIL_URL; diff --git a/imports/startup/server/facts.js b/imports/startup/server/facts.js deleted file mode 100644 index 0c75843..0000000 --- a/imports/startup/server/facts.js +++ /dev/null @@ -1,9 +0,0 @@ -/* global Facts */ -import { Roles } from 'meteor/alanning:roles'; -import { Meteor } from 'meteor/meteor'; - -Facts.setUserIdFilter((userId) => { - const user = Meteor.users.findOne(userId); - // console.log(`User roles: ${user.roles}`); - return Roles.userIsInRole(userId, ['admin']); -}); diff --git a/imports/startup/server/feedback.js b/imports/startup/server/feedback.js deleted file mode 100644 index c1d028b..0000000 --- a/imports/startup/server/feedback.js +++ /dev/null @@ -1,25 +0,0 @@ -/* 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: 'fires@comunes.org', - from: `${appName}${feedback}
`, - template: '{{appName}}{{{subject}}}
{{{html}}}', - appName - }, true); - } -}); diff --git a/imports/startup/server/fibers.js b/imports/startup/server/fibers.js deleted file mode 100644 index ff96265..0000000 --- a/imports/startup/server/fibers.js +++ /dev/null @@ -1,7 +0,0 @@ -// Workaround for: https://github.com/meteor/meteor/issues/9796 -// https://github.com/meteor/meteor/issues/9796#issuecomment-381676326 -// https://github.com/sandstorm-io/sandstorm/blob/0f1fec013fe7208ed0fd97eb88b31b77e3c61f42/shell/server/00-startup.js#L99-L129 - -import Fiber from 'fibers'; - -Fiber.poolSize = 1e9; diff --git a/imports/startup/server/i18n.js b/imports/startup/server/i18n.js deleted file mode 100644 index 053d487..0000000 --- a/imports/startup/server/i18n.js +++ /dev/null @@ -1,32 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import i18n from 'i18next'; -import backend from 'i18next-sync-fs-backend'; -import i18nOpts from '../common/i18n'; -// import moment from 'moment'; -// import { T9n } from 'meteor-accounts-t9n'; - -// vi ostrio:meteor-root -i18nOpts.backend.loadPath = `${Meteor.rootPath}/../web.browser/app/${i18nOpts.backend.loadPath}`; -i18nOpts.backend.addPath = `${Meteor.rootPath}/../web.browser/app/${i18nOpts.backend.addPath}`; - -// console.log(i18nOpts.backend.loadPath); -i18nOpts.debug = false; -i18nOpts.saveMissing = Meteor.isDevelopment; -i18nOpts.initImmediate = false; - -i18n - .use(backend) - .init(i18nOpts, (err) => { - if (err) { - console.error(err); - } - }); - -/* export function setUserLang (lng) { - * moment.locale(lng); - * T9n.setLanguage(lng); - * } */ - -// console.log(i18n.t('Servidor arrancado')); - -export default i18n; diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index 7f84dde..09fb6b3 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -1,20 +1,4 @@ -import './ravenLogger'; -import './catchExceptions'; -import './fibers'; -import './i18n'; import './accounts'; import './api'; import './fixtures'; import './email'; -import './IPGeocoder'; -import './migrations'; -import './notificationsObserver'; -import './facts'; -import './comments'; -import './sitemaps'; -import './subsUnion'; -import './prerender'; -import './feedback'; -import './cron'; -import './isMaster'; -import './rest'; diff --git a/imports/startup/server/isMaster.js b/imports/startup/server/isMaster.js deleted file mode 100644 index 1bcdd32..0000000 --- a/imports/startup/server/isMaster.js +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable import/no-absolute-path */ - -import pm2Master from 'pm2-master'; -import { Meteor } from 'meteor/meteor'; - -Meteor.startup(() => { - if (pm2Master.isMaster()) { - console.log('This is the master process'); - } else { - console.log('This is a worker process'); - } -}); - -const isMaster = () => pm2Master.isMaster(); - -export default isMaster; diff --git a/imports/startup/server/leaflet-workaround.js b/imports/startup/server/leaflet-workaround.js deleted file mode 100644 index 740aa3b..0000000 --- a/imports/startup/server/leaflet-workaround.js +++ /dev/null @@ -1,19 +0,0 @@ -// imports/startup/server/leaflet-workaround.js -global.window = { - screen: { - deviceXDPI: 1, - logicalXDPI: 1 - } -}; -global.document = { - documentElement: { - style: {} - }, - createElement: () => { - return {}; - } -}; -global.navigator = { - userAgent: 'foo', - platform: 'bar' -}; diff --git a/imports/startup/server/migrations.js b/imports/startup/server/migrations.js deleted file mode 100644 index e3bfac9..0000000 --- a/imports/startup/server/migrations.js +++ /dev/null @@ -1,260 +0,0 @@ -/* global Migrations, Comments */ -/* eslint-disable import/no-absolute-path */ -import { Meteor } from 'meteor/meteor'; -import { Accounts } from 'meteor/accounts-base'; -import randomHex from 'crypto-random-hex'; -import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions'; -import FireAlertsCollection from '/imports/api/FireAlerts/FireAlerts'; -import SiteSettings from '/imports/api/SiteSettings/SiteSettings'; -import FalsePositives from '/imports/api/FalsePositives/FalsePositives'; -import Industries from '/imports/api/Industries/Industries'; -import IndustryRegistries from '/imports/api/Industries/IndustryRegistries'; -import Notifications from '/imports/api/Notifications/Notifications'; -import ActiveFiresUnion from '/imports/api/ActiveFiresUnion/ActiveFiresUnion'; -import { Mongo } from 'meteor/mongo'; - -Meteor.startup(() => { - // https://github.com/percolatestudio/meteor-migrations - - Migrations.config({ - // Log job run details to console - log: Meteor.isProduction - }); - - Migrations.add({ - version: 1, - up: function migrateIds() { - // https://docs.mongodb.com/manual/reference/operator/query/type/ - Meteor.users.find({ _id: { $type: 7 } }).forEach((user) => { - const migratedUser = user; - const id = user._id.valueOf(); - console.log(`Migrating id of user: ${JSON.stringify(user)}`); - Meteor.users.remove({ _id: user._id }); - migratedUser._id = id; - Meteor.users.insert(migratedUser); - }); - } - }); - - Migrations.add({ - version: 2, - up: function migrateSubsForeignKey() { - UserSubsToFiresCollection.find({ owner: null }).forEach((sub) => { - console.log(`Migrating subs of chatId: ${sub.chatId}`); - const subsUser = Meteor.users.findOne({ telegramChatId: sub.chatId }); - if (subsUser) { - console.log(`Migrating linking to user: ${JSON.stringify(subsUser)}`); - UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { owner: subsUser._id } }); - } else { - // create user with chatId and def language - const username = `tel${sub.chatId.toString().replace(/^-/, '')}`; - console.log(`Linking to new user: ${username}`); - const newUserId = Accounts.createUser({ - username, - password: randomHex(50), - profile: { name: {} } - }); - Meteor.users.update({ _id: newUserId }, { - $set: { - emails: [], - roles: ['user'], - telegramChatId: sub.chatId, - lang: 'es' - } - }); - UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { owner: newUserId } }); - } - }); - } - }); - - Migrations.add({ - version: 3, - up: function emptySubsTypes() { - UserSubsToFiresCollection.find({ type: null }).forEach((sub) => { - UserSubsToFiresCollection.update({ _id: sub._id }, { $set: { type: 'telegram' } }); - }); - } - }); - - Migrations.add({ - version: 4, - up: function deleteOldAlertFiresAndIndexes() { - FireAlertsCollection.remove({ createdAd: null }); - const raw = FireAlertsCollection.rawCollection(); - raw.createIndex({ ourid: '2dsphere' }); - raw.createIndex({ when: 1 }); - raw.createIndex({ updatedAt: 1 }); - raw.createIndex({ createdAt: 1 }); - raw.createIndex({ ourid: 1, type: 1 }); - } - }); - - Migrations.add({ - version: 5, - up: function siteSettingsIndex() { - // other way: - SiteSettings._ensureIndex({ name: 1 }, { unique: 1 }); - } - }); - - Migrations.add({ - version: 6, - up: function falsePositiveIndexes() { - FalsePositives._ensureIndex({ chatId: 1 }); - FalsePositives._ensureIndex({ owner: 1 }); - FalsePositives._ensureIndex({ fireId: 1 }); - FalsePositives._ensureIndex({ type: 1 }); - FalsePositives._ensureIndex({ geo: '2dsphere' }); - } - }); - - Migrations.add({ - version: 7, - up: function defLangIfNull() { - Meteor.users.find({ lang: null }).forEach((user) => { - Meteor.users.update({ _id: user._id }, { - $set: { - lang: 'es' - } - }); - }); - } - }); - - Migrations.add({ - version: 8, - up: function siteSettingsAddIndex() { - SiteSettings._ensureIndex({ isPublic: 1 }); - SiteSettings.find({ isPublic: null }).forEach((setting) => { - SiteSettings.update({ _id: setting._id }, { $set: { isPublic: true } }); - }); - } - }); - - Migrations.add({ - version: 9, - up: function siteSettingsAddIndex() { - Industries._ensureIndex({ registry: 1 }); - Industries._ensureIndex({ geo: '2dsphere' }); - // https://www.eea.europa.eu/data-and-maps/data/member-states-reporting-art-7-under-the-european-pollutant-release-and-transfer-register-e-prtr-regulation-16 - IndustryRegistries.insert({ - _id: '1', name: 'E-PRTR', agency: 'EEA', region: 'EU' - }); - // https://www.epa.gov/enviro/epa-frs-facilities-state-single-file-csv-download - IndustryRegistries.insert({ - _id: '2', name: 'FRS', agency: 'EPA', region: 'US' - }); - } - }); - - Migrations.add({ - version: 10, - up: function siteSettingsAddIndex() { - IndustryRegistries.insert({ - _id: '3', name: 'NPRI', agency: 'GCODP', region: 'Canada' - }); - IndustryRegistries.insert({ - _id: '4', name: 'NPI', agency: 'DEE', region: 'Australia' - }); - } - }); - - Migrations.add({ - version: 11, - up: function noAnonComments() { - Comments.getCollection().remove({ isAnonymous: true }); - } - }); - - Migrations.add({ - version: 12, - up: function setTelegramUsersBotId() { - Meteor.users.update({ telegramChatId: { $ne: null }, telegramBot: null }, { - $set: { - telegramBot: 'es' - } - }, { multi: true }); - } - }); - - Migrations.add({ - version: 13, - up: function removeTelegramBotFromUsersId() { - Meteor.users.update({}, { - $unset: { - telegramBot: '' - } - }, { multi: true }); - } - }); - - Migrations.add({ - version: 14, - up: function setTelegramUsersBotId() { - UserSubsToFiresCollection.update({ chatId: { $ne: null }, telegramBot: null }, { - $set: { - telegramBot: 'es' - } - }, { multi: true }); - } - }); - - Migrations.add({ - version: 15, - up: function moveToFalsePositivesUppercase() { - /* const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' }); - * falsepositiveslower.find({}).forEach((falseDoc) => { - * FalsePositives.insert(falseDoc); - * });*/ - // TODO remove falsepositives lowercase collection - } - }); - - Migrations.add({ - version: 16, - up: function moveToFalsePositivesUppercaseWithUser() { - const falsepositiveslower = new Mongo.Collection('falsepositives', { idGeneration: 'MONGO' }); - const now = new Date(); - falsepositiveslower.find({}).forEach((falseDoc) => { - const user = Meteor.users.findOne({ telegramChatId: falseDoc.chatId }); - if (user) { - falseDoc.owner= user._id; - } - falseDoc.type = 'industry'; - falseDoc.createdAt = now; - falseDoc.updatedAt = now; - FalsePositives.insert(falseDoc); - }); - } - }); - - Migrations.add({ - version: 17, - up: function renameWebNotifiedField() { - Notifications.update({ webNotified: { $exists: true } }, { - $rename: { webNotifiedAt: 'notifiedAt' } - }, { upsert: false, multi: true }); - Notifications.update({ webNotified: { $exists: true } }, { - $rename: { webNotified: 'notified' } - }, { upsert: false, multi: true }); - } - }); - - Migrations.add({ - version: 18, - up: () => { - const raw = ActiveFiresUnion.rawCollection(); - raw.createIndex({ centerid: '2dsphere' }); - raw.createIndex({ shape: '2dsphere' }); - raw.createIndex({ when: 1 }); - raw.createIndex({ createdAt: 1 }); - raw.createIndex({ updatedAt: 1 }); - } - }); - - // Set createdAt in users & subs - Migrations.migrateTo('latest'); - - // Migrations.migrateTo('14,rerun'); -}); diff --git a/imports/startup/server/notificationsObserver.js b/imports/startup/server/notificationsObserver.js deleted file mode 100644 index 70be8e0..0000000 --- a/imports/startup/server/notificationsObserver.js +++ /dev/null @@ -1,19 +0,0 @@ -/* eslint-disable import/no-absolute-path */ - -import { Meteor } from 'meteor/meteor'; -import Notifications from '/imports/api/Notifications/Notifications'; -import processNotif from '/imports/modules/server/notificationsProcess.js'; -import { isMailServerMaster } from '/imports/startup/server/email'; - -Meteor.startup(() => { - if (isMailServerMaster) { - Notifications.find().observe({ - added: function notifAdded(notif) { - processNotif(notif); - }, - changed: function notifChanged(updatedNotif) { // , oldNotif) { - processNotif(updatedNotif); - } - }); - } -}); diff --git a/imports/startup/server/prerender.js b/imports/startup/server/prerender.js deleted file mode 100644 index dedee0b..0000000 --- a/imports/startup/server/prerender.js +++ /dev/null @@ -1,46 +0,0 @@ -/* 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/imports/startup/server/ravenLogger.js b/imports/startup/server/ravenLogger.js deleted file mode 100644 index b3b83a3..0000000 --- a/imports/startup/server/ravenLogger.js +++ /dev/null @@ -1,18 +0,0 @@ -import RavenLogger from 'meteor/flowkey:raven'; -import { Meteor } from 'meteor/meteor'; - -const ravenOptions = {}; -const publicDSN = Meteor.settings.public.sentryPublicDSN; -const privateDSN = Meteor.settings.sentryPrivateDSN; -const enabled = publicDSN && privateDSN; - -const ravenLogger = enabled ? new RavenLogger({ - publicDSN, - privateDSN, - shouldCatchConsoleError: true, // default true - trackUser: true // default false -}, ravenOptions) : { log: (error) => { console.log(error); } }; - -console.log(`ravenLogger ${enabled ? 'enabled' : 'disabled'}`); - -export default ravenLogger; diff --git a/imports/startup/server/rest.js b/imports/startup/server/rest.js deleted file mode 100644 index 64e8172..0000000 --- a/imports/startup/server/rest.js +++ /dev/null @@ -1 +0,0 @@ -import '../../api/Rest/Rest.js'; diff --git a/imports/startup/server/sitemaps.js b/imports/startup/server/sitemaps.js deleted file mode 100644 index 8026449..0000000 --- a/imports/startup/server/sitemaps.js +++ /dev/null @@ -1,44 +0,0 @@ -/* global sitemaps Comments */ -/* eslint-disable import/no-absolute-path */ - -import Fires from '/imports/api/Fires/Fires'; -// import Comments from '/imports/api/Comments/Comments'; - -const firesMapEnabled = false; - -sitemaps.add('/sitemap.xml', () => { - const today = new Date(); - - const out = []; - out.push({ page: '/fires', lastmod: today }); - out.push({ page: '/login', lastmod: today }); - out.push({ page: '/signup', lastmod: today }); - out.push({ page: '/recover-password', lastmod: today }); - out.push({ page: '/credits', lastmod: today }); - out.push({ page: '/terms', lastmod: today }); - out.push({ page: '/license', lastmod: today }); - out.push({ page: '/privacy', lastmod: today }); - out.push({ page: '/about', lastmod: today }); - - // When user has public page - /* const users = Meteor.users.find().fetch(); - _.each(users, function(user) { - out.push({ - page: '/persona/' + user.username, - lastmod: user.updatedAt - }); - }); */ - - if (firesMapEnabled) { - Fires.find({}, { limit: 100, sort: { createdAt: -1 } }).fetch().forEach((fire) => { - // Search the last comment of tha fire - const lastComment = Comments.getCollection().findOne({ referenceId: `fire-${fire._id}` }, { sort: { createdAt: -1 } }); - out.push({ - page: `/fire/archive/${fire._id._str}`, - lastmod: lastComment ? lastComment.createdAt : fire.updatedAt - }); - }); - } - - return out; -}); diff --git a/imports/startup/server/subsUnion.js b/imports/startup/server/subsUnion.js deleted file mode 100644 index 2643359..0000000 --- a/imports/startup/server/subsUnion.js +++ /dev/null @@ -1,123 +0,0 @@ -/* 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 './leaflet-workaround'; -import L from 'leaflet'; -import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; -import { isMailServerMaster } from '/imports/startup/server/email'; - -// sudo apt-get install libcairo2-dev libjpeg-dev libgif-dev - -Meteor.startup(() => { - if (!isMailServerMaster) { - console.log('We only process subsUnion in master'); - return; - } - const debug = true; // Meteor.isDevelopment; - 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 noNoisy = sub => sub; - - const process = (isPublic) => { - const subscribers = Subscriptions.find().fetch(); - const result = calcUnion(L, subscribers, isPublic ? addNoisy : noNoisy, true); - const union = result[0]; - const bounds = result[1]; - - const publicl = isPublic ? 'public' : 'private'; - const Publicl = publicl.replace(/\b\w/g, l => l.toUpperCase()); - - if (typeof union === 'object') { - const unionSet = { - $set: { - name: `subs-${publicl}-union`, - value: JSON.stringify(union), - isPublic, - description: `${Publicl} subscriptions union`, - type: 'string' - } - }; - const boundsSet = { - $set: { - name: `subs-${publicl}-union-bounds`, - value: JSON.stringify(bounds), - isPublic, - description: `${Publicl} subscriptions union bounds`, - type: 'string' - } - }; - const sizeSet = { - $set: { - name: 'subs-union-count', - value: subscribers.length, - isPublic: false, - description: 'Subscriptions count', - type: 'number' - } - }; - // 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-${publicl}-union` }, unionSet, { multi: false }); - SiteSettings.upsert({ name: `subs-${publicl}-union-bounds` }, boundsSet, { multi: false }); - SiteSettings.upsert({ name: 'subs-union-count' }, sizeSet, { multi: false }); - if (debug) console.log(`${Publicl} subscription union calculated`); - } else { - console.log('Subscription union failed!'); - } - }; - - // At startup, we check if it's necessary to calc subscriptions union again - const currentUnion = SiteSettings.findOne({ name: 'subs-public-union' }); - const lastSubs = Subscriptions.findOne({}, { sort: { updatedAt: -1 } }); - const countUnionSubs = SiteSettings.findOne({ name: 'subs-union-count' }); - const countSubs = Subscriptions.find({}).count(); - if (currentUnion && lastSubs) { - const lastUnionUpdated = currentUnion.updatedAt; - const lastSubsUpdated = lastSubs.updatedAt; - if (lastUnionUpdated > lastSubsUpdated || !countUnionSubs || countSubs !== countUnionSubs.value) { - console.log('Subs union outdated'); - process(true); - process(false); - } else { - console.log('Subs union up-to-date'); - } - } - - Subscriptions.find({ createdAt: { $gt: new Date() } }).observe({ - added: function newSubAdded() { // doc) { - if (debug) console.log('Subs added so recreate union'); - process(true); - process(false); - } - }); - - Subscriptions.find().observe({ - changed: function subsChanged() { // updatedDoc, oldDoc) { - if (debug) console.log('Subs changed so recreate union'); - process(true); - process(false); - }, - removed: function subsRemoved() { // oldDoc) { - if (debug) console.log('Subs removed so recreate union'); - process(true); - process(false); - } - }); -}); diff --git a/imports/ui/components/Authenticated/Authenticated.js b/imports/ui/components/Authenticated/Authenticated.js index f34da2f..7207ad0 100644 --- a/imports/ui/components/Authenticated/Authenticated.js +++ b/imports/ui/components/Authenticated/Authenticated.js @@ -2,14 +2,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Route, Redirect } from 'react-router-dom'; -const Authenticated = ({ loggingIn, authenticated, component, path, exact, ...rest }) => ( +const Authenticated = ({ loggingIn, authenticated, component, ...rest }) => (-
- {/* */}
-
+
+
+
);
AuthenticatedNavigation.propTypes = {
- name: PropTypes.string.isRequired
+ name: PropTypes.string.isRequired,
};
-export default translate([], { wait: true })(withRouter(AuthenticatedNavigation));
+export default AuthenticatedNavigation;
diff --git a/imports/ui/components/BetaRibbon/BetaRibbon.js b/imports/ui/components/BetaRibbon/BetaRibbon.js
deleted file mode 100644
index 584f38d..0000000
--- a/imports/ui/components/BetaRibbon/BetaRibbon.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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 { translate } from 'react-i18next';
-
-import './BetaRibbon.scss';
-
-class BetaRibbon extends Component {
- constructor(props) {
- super(props);
- this.t = props.t;
- this.state = {
- };
- }
-
- render() {
- return (
- BETA
- );
- }
-}
-
-BetaRibbon.propTypes = {
- t: PropTypes.func.isRequired
-};
-
-BetaRibbon.defaultProps = {
-};
-
-export default translate([], { wait: true })(BetaRibbon);
diff --git a/imports/ui/components/BetaRibbon/BetaRibbon.scss b/imports/ui/components/BetaRibbon/BetaRibbon.scss
deleted file mode 100644
index cd150c2..0000000
--- a/imports/ui/components/BetaRibbon/BetaRibbon.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-.ribbon {
- position: absolute;
- left: -5px; top: -5px;
- z-index: 2000;
- overflow: hidden;
- width: 75px; height: 75px;
- text-align: right;
-}
-.ribbon span {
- font-size: 10px;
- font-weight: bold;
- color: #FFF;
- text-transform: uppercase;
- text-align: center;
- line-height: 20px;
- transform: rotate(-45deg);
- -webkit-transform: rotate(-45deg);
- width: 100px;
- display: block;
- background: #79A70A;
- background: linear-gradient(#9BC90D 0%, #9BC90D 100%);
- box-shadow: 0 3px 10px -5px rgba(0, 0, 0, 1);
- position: absolute;
- top: 19px; left: -21px;
-}
-.ribbon span::before {
- content: "";
- position: absolute; left: 0px; top: 100%;
- z-index: -1;
- border-left: 3px solid #9BC90D;
- border-right: 3px solid transparent;
- border-bottom: 3px solid transparent;
- border-top: 3px solid #9BC90D;
-}
-.ribbon span::after {
- content: "";
- position: absolute; right: 0px; top: 100%;
- z-index: -1;
- border-left: 3px solid transparent;
- border-right: 3px solid #9BC90D;
- border-bottom: 3px solid transparent;
- border-top: 3px solid #9BC90D;
-}
\ No newline at end of file
diff --git a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js b/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js
deleted file mode 100644
index 6fde995..0000000
--- a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* global Geolocation */
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Tracker } from 'meteor/tracker';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Button } from 'react-bootstrap';
-import { translate } from 'react-i18next';
-import { Bert } from 'meteor/themeteorchef:bert';
-
-import './CenterInMyPosition.scss';
-
-class CenterInMyPosition extends React.Component {
- onClick() {
- // this.props.onClick(event);
- // https://atmospherejs.com/mdg/geolocation
- // only with SSL:
- // https://developer.mozilla.org/en-US/docs/Web/API/Geolocation/getCurrentPosition
-
- // https://stackoverflow.com/questions/31608579/somethings-wrong-with-my-meteor-geolocation-functions
- const userGeoLocation = new ReactiveVar(null);
- const self = this;
- Tracker.autorun((computation) => {
- userGeoLocation.set(Geolocation.latLng());
- if (userGeoLocation.get()) {
- // stop the tracker if we got something
- const viewport = {
- center: [userGeoLocation.get().lat, userGeoLocation.get().lng],
- zoom: 11
- };
- self.props.onClick(viewport);
- computation.stop();
- }
- // https://developer.mozilla.org/en-US/docs/Web/API/PositionError)
- const error = Geolocation.error();
- if (error) {
- const cod = error.code;
- // window.alert(cod);
- if (cod === 1) Bert.alert(self.props.t('geo-not-perms-error'), 'danger');
- else if (cod === 2) Bert.alert(self.props.t('geo-not-avail-error'), 'danger');
- else if (cod === 3) Bert.alert(self.props.t('geo-not-timeout-error'), 'danger');
- else Bert.alert(error.message, 'danger');
- computation.stop();
- }
- });
- }
-
- render() {
- const { onlyIcon, t } = this.props;
- const msg = t('Centrar en tu ubicación');
- return (
- );
- }
-}
-
-CenterInMyPosition.defaultProps = {
- onlyIcon: false
-};
-
-CenterInMyPosition.propTypes = {
- t: PropTypes.func.isRequired,
- onlyIcon: PropTypes.bool
-};
-
-export default translate([], { wait: true })(CenterInMyPosition);
diff --git a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.scss b/imports/ui/components/CenterInMyPosition/CenterInMyPosition.scss
deleted file mode 100644
index f579e99..0000000
--- a/imports/ui/components/CenterInMyPosition/CenterInMyPosition.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-i.location {
- background: url(/my_location.svg) no-repeat top left;
- background-size: contain;
- cursor: pointer;
- display: inline-block;
- height: 30px;
- width: 35px;
- vertical-align: middle;
-}
diff --git a/imports/ui/components/Chronos/Chronos.js b/imports/ui/components/Chronos/Chronos.js
deleted file mode 100644
index 6a96c31..0000000
--- a/imports/ui/components/Chronos/Chronos.js
+++ /dev/null
@@ -1,122 +0,0 @@
-// Adapted from: https://github.com/remcoder/chronos (MIT License)
-
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-import { ReactiveVar } from 'meteor/reactive-var';
-import moment from 'moment';
-
-const _timers = {};
-
-function Timer(interval) {
- this.interval = interval || 1000;
- this.time = new ReactiveVar(0);
-}
-
-Timer.prototype.start = function () {
- if (this._timer) throw new Error('Trying to start Chronos.Timer but it is already running.');
- this.time.set(new Date());
-
-
- this._timer = setInterval(Meteor.bindEnvironment(() => {
- // console.log('tick', this._timer);
- this.time.set(new Date());
- }), this.interval);
-};
-
-Timer.prototype.stop = function () {
- // console.log('stopping timer');
- clearInterval(this._timer);
- this._timer = null;
-};
-
-function _update(interval) {
- // get current reactive context
- const comp = Tracker.currentComputation;
- if (!comp) { return; } // no nothing when used outside a reactive context
-
- // only create one timer per reactive context to prevent stacking of timers
- const cid = comp && comp._id;
- if (!_timers[cid]) {
- const timer = new Timer(interval);
- _timers[cid] = timer;
-
- // add destroy method that stops the timer and removes itself from the list
- timer.destroy = function () {
- timer.stop();
- delete _timers[cid];
- };
-
- timer.start();
- }
-
- // make sure to stop and delete the attached timer when the computation is stopped
- comp.onInvalidate(() => {
- // console.log('onInvalidated',comp);
- if (comp.stopped && _timers[cid]) {
- // console.log('computation stopped');
- _timers[cid].destroy();
- }
- });
-
- _timers[cid].time.dep.depend(comp); // make dependent on time
-
- // console.log(_timers);
- return _timers[cid];
-}
-
-// reactive version of moment()
-// please install moment separately
-// example usage: Chronos.moment(someTimestamp).format('ss');
-function _moment(/* arguments */) {
- if (!moment) throw new Error('moment not found. Please install it first');
-
- _update();
- return moment(...arguments);
-}
-
-// reactive version of new Date() get the current date/time
-function _date(interval) {
- _update(interval);
- return new Date();
-}
-
-// reactive version of Date.now(). get the current # of milliseconds since the start of the epoch
-function _now(interval) {
- _update(interval);
- return Date.now();
-}
-
-// export global
-const Chronos = {
-
- // a simple reactive timer
- // usage: var timer = new Timer();
- // get current time: timer.time.get();
- Timer,
-
- // handy util func for making reactive contexts live updating in time
- // usage: simply call Chronos.update() in your helper to make it execute
- // every interval
- update: _update,
-
- // reactive version of new Date() get the current date/time
- date: _date,
-
- // reactive version of Date.now(). get the current # of milliseconds since the start of the epoch
- now: _now,
-
- // reactive version of moment()
- // please install moment separately
- // example usage: Chronos.moment(someTimestamp).format('ss');
- moment: _moment,
-
- // for debugging and testing
- _timers,
-
- // deprecated. but kept for backwards compatibility
- liveUpdate: _update,
- currentTime: _date,
- liveMoment: _moment
-};
-
-export default Chronos;
diff --git a/imports/ui/components/Col/Col.js b/imports/ui/components/Col/Col.js
deleted file mode 100644
index 2a20586..0000000
--- a/imports/ui/components/Col/Col.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import classNames from 'classnames';
-import React from 'react';
-import PropTypes from 'prop-types';
-import elementType from 'prop-types-extra/lib/elementType';
-
-import { bsClass, prefix, splitBsProps } from 'react-bootstrap/lib/utils/bootstrapUtils';
-import { DEVICE_SIZES } from 'react-bootstrap/lib/utils/StyleConfig';
-
-const column = PropTypes.oneOfType([
- PropTypes.oneOf(['auto']),
- PropTypes.number,
-]);
-
-const propTypes = {
- componentClass: elementType,
-
- /**
- * The number of columns you wish to span
- *
- * for Extra small devices Phones (<576px)
- *
- * class-prefix `col-`
- */
- xs: column,
-
- /**
- * The number of columns you wish to span
- *
- * for Small devices Tablets (≥576px)
- *
- * class-prefix `col-sm-`
- */
- sm: column,
-
- /**
- * The number of columns you wish to span
- *
- * for Medium devices Desktops (≥768px)
- *
- * class-prefix `col-md-`
- */
- md: column,
-
- /**
- * The number of columns you wish to span
- *
- * for Large devices Desktops (≥992px)
- *
- * class-prefix `col-lg-`
- */
- lg: column,
-
- /**
- * The number of columns you wish to span
- *
- * for Large devices Desktops (≥1200px)
- *
- * class-prefix `col-xl-`
- */
- xl: column,
-};
-
-const defaultProps = {
- componentClass: 'div',
-};
-
-class Col extends React.Component {
- render() {
- const { componentClass: Component, className, ...props } = this.props;
- const [bsProps, elementProps] = splitBsProps(props);
-
- const classes = [];
-
- DEVICE_SIZES.forEach((size) => {
- const propValue = elementProps[size];
-
- if (propValue == null) return;
-
- if (size === 'xs') {
- // col and col-4
- classes.push(propValue === true ?
- bsProps.bsClass :
- prefix(bsProps, `${propValue}`),
- );
- } else {
- // col-md-3
- classes.push(
- prefix(bsProps, `${size}-${propValue}`),
- );
- }
-
- delete elementProps[size];
- });
-
- if (!classes.length) {
- classes.push(bsProps.bsClass); // plain 'col'
- }
-
- return (
-
-
- );
- }
-}
-
-DistanceSlider.defaultProps = {
- onChange: null
-};
-
-DistanceSlider.propTypes = {
- onChange: PropTypes.func
-};
-
-export default translate([], { wait: true })(DistanceSlider);
diff --git a/imports/ui/components/DistanceSlider/DistanceSlider.scss b/imports/ui/components/DistanceSlider/DistanceSlider.scss
deleted file mode 100644
index 629b81f..0000000
--- a/imports/ui/components/DistanceSlider/DistanceSlider.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@import '../../stylesheets/mixins';
-
-.dist-slider {
- width: 400px;
- margin: 30px;
-}
-
-@include breakpoint(mobile) {
- .dist-slider {
- width: 100%;
- margin: 10px;
- }
-
- .rc-slider {
- margin: 0 0 0 -10px;
- }
-}
\ No newline at end of file
diff --git a/imports/ui/components/ErrorBoundary/ErrorBoundary.js b/imports/ui/components/ErrorBoundary/ErrorBoundary.js
deleted file mode 100644
index f57fe79..0000000
--- a/imports/ui/components/ErrorBoundary/ErrorBoundary.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 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 { Row, Col } from 'react-bootstrap';
-import ravenLogger from '/imports/startup/client/ravenLogger';
-import './ErrorBoundary.scss';
-
-// https://reactjs.org/blog/2017/07/26/error-handling-in-react-16.html
-class ErrorBoundary extends Component {
- constructor(props) {
- super(props);
- this.state = { hasError: false };
- }
-
- componentDidCatch(error, info) {
- // Display fallback UI
- this.setState({ hasError: true });
- // You can also log the error to an error reporting service
- // console.log(`typeof error ${typeof error}`);
- // console.log(`typeof info ${typeof info}`);
- ravenLogger.log(error, info);
- // ravenLogger.log(info);
- }
-
- render() {
- const {
- appName, title, subTitle, children
- } = this.props;
- if (this.state.hasError) {
- // You can render any custom fallback UI
- return (
-
-
-
-
- );
- }
- return children;
- }
-}
-
-ErrorBoundary.propTypes = {
- appName: PropTypes.string,
- title: PropTypes.string,
- subTitle: PropTypes.string,
- children: PropTypes.oneOfType([
- PropTypes.arrayOf(PropTypes.node),
- PropTypes.node
- ]).isRequired
-};
-
-ErrorBoundary.defaultProps = {
- appName: 'All Against the Fire!',
- title: 'Upppps: Something has gone wrong',
- subTitle: 'We are investigating the problem, try again in a while'
-};
-
-export default ErrorBoundary;
diff --git a/imports/ui/components/ErrorBoundary/ErrorBoundary.scss b/imports/ui/components/ErrorBoundary/ErrorBoundary.scss
deleted file mode 100644
index 225e4ca..0000000
--- a/imports/ui/components/ErrorBoundary/ErrorBoundary.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.error-boundary {
- background-image: url('/error-background.png');
- height: 100%;
- min-height: 55vh;
- margin: 40px 10px 10px 10px;
-}
-
-.error-boundary > div > div > h4 {
- line-height: 1.3em;
-}
diff --git a/imports/ui/components/Feedback/Feedback.js b/imports/ui/components/Feedback/Feedback.js
deleted file mode 100644
index bbcab29..0000000
--- a/imports/ui/components/Feedback/Feedback.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/* 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 { withTracker } from 'meteor/react-meteor-data';
-import { isHome } from '/imports/ui/components/Utils/location';
-import { testId } from '/imports/ui/components/Utils/TestUtils';
-import validate from '/imports/modules/validate';
-
-import './Feedback.scss';
-
-class Feedback extends Component {
- constructor(props) {
- super(props);
- this.handleSubmit = this.handleSubmit.bind(this);
- this.onTabClick = this.onTabClick.bind(this);
- }
-
- componentDidMount() {
- const component = this;
- const { t } = this.props;
-
- validate(component.form, {
- rules: {
- email: {
- required: true,
- email: true
- },
- feedbackText: {
- required: true
- }
- },
- messages: {
- feedbackText: {
- required: t('Por favor, escribe aquí tu feedback...')
- },
- email: {
- required: t('Tu correo'),
- email: 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() {
- // console.log(`Render Feedback because isHome ${this.props.isHome}, email: '${this.props.emailAddress}'`);
- const disabled = this.props.emailVerified && this.props.emailAddress;
- const { t } = this.props;
- return (
- {appName}
-{title}
-{subTitle}
- -
- { !this.props.isHome &&
-
-
(this.formdiv = formdiv)} style={{ display: 'none' }} className="card">
-