Merge branch 'development' into main

This commit is contained in:
jwu-fisker
2021-08-13 09:33:19 -07:00
22 changed files with 640 additions and 705 deletions

View File

@@ -1,15 +1,11 @@
import React, { useEffect } from "react";
import { Typography } from "@material-ui/core";
import useStyles from "../useStyles";
import { useUserContext } from "../Contexts/UserContext";
import { useStatusContext } from "../Contexts/StatusContext";
import VehicleMap from "../VehicleMap";
import { getName } from "../../utils/jwt";
const Home = () => {
const classes = useStyles();
const { token } = useUserContext();
const { setTitle, setSitePath } = useStatusContext();
@@ -21,9 +17,6 @@ const Home = () => {
return (
<div className={classes.paper}>
<Typography className={classes.homePageTitle} component="h1" variant="h5">
Welcome {getName(token)}!
</Typography>
<VehicleMap />
</div>
);