Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: qa 반영 #355

Merged
merged 9 commits into from
Nov 13, 2024
Merged

feat: qa 반영 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
acf6f75
feat: 경기 리스트 로고 배경 제거
siawase17 Nov 8, 2024
50dfa86
feat: 응원 카운트 로고 배경 제거
siawase17 Nov 8, 2024
57e858d
feat: 라인업 로고 배경 제거
siawase17 Nov 8, 2024
97aee76
feat: 응원톡 로고 배경 제거
siawase17 Nov 8, 2024
ae5cff3
feat: 예정, 종료 뱃지 분간
siawase17 Nov 9, 2024
62b6380
feat: 빈 응원톡 메시지 표시
siawase17 Nov 9, 2024
0bf19d0
feat: 경기리스트 로고 스타일 분리
siawase17 Nov 11, 2024
8ef4e17
feat: 응원카운트 로고 스타일 분리
siawase17 Nov 11, 2024
3ef0226
feat: 라인업 로고 스타일 분리
siawase17 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions apps/spectator/app/_components/GameList/Info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ type GameInfoProps = {
state: GameState;
};

const IMAGE_SIZE = 26;

export default function GameInfo({ gameTeams, state }: GameInfoProps) {
// todo: fisished 상태일 때 경기 승패를 score 색상으로 표시
const [firstTeam, secondTeam] = gameTeams;
Expand All @@ -19,13 +17,15 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) {
<div className={styles.infoContainer}>
<div className={styles.gameInfoRow.root}>
<div className={styles.gameInfoRow.team}>
<Image
src={firstTeam.logoImageUrl}
alt={`${firstTeam.gameTeamName} logo`}
width={IMAGE_SIZE}
height={IMAGE_SIZE}
loading="lazy"
/>
<div className={styles.logoContainer}>
<Image
src={firstTeam.logoImageUrl}
alt={`${firstTeam.gameTeamName} logo`}
loading="lazy"
fill
className={styles.logoImg}
/>
</div>
<span className={styles.gameInfoRow.teamName}>
{firstTeam.gameTeamName}
</span>
Expand All @@ -34,13 +34,15 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) {
</div>
<div className={styles.gameInfoRow.root}>
<div className={styles.gameInfoRow.team}>
<Image
src={secondTeam.logoImageUrl}
alt={`${secondTeam.gameTeamName} logo`}
width={IMAGE_SIZE}
height={IMAGE_SIZE}
loading="lazy"
/>
<div className={styles.logoContainer}>
<Image
src={secondTeam.logoImageUrl}
alt={`${secondTeam.gameTeamName} logo`}
loading="lazy"
fill
className={styles.logoImg}
/>
</div>
<span className={styles.gameInfoRow.teamName}>
{secondTeam.gameTeamName}
</span>
Expand Down
28 changes: 26 additions & 2 deletions apps/spectator/app/_components/GameList/styles.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,20 @@ export const state = styleVariants({
backgroundColor: theme.colors.red600,
},
],
SCHEDULED: [baseState],
FINISHED: [baseState],
SCHEDULED: [
baseState,
{
color: theme.colors.blue600,
backgroundColor: theme.colors.blue200,
},
],
FINISHED: [
baseState,
{
color: theme.colors.white,
backgroundColor: theme.colors.gray300,
},
],
});

export const timestamp = style({
Expand Down Expand Up @@ -164,3 +176,15 @@ export const errorFallback = styleVariants({
color: theme.colors.gray[5],
},
});

export const logoContainer = style({
width: rem(26),
height: rem(26),
position: 'relative',
});

export const logoImg = style({
border: `1px solid ${theme.colors.gray50}`,
borderRadius: '50%',
objectFit: 'cover',
});
2 changes: 2 additions & 0 deletions apps/spectator/app/game/[id]/_components/CheerTalk/Item/Item.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export const item = styleVariants({
teamLogo: {
userSelect: 'none',
alignSelf: 'center',
border: `1px solid ${theme.colors.gray50}`,
borderRadius: '50%',
},
content: {
padding: `${theme.spaces.xs} ${theme.spaces.sm}`,
Expand Down
8 changes: 8 additions & 0 deletions apps/spectator/app/game/[id]/_components/CheerTalk/List/List.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ export const list = styleVariants({
},
});

export const emptyMsg = style({
display: 'flex',
flex: 1,
fontSize: theme.textVariants.default.fontSize,
alignItems: 'center',
justifyContent: 'center',
});

export const scrollToBottomButton = style({
position: 'absolute',
display: 'flex',
Expand Down
81 changes: 44 additions & 37 deletions apps/spectator/app/game/[id]/_components/CheerTalk/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,43 +94,50 @@ export default function CheerTalkList({
}, [checkScrollHeight]);

return (
<div className={styles.list.container}>
<ul ref={scrollRef} className={styles.list.content}>
{hasNextPage && <Spinner />}
<li ref={ref} />
{/* HTTP */}
{cheerTalkList.map(talk => (
<CheerTalkItemMemo
key={`cheer-${talk.cheerTalkId}`}
hasMenu
{...talk}
/>
))}

{/* Socket */}
{socketTalkList.map(talk => (
<CheerTalkItemMemo
key={`socket-${talk.cheerTalkId}`}
hasMenu
{...talk}
/>
))}
<li ref={bottomRef} />
</ul>
<CheerTalkForm
gameTeams={gameDetail.gameTeams}
saveCheerTalkMutate={mutate}
scrollToBottom={run}
/>
{showScrollToBottomButton && (
<button
className={styles.scrollToBottomButton}
onClick={run}
type="button"
>
<Icon source={ArrowDownIcon} size={16} color="black" />
</button>
<>
{cheerTalkList.length === 0 && socketTalkList.length === 0 && (
<div className={styles.emptyMsg}>
지금 우리 팀에게 첫 응원톡을 남겨주세요! 💪
</div>
)}
</div>
<div className={styles.list.container}>
<ul ref={scrollRef} className={styles.list.content}>
{hasNextPage && <Spinner />}
<li ref={ref} />
{/* HTTP */}
{cheerTalkList.map(talk => (
<CheerTalkItemMemo
key={`cheer-${talk.cheerTalkId}`}
hasMenu
{...talk}
/>
))}

{/* Socket */}
{socketTalkList.map(talk => (
<CheerTalkItemMemo
key={`socket-${talk.cheerTalkId}`}
hasMenu
{...talk}
/>
))}
<li ref={bottomRef} />
</ul>
<CheerTalkForm
gameTeams={gameDetail.gameTeams}
saveCheerTalkMutate={mutate}
scrollToBottom={run}
/>
{showScrollToBottomButton && (
<button
className={styles.scrollToBottomButton}
onClick={run}
type="button"
>
<Icon source={ArrowDownIcon} size={16} color="black" />
</button>
)}
</div>
</>
);
}
16 changes: 9 additions & 7 deletions apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ export default function CheerTeamBox({
})}
onClick={handleCheerClick}
>
<Image
width={36}
height={36}
src={logoImageUrl}
alt={`${gameTeamName} 로고`}
loading="lazy"
/>
<div className={styles.logoContainer}>
<Image
src={logoImageUrl}
alt={`${gameTeamName} 로고`}
loading="lazy"
fill
className={styles.logoImg}
/>
</div>
<span className={styles.countNumber}>
{count.toLocaleString('ko-KR')}
</span>
Expand Down
12 changes: 12 additions & 0 deletions apps/spectator/app/game/[id]/_components/CheerVS/styles.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,15 @@ export const skeleton = styleVariants({
},
],
});

export const logoContainer = style({
width: rem(36),
height: rem(36),
position: 'relative',
});

export const logoImg = style({
border: `1px solid ${theme.colors.gray50}`,
borderRadius: '50%',
objectFit: 'cover',
});
32 changes: 18 additions & 14 deletions apps/spectator/app/game/[id]/_components/Lineup/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ export default function Lineup({ gameId }: LineupProps) {
<div className={clsx(styles.container, styles.starterContainer)}>
<div className={styles.teamContainer}>
<div className={styles.team.left}>
<Image
src={homeTeam.logoImageUrl}
alt={`${homeTeam.teamName} logo image`}
width={28}
height={28}
loading="lazy"
/>
<div className={styles.logoContainer}>
<Image
src={homeTeam.logoImageUrl}
alt={`${homeTeam.teamName} logo image`}
loading="lazy"
fill
className={styles.logoImg}
/>
</div>
<span className={styles.teamName.left}>{homeTeam.teamName}</span>
</div>

Expand All @@ -42,13 +44,15 @@ export default function Lineup({ gameId }: LineupProps) {
<div className={styles.teamContainer}>
<div className={styles.team.right}>
<span className={styles.teamName.right}>{awayTeam.teamName}</span>
<Image
src={awayTeam.logoImageUrl}
alt={`${awayTeam.teamName} logo image`}
width={28}
height={28}
loading="lazy"
/>
<div className={styles.logoContainer}>
<Image
src={awayTeam.logoImageUrl}
alt={`${awayTeam.teamName} logo image`}
loading="lazy"
fill
className={styles.logoImg}
/>
</div>
</div>

<PlayerList
Expand Down
12 changes: 12 additions & 0 deletions apps/spectator/app/game/[id]/_components/Lineup/styles.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,15 @@ export const errorFallback = styleVariants({
fontWeight: 500,
},
});

export const logoContainer = style({
width: rem(28),
height: rem(28),
position: 'relative',
});

export const logoImg = style({
border: `1px solid ${theme.colors.gray50}`,
borderRadius: '50%',
objectFit: 'cover',
});