Match vision tab overhaul #469
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,5 +43,4 @@ | |
| </script> | ||
| <script src="/build/bundle.js"></script> | ||
| </body> | ||
| </html> | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| import React from 'react'; | ||
| import { | ||
| Row, | ||
| Col, | ||
| } from 'react-flexbox-grid'; | ||
| import Avatar from 'material-ui/Avatar'; | ||
| import Button from 'material-ui/RaisedButton'; | ||
| import { | ||
| grey800 as filterOff, | ||
| blueGrey700 as filterOn, | ||
| } from 'material-ui/styles/colors'; | ||
| import styles from '../Match.css'; // extract filters from there | ||
|
|
||
| import { heroTd } from '../matchColumns'; | ||
|
|
||
|
|
||
| export default class PlayerFilter extends React.PureComponent { | ||
| constructor(props) { | ||
| super(props); | ||
| this.getObserverCount = () => this.props.player.obs_log.length; | ||
| this.getSentryCount = () => this.props.player.sen_log.length; | ||
| this.getMuiThemeProps = () => ({ | ||
| fullWidth: true, | ||
| disabledBackgroundColor: filterOff, | ||
| }); | ||
| } | ||
|
|
||
| generateFilterKey(type) { | ||
|
Member
There was a problem hiding this comment. don't you need to bind this in the constructor so you don't lose 'this' context? |
||
| return `${this.props.player.player_slot}-${type}`; | ||
| } | ||
|
|
||
| render() { | ||
| const { | ||
| player, | ||
| onFilterClick, | ||
| } = this.props; | ||
| const obsCount = this.getObserverCount(); | ||
| const senCount = this.getSentryCount(); | ||
| const [opacityOn, opacityOff] = [1, 0.4]; | ||
| return ( | ||
| <Row | ||
| className={styles['filter-row']} | ||
|
Member
There was a problem hiding this comment. We use camelcase in the css files so we don't need to do things like this. I know camelCase isn't standard css, but for css-modules, it is. |
||
| middle="xs" | ||
| between="xs" | ||
| > | ||
| <Col xs={12} sm={7}> | ||
| <Row xs> | ||
| <Col>{heroTd(player)}</Col> | ||
| </Row> | ||
| </Col> | ||
| <Col xs={12} sm={5}> | ||
| <Row> | ||
| <Col xs> | ||
| <Button | ||
| {...this.getMuiThemeProps()} | ||
| label={obsCount} | ||
| disabled={!obsCount} | ||
| backgroundColor={this.generateFilterKey('observer') in this.props.activeFilters ? filterOff : filterOn} | ||
| style={{ opacity: obsCount > 0 ? opacityOn : opacityOff }} | ||
| onClick={() => onFilterClick(this.generateFilterKey('observer'), player.player_slot, 'observer')} | ||
| icon={<Avatar size={24} src={`${API_HOST}/apps/dota2/images/items/ward_observer_lg.png`} />} | ||
| /> | ||
| </Col> | ||
| <Col xs> | ||
| <Button | ||
| {...this.getMuiThemeProps()} | ||
| label={senCount} | ||
| disabled={!senCount} | ||
| backgroundColor={this.generateFilterKey('sentry') in this.props.activeFilters ? filterOff : filterOn} | ||
| style={{ opacity: senCount > 0 ? opacityOn : opacityOff }} | ||
| onClick={() => onFilterClick(this.generateFilterKey('sentry'), player.player_slot, 'sentry')} | ||
| icon={<Avatar size={24} src={`${API_HOST}/apps/dota2/images/items/ward_sentry_lg.png`} />} | ||
| /> | ||
| </Col> | ||
| </Row> | ||
| </Col> | ||
| </Row> | ||
| ); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this new 7 dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me explain why those have been added: