From b5cd315b1390a1326dc232c059aa081c3f541867 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Sat, 2 Mar 2024 20:17:00 +0900 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20done=20detail=20room=20empty=20?= =?UTF-8?q?view=20=EC=A4=91=EC=95=99=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyPage/Detail/DetailDoneRoom/DetailDoneRoom.style.ts | 2 +- src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.tsx | 8 +++++--- .../Detail/DetailProgressRoom/DetailProgress.style.ts | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.style.ts b/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.style.ts index 9386a741..bf8a240b 100644 --- a/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.style.ts +++ b/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.style.ts @@ -3,6 +3,7 @@ import styled from 'styled-components'; export const DetailDoneRoomWrapper = styled.div` ${({ theme: { mixin } }) => mixin.flexCenter({})}; width: 100%; + height: 100vh; padding: 0 2rem; `; @@ -22,7 +23,6 @@ export const EmptyWrapper = styled.div` height: 100%; gap: 1.2rem; margin: 0 2rem; - margin-top: 15.9rem; `; export const EmptyText = styled.div` diff --git a/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.tsx b/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.tsx index 1082c9de..a4d6968a 100644 --- a/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.tsx +++ b/src/pages/MyPage/Detail/DetailDoneRoom/DetailDoneRoom.tsx @@ -24,9 +24,11 @@ const DetailDoneRoom = () => { return ( - + <> {Array.isArray(data) && data.length > 0 ? ( - data.map(renderDoneRoomCard) + + {data.map((item, index) => renderDoneRoomCard(item, index))} + ) : ( @@ -34,7 +36,7 @@ const DetailDoneRoom = () => { 새로운 선물 준비하기 )} - + ); }; diff --git a/src/pages/MyPage/Detail/DetailProgressRoom/DetailProgress.style.ts b/src/pages/MyPage/Detail/DetailProgressRoom/DetailProgress.style.ts index 5234c12b..d63acf19 100644 --- a/src/pages/MyPage/Detail/DetailProgressRoom/DetailProgress.style.ts +++ b/src/pages/MyPage/Detail/DetailProgressRoom/DetailProgress.style.ts @@ -3,7 +3,7 @@ import styled from 'styled-components'; export const DetailProgressRoomWrapper = styled.div` ${({ theme: { mixin } }) => mixin.flexCenter({})}; width: 100%; - height: 100%; + height: 100vh; padding: 0 2rem; `; @@ -23,7 +23,6 @@ export const EmptyWrapper = styled.div` height: 100%; gap: 1.2rem; margin: 0 2rem; - margin-top: 15.9rem; `; export const EmptyText = styled.div` From 5e6525c2ff41f27538d39eeddefbc8a7144c56a1 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Mon, 4 Mar 2024 12:09:19 +0900 Subject: [PATCH 2/7] =?UTF-8?q?style:=20count=20user=20gap=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardRoom/CardRoom.style.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/CardRoom/CardRoom.style.ts b/src/components/CardRoom/CardRoom.style.ts index 5632a49f..6de670c0 100644 --- a/src/components/CardRoom/CardRoom.style.ts +++ b/src/components/CardRoom/CardRoom.style.ts @@ -48,6 +48,7 @@ export const CountUser = styled.div` color: ${({ theme: { colors } }) => colors.G_07}; margin: 0 1.2rem; margin-top: 0.4rem; + gap: 0.2rem; `; export const TagWrapper = styled.div` @@ -67,3 +68,8 @@ export const SettingWrapper = styled.div` margin-top: 0.8rem; cursor: pointer; `; + +export const IcUserWrapper = styled.div` + ${({ theme: { mixin } }) => mixin.flexBox({ align: 'center' })}; + gap: 0.2rem; +`; From 390291f4a98e8eaf565fb0077b46f20899d6011f Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Mon, 4 Mar 2024 12:14:14 +0900 Subject: [PATCH 3/7] =?UTF-8?q?style:=20margin=20=EC=A1=B0=EA=B8=88=20?= =?UTF-8?q?=EB=8D=94=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CardRoom/CardRoom.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CardRoom/CardRoom.style.ts b/src/components/CardRoom/CardRoom.style.ts index 6de670c0..a4f40fde 100644 --- a/src/components/CardRoom/CardRoom.style.ts +++ b/src/components/CardRoom/CardRoom.style.ts @@ -55,6 +55,7 @@ export const TagWrapper = styled.div` display: flex; margin: 0 1.2rem; margin-top: 1rem; + margin-bottom: 0.5rem; gap: 0.4rem; `; From 52a5eaca1d78efa391e43ac48c40ec2c809c7959 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Mon, 4 Mar 2024 14:00:07 +0900 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=ED=86=A0=EB=84=88=EB=A8=BC?= =?UTF-8?q?=ED=8A=B8=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=A7=81=EC=A0=91=20=EA=B5=AC=ED=98=84=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=ED=8F=B4=EB=8D=94=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StartTournamentAnimation.style.ts | 5 +++++ .../TournamentAnimation/StartTournamentAnimation.tsx | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts create mode 100644 src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx diff --git a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts new file mode 100644 index 00000000..7225c1d5 --- /dev/null +++ b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts @@ -0,0 +1,5 @@ +import styled from 'styled-components'; + +export const TournamentWrapper = styled.div` + display: flex; +`; diff --git a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx new file mode 100644 index 00000000..0b386c73 --- /dev/null +++ b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx @@ -0,0 +1,11 @@ +import * as S from './StartTournamentAnimation.style'; + +const StartTournamentAnimation = () => { + return ( + +

토너먼트 애니메이션

+ + ); +}; + +export default StartTournamentAnimation; From fbfb739d020d48d20f25fdacd6092cbecf3c0449 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Wed, 6 Mar 2024 01:24:41 +0900 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20tournament=20svg=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/svg/tournament01.svg | 14 ++++++++++++++ public/svg/tournament02.svg | 18 ++++++++++++++++++ public/svg/tournament03.svg | 15 +++++++++++++++ public/svg/tournament04.svg | 18 ++++++++++++++++++ src/assets/svg/Tournament01.tsx | 15 +++++++++++++++ src/assets/svg/Tournament02.tsx | 26 ++++++++++++++++++++++++++ src/assets/svg/Tournament03.tsx | 19 +++++++++++++++++++ src/assets/svg/Tournament04.tsx | 24 ++++++++++++++++++++++++ src/assets/svg/index.ts | 6 +++++- 9 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 public/svg/tournament01.svg create mode 100644 public/svg/tournament02.svg create mode 100644 public/svg/tournament03.svg create mode 100644 public/svg/tournament04.svg create mode 100644 src/assets/svg/Tournament01.tsx create mode 100644 src/assets/svg/Tournament02.tsx create mode 100644 src/assets/svg/Tournament03.tsx create mode 100644 src/assets/svg/Tournament04.tsx diff --git a/public/svg/tournament01.svg b/public/svg/tournament01.svg new file mode 100644 index 00000000..30e6d838 --- /dev/null +++ b/public/svg/tournament01.svg @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/public/svg/tournament02.svg b/public/svg/tournament02.svg new file mode 100644 index 00000000..d816633c --- /dev/null +++ b/public/svg/tournament02.svg @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/public/svg/tournament03.svg b/public/svg/tournament03.svg new file mode 100644 index 00000000..5d36edb4 --- /dev/null +++ b/public/svg/tournament03.svg @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/public/svg/tournament04.svg b/public/svg/tournament04.svg new file mode 100644 index 00000000..ebd557be --- /dev/null +++ b/public/svg/tournament04.svg @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svg/Tournament01.tsx b/src/assets/svg/Tournament01.tsx new file mode 100644 index 00000000..d786f119 --- /dev/null +++ b/src/assets/svg/Tournament01.tsx @@ -0,0 +1,15 @@ +import * as React from 'react'; +import type { SVGProps } from 'react'; +const SvgTournament01 = (props: SVGProps) => ( + + + +); +export default SvgTournament01; diff --git a/src/assets/svg/Tournament02.tsx b/src/assets/svg/Tournament02.tsx new file mode 100644 index 00000000..cc5d8304 --- /dev/null +++ b/src/assets/svg/Tournament02.tsx @@ -0,0 +1,26 @@ +import * as React from 'react'; +import type { SVGProps } from 'react'; +const SvgTournament02 = (props: SVGProps) => ( + + + + + + + + +); +export default SvgTournament02; diff --git a/src/assets/svg/Tournament03.tsx b/src/assets/svg/Tournament03.tsx new file mode 100644 index 00000000..900eb072 --- /dev/null +++ b/src/assets/svg/Tournament03.tsx @@ -0,0 +1,19 @@ +import * as React from 'react'; +import type { SVGProps } from 'react'; +const SvgTournament03 = (props: SVGProps) => ( + + + + + + + + +); +export default SvgTournament03; diff --git a/src/assets/svg/Tournament04.tsx b/src/assets/svg/Tournament04.tsx new file mode 100644 index 00000000..6dca1ec1 --- /dev/null +++ b/src/assets/svg/Tournament04.tsx @@ -0,0 +1,24 @@ +import * as React from 'react'; +import type { SVGProps } from 'react'; +const SvgTournament04 = (props: SVGProps) => ( + + + + + + +); +export default SvgTournament04; diff --git a/src/assets/svg/index.ts b/src/assets/svg/index.ts index e8bb0904..18e5db7a 100644 --- a/src/assets/svg/index.ts +++ b/src/assets/svg/index.ts @@ -85,10 +85,14 @@ export { default as IcPoint } from './IcPoint'; export { default as IcOnboardingFinal } from './IcOnboardingFinal'; export { default as IcAfterTournamentProgressLine } from './IcAfterTournamentProgressLine'; export { default as IcBeforeTournamentProgressLine } from './IcBeforeTournamentProgressLine'; -export { default as Vite } from './Vite'; export { default as IcShare } from './IcShare'; export { default as Ranking04 } from './Ranking04'; export { default as Ranking1 } from './Ranking1'; export { default as Ranking2 } from './Ranking2'; export { default as Ranking3 } from './Ranking3'; export { default as IcEmptyThumbnailFinal } from './IcEmptyThumbnailFinal'; +export { default as Tournament01 } from './Tournament01'; +export { default as Tournament02 } from './Tournament02'; +export { default as Tournament03 } from './Tournament03'; +export { default as Tournament04 } from './Tournament04'; +export { default as Vite } from './Vite'; From 41e2ca04de268aacdc5e4cad0eeaf8b4e94d6306 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Sun, 10 Mar 2024 15:58:30 +0900 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20touranment=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=A7=81=EC=A0=91=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=ED=9B=84=20=EC=A0=81=EC=9A=A9=20X=20view=EC=97=90?= =?UTF-8?q?=20=EC=95=88=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StartTournamentAnimation.style.ts | 23 ++++++++++++++++++- .../StartTournamentAnimation.tsx | 14 ++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts index 7225c1d5..28c35bbe 100644 --- a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts +++ b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.style.ts @@ -1,5 +1,26 @@ -import styled from 'styled-components'; +import styled, { keyframes } from 'styled-components'; +const slideIn = keyframes` + 0% { + opacity: 0; + transform: translateY(-50px); + } + 100% { + opacity: 1; + transform: translateY(0); + } +`; export const TournamentWrapper = styled.div` display: flex; + position: relative; + z-index: 999; + /* top: 36rem; + z-index: 50; */ +`; + +export const AnimatedTournament = styled.div<{ $animationDelay: string; $style: string }>` + position: relative; + top: ${(props) => props.$style}; + animation: ${slideIn} 0.5s ease forwards; + animation-delay: ${(props) => props.$animationDelay}; `; diff --git a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx index 0b386c73..33f6b5d7 100644 --- a/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx +++ b/src/pages/Start/StartAnimation/TournamentAnimation/StartTournamentAnimation.tsx @@ -1,9 +1,21 @@ +import { Tournament01, Tournament02, Tournament03, Tournament04 } from '../../../../assets/svg'; import * as S from './StartTournamentAnimation.style'; const StartTournamentAnimation = () => { return ( -

토너먼트 애니메이션

+ + + + + + + + + + + + ); }; From ca00edb6c97a11e5bc9b85ed0a326d75e0471461 Mon Sep 17 00:00:00 2001 From: Wang HoEun Date: Sun, 10 Mar 2024 16:16:23 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=EC=95=88=EC=93=B0=EB=8A=94=20svg=20?= =?UTF-8?q?import=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/Tournament01.tsx | 1 - src/assets/svg/Tournament02.tsx | 1 - src/assets/svg/Tournament03.tsx | 1 - src/assets/svg/Tournament04.tsx | 1 - 4 files changed, 4 deletions(-) diff --git a/src/assets/svg/Tournament01.tsx b/src/assets/svg/Tournament01.tsx index d786f119..a877ab41 100644 --- a/src/assets/svg/Tournament01.tsx +++ b/src/assets/svg/Tournament01.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import type { SVGProps } from 'react'; const SvgTournament01 = (props: SVGProps) => ( diff --git a/src/assets/svg/Tournament02.tsx b/src/assets/svg/Tournament02.tsx index cc5d8304..1ba48ab7 100644 --- a/src/assets/svg/Tournament02.tsx +++ b/src/assets/svg/Tournament02.tsx @@ -1,4 +1,3 @@ -import * as React from 'react'; import type { SVGProps } from 'react'; const SvgTournament02 = (props: SVGProps) => ( ) => ( ) => (