From a0082bb705b8e834c2db66efe71432823a3cb333 Mon Sep 17 00:00:00 2001 From: Young-do Cho Date: Sun, 1 Sep 2024 20:15:27 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=8B=A4=EC=9D=8C=20=EC=A7=91=EC=A4=91/?= =?UTF-8?q?=ED=9C=B4=EC=8B=9D=EC=8B=9C=EA=B0=84=20=EC=A1=B0=EC=A0=95?= =?UTF-8?q?=EC=8B=9C=20=EB=AC=B4=EC=A1=B0=EA=B1=B4=20minus=EB=90=98?= =?UTF-8?q?=EB=8A=94=EA=B1=B0=20=EC=88=98=EC=A0=95=20(#53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 다음 시간 조정 value를 타입에 맞춰 수정 * 선택된 고양이가 없는 경우에만 온보딩 페이지로 갈수있도록 --- src/renderer/pages/home.tsx | 6 ++++-- src/renderer/widgets/pomodoro/ui/rest-screen.tsx | 4 ++-- src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/renderer/pages/home.tsx b/src/renderer/pages/home.tsx index abf8550..ab172ab 100644 --- a/src/renderer/pages/home.tsx +++ b/src/renderer/pages/home.tsx @@ -19,8 +19,10 @@ const Home = () => { useEffect(() => { if (!user) return; - if (!isCompletedOnboarding) return navigate(PATH.ONBOARDING); - if (!user.cat) return navigate(PATH.SELECTION); + if (!user.cat) { + if (!isCompletedOnboarding) return navigate(PATH.ONBOARDING); + return navigate(PATH.SELECTION); + } navigate(PATH.POMODORO); }, [isCompletedOnboarding, user]); diff --git a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx index 6c35f83..f23eebe 100644 --- a/src/renderer/widgets/pomodoro/ui/rest-screen.tsx +++ b/src/renderer/widgets/pomodoro/ui/rest-screen.tsx @@ -85,7 +85,7 @@ export const RestScreen = ({ > @@ -93,7 +93,7 @@ export const RestScreen = ({ = MAX_REST_MINUTES} - value="plus-focus-time" + value="plus" className="flex flex-row items-center justify-center gap-1 px-3 py-2" > diff --git a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx index 7437dba..f5ad2f7 100644 --- a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx +++ b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx @@ -88,7 +88,7 @@ export const RestWaitScreen = ({ > @@ -96,7 +96,7 @@ export const RestWaitScreen = ({ = MAX_FOCUS_MINUTES} - value="plus-focus-time" + value="plus" className="flex flex-row items-center justify-center gap-1 px-3 py-2" >