Commit 0a0cd7a4 authored by Scott Ames's avatar Scott Ames
Browse files

GUI polished and complete. Waiting for coordinate class merge.

parent a3a75828

package.json

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
    "html-webpack-plugin": "^3.2.0",

    "jsdoc": "^3.6.3",

    "onchange": "^6.1.0",

    "postcss-loader": "^3.0.0",

    "precss": "^4.0.0",

    "prettier": "^1.19.1",

    "prop-types": "^15.7.2",

src/App.jsx

0 → 100644
+30 −0
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 ConsoleContainer from "./components/container/ConsoleContainer.jsx";

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);

  }



  render() {

    return (

      <Paper elevation={10}>

        <ConsoleContainer />

        <div id="map-container" />

      </Paper>

    );

  }

}

src/components/container/ConsoleContainer.jsx

+4 −4
Original line number Diff line number Diff line
@@ -2,24 +2,24 @@ import React from "react"; 
import ConsoleAppBar from "../presentational/ConsoleAppBar.jsx";

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



const useStyles = makeStyles(theme => ({

const useStyles = makeStyles({

  root: {

    maxWidth: 800,

    height: 100,

    width: "100%"

  },

  consappbar: {

  consAppbar: {

    maxWidth: 800,

    height: 100,

    width: "auto"

  }

}));

});



export default function ConsoleContainer(props) {

  const classes = useStyles();

  return (

    <div className={classes.root}>

      <ConsoleAppBar className={classes.consappbar} />

      <ConsoleAppBar className={classes.consAppbar} />

    </div>

  );

}

src/components/container/MapContainer.jsx

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
import React from "react";

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

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



export default function MapContainer(props) {

  return (

    <Container>

      <Paper>

        <div id="map-container" />

      </Paper>

    </Container>

  );

}

src/components/presentational/ConsoleAppBar.jsx

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ const useStyles = makeStyles(theme => ({ 
    width: "100%"

  },

  appbar: {

    background: "#d6ddbc",

    background: "-webkit-linear-gradient(to right, #d6ddbc, #bcddca)",

    background: "linear-gradient(to right, #d6ddbc, #bcddca)"

    background: "#96DEDA",

    background: "-webkit-linear-gradient(to right, #96DEDA, #86fde8)",

    background: "linear-gradient(to right, #96DEDA, #86fde8)"

  },

  toolbar: {

    height: "100%",