hackathon-Gazprom · k0t1k777 · Aug 29, 2024 · Aug 25, 2024 · Aug 26, 2024 · Aug 26, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,11 +1,6 @@
 name: CI/CD
 
 on:
-  push:
-    branches: [ "main" , "dev" ]
-  pull_request:
-    branches: [ "main" ]
-
 
 jobs:
   build_frontend_and_push_to_docker_hub:

diff --git a/src/assets/images/2photo.png b/src/assets/images/2photo.png
diff --git a/src/assets/images/Beautiful.png b/src/assets/images/Beautiful.png
diff --git a/src/assets/images/Blonde.png b/src/assets/images/Blonde.png
diff --git a/src/assets/images/Entrepreneur.png b/src/assets/images/Entrepreneur.png
diff --git a/src/assets/images/Front.png b/src/assets/images/Front.png
diff --git a/src/assets/images/Portrait.png b/src/assets/images/Portrait.png
diff --git a/src/assets/images/Smilin.png b/src/assets/images/Smilin.png
diff --git a/src/assets/images/Studile.png b/src/assets/images/Studile.png
diff --git a/src/assets/images/Waie.png b/src/assets/images/Waie.png
diff --git a/src/assets/images/Waistl.png b/src/assets/images/Waistl.png
diff --git a/src/assets/images/Woman6e.png b/src/assets/images/Woman6e.png
diff --git a/src/assets/images/amera.png b/src/assets/images/amera.png
diff --git a/src/assets/images/c.png b/src/assets/images/c.png
diff --git a/src/assets/images/fident.png b/src/assets/images/fident.png
diff --git a/src/assets/images/ge3.jpeg b/src/assets/images/ge3.jpeg
diff --git a/src/assets/images/gen506.jpeg b/src/assets/images/gen506.jpeg
diff --git a/src/assets/images/gen7d.jpeg b/src/assets/images/gen7d.jpeg
diff --git a/src/assets/images/genera28.jpeg b/src/assets/images/genera28.jpeg
diff --git a/src/assets/images/generat.jpeg b/src/assets/images/generat.jpeg
diff --git a/src/assets/images/generat6.jpeg b/src/assets/images/generat6.jpeg
diff --git a/src/assets/images/generate9644e1857.jpeg b/src/assets/images/generate9644e1857.jpeg
diff --git a/src/assets/images/generateb8.jpeg b/src/assets/images/generateb8.jpeg
diff --git a/src/assets/images/generated.jpeg b/src/assets/images/generated.jpeg
diff --git a/src/assets/images/generated0705.jpeg b/src/assets/images/generated0705.jpeg
diff --git a/src/assets/images/generated120.jpeg b/src/assets/images/generated120.jpeg
diff --git a/src/assets/images/generated1d6.jpeg b/src/assets/images/generated1d6.jpeg
diff --git a/src/assets/images/generated3506.jpeg b/src/assets/images/generated3506.jpeg
diff --git a/src/assets/images/generated3823d.jpeg b/src/assets/images/generated3823d.jpeg
diff --git a/src/assets/images/generated3ddbb.jpeg b/src/assets/images/generated3ddbb.jpeg
diff --git a/src/assets/images/generated4c1.jpeg b/src/assets/images/generated4c1.jpeg
diff --git a/src/assets/images/generated506.jpeg b/src/assets/images/generated506.jpeg
diff --git a/src/assets/images/generated749.jpeg b/src/assets/images/generated749.jpeg
diff --git a/src/assets/images/generated9.jpeg b/src/assets/images/generated9.jpeg
diff --git a/src/assets/images/generated942fa.jpeg b/src/assets/images/generated942fa.jpeg
diff --git a/src/assets/images/generatedb35.jpeg b/src/assets/images/generatedb35.jpeg
diff --git a/src/assets/images/generatedbed2.jpeg b/src/assets/images/generatedbed2.jpeg
diff --git a/src/assets/images/generatedc1.jpeg b/src/assets/images/generatedc1.jpeg
diff --git a/src/assets/images/generatedc16c58.jpeg b/src/assets/images/generatedc16c58.jpeg
diff --git a/src/assets/images/generatedd0506.jpeg b/src/assets/images/generatedd0506.jpeg
diff --git a/src/assets/images/generateded2.jpeg b/src/assets/images/generateded2.jpeg
diff --git a/src/assets/images/image.jpeg b/src/assets/images/image.jpeg
diff --git a/src/assets/images/lose.png b/src/assets/images/lose.png
diff --git a/src/assets/images/lowers.png b/src/assets/images/lowers.png
diff --git a/src/assets/images/olated.png b/src/assets/images/olated.png
diff --git a/src/assets/images/unsash.png b/src/assets/images/unsash.png
diff --git a/src/assets/images/unsn6deo.png b/src/assets/images/unsn6deo.png
diff --git a/src/assets/images/unspla66.png b/src/assets/images/unspla66.png
diff --git a/src/assets/images/unsplash.png b/src/assets/images/unsplash.png
diff --git a/src/assets/images/unsplash654.png b/src/assets/images/unsplash654.png
diff --git a/src/assets/images/unsplash_kMJp7620W6U.png b/src/assets/images/unsplash_kMJp7620W6U.png
diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
@@ -22,7 +22,6 @@ import {
   setLoggedIn,
 } from 'src/store/features/slice/userSlice';
 
-
 export default function App() {
   const { loggedIn, loading } = useAppSelector(selectUsers);
   const [droppedCards, setDroppedCards] = useState<membersProps[]>([]);
@@ -37,8 +36,8 @@ export default function App() {
     dispatch(fetchRegisterUser({ email, password }))
       .unwrap()
       .then((data) => {
-        if (data.access) {
-          localStorage.setItem('token', data.access);
+        if (data.token) {
+          localStorage.setItem('token', data.token);
           dispatch(setLoggedIn(true));
           navigate('/');
           fetchTeamsId();

diff --git a/src/pages/Employees/Employees.tsx b/src/pages/Employees/Employees.tsx
@@ -118,6 +118,7 @@ export default function Employees() {
               title={card.position}
               full_name={card.full_name}
               department={card.department}
+              image={card.image}
               index={index}
             />
           ))}

diff --git a/src/pages/Profile/Profile.module.scss b/src/pages/Profile/Profile.module.scss
@@ -167,6 +167,10 @@
   cursor: pointer;
 }
 
+.colorBlack {
+  color: $main-text-black;
+}
+
 .link {
   text-decoration: none;
 }
diff --git a/src/pages/Profile/Profile.tsx b/src/pages/Profile/Profile.tsx
@@ -9,7 +9,6 @@ import {
   selectUsers,
 } from 'src/store/features/slice/userSlice';
 import { useEffect } from 'react';
-import { BASE_URL } from 'src/store/api';
 import DigramOne from 'src/assets/images/diagram1.png';
 import DigramTwo from 'src/assets/images/diagram2.png';
 import DigramThree from 'src/assets/images/diagram3.png';
@@ -25,14 +24,12 @@ export default function Profile() {
     dispatch(fetchGetProfile());
   }, [dispatch]);
 
-  const imageUrl = profile?.image ? `${BASE_URL}${profile.image}` : '';
-
   return (
     <section className={styles.profile}>
       <div className={styles.containerProfile}>
         <div className={styles.photoContainer}>
           <img
-            src={imageUrl}
+            src= {profile?.image}
             alt='ваше фото'
             className={styles.photo}
           />
@@ -105,7 +102,7 @@ export default function Profile() {
                 ))}
               </ul>
               <a
-                className={`${styles.itemContainerItem} ${styles.colorBlue}`}
+                className={`${styles.itemContainerItem} ${styles.colorBlack}`}
                 href='#'
               >
                 {cont.link}

diff --git a/src/pages/Teams/Teams.tsx b/src/pages/Teams/Teams.tsx
@@ -96,6 +96,7 @@ export default function Teams() {
     }
     return card;
   };
+
   const renderCardsServer = (card: membersProps) => {
     if (!card.cellId || !card.subordinates) {
       return null;

diff --git a/src/services/helpers.tsx b/src/services/helpers.tsx
@@ -89,6 +89,7 @@ export const renderCards = (
     >
       <Card
         id={card.id}
+        image={card.image}
         title={card.position}
         full_name={card.full_name}
         department={card.department}