Many improvements: navbar, favico, new icons

This commit is contained in:
vjrj 2017-12-07 17:29:17 +01:00
parent 3dc8edb4a8
commit f1786541cd
20 changed files with 161 additions and 83 deletions

View file

@ -16,17 +16,19 @@ import NavItem from '../NavItem/NavItem';
import { Meteor } from 'meteor/meteor';
const AuthenticatedNavigation = ({ name, history, props }) => (
<Nav pullRight>
<ul className="navbar-nav ml-auto ">
{/* <Nav pullRight> */}
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/documents">
<NavItem eventKey={1} href="/documents">Documents</NavItem>
<NavItem eventKey={3} href="/documents">Documents</NavItem>
</LinkContainer>
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/profile">
<NavItem eventKey={2.1} href="/profile">{name}</NavItem>
<NavItem eventKey={3.1} href="/profile">{name}</NavItem>
</LinkContainer>
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/logout">
<NavItem eventKey={2.2} onClick={() => history.push('/logout')} href="/logout"><Trans i18nKey="Cerrar sesión">Cerrar sesión</Trans></NavItem>
<NavItem eventKey={3.2} onClick={() => history.push('/logout')} href="/logout"><Trans i18nKey="Cerrar sesión">Cerrar sesión</Trans></NavItem>
</LinkContainer>
</Nav>
{/* </Nav> */}
</ul>
);
AuthenticatedNavigation.propTypes = {

View file

@ -9,7 +9,6 @@ class CenterInMyPosition extends React.Component {
}
onClick = (event) => {
console.log("Click?");
// this.props.onClick(event);
// https://atmospherejs.com/mdg/geolocation
// only with SSL:
@ -27,6 +26,7 @@ class CenterInMyPosition extends React.Component {
zoom: 11
}
self.props.onClick(viewport);
// console.log(viewport);
// self.onViewportChanged(viewport);
computation.stop();
}
@ -36,7 +36,7 @@ class CenterInMyPosition extends React.Component {
render() {
return (
<Button bsStyle="default" onClick={(event) => this.onClick(event)}>
<i className="location"/>{this.props.t("Centrar el mapa en tu ubicación")}
<i className="icons icon-target"/>{this.props.t("Centrar el mapa en tu ubicación")}
</Button>
)
}

View file

@ -9,23 +9,29 @@ import { translate } from 'react-i18next';
import './Navigation.scss';
const Navigation = props => (
<Navbar bsClass="navbar navbar-dark bg-dark">
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<div className="container">
{/* <Navbar bsClass="navbar navbar-dark bg-dark"> */}
{/* https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Navbar.js */}
<Navbar.Header>
{window.location.pathname != '/'?
<Navbar.Brand>
<Link to="/">{props.t('AppNameFull')}</Link>
</Navbar.Brand>: ''
}
<Link to="/">{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"></span>
</button>
</Navbar.Header>
<Navbar.Collapse>
<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"></span>
</button>
{/* <Navbar.Collapse> */}
<div className="collapse navbar-collapse" id="navbarNavDropdown">
{!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation {...props} />}
</Navbar.Collapse>
</Navbar>
{/* </Navbar.Collapse> */}
</div>
</div>
</nav>
);
Navigation.defaultProps = {

View file

@ -26,3 +26,15 @@ a.nav-link:hover {
.navbar {
padding: 0.3rem 0rem;
}
a.navbar-brand {
font-size: 26px;
}
@media (max-width: 480px) {
a.navbar-brand {
font-size: 16px;
padding: 15px 3px;
}
}

View file

@ -12,7 +12,11 @@ import { translate } from 'react-i18next';
import NavItem from '../NavItem/NavItem';
const PublicNavigation = (props) => (
<Nav pullRight>
<ul className="navbar-nav ml-auto ">
{/* <Nav pullRight> */}
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox">
<NavItem href="/sandbox">Sandbox</NavItem>
</LinkContainer>
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/fires">
<NavItem href="/fires">{props.t('activeFires')}</NavItem>
</LinkContainer>
@ -22,7 +26,8 @@ const PublicNavigation = (props) => (
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/login">
<NavItem eventKey={2} href="/login">{props.t('Iniciar sesión')}</NavItem>
</LinkContainer>
</Nav>
{/* </Nav> */}
</ul>
);
export default translate([], { wait: true })(PublicNavigation);