From 8a6584acb900f90dc425042c00c4de1b26ec1b92 Mon Sep 17 00:00:00 2001 From: vjrj Date: Mon, 12 Feb 2018 14:57:13 +0100 Subject: [PATCH] Fix for participe btn --- imports/ui/pages/Index/Index.js | 2 +- imports/ui/pages/Subscriptions/SubscriptionsMap.js | 3 +++ imports/ui/pages/ZonesMap/ZonesMap.js | 11 ++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js index f69ec43..4cfa2f4 100644 --- a/imports/ui/pages/Index/Index.js +++ b/imports/ui/pages/Index/Index.js @@ -182,7 +182,7 @@ class Index extends Component {
- +
diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js index 72842a3..ce675fd 100644 --- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js +++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js @@ -81,6 +81,8 @@ class SubscriptionsMap extends React.Component { const element = document.querySelector('#participe'); if (element) { element.scrollIntoView(); + } else { + this.props.history.push('/subscriptions'); } } @@ -153,6 +155,7 @@ class SubscriptionsMap extends React.Component { SubscriptionsMap.propTypes = { subsready: PropTypes.bool.isRequired, userSubs: PropTypes.arrayOf(PropTypes.object).isRequired, + history: PropTypes.object.isRequired, t: PropTypes.func.isRequired }; diff --git a/imports/ui/pages/ZonesMap/ZonesMap.js b/imports/ui/pages/ZonesMap/ZonesMap.js index c5a0c8f..1ad2cad 100644 --- a/imports/ui/pages/ZonesMap/ZonesMap.js +++ b/imports/ui/pages/ZonesMap/ZonesMap.js @@ -1,25 +1,26 @@ /* eslint-disable import/no-absolute-path */ import React, { Fragment } from 'react'; -// import PropTypes from 'prop-types'; +import PropTypes from 'prop-types'; import { translate } from 'react-i18next'; import SubscriptionsMap from '/imports/ui/pages/Subscriptions/SubscriptionsMap'; class ZonesMap extends React.Component { - componentDidMount() { - // this.setState({init: true}); + constructor(props) { + super(props); + this.t = props.t; } render() { return ( - + ); } } ZonesMap.propTypes = { - // history: PropTypes.object.isRequired + history: PropTypes.object.isRequired }; export default translate([], { wait: true })(ZonesMap);