From 6a069506546e62734b6deae2c829dd9c1ce39d76 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 23 Jun 2022 19:37:29 +0200
Subject: [PATCH] feat: project status.

---
 .../ProjectsLanding/ProjectsDataTable.tsx     | 13 ++++++++++-
 .../containers/ProjectsLanding/components.tsx | 22 +++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
index cb2c9b647..5cc5d373e 100644
--- a/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
@@ -21,7 +21,7 @@ const projects = [
     deadline: '2022-06-08T22:00:00.000Z',
     display_name: 'Kyrie Rearden',
     cost_estimate: '40000',
-    task_amount: '10000',
+    task_amount: '0',
     is_process: true,
     is_closed: false,
     is_draft: false,
@@ -33,6 +33,17 @@ const projects = [
     display_name: 'Ella-Grace Miller',
     cost_estimate: '700',
     task_amount: '300',
+    is_process: false,
+    is_closed: false,
+    is_draft: true,
+  },
+  {
+    id: 3,
+    name: 'Tax Compliance',
+    deadline: '2022-06-23T22:00:00.000Z',
+    display_name: 'Abby & Wells',
+    cost_estimate: '3000',
+    task_amount: '0',
     is_process: true,
     is_closed: false,
     is_draft: false,
diff --git a/src/containers/Projects/containers/ProjectsLanding/components.tsx b/src/containers/Projects/containers/ProjectsLanding/components.tsx
index 0932a5bb5..0be5c187b 100644
--- a/src/containers/Projects/containers/ProjectsLanding/components.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/components.tsx
@@ -19,13 +19,13 @@ import { safeCallback, firstLettersArgs, calculateStatus } from 'utils';
 export function ProjectStatus({ project }) {
   return (
     <ProjectStatusRoot>
+      <ProjectStatusTaskAmount>{project.task_amount}</ProjectStatusTaskAmount>
       <ProjectProgressBar
         animate={false}
         stripes={false}
         // intent={Intent.PRIMARY}
         value={calculateStatus(project.task_amount, project.cost_estimate)}
       />
-      <ProjectStatusTaskAmount>{project.task_amount}</ProjectStatusTaskAmount>
     </ProjectStatusRoot>
   );
 }
@@ -40,14 +40,14 @@ export const StatusAccessor = (project) => {
         <ProjectStatus project={project} />
       </Choose.When>
       <Choose.When condition={project.is_closed}>
-        <Tag minimal={true} intent={Intent.SUCCESS} round={true}>
+        <StatusTag minimal={true} intent={Intent.SUCCESS} round={true}>
           <T id={'closed'} />
-        </Tag>
+        </StatusTag>
       </Choose.When>
       <Choose.When condition={project.is_draft}>
-        <Tag round={true} minimal={true}>
+        <StatusTag round={true} minimal={true}>
           <T id={'draft'} />
-        </Tag>
+        </StatusTag>
       </Choose.When>
     </Choose>
   );
@@ -134,7 +134,7 @@ export const useProjectsListColumns = () => {
         id: 'name',
         Header: '',
         accessor: ProjectsAccessor,
-        width: 200,
+        width: 240,
         className: 'name',
         clickable: true,
       },
@@ -175,9 +175,9 @@ const ProjectItemDescription = styled.div`
 const ProjectStatusRoot = styled.div`
   display: flex;
   align-items: center;
-  justify-content: flex-end;
+  /* justify-content: flex-end; */
   /* margin-right: 0.8rem; */
-  /* flex-direction: row-reverse; */
+  flex-direction: row-reverse;
 `;
 const ProjectStatusTaskAmount = styled.div`
   text-align: right;
@@ -191,10 +191,14 @@ const ProjectProgressBar = styled(ProgressBar)`
     display: block;
     flex-shrink: 0;
     height: 3px;
-    max-width: 100px;
+    max-width: 115px;
     &,
     .bp3-progress-meter {
       border-radius: 0;
     }
   }
 `;
+const StatusTag = styled(Tag)`
+  min-width: 65px;
+  text-align: center;
+`;