refactor(priority card): hide section when there's no card created yet

fix #144 #152 #157
zidoro · Jan 30, 2023 · 81f621c · 81f621c
1 parent a2ec15b
commit 81f621c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/app/renderer/src/config.ts b/app/renderer/src/config.ts
@@ -15,9 +15,9 @@ type NavItemTypes = {
 export const routes: NavItemTypes[] = [
   {
     icon: "task",
-    name: "Task List",
+    name: "Tasks",
     exact: false,
-    path: "/tasklist",
+    path: "/tasks",
     component: TaskList,
   },
   {

diff --git a/app/renderer/src/routes/Timer/PriorityCard.tsx b/app/renderer/src/routes/Timer/PriorityCard.tsx
@@ -20,6 +20,7 @@ import {
   StyledOptionPriority,
   StyledOptionDone,
   StyledOptionDelete,
+  StyledSectionSeparator,
 } from "styles";
 import { SVG } from "components";
 import { useTargetOutside } from "hooks";
@@ -68,31 +69,23 @@ const PriorityCard: React.FC = () => {
   };
 
   const getTaskNoteHeading = () => {
-    if (isObjectEmpty(priorityList)) {
-      return "No priority list has been created yet.";
-    } else {
-      if (priorityCard?.text) {
-        return priorityCard?.text;
-      }
-      return "No task item on your priority list.";
+    if (priorityCard?.text) {
+      return priorityCard?.text;
     }
+    return "";
   };
 
   const getTaskNoteDescription = () => {
-    if (isObjectEmpty(priorityList)) {
-      return "Create a priority list and add task items on it.";
-    } else {
-      if (isObjectEmpty(priorityCard)) {
-        return "Add at least one item on your priority list.";
-      } else {
-        if (priorityCard?.description) {
-          return priorityCard?.description;
-        }
-        return "";
-      }
+    if (priorityCard?.description) {
+      return priorityCard?.description;
     }
+    return "";
   };
 
+  if (isObjectEmpty(priorityList)) {
+    return <StyledSectionSeparator />;
+  }
+
   return (
     <StyledPriorityCardContainer>
       <StyledPriorityCardWrapper>
@@ -122,10 +115,10 @@ const PriorityCard: React.FC = () => {
 
             <StyledOptionList>
               <StyledOptionDone onClick={setTaskCardDoneCallback}>
-                Done Task
+                Done
               </StyledOptionDone>
               <StyledOptionPriority onClick={skipTaskCardCallback}>
-                Skip Task
+                Skip
               </StyledOptionPriority>
               <StyledOptionDelete onClick={deleteTaskCardCallback}>
                 Delete

diff --git a/app/renderer/src/styles/routes/timer/timer.ts b/app/renderer/src/styles/routes/timer/timer.ts
@@ -37,6 +37,12 @@ export const StyledTimer = styled.main`
   }
 `;
 
+export const StyledSectionSeparator = styled.div`
+  width: 100%;
+  height: 1px;
+  background-color: var(--color-border-primary);
+`;
+
 export const StyledPriorityCardContainer = styled.div`
   width: 100%;
   height: 5.6rem;