Merge pull request #146 from apuc/fixed-pages

Fixed project card

src/components/ProjectTiket/ProjectTiket.jsx

@@ -74,7 +74,10 @@ export const ProjectTiket = ({ project, index }) => {
 
   return (
     <div className="project" key={index}>
-      <Link to={`/tracker/project/${project.id}`}>
+      <Link
+        to={`/tracker/project/${project.id}`}
+        className="project__open-traker"
+      >
         <p className="project__link">{project.name}</p>
 
         <div className="project__info">
@@ -93,6 +96,7 @@ export const ProjectTiket = ({ project, index }) => {
       <span className="menu-settings" onClick={() => setModalSelect(true)}>
         ...
       </span>
+
       <Link
         to={`/profile/statistics/${project.id}`}
         className="project__statistics"

src/components/ProjectTiket/projectTiket.scss

@@ -1,10 +1,12 @@
 .project {
+  display: flex;
+  flex-direction: column;
   position: relative;
   width: 322px;
 
   background: #f1f1f1;
   border-radius: 12px;
-  padding: 17px 26px 16px;
+
   cursor: pointer;
   max-width: 440px;
   transition: 0.4s;
@@ -43,7 +45,7 @@
     display: flex;
     align-items: center;
     position: relative;
-    margin-bottom: 27px;
+    margin-bottom: 45px;
 
     p {
       color: #6f6f6f;
@@ -94,9 +96,15 @@
     margin-left: 56px;
   }
 
+  &__open-traker {
+    padding: 17px 26px 16px;
+  }
+
   &__statistics {
+    position: absolute;
+    bottom: 18px;
+    left: 26px;
     color: #678eda;
-    margin-top: 27px;
     text-decoration: underline;
     font-size: 12px;
     font-weight: 300;

src/pages/Tracker/Tracker.jsx

@@ -197,7 +197,7 @@ export const Tracker = () => {
               !loader &&
               projects.map((project, index) => {
                 return project.status !== 10 ? (
-                  <ProjectTiket key={index} project={project}></ProjectTiket>
+                  <ProjectTiket key={index} project={project} />
                 ) : (
                   ""
                 );
@@ -452,7 +452,7 @@ export const Tracker = () => {
                       {Boolean(filterCompleteTasks.length) ? (
                         filterCompleteTasks.map((task, index) => {
                           return (
-                            <tr>
+                            <tr key={index}>
                               <td className="archive__completeTask__description">
                                 <p className="completeTask__title">
                                   {task.title}