From e46ae3a000b5b9a98045bd5f3e9506104289dc7d Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Mon, 12 Feb 2018 09:49:13 +0100
Subject: [PATCH] Added zones nav link

---
 imports/ui/components/Navigation/Navigation.js     | 6 +++++-
 imports/ui/layouts/App/App.js                      | 2 ++
 imports/ui/pages/Subscriptions/SubscriptionsMap.js | 8 ++++++++
 public/locales/es/common.json                      | 4 +++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/imports/ui/components/Navigation/Navigation.js b/imports/ui/components/Navigation/Navigation.js
index 4207ee1..f252702 100644
--- a/imports/ui/components/Navigation/Navigation.js
+++ b/imports/ui/components/Navigation/Navigation.js
@@ -15,8 +15,9 @@ import NavItem from '../NavItem/NavItem';
 import './Navigation.scss';
 
 // removed class: fixed-top
+// md instead of lg: no menu in medium
 const Navigation = props => (
-  <nav className="navbar navbar-expand-md navbar-dark bg-dark">
+  <nav className="navbar navbar-expand-lg navbar-dark bg-dark">
     <div style={{ overflow: 'hidden' } /* for ribbon */} className="container">
       <BetaRibbon />
       {/* <Navbar bsClass="navbar navbar-dark bg-dark"> */}
@@ -49,6 +50,9 @@ const Navigation = props => (
           <LinkContainer id={testId('activeFires')} className="nav-item" anchorClassName="nav-link" to="/fires">
             <NavItem eventKey={2} href="/fires">{props.t('activeFires')}</NavItem>
           </LinkContainer>
+          <LinkContainer id={testId('moniZones')} className="nav-item" anchorClassName="nav-link" to="/zones">
+            <NavItem eventKey={2.1} href="/zones">{props.t('Zonas vigiladas')}</NavItem>
+          </LinkContainer>
         </ul>
         {!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
         {/* </Navbar.Collapse> */}
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index 4e3ff27..3cb8759 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -44,6 +44,7 @@ import Terms from '../../pages/Terms/Terms';
 import Privacy from '../../pages/Privacy/Privacy';
 import License from '../../pages/License/License';
 import Credits from '../../pages/Credits/Credits';
+import ZonesMap from '../../pages/ZonesMap/ZonesMap';
 import ReSendEmail from '../../components/ReSendEmail/ReSendEmail';
 import ErrorBoundary from '../../components/ErrorBoundary/ErrorBoundary';
 import history from '../../components/History/History';
@@ -83,6 +84,7 @@ const App = props => (
                 <Authenticated exact path="/profile" component={Profile} {...props} />
                 <Authenticated exact path="/status" component={Status} {...props} />
                 <Route path="/fires" component={FiresMap} {...props} />
+                <Route path="/zones" component={ZonesMap} {...props} />
                 <Route path="/fire/:type(active|archive)/:id" component={Fires} {...props} />
                 <Route path="/fire/:id" component={Fires} {...props} />
                 <Public path="/auth/:token" component={Auth} {...props} />
diff --git a/imports/ui/pages/Subscriptions/SubscriptionsMap.js b/imports/ui/pages/Subscriptions/SubscriptionsMap.js
index ba7b434..0afd38d 100644
--- a/imports/ui/pages/Subscriptions/SubscriptionsMap.js
+++ b/imports/ui/pages/Subscriptions/SubscriptionsMap.js
@@ -9,6 +9,7 @@ import { Meteor } from 'meteor/meteor';
 import { withTracker } from 'meteor/react-meteor-data';
 import { Trans, translate } from 'react-i18next';
 import { Map } from 'react-leaflet';
+import { Helmet } from 'react-helmet';
 import 'leaflet/dist/leaflet.css';
 import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.css';
 import 'leaflet-graphicscale/dist/Leaflet.GraphicScale.min.js';
@@ -20,6 +21,7 @@ import DefMapLayers from '/imports/ui/components/Maps/DefMapLayers';
 import Loading from '/imports/ui/components/Loading/Loading';
 import UserSubsToFiresCollection from '/imports/api/Subscriptions/Subscriptions';
 import { isChrome } from '/imports/ui/components/Utils/isMobile';
+import { isHome } from '/imports/ui/components/Utils/location';
 
 import './SubscriptionsMap.scss';
 
@@ -82,9 +84,15 @@ class SubscriptionsMap extends React.Component {
   }
 
   render() {
+    const { t } = this.props;
     console.log(`Rendering Subs users ready ${this.props.subsready} subs: ${this.props.userSubs.length} viewport: ${JSON.stringify(this.state.viewport)}`);
     return (
       <Fragment>
+        { !isHome() &&
+          <Helmet>
+            <title>{t('AppName')}: {t('Zonas vigiladas')}</title>
+            <meta name="description" content={t('Zonas vigiladas por nuestros usuari@s actualmente')} />
+          </Helmet> }
         {!this.props.subsready ?
          <Row className="align-items-center justify-content-center">
            <Loading />
diff --git a/public/locales/es/common.json b/public/locales/es/common.json
index db61fc1..0231e6e 100644
--- a/public/locales/es/common.json
+++ b/public/locales/es/common.json
@@ -267,5 +267,7 @@
   "nuestros usuarios/as": "nuestros usuarios/as",
   "Pulsa para más información": "Pulsa para más información",
   "Detectado":
-  "Detectado"
+  "Detectado",
+  "Zonas vigiladas por nuestros usuari@s actualmente":
+  "Zonas vigiladas por nuestros usuari@s actualmente"
 }