Merge branch 'display-full-name-games' into 'master'

rename username to fullName See merge request os-incubator/kicker/kicker-v2!38
zensoftio · Feb 22, 2019 · 0f64b13 · 0f64b13
2 parents d73ea49 + 1ddadcd
commit 0f64b13
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/common/global-prop-types.js b/frontend/src/common/global-prop-types.js
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 export const PlayerModel = PropTypes.shape({
   iconPath: PropTypes.string,
   id: PropTypes.number.isRequired,
-  username: PropTypes.string.isRequired
+	fullName: PropTypes.string.isRequired
 })
 
 export const GameModel = PropTypes.shape({

diff --git a/frontend/src/components/all-games/index.js b/frontend/src/components/all-games/index.js
@@ -19,14 +19,14 @@ const AllGames = ({games, totalCount, appendToGames}) => {
         <InfiniteScroll data={games} onLoadMore={onLoadMore} totalCount={totalCount}>
           {games.length ? games.map(i => <GameBlock key={i.id} losersGoals={i.losersGoals} isMobile={isMobile}
                                                     winner1Icon={i.winner1.iconPath} winner1Id={i.winner1.id}
-                                                    winner1Name={i.winner1.username}
+                                                    winner1Name={i.winner1.fullName}
                                                     winner2Id={i.winner2.id} winner2Icon={i.winner2.iconPath}
-                                                    winner2Name={i.winner2.username}
+                                                    winner2Name={i.winner2.fullName}
                                                     loser1Id={i.loser1.id} loser1Icon={i.loser1.iconPath}
-                                                    loser1Name={i.loser1.username}
+                                                    loser1Name={i.loser1.fullName}
                                                     loser2Id={i.loser2.id} loser2Icon={i.loser2.iconPath}
-                                                    loser2Name={i.loser2.username} date={i.date}
-                                                    reportedBy={i.reportedBy.username} reportedById={i.reportedBy.id}/>) :
+                                                    loser2Name={i.loser2.fullName} date={i.date}
+                                                    reportedBy={i.reportedBy.fullName} reportedById={i.reportedBy.id}/>) :
             <NoContent/>
           }
         </InfiniteScroll>

diff --git a/frontend/src/scenes/ProfileScene/index.js b/frontend/src/scenes/ProfileScene/index.js
@@ -69,7 +69,7 @@ class ProfileScene extends Component {
                          bestPartner={relationsDashboard && relationsDashboard.bestPartner}
                          worstPartner={relationsDashboard && relationsDashboard.worstPartner}
                          favoritePartner={relationsDashboard && relationsDashboard.favoritePartner}
-                         username={player.username} isCurrent={isCurrent} countLosses={player.countLosses}
+												 fullName={player.fullName} isCurrent={isCurrent} countLosses={player.countLosses}
                          countWins={player.countWins} winningPercentage={player.winningPercentage}
                          currentLossStreak={player.currentLossesStreak} currentWinStreak={player.currentWinningStreak}
                          longestLossStreak={player.longestLossesStreak} longestWinStreak={player.longestWinningStreak}/>