Skip to content

Commit

Permalink
Merge pull request #79 from softeerbootcamp4th/TASK-132
Browse files Browse the repository at this point in the history
[Feature][Task-132] 헷갈릴 수 있는 ui/ux 에 안내 문구 추가
  • Loading branch information
nim-od authored Aug 18, 2024
2 parents 23b7a17 + cd2d6b5 commit 954b15b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
16 changes: 14 additions & 2 deletions packages/user/src/components/home/eventSteps/StepThird.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -12,10 +13,21 @@ export default function StepThird() {
}

function CopyAndShare() {
const { user } = useAuth();

return (
<div className="flex w-[595px] flex-col items-center gap-7">
<div className="flex w-[595px] flex-col items-center">
<LinkShare />
<p className="text-body-3 font-medium">링크를 복사하고 친구에게 공유하기</p>
<p className="text-body-3 mb-3 mt-7 font-medium">
{user?.type ? (
'링크를 복사하고 친구에게 공유하기'
) : (
<>
나의 <strong>캐스퍼 유형</strong> 확인하고 <strong>나만의 공유 링크</strong>를 만들어
보세요!
</>
)}
</p>
</div>
);
}
Expand Down
5 changes: 3 additions & 2 deletions packages/user/src/components/home/fastestQuiz/TopSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import { PropsWithChildren } from 'react';

export default function TopSection() {
return (
<div className="flex flex-col items-center gap-6">
<div className="flex flex-col items-center">
<Highlight>매일 3시 15분!</Highlight>
<h2>깜짝 선착순 퀴즈 OPEN</h2>
<h2 className="mb-2 mt-6">깜짝 선착순 퀴즈 OPEN</h2>
<p className="text-body-3 text-neutral-200">* 아래 사진은 선착순 퀴즈 팝업 예시입니다</p>
</div>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function TeamsDescriptions() {
/>
))}
</div>
<Button size="lg" onClick={goDetailDescriptions}>
<Button className="underline" size="lg" onClick={goDetailDescriptions}>
자세한 설명 보러가기
</Button>
</div>
Expand Down
1 change: 0 additions & 1 deletion packages/user/src/components/shared/linkShare/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export default function LinkShare({ category }: LinkShareProps) {
return (
<div className="flex gap-4">
<LinkDisplay variants={variants} value={url} />
{/* Todo: 유형 검사 완료해야 가산점 받을 수 있다는 안내 tooltip 추가 */}
{category ? (
<LinkShareButton onClick={handleCopy} variants={category} />
) : (
Expand Down

0 comments on commit 954b15b

Please sign in to comment.