Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components

package-lock.json

@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
+  "name": "itguild.info",
+=======
   "name": "outstaffing-react",
+>>>>>>> 42b597d58589cfa47890a35c06fd651fc654742a
   "version": "0.1.0",
   "lockfileVersion": 3,
   "requires": true,

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
                 ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                 : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
               : activePeriod
-              ? "Выберите диапазон на календаре"
+                ? "Выберите диапазон на календаре"
-              : "Выбрать диапазон"}
+                : "Выбрать диапазон"}
           </span>
           <span>
             {totalRangeHours
               ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
               : endDate
-              ? "0 часов"
+                ? "0 часов"
-              : ""}
+                : ""}
           </span>
           {endDate && (
             <BaseButton

src/components/ProjectTicket/ProjectTicket.jsx

@@ -108,17 +108,9 @@ export const ProjectTicket = ({ project, index }) => {
         </div>
       </Link>
 
-      {/* <Link
+      <Link to={`/profile/statistics/${project.id}`} className="project-stats">
-        to={`/profile/statistics/${project.id}`}
-        className="project__statistics"
-      >
         Посмотреть статистику
-      </Link> */}
+      </Link>
-
-      <span className="project-stats" onClick={() => {}}>
-        Просмотреть <br />
-        статистику проекта
-      </span>
 
       <span
         className="menu-settings"

src/components/ProjectTicket/projectTicket.scss

@@ -3,7 +3,7 @@
   flex-direction: column;
   position: relative;
   width: 22%;
-  height: 170px;
+  height: 140px;
   background: #f1f1f1;
   border-radius: 12px;
 
@@ -90,7 +90,7 @@
     color: #678eda;
     position: absolute;
     left: 18px;
-    bottom: 10px;
+    bottom: 16px;
   }
 
   .menu-settings {

src/pages/Tracker/tracker.scss

@@ -130,7 +130,6 @@
         row-gap: 30px;
         display: none;
         align-items: center;
-        justify-content: center;
 
         @media (max-width: 785px) {
           row-gap: 25px;
@@ -163,7 +162,7 @@
 
         .create-project-btn {
           width: 22%;
-          height: 170px;
+          height: 140px;
           border-radius: 12px;
           background: #ecf8e5;
           color: #000000;
@@ -191,6 +190,10 @@
             img {
               margin: 0 20px 0 0;
             }
+
+            p {
+              text-align: left;
+            }
           }
 
           &:hover {