vjrj
12bdbe8fed
Modernizes the whole i18n stack:
- 48 translate([], {wait:true}) / translate() HOCs -> withTranslation()
- react.wait:true -> react.useSuspense:false
- whitelist -> supportedLngs; added compatibilityJSON: 'v3' so our
natural-language keys + v3 _plural layout keep working (custom
separators ss/eth/dj preserved)
- backends: xhr -> i18next-http-backend (client), sync-fs ->
i18next-fs-backend (server); dropped i18next-localstorage-cache
(was enabled:false); languagedetector 2 -> 8
- ReSendEmail: <Interpolate> (removed in v10) -> <Trans values={{email}}/>,
dropped the removed bare t export
- saveMissing handler signature (lngs, ns, key, fallbackValue)
Silences the per-component Translate/I18n legacy-context warnings.
Browser-verified es/en switch and <Trans> interpolation on /fires;
REST smoke byte-identical.
74 lines
3.3 KiB
JavaScript
74 lines
3.3 KiB
JavaScript
/* eslint-disable import/no-absolute-path */
|
|
|
|
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Navbar } from 'react-bootstrap';
|
|
import { Link } from 'react-router-dom';
|
|
import { LinkContainer } from 'react-router-bootstrap';
|
|
import { Trans, withTranslation } from 'react-i18next';
|
|
import { testId } from '/imports/ui/components/Utils/TestUtils';
|
|
/* import BetaRibbon from '../../components/BetaRibbon/BetaRibbon'; */
|
|
import PublicNavigation from '../PublicNavigation/PublicNavigation';
|
|
import AuthenticatedNavigation from '../AuthenticatedNavigation/AuthenticatedNavigation';
|
|
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-lg navbar-dark bg-dark">
|
|
<div style={{ overflow: 'hidden' } /* for ribbon */} className="container">
|
|
{/* <BetaRibbon /> */}
|
|
{/* <Navbar bsClass="navbar navbar-dark bg-dark"> */}
|
|
{/* https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Navbar.js */}
|
|
<Navbar.Header>
|
|
<Navbar.Brand>
|
|
<Link to="/" className={window.location.pathname === '/' ? 'hide-brand' : ''} >
|
|
{props.t('AppNameFull')}
|
|
</Link>
|
|
</Navbar.Brand>
|
|
{/* <Navbar.Toggle/> */}
|
|
<button className="sr-only navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
|
<span className="navbar-toggler-icon" />
|
|
</button>
|
|
</Navbar.Header>
|
|
<button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
|
<span className="navbar-toggler-icon" />
|
|
</button>
|
|
{/* <Navbar.Collapse> */}
|
|
<div className="collapse navbar-collapse" id="navbarNavDropdown">
|
|
<ul className="navbar-nav ml-auto ">
|
|
{/* <LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox">
|
|
<NavItem eventKey={1.1} href="/sandbox">Sandbox</NavItem>
|
|
</LinkContainer> */}
|
|
<LinkContainer id={testId('subscriptions')} className="nav-item" anchorClassName="nav-link" to="/subscriptions">
|
|
<NavItem eventKey={1.2} href="/subscriptions">
|
|
{props.authenticated ? <Trans>Mis zonas</Trans> : <Trans>Participar</Trans>}
|
|
</NavItem>
|
|
</LinkContainer>
|
|
<LinkContainer id={testId('moniZones')} className="nav-item" anchorClassName="nav-link" to="/zones">
|
|
<NavItem eventKey={2} href="/zones">{props.t('Zonas vigiladas')}</NavItem>
|
|
</LinkContainer>
|
|
<LinkContainer id={testId('activeFires')} className="nav-item" anchorClassName="nav-link" to="/fires">
|
|
<NavItem eventKey={2.1} href="/fires">{props.t('activeFires')}</NavItem>
|
|
</LinkContainer>
|
|
|
|
</ul>
|
|
{!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
|
|
{/* </Navbar.Collapse> */}
|
|
</div>
|
|
</div>
|
|
</nav>
|
|
);
|
|
|
|
Navigation.defaultProps = {
|
|
name: ''
|
|
};
|
|
|
|
Navigation.propTypes = {
|
|
t: PropTypes.func.isRequired,
|
|
authenticated: PropTypes.bool.isRequired
|
|
};
|
|
|
|
export default withTranslation()(Navigation);
|