From 1695c33d1d018c05bd3d94407bb0e47572e6c5f2 Mon Sep 17 00:00:00 2001 From: klmhyeonwoo Date: Sat, 6 Jul 2024 21:48:46 +0900 Subject: [PATCH 1/5] chore: #1 Add vercel.json --- src/app/test/Staging.tsx | 0 src/component/ProgressBar/ProgressBar.tsx | 28 +++++++++++++++++++++++ vercel.json | 6 +++++ 3 files changed, 34 insertions(+) create mode 100644 src/app/test/Staging.tsx create mode 100644 src/component/ProgressBar/ProgressBar.tsx create mode 100644 vercel.json diff --git a/src/app/test/Staging.tsx b/src/app/test/Staging.tsx new file mode 100644 index 00000000..e69de29b diff --git a/src/component/ProgressBar/ProgressBar.tsx b/src/component/ProgressBar/ProgressBar.tsx new file mode 100644 index 00000000..b8198a68 --- /dev/null +++ b/src/component/ProgressBar/ProgressBar.tsx @@ -0,0 +1,28 @@ +import {css} from "@emotion/react"; + +interface ProgressBarProps { + curPage: number, + lastPage: number, +} + +export default function ProgressBar({ curPage, lastPage }: ProgressBarProps) { + return ( + // FIXME: 추후 디자인 토큰 연동 후 컬러 값 변경 +
+
+
+ ) +} \ No newline at end of file diff --git a/vercel.json b/vercel.json new file mode 100644 index 00000000..f90a92e1 --- /dev/null +++ b/vercel.json @@ -0,0 +1,6 @@ +{ + "routes": [ + { "handle": "filesystem" }, + { "src": "/.*", "dest": "/index.html" } + ] +} \ No newline at end of file From 4582a72e6d11ede8b544d53b8871b7c90a772007 Mon Sep 17 00:00:00 2001 From: klmhyeonwoo Date: Sat, 6 Jul 2024 21:49:20 +0900 Subject: [PATCH 2/5] feat: #11 Add Progress Bar --- src/app/test/Staging.tsx | 19 +++++++++++++++++++ src/component/ProgressBar/ProgressBar.tsx | 1 + src/router/index.tsx | 5 +++++ 3 files changed, 25 insertions(+) diff --git a/src/app/test/Staging.tsx b/src/app/test/Staging.tsx index e69de29b..1c2d47bc 100644 --- a/src/app/test/Staging.tsx +++ b/src/app/test/Staging.tsx @@ -0,0 +1,19 @@ +import ProgressBar from "@/component/ProgressBar/ProgressBar.tsx"; +import {useState} from "react"; +import {css} from "@emotion/react"; + +export default function Staging() { + + const [page, setPage] = useState(0); + + return ( +
+ +
현재 페이지 넘버 {page}
+ + +
+ ) +} \ No newline at end of file diff --git a/src/component/ProgressBar/ProgressBar.tsx b/src/component/ProgressBar/ProgressBar.tsx index b8198a68..78aa4661 100644 --- a/src/component/ProgressBar/ProgressBar.tsx +++ b/src/component/ProgressBar/ProgressBar.tsx @@ -6,6 +6,7 @@ interface ProgressBarProps { } export default function ProgressBar({ curPage, lastPage }: ProgressBarProps) { + if (curPage > lastPage) curPage = lastPage; return ( // FIXME: 추후 디자인 토큰 연동 후 컬러 값 변경
, }, + { + path: '/staging', + element: + } ]; const router = createBrowserRouter([ From 05bbe78f12a481eb5512ad6ae071724de71ac929 Mon Sep 17 00:00:00 2001 From: klm hyeon woo Date: Sat, 6 Jul 2024 22:14:56 +0900 Subject: [PATCH 3/5] Update src/component/ProgressBar/ProgressBar.tsx --- src/component/ProgressBar/ProgressBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/ProgressBar/ProgressBar.tsx b/src/component/ProgressBar/ProgressBar.tsx index 78aa4661..164c33e7 100644 --- a/src/component/ProgressBar/ProgressBar.tsx +++ b/src/component/ProgressBar/ProgressBar.tsx @@ -18,7 +18,7 @@ export default function ProgressBar({ curPage, lastPage }: ProgressBarProps) { `}>
Date: Sat, 6 Jul 2024 23:25:30 +0900 Subject: [PATCH 4/5] chore: #1 Add rem css unit --- src/style/global.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/style/global.css b/src/style/global.css index 03afaff8..8f951830 100644 --- a/src/style/global.css +++ b/src/style/global.css @@ -1,4 +1,9 @@ +html { + font-size: 62.5%; +} + body { + font-size: 1.5rem; margin: 0; padding: 0; } \ No newline at end of file From fa383d597908b76f35fed4761c32ebd943487dae Mon Sep 17 00:00:00 2001 From: klmhyeonwoo Date: Sat, 6 Jul 2024 23:26:44 +0900 Subject: [PATCH 5/5] fix: #17 Change px to rem --- src/component/ProgressBar/ProgressBar.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/component/ProgressBar/ProgressBar.tsx b/src/component/ProgressBar/ProgressBar.tsx index 164c33e7..f55dbc8f 100644 --- a/src/component/ProgressBar/ProgressBar.tsx +++ b/src/component/ProgressBar/ProgressBar.tsx @@ -7,23 +7,24 @@ interface ProgressBarProps { export default function ProgressBar({ curPage, lastPage }: ProgressBarProps) { if (curPage > lastPage) curPage = lastPage; + return ( // FIXME: 추후 디자인 토큰 연동 후 컬러 값 변경
+ `}/>
) } \ No newline at end of file