server calculated scoring

[alttp.git] / resources / js / components / tournament / Scoreboard.js

diff --git a/resources/js/components/tournament/Scoreboard.js b/resources/js/components/tournament/Scoreboard.js
index e142a80e030488f9a96d474d31d390b9a5259617..40ad82ff300724acda076a5f7038d1546b723c5e 100644 (file)
--- a/resources/js/components/tournament/Scoreboard.js
+++ b/resources/js/components/tournament/Scoreboard.js
@@ -5,26 +5,53 @@ import { withTranslation } from 'react-i18next';
 
 import Icon from '../common/Icon';
 import Box from '../users/Box';
-import { calculateScores } from '../../helpers/Tournament';
+import { comparePlacement } from '../../helpers/Participant';
+import { getRunners } from '../../helpers/Tournament';
+import { withUser } from '../../helpers/UserContext';
 import i18n from '../../i18n';
 
-const Scoreboard = ({ tournament }) =>
-<Table striped className="scoreboard">
+const getRowClassName = (tournament, participant, user) => {
+       const classNames = ['score'];
+       if (participant && user && participant.user_id == user.id) {
+               classNames.push('is-self');
+       }
+       return classNames.join(' ');
+};
+
+const getPlacementDisplay = participant => {
+       if (participant.placement === 1) {
+               return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
+       }
+       if (participant.placement === 2) {
+               return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
+       }
+       if (participant.placement === 3) {
+               return <Icon.THIRD_PLACE className="text-bronze" size="lg" />;
+       }
+       return participant.placement;
+};
+
+const Scoreboard = ({ tournament, user }) =>
+<Table striped className="scoreboard align-middle">
        <thead>
                <tr>
+                       <th className="text-center">{i18n.t('participants.placementShort')}</th>
                        <th>{i18n.t('participants.participant')}</th>
-                       <th className="text-end">{i18n.t('participants.score')}</th>
+                       <th className="text-end">{i18n.t('participants.scoreShort')}</th>
                </tr>
        </thead>
        <tbody>
-       {calculateScores(tournament).map(score =>
-               <tr className="score" key={score.participant.id}>
+       {getRunners(tournament).sort(comparePlacement).map(participant =>
+               <tr className={getRowClassName(tournament, participant, user)} key={participant.id}>
+                       <td className="text-center">
+                               {getPlacementDisplay(participant)}
+                       </td>
                        <td>
                                <div className="d-flex align-items-center justify-content-between">
-                                       <Box user={score.participant.user} />
-                                       {score.participant.user.stream_link ?
+                                       <Box user={participant.user} />
+                                       {participant.user.stream_link ?
                                                <Button
-                                                       href={score.participant.user.stream_link}
+                                                       href={participant.user.stream_link}
                                                        size="sm"
                                                        target="_blank"
                                                        title={i18n.t('users.stream')}
@@ -35,7 +62,7 @@ const Scoreboard = ({ tournament }) =>
                                        : null}
                                </div>
                        </td>
-                       <td className="text-end text-lg">{score.score}</td>
+                       <td className="text-end">{participant.score}</td>
                </tr>
        )}
        </tbody>
@@ -44,6 +71,8 @@ const Scoreboard = ({ tournament }) =>
 Scoreboard.propTypes = {
        tournament: PropTypes.shape({
        }),
+       user: PropTypes.shape({
+       }),
 };
 
-export default withTranslation()(Scoreboard);
+export default withTranslation()(withUser(Scoreboard));