Commit 44418839 authored by Amy Stamile's avatar Amy Stamile
Browse files

npm updates.

parent e9ca9345

app/.babelrc

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    [

      "babel-plugin-import",

      {

        "libraryName": "@material-ui/core",

        "libraryName": "@mui/material",

        "libraryDirectory": "esm",

        "camel2DashComponentName": false

      },
@@ -29,7 +29,7 @@ 
    [

      "babel-plugin-import",

      {

        "libraryName": "@material-ui/icons",

        "libraryName": "@mui/icons-material",

        "libraryDirectory": "esm",

        "camel2DashComponentName": false

      },

app/package.json

+43 −55
Original line number Diff line number Diff line
@@ -40,68 +40,56 @@ 
    "deploy": "gh-pages -d dist"

  },

  "devDependencies": {

    "@babel/core": "^7.8.3",

    "@babel/preset-env": "^7.8.3",

    "@babel/preset-react": "^7.8.3",

    "@babel/register": "7.9.0",

    "@babel/runtime": "^7.8.3",

    "autoprefixer": "^9.7.4",

    "babel-loader": "^8.0.6",

    "babel-plugin-import": "^1.13.0",

    "babel-preset-airbnb": "^4.4.0",

    "babel-root-slash-import": "^1.1.0",

    "@babel/core": "^7.17.2",

    "@babel/preset-env": "^7.16.11",

    "@babel/preset-react": "^7.16.7",

    "@babel/register": "^7.17.0",

    "@babel/runtime": "^7.17.2",

    "babel-loader": "^8.2.3",

    "babel-plugin-import": "^1.13.3",

    "babel-preset-airbnb": "^5.0.0",

    "braintree-jsdoc-template": "^3.3.0",

    "chai": "^4.2.0",

    "clean-webpack-plugin": "^3.0.0",

    "css-loader": "^3.4.2",

    "eslint": "^6.1.0",

    "eslint-config-airbnb-base": "^14.0.0",

    "eslint-config-prettier": "^6.9.0",

    "eslint-plugin-import": "^2.20.0",

    "eslint-plugin-prettier": "^3.1.2",

    "chai": "^4.3.6",

    "clean-webpack-plugin": "^4.0.0",

    "css-loader": "^6.6.0",

    "eslint": "^8.9.0",

    "eslint-config-airbnb-base": "^15.0.0",

    "eslint-config-prettier": "^8.3.0",

    "eslint-plugin-import": "^2.25.4",

    "eslint-plugin-prettier": "^4.0.0",

    "gh-pages": "^3.2.3",

    "html-loader": "^0.5.5",

    "html-webpack-plugin": "^3.2.0",

    "jsdoc": "^3.6.3",

    "jsdom": "^16.2.1",

    "jsdom-global": "3.0.2",

    "mocha": "^7.1.1",

    "mocha-jsdom": "^2.0.0",

    "onchange": "^6.1.0",

    "precss": "^4.0.0",

    "prettier": "^1.19.1",

    "prop-types": "^15.7.2",

    "style-loader": "^1.1.3",

    "url-loader": "^3.0.0",

    "webpack": "^4.42.1",

    "webpack-cli": "^3.3.10",

    "webpack-dev-server": "^3.10.1",

    "webpack-merge": "^4.2.2"

    "html-loader": "^3.1.0",

    "html-webpack-plugin": "^5.5.0",

    "jsdoc": "^3.6.10",

    "jsdom": "^19.0.0",

    "jsdom-global": "^3.0.2",

    "mocha": "^9.2.0",

    "onchange": "^7.1.0",

    "prettier": "^2.5.1",

    "prop-types": "^15.8.1",

    "style-loader": "^3.3.1",

    "url-loader": "^4.1.1",

    "webpack": "^5.68.0",

    "webpack-cli": "^4.9.2",

    "webpack-dev-server": "^4.7.4",

    "webpack-merge": "^5.8.0"

  },

  "dependencies": {

    "@date-io/date-fns": "^2.13.1",

    "@emotion/react": "^11.7.1",

    "@emotion/styled": "^11.6.0",

    "@material-ui/core": "^4.9.0",

    "@material-ui/icons": "^4.5.1",

    "@material-ui/lab": "^4.0.0-alpha.41",

    "@material-ui/pickers": "^3.3.10",

    "@mui/icons-material": "^5.3.1",

    "@mui/lab": "^5.0.0-alpha.66",

    "@mui/material": "^5.3.1",

    "@svgr/webpack": "^5.3.1",

    "@mui/icons-material": "^5.4.1",

    "@mui/lab": "^5.0.0-alpha.68",

    "@mui/material": "^5.4.1",

    "@mui/material/styles": "^5.4.1",

    "@svgr/webpack": "^6.2.1",

    "autoprefixer": "^10.4.2",

    "date-fns": "^2.28.0",

    "jquery": "^3.4.1",

    "leaflet": "^1.6.0",

    "leaflet-draw": "1.0.4",

    "leaflet-fullscreen": "^1.0.2",

    "leaflet-html-legend": "0.3.5",

    "proj4": "^2.6.0",

    "jquery": "^3.6.0",

    "leaflet": "^1.7.1",

    "leaflet-draw": "^1.0.4",

    "proj4leaflet": "^1.0.2",

    "react": "^16.12.0",

    "react-dom": "^16.12.0",

    "requirejs": "^2.3.6",

    "typeface-roboto": "0.0.75",

    "wicket": "1.3.5"

    "react": "^17.0.2",

    "react-dom": "^17.0.2",

    "wicket": "^1.3.8"

  }

}

app/src/components/presentational/ConsoleAppBar.jsx

+3 −3
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ import ConsoleTargetInfo from "../presentational/ConsoleTargetInfo.jsx"; 
import ConsoleProjectionButtons from "../presentational/ConsoleProjectionButtons.jsx";

import ConsoleLonLatSelects from "../presentational/ConsoleLonLatSelects.jsx";

import ConsoleCoordinates from "./ConsoleCoordinates.jsx";

import AppBar from "@material-ui/core/AppBar";

import Toolbar from "@material-ui/core/Toolbar"; // Not sure what this did?

import { makeStyles } from "@material-ui/core/styles";

import Divider from "@material-ui/core/Divider";

import AppBar from "@mui/material/AppBar";

import Toolbar from "@mui/material/Toolbar"; // Not sure what this did?

import Divider from "@mui/material/Divider";



/**

 * Controls css styling for this component using js to css

app/src/components/presentational/ConsoleCoordinates.jsx

+6 −6
Original line number Diff line number Diff line 
import React from "react";

import Grid from "@material-ui/core/Grid";

import Typography from "@material-ui/core/Typography";

import { makeStyles, withStyles } from "@material-ui/core/styles";

import Zoom from "@material-ui/core/Zoom";

import Paper from "@material-ui/core/Paper";

import Divider from "@material-ui/core/Divider";

import Grid from "@mui/material/Grid";

import Typography from "@mui/material/Typography";

import Zoom from "@mui/material/Zoom";

import Paper from "@mui/material/Paper";

import Divider from "@mui/material/Divider";

import StyledTooltip from "./StyledTooltip.jsx";



/**
@@ -69,7 +69,7 @@ export default function ConsoleCoordinates() { 
      arrow

      TransitionComponent={Zoom}

    >

      <div id="coordContianer" className={classes.container}>

      <div id="coordContainer" className={classes.container}>

        <Paper

          style={{ borderTopRightRadius: 0, borderBottomRightRadius: 0 }}

          variant="outlined"

app/src/components/presentational/ConsoleLonLatSelects.jsx

+8 −8
Original line number Diff line number Diff line 
import React from "react";

import { alpha, makeStyles, withStyles } from "@material-ui/core/styles";

import Zoom from "@material-ui/core/Zoom";

import AutorenewIcon from "@material-ui/icons/Autorenew";

import AddBoxIcon from "@material-ui/icons/AddBoxOutlined";

import ExposureIcon from "@material-ui/icons/Exposure";

import ToggleButtonGroup from "@material-ui/lab/ToggleButtonGroup";

import ToggleButton from "@material-ui/lab/ToggleButton";

import Typography from "@material-ui/core/Typography";

import Divider from "@material-ui/core/Divider";

import Zoom from "@mui/material/Zoom";

import AutorenewIcon from "@mui/icons-material/Autorenew";

import AddBoxIcon from "@mui/icons-material/AddBoxOutlined";

import ExposureIcon from "@mui/icons-material/Exposure";

import ToggleButtonGroup from "@mui/material/ToggleButtonGroup";

import ToggleButton from "@mui/material/ToggleButton";

import Typography from "@mui/material/Typography";

import Divider from "@mui/material/Divider";

import StyledTooltip from "./StyledTooltip.jsx";



/**