diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/app/map/MapStageComponent.js | 26 | ||||
| -rw-r--r-- | src/components/app/sidebars/topology/machine/UnitComponent.js | 8 | ||||
| -rw-r--r-- | src/components/modals/Modal.js | 4 | ||||
| -rw-r--r-- | src/containers/auth/Login.js | 23 | ||||
| -rw-r--r-- | src/sagas/experiments.js | 3 | ||||
| -rw-r--r-- | src/store/configure-store.js | 12 |
6 files changed, 45 insertions, 31 deletions
diff --git a/src/components/app/map/MapStageComponent.js b/src/components/app/map/MapStageComponent.js index ce6a60f6..67b3349c 100644 --- a/src/components/app/map/MapStageComponent.js +++ b/src/components/app/map/MapStageComponent.js @@ -7,6 +7,8 @@ import RoomHoverLayer from "../../../containers/app/map/layers/RoomHoverLayer"; import jQuery from "../../../util/jquery"; import { NAVBAR_HEIGHT } from "../../navigation/Navbar"; import { MAP_MOVE_PIXELS_PER_EVENT } from "./MapConstants"; +import { Provider } from "react-redux"; +import { store } from "../../../store/configure-store"; class MapStageComponent extends React.Component { state = { @@ -14,8 +16,8 @@ class MapStageComponent extends React.Component { mouseY: 0 }; - constructor() { - super(); + constructor(props) { + super(props); this.updateDimensions = this.updateDimensions.bind(this); this.updateScale = this.updateScale.bind(this); @@ -104,15 +106,17 @@ class MapStageComponent extends React.Component { height={this.props.mapDimensions.height} onMouseMove={this.updateMousePosition.bind(this)} > - <MapLayer /> - <RoomHoverLayer - mouseX={this.state.mouseX} - mouseY={this.state.mouseY} - /> - <ObjectHoverLayer - mouseX={this.state.mouseX} - mouseY={this.state.mouseY} - /> + <Provider store={store}> + <MapLayer /> + <RoomHoverLayer + mouseX={this.state.mouseX} + mouseY={this.state.mouseY} + /> + <ObjectHoverLayer + mouseX={this.state.mouseX} + mouseY={this.state.mouseY} + /> + </Provider> </Stage> </Shortcuts> ); diff --git a/src/components/app/sidebars/topology/machine/UnitComponent.js b/src/components/app/sidebars/topology/machine/UnitComponent.js index 10a310e8..7c27043d 100644 --- a/src/components/app/sidebars/topology/machine/UnitComponent.js +++ b/src/components/app/sidebars/topology/machine/UnitComponent.js @@ -49,18 +49,16 @@ class UnitComponent extends React.Component { this.props.unit.generation} </span> <span> - <a + <span tabIndex="0" - className="unit-info-popover btn btn-outline-info mr-1" + className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle" role="button" data-toggle="popover" data-trigger="focus" title="Unit information" data-content={unitInfo} data-html="true" - > - <span className="fa fa-info-circle" /> - </a> + /> {this.props.inSimulation ? ( undefined ) : ( diff --git a/src/components/modals/Modal.js b/src/components/modals/Modal.js index 367cf2da..19337db8 100644 --- a/src/components/modals/Modal.js +++ b/src/components/modals/Modal.js @@ -22,8 +22,8 @@ class Modal extends React.Component { // 'close' triggers) visible = false; - constructor() { - super(); + constructor(props) { + super(props); this.id = "modal-" + Modal.idCounter++; } diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js index 28e95963..15af8e62 100644 --- a/src/containers/auth/Login.js +++ b/src/containers/auth/Login.js @@ -21,6 +21,10 @@ class LoginContainer extends React.Component { }); } + onAuthFailure(error) { + console.error(error); + } + render() { if (!this.props.visible) { return <span />; @@ -30,13 +34,13 @@ class LoginContainer extends React.Component { <GoogleLogin clientId={process.env.REACT_APP_OAUTH_CLIENT_ID} onSuccess={this.onAuthResponse.bind(this)} - onFailure={this.onAuthResponse.bind(this)} - className="login btn btn-primary" - > - <span> - <span className="fa fa-google" /> Login with Google - </span> - </GoogleLogin> + onFailure={this.onAuthFailure.bind(this)} + render={renderProps => ( + <span onClick={renderProps.onClick} className="login btn btn-primary"> + <span className="fa fa-google" /> Login with Google + </span> + )} + /> ); } } @@ -53,6 +57,9 @@ const mapDispatchToProps = dispatch => { }; }; -const Login = connect(mapStateToProps, mapDispatchToProps)(LoginContainer); +const Login = connect( + mapStateToProps, + mapDispatchToProps +)(LoginContainer); export default Login; diff --git a/src/sagas/experiments.js b/src/sagas/experiments.js index 9b8c1a8f..d9c410f7 100644 --- a/src/sagas/experiments.js +++ b/src/sagas/experiments.js @@ -1,5 +1,4 @@ -import { delay } from "redux-saga"; -import { call, put, select } from "redux-saga/effects"; +import { call, put, select, delay } from "redux-saga/effects"; import { addPropToStoreObject, addToStore } from "../actions/objects"; import { setLastSimulatedTick } from "../actions/simulation/tick"; import { addBatchToStates } from "../actions/states"; diff --git a/src/store/configure-store.js b/src/store/configure-store.js index 2c5f46fb..29af25ab 100644 --- a/src/store/configure-store.js +++ b/src/store/configure-store.js @@ -24,12 +24,18 @@ const middlewares = [ viewportAdjustmentMiddleware ]; +export let store = undefined; + export default function configureStore() { - const store = createStore( + const configuredStore = createStore( rootReducer, - compose(persistState("auth"), applyMiddleware(...middlewares)) + compose( + persistState("auth"), + applyMiddleware(...middlewares) + ) ); sagaMiddleware.run(rootSaga); + store = configuredStore; - return store; + return configuredStore; } |