vjrj
a1a1b9a801
Removes the largest batch of React-19-blocking warnings: the 0.31 components (Grid, FormGroup, ControlLabel, Navbar.Header/Brand, Checkbox, SafeAnchor) all leaned on legacy context / defaultProps. 29 files converted: Grid->Container, FormGroup/ControlLabel/FormControl/ HelpBlock -> Form.Group/Label/Control/Text, Checkbox -> Form.Check (label as prop), bsStyle->variant (default->secondary), bsSize->size, pull-right->float-end. Custom Col.js now re-exports v2's Col; custom NavItem.js rewritten self-contained (no SafeAnchor/createChainedFunction); Navigation.js drops react-bootstrap Navbar (raw markup anyway). CSS stays on Bootstrap 4 (alexwine:bootstrap-4) for now: the BS4->5 jump is entangled with the jQuery carousel/swipe + navbar-collapse and is tracked as separate debt in UPGRADE.md. Only .form-label needed a shim (forms.scss). Browser-verified home carousel+navbar, signup form + terms checkbox, login form; REST smoke byte-identical.
66 lines
3 KiB
JavaScript
66 lines
3 KiB
JavaScript
/* eslint-disable import/no-absolute-path */
|
|
|
|
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
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 /> */}
|
|
<Link to="/" className={`navbar-brand ${window.location.pathname === '/' ? 'hide-brand' : ''}`} >
|
|
{props.t('AppNameFull')}
|
|
</Link>
|
|
<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>
|
|
<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);
|