Merge branch 'release/0.0.3'

This commit is contained in:
jwu-fisker
2023-01-16 09:48:01 -08:00
24 changed files with 936 additions and 466 deletions

View File

@@ -1,15 +1,15 @@
import React, { useEffect, useState } from "react";
import useStyles from "../useStyles";
import L from "leaflet";
import { MapContainer, TileLayer, Marker, Popup, useMap } from "react-leaflet";
import { Button } from "@material-ui/core";
import L from "leaflet";
import React, { useEffect, useState } from "react";
import { MapContainer, Marker, Popup, TileLayer, useMap } from "react-leaflet";
import useStyles from "../useStyles";
import GrayMarkerIcon from "../../assets/gray-marker.png";
import GreenMarkerIcon from "../../assets/green-marker.png";
import { logger } from "../../services/monitoring";
import { useUserContext } from "../Contexts/UserContext";
import { useVehicleContext, VehicleProvider } from "../Contexts/VehicleContext";
import { VehiclePopUp } from "./popup";
import GreenMarkerIcon from "../../assets/green-marker.png";
import GrayMarkerIcon from "../../assets/gray-marker.png";
import { logger } from "../../services/monitoring";
const Component = () => {
const classes = useStyles();
@@ -185,16 +185,7 @@ const Component = () => {
{carState ? (
<VehiclePopUp
key={carState.vin}
vin={carState.vin}
online={carState.online}
onlineHMI={carState.online_hmi}
battery={carState.battery}
doors={carState.doors}
location={carState.location}
windows={carState.windows}
trex_version={carState.trex_version}
ip={carState.ip}
updated={carState.updated}
{...carState}
className={classes.popup}
onClose={handleClose}
/>