nav from following and follower pages to profile

COS301-SE-2024 · Sep 27, 2024 · 425d84d · 425d84d
1 parent 4bfd500
commit 425d84d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 29 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -248,10 +248,10 @@ const ThemedStackNavigator = withTheme(({ theme }) => (
                 title: "movieHub.",
                 headerShadowVisible: false,
                 headerBackTitleVisible: false,
-                headerTintColor: "white",
                 headerTintColor: theme.textColor,
+                headerTransparent: true,
                 headerStyle: {
-                    backgroundColor: theme.backgroundColor,
+                    backgroundColor: "transparent",
                 },
             })}
         />

diff --git a/frontend/src/Components/MovieCard.js b/frontend/src/Components/MovieCard.js
@@ -14,12 +14,6 @@ export default function MovieCard({ movieId, imageUrl, title, rating, overview,
         navigation.navigate("MovieDescriptionPage", { movieId: movieId, imageUrl: imageUrl, title: title, rating: rating, overview: overview, date: date, userInfo: userInfo });
     };
 
-
-
-    const handleLikePress = () => {
-        setLiked(!liked);
-    };
-
     return (
         <View style={styles.container}>
 

diff --git a/frontend/src/Screens/ExplorePage.js b/frontend/src/Screens/ExplorePage.js
@@ -147,7 +147,6 @@ export default function ExplorePage({ route }) {
         }
     }, [userInfo]);
 
-
     useEffect(() => {
         if (userInfo) {
             fetchFriendsContent();

diff --git a/frontend/src/Screens/FollowersPage.js b/frontend/src/Screens/FollowersPage.js
@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from 'react';
-import { View, FlatList, StyleSheet, Text, ActivityIndicator } from 'react-native';
-import FollowList from '../Components/FollowList';
+import { View, FlatList, StyleSheet, Text, ActivityIndicator, TouchableOpacity } from 'react-native';
 import { getFollowers, isFollowed } from '../Services/UsersApiService';
 import { useTheme } from "../styles/ThemeContext";
+import FollowList from '../Components/FollowList';
+import { useNavigation } from '@react-navigation/native';
 
 const FollowersPage = ({ route }) => {
     const { userInfo } = route.params;
-    console.log(userInfo) 
+    const navigation = useNavigation();
     const [followers, setFollowers] = useState([]);
     const [loading, setLoading] = useState(true); 
     const {theme} = useTheme();
@@ -24,7 +25,6 @@ const FollowersPage = ({ route }) => {
                     isFollowing,    // Add the isFollowing property
                 };
             }));
-            console.log("followers", followersWithStatus)
             setFollowers(followersWithStatus); // Set the updated followers list
         } catch (error) {
             console.error("Error fetching followers:", error);
@@ -38,14 +38,16 @@ const FollowersPage = ({ route }) => {
     }, []);
 
     const renderFollower = ({ item }) => (
-        <FollowList 
-            route={route}
-            uid={item.uid}
-            username={item.username}
-            userHandle={item.name}
-            userAvatar={item.avatar}
-            isFollowing={item.isFollowing}
-        />
+        <TouchableOpacity onPress={() => navigation.navigate('Profile', { userInfo, otherUserInfo: item })}>
+            <FollowList 
+                route={route}
+                uid={item.uid}
+                username={item.username}
+                userHandle={item.name}
+                userAvatar={item.avatar}
+                isFollowing={item.isFollowing}
+            />
+        </TouchableOpacity>
     );
 
     const styles = StyleSheet.create({

diff --git a/frontend/src/Screens/FollowingPage.js b/frontend/src/Screens/FollowingPage.js
@@ -40,14 +40,16 @@ const FollowingPage = ({ route }) => {
 
 
     const renderFollower = ({ item }) => (
-        <FollowList 
-            route={route}
-            uid={item.uid}
-            username={item.username}
-            userHandle={item.name}
-            userAvatar={item.avatar}
-            isFollowing={item.isFollowing}
-        />
+        <TouchableOpacity onPress={() => navigation.navigate('Profile', { userInfo, otherUserInfo: item })}>
+            <FollowList 
+                route={route}
+                uid={item.uid}
+                username={item.username}
+                userHandle={item.name}
+                userAvatar={item.avatar}
+                isFollowing={item.isFollowing}
+            />
+        </TouchableOpacity>
     );
 
     const styles = StyleSheet.create({

diff --git a/frontend/src/Screens/GenrePage.js b/frontend/src/Screens/GenrePage.js
@@ -146,6 +146,7 @@ const GenrePage = () => {
 
             <MovieCard
                 key={index}
+                userInfo={userInfo}
                 movieId={movie.id}
                 imageUrl={`https://image.tmdb.org/t/p/w500${movie.poster_path}`}
                 title={movie.title}

diff --git a/frontend/src/Screens/Notifications.js b/frontend/src/Screens/Notifications.js
@@ -193,6 +193,9 @@ const Notifications = ({ route }) => {
                                 <Text style={styles.buttonText}>Read</Text>
                             </TouchableOpacity>
                         )}
+                        <TouchableOpacity style={[styles.button, styles.deleteButton]} onPress={() => handleDeleteNotification(item.id, item.type)}>
+                            <Text style={styles.buttonText}>Delete</Text>
+                        </TouchableOpacity>
                         <TouchableOpacity style={[styles.button, styles.followButton]} onPress={() => handleFollow(item.isFollowing, item.followerId)}>
                             <Text style={styles.buttonText}>{item.isFollowing ? "Following" : "Follow"}</Text>
                         </TouchableOpacity>