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

debag-conflict

src/pages/PartnerСategories/PartnerСategories.jsx

@@ -39,7 +39,7 @@ export const PartnerCategories = () => {
     setLoader(true);
     apiRequest("/project/my-employee").then((el) => {
       setLoader(false);
-      setStaff(el.managerEmployees);
+      setStaff(el?.managerEmployees);
     });
   }, []);
 
@@ -161,16 +161,22 @@ export const PartnerCategories = () => {
           <Loader style={"green"} height={80} width={80} />
         ) : (
           <div className="partner-categories__items">
-            {staff.map((card) => {
-              return (
-                <PartnerPersonCard
-                  key={card.id}
-                  name={card.employee.fio}
-                  img={card.employee.avatar}
-                  userId={card.user_id}
-                />
-              );
-            })}
+            {Boolean(staff) ? (
+              staff.map((card) => {
+                return (
+                  <PartnerPersonCard
+                    key={card.id}
+                    name={card.employee.fio}
+                    img={card.employee.avatar}
+                    userId={card.user_id}
+                  />
+                );
+              })
+            ) : (
+              <span className="partnerCategories__empty">
+                У вас нет нанятого персонала
+              </span>
+            )}
             {/*{personalInfoItems.map((item, index) => {*/}
             {/*  return (*/}
             {/*    <Link*/}

src/pages/PartnerСategories/partnerСategories.scss

@@ -20,6 +20,11 @@
     //row-gap: 24px;
     //column-gap: 21px;
   }
+  &__empty {
+    font-size: 18px;
+    font-weight: 500;
+    margin-top: 20px;
+  }
 
   .item {
     display: flex;