Merge pull request #378 from Aymanhki/ayman

Bug fixes
Aymanhki · Apr 9, 2024 · 9071265 · 9071265
2 parents 324a1da + fb370cc
commit 9071265
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 11 deletions.
diff --git a/epoch_frontend/src/modules/Feed.js b/epoch_frontend/src/modules/Feed.js
@@ -29,7 +29,8 @@ export default function Feed({
                                  posts,
                                  isInFavorites,
                                  isInHashtags,
-                                 hashtag
+                                 hashtag,
+                                 isInComments
                              }) {
 
     const [isLoading, setIsLoading] = useState(true);
@@ -372,7 +373,8 @@ export default function Feed({
                                       setFileBlob={setFileBlob}
                                       setPostToEditId={setPostToEditId}
                                       setPostToEditCaption={setPostToEditCaption}
-                                      setPostToEdit={setPostToEdit}/>
+                                      setPostToEdit={setPostToEdit}
+                                      isInComments={isInComments}/>
 
                             ))
                         )}

diff --git a/epoch_frontend/src/modules/Post.js b/epoch_frontend/src/modules/Post.js
@@ -12,7 +12,7 @@ import {favoritePost, removeFavoritePost, votePost, removeVotePost} from "../ser
 import ForumOutlinedIcon from '@mui/icons-material/ForumOutlined';
 import ShareOutlinedIcon from '@mui/icons-material/ShareOutlined';
 
-export default function Post({post, postViewer, isInFavorites, setShowDeletePostPopup, setPostToDelete, setShowFavoritedByList, setShowVoteByList, favoritedByUsernameList, voteByUsernameList, setFavoritedByUsernameList, setVoteByUsernameList, showPostPopup, setShowPostPopup, setReleaseMonth, setReleaseDay, setReleaseYear, setReleaseHour, setReleaseMinute, setReleaseSecond, setFileBlob, setPostToEditId, setPostToEditCaption, setPostToEdit}) {
+export default function Post({post, postViewer, isInFavorites, setShowDeletePostPopup, setPostToDelete, setShowFavoritedByList, setShowVoteByList, favoritedByUsernameList, voteByUsernameList, setFavoritedByUsernameList, setVoteByUsernameList, showPostPopup, setShowPostPopup, setReleaseMonth, setReleaseDay, setReleaseYear, setReleaseHour, setReleaseMinute, setReleaseSecond, setFileBlob, setPostToEditId, setPostToEditCaption, setPostToEdit, isInComments}) {
     const captionCharLimit = 240;
     const timeAllowedToEditInSeconds = 30;
     const [editable, setEditable] = useState(false);
@@ -39,6 +39,7 @@ export default function Post({post, postViewer, isInFavorites, setShowDeletePost
     const [localFinalVoteByUsernameList, setLocalFinalVoteByUsernameList] = useState(voteByUsernameList);
     const [copiedMessage, setCopiedMessage] = useState('');
     const [isMobile, setIsMobile] = useState( window.innerWidth <= 768);
+    const [notVisibleReason, setNotVisibleReason] = useState(null);
 
 
     useEffect(() => {
@@ -227,19 +228,38 @@ export default function Post({post, postViewer, isInFavorites, setShowDeletePost
                     for (let i = 0; i < usernames.length && !visible; i++) {
                         if (postViewer && postViewer.username === usernames[i]) {
                             visible = true;
+                            setNotVisibleReason(null);
                         }
                     }
 
                     if (!visible)
                     {
                         visible = postAdmin;
                     }
+
+                    if (!visible)
+                    {
+                        setNotVisibleReason('You can not see this post because is is not dedicated to you.');
+                    }
+                    else
+                    {
+                        setNotVisibleReason(null);
+                    }
                 }
                 else
                 {
                     visible = true;
+                    setNotVisibleReason(null);
                 }
             }
+            else
+            {
+                setNotVisibleReason('You can not see this post because it is not in your favorites.');
+            }
+        }
+        else
+        {
+            setNotVisibleReason('You can not see this post because it is not released yet.\n' + (post.release ? ' Release: ' + getReleaseFormat() : ''));
         }
 
 
@@ -630,6 +650,7 @@ export default function Post({post, postViewer, isInFavorites, setShowDeletePost
     }, []);
 
     return (
+        <>
         <div className={`post ${showFullCaption ? 'post-expanded' : ''}`}
              style={{display: ( isPostVisible() ) ? 'block' : 'none'}}>
             <div className="post-header">
@@ -769,5 +790,31 @@ export default function Post({post, postViewer, isInFavorites, setShowDeletePost
                 )}
             </div>
         </div>
+
+            {isInComments && notVisibleReason && (
+                <div className={`post`} >
+                    <div className="post-header">
+                        <div className="post-header-left">
+                            <div className={'profile-photo-container'}
+                                 onClick={() => handleProfilePhotoClick(post.profile_picture)}>
+                                <SmartMedia fileUrl={post.profile_picture} file_type={post.profile_picture_type}
+                                            file_name={post.profile_picture_name} alt="Profile" className="profile-photo"/>
+                            </div>
+                            <div className="post-header-info">
+                                <h3 className={'post-username'}
+                                    onClick={() => navigateToProfile()}>{post.username}</h3>
+                                <p className={'post-date'}>{getReleaseFormat()}</p>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className="post-body">
+                        <h1>{notVisibleReason}</h1>
+                    </div>
+
+
+                </div>
+                )}
+        </>
     );
 }
diff --git a/epoch_frontend/src/modules/ProtectedRoute.js b/epoch_frontend/src/modules/ProtectedRoute.js
@@ -20,7 +20,6 @@ const ProtectedRoute = ({ children }) => {
     useEffect(() => {
         // Check if the session is active; if not, redirect to the login page
         if (!isSessionActive()) {
-
             navigate('/epoch/login');
         }
     }, [navigate]);

diff --git a/epoch_frontend/src/pages/Comments.js b/epoch_frontend/src/pages/Comments.js
@@ -110,7 +110,7 @@ function Comments() {
                                               setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshComments}
                                               setRefreshFeed={setRefreshComments} viewingOnly={true}
                                               posts={[commentsPost]} isInFavorites={false} isInHashtags={false}
-                                              hashtag={null}></Feed>
+                                              hashtag={null} isInComments={true}></Feed>
                                     )}
                                 </div>
 

diff --git a/epoch_frontend/src/pages/Favorites.js b/epoch_frontend/src/pages/Favorites.js
@@ -52,7 +52,7 @@ function Favorites() {
                                            currentUser={user} showNewPostPopup={showNewPostPopup}
                                            setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed}
                                            setRefreshFeed={setRefreshFeed}
-                                           isInFavorites={true}/>) : (<></>)}
+                                           isInFavorites={true} isInComments={false}/>) : (<></>)}
                         </div>
                     </div>
                     {user ? (<PostPopup showPopup={showNewPostPopup} setShowPopup={setShowNewPostPopup}

diff --git a/epoch_frontend/src/pages/Hashtag.js b/epoch_frontend/src/pages/Hashtag.js
@@ -58,12 +58,12 @@ function Hashtag() {
                                 <Feed feedUsername={user.username} feedUserId={user.id} isInProfile={false}
                                       currentUser={user} showNewPostPopup={showNewPostPopup}
                                       setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed}
-                                      setRefreshFeed={setRefreshFeed} posts={null} isInFavorites={false} hashtag={hashtag} isInHashtags={true}/>
+                                      setRefreshFeed={setRefreshFeed} posts={null} isInFavorites={false} hashtag={hashtag} isInHashtags={true} isInComments={false}/>
                             ) : (
                                 <Feed feedUsername={null} feedUserId={null} isInProfile={false} currentUser={null}
                                       showNewPostPopup={showNewPostPopup} setShowNewPostPopup={setShowNewPostPopup}
                                       refreshFeed={refreshFeed} setRefreshFeed={setRefreshFeed} viewingOnly={true}
-                                      posts={null} isInFavorites={false} isInHashtags={true} hashtag={hashtag}/>
+                                      posts={null} isInFavorites={false} isInHashtags={true} hashtag={hashtag} isInComments={false}/>
                             )}
                         </div>
                     </div>

diff --git a/epoch_frontend/src/pages/home.js b/epoch_frontend/src/pages/home.js
@@ -61,7 +61,7 @@ function Home() {
                                       currentUser={user} showNewPostPopup={showNewPostPopup}
                                       setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed}
                                       setRefreshFeed={setRefreshFeed} viewingOnly={false} posts={null}
-                                      isInFavorites={false}/>
+                                      isInFavorites={false} isInComments={false}/>
                             </div>
                         </div>
                     </div>

diff --git a/epoch_frontend/src/pages/profile.js b/epoch_frontend/src/pages/profile.js
@@ -400,13 +400,13 @@ function Profile() {
                             <Feed feedUsername={userInfo.username} feedUserId={userInfo.id} isInProfile={true}
                                   currentUser={user} showNewPostPopup={showNewPostPopup}
                                   setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed}
-                                  setRefreshFeed={setRefreshFeed} posts={null} isInFavorites={false}/>
+                                  setRefreshFeed={setRefreshFeed} posts={null} isInFavorites={false} isInComments={false}/>
                         ) : (
                             <Feed feedUsername={userInfo.username} feedUserId={userInfo.id} isInProfile={true}
                                   currentUser={null} showNewPostPopup={showNewPostPopup}
                                   setShowNewPostPopup={setShowNewPostPopup} refreshFeed={refreshFeed}
                                   setRefreshFeed={setRefreshFeed} viewingOnly={true} posts={null}
-                                  isInFavorites={false}/>
+                                  isInFavorites={false} isInComments={false}/>
                         )}
                     </div>
                 </div>