Unverified Commit e33318f6 authored by Jacob Kaufman's avatar Jacob Kaufman Committed by GitHub
Browse files

Merge pull request #52 from scottaames/master 

updated GUI css and added disabled projection buttons css
parents 05e082e3 f5a6f52d

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
coverage/

dist/

dist/*

.dist/

node_modules

package-lock.json

*.log

app/package-lock.json

+15 −0
Original line number Diff line number Diff line
@@ -5031,6 +5031,11 @@ 
      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",

      "dev": true

    },

    "jquery": {

      "version": "3.4.1",

      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",

      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="

    },

    "js-base64": {

      "version": "2.5.1",

      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -5242,6 +5247,16 @@ 
      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",

      "integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="

    },

    "leaflet-fullscreen": {

      "version": "1.0.2",

      "resolved": "https://registry.npmjs.org/leaflet-fullscreen/-/leaflet-fullscreen-1.0.2.tgz",

      "integrity": "sha1-CcYcS6xF9jsu4Sav2H5c2XZQ/Bs="

    },

    "leaflet-sidebar-v2": {

      "version": "3.2.2",

      "resolved": "https://registry.npmjs.org/leaflet-sidebar-v2/-/leaflet-sidebar-v2-3.2.2.tgz",

      "integrity": "sha512-LwDiEvC3TAybIxHt+ud2rkdvJxQFMFpS9Xk02nvC8h2YRx5/+cYySFgM76Z8fEHPOl02htLWECmGitSwGVf/+A=="

    },

    "leven": {

      "version": "3.1.0",

      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",

app/package.json

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ 
    "@material-ui/lab": "^4.0.0-alpha.41",

    "jquery": "^3.4.1",

    "leaflet": "^1.6.0",

    "leaflet-fullscreen": "^1.0.2",

    "leaflet-sidebar-v2": "^3.2.2",

    "proj4": "^2.6.0",

    "proj4leaflet": "^1.0.2",

    "react": "^16.12.0",

app/src/components/App.jsx

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
import React, { Component } from "react";

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

import AstroMap from "../js/AstroMap.js";

import Projection from "../js/Projection.js";

import MousePosition from "../js/MousePosition";

import ConsoleContainer from "./container/ConsoleContainer.jsx";

import "../js/AstroMath";

import "leaflet";

import "proj4leaflet";

import "proj4";



export default class App extends Component {

  constructor(props) {

    super(props);

    this.state = {};

  }



  componentDidMount() {

    let map = new AstroMap("map-container", "mars", {});

    let projectionControl = new Projection();

    projectionControl.addTo(map);



    let mouseControl = new MousePosition({

      numDigits: 2,

      targetPlanet: "mars"

    });

    mouseControl.addTo(map);



    let scaleControl = new L.Control.Scale({ imperial: false });

    scaleControl.addTo(map);

  }



  render() {

    return (

      <Paper elevation={10}>

        <ConsoleContainer />

        <div id="map-container" />

      </Paper>

    );

  }

}

app/src/components/container/App.jsx

0 → 100644
+15 −0
Original line number Diff line number Diff line 
import React, { Component } from "react";

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

import ConsoleContainer from "./ConsoleContainer.jsx";

import MapContainer from "./MapContainer.jsx";

import "proj4leaflet";

import "proj4";



export default function App() {

  return (

    <Paper elevation={10}>

      <ConsoleContainer />

      <MapContainer />

    </Paper>

  );

}