From 8e78844fdc9529edb4ee5a06040292e3013fe696 Mon Sep 17 00:00:00 2001 From: woo-jk Date: Tue, 30 Apr 2024 09:14:51 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20HeaderLayout=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EB=A7=88=ED=81=AC=EC=97=85=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(routes)/(quiz)/layout.tsx | 11 +++++ src/components/header-layout.tsx | 65 ++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 src/app/(routes)/(quiz)/layout.tsx create mode 100644 src/components/header-layout.tsx diff --git a/src/app/(routes)/(quiz)/layout.tsx b/src/app/(routes)/(quiz)/layout.tsx new file mode 100644 index 00000000..5d52421b --- /dev/null +++ b/src/app/(routes)/(quiz)/layout.tsx @@ -0,0 +1,11 @@ +import HeaderLayout from '@/components/header-layout' +import { PropsWithChildren } from 'react' + +export default function Layout({ children }: PropsWithChildren) { + return ( +
+ + {children} +
+ ) +} diff --git a/src/components/header-layout.tsx b/src/components/header-layout.tsx new file mode 100644 index 00000000..80c27a1e --- /dev/null +++ b/src/components/header-layout.tsx @@ -0,0 +1,65 @@ +const mockData = { + name: '픽토스', + stars: 20, +} + +export default function HeaderLayout() { + return ( +
+ + + {mockData.stars} + + +
+
+ {mockData.name}님 + +
+
+ ) +} + +// TODO: Icon 컴포넌트 구현시 분리 +function BellIcon() { + return ( + + + + + + + + + + + + + ) +} + +function ArrowDownIcon() { + return ( + + + + ) +} From 929a27661135f9f83853a1ec09102e6e044992da Mon Sep 17 00:00:00 2001 From: woo-jk Date: Tue, 30 Apr 2024 11:51:28 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=ED=80=B4=EC=A6=88=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A7=88=ED=81=AC?= =?UTF-8?q?=EC=97=85=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(routes)/(quiz)/page.tsx | 98 +++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/src/app/(routes)/(quiz)/page.tsx b/src/app/(routes)/(quiz)/page.tsx index 1e82d122..317d0c40 100644 --- a/src/app/(routes)/(quiz)/page.tsx +++ b/src/app/(routes)/(quiz)/page.tsx @@ -1,5 +1,101 @@ import { Button } from '@/components/ui/button' +import { cn } from '@/lib/utils' + +const userData = { + id: 1, + nickname: '픽토스', + stars: 20, +} + +const todayQuizData = { + continuousSolvedDates: 5, + totalSolvedQuizCount: 100, + stat: 'ready', + quiz: [ + { + id: 1, + category: '전공 공부', + count: 4, + }, + { + id: 2, + category: '코딩 아카데미', + count: 3, + }, + { + id: 3, + category: '컴활 필기 준비', + count: 3, + }, + ], +} + +const boxStyle = 'rounded-2xl bg-white p-5' export default function Quiz() { - return + return ( +
+

파워업 퀴즈

+
+
+
+
+

+ {todayQuizData.continuousSolvedDates}일째 + 파워업 중! +

+

2024년 4월 25일 목요일

+
+
+
+
오늘의 퀴즈 점수
+

아직 오늘 퀴즈를 풀지 않았어요.

+
+
+
+
+

별

+

{userData.stars}개

+
+
+
+

오늘의 퀴즈

+
+
INFORMATION
+

{userData.nickname}님을 위한 퀴즈가 준비되었어요

+
+ +
+ {todayQuizData.quiz.map((quiz) => ( +
+ {quiz.category} + {quiz.count} +
+ ))} +
+
+ +
+
+ ) +} + +function DocumentIcon() { + return ( + + + + + ) } From b0c4261dd2d92840fbd2dd59a3225416f16a9b53 Mon Sep 17 00:00:00 2001 From: woo-jk Date: Tue, 30 Apr 2024 11:57:30 +0900 Subject: [PATCH 3/6] =?UTF-8?q?chore:=20tailwind=20=ED=8C=94=EB=A0=88?= =?UTF-8?q?=ED=8A=B8=20orange,=20red,=20green,=20blue=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tailwind.config.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tailwind.config.ts b/tailwind.config.ts index 2f03b49b..85d7f4d8 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -35,6 +35,23 @@ const config = { 80: '#292B2C', 90: '#1D1E1F', }, + orange: { + '05': '#FFECD0', + 10: '#FFE1AC', + 20: '#FFD180', + 30: '#FFAB40', + 40: '#FF9100', + 50: '#FB7E20', + }, + red: { + 50: '#F66444', + }, + green: { + 50: '#82E223', + }, + blue: { + 50: '#719EE3', + }, white: '#FFFFFF', border: 'hsl(var(--border))', input: 'hsl(var(--input))', From bc8b878df15d2f083e2be927cb0b66f631f917f7 Mon Sep 17 00:00:00 2001 From: woo-jk Date: Tue, 30 Apr 2024 12:02:04 +0900 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=ED=80=B4=EC=A6=88=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=B0=8F=20=ED=97=A4=EB=8D=94=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=20orange=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=AC=20=ED=8C=94=EB=A0=88=ED=8A=B8=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/app/(routes)/(quiz)/page.tsx | 8 ++++---- src/components/header-layout.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/(routes)/(quiz)/page.tsx b/src/app/(routes)/(quiz)/page.tsx index 317d0c40..91ecf9a3 100644 --- a/src/app/(routes)/(quiz)/page.tsx +++ b/src/app/(routes)/(quiz)/page.tsx @@ -41,7 +41,7 @@ export default function Quiz() {

- {todayQuizData.continuousSolvedDates}일째 + {todayQuizData.continuousSolvedDates}일째 파워업 중!

2024년 4월 25일 목요일

@@ -55,13 +55,13 @@ export default function Quiz() {

별

-

{userData.stars}개

+

{userData.stars}개

오늘의 퀴즈

-
INFORMATION
+
INFORMATION

{userData.nickname}님을 위한 퀴즈가 준비되었어요

@@ -77,7 +77,7 @@ export default function Quiz() { ))}
-
diff --git a/src/components/header-layout.tsx b/src/components/header-layout.tsx index 80c27a1e..c8ec1366 100644 --- a/src/components/header-layout.tsx +++ b/src/components/header-layout.tsx @@ -7,7 +7,7 @@ export default function HeaderLayout() { return (
- + {mockData.stars}