From 8c37eba212cc486228c0c119c38952cf6297dd1e Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 01:43:26 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=9C=A0=ED=98=95=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EC=99=84=EB=A3=8C=ED=95=B4=EC=95=BC=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=83=9D=EC=84=B1=EB=90=9C=EB=8B=A4=EB=8A=94=20?= =?UTF-8?q?=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/home/eventSteps/StepThird.tsx | 16 ++++++++++++++-- .../src/components/shared/linkShare/index.tsx | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/user/src/components/home/eventSteps/StepThird.tsx b/packages/user/src/components/home/eventSteps/StepThird.tsx index 76d51dfd..f01bfa94 100644 --- a/packages/user/src/components/home/eventSteps/StepThird.tsx +++ b/packages/user/src/components/home/eventSteps/StepThird.tsx @@ -1,4 +1,5 @@ import LinkShare from 'src/components/shared/linkShare/index.tsx'; +import useAuth from 'src/hooks/useAuth.ts'; import ContentCard from './ContentCard.tsx'; import ContentsContainer from './ContentsContainer.tsx'; @@ -12,10 +13,21 @@ export default function StepThird() { } function CopyAndShare() { + const { user } = useAuth(); + return ( -
+
-

링크를 복사하고 친구에게 공유하기

+

+ {user?.type ? ( + '링크를 복사하고 친구에게 공유하기' + ) : ( + <> + 나의 캐스퍼 유형 확인하고 나만의 공유 링크를 만들어 + 보세요! + + )} +

); } diff --git a/packages/user/src/components/shared/linkShare/index.tsx b/packages/user/src/components/shared/linkShare/index.tsx index 02063156..b73eef83 100644 --- a/packages/user/src/components/shared/linkShare/index.tsx +++ b/packages/user/src/components/shared/linkShare/index.tsx @@ -21,7 +21,6 @@ export default function LinkShare({ category }: LinkShareProps) { return (
- {/* Todo: 유형 검사 완료해야 가산점 받을 수 있다는 안내 tooltip 추가 */} {category ? ( ) : ( From aa35d935d329aae42360e2a2416ec56d2ede8d38 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 01:46:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?design:=20=EC=84=A0=EC=B0=A9=EC=88=9C=20?= =?UTF-8?q?=ED=80=B4=EC=A6=88=20=ED=8C=9D=EC=97=85=20=EC=98=88=EC=8B=9C=20?= =?UTF-8?q?=EC=82=AC=EC=A7=84=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/user/src/components/home/fastestQuiz/TopSection.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/user/src/components/home/fastestQuiz/TopSection.tsx b/packages/user/src/components/home/fastestQuiz/TopSection.tsx index 99e908c9..a8f08870 100644 --- a/packages/user/src/components/home/fastestQuiz/TopSection.tsx +++ b/packages/user/src/components/home/fastestQuiz/TopSection.tsx @@ -2,9 +2,10 @@ import { PropsWithChildren } from 'react'; export default function TopSection() { return ( -
+
매일 3시 15분! -

깜짝 선착순 퀴즈 OPEN

+

깜짝 선착순 퀴즈 OPEN

+

* 아래 사진은 선착순 퀴즈 팝업 예시입니다

); } From cd2d6b5567fbcbc038f528363797ae43558a6489 Mon Sep 17 00:00:00 2001 From: nimod7890 Date: Mon, 19 Aug 2024 01:50:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?design:=20=EC=99=B8=EB=B6=80=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/user/src/components/home/teamsDescriptions/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/user/src/components/home/teamsDescriptions/index.tsx b/packages/user/src/components/home/teamsDescriptions/index.tsx index 953813c5..e55b3646 100644 --- a/packages/user/src/components/home/teamsDescriptions/index.tsx +++ b/packages/user/src/components/home/teamsDescriptions/index.tsx @@ -29,7 +29,7 @@ export default function TeamsDescriptions() { /> ))}
-