X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fjs%2Fcomponents%2Ftournament%2FScoreboard.js;h=f13adacb61bbaa7a4465f88fb8b549ea535cca40;hb=2c5535946aa15278c6e969c9a9b24d32a45e5b12;hp=e142a80e030488f9a96d474d31d390b9a5259617;hpb=9e52cf7a5fc89a89301e00e9595c80b783449bbe;p=alttp.git
diff --git a/resources/js/components/tournament/Scoreboard.js b/resources/js/components/tournament/Scoreboard.js
index e142a80..f13adac 100644
--- a/resources/js/components/tournament/Scoreboard.js
+++ b/resources/js/components/tournament/Scoreboard.js
@@ -5,37 +5,91 @@ 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 }) =>
-
+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 ;
+ }
+ if (participant.placement === 2) {
+ return ;
+ }
+ if (participant.placement === 3) {
+ return ;
+ }
+ return participant.placement;
+};
+
+const twitchReg = /^https?:\/\/(www\.)?twitch\.tv/;
+const youtubeReg = /^https?:\/\/(www\.)?youtu(\.be|be\.)/;
+
+const getStreamVariant = participant => {
+ if (!participant || !participant.user || !participant.user.stream_link) {
+ return 'outline-secondary';
+ }
+ if (twitchReg.test(participant.user.stream_link)) {
+ return 'outline-twitch';
+ }
+ if (youtubeReg.test(participant.user.stream_link)) {
+ return 'outline-youtube';
+ }
+ return 'outline-secondary';
+};
+
+const getStreamIcon = participant => {
+ const variant = getStreamVariant(participant);
+ if (variant === 'outline-twitch') {
+ return ;
+ }
+ if (variant === 'outline-youtube') {
+ return ;
+ }
+ return ;
+};
+
+const Scoreboard = ({ tournament, user }) =>
+
+ {i18n.t('participants.placementShort')} |
{i18n.t('participants.participant')} |
- {i18n.t('participants.score')} |
+ {i18n.t('participants.scoreShort')} |
- {calculateScores(tournament).map(score =>
-
+ {getRunners(tournament).sort(comparePlacement).map(participant =>
+
+
+ {getPlacementDisplay(participant)}
+ |
-
- {score.participant.user.stream_link ?
+
+ {participant.user.stream_link ?
: null}
|
- {score.score} |
+ {participant.score} |
)}
@@ -44,6 +98,8 @@ const Scoreboard = ({ tournament }) =>
Scoreboard.propTypes = {
tournament: PropTypes.shape({
}),
+ user: PropTypes.shape({
+ }),
};
-export default withTranslation()(Scoreboard);
+export default withTranslation()(withUser(Scoreboard));