Merge pull request #145 from Katyusha-Group/fix/timeline

Fix/timeline
Katyusha-Group · Jan 28, 2024 · 7f06cf8 · 7f06cf8
2 parents 38923bd + 4287a47
commit 7f06cf8
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 124 deletions.
diff --git a/src/assets/css/Timeline/Tweet.module.css b/src/assets/css/Timeline/Tweet.module.css
@@ -28,10 +28,13 @@
   margin-right: 10px;
   margin-left: 10px;
   border: 2px solid #32325d;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .avatarimg{
   width: 50px;
-  padding: 2px;
+  height: 50px;
   border-radius: 50%;
   object-fit: cover;
 }

diff --git a/src/assets/css/UserPage.module.css b/src/assets/css/UserPage.module.css
@@ -173,7 +173,6 @@ div {
   border-width: 0.1875rem;
   border-color: "red";
 }
-/* TODO */
 .color {
   width: 23%;
   height: 5rem;
@@ -210,8 +209,6 @@ p {
   justify-content: right;
   padding-right: 5px;
 }
-
-/* TODO fix chart */
 .cart {
   width: 25px;
   height: 25px;

diff --git a/src/components/Timeline/Reply.jsx b/src/components/Timeline/Reply.jsx
@@ -4,7 +4,6 @@ import styles from "../../assets/css/Timeline/Reply.module.css";
 import { useState } from "react";
 import { Card } from "reactstrap";
 import SendMessage from "../Tweet/SendMessage";
-import { useTweets } from "../../hooks/Twitter/useTweets";
 import { useParams } from "react-router-dom";
 function Reply() {
   const [activeTab, setActiveTab] = useState("tweets");

diff --git a/src/components/Tweet/SendMessage.jsx b/src/components/Tweet/SendMessage.jsx
@@ -1,8 +1,6 @@
 import React, { useState } from "react";
 import { Button, Input } from "reactstrap";
 import styles from "../../assets/css/Tweet/SendMessage.module.css";
-import { useSendTweets } from "../../hooks/Twitter/sendTweets";
-import { useTweets } from "../../hooks/Twitter/useTweets";
 
 export default function SendMessage({
   fetchData = () => {},

diff --git a/src/hooks/Twitter/useTweets.jsx b/src/hooks/Twitter/useTweets.jsx
@@ -4,8 +4,15 @@ import { apis } from "../../assets/apis";
 import { useState } from "react";
 import { useEffect } from "react";
 import { returnToken } from "../../Functions/returnToken";
-export const fetchData = (setLoading, setData, num, initial, info, setInfo) => {
-  const token = returnToken()
+export const fetchData = async (
+  setLoading,
+  setData,
+  num,
+  initial,
+  info,
+  setInfo,
+) => {
+  const token = returnToken();
   setLoading(true);
 
   let config = {
@@ -17,24 +24,25 @@ export const fetchData = (setLoading, setData, num, initial, info, setInfo) => {
       Authorization: `Bearer ${token}`,
     },
   };
-  axios
-    .request(config)
-    .then((response) => {
-      setLoading(false);
-      setInfo(response.data)
-      setData((x) => {
-        if (!initial) return ({ ...x, results: [...x.results, ...response.data.results] });
-        return response.data;
-      });
+  try {
+    var response = await axios.request(config);
+    setLoading(false);
+    setInfo(response.data);
+    setData((x) => {
+      if (!initial)
+        return { ...x, results: [...x.results, ...response.data.results] };
       return response.data;
-    })
-    .catch();
+    });
+    return response.data;
+  } catch (error) {
+    console.error("Error fetching data: ", error);
+    throw error;
+  }
 };
 export const useTweets = () => {
   const [data, setData] = useState({ results: [] });
   const [loading, setLoading] = useState(false);
   const [info, setInfo] = useState(null);
-  // console.log("my tweeets",data.results)
 
   useEffect(() => {
     fetchData(setLoading, setData, 1, true, info, setInfo);

diff --git a/src/hooks/Twitter/useTweetsForYou.jsx b/src/hooks/Twitter/useTweetsForYou.jsx
@@ -4,38 +4,40 @@ import { apis } from "../../assets/apis";
 import { useState } from "react";
 import { useEffect } from "react";
 import { returnToken } from "../../Functions/returnToken";
-export const fetchData = (setLoading, setData, num, initial) => {
-  const token = returnToken()
+export const fetchData = async (setLoading, setData, num, initial) => {
+  const token = returnToken();
   setLoading(true);
-  
+
   let config = {
     method: "get",
     maxBodyLength: Infinity,
-    url: apis["forYouTwittes"]["forYouTwittes"],
+    url: apis["forYouTwittes"]["forYouTwittes"] + "?page=" + num,
     headers: {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
     },
   };
-  axios
-    .request(config)
-    .then((response) => {
-      setLoading(false);
-      setData((x) => {
-        if (!initial) return( {...x,results:[...x.results, ...response.data.results]});
-        return response.data;
-      });
+  try {
+    let response = await axios.request(config);
+    setLoading(false);
+    setData((x) => {
+      if (!initial)
+        return { ...x, results: [...x.results, ...response.data.results] };
       return response.data;
-    })
-    .catch();
+    });
+    return response.data;
+  } catch (error) {
+    console.error("Error fetching data: ", error);
+    throw error;
+  }
 };
 export const useTweetsForYou = () => {
-  const [data, setData] = useState({results:[]});
+  const [data, setData] = useState({ results: [] });
   const [loading, setLoading] = useState(false);
   const [info, setInfo] = useState(null);
   useEffect(() => {
     fetchData(setLoading, setData, 1, true);
   }, []);
 
-  return { data, setData, loading, setLoading};
-};
+  return { data, setData, loading, setLoading };
+};
diff --git a/src/hooks/useProfileMe.jsx b/src/hooks/useProfileMe.jsx
@@ -6,9 +6,10 @@ import { returnToken } from "../Functions/returnToken";
 export const usesProfileMe = () => {
   const [profile, setProfile] = useState(null);
   const [loading, setLoading] = useState(true);
-  const { changeInfo } = useInfo();
+  const { info,changeInfo } = useInfo();
   useEffect(() => {
     const token = returnToken()
+
     const fetchData = async () => {
       try {
 
@@ -26,9 +27,10 @@ export const usesProfileMe = () => {
         console.error(error);
       }
     };
-
-    fetchData();
+    if(info.userName !== ""){
+      fetchData();
+    }
   }, []);
-
   return { profile, setProfile, loading };
+
 };
diff --git a/src/hooks/useSearchprofile.jsx b/src/hooks/useSearchprofile.jsx
@@ -8,16 +8,17 @@ export const useAllProfiles = (searchQuery) => {
   const [allProfiles, setAllProfiles] = useState([]);
   const [filteredProfiles, setFilteredProfiles] = useState([]);
   const [loading, setLoading] = useState(true);
+
   useEffect(() => {
     axios(apis["profiles"]["all"] + searchQuery, {
       headers: { Authorization: `Bearer ${token}` },
     })
-      .then((data) => {
-        setFilteredProfiles(data.data);
-        setLoading(false);
-      })
+    .then((data) => {
+      setFilteredProfiles(data.data);
+      setLoading(false);
+    })
       .catch((error) => console.error("error"));
   }, [searchQuery]);
-
+  
   return { filteredProfiles, loading };
 };