feat(in-652): penalty score #225

Merged
andrey.dekterev merged 2 commits from IN-652-penalty-score into develop 3 years ago
  1. 14
      src/features/MatchCard/CardFrontside/MatchCardMobile/index.tsx
  2. 14
      src/features/MatchCard/CardFrontside/MatchCardMobile/styled.tsx
  3. 14
      src/features/MatchCard/CardFrontside/index.tsx
  4. 30
      src/features/MatchCard/Score/index.tsx
  5. 31
      src/features/MatchCard/Score/styled.tsx
  6. 2
      src/features/MatchCard/styled.tsx
  7. 26
      src/features/MatchPage/components/MatchDescription/index.tsx
  8. 5
      src/features/MatchPage/components/MatchDescription/styled.tsx
  9. 1
      src/requests/getLiveScores.tsx
  10. 1
      src/requests/getMatchInfo.tsx
  11. 1
      src/requests/getMatches/types.tsx

@ -35,7 +35,6 @@ import {
MatchTimeInfo,
Preview,
PreviewWrapper,
Score,
Team,
TeamName,
Teams,
@ -50,6 +49,7 @@ import {
MobTime,
} from './styled'
import { useCardPreview } from '../hooks'
import { Score } from '../../Score'
type Props = {
isNeedFormatTimeChanged: boolean,
@ -159,14 +159,22 @@ export const CardFrontsideMobile = ({
<TeamName nameObj={team1} />
{team1InFavorites && <FavoriteSign />}
</NameSignWrapper>
{showScore && <Score>{score?.team1.score ?? team1.score}</Score>}
<Score
showScore={showScore}
score={score?.team1.score ?? team1.score}
penaltyScore={score?.team1.penalty_score ?? team1.penalty_score}
/>
</Team>
<Team>
<NameSignWrapper>
<TeamName nameObj={team2} />
{team2InFavorites && <FavoriteSign />}
</NameSignWrapper>
{showScore && <Score>{score?.team2.score ?? team2.score}</Score>}
<Score
showScore={showScore}
score={score?.team2.score ?? team2.score}
penaltyScore={score?.team2.penalty_score ?? team2.penalty_score}
/>
</Team>
</Teams>
<SecondaryInfo>

@ -199,7 +199,7 @@ export const Info = styled.div`
left: 45%; */
width: 60%;
height: 100%;
padding: 9px 9px 9px 19px;
padding: 9px 11px 9px 19px;
`
: ''};
`
@ -304,18 +304,6 @@ export const TeamName = styled(Name)`
${nameStyles}
`
export const Score = styled.div`
${isMobileDevice
? css`
display: flex;
justify-content: center;
width: 15px;
`
: ''};
`
export const TeamLogos = styled.div`
display: flex;
align-items: center;

@ -19,6 +19,7 @@ import { useUserFavoritesStore } from 'features/UserFavorites/store'
import { TournamentSubtitle } from 'features/TournamentSubtitle'
import { NoAccessMessage } from '../NoAccessMessage'
import { Score } from '../Score'
import {
CardWrapperOuter,
CardWrapper,
@ -28,7 +29,6 @@ import {
MatchTimeInfo,
Preview,
PreviewWrapper,
Score,
Team,
TeamName,
Teams,
@ -206,7 +206,11 @@ export const CardFrontside = ({
<TeamName nameObj={team1} />
{team1InFavorites && <FavoriteSign />}
</NameSignWrapper>
{showScore && <Score>{score?.team1.score ?? team1.score}</Score>}
<Score
showScore={showScore}
score={score?.team1.score ?? team1.score}
penaltyScore={score?.team1.penalty_score ?? team1.penalty_score}
/>
</Team>
<Team isMatchPage={isMatchPage}>
<NameSignWrapper>
@ -224,7 +228,11 @@ export const CardFrontside = ({
<TeamName nameObj={team2} />
{team2InFavorites && <FavoriteSign />}
</NameSignWrapper>
{showScore && <Score>{score?.team2.score ?? team2.score}</Score>}
<Score
showScore={showScore}
score={score?.team2.score ?? team2.score}
penaltyScore={score?.team2.penalty_score ?? team2.penalty_score}
/>
</Team>
</Teams>
{!isMatchPage && (

@ -0,0 +1,30 @@
import {
MainScore,
ScoreWrapper,
PenaltyScore,
} from './styled'
type Props = {
penaltyScore?: number | null,
score?: number | null,
showScore: boolean,
}
export const Score = ({
penaltyScore,
score,
showScore,
}: Props) => {
if (!showScore) return null
return (
<ScoreWrapper>
<MainScore>
{score}
</MainScore>
<PenaltyScore>
{penaltyScore}
</PenaltyScore>
</ScoreWrapper>
)
}

@ -0,0 +1,31 @@
import styled, { css } from 'styled-components/macro'
import { isMobileDevice } from 'config/userAgent'
export const MainScore = styled.div`
${isMobileDevice
? css`
display: flex;
justify-content: center;
`
: ''};
`
export const ScoreWrapper = styled.div`
display: flex;
line-height: 1;
`
export const PenaltyScore = styled.div`
font-weight: 400;
font-size: .55rem;
margin-left: 1px;
${isMobileDevice
? css`
font-size: 10px;
`
: ''};
`

@ -274,8 +274,6 @@ export const TeamName = styled(Name)`
${nameStyles}
`
export const Score = styled.div``
export const TeamLogos = styled.div<CardProps>`
display: ${({ isMatchPage }) => (isMatchPage ? 'none' : 'flex')};
align-items: center;

@ -1,4 +1,4 @@
import { useCallback } from 'react'
import { Fragment, useCallback } from 'react'
import { useQuery } from 'react-query'
@ -41,6 +41,7 @@ import {
Time,
Title,
Views,
PenaltyScore,
} from './styled'
export const MatchDescription = () => {
@ -93,6 +94,7 @@ export const MatchDescription = () => {
parseDate(date),
isChangedTimeFormat ? 'h:mm a' : 'HH:mm',
)
const isPenaltyScoreShow = queryScore?.team1.penalty_score || team1.penalty_score
return (
<Description isHidden={!profileCardShown}>
@ -111,8 +113,26 @@ export const MatchDescription = () => {
{
isScoreHidden || isNil(team1.score) || isNil(team2.score)
? '-'
: `${queryScore?.team1.score ?? team1.score} - ${queryScore?.team2.score ?? team2.score}`
: (
<Fragment>
{queryScore?.team1.score ?? team1.score}
{isPenaltyScoreShow && (
<PenaltyScore>
({queryScore?.team1.penalty_score ?? team1.penalty_score})
</PenaltyScore>
)}
{` - ${queryScore?.team2.score ?? team2.score}`}
{isPenaltyScoreShow && (
<PenaltyScore>
({queryScore?.team2.penalty_score ?? team2.penalty_score})
</PenaltyScore>
)}
</Fragment>
)
}
</Score>
<StyledLink

@ -40,6 +40,11 @@ export const Score = styled.span`
: ''};
`
export const PenaltyScore = styled.span`
font-weight: 400;
opacity: .8;
`
export const StyledLink = styled(ProfileLink)`
display: flex;
align-items: center;

@ -4,6 +4,7 @@ import { API_ROOT } from 'config'
type ScoreTeam = {
id: number,
penalty_score: number | null,
score: number | null,
}

@ -16,6 +16,7 @@ export type Team = {
id: number,
name_eng: string,
name_rus: string,
penalty_score: number | null,
score: number,
shirt_color: string | null,
}

@ -22,6 +22,7 @@ type Team = {
media?: AwsTeamMedia,
name_eng: string,
name_rus: string,
penalty_score?: number | null,
score?: number | null,
}

Loading…
Cancel
Save