Unverified Commit 8c39e3fd authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Merge pull request #91 from scottaames/master 

Commented out autocomplete input box
parents aad31320 a5d00ec6

.gitignore

+1 −0
Original line number Diff line number Diff line 
.cache/

coverage/

docs/

dist/

dist/*

.dist/

app/.babelrc

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 
    ]

  ],

  "plugins": [

    [

      "@babel/plugin-transform-runtime",

      {

        "regenerator": true

      }

    ],



    [

      "babel-plugin-import",

      {

app/package.json

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
    "@material-ui/core": "^4.9.0",

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

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

    "@tarekraafat/autocomplete.js": "^7.2.0",

    "jquery": "^3.4.1",

    "leaflet": "^1.6.0",

    "leaflet-draw": "1.0.4",

app/src/components/container/App.jsx

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import MapContainer from "./MapContainer.jsx"; 
import ListSubheader from "@material-ui/core/ListSubheader";

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

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

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

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



/**

 * Controls css styling for this component using js to css
@@ -92,7 +92,7 @@ export default function App() { 
            <MenuItem value="Charon">Charon</MenuItem>

          </Select>

        </FormControl>

        <AutoCompleteInput className={classes.autoComplete} />

        {/* <AutoCompleteInput className={classes.autoComplete} /> */}

      </div>

      <Paper elevation={10}>

        <ConsoleContainer target={targetPlanet} />

app/src/components/container/MapContainer.jsx

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import Projection from "../../js/Projection"; 
import MousePosition from "../../js/MousePosition";

import Draw from "../../js/Draw";

import "leaflet";

//import newAutocomplete from "../../js/autocomplete/customIndex";



/**

 * Component that uses back end JS files to invoke and display the
@@ -25,7 +26,7 @@ export default class MapContainer extends Component { 
  }



  /**

   * Invokes when the component is successfully mounted to the DOM, then

   * Invoked when the component is successfully mounted to the DOM, then

   * handles all of the map intialization and creation.

   */

  componentDidMount() {
@@ -51,6 +52,8 @@ export default class MapContainer extends Component { 
    }).addTo(map);



    new L.Control.Scale({ imperial: false }).addTo(map);



    //new newAutocomplete();

  }



  /**