Skip to content
Snippets Groups Projects
Commit eff56235 authored by Klaas Kliffen's avatar Klaas Kliffen :satellite:
Browse files

Fix issue with loading login data

parent 0454f8a3
No related branches found
No related tags found
1 merge request!109Clean up GUI part I
import React, { useContext } from "react";
import { useHistory } from "react-router-dom";
import { Navbar, Nav } from "react-bootstrap";
import { NavLink } from "react-router-dom";
import AuthControl from "./auth/authControl";
import MyBasketButton from "./basket/MyBasketButton"
import SaveBasketButton from "./basket/SaveBasketButton"
import ShowTokenButton from "./ShowTokenButton"
import { QueryContext } from "../contexts/QueryContext";
import { GlobalContext } from "../contexts/GlobalContext";
import React, { useContext, useEffect } from "react";
import { Nav, Navbar } from "react-bootstrap";
import { NavLink, useHistory } from "react-router-dom";
import esap_logo from "../assets/esap_logo.png";
import { GlobalContext } from "../contexts/GlobalContext";
import { QueryContext } from "../contexts/QueryContext";
import AuthControl from "./auth/authControl";
import MyBasketButton from "./basket/MyBasketButton";
import SaveBasketButton from "./basket/SaveBasketButton";
import ShowTokenButton from "./ShowTokenButton";
export default function NavBar() {
let history = useHistory()
// History is defined here; since this is the first component that
// is in the router
const history = useHistory();
const { navbar, refreshLogin } = useContext(GlobalContext);
const { config } = useContext(QueryContext);
if (!navbar) return null;
if (!config) return null;
const { navbar, refreshLogin } = useContext(GlobalContext);
// On Mount, check login once;
useEffect(() => {
refreshLogin(history);
}, []);
const { config } = useContext(QueryContext);
if (!navbar) return null;
if (!config) return null;
const navlist = navbar.navbar;
const navlist = navbar.navbar;
return (
return (
<Navbar bg="dark" variant="dark">
<img
alt=""
......@@ -38,14 +46,14 @@ export default function NavBar() {
</Nav.Link>
))}
</Nav>
<Nav.Link key="my basket" as={NavLink} to="/basket">
<MyBasketButton />
</Nav.Link>
<SaveBasketButton/>{' '}
<Nav.Link key="my basket" as={NavLink} to="/basket">
<MyBasketButton />
</Nav.Link>
<SaveBasketButton />{' '}
<Nav>
<ShowTokenButton/>
<AuthControl />
<ShowTokenButton />
<AuthControl />
</Nav>
</Navbar>
);
);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment