fix: 다음 집중/휴식시간 조정시 무조건 minus되는거 수정 (#53)

* 다음 시간 조정 value를 타입에 맞춰 수정 * 선택된 고양이가 없는 경우에만 온보딩 페이지로 갈수있도록
Nexters · Sep 1, 2024 · a0082bb · a0082bb
1 parent bc8589e
commit a0082bb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -85,15 +85,15 @@ export const RestScreen = ({
           >
             <SelectGroupItem
               disabled={currentRestMinutes - MINUTES_GAP <= MIN_REST_MINUTES}
-              value="minus-focus-time"
+              value="minus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="minusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />
               <span className="body-sb text-text-tertiary">5분</span>
             </SelectGroupItem>
             <SelectGroupItem
               disabled={currentRestMinutes + MINUTES_GAP >= MAX_REST_MINUTES}
-              value="plus-focus-time"
+              value="plus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="plusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />

diff --git a/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx b/src/renderer/widgets/pomodoro/ui/rest-wait-screen.tsx
@@ -88,15 +88,15 @@ export const RestWaitScreen = ({
           >
             <SelectGroupItem
               disabled={currentFocusMinutes - MINUTES_GAP <= MIN_FOCUS_MINUTES}
-              value="minus-focus-time"
+              value="minus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="minusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />
               <span className="body-sb text-text-tertiary">5분</span>
             </SelectGroupItem>
             <SelectGroupItem
               disabled={currentFocusMinutes + MINUTES_GAP >= MAX_FOCUS_MINUTES}
-              value="plus-focus-time"
+              value="plus"
               className="flex flex-row items-center justify-center gap-1 px-3 py-2"
             >
               <Icon name="plusSvg" size="sm" className="[&>path]:stroke-icon-tertiary" />