Unverified Commit 0797a643 authored by Scott Ames's avatar Scott Ames Committed by GitHub
Browse files

Merge pull request #34 from scottaames/master 

Minor GUi changes
parents 7556d35b babb9fa7

src/App.jsx→src/components/App.jsx

+3 −3
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 AstroMap from "../js/AstroMap.js";

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

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

import "leaflet";

import "proj4leaflet";

import "proj4";

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: "#96DEDA",

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

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

    background: "#f5dd95",

    background: "-webkit-linear-gradient(to right, #f5dd95, #faf5e6)",

    background: "linear-gradient(to right, #f5dd95, #faf5e6)"

  },

  toolbar: {

    height: "100%",

src/components/presentational/ConsoleLonLatSelects.jsx

+10 −10
Original line number Diff line number Diff line
@@ -51,15 +51,15 @@ const StyledTooltip = withStyles(theme => ({ 
const StyledToggleButton = withStyles(theme => ({

  root: {

    color: fade("#022", 0.6),

    background: fade("#B0D0D3", 0.2),

    background: fade("#ffdb62", 0.2),

    "&:hover": {

      backgroundColor: fade("#FFFDB4", 0.8)

      backgroundColor: fade("#ffdb62", 0.8)

    },

    "&$selected": {

      color: "#022",

      backgroundColor: "#B0D0D3",

      backgroundColor: "#ffdb62",

      "&:hover": {

        backgroundColor: "#B0D0D3",

        backgroundColor: "#ffdb62",

        border: `1px solid ${fade(theme.palette.action.active, 0.12)}`

      }

    }
@@ -71,8 +71,8 @@ const StyledToggleButton = withStyles(theme => ({ 
}))(ToggleButton);



export default function ConsoleLonLatSelects(props) {

  const [posEastWest, setPosEastWest] = React.useState("east");

  const [coordSystem, setCoordSystem] = React.useState("ocentric");

  const [posEastWest, setPosEastWest] = React.useState("PositiveEast");

  const [coordSystem, setCoordSystem] = React.useState("Planetocentric");

  const [lonRange, setLonRange] = React.useState(180);



  const handlePosEastWest = (event, newPosEastWest) => {
@@ -125,11 +125,11 @@ export default function ConsoleLonLatSelects(props) { 
              value={posEastWest}

              onChange={handlePosEastWest}

            >

              <StyledToggleButton value="east">

              <StyledToggleButton value="PositiveEast">

                <AutorenewIcon className={classes.flip} />

                <Typography>East</Typography>

              </StyledToggleButton>

              <StyledToggleButton value="west">

              <StyledToggleButton value="PositiveWest">

                <AutorenewIcon />

                <Typography>West</Typography>

              </StyledToggleButton>
@@ -157,11 +157,11 @@ export default function ConsoleLonLatSelects(props) { 
              value={coordSystem}

              onChange={handleCoordSystem}

            >

              <StyledToggleButton value="ocentric">

              <StyledToggleButton value="Planetocentric">

                <span className={classes.circle} />

                <Typography>centric</Typography>

              </StyledToggleButton>

              <StyledToggleButton value="ographic">

              <StyledToggleButton value="Planetographic">

                <span className={classes.oval} />

                <Typography>graphic</Typography>

              </StyledToggleButton>

src/index.jsx

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import "leaflet"; 
import "proj4leaflet";

import "proj4";

import "./styles.css";

import App from "./App.jsx";

import App from "./components/App.jsx";



ReactDOM.render(<App />, document.getElementById("map"));
 
//document.getElementById("projectionCylindrical").focus();