fix edit team image

Author: BasharElmetwaliahmed

src/Components/Posts/Post/PostHeader.jsx

@@ -1,5 +1,8 @@
+/* eslint-disable no-undef */
+/* eslint-disable react/prop-types */
 import { useSelector } from 'react-redux';
-import profileImg from '../../../assets/images/posts/Ellipse 49.svg';
+import { imgLink } from '../../../api';
+import noPicture from '../../../assets/images/profile/no-profile-picture.svg';
 import { transferDate } from '../../../Functions/transferDate';
 import EditPost from './EditPost/EditPost';
 
@@ -9,7 +12,7 @@ function PostHeader({ post }) {
   return (
     <header className='flex items-center py-4 text-inter justify-between'>
       <div className='space-x-5 flex items-center'>
-        <img src={profileImg} alt='profile img' className='w-14' />
+        <img src={userData.imageUrl?`${imgLink}/${userData.imageUrl}`:noPicture} alt='profile img' className='w-14 h-14 rounded-full'  />
          <div className='flex flex-col'>
           <p className='text-base font-medium font-inter'>{user_name}</p>
           <p className='text-xs font-normal'>Front End developer</p>

src/Components/Teams/EditTeamForm/EditTeam.jsx

@@ -29,13 +29,23 @@ function EditTeam({ team, teamForm, setTeamForm }) {
       toastEmitter('All fields are required', 'error');
       return;
     }
-
-    const formData = await toFormData([
+    let formData
+    console.log(team.imageUrl,teamForm.image)
+    if(teamForm.image==team.imageUrl){
+     formData = await toFormData([
+      { name: 'name', value: teamForm.nameofTeam },
+      { name: 'description', value: teamForm.description },
+    ]);
+    }
+    else{
+       formData = await toFormData([
       { name: 'name', value: teamForm.nameofTeam },
       { name: 'description', value: teamForm.description },
       { name: 'imageUrl', value: teamForm.image },
     ]);
 
+    }
+
     const res = await editTeamFetch(formData);
 
     if (res.ok) {

src/Components/Teams/TeamsList/TeamsList.jsx

@@ -15,19 +15,19 @@ function TeamsList({isFixed}) {
   const [keyword,setKeyWord]=useState('')
   const {fetchApi:getSearch,loading:searchLoading}=useFetch(`${api}/search/teams?query=${keyword}`,getOptions,true)
   const [currentTeams,setCurrentTeams]=useState([]);
+  const [changed,setChanged]=useState()
 
-  console.log(currentTeams)
 
   return (
     <div className={`w-1/4 px-6 pt-12 bg-[rgba(252,250,248,1)] border-r-[rgba(209,208,208,1)]  border-r-[1px] h-[calc(100vh_-_99px)] relative z-10
      ${!isFixed?'':'fixed top-0 right-0   '} scroll-y  overflow-y-auto custom-scrollbar  `}>
         <div className="flex gap-1">
-                    <div className="w-full"><SearchField getSearch={getSearch} type='teams' setCurrent={setCurrentTeams} setKeyWord={setKeyWord}/></div>
+                    <div className="w-full"><SearchField setChanged={changed} getSearch={getSearch} type='teams' setCurrent={setCurrentTeams} setKeyWord={setKeyWord}/></div>
         <button className="text-center text-[10px] w-fit" onClick={()=>navigate('createteam')}><img className="mx-auto" src={createTeamIcon}/>Create team</button>
         </div>
         <div className="flex flex-col gap-6 pt-2">
-          {!currentTeams?teams &&teams.map((team,index)=>(
-           team&& <TeamItemList key={index} team={team}/>
+          {!currentTeams.length>0 ||keyword===''?teams &&teams.map((team,index)=>(
+           team&& <TeamItemList key={index} team={team} teams={teams} />
           )):currentTeams.map((team,index)=>(
            team&& <TeamItemList key={index} team={team} teams={teams}/>
           ))