X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Frounds%2FItem.js;h=0ef77c5d2c5ce6b9bec1c8798ddba6c184b43a77;hb=e5192dadab765ecf0cdb877e0497293e0c9f1e45;hp=6eb3d9446809a34d8eac6711f65f5031bc709720;hpb=9160186db0ea1b0da0edfec49cb3d99ead213bc4;p=alttp.git diff --git a/resources/js/components/rounds/Item.js b/resources/js/components/rounds/Item.js index 6eb3d94..0ef77c5 100644 --- a/resources/js/components/rounds/Item.js +++ b/resources/js/components/rounds/Item.js @@ -1,22 +1,21 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { withTranslation } from 'react-i18next'; +import { useTranslation } from 'react-i18next'; +import EditButton from './EditButton'; import LockButton from './LockButton'; import SeedButton from './SeedButton'; import SeedCode from './SeedCode'; import SeedRolledBy from './SeedRolledBy'; import List from '../results/List'; import ReportButton from '../results/ReportButton'; -import { isRunner } from '../../helpers/permissions'; +import { mayEditRound, mayReportResult, isRunner } from '../../helpers/permissions'; import { isComplete } from '../../helpers/Round'; -import { findParticipant } from '../../helpers/Tournament'; import { hasFinishedRound } from '../../helpers/User'; -import { withUser } from '../../helpers/UserContext'; -import i18n from '../../i18n'; +import { useUser } from '../../hooks/user'; const getClassName = (round, tournament, user) => { - const classNames = ['round', 'd-flex']; + const classNames = ['round']; if (round.locked) { classNames.push('is-locked'); } else { @@ -38,41 +37,57 @@ const getClassName = (round, tournament, user) => { const Item = ({ round, tournament, - user, -}) => -
- {round.number ? `#${round.number} ` : '#?'} - {i18n.t('rounds.date', { date: new Date(round.created_at) })} -
-
- {round.code ?
- <>
-
- >
- : null}
-
-
+ {tournament.show_numbers && round.number ? `#${round.number} ` : ''} + {t('rounds.date', { date: new Date(round.created_at) })} +
+
+ {round.code && round.code.length ?
+ <>
+
+ >
+ : null}
+
+
{t('rounds.numberOfResults', { count: round.results.length })}
+ : null} +