Merge e878d70 into 89c43b2

actuallyReallyAlex · Sep 25, 2019 · 6ebe498 · 6ebe498
2 parents 89c43b2 + e878d70
commit 6ebe498
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 173 deletions.
diff --git a/cypress/integration/ImportGame-spec.js b/cypress/integration/ImportGame-spec.js
@@ -8,7 +8,7 @@ describe('Import Game', () => {
     cy.visit('/')
   })
 
-  it.skip('Should import the game state from a JSON file.', () => {
+  it('Should import the game state from a JSON file.', () => {
     cy.get('#view-speeddial').trigger('mouseover', { force: true })
     cy.get('button[title="Import Game"]')
       .click()

diff --git a/package.json b/package.json
@@ -37,7 +37,6 @@
     "react-ga": "^2.6.0",
     "react-redux": "^7.1.0",
     "react-scripts": "3.1.0",
-    "react-tooltip": "^3.10.0",
     "redux": "^4.0.4",
     "redux-thunk": "^2.3.0",
     "styled-components": "^4.3.2",

diff --git a/src/App.js b/src/App.js
@@ -5,9 +5,6 @@ import { initializeApplication } from './redux/actions/world'
 import View from './views/View'
 import { Box } from 'grommet'
 import { setView } from './redux/actions/ui'
-import TravelTimer from './components/TravelTimer'
-import CashDisplay from './components/CashDisplay'
-import ImportButton from './components/ImportButton'
 import ViewSpeeddial from './components/ViewSpeeddial'
 
 /**
@@ -21,13 +18,7 @@ const App = ({ handleInitializeApplication, planets }) => {
 
   return (
     <Box fill>
-      {/* <TravelTimer />  */}
       <ViewSpeeddial />
-
-      {/* <CashDisplay />
-          <ImportButton />
-        </Box> */}
-      {/* </Box> */}
       <Box pad={{ left: '100px', top: '25px', right: '25px', bottom: '25px' }}>
         <View />
       </Box>

diff --git a/src/components/ImportButton.js b/src/components/ImportButton.js
@@ -1,11 +1,11 @@
-import React, { createRef } from 'react'
+import React, { Fragment, createRef } from 'react'
 import PropTypes from 'prop-types'
-import { Box, Button } from 'grommet'
 import { connect } from 'react-redux'
 import { replaceShip } from '../redux/actions/ship'
 import { replaceUI } from '../redux/actions/ui'
 import { replaceUser } from '../redux/actions/user'
 import { replaceWorld } from '../redux/actions/world'
+import Icon from '@material-ui/core/Icon'
 
 /**
  * Allows the user to import their game from an exported file.
@@ -34,8 +34,8 @@ const ImportButton = ({ handleImportGame }) => {
   }
 
   return (
-    <Box>
-      <Button label="Import Game" onClick={handleImportGameClick} plain />
+    <Fragment>
+      <Icon className="fas fa-download" onClick={handleImportGameClick} />
       <input
         accept=".json"
         data-testid="input-import"
@@ -44,7 +44,7 @@ const ImportButton = ({ handleImportGame }) => {
         style={{ display: 'none' }}
         type="file"
       />
-    </Box>
+    </Fragment>
   )
 }
 

diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
diff --git a/src/components/ViewSpeeddial.js b/src/components/ViewSpeeddial.js
@@ -6,6 +6,7 @@ import { SpeedDial, SpeedDialAction, SpeedDialIcon } from '@material-ui/lab'
 import Icon from '@material-ui/core/Icon'
 import { setView } from '../redux/actions/ui'
 import { exportGame } from '../util/main'
+import ImportButton from './ImportButton'
 
 const useStyles = makeStyles(theme => ({
   exampleWrapper: {
@@ -48,7 +49,7 @@ const ViewSpeeddial = ({ handleViewChange }) => {
       onClick: () => handleViewChange('Ship')
     },
     {
-      icon: <Icon className="fas fa-download" />,
+      icon: <ImportButton />,
       name: 'Import Game',
       onClick: () => {}
     },

diff --git a/src/index.css b/src/index.css
@@ -3,56 +3,6 @@ body {
   margin: 0;
 }
 
-.bm-item {
-  display: inline-block;
-  text-decoration: none;
-  margin-bottom: 10px;
-  color: #d1d1d1;
-  transition: color 0.2s;
-}
-
-.bm-item:hover {
-  color: white;
-}
-
-.bm-burger-button {
-  position: fixed;
-  width: 36px;
-  height: 30px;
-  left: 36px;
-  top: 36px;
-}
-
-.bm-burger-bars {
-  background: #373a47;
-}
-
-.bm-cross-button {
-  display: none;
-}
-
-.bm-cross {
-  background: #bdc3c7;
-}
-
-.bm-menu {
-  background: #373a47;
-  padding: 2.5em 1.5em 0;
-  font-size: 1.15em;
-}
-
-.bm-morph-shape {
-  fill: #373a47;
-}
-
-.bm-item-list {
-  color: #b8b7ad;
-}
-
-.bm-overlay {
-  background: rgba(0, 0, 0, 0.3);
-}
-
 .links line {
   stroke: #999;
   stroke-opacity: 0.6;

diff --git a/yarn.lock b/yarn.lock
@@ -3432,7 +3432,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.5, classnames@^2.2.6:
+classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
@@ -10891,7 +10891,7 @@ prop-types-exact@^1.2.0:
     object.assign "^4.1.0"
     reflect.ownkeys "^0.2.0"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -11347,14 +11347,6 @@ react-test-renderer@^16.0.0-0:
     react-is "^16.9.0"
     scheduler "^0.15.0"
 
-react-tooltip@^3.10.0:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.11.1.tgz#7b4ce48ed26a46e996662b19a2afebbfd483513b"
-  integrity sha512-YCMVlEC2KuHIzOQhPplTK5jmBBwoL+PYJJdJKXj7M/h7oevupd/QSVq6z5U7/ehIGXyHsAqvwpdxexDfyQ0o3A==
-  dependencies:
-    classnames "^2.2.5"
-    prop-types "^15.6.0"
-
 react-transition-group@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"