Merge pull request #362 from Aymanhki/ayman

Bug fix for feed scrolling

epoch_backend/business/utils.py

@@ -317,6 +317,7 @@ def get_post_dict(current_post, posts_media, username, profile_picture_url, prof
                   i):
     post_dict = {}
     post_dict["post_id"] = current_post[0]
+    post_dict["user_id"] = current_post[1]
     post_dict["profile_picture"] = profile_picture_url
     post_dict["profile_picture_type"] = profile_picture_type
     post_dict["profile_picture_name"] = profile_picture_name

epoch_frontend/src/modules/NotificationsPopup.js

@@ -13,13 +13,13 @@ function NotificationsPopup ({showNotifications, setShowNotifications, newUnread
     const {user} = useContext(UserContext);
     const[notifications, setNotifications] = useState((user && user.notifications) || []);
     const [offset, setOffset] = useState(0);
-    const limit =  useState(10);
+    const limit =  10;
     const [isLoading, setIsLoading] = useState(false);
     const [noMoreNotifications, setNoMoreNotifications] = useState(false);
     const [countUnreadNotifications, setCountUnreadNotifications] = useState(0);
     const [loadMorePrompt, setLoadMorePrompt] = useState('Load more');
     const [markAllAsReadPrompt, setMarkAllAsReadPrompt] = useState('Mark all as read');
-    const getNotificationsEvery = 90000000; // 10 seconds
+    const getNotificationsEvery = 3000; // 3 seconds
 
     const {transform: inTransform, opacity: inOpacity} = useSpring({
         opacity: showNotifications ? 1 : 0,

epoch_frontend/src/pages/Comments.js

@@ -11,6 +11,7 @@ import { UserContext } from '../services/UserContext';
 import { getUserInfo } from "../services/user";
 import CommentPopup from "../modules/CommentPopup";
 import {useNavigate} from "react-router-dom";
+import Feed from "../modules/Feed";
 
 
 
@@ -118,7 +119,10 @@ function Comments() {
                 <div className={"post-comments-page-wrapper"}>
                     <div className={"post-comments-page-feed"}>
             <div className={'comments-post-wrapper'}>
-        {commentsPost && (<Post key={ commentsPost.post_id } post={commentsPost} postViewer={user} refreshFeed={refreshComments} setRefreshFeed={setRefreshComments} isInFavorites={false}></Post>)}
+        {commentsPost && (
+            // <Post key={ commentsPost.post_id } post={commentsPost} postViewer={user} refreshFeed={refreshComments} setRefreshFeed={setRefreshComments} isInFavorites={false}></Post>
+            <Feed feedUsername={user.username} feedUserId={commentsPost.user_id} isInProfile={false} currentUser={user} showNewPostPopup={showNewPostPopup} setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed} setRefreshFeed={setRefreshFeed} viewingOnly={true} posts={[commentsPost]} isInFavorites={false} isInHashtags={false} hashtag={null}></Feed>
+        )}
             </div>
 
       {(<button className={`new-comment-button ${showNewCommentPopup ? 'rotate' : ''}`}
@@ -141,7 +145,7 @@ function Comments() {
       </div>
       )}
       <PostPopup showPopup={showNewPostPopup} setShowPopup={setShowNewPostPopup} username={user.username} profilePic={user.profile_pic_data} refreshFeed={refreshFeed} setRefreshFeed={setRefreshFeed}/>
-        <CommentPopup showPopup={showNewCommentPopup} setShowPopup={setShowNewCommentPopup} postId={postId} username={user.username} profilePic={user.profile_pic_data} refreshComments={refreshComments} setRefreshComments={setRefreshComments}/>
+    <CommentPopup showPopup={showNewCommentPopup} setShowPopup={setShowNewCommentPopup} postId={postId} username={user.username} profilePic={user.profile_pic_data} refreshComments={refreshComments} setRefreshComments={setRefreshComments}/>
     </>
   )
 }

epoch_frontend/src/styles/PostComments.css

@@ -89,7 +89,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 90%;
+    width: 80%;
     height: auto;
     padding: 1rem;
     margin: 1rem;