Revert "Merge pull request #152 from Katyusha-Group/Fix/Timeline-Prof…

…ile-Data" This reverts commit ce83520, reversing changes made to 6b91328.
Katyusha-Group · Jan 28, 2024 · 5f967ef · 5f967ef
1 parent dba8c35
commit 5f967ef
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 158 deletions.
diff --git a/src/assets/apis.js b/src/assets/apis.js
@@ -60,9 +60,6 @@ export const apis = {
 
   tweets: {
     tweets: `${domain}/twittes/`,
-    twittedBy: `${domain}/twittes/?twitted_by=`,
-    likedBy: `${domain}/twittes/?liked_by=`,
-    repliedBy: `${domain}/twittes/?replied_by=`,
   },
   reports: {
     tweets: `${domain}/report-twitte/`,
@@ -87,7 +84,7 @@ export const apis = {
   forYouTwittes: {
     forYouTwittes: `${domain}/for-you-twittes/`,
   },
-  chat: {
+  chat:{
     chat: `${chatDomain}/ws/chat/`,
     chatWith: `${domain}/chat/chat-with/`,
   }

diff --git a/src/assets/css/Profile.module.css b/src/assets/css/Profile.module.css
@@ -218,10 +218,6 @@
     border-bottom: 2px solid var(--purple);
 }
 
-.chatIcon {
-    padding-left: 7px;
-    font-size: large;
-}
 
 @media only screen and (max-width: 1064px) {
     .leftpart {

diff --git a/src/hooks/useLikedBy.jsx b/src/hooks/useLikedBy.jsx
diff --git a/src/hooks/useRepliedBy.jsx b/src/hooks/useRepliedBy.jsx
diff --git a/src/hooks/useTweetBy.jsx b/src/hooks/useTweetBy.jsx
diff --git a/src/views/TimeLine/Timeline_Profile.jsx b/src/views/TimeLine/Timeline_Profile.jsx
@@ -8,9 +8,8 @@ import TeacherTimeline from "../../components/TeacherTimeline/TeacherTimeline";
 import StudentTimeline from "./StudentTimeline.jsx";
 import { useTweets } from "../../hooks/Twitter/useTweets";
 import { useGetChartData } from "../../hooks/GetChartData.jsx";
-import { useTweetBy } from "../../hooks/useTweetBy.jsx";
-import { useLikedBy } from "../../hooks/useLikedBy.jsx";
-import { useRepliedBy } from "../../hooks/useRepliedBy.jsx";
+
+
 function Timeline({ tabsList, profileData, profileData_loading, setProfileData, username, IsThisMe }) {
   if (profileData_loading) {
     return <></>
@@ -37,9 +36,6 @@ function Timeline({ tabsList, profileData, profileData_loading, setProfileData,
     ];
   }
   const { data: tweets, setData: setTweets, loading } = useTweets("get", true);
-  const { filteredTweets, tweetLoading } = useTweetBy(profileData.username);
-  const { likedTweets, likedLoading } = useLikedBy(profileData.username);
-  const { repliedTweets, repliedLoading } = useRepliedBy(profileData.username);
   const [open, setOpen] = useState(false);
   return (
     <>
@@ -65,7 +61,7 @@ function Timeline({ tabsList, profileData, profileData_loading, setProfileData,
         <div className={styles.content}>
           {activeTab === "Tweets" && (
             <div className={styles.tweetsContainer}>
-              {filteredTweets.results.map((tweet) => (
+              {tweets.results.map((tweet) => (
                 <Tweet key={tweet.id}
                   tweet={tweet}
                   setOpenComment={setOpen}
@@ -106,10 +102,9 @@ function Timeline({ tabsList, profileData, profileData_loading, setProfileData,
                 </div>)}
             </div>
           )}
-          {/* {console.log(tweets)} */}
           {activeTab === "Likes" && (
             <div className={styles.tweetsContainer}>
-              {likedTweets.results.map((tweet) => (
+              {tweets.results.filter(item => item.liked_by_me).map((tweet) => (
                 <Tweet
                   key={tweet.id}
                   tweet={tweet}
@@ -121,14 +116,14 @@ function Timeline({ tabsList, profileData, profileData_loading, setProfileData,
           )}
           {activeTab === "Comments" && (
             <div className={styles.tweetsContainer}>
-              {repliedTweets.results.map((tweet) => {
-                return <Tweet
+              {tweets.results.map((tweet) => (
+                <Tweet
                   key={tweet.id}
-                  tweet={tweet.parent_info}
+                  tweet={tweet}
                   setOpenComment={setOpen}
                   setTweets={setTweets}
                 />
-              })}
+              ))}
             </div>
           )}
           <ModalProfileHeader

diff --git a/src/views/UserPorfile/ProfileHeader.jsx b/src/views/UserPorfile/ProfileHeader.jsx
@@ -7,21 +7,22 @@ import { POSTFollow } from '../../hooks/POSTFollow';
 import { useNavigate } from 'react-router-dom';
 import { apis } from '../../assets/apis';
 import Spinner from "react-bootstrap/Spinner";
-export default function ProfileHeader({ profile, setProfileData, username, IsThisMe, profileData_loading }) {
+export default function ProfileHeader({profile, setProfileData, username, IsThisMe, profileData_loading}) {
   // console.log("Profile in profile header: ", profile);
   const [showModal, setShowModal] = React.useState(false);
   const [IsFollowing, setIsFollowing] = React.useState(false); // Which Modal
   // const [profileData_Here, setProfileData_Here] = React.useState(profile);
   const [IsFollowed, setIsFollowed] = React.useState(profile.is_followed);
 
-  if (profileData_loading) {
+  if (profileData_loading)
+  {
     return (
       <div>
         <Spinner animation="border" variant="primary" />
       </div>
     );
   }
-
+  
   const handleOpenModal_Following = () => {
     setIsFollowing(true);
     setShowModal(true);
@@ -57,21 +58,21 @@ export default function ProfileHeader({ profile, setProfileData, username, IsThi
     fetch((apis["profiles"]["view_profile"] + `${username}`), {
       headers: { Authorization: `Bearer ${token}` },
     })
-      .then(response => {
-        return response.json().then((data) => {
-          setProfileData(data);
-        });
-      })
-      .catch((error) => {
-        console.error(error);
+    .then(response => {
+      return response.json().then((data) => {
+        setProfileData(data);
       });
+    })
+    .catch((error) => {
+      console.error(error);
+    });
   }, []);
 
-
+  
 
   const dateObj = new Date(profile.created_at);
   const formattedDate = dateObj.toISOString().split('T')[0].replace(/-/g, '/');
-  const date = moment(formattedDate, 'YYYY/MM/DD').locale('fa').format('YYYY/MM/DD');
+  const date =moment(formattedDate, 'YYYY/MM/DD').locale('fa').format('YYYY/MM/DD');
 
   // let Button_Data = IsThisMe ? 
   //                   "ویرایش پروفایل" :
@@ -80,77 +81,74 @@ export default function ProfileHeader({ profile, setProfileData, username, IsThi
   //                     "دنبال کردن";
 
   const navigate = useNavigate();
-  function Profile_Button() {
-    if (IsThisMe) {
+  function Profile_Button () {
+    if (IsThisMe)
+    {
       navigate('/user');
     }
-    else if (IsFollowed) {
+    else if (IsFollowed)
+    {
       setIsFollowed(prev => !prev);
       POSTFollow(username, !IsFollowed); // unfollow
     }
-    else {
+    else 
+    {
       setIsFollowed(prev => !prev);
       POSTFollow(username, !IsFollowed); // follow
     }
   }
   return (
-    <div className={styles.rightUpper}>
-      <div className={styles.ProfileHeader_Content}>
-        <img className={styles.ProfileImage}
-          src={profile.image}
-          // src="https://www.katyushaiust.ir/media/images/profile_pics/male_default.png"
-          alt="" />
-        <p className={styles.myusername}>
-          @{profile.username}
-          <a href={"/chat/" + username} className={styles.chatIcon}>
-            <i className='tim-icons icon-chat-33'></i>
-          </a>
-        </p>
-
-        <div className={styles.Followes}>
-          <div onClick={handleOpenModal_Following} className={styles.Following_Follower}>
-            <i className='tim-icons icon-single-02'></i>
-            <span className={styles.Followes_Count}>{profile.following_count}</span>
-            <p>دنبال میشود</p>
+        <div className={styles.rightUpper}>
+          <div className={styles.ProfileHeader_Content}>
+            <img className={styles.ProfileImage} 
+              src={profile.image} 
+              // src="https://www.katyushaiust.ir/media/images/profile_pics/male_default.png"
+              alt="" />
+            <p className={styles.myusername}> @{profile.username} </p>
+            <div className={styles.Followes}>
+              <div onClick={handleOpenModal_Following} className={styles.Following_Follower}>
+                <i className='tim-icons icon-single-02'></i>
+                <span className={styles.Followes_Count}>{profile.following_count}</span> 
+                <p>دنبال میشود</p>
+              </div>
+              <div onClick={handleOpenModal_Followers} className={styles.Following_Follower}>
+                <i className='tim-icons icon-single-02'></i>
+                <span className={styles.Followes_Count}>{profile.followers_count}</span> 
+                <p>دنبال کننده</p>
+              </div>
+              <UsersListModal 
+                showModal={showModal} 
+                handleClose={handleCloseModal} 
+                IsFollowing={IsFollowing}  // Is it Following or Follower Modal
+                // Followings={Followings} 
+                // Followers={Followers}
+                username={username}
+                IsThisMe = {IsThisMe}
+              />
+            </div>
+            <button className={styles.followbutton} onClick={Profile_Button}> 
+                  {IsThisMe ? 
+                    "ویرایش پروفایل" :
+                    profile.is_followed ?
+                      "حذف" :
+                      "دنبال کردن"}
+              </button>
           </div>
-          <div onClick={handleOpenModal_Followers} className={styles.Following_Follower}>
-            <i className='tim-icons icon-single-02'></i>
-            <span className={styles.Followes_Count}>{profile.followers_count}</span>
-            <p>دنبال کننده</p>
+
+          <div className={styles.ProfileHeader_Other}>
+              <div className={styles.ProfileHeader_Other_Item}>
+                <p>نام</p>
+                <p>{profile.name}</p> 
+              </div>
+              <div className={styles.ProfileHeader_Other_Item}>
+                <p>نام کاربری</p>
+                <p>{profile.username}@</p>  
+              </div>
+              <div className={styles.ProfileHeader_Other_Item}>
+                <p>تاریخ شروع فعالیت</p>
+                <p>{date}</p>  
+              </div>
           </div>
-          <UsersListModal
-            showModal={showModal}
-            handleClose={handleCloseModal}
-            IsFollowing={IsFollowing}  // Is it Following or Follower Modal
-            // Followings={Followings} 
-            // Followers={Followers}
-            username={username}
-            IsThisMe={IsThisMe}
-          />
-        </div>
-        <button className={styles.followbutton} onClick={Profile_Button}>
-          {IsThisMe ?
-            "ویرایش پروفایل" :
-            profile.is_followed ?
-              "حذف" :
-              "دنبال کردن"}
-        </button>
-      </div>
-
-      <div className={styles.ProfileHeader_Other}>
-        <div className={styles.ProfileHeader_Other_Item}>
-          <p>نام</p>
-          <p>{profile.name}</p>
-        </div>
-        <div className={styles.ProfileHeader_Other_Item}>
-          <p>نام کاربری</p>
-          <p>{profile.username}@</p>
         </div>
-        <div className={styles.ProfileHeader_Other_Item}>
-          <p>تاریخ شروع فعالیت</p>
-          <p>{date}</p>
-        </div>
-      </div>
-    </div>
-  )
+    )
 }
diff --git a/src/views/UserSearchResponce.jsx b/src/views/UserSearchResponce.jsx
@@ -10,7 +10,7 @@ const UserSearchResponce = (res) => {
         <div className={styles.main2}>
           <img className={styles.img} src={res.res.image} />
           <p className={styles.text}>
-            {res.res.name}
+            {res.res.name }
           </p>
         </div>
       </Link>