Merge 445efb2 into 5c35f33

src/App.js

@@ -12,7 +12,7 @@ const App = ({
   handleInitializeShipLocation,
   handleSetPlanets,
   planets,
-  shipLocation
+  userCash
 }) => {
   useEffect(() => {
     if (planets.length === 0) {
@@ -35,6 +35,8 @@ const App = ({
     <div>
       <h1>hermes</h1>
       <ItemTimer />
+      <h2>Cash:</h2>
+      <span>{userCash}</span>
       <br />
       <br />
       <ViewSelector />
@@ -48,13 +50,12 @@ const App = ({
 App.propTypes = {
   handleInitializeShipLocation: PropTypes.func.isRequired,
   handleSetPlanets: PropTypes.func.isRequired,
-  planets: PropTypes.array.isRequired,
-  shipLocation: PropTypes.object
+  planets: PropTypes.array.isRequired
 }
 
-const mapStateToProps = ({ ship, world }) => ({
+const mapStateToProps = ({ user, world }) => ({
   planets: world.planets,
-  shipLocation: ship.location
+  userCash: user.cash
 })
 
 const mapDispatchToProps = dispatch => ({

src/redux/actions/user.js

@@ -0,0 +1,7 @@
+// * ACTION TYPES
+
+// * ACTION GENERATORS
+
+// * PROMISES
+
+// * THUNKS

src/redux/actions/world.js

@@ -28,19 +28,5 @@ export const clearItems = () => ({ type: CLEAR_ITEMS })
 export const refreshItems = () => ({ type: REFRESH_ITEMS })
 
 // * PROMISES
-// const thing = () => {
-//   return new Promise((resolve, reject) => {
-//     console.log('Promise timer started.')
-//     setTimeout(() => {
-//       resolve(true)
-//     }, 3000)
-//   })
-// }
 
 // * THUNKS
-// export const generatePlanet = () => {
-//   return async dispatch => {
-//     const thingy = await thing()
-//     console.log(thingy)
-//   }
-// }

src/redux/reducers/user.js

@@ -0,0 +1,10 @@
+const userDefaultState = {
+  cash: 100
+}
+
+export default (state = userDefaultState, action) => {
+  switch (action.type) {
+    default:
+      return state
+  }
+}

src/redux/store/store.js

@@ -2,6 +2,7 @@ import { createStore, compose, combineReducers, applyMiddleware } from 'redux'
 import thunk from 'redux-thunk'
 import shipReducer from '../reducers/ship'
 import uiReducer from '../reducers/ui'
+import userReducer from '../reducers/user'
 import worldReducer from '../reducers/world'
 import { loadState, saveState } from '../../util'
 import throttle from 'lodash/throttle'
@@ -14,6 +15,7 @@ const store = createStore(
   combineReducers({
     ship: shipReducer,
     ui: uiReducer,
+    user: userReducer,
     world: worldReducer
   }),
   persistedState,

src/util.js

@@ -9,8 +9,6 @@ const getPlanetName = () => {
 export const generateItems = possibleDestinations => {
   const items = []
 
-  console.log({ possibleDestinations })
-
   for (let i = 0; i < 5; i++) {
     const destinationPlanet =
       possibleDestinations[