Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added roles to player tables #2290

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added roles to player tables #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95a442a
Added roles for players
ahi-el Nov 15, 2019
0671fd0
only render if defined
ahi-el Nov 15, 2019
1884037
Merge branch 'master' into add-role
ahi-el Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/Match/matchColumns.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default (strings) => {
predictedVictory={row.pred_vict}
leaverStatus={row.leaver_status}
hero={compileLevelOneStats(heroes[row.hero_id])}
role={row.desc}
/>);
};

Expand Down
3 changes: 3 additions & 0 deletions src/components/Visualizations/Table/HeroImage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ class TableHeroImage extends React.Component {
leaverStatus,
strings,
hero = {},
role,
} = this.props;
const { tooltipVisible } = this.state;

Expand Down Expand Up @@ -576,6 +577,7 @@ class TableHeroImage extends React.Component {
</TableLink>
: title}
</span>
{role && <span>{role}</span>}
{subtitle &&
<span style={subTextStyle} className="subTextContainer">
{subtitle}
Expand Down Expand Up @@ -724,6 +726,7 @@ TableHeroImage.propTypes = {
strings: shape({}),
hero: shape({}),
heroID: number,
role: string,
};

// If need party or estimated, just add new prop with default val = solo and change icons depending what needs
Expand Down