From 8d5a6c7a7f57fbe946d027da04cfc8ef50299c5a Mon Sep 17 00:00:00 2001 From: Drew Taylor Date: Thu, 22 Jul 2021 12:08:20 -0700 Subject: [PATCH] fixing token error --- src/components/Home/index.jsx | 1 + src/components/VehicleMap/index.jsx | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx index aad89d4..5b4d7c3 100644 --- a/src/components/Home/index.jsx +++ b/src/components/Home/index.jsx @@ -31,6 +31,7 @@ const Home = () => { setTitle("Home"); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + return (
diff --git a/src/components/VehicleMap/index.jsx b/src/components/VehicleMap/index.jsx index afcd78a..617a4c5 100644 --- a/src/components/VehicleMap/index.jsx +++ b/src/components/VehicleMap/index.jsx @@ -5,7 +5,6 @@ import { MapContainer, TileLayer, Marker, Popup, useMap } from "react-leaflet"; import { Button } from "@material-ui/core"; import { useUserContext } from "../Contexts/UserContext"; -import { useStatusContext } from "../Contexts/StatusContext"; import { useVehicleContext, VehicleProvider } from "../Contexts/VehicleContext"; import { VehiclePopUp } from "./popup"; import GreenCarIcon from "../../assets/green-car.png"; @@ -13,17 +12,15 @@ import RedCarIcon from "../../assets/red-car.png"; const Component = () => { const classes = useStyles(); - const { token } = useUserContext(); - const { setTitle } = useStatusContext(); + const { + token: { + idToken: { jwtToken: token }, + } + } = useUserContext(); const { getConnections, getLocations, getState } = useVehicleContext(); const REQUEST_INTERVAL = 10000; - useEffect(() => { - setTitle(""); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - const [center, setCenter] = useState([0, 0]); const [zoom, setZoom] = useState(2); const [markers, setMarkers] = useState([]);