From acf6f7501b76462e39fcf7b78f743ce464d8739c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Fri, 8 Nov 2024 20:43:39 +0900 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=EA=B2=BD=EA=B8=B0=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A1=9C=EA=B3=A0=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/spectator/app/_components/GameList/Info.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/spectator/app/_components/GameList/Info.tsx b/apps/spectator/app/_components/GameList/Info.tsx index b758243e..63fd7793 100644 --- a/apps/spectator/app/_components/GameList/Info.tsx +++ b/apps/spectator/app/_components/GameList/Info.tsx @@ -1,3 +1,4 @@ +import { theme } from '@hcc/styles'; import Image from 'next/image'; import { GameListType, GameState } from '@/types/game'; @@ -25,6 +26,10 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) { width={IMAGE_SIZE} height={IMAGE_SIZE} loading="lazy" + style={{ + border: `1px solid ${theme.colors.gray50}`, + borderRadius: '50%', + }} /> {firstTeam.gameTeamName} @@ -40,6 +45,10 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) { width={IMAGE_SIZE} height={IMAGE_SIZE} loading="lazy" + style={{ + border: `1px solid ${theme.colors.gray50}`, + borderRadius: '50%', + }} /> {secondTeam.gameTeamName} From 50dfa8697dc1830cae945c71bac898fbfee764cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Fri, 8 Nov 2024 20:54:13 +0900 Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=EC=9D=91=EC=9B=90=20=EC=B9=B4?= =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=EB=A1=9C=EA=B3=A0=20=EB=B0=B0=EA=B2=BD=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx b/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx index f0b2a84b..30d37da9 100644 --- a/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx +++ b/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx @@ -1,5 +1,6 @@ 'use client'; +import { theme } from '@hcc/styles'; import { assignInlineVars } from '@vanilla-extract/dynamic'; import Image from 'next/image'; import { useState } from 'react'; @@ -79,6 +80,10 @@ export default function CheerTeamBox({ src={logoImageUrl} alt={`${gameTeamName} 로고`} loading="lazy" + style={{ + border: `1px solid ${theme.colors.gray50}`, + borderRadius: '50%', + }} /> {count.toLocaleString('ko-KR')} From 57e858d82425aa3df628bc691e2638f9906fabb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Fri, 8 Nov 2024 20:56:17 +0900 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=EB=9D=BC=EC=9D=B8=EC=97=85=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EB=B0=B0=EA=B2=BD=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spectator/app/game/[id]/_components/Lineup/index.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/spectator/app/game/[id]/_components/Lineup/index.tsx b/apps/spectator/app/game/[id]/_components/Lineup/index.tsx index a2ea30c9..88820d0a 100644 --- a/apps/spectator/app/game/[id]/_components/Lineup/index.tsx +++ b/apps/spectator/app/game/[id]/_components/Lineup/index.tsx @@ -1,3 +1,4 @@ +import { theme } from '@hcc/styles'; import { Accordion } from '@hcc/ui'; import { clsx } from 'clsx'; import Image from 'next/image'; @@ -27,6 +28,10 @@ export default function Lineup({ gameId }: LineupProps) { width={28} height={28} loading="lazy" + style={{ + border: `1px solid ${theme.colors.gray50}`, + borderRadius: '50%', + }} /> {homeTeam.teamName} @@ -48,6 +53,10 @@ export default function Lineup({ gameId }: LineupProps) { width={28} height={28} loading="lazy" + style={{ + border: `1px solid ${theme.colors.gray50}`, + borderRadius: '50%', + }} /> From 97aee769c739e63016e2f28088d287e6ce0ba5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Fri, 8 Nov 2024 21:01:06 +0900 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=EC=9D=91=EC=9B=90=ED=86=A1=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EB=B0=B0=EA=B2=BD=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/game/[id]/_components/CheerTalk/Item/Item.css.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spectator/app/game/[id]/_components/CheerTalk/Item/Item.css.ts b/apps/spectator/app/game/[id]/_components/CheerTalk/Item/Item.css.ts index b062a030..693f5454 100644 --- a/apps/spectator/app/game/[id]/_components/CheerTalk/Item/Item.css.ts +++ b/apps/spectator/app/game/[id]/_components/CheerTalk/Item/Item.css.ts @@ -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}`, From ae5cff367ace36e6adc9c596cba811b047fdec23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Sat, 9 Nov 2024 14:41:35 +0900 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=EC=98=88=EC=A0=95,=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=EB=B1=83=EC=A7=80=20=EB=B6=84=EA=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/_components/GameList/styles.css.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/spectator/app/_components/GameList/styles.css.ts b/apps/spectator/app/_components/GameList/styles.css.ts index 7e596446..5a713d08 100644 --- a/apps/spectator/app/_components/GameList/styles.css.ts +++ b/apps/spectator/app/_components/GameList/styles.css.ts @@ -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({ From 62b6380cb257861a62e106e9c3db2ef874a91cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Sat, 9 Nov 2024 20:34:47 +0900 Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=EB=B9=88=20=EC=9D=91=EC=9B=90?= =?UTF-8?q?=ED=86=A1=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_components/CheerTalk/List/List.css.ts | 8 ++ .../[id]/_components/CheerTalk/List/index.tsx | 81 ++++++++++--------- 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/apps/spectator/app/game/[id]/_components/CheerTalk/List/List.css.ts b/apps/spectator/app/game/[id]/_components/CheerTalk/List/List.css.ts index 313b3fde..2d68050e 100644 --- a/apps/spectator/app/game/[id]/_components/CheerTalk/List/List.css.ts +++ b/apps/spectator/app/game/[id]/_components/CheerTalk/List/List.css.ts @@ -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', diff --git a/apps/spectator/app/game/[id]/_components/CheerTalk/List/index.tsx b/apps/spectator/app/game/[id]/_components/CheerTalk/List/index.tsx index 5cb36b54..74296139 100644 --- a/apps/spectator/app/game/[id]/_components/CheerTalk/List/index.tsx +++ b/apps/spectator/app/game/[id]/_components/CheerTalk/List/index.tsx @@ -94,43 +94,50 @@ export default function CheerTalkList({ }, [checkScrollHeight]); return ( -
-
    - {hasNextPage && } -
  • - {/* HTTP */} - {cheerTalkList.map(talk => ( - - ))} - - {/* Socket */} - {socketTalkList.map(talk => ( - - ))} -
  • -
- - {showScrollToBottomButton && ( - + <> + {cheerTalkList.length === 0 && socketTalkList.length === 0 && ( +
+ 지금 우리 팀에게 첫 응원톡을 남겨주세요! 💪 +
)} -
+
+
    + {hasNextPage && } +
  • + {/* HTTP */} + {cheerTalkList.map(talk => ( + + ))} + + {/* Socket */} + {socketTalkList.map(talk => ( + + ))} +
  • +
+ + {showScrollToBottomButton && ( + + )} +
+ ); } From 0bf19d0aa878beb112e4001c627bb14921fd23c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Mon, 11 Nov 2024 22:15:07 +0900 Subject: [PATCH 7/9] =?UTF-8?q?feat:=20=EA=B2=BD=EA=B8=B0=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A1=9C=EA=B3=A0=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/_components/GameList/Info.tsx | 43 ++++++++----------- .../app/_components/GameList/styles.css.ts | 12 ++++++ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/apps/spectator/app/_components/GameList/Info.tsx b/apps/spectator/app/_components/GameList/Info.tsx index 63fd7793..7a751220 100644 --- a/apps/spectator/app/_components/GameList/Info.tsx +++ b/apps/spectator/app/_components/GameList/Info.tsx @@ -1,4 +1,3 @@ -import { theme } from '@hcc/styles'; import Image from 'next/image'; import { GameListType, GameState } from '@/types/game'; @@ -10,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; @@ -20,17 +17,15 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) {
- {`${firstTeam.gameTeamName} +
+ {`${firstTeam.gameTeamName} +
{firstTeam.gameTeamName} @@ -39,17 +34,15 @@ export default function GameInfo({ gameTeams, state }: GameInfoProps) {
- {`${secondTeam.gameTeamName} +
+ {`${secondTeam.gameTeamName} +
{secondTeam.gameTeamName} diff --git a/apps/spectator/app/_components/GameList/styles.css.ts b/apps/spectator/app/_components/GameList/styles.css.ts index 5a713d08..e44754b6 100644 --- a/apps/spectator/app/_components/GameList/styles.css.ts +++ b/apps/spectator/app/_components/GameList/styles.css.ts @@ -176,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', +}); From 8ef4e172e9cdaf16dd2659e3cb4c92bdac1a7d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Mon, 11 Nov 2024 22:19:36 +0900 Subject: [PATCH 8/9] =?UTF-8?q?feat:=20=EC=9D=91=EC=9B=90=EC=B9=B4?= =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=EB=A1=9C=EA=B3=A0=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/[id]/_components/CheerVS/TeamBox.tsx | 21 ++++++++----------- .../[id]/_components/CheerVS/styles.css.ts | 12 +++++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx b/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx index 30d37da9..65061a3c 100644 --- a/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx +++ b/apps/spectator/app/game/[id]/_components/CheerVS/TeamBox.tsx @@ -1,6 +1,5 @@ 'use client'; -import { theme } from '@hcc/styles'; import { assignInlineVars } from '@vanilla-extract/dynamic'; import Image from 'next/image'; import { useState } from 'react'; @@ -74,17 +73,15 @@ export default function CheerTeamBox({ })} onClick={handleCheerClick} > - {`${gameTeamName} +
+ {`${gameTeamName} +
{count.toLocaleString('ko-KR')} diff --git a/apps/spectator/app/game/[id]/_components/CheerVS/styles.css.ts b/apps/spectator/app/game/[id]/_components/CheerVS/styles.css.ts index dc7e6a6a..b391a0f3 100644 --- a/apps/spectator/app/game/[id]/_components/CheerVS/styles.css.ts +++ b/apps/spectator/app/game/[id]/_components/CheerVS/styles.css.ts @@ -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', +}); From 3ef022601c1051aa373bfa1bca9fb47beb9e3a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9C=A0=EC=A7=84?= Date: Mon, 11 Nov 2024 22:24:42 +0900 Subject: [PATCH 9/9] =?UTF-8?q?feat:=20=EB=9D=BC=EC=9D=B8=EC=97=85=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/[id]/_components/Lineup/index.tsx | 41 ++++++++----------- .../[id]/_components/Lineup/styles.css.ts | 12 ++++++ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/apps/spectator/app/game/[id]/_components/Lineup/index.tsx b/apps/spectator/app/game/[id]/_components/Lineup/index.tsx index 88820d0a..38da0e13 100644 --- a/apps/spectator/app/game/[id]/_components/Lineup/index.tsx +++ b/apps/spectator/app/game/[id]/_components/Lineup/index.tsx @@ -1,4 +1,3 @@ -import { theme } from '@hcc/styles'; import { Accordion } from '@hcc/ui'; import { clsx } from 'clsx'; import Image from 'next/image'; @@ -22,17 +21,15 @@ export default function Lineup({ gameId }: LineupProps) {
- {`${homeTeam.teamName} +
+ {`${homeTeam.teamName} +
{homeTeam.teamName}
@@ -47,17 +44,15 @@ export default function Lineup({ gameId }: LineupProps) {
{awayTeam.teamName} - {`${awayTeam.teamName} +
+ {`${awayTeam.teamName} +