Feature/complete workflow #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vetom
approved these changes
Apr 5, 2017
wistcc
requested changes
Apr 8, 2017
| return { | ||
| key: c.key, | ||
| visible: werewolfService.isInDeck(c.key, currentDeck), | ||
| value: 1, |
There was a problem hiding this comment.
I think that this is not correct, isn't it?
There was a problem hiding this comment.
Actually, that's required to be hardcoded (for now). That's the initial amount that a card will have. In order to remove this hardcode number we should have a centralized storage of cards amount (yes, this actually exists in the werewolf brain but the api doesn't return cards amounts).
src/js/pages/Cards.js
Outdated
| <label><input type="checkbox" name={c.role} /> {c.role}</label> | ||
| </div> | ||
| <div class="col-md-6 col-xs-12" key={c.key}> | ||
| <label><input type="checkbox" onChange={this.setVisibility} checked={c.visible || false} name={c.key} /> {c.key}</label> |
There was a problem hiding this comment.
c.visible || false is not enough c.visible?
| import werewolfService from '../services/werewolf'; | ||
|
|
||
| const DEFAULT_GAME_MODE = 'balanced'; |
There was a problem hiding this comment.
Probably we should create another file with this 'balanced', 'chaosand'basic'`.
| <button onClick={browserHistory.goBack} className="btn btn-default pull-left col-md-2 col-xs-12 btn-space"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> | ||
| <button onClick={browserHistory.goBack} className="btn btn-default col-md-2 col-xs-12 btn-space"><i class="fa fa-arrow-left" aria-hidden="true"></i></button> | ||
| <button onClick={this.props.startGame.bind(this, "chaos")} className="btn btn-default col-md-4 col-md-offset-1 col-xs-12 btn-space"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</button> | ||
| <button onClick={this.props.startGame.bind(this, "balanced")} className="btn btn-default col-md-4 col-md-offset-1 col-xs-12 btn-space"><i class="fa fa-balance-scale" aria-hidden="true"></i> Quick Balanced</button> |
There was a problem hiding this comment.
Probably we should create another file with this 'balanced', 'chaosand'basic'`.
| <Link to={{pathname:"game", query:{type: "chaos"} }} className="btn btn-default col-md-4 pull-left"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</Link> | ||
| <Link to={{pathname:"game", query:{type: "balanced"} }} className="btn btn-default col-md-4 pull-right"><i class="fa fa-balance-scale" aria-hidden="true"></i> Quick Balanced</Link> | ||
| <button onClick={this.props.startGame.bind(this, "chaos")} className="btn btn-default col-md-5"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</button> | ||
| <button onClick={this.props.startGame.bind(this, "balanced")} className="btn btn-default col-md-5 col-md-offset-2"><i class="fa fa-balance-scale" aria-hidden="true"></i> Quick Balanced</button> |
There was a problem hiding this comment.
Probably we should create another file with this 'balanced', 'chaosand'basic'`.
| <Link to={{pathname:"game", query:{type: "chaos"} }} className="btn btn-danger pull-right col-md-4 col-xs-12 btn-space"><i class="fa fa-arrows" aria-hidden="true"></i> Start Chaos </Link> | ||
| <button onClick={browserHistory.goBack} className="btn btn-default pull-left col-md-2 col-xs-12 btn-space"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> | ||
| <button onClick={browserHistory.goBack} className="btn btn-default col-md-2 col-xs-12 btn-space"><i class="fa fa-arrow-left" aria-hidden="true"></i></button> | ||
| <button onClick={this.props.startGame.bind(this, "chaos")} className="btn btn-default col-md-4 col-md-offset-1 col-xs-12 btn-space"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</button> |
There was a problem hiding this comment.
Probably we should create another file with this 'balanced', 'chaosand'basic'`.
| </div> | ||
| <hr /> | ||
| <div class="col-md-12"> | ||
| <Link to={{pathname:"game", query:{type: "chaos"} }} className="btn btn-default col-md-4 pull-left"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</Link> | ||
| <Link to={{pathname:"game", query:{type: "balanced"} }} className="btn btn-default col-md-4 pull-right"><i class="fa fa-balance-scale" aria-hidden="true"></i> Quick Balanced</Link> | ||
| <button onClick={this.props.startGame.bind(this, "chaos")} className="btn btn-default col-md-5"><i class="fa fa-arrows" aria-hidden="true"></i> Quick Chaos</button> |
There was a problem hiding this comment.
Probably we should create another file with this 'balanced', 'chaosand'basic'`.
src/js/services/werewolf.js
Outdated
| } | ||
|
|
||
| getCards() { | ||
| return brain.getAllCards(); | ||
| const cards = brain.getCards(); | ||
| return Object.keys(cards).map(_ => {return {key: _, value: cards[_]}}); |
There was a problem hiding this comment.
I'm a full fan of always having very descriptive names!
wistcc
approved these changes
Apr 8, 2017
Open
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.