From 484633a68f250a59522c2d3da12855c58751706d Mon Sep 17 00:00:00 2001 From: young-do Date: Thu, 29 Aug 2024 00:20:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=20value=EB=A5=BC=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/widgets/pomodoro/ui/rest-screen.tsx | 4 ++-- src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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" > From 8c5413738ad334cddbb935cf8449c8fc0c7a4f88 Mon Sep 17 00:00:00 2001 From: young-do Date: Thu, 29 Aug 2024 00:20:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=84=A0=ED=83=9D=EB=90=9C=20=EA=B3=A0?= =?UTF-8?q?=EC=96=91=EC=9D=B4=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=A7=8C=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EA=B0=88=EC=88=98?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/pages/home.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 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]);