diff --git a/src/App.js b/src/App.js index 938fd2830522c664031a8b1d5d4ebb52573a8cfb..3ea2fef6365f6e4e8628810c9ecea311eb717268 100644 --- a/src/App.js +++ b/src/App.js @@ -13,8 +13,8 @@ import Head from './Head'; function Panel(props) { return ( <div> - <Head onLogout={props.onLogout} /> <BrowserRouter> + <Head onLogout={props.onLogout} /> <Switch> <Route path="/members"> <MemberList /> diff --git a/src/Head.js b/src/Head.js index 76ff63ef955497aa4d4409b356f93fde1c47baeb..5241de98a056d85f34a60233a74e6c7d61b3ff21 100644 --- a/src/Head.js +++ b/src/Head.js @@ -1,10 +1,12 @@ import React, { useContext } from 'react'; -import mano from './mano.svg'; import { Navbar, Nav, NavDropdown, Button, Form } from 'react-bootstrap'; +import { useLocation } from 'react-router-dom'; +import mano from './mano.svg'; import AuthContext from './AuthContext'; function Head(props) { const auth = useContext(AuthContext); + let location = useLocation(); let adminNav; if (auth.role === "admin") { @@ -22,7 +24,7 @@ function Head(props) { </Navbar.Brand> <Navbar.Toggle aria-controls="basic-navbar-nav" /> <Navbar.Collapse id="basic-navbar-nav"> - <Nav className="mr-auto"> + <Nav className="mr-auto" activeKey={location.pathname}> <Nav.Link href="/products">Productos</Nav.Link> <Nav.Link href="/purchase">Comprar</Nav.Link> </Nav>