Adding reset button

Unfortunately, a lot of other minor tweaks snuck in here, but now there is a reset button available. At this point, the product is ready for larger use. Crazy... One day of soaking, and I'll probably make the world more aware of it come Saturday.
DaveSpringer · May 25, 2017 · e1b80b4 · e1b80b4
1 parent 0f2c597
commit e1b80b4
Show file tree

Hide file tree

Showing 17 changed files with 121 additions and 18 deletions.
diff --git a/dist/0.82dc086373a23a8fe216.js b/dist/0.82dc086373a23a8fe216.js
diff --git a/dist/0.82dc086373a23a8fe216.js.map b/dist/0.82dc086373a23a8fe216.js.map
diff --git a/dist/0.d08ff7e1984567c9474a.js b/dist/0.d08ff7e1984567c9474a.js
diff --git a/dist/0.d08ff7e1984567c9474a.js.map b/dist/0.d08ff7e1984567c9474a.js.map
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><title>Batman Miniature Game Dashboard</title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16"><link href="https://fonts.googleapis.com/css?family=Teko|Cuprum|Cuprum:700" rel="stylesheet"><link href="/styles/main.0af52badcb6cd698513cbb5ca75af957.css" rel="stylesheet"></head><body><div id="root" style="height: 100%"></div><script type="text/javascript" src="/manifest.5d456d809c8b636db2f7.js"></script><script type="text/javascript" src="/normalize.a31107ff90dfd6013773.js"></script><script type="text/javascript" src="/vendor.eed8a87e8b9c88fc7487.js"></script><script type="text/javascript" src="/main.52840a2cfdedd82702be.js"></script></body></html>
+<!doctype html><html lang="en"><head><title>Batman Miniature Game Dashboard</title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/png" href="favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="favicon-16x16.png" sizes="16x16"><link href="https://fonts.googleapis.com/css?family=Teko|Cuprum|Cuprum:700" rel="stylesheet"><link href="/styles/main.3672d6d8dba23493a2dccac7e880f464.css" rel="stylesheet"></head><body><div id="root" style="height: 100%"></div><script type="text/javascript" src="/manifest.3f83faa4053a8fe162de.js"></script><script type="text/javascript" src="/normalize.a31107ff90dfd6013773.js"></script><script type="text/javascript" src="/vendor.eed8a87e8b9c88fc7487.js"></script><script type="text/javascript" src="/main.52840a2cfdedd82702be.js"></script></body></html>
diff --git a/dist/manifest.5d456d809c8b636db2f7.js → dist/manifest.3f83faa4053a8fe162de.js b/dist/manifest.5d456d809c8b636db2f7.js → dist/manifest.3f83faa4053a8fe162de.js
diff --git a/dist/manifest.5d456d809c8b636db2f7.js.map → dist/manifest.3f83faa4053a8fe162de.js.map b/dist/manifest.5d456d809c8b636db2f7.js.map → dist/manifest.3f83faa4053a8fe162de.js.map
diff --git a/dist/styles/main.0af52badcb6cd698513cbb5ca75af957.css.map b/dist/styles/main.0af52badcb6cd698513cbb5ca75af957.css.map
diff --git a/...main.0af52badcb6cd698513cbb5ca75af957.css → ...main.3672d6d8dba23493a2dccac7e880f464.css b/...main.0af52badcb6cd698513cbb5ca75af957.css → ...main.3672d6d8dba23493a2dccac7e880f464.css
diff --git a/dist/styles/main.3672d6d8dba23493a2dccac7e880f464.css.map b/dist/styles/main.3672d6d8dba23493a2dccac7e880f464.css.map
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "compile": "node build/scripts/compile",
-    "build": "npm run clean && cross-env NODE_ENV=production npm run compile",
+    "build": "npm run clean && npm run lint:fix && npm run test && cross-env NODE_ENV=production npm run compile",
     "start": "cross-env NODE_ENV=development PORT=3000 node build/scripts/start",
     "serve": "cross-env NODE_ENV=production node build/scripts/start",
     "test": "cross-env NODE_ENV=test karma start build/karma.config",

diff --git a/src/resources/crews.js b/src/resources/crews.js
@@ -40,7 +40,23 @@ export const allCrews = [
     id : 'bm'
   }, {
     name : 'Watchmen',
-    id : 'wm'
+    id : 'wm',
+    roster: [{
+      name: 'Rorschach',
+      boss: 'no'
+    }, {
+      name: 'Comedian',
+      boss: 'no'
+    }, {
+      name: 'Ozymandias',
+      boss: 'no'
+    }, {
+      name: 'Niteowl',
+      boss: 'no'
+    }, {
+      name: 'Silk Spectre II',
+      boss: 'no'
+    }]
   }, {
     name : 'Riddler',
     id : 'rd'

diff --git a/src/routes/Builder/components/Builder.js b/src/routes/Builder/components/Builder.js
@@ -11,6 +11,7 @@ class Builder extends React.Component {
     super()
     this.addAllCharactersClick = this.addAllCharactersClick.bind(this)
     this.handleRulesChange = this.handleRulesChange.bind(this)
+    this.handleResetCrew = this.handleResetCrew.bind(this)
   }
   componentWillMount () {
     // Load up the various files
@@ -27,6 +28,10 @@ class Builder extends React.Component {
     this.props.followCrewRules(event.target.checked)
   }
 
+  handleResetCrew (event) {
+    this.props.resetCrew()
+  }
+
   render () {
     let availableCharacters = this.props.crew.availableCharacters
     return (
@@ -51,6 +56,8 @@ class Builder extends React.Component {
                 onChange={this.handleRulesChange} />
               <span className='spacerSpan' />
               <button className='addAllBtn' onClick={this.addAllCharactersClick}>Add All Models</button>
+              <span className='spacerSpan' />
+              <button className='addAllBtn' onClick={this.handleResetCrew}>Reset</button>
             </div>
             <div id='available-characters' className='character-area'>
               {availableCharacters.map(character =>
@@ -105,7 +112,8 @@ Builder.propTypes = {
   selectCharacter : React.PropTypes.func.isRequired,
   loadResources : React.PropTypes.func.isRequired,
   addAllCharacters : React.PropTypes.func.isRequired,
-  followCrewRules : React.PropTypes.func.isRequired
+  followCrewRules : React.PropTypes.func.isRequired,
+  resetCrew : React.PropTypes.func.isRequired
 }
 
 export default Builder
diff --git a/src/routes/Builder/components/SelectHeader.js b/src/routes/Builder/components/SelectHeader.js
@@ -54,7 +54,7 @@ class SelectHeader extends React.Component {
             inconsistent.</p>
             <p>This site is really and truly in <b>alpha</b>. This is not a modern video
             game beta-that-is-actually-a-demo or a Google beta-that-is-a-better-product-than-the-rest-of-the-world-can-make.</p>
-          <p>Trait descriptions here are not directly copied from the rule book,
+            <p>Trait descriptions here are not directly copied from the rule book,
             and the rule book is the final authority. I didn't realize there was
             a huge difference between Character and Model until probably the last
             15 traits, so there are many traits that incorrectly reference Character

diff --git a/src/routes/Builder/containers/BuilderContainer.js b/src/routes/Builder/containers/BuilderContainer.js
@@ -1,5 +1,12 @@
 import { connect } from 'react-redux'
-import { selectCrew, selectCharacter, loadResources, addAllCharacters, followCrewRules } from '../modules/builder'
+import {
+  selectCrew,
+  selectCharacter,
+  loadResources,
+  addAllCharacters,
+  followCrewRules,
+  resetCrew
+} from '../modules/builder'
 
 import Builder from '../components/Builder'
 
@@ -8,7 +15,8 @@ const mapDispatchToProps = {
   selectCharacter,
   loadResources,
   addAllCharacters,
-  followCrewRules
+  followCrewRules,
+  resetCrew
 }
 
 const mapStateToProps = (state) => ({

diff --git a/src/routes/Builder/modules/builder.js b/src/routes/Builder/modules/builder.js
@@ -9,6 +9,7 @@ export const SELECT_CHARACTER = 'SELECT_CHARACTER'
 export const LOAD_RESOURCES = 'LOAD_RESOURCES'
 export const ADD_ALL_CHARACTERS = 'ADD_ALL_CHARACTERS'
 export const FOLLOW_CREW_RULES = 'FOLLOW_CREW_RULES'
+export const RESET_CREW = 'RESET_CREW'
 
 // Actions
 
@@ -51,10 +52,19 @@ export function followCrewRules (followRules = true) {
   }
 }
 
+export function resetCrew () {
+  return {
+    type: RESET_CREW
+  }
+}
+
 export const actions = {
   selectCrew,
   selectCharacter,
-  loadResources
+  loadResources,
+  addAllCharacters,
+  followCrewRules,
+  resetCrew
 }
 
 export const selectCrewAction = (state, action) => {
@@ -96,6 +106,7 @@ export const selectCrewAction = (state, action) => {
   resultAvail.sort(sortCharacters)
   return Object.assign({}, state, {
     crewName: crewName,
+    crewId: action.crew.id,
     availableCharacters : resultAvail,
     characters : [],
     hiddenCharacters : [],
@@ -148,6 +159,15 @@ export const followRules = (state, action) => {
   return toggleFollowRules(state, action)
 }
 
+export const resetCurrentCrew = (state, action) => {
+  if (state.crewId === 'na' || state.crewName === 'default') {
+    return state
+  }
+  // Find the crew object
+  let crew = state.allCrews.find((crew) => crew.id === state.crewId && crew.name === state.crewName)
+  return selectCrewAction(state, { crew: crew })
+}
+
 // Action Handlers
 const ACTION_HANDLERS = {
   [SELECT_CREW] : (state, action) => {
@@ -164,11 +184,15 @@ const ACTION_HANDLERS = {
   },
   [FOLLOW_CREW_RULES]: (state, action) => {
     return followRules(state, action)
+  },
+  [RESET_CREW]: (state, action) => {
+    return resetCurrentCrew(state, action)
   }
 }
 
 const initialState = {
   crewName : 'default',
+  crewId : 'na',
   characters: [],
   availableCharacters: [],
   allCharacters: [],

diff --git a/tests/routes/Builder/modules/builder.spec.js b/tests/routes/Builder/modules/builder.spec.js
@@ -4,11 +4,13 @@ import {
   LOAD_RESOURCES,
   ADD_ALL_CHARACTERS,
   FOLLOW_CREW_RULES,
+  RESET_CREW,
   selectCrew,
   selectCharacter,
   loadResources,
   addAllCharacters,
   followCrewRules,
+  resetCrew,
   default as builderReducer
 } from 'routes/Builder/modules/builder'
 
@@ -195,7 +197,6 @@ describe('(Redux Module) Builder', () => {
 
     it('Suicide Squad should have Free Agents that are not generically available.', () => {
       expect(suicideSquadPopped).to.be.an('object')
-      console.log('Here it is: ' + JSON.stringify(suicideSquadPopped.availableCharacters.filter(filterCharacterAlias('Harley Quinn'))))
       expect(suicideSquadPopped.availableCharacters.filter(filterCharacterAlias('Katana (Suicide Squad)')).length).to.be.above(0)
     })
 
@@ -206,6 +207,18 @@ describe('(Redux Module) Builder', () => {
         expect(character.rank).to.be.a('string')
       })
     })
+
+    let watchmenCrew = loadedState.allCrews.find((crew) => crew.id === 'wm')
+    let watchmenCrewPopped = builderReducer(loadedState, selectCrew(watchmenCrew))
+    it('Should be able to select the Watchmen.', () => {
+      expect(watchmenCrewPopped).to.be.an('object')
+      expect(watchmenCrewPopped.crewName).to.equal('Watchmen')
+      expect(watchmenCrewPopped.crewId).to.equal('wm')
+    })
+
+    it('Should only have the 5 Watchmen.', () => {
+      expect(watchmenCrewPopped.availableCharacters.length).to.equal(5)
+    })
   })
 
   describe('(ActionCreator) selectCharacter', () => {
@@ -292,4 +305,38 @@ describe('(Redux Module) Builder', () => {
       expect(additionalState.followRules).to.equal(true)
     })
   })
+
+  describe('(ActionCreator) resetCrew', () => {
+    let loadedState = builderReducer(defaultState, loadResources())
+
+    describe('Suicide-Squad Reset Validator', () => {
+      let suicideSquadCrew = loadedState.allCrews.find((crew) => crew.id === 'ss')
+      let suicideSquadPopped = builderReducer(loadedState, selectCrew(suicideSquadCrew))
+      let allSelected = builderReducer(suicideSquadPopped, addAllCharacters())
+
+      it('Pretest validation', () => {
+        expect(allSelected.characters.length).to.equal(suicideSquadPopped.availableCharacters.length)
+      })
+
+      it('Should be able to reset an all selected crew.', () => {
+        let resetCrewState = builderReducer(allSelected, resetCrew())
+        expect(resetCrewState.availableCharacters.length).to.equal(suicideSquadPopped.availableCharacters.length)
+      })
+    })
+
+    describe('Batman Reset Validator', () => {
+      let batmanCrew = loadedState.allCrews.find((crew) => crew.id === 'bt')
+      let batmanCrewPopped = builderReducer(loadedState, selectCrew(batmanCrew))
+      let allSelected = builderReducer(batmanCrewPopped, addAllCharacters())
+
+      it('Pretest validation', () => {
+        expect(allSelected.characters.length).to.equal(batmanCrewPopped.availableCharacters.length)
+      })
+
+      it('Should be able to reset an all selected crew.', () => {
+        let resetCrewState = builderReducer(allSelected, resetCrew())
+        expect(resetCrewState.availableCharacters.length).to.equal(batmanCrewPopped.availableCharacters.length)
+      })
+    })
+  })
 })