diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..d05d5b1
Binary files /dev/null and b/.DS_Store differ
diff --git a/addbannerlogicc.drawio b/addbannerlogicc.drawio
new file mode 100644
index 0000000..993f446
--- /dev/null
+++ b/addbannerlogicc.drawio
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/adminpanellogic.drawio b/adminpanellogic.drawio
new file mode 100644
index 0000000..b4a740b
--- /dev/null
+++ b/adminpanellogic.drawio
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/backend/controllers/messageController.js b/backend/controllers/messageController.js
index a8d0656..3aeee51 100644
--- a/backend/controllers/messageController.js
+++ b/backend/controllers/messageController.js
@@ -3,100 +3,165 @@ import Message from "../models/messageModel.js";
import { getRecipientSocketId, io } from "../socket/socket.js";
import { v2 as cloudinary } from "cloudinary";
+// this is is just a comment to see if anything is actually being affected and if im pushing changes as a head master thats all
+// Start of sendMessage function
async function sendMessage(req, res) {
- try {
- const { recipientId, message } = req.body;
- let { img } = req.body;
- const senderId = req.user._id;
-
- let conversation = await Conversation.findOne({
- participants: { $all: [senderId, recipientId] },
- });
-
- if (!conversation) {
- conversation = new Conversation({
- participants: [senderId, recipientId],
- lastMessage: {
- text: message,
- sender: senderId,
- },
- });
- await conversation.save();
- }
-
- if (img) {
- const uploadedResponse = await cloudinary.uploader.upload(img);
- img = uploadedResponse.secure_url;
- }
-
- const newMessage = new Message({
- conversationId: conversation._id,
- sender: senderId,
- text: message,
- img: img || "",
- });
-
- await Promise.all([
- newMessage.save(),
- conversation.updateOne({
- lastMessage: {
- text: message,
- sender: senderId,
- },
- }),
- ]);
-
- const recipientSocketId = getRecipientSocketId(recipientId);
- if (recipientSocketId) {
- io.to(recipientSocketId).emit("newMessage", newMessage);
- }
-
- res.status(201).json(newMessage);
- } catch (error) {
- res.status(500).json({ error: error.message });
- }
+ try {
+ const { recipientId, message } = req.body;
+ let { img } = req.body;
+ const senderId = req.user._id;
+
+
+ let conversation = await Conversation.findOne({
+ participants: { $all: [senderId, recipientId] },
+ });
+
+
+ if (!conversation) {
+ conversation = new Conversation({
+ participants: [senderId, recipientId],
+ lastMessage: {
+ text: message,
+ sender: senderId,
+ },
+ });
+ await conversation.save();
+ }
+
+
+ if (img) {
+ const uploadedResponse = await cloudinary.uploader.upload(img);
+ img = uploadedResponse.secure_url;
+ }
+
+
+ const newMessage = new Message({
+ conversationId: conversation._id,
+ sender: senderId,
+ text: message,
+ img: img || "",
+ });
+
+
+ await Promise.all([
+ newMessage.save(),
+ conversation.updateOne({
+ lastMessage: {
+ text: message,
+ sender: senderId,
+ },
+ }),
+ ]);
+
+
+ const recipientSocketId = getRecipientSocketId(recipientId);
+ if (recipientSocketId) {
+ io.to(recipientSocketId).emit("newMessage", newMessage);
+ }
+
+
+ res.status(201).json(newMessage);
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
}
+// End of sendMessage function
+
+// Start of getMessages function
async function getMessages(req, res) {
- const { otherUserId } = req.params;
- const userId = req.user._id;
- try {
- const conversation = await Conversation.findOne({
- participants: { $all: [userId, otherUserId] },
- });
-
- if (!conversation) {
- return res.status(404).json({ error: "Conversation not found" });
- }
-
- const messages = await Message.find({
- conversationId: conversation._id,
- }).sort({ createdAt: 1 });
-
- res.status(200).json(messages);
- } catch (error) {
- res.status(500).json({ error: error.message });
- }
+ const { otherUserId } = req.params;
+ const userId = req.user._id;
+ try {
+ const conversation = await Conversation.findOne({
+ participants: { $all: [userId, otherUserId] },
+ });
+
+
+ if (!conversation) {
+ return res.status(404).json({ error: "Conversation not found" });
+ }
+
+
+ const messages = await Message.find({
+ conversationId: conversation._id,
+ }).sort({ createdAt: 1 });
+
+
+ res.status(200).json(messages);
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
}
+// End of getMessages function
+
+// Start of getConversations function
async function getConversations(req, res) {
- const userId = req.user._id;
- try {
- const conversations = await Conversation.find({ participants: userId }).populate({
- path: "participants",
- select: "username profilePic",
- });
-
- // remove the current user from the participants array
- conversations.forEach((conversation) => {
- conversation.participants = conversation.participants.filter(
- (participant) => participant._id.toString() !== userId.toString()
- );
- });
- res.status(200).json(conversations);
- } catch (error) {
- res.status(500).json({ error: error.message });
- }
+ const userId = req.user._id;
+ try {
+ const conversations = await Conversation.find({ participants: userId }).populate({
+ path: "participants",
+ select: "username profilePic",
+ });
+
+
+ // remove the current user from the participants array
+ conversations.forEach((conversation) => {
+ conversation.participants = conversation.participants.filter(
+ (participant) => participant._id.toString() !== userId.toString()
+ );
+ });
+ res.status(200).json(conversations);
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
}
+// End of getConversations function
+
+
+// Start of deleteMessage function
+async function deleteMessage(req, res) {
+ try {
+ const { messageId } = req.params;
+ const userId = req.user._id;
+
+
+ const message = await Message.findById(messageId);
+
+
+ // Check if the message exists and if the user is the sender
+ if (!message || message.sender.toString() !== userId.toString()) {
+ return res.status(403).json({ error: "You can only delete your own messages" });
+ }
+
+
+ // Delete the message
+ await message.deleteOne();
+
+
+ // Optionally, you can update the conversation's last message if the deleted message was the last one
+ const conversation = await Conversation.findById(message.conversationId);
+ if (conversation && conversation.lastMessage && conversation.lastMessage.text === message.text) {
+ const lastMessage = await Message.findOne({ conversationId: message.conversationId }).sort({ createdAt: -1 });
+ if (lastMessage) {
+ conversation.lastMessage = {
+ text: lastMessage.text,
+ sender: lastMessage.sender,
+ };
+ } else {
+ conversation.lastMessage = { text: "", sender: "" };
+ }
+ await conversation.save();
+ }
+
+
+ res.status(200).json({ message: "Message deleted successfully" });
+ } catch (error) {
+ res.status(500).json({ error: error.message });
+ }
+}
+// End of deleteMessage function
+
-export { sendMessage, getMessages, getConversations };
+export { sendMessage, getMessages, getConversations, deleteMessage };
diff --git a/backend/controllers/postController.js b/backend/controllers/postController.js
index 3f964a4..1fa111e 100644
--- a/backend/controllers/postController.js
+++ b/backend/controllers/postController.js
@@ -1,171 +1,1815 @@
+// this is th euodated post controller with the the new changes(dont use this)
+// import Post from "../models/postModel.js";
+// import User from "../models/userModel.js";
+// import { v2 as cloudinary } from "cloudinary";
+
+// const createPost = async (req, res) => {
+// try {
+// const { text, targetAudience } = req.body;
+// let { img } = req.body;
+// const userId = req.user._id;
+
+// if (!text) {
+// return res.status(400).json({ error: "Text field is required" });
+// }
+
+// // Ensure text length is within limit (500 characters max)
+// if (text.length > 500) {
+// return res.status(400).json({ error: "Text must be less than 500 characters" });
+// }
+
+// // Find the user who is creating the post
+// const user = await User.findById(userId);
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// // Handle image upload if provided
+// if (img) {
+// const uploadedResponse = await cloudinary.uploader.upload(img);
+// img = uploadedResponse.secure_url;
+// }
+
+// // Check target audience permissions based on user role
+// let finalTargetAudience = null;
+// if (user.role === "admin") {
+// // Admin can set any target audience
+// finalTargetAudience = targetAudience;
+// } else if (user.role === "teacher") {
+// // Teachers can target "all" or their own department
+// finalTargetAudience = targetAudience === "all" || targetAudience === user.department ? targetAudience : "all";
+// } else if (user.role === "student") {
+// // Students cannot specify a target audience
+// finalTargetAudience = null;
+// }
+
+// // Create a new post
+// const newPost = new Post({
+// postedBy: userId,
+// text,
+// img,
+// targetAudience: finalTargetAudience,
+// });
+
+// // Save the post
+// await newPost.save();
+// res.status(201).json(newPost);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const getPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+// const post = await Post.findById(postId).populate("postedBy", "username profilePic");
+
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// res.status(200).json(post);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const deletePost = async (req, res) => {
+// try {
+// const post = await Post.findById(req.params.id);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// if (post.postedBy.toString() !== req.user._id.toString()) {
+// return res.status(401).json({ error: "Unauthorized to delete post" });
+// }
+
+// if (post.img) {
+// const imgId = post.img.split("/").pop().split(".")[0];
+// await cloudinary.uploader.destroy(imgId);
+// }
+
+// await Post.findByIdAndDelete(req.params.id);
+// res.status(200).json({ message: "Post deleted successfully" });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const likeUnlikePost = async (req, res) => {
+// try {
+// const { id: postId } = req.params;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const userLikedPost = post.likes.includes(userId);
+// if (userLikedPost) {
+// await Post.updateOne({ _id: postId }, { $pull: { likes: userId } });
+// res.status(200).json({ message: "Post unliked successfully" });
+// } else {
+// post.likes.push(userId);
+// await post.save();
+// res.status(200).json({ message: "Post liked successfully" });
+// }
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const replyToPost = async (req, res) => {
+// try {
+// const { text } = req.body;
+// const postId = req.params.id;
+// const userId = req.user._id;
+// const userProfilePic = req.user.profilePic;
+// const username = req.user.username;
+
+// if (!text) {
+// return res.status(400).json({ error: "Text field is required" });
+// }
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const reply = { userId, text, userProfilePic, username };
+// post.replies.push(reply);
+// await post.save();
+
+// res.status(200).json(reply);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const repostPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// if (post.reposts.includes(userId)) {
+// return res.status(400).json({ error: "Post already reposted" });
+// }
+
+// post.reposts.push(userId);
+// await post.save();
+// res.status(200).json({ message: "Post reposted successfully", post });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const getFeedPosts = async (req, res) => {
+// try {
+// const userId = req.user && req.user._id;
+// if (!userId) {
+// return res.status(401).json({ error: "Unauthorized, user not authenticated" });
+// }
+
+// const user = await User.findById(userId).select("role following yearGroup department isStudent");
+
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// const following = user.following || [];
+// const allUserIds = [...following, userId];
+
+// let queryConditions = [
+// { targetAudience: null },
+// { targetAudience: "all" },
+// { postedBy: { $in: allUserIds } },
+// ];
+
+// if (user.role === "student") {
+// queryConditions.push({ targetAudience: user.yearGroup });
+// } else if (user.role === "teacher") {
+// queryConditions.push({ targetAudience: user.department });
+// }
+
+// const feedPosts = await Post.find({
+// $or: queryConditions,
+// }).sort({ createdAt: -1 });
+
+// res.status(200).json(feedPosts);
+// } catch (err) {
+// res.status(500).json({ error: "Could not fetch posts" });
+// }
+// };
+
+// const getUserPosts = async (req, res) => {
+// const { username } = req.params;
+// try {
+// const user = await User.findOne({ username });
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// const posts = await Post.find({ postedBy: user._id }).sort({ createdAt: -1 });
+// res.status(200).json(posts);
+// } catch (error) {
+// res.status(500).json({ error: error.message });
+// }
+// };
+
+// export {
+// createPost,
+// getPost,
+// deletePost,
+// likeUnlikePost,
+// replyToPost,
+// repostPost,
+// getFeedPosts,
+// getUserPosts,
+// };
+
+// original use this version (working this si the one to use)
+// import Post from "../models/postModel.js";
+// import User from "../models/userModel.js";
+// import { v2 as cloudinary } from "cloudinary";
+
+// const createPost = async (req, res) => {
+// try {
+// const { postedBy, text, targetAudience } = req.body;
+// let { img } = req.body;
+
+// if (!postedBy || !text) {
+// return res.status(400).json({ error: "PostedBy and text fields are required" });
+// }
+
+// // Find the user who is posting
+// const user = await User.findById(postedBy);
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// // Check if the user is authorized to post
+// if (user._id.toString() !== req.user._id.toString()) {
+// return res.status(401).json({ error: "Unauthorized to create post" });
+// }
+
+// // Ensure text length is within limit (500 characters max)
+// if (text.length > 500) {
+// return res.status(400).json({ error: `Text must be less than 500 characters` });
+// }
+
+// // Handle image upload if provided
+// if (img) {
+// const uploadedResponse = await cloudinary.uploader.upload(img);
+// img = uploadedResponse.secure_url;
+// }
+
+// // Only teachers can set the `targetAudience`
+// let finalTargetAudience = null;
+// if (user.role === "teacher") {
+// finalTargetAudience = targetAudience || 'all'; // Default to 'all' if not specified
+// }
+
+// // Create the new post
+// const newPost = new Post({
+// postedBy,
+// text,
+// img,
+// targetAudience: finalTargetAudience, // Target audience only for teachers
+// });
+
+// // Save the post
+// await newPost.save();
+
+// // Respond with the newly created post
+// res.status(201).json(newPost);
+
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const getPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+
+// // Fetch the post with the postedBy details
+// const post = await Post.findById(postId).populate("postedBy", "username profilePic");
+
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// // Return the post since the middleware has already filtered access
+// res.status(200).json(post);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const deletePost = async (req, res) => {
+// try {
+// const post = await Post.findById(req.params.id);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// if (post.postedBy.toString() !== req.user._id.toString()) {
+// return res.status(401).json({ error: "Unauthorized to delete post" });
+// }
+
+// if (post.img) {
+// const imgId = post.img.split("/").pop().split(".")[0];
+// await cloudinary.uploader.destroy(imgId);
+// }
+
+// await Post.findByIdAndDelete(req.params.id);
+
+// res.status(200).json({ message: "Post deleted successfully" });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const likeUnlikePost = async (req, res) => {
+// try {
+// const { id: postId } = req.params;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const userLikedPost = post.likes.includes(userId);
+
+// if (userLikedPost) {
+// // Unlike post
+// await Post.updateOne({ _id: postId }, { $pull: { likes: userId } });
+// res.status(200).json({ message: "Post unliked successfully" });
+// } else {
+// // Like post
+// post.likes.push(userId);
+// await post.save();
+// res.status(200).json({ message: "Post liked successfully" });
+// }
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const replyToPost = async (req, res) => {
+// try {
+// const { text } = req.body;
+// const postId = req.params.id;
+// const userId = req.user._id;
+// const userProfilePic = req.user.profilePic;
+// const username = req.user.username;
+
+// if (!text) {
+// return res.status(400).json({ error: "Text field is required" });
+// }
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const reply = { userId, text, userProfilePic, username };
+
+// post.replies.push(reply);
+// await post.save();
+
+// res.status(200).json(reply);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// // New repostPost method
+// const repostPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// // Ensure the post is not already reposted by this user
+// if (post.reposts.includes(userId)) {
+// return res.status(400).json({ error: "Post already reposted" });
+// }
+
+// // Add user ID to reposts array
+// post.reposts.push(userId);
+// await post.save();
+
+// res.status(200).json({ message: "Post reposted successfully", post });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const getFeedPosts = async (req, res) => {
+// try {
+// const userId = req.user && req.user._id; // Ensure req.user exists before accessing userId
+
+// if (!userId) {
+// return res.status(401).json({ error: "Unauthorized, user not authenticated" });
+// }
+
+// const user = await User.findById(userId).select("role following yearGroup isStudent");
+
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// // Retrieve the list of users the current user is following
+// const following = user.following || [];
+
+// // Include the current user’s own ID in the list to fetch their posts as well
+// const allUserIds = [...following, userId];
+
+// // Fetch posts based on target audience and user roles
+// const feedPosts = await Post.find({
+// $or: [
+// { targetAudience: null }, // Posts without specific targeting (public)
+// { targetAudience: "all" }, // Posts targeted to all users
+// { targetAudience: user.isStudent ? user.yearGroup : user.role }, // Posts targeted to user's year group or role
+// { postedBy: { $in: allUserIds } }, // Posts by users the current user is following
+// ],
+// }).sort({ createdAt: -1 });
+
+// // If no posts found, return an empty array instead of 404
+// if (!feedPosts.length) {
+// return res.status(200).json([]);
+// }
+
+// res.status(200).json(feedPosts);
+// } catch (err) {
+// console.error("Error fetching feed posts:", err.message);
+// res.status(500).json({ error: "Could not fetch posts" });
+// }
+// };
+
+// const getUserPosts = async (req, res) => {
+// const { username } = req.params;
+// try {
+// const user = await User.findOne({ username });
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// const posts = await Post.find({ postedBy: user._id }).sort({
+// createdAt: -1,
+// });
+
+// res.status(200).json(posts);
+// } catch (error) {
+// res.status(500).json({ error: error.message });
+// }
+// };
+
+// export {
+// createPost,
+// getPost,
+// deletePost,
+// likeUnlikePost,
+// replyToPost,
+// getFeedPosts,
+// getUserPosts,
+// };
+
+// this is the new version Admin role update
+// import Post from "../models/postModel.js";
+// import User from "../models/userModel.js";
+// import { v2 as cloudinary } from "cloudinary";
+
+// const createPost = async (req, res) => {
+// try {
+// const {
+// postedBy,
+// text,
+// targetYearGroups,
+// targetDepartments,
+// targetAudience,
+// } = req.body;
+// let { img } = req.body;
+
+// // Validate required fields
+// if (!postedBy || !text) {
+// return res
+// .status(400)
+// .json({ error: "PostedBy and text fields are required" });
+// }
+
+// // Find the user who is posting
+// const user = await User.findById(postedBy);
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// // Authorization check
+// if (user._id.toString() !== req.user._id.toString()) {
+// return res.status(401).json({ error: "Unauthorized to create post" });
+// }
+
+// // Role-specific post creation rules
+// switch (user.role) {
+// case "student":
+// // Students can only post to 'all'
+// req.body.targetAudience = "all";
+// req.body.targetYearGroups = [];
+// req.body.targetDepartments = [];
+// break;
+
+// case "teacher":
+// // Teachers must specify year groups
+// if (!targetYearGroups || targetYearGroups.length === 0) {
+// return res.status(400).json({
+// error: "Teachers must specify at least one year group to target",
+// });
+// }
+// // Ensure the teacher is targeting only year groups
+// req.body.targetDepartments = [];
+// req.body.targetAudience = targetYearGroups[0]; // Set first targeted year group as audience
+// break;
+
+// case "admin":
+// // Admins must specify a target
+// if (!targetAudience && !targetYearGroups && !targetDepartments) {
+// return res.status(400).json({
+// error:
+// "Admin must specify a target audience, year groups, or departments",
+// });
+// }
+// break;
+
+// default:
+// return res.status(403).json({ error: "Unauthorized to create posts" });
+// }
+
+// // Handle image upload if provided
+// if (img) {
+// const uploadedResponse = await cloudinary.uploader.upload(img);
+// img = uploadedResponse.secure_url;
+// }
+
+// // Create the post
+// const newPost = new Post({
+// postedBy,
+// text,
+// img,
+// targetYearGroups: targetYearGroups || [],
+// targetDepartments: targetDepartments || [],
+// targetAudience: req.body.targetAudience || "all",
+// });
+
+// await newPost.save();
+// res.status(201).json(newPost);
+// } catch (err) {
+// console.error("Error in createPost:", err.message);
+// res.status(500).json({ error: "Failed to create post" });
+// }
+// };
+
+
+// const getPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+
+// // Fetch the post matching the filter and ID
+// const post = await Post.findOne({ _id: postId, ...req.filter }).populate(
+// "postedBy",
+// "username profilePic"
+// );
+
+// if (!post) {
+// return res.status(404).json({ error: "Post not found or access denied" });
+// }
+
+// res.status(200).json(post);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const deletePost = async (req, res) => {
+// try {
+// const post = await Post.findById(req.params.id);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// if (post.postedBy.toString() !== req.user._id.toString()) {
+// return res.status(401).json({ error: "Unauthorized to delete post" });
+// }
+
+// if (post.img) {
+// const imgId = post.img.split("/").pop().split(".")[0];
+// await cloudinary.uploader.destroy(imgId);
+// }
+
+// await Post.findByIdAndDelete(req.params.id);
+
+// res.status(200).json({ message: "Post deleted successfully" });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const likeUnlikePost = async (req, res) => {
+// try {
+// const { id: postId } = req.params;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const userLikedPost = post.likes.includes(userId);
+
+// if (userLikedPost) {
+// // Unlike post
+// await Post.updateOne({ _id: postId }, { $pull: { likes: userId } });
+// res.status(200).json({ message: "Post unliked successfully" });
+// } else {
+// // Like post
+// post.likes.push(userId);
+// await post.save();
+// res.status(200).json({ message: "Post liked successfully" });
+// }
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const replyToPost = async (req, res) => {
+// try {
+// const { text } = req.body;
+// const postId = req.params.id;
+// const userId = req.user._id;
+// const userProfilePic = req.user.profilePic;
+// const username = req.user.username;
+
+// if (!text) {
+// return res.status(400).json({ error: "Text field is required" });
+// }
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// const reply = { userId, text, userProfilePic, username };
+
+// post.replies.push(reply);
+// await post.save();
+
+// res.status(200).json(reply);
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// // New repostPost method
+// const repostPost = async (req, res) => {
+// try {
+// const postId = req.params.id;
+// const userId = req.user._id;
+
+// const post = await Post.findById(postId);
+// if (!post) {
+// return res.status(404).json({ error: "Post not found" });
+// }
+
+// // Ensure the post is not already reposted by this user
+// if (post.reposts.includes(userId)) {
+// return res.status(400).json({ error: "Post already reposted" });
+// }
+
+// // Add user ID to reposts array
+// post.reposts.push(userId);
+// await post.save();
+
+// res.status(200).json({ message: "Post reposted successfully", post });
+// } catch (err) {
+// res.status(500).json({ error: err.message });
+// }
+// };
+
+// const getFeedPosts = async (req, res) => {
+// try {
+// const userId = req.user && req.user._id;
+
+// if (!userId) {
+// return res
+// .status(401)
+// .json({ error: "Unauthorized, user not authenticated" });
+// }
+
+// const user = await User.findById(userId).select(
+// "role following yearGroup department isStudent"
+// );
+
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// // Retrieve the list of users the current user is following
+// const following = user.following || [];
+
+// // Construct a precise filtering condition
+// const postFilter = {
+// $or: [
+// // Always allow posts targeted to 'all'
+// { targetAudience: "all" },
+
+// // For students, show posts targeting their EXACT year group
+// ...(user.role === "student"
+// ? [
+// { targetYearGroups: { $in: [user.yearGroup] } },
+// { targetAudience: user.yearGroup },
+// ]
+// : []),
+
+// // For teachers, show posts targeting their EXACT department
+// ...(user.role === "teacher"
+// ? [
+// { targetDepartments: { $in: [user.department] } },
+// { targetAudience: user.department },
+// ]
+// : []),
+
+// // For admin/TV, show additional posts
+// ...(user.role === "admin" || user.role === "tv"
+// ? [{ targetAudience: "tv" }]
+// : []),
+
+// // Always show posts from users the current user is following
+// { postedBy: { $in: following } },
+
+// // Ensure users see their own posts
+// { postedBy: userId }
+// ],
+// };
+
+// // Fetch posts matching the filter
+// const feedPosts = await Post.find(postFilter)
+// .populate("postedBy", "username profilePic")
+// .sort({ createdAt: -1 })
+// .limit(50); // Limit to prevent overwhelming results
+
+// res.status(200).json(feedPosts);
+// } catch (err) {
+// console.error("Error fetching feed posts:", err.message);
+// res.status(500).json({ error: "Could not fetch posts" });
+// }
+// };
+
+// const getUserPosts = async (req, res) => {
+// const { username } = req.params;
+// try {
+// const user = await User.findOne({ username });
+// if (!user) {
+// return res.status(404).json({ error: "User not found" });
+// }
+
+// const posts = await Post.find({ postedBy: user._id }).sort({
+// createdAt: -1,
+// });
+
+// res.status(200).json(posts);
+// } catch (error) {
+// res.status(500).json({ error: error.message });
+// }
+// };
+
+// export {
+// createPost,
+// getPost,
+// deletePost,
+// likeUnlikePost,
+// replyToPost,
+// getFeedPosts,
+// getUserPosts,
+// };
+
+
+// post notis(working)
+// import Post from "../models/postModel.js";
+// import User from "../models/userModel.js";
+// import { v2 as cloudinary } from "cloudinary";
+// import nodemailer from 'nodemailer';
+
+// // Email configuration
+// const transporter = nodemailer.createTransport({
+// host: "smtp-relay.brevo.com",
+// port: 587,
+// auth: {
+// user: "81d810001@smtp-brevo.com",
+// pass: "6IBdE9hsKrHUxD4G",
+// },
+// });
+
+// // Helper function to send notification email
+// const sendNotificationEmail = async (recipientEmail, posterId, postId, posterUsername) => {
+// const mailOptions = {
+// from: "pearnet104@gmail.com",
+// to: recipientEmail,
+// subject: "New Post on Pear! 🍐",
+// html: `
+//
+//
New Post on Pear! 🍐
+//
Hello! ${posterUsername} just made a new post on Pear.
+//
Don't miss out on the conversation!
+//
+// View Post
+//
+//
+// You received this email because you have notifications enabled.
+// You can disable these in your Pear account settings.
+//
+//
+
New Post on Pear! 🍐
+
Hello! ${posterUsername} just made a new post on Pear.
+
Don't miss out on the conversation!
+
+ View Post
+
+
+ You received this email because you have notifications enabled.
+ You can disable these in your Pear account settings.
+
+
+ {!isActive && (
+
+ )}
+
+
+
Follow users for the latest Brookhouse news.
}
+
+// {loading && (
+//
+//
+//
+// )}
+
+// {posts.map((post) => (
+//
+// ))}
+//
+//
+//
+//
+//
+// );
+// };
+
+// export default HomePage;
+
+
+// version 2 this is the animated posts with green tint (this is before the disabled suggested users)
+// import { Box, Flex, Spinner } from "@chakra-ui/react";
+// import { useEffect, useState } from "react";
+// import useShowToast from "../hooks/useShowToast";
+// import Post from "../components/Post";
+// import { useRecoilState } from "recoil";
+// import postsAtom from "../atoms/postsAtom";
+// import SuggestedUsers from "../components/SuggestedUsers";
+
+// const HomePage = () => {
+// const [posts, setPosts] = useRecoilState(postsAtom);
+// const [loading, setLoading] = useState(true);
+// const showToast = useShowToast();
+
+// useEffect(() => {
+// const getFeedPosts = async () => {
+// setLoading(true);
+// setPosts([]);
+// try {
+// const res = await fetch("/api/posts/feed");
+// const data = await res.json();
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// console.log(data);
+// setPosts(data);
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// } finally {
+// setLoading(false);
+// }
+// };
+// getFeedPosts();
+// }, [showToast, setPosts]);
+
+// return (
+//
+//
+// {!loading && posts.length === 0 && (
+// Follow users for the latest Brookhouse news.
+// )}
+
+// {loading && (
+//
+//
+//
+// )}
+
+// {posts.map((post) => (
+//
+// {/* Assuming Post component takes care of image and content */}
+//
+//
+// ))}
+//
+
+//
+//
+//
+//
+// );
+// };
+
+// export default HomePage;
+
+// this is is home page with sugggested users disable version 3 working
+// import { Box, Flex, Spinner } from "@chakra-ui/react";
+// import { useEffect, useState } from "react";
+// import useShowToast from "../hooks/useShowToast";
+// import Post from "../components/Post";
+// import { useRecoilState } from "recoil";
+// import postsAtom from "../atoms/postsAtom";
+// // import SuggestedUsers from "../components/SuggestedUsers"; // Commented out the import
+
+// const HomePage = () => {
+// const [posts, setPosts] = useRecoilState(postsAtom);
+// const [loading, setLoading] = useState(true);
+// const showToast = useShowToast();
+
+// useEffect(() => {
+// const getFeedPosts = async () => {
+// setLoading(true);
+// setPosts([]);
+// try {
+// const res = await fetch("/api/posts/feed");
+// const data = await res.json();
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// console.log(data);
+// setPosts(data);
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// } finally {
+// setLoading(false);
+// }
+// };
+// getFeedPosts();
+// }, [showToast, setPosts]);
+
+// return (
+//
+//
+// {!loading && posts.length === 0 && (
+// welcome to pear you have succesfully created an account login in to see the latest brookhouse news.
+// )}
+
+// {loading && (
+//
+//
+//
+// )}
+
+// {posts.map((post) => (
+//
+// {/* Assuming Post component takes care of image and content */}
+//
+//
+// ))}
+//
+
+// {/*
+//
+//
+//
+// */}
+//
+// );
+// };
+
+// export default HomePage;
+
+
+
+
+// adding the new posts working
+// import { Box, Flex, Spinner, Text } from "@chakra-ui/react";
+// import { useEffect, useState } from "react";
+// import useShowToast from "../hooks/useShowToast";
+// import Post from "../components/Post";
+// import { useRecoilState } from "recoil";
+// import postsAtom from "../atoms/postsAtom";
+// import '../index.css'; // Ensure correct CSS is imported
+
+// const HomePage = () => {
+// const [posts, setPosts] = useRecoilState(postsAtom);
+// const [loading, setLoading] = useState(true);
+// const [newPosts, setNewPosts] = useState([]);
+// const showToast = useShowToast();
+
+// useEffect(() => {
+// const getFeedPosts = async () => {
+// setLoading(true);
+// setPosts([]);
+// try {
+// const res = await fetch("/api/posts/feed");
+// const data = await res.json();
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// setPosts(data);
+
+// const now = Date.now();
+// const recentPosts = data.filter(post => {
+// const postAgeInHours = (now - new Date(post.createdAt).getTime()) / (1000 * 60 * 60);
+// return postAgeInHours <= 3; // Check if post is within 1-3 hours
+// });
+// setNewPosts(recentPosts);
+
+// setTimeout(() => {
+// setNewPosts([]);
+// }, 30000); // "New to you" message disappears after 30 seconds
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// } finally {
+// setLoading(false);
+// }
+// };
+// getFeedPosts();
+// }, [showToast, setPosts]);
+
+// const isNewPost = (postTime) => {
+// const now = Date.now();
+// const postAgeInHours = (now - new Date(postTime).getTime()) / (1000 * 60 * 60);
+// return postAgeInHours <= 3;
+// };
+
+// return (
+//
+//
+// {!loading && posts.length === 0 && (
+// Welcome to Pear! You have successfully created an account. Log in to see the latest Brookhouse news.
+// )}
+
+// {loading && (
+//
+//
+//
+// )}
+
+// {posts.map((post) => {
+// const isNew = isNewPost(post.createdAt);
+
+// return (
+//
+//
+
+// {isNew && newPosts.includes(post) && (
+// New to you!
+// )}
+//
+// );
+// })}
+//
+//
+// );
+// };
+
+// export default HomePage;
+
+
+// this is with translations added(working)
+import { Box, Flex, Spinner, Text } from "@chakra-ui/react";
import { useEffect, useState } from "react";
import useShowToast from "../hooks/useShowToast";
import Post from "../components/Post";
import { useRecoilState } from "recoil";
import postsAtom from "../atoms/postsAtom";
-import SuggestedUsers from "../components/SuggestedUsers";
+import { useTranslation } from 'react-i18next'; // Import useTranslation
+import '../index.css'; // Ensure correct CSS is imported
const HomePage = () => {
const [posts, setPosts] = useRecoilState(postsAtom);
const [loading, setLoading] = useState(true);
+ const [newPosts, setNewPosts] = useState([]);
const showToast = useShowToast();
+ const { t, i18n } = useTranslation(); // Initialize the translation hook
+ const [language, setLanguage] = useState(i18n.language); // Add language state
+
+ // Handle language changes
+ useEffect(() => {
+ const handleLanguageChange = (lng) => {
+ setLanguage(lng);
+ };
+
+ i18n.on('languageChanged', handleLanguageChange); // Listen for language changes
+
+ return () => {
+ i18n.off('languageChanged', handleLanguageChange); // Cleanup on unmount
+ };
+ }, [i18n]);
+
useEffect(() => {
const getFeedPosts = async () => {
setLoading(true);
@@ -17,44 +372,81 @@ const HomePage = () => {
try {
const res = await fetch("/api/posts/feed");
const data = await res.json();
+
if (data.error) {
- showToast("Error", data.error, "error");
+ // Ensure that the toast is only shown if the user retrieval truly fails
+ showToast(t("Error"), data.error, "error");
return;
}
- console.log(data);
+
setPosts(data);
+
+ const now = Date.now();
+ const recentPosts = data.filter(post => {
+ const postAgeInHours = (now - new Date(post.createdAt).getTime()) / (1000 * 60 * 60);
+ return postAgeInHours <= 3; // Check if post is within 1-3 hours
+ });
+ setNewPosts(recentPosts);
+
+ setTimeout(() => {
+ setNewPosts([]);
+ }, 30000); // "New to you" message disappears after 30 seconds
} catch (error) {
- showToast("Error", error.message, "error");
+ // Make sure the error here is valid (e.g., network error or actual server issue)
+ if (error.message.includes('User not found')) {
+ // Suppress "User not found" error on the HomePage
+ console.warn("User retrieval failed but no toast shown");
+ } else {
+ showToast(t("Error"), error.message, "error");
+ }
} finally {
setLoading(false);
}
};
getFeedPosts();
- }, [showToast, setPosts]);
+ }, [showToast, setPosts, t]);
+
+
+ const isNewPost = (postTime) => {
+ const now = Date.now();
+ const postAgeInHours = (now - new Date(postTime).getTime()) / (1000 * 60 * 60);
+ return postAgeInHours <= 3;
+ };
return (
-
+
- {!loading && posts.length === 0 && Follow some users to see the feed
}
+ {!loading && posts.length === 0 && (
+ {t("Welcome to Pear! You have successfully created an account. Log in to see the latest Brookhouse news 🍐.")}
+ )}
{loading && (
-
-
+
+
)}
- {posts.map((post) => (
-
- ))}
-
-
-
+ {posts.map((post) => {
+ const isNew = isNewPost(post.createdAt);
+
+ return (
+
+
+
+ {isNew && newPosts.includes(post) && (
+ {t("New to you!")}
+ )}
+
+ );
+ })}
);
diff --git a/frontend/src/pages/PostPage.jsx b/frontend/src/pages/PostPage.jsx
index 6f2001d..1d11e35 100644
--- a/frontend/src/pages/PostPage.jsx
+++ b/frontend/src/pages/PostPage.jsx
@@ -1,6 +1,140 @@
-import { Avatar, Box, Button, Divider, Flex, Image, Spinner, Text } from "@chakra-ui/react";
+// working version one
+// import { Avatar, Box, Button, Divider, Flex, Image, Spinner, Text } from "@chakra-ui/react";
+// import Actions from "../components/Actions";
+// import { useEffect } from "react";
+// import Comment from "../components/Comment";
+// import useGetUserProfile from "../hooks/useGetUserProfile";
+// import useShowToast from "../hooks/useShowToast";
+// import { useNavigate, useParams } from "react-router-dom";
+// import { formatDistanceToNow } from "date-fns";
+// import { useRecoilState, useRecoilValue } from "recoil";
+// import userAtom from "../atoms/userAtom";
+// import { DeleteIcon } from "@chakra-ui/icons";
+// import postsAtom from "../atoms/postsAtom";
+
+// const PostPage = () => {
+// const { user, loading } = useGetUserProfile();
+// const [posts, setPosts] = useRecoilState(postsAtom);
+// const showToast = useShowToast();
+// const { pid } = useParams();
+// const currentUser = useRecoilValue(userAtom);
+// const navigate = useNavigate();
+
+// const currentPost = posts[0];
+
+// useEffect(() => {
+// const getPost = async () => {
+// setPosts([]);
+// try {
+// const res = await fetch(`/api/posts/${pid}`);
+// const data = await res.json();
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// setPosts([data]);
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// }
+// };
+// getPost();
+// }, [showToast, pid, setPosts]);
+
+// const handleDeletePost = async () => {
+// try {
+// if (!window.confirm("Are you sure you want to delete this post?")) return;
+
+// const res = await fetch(`/api/posts/${currentPost._id}`, {
+// method: "DELETE",
+// });
+// const data = await res.json();
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// showToast("Success", "Post deleted", "success");
+// navigate(`/${user.username}`);
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// }
+// };
+
+// if (!user && loading) {
+// return (
+//
+//
+//
+// );
+// }
+
+// if (!currentPost) return null;
+// console.log("currentPost", currentPost);
+
+// return (
+// <>
+//
+//
+//
+//
+//
+// {user.username}
+//
+//
+//
+//
+//
+//
+// {formatDistanceToNow(new Date(currentPost.createdAt))} ago
+//
+
+// {currentUser?._id === user._id && (
+//
+// )}
+//
+//
+
+// {currentPost.text}
+
+// {currentPost.img && (
+//
+//
+//
+// )}
+
+//
+//
+//
+
+//
+// {/* temporarily disbled the get button */}
+
+//
+//
+// 🍐
+// The application is coming to your phone soon.
+//
+// {/* */}
+//
+
+//
+// {currentPost.replies.map((reply) => (
+//
+// ))}
+//
+// );
+// };
+
+// export default PostPage;
+
+
+// verison two with transaltions
+import { Avatar, Box, Divider, Flex, Image, Spinner, Text } from "@chakra-ui/react";
import Actions from "../components/Actions";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
import Comment from "../components/Comment";
import useGetUserProfile from "../hooks/useGetUserProfile";
import useShowToast from "../hooks/useShowToast";
@@ -10,120 +144,147 @@ import { useRecoilState, useRecoilValue } from "recoil";
import userAtom from "../atoms/userAtom";
import { DeleteIcon } from "@chakra-ui/icons";
import postsAtom from "../atoms/postsAtom";
+import { useTranslation } from "react-i18next";
const PostPage = () => {
- const { user, loading } = useGetUserProfile();
- const [posts, setPosts] = useRecoilState(postsAtom);
- const showToast = useShowToast();
- const { pid } = useParams();
- const currentUser = useRecoilValue(userAtom);
- const navigate = useNavigate();
-
- const currentPost = posts[0];
-
- useEffect(() => {
- const getPost = async () => {
- setPosts([]);
- try {
- const res = await fetch(`/api/posts/${pid}`);
- const data = await res.json();
- if (data.error) {
- showToast("Error", data.error, "error");
- return;
- }
- setPosts([data]);
- } catch (error) {
- showToast("Error", error.message, "error");
- }
- };
- getPost();
- }, [showToast, pid, setPosts]);
-
- const handleDeletePost = async () => {
- try {
- if (!window.confirm("Are you sure you want to delete this post?")) return;
-
- const res = await fetch(`/api/posts/${currentPost._id}`, {
- method: "DELETE",
- });
- const data = await res.json();
- if (data.error) {
- showToast("Error", data.error, "error");
- return;
- }
- showToast("Success", "Post deleted", "success");
- navigate(`/${user.username}`);
- } catch (error) {
- showToast("Error", error.message, "error");
- }
- };
-
- if (!user && loading) {
- return (
-
-
-
- );
- }
-
- if (!currentPost) return null;
- console.log("currentPost", currentPost);
-
- return (
- <>
-
-
-
-
-
- {user.username}
-
-
-
-
-
-
- {formatDistanceToNow(new Date(currentPost.createdAt))} ago
-
-
- {currentUser?._id === user._id && (
-
- )}
-
-
-
- {currentPost.text}
-
- {currentPost.img && (
-
-
-
- )}
-
-
-
-
-
-
-
-
-
- 👋
- Get the app to like, reply and post.
-
-
-
-
-
- {currentPost.replies.map((reply) => (
-
- ))}
-
- );
+ const { t } = useTranslation();
+ const { user, loading } = useGetUserProfile();
+ const [posts, setPosts] = useRecoilState(postsAtom);
+ const showToast = useShowToast();
+ const { pid } = useParams();
+ const currentUser = useRecoilValue(userAtom);
+ const navigate = useNavigate();
+ const [loadingPost, setLoadingPost] = useState(true);
+
+ const handleDeletePost = async (postId) => {
+ try {
+ const res = await fetch(`/api/posts/${postId}`, {
+ method: "DELETE",
+ headers: {
+ Authorization: `Bearer ${currentUser.token}`,
+ },
+ });
+
+ if (!res.ok) {
+ const errorData = await res.json();
+ showToast(t("Error"), errorData.error || t("Failed to delete post"), "error");
+ return;
+ }
+
+ navigate("/");
+ showToast(t("Success"), t("Post deleted successfully"), "success");
+ } catch (error) {
+ showToast(t("Error"), error.message || t("Failed to delete post"), "error");
+ }
+ };
+
+ const handleDeleteComment = (deletedCommentId) => {
+ setPosts(prevPosts => {
+ const updatedPost = {
+ ...prevPosts[0],
+ replies: prevPosts[0].replies.filter(reply => reply._id !== deletedCommentId)
+ };
+ return [updatedPost];
+ });
+ };
+
+ useEffect(() => {
+ const getPost = async () => {
+ setLoadingPost(true);
+ try {
+ const res = await fetch(`/api/posts/${pid}`);
+ const data = await res.json();
+
+ if (!res.ok) {
+ showToast(t("Error"), data.error || t("Something went wrong"), "error");
+ return;
+ }
+
+ setPosts([data]);
+ } catch (error) {
+ showToast(t("Error"), error.message || t("Something went wrong"), "error");
+ } finally {
+ setLoadingPost(false);
+ }
+ };
+ getPost();
+ }, [showToast, pid, setPosts, t]);
+
+ if (!user && loading) {
+ return (
+
+
+
+ );
+ }
+
+ if (loadingPost) {
+ return (
+
+
+
+ );
+ }
+
+ const currentPost = posts[0];
+
+ if (!currentPost) return {t("No post found.")};
+
+ return (
+ <>
+
+
+
+
+
+ {user.username}
+
+
+
+
+
+
+ {formatDistanceToNow(new Date(currentPost.createdAt))} {t("ago")}
+
+ {(currentUser?.role === "admin" || currentUser?._id === user._id) && (
+ handleDeletePost(currentPost._id)}
+ />
+ )}
+
+
+
+ {currentPost.text}
+
+ {currentPost.img && (
+
+
+
+ )}
+
+
+
+
+
+
+
+ {currentPost.replies?.map((reply, index) => (
+
+ ))}
+
+ );
};
-export default PostPage;
+export default PostPage;
\ No newline at end of file
diff --git a/frontend/src/pages/SettingsPage.jsx b/frontend/src/pages/SettingsPage.jsx
index 63bb341..e7d9cf7 100644
--- a/frontend/src/pages/SettingsPage.jsx
+++ b/frontend/src/pages/SettingsPage.jsx
@@ -1,42 +1,404 @@
-import { Button, Text } from "@chakra-ui/react";
-import useShowToast from "../hooks/useShowToast";
-import useLogout from "../hooks/useLogout";
+// version one without language switcher
+// import { Button, Text } from "@chakra-ui/react";
+// import useShowToast from "../hooks/useShowToast";
+// import useLogout from "../hooks/useLogout";
+
+// export const SettingsPage = () => {
+// const showToast = useShowToast();
+// const logout = useLogout();
+
+// const freezeAccount = async () => {
+// if (!window.confirm("Are you sure you want to freeze your account?")) return;
+
+// try {
+// const res = await fetch("/api/users/freeze", {
+// method: "PUT",
+// headers: { "Content-Type": "application/json" },
+// });
+// const data = await res.json();
+
+// if (data.error) {
+// return showToast("Error", data.error, "error");
+// }
+// if (data.success) {
+// await logout();
+// showToast("Success", "Your account has been frozen", "success");
+// }
+// } catch (error) {
+// showToast("Error", error.message, "error");
+// }
+// };
+
+// return (
+// <>
+//
+// Freeze Your Account
+//
+// You can unfreeze your account anytime by logging in.
+//
+//
+// );
+// };
+
+
+// version 2 working version with change of langauge feature
+// import React from 'react';
+// import { Button, Text } from '@chakra-ui/react';
+// import useShowToast from '../hooks/useShowToast';
+// import useLogout from '../hooks/useLogout';
+// import i18n from '../i18n'; // Import i18n
+
+// export const SettingsPage = () => {
+// const showToast = useShowToast();
+// const logout = useLogout();
+
+// const freezeAccount = async () => {
+// if (!window.confirm(i18n.t("Are you sure you want to freeze your account?"))) return;
+
+// try {
+// const res = await fetch('/api/users/freeze', {
+// method: 'PUT',
+// headers: { 'Content-Type': 'application/json' },
+// });
+// const data = await res.json();
+
+// if (data.error) {
+// return showToast('Error', data.error, 'error');
+// }
+// if (data.success) {
+// await logout();
+// showToast('Success', i18n.t('Your account has been frozen'), 'success');
+// }
+// } catch (error) {
+// showToast('Error', error.message, 'error');
+// }
+// };
+
+// const handleLanguageChange = (lng) => {
+// i18n.changeLanguage(lng);
+// localStorage.setItem('language', lng);
+// };
+
+// return (
+// <>
+//
+// {i18n.t('Freeze Your Account')}
+//
+//
+// {i18n.t('You can unfreeze your account anytime by logging in.')}
+//
+//
+//
+//
+//
+// );
+// };
+
+// version 3 pauseeeeeee this is woring witht the langauge changer butons only working in the settings thoughb
+// import React from 'react';
+// import { Button, Text, Spinner } from '@chakra-ui/react';
+// import useShowToast from '../hooks/useShowToast';
+// import useLogout from '../hooks/useLogout';
+// import i18n from '../i18n'; // Import i18n
+
+// export const SettingsPage = () => {
+// const showToast = useShowToast();
+// const logout = useLogout();
+// const [loading, setLoading] = React.useState(false);
+
+// const freezeAccount = async () => {
+// if (!window.confirm(i18n.t("Are you sure you want to freeze your account?"))) return;
+
+// try {
+// const res = await fetch('/api/users/freeze', {
+// method: 'PUT',
+// headers: { 'Content-Type': 'application/json' },
+// });
+// const data = await res.json();
+
+// if (data.error) {
+// return showToast('Error', data.error, 'error');
+// }
+// if (data.success) {
+// await logout();
+// showToast('Success', i18n.t('Your account has been frozen'), 'success');
+// }
+// } catch (error) {
+// showToast('Error', error.message, 'error');
+// }
+// };
+
+// const handleLanguageChange = (lng) => {
+// setLoading(true);
+// i18n.changeLanguage(lng).then(() => {
+// localStorage.setItem('language', lng);
+// setLoading(false);
+// });
+// };
+
+// return (
+// <>
+//
+// {i18n.t('Freeze Your Account')}
+//
+//
+// {i18n.t('You can unfreeze your account anytime by logging in.')}
+//
+//
+// {loading ? (
+//
+// ) : (
+// <>
+//
+//
+//
+// )}
+//
+// );
+// };
+
+
+
+// slight update to th settings for the langauge changer
+// import React from 'react';
+// import { Button, Text, Spinner } from '@chakra-ui/react';
+// import useShowToast from '../hooks/useShowToast';
+// import useLogout from '../hooks/useLogout';
+// import i18n from '../i18n'; // Import i18n
+
+// export const SettingsPage = () => {
+// const showToast = useShowToast();
+// const logout = useLogout();
+// const [loading, setLoading] = React.useState(false);
+
+// const freezeAccount = async () => {
+// if (!window.confirm(i18n.t("Are you sure you want to freeze your account?"))) return;
+
+// try {
+// const res = await fetch('/api/users/freeze', {
+// method: 'PUT',
+// headers: { 'Content-Type': 'application/json' },
+// });
+// const data = await res.json();
+
+// if (data.error) {
+// return showToast('Error', data.error, 'error');
+// }
+// if (data.success) {
+// await logout();
+// showToast('Success', i18n.t('Your account has been frozen'), 'success');
+// }
+// } catch (error) {
+// showToast('Error', error.message, 'error');
+// }
+// };
+
+// const handleLanguageChange = (lng) => {
+// setLoading(true);
+// i18n.changeLanguage(lng).then(() => {
+// localStorage.setItem('language', lng);
+// setLoading(false);
+// });
+// };
+
+// return (
+// <>
+//
+// {i18n.t('Freeze Your Account')}
+//
+//
+// {i18n.t('You can unfreeze your account anytime by logging in.')}
+//
+//
+// {loading ? (
+//
+// ) : (
+// <>
+//
+//
+//
+// )}
+//
+// );
+// };
+
+
+// post notis
+import React from 'react';
+import { Button, Text, Spinner, Switch, HStack, useToast } from '@chakra-ui/react';
+import useShowToast from '../hooks/useShowToast';
+import useLogout from '../hooks/useLogout';
+import i18n from '../i18n';
export const SettingsPage = () => {
- const showToast = useShowToast();
- const logout = useLogout();
-
- const freezeAccount = async () => {
- if (!window.confirm("Are you sure you want to freeze your account?")) return;
-
- try {
- const res = await fetch("/api/users/freeze", {
- method: "PUT",
- headers: { "Content-Type": "application/json" },
- });
- const data = await res.json();
-
- if (data.error) {
- return showToast("Error", data.error, "error");
- }
- if (data.success) {
- await logout();
- showToast("Success", "Your account has been frozen", "success");
- }
- } catch (error) {
- showToast("Error", error.message, "error");
- }
- };
-
- return (
- <>
-
- Freeze Your Account
-
- You can unfreeze your account anytime by logging in.
-
-
- );
-};
+ const showToast = useShowToast();
+ const logout = useLogout();
+ const [loading, setLoading] = React.useState(false);
+ const [notificationsEnabled, setNotificationsEnabled] = React.useState(true);
+ const [isToggling, setIsToggling] = React.useState(false);
+
+ // Fetch initial notification preferences when component mounts
+ React.useEffect(() => {
+ const fetchNotificationPreferences = async () => {
+ try {
+ const res = await fetch('/api/users/me');
+ const data = await res.json();
+ if (data.notificationPreferences !== undefined) {
+ setNotificationsEnabled(data.notificationPreferences);
+ }
+ } catch (error) {
+ console.error('Error fetching notification preferences:', error);
+ }
+ };
+
+ fetchNotificationPreferences();
+ }, []);
+
+ const toggleNotifications = async () => {
+ setIsToggling(true);
+ try {
+ const res = await fetch('/api/posts/toggle-notifications', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ credentials: 'include'
+ });
+ const data = await res.json();
+
+ if (data.error) {
+ showToast('Error', data.error, 'error');
+ return;
+ }
+
+ setNotificationsEnabled(data.notificationPreferences);
+ showToast(
+ 'Success',
+ `${i18n.t('Email notifications')} ${data.notificationPreferences ? i18n.t('enabled') : i18n.t('disabled')}`,
+ 'success'
+ );
+ } catch (error) {
+ showToast('Error', error.message, 'error');
+ } finally {
+ setIsToggling(false);
+ }
+ };
+
+ const freezeAccount = async () => {
+ if (!window.confirm(i18n.t("Are you sure you want to freeze your account?"))) return;
+
+ try {
+ const res = await fetch('/api/users/freeze', {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ });
+ const data = await res.json();
+
+ if (data.error) {
+ return showToast('Error', data.error, 'error');
+ }
+ if (data.success) {
+ await logout();
+ showToast('Success', i18n.t('Your account has been frozen'), 'success');
+ }
+ } catch (error) {
+ showToast('Error', error.message, 'error');
+ }
+ };
+
+ const handleLanguageChange = (lng) => {
+ setLoading(true);
+ i18n.changeLanguage(lng).then(() => {
+ localStorage.setItem('language', lng);
+ setLoading(false);
+ });
+ };
+
+ return (
+ <>
+ {/* Notification Settings Section */}
+
+ {i18n.t('Email Notifications')}
+
+
+
+
+ {notificationsEnabled
+ ? i18n.t('Receive email notifications for new posts')
+ : i18n.t('Email notifications are disabled')}
+
+ {isToggling && }
+
+
+ {/* Account Freeze Section */}
+
+ {i18n.t('Freeze Your Account')}
+
+
+ {i18n.t('You can unfreeze your account anytime by logging in.')}
+
+
+
+ {/* Language Selection Section */}
+ {loading ? (
+
+ ) : (
+ <>
+
+
+
+ )}
+
+ );
+};
\ No newline at end of file
diff --git a/frontend/src/pages/TVPage.jsx b/frontend/src/pages/TVPage.jsx
new file mode 100644
index 0000000..fa6a638
--- /dev/null
+++ b/frontend/src/pages/TVPage.jsx
@@ -0,0 +1,175 @@
+import React, { useEffect, useState } from 'react';
+import { Box, Flex, Spinner, Text, useToast } from "@chakra-ui/react";
+import { useRecoilValue } from "recoil";
+import userAtom from "../atoms/userAtom";
+import Post from "../components/Post";
+import { useTranslation } from 'react-i18next';
+
+const TVPage = () => {
+ const [posts, setPosts] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [currentPostIndex, setCurrentPostIndex] = useState(0);
+ const [error, setError] = useState(null);
+ const [cachedPosts, setCachedPosts] = useState([]);
+ const user = useRecoilValue(userAtom);
+ const { t } = useTranslation();
+ const toast = useToast();
+
+ const SLIDE_DURATION = 7000;
+ const MAX_FEATURED_POSTS = 3;
+
+ useEffect(() => {
+ const loadCachedPosts = () => {
+ const cached = localStorage.getItem('tvPagePosts');
+ if (cached) {
+ setCachedPosts(JSON.parse(cached));
+ setPosts(JSON.parse(cached));
+ setLoading(false);
+ }
+ };
+
+ const fetchPosts = async () => {
+ setLoading(true);
+ try {
+ const res = await fetch("/api/posts/feed");
+ const data = await res.json();
+
+ if (data.error) {
+ setError(data.error);
+ toast({
+ title: t("Error"),
+ description: data.error,
+ status: "error",
+ duration: 3000,
+ isClosable: true,
+ });
+ return;
+ }
+
+ const sortedPosts = data.sort((a, b) => {
+ const aEngagement = (a.likes?.length || 0) + (a.replies?.length || 0);
+ const bEngagement = (b.likes?.length || 0) + (b.replies?.length || 0);
+ return bEngagement - aEngagement;
+ });
+
+ const featuredPosts = sortedPosts.slice(0, MAX_FEATURED_POSTS);
+ setPosts(featuredPosts);
+ localStorage.setItem('tvPagePosts', JSON.stringify(featuredPosts));
+ setCachedPosts(featuredPosts);
+ } catch (error) {
+ setError(error.message);
+ loadCachedPosts();
+ toast({
+ title: t("Network Error"),
+ description: t("Using cached content"),
+ status: "warning",
+ duration: 3000,
+ isClosable: true,
+ });
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ if (user?.role !== 'admin') {
+ toast({
+ title: t("Access Denied"),
+ description: t("You don't have permission to view this page"),
+ status: "error",
+ duration: 3000,
+ isClosable: true,
+ });
+ return;
+ }
+
+ fetchPosts();
+
+ const interval = setInterval(() => {
+ setCurrentPostIndex((prevIndex) =>
+ prevIndex === (posts.length - 1) ? 0 : prevIndex + 1
+ );
+ }, SLIDE_DURATION);
+
+ return () => clearInterval(interval);
+ }, [user, t, toast]);
+
+ const Progress = ({ index }) => (
+
+
+
+ );
+
+ if (!user || user.role !== 'admin') {
+ return {t("Access Denied")};
+ }
+
+ return (
+
+ {loading ? (
+
+
+
+ ) : error ? (
+ {error}
+ ) : (
+
+
+ {posts.map((_, index) => (
+
+
+
+ ))}
+
+
+ {posts[currentPostIndex] && (
+
+
+
+ )}
+
+
+ )}
+
+ );
+};
+
+export default TVPage;
\ No newline at end of file
diff --git a/frontend/src/pages/UpdateProfilePage.jsx b/frontend/src/pages/UpdateProfilePage.jsx
index 4890fa9..1e1dcef 100644
--- a/frontend/src/pages/UpdateProfilePage.jsx
+++ b/frontend/src/pages/UpdateProfilePage.jsx
@@ -1,3 +1,356 @@
+// version one is working
+// import {
+// Button,
+// Flex,
+// FormControl,
+// FormLabel,
+// Heading,
+// Input,
+// Stack,
+// useColorModeValue,
+// Avatar,
+// Center,
+// } from "@chakra-ui/react";
+// import { useRef, useState } from "react";
+// import { useRecoilState } from "recoil";
+// import userAtom from "../atoms/userAtom";
+// import usePreviewImg from "../hooks/usePreviewImg";
+// import useShowToast from "../hooks/useShowToast";
+
+// export default function UpdateProfilePage() {
+// const [user, setUser] = useRecoilState(userAtom);
+// const [inputs, setInputs] = useState({
+// name: user.name,
+// username: user.username,
+// email: user.email,
+// bio: user.bio,
+// password: "",
+// });
+// const fileRef = useRef(null);
+// const [updating, setUpdating] = useState(false);
+
+// const showToast = useShowToast();
+
+// const { handleImageChange, imgUrl } = usePreviewImg();
+
+// const handleSubmit = async (e) => {
+// e.preventDefault();
+// if (updating) return;
+// setUpdating(true);
+// try {
+// const res = await fetch(`/api/users/update/${user._id}`, {
+// method: "PUT",
+// headers: {
+// "Content-Type": "application/json",
+// },
+// body: JSON.stringify({ ...inputs, profilePic: imgUrl }),
+// });
+// const data = await res.json(); // updated user object
+// if (data.error) {
+// showToast("Error", data.error, "error");
+// return;
+// }
+// showToast("Success", "Profile updated successfully", "success");
+// setUser(data);
+// localStorage.setItem("user-threads", JSON.stringify(data));
+// } catch (error) {
+// showToast("Error", error, "error");
+// } finally {
+// setUpdating(false);
+// }
+// };
+// return (
+//
+// );
+// }
+
+
+// this is version with updated trabsaltions working
+// import {
+// Button,
+// Flex,
+// FormControl,
+// FormLabel,
+// Heading,
+// Input,
+// Stack,
+// useColorModeValue,
+// Avatar,
+// Center,
+// } from "@chakra-ui/react";
+// import { useRef, useState, useEffect } from "react";
+// import { useRecoilState } from "recoil";
+// import userAtom from "../atoms/userAtom";
+// import usePreviewImg from "../hooks/usePreviewImg";
+// import useShowToast from "../hooks/useShowToast";
+// import { useTranslation } from 'react-i18next'; // Import useTranslation
+
+// export default function UpdateProfilePage() {
+// const [user, setUser] = useRecoilState(userAtom);
+// const [inputs, setInputs] = useState({
+// name: user.name,
+// username: user.username,
+// email: user.email,
+// bio: user.bio,
+// password: "",
+// });
+// const fileRef = useRef(null);
+// const [updating, setUpdating] = useState(false);
+
+// const showToast = useShowToast();
+// const { handleImageChange, imgUrl } = usePreviewImg();
+// const { t, i18n } = useTranslation(); // Initialize the translation hook
+// const [language, setLanguage] = useState(i18n.language); // Add a state for language
+
+// // Handle language change
+// useEffect(() => {
+// const handleLanguageChange = (lng) => {
+// setLanguage(lng);
+// };
+
+// i18n.on('languageChanged', handleLanguageChange);
+
+// return () => {
+// i18n.off('languageChanged', handleLanguageChange);
+// };
+// }, [i18n]);
+
+// const handleSubmit = async (e) => {
+// e.preventDefault();
+// if (updating) return;
+// setUpdating(true);
+// try {
+// const res = await fetch(`/api/users/update/${user._id}`, {
+// method: "PUT",
+// headers: {
+// "Content-Type": "application/json",
+// },
+// body: JSON.stringify({ ...inputs, profilePic: imgUrl }),
+// });
+// const data = await res.json();
+// if (data.error) {
+// showToast(t("Error"), data.error, "error"); // Translate error message
+// return;
+// }
+// showToast(t("Success"), t("Profile updated successfully"), "success"); // Translate success message
+// setUser(data);
+// localStorage.setItem("user-threads", JSON.stringify(data));
+// } catch (error) {
+// showToast(t("Error"), error.message, "error"); // Translate error message
+// } finally {
+// setUpdating(false);
+// }
+// };
+
+// return (
+//
+// );
+// }
+
+// delte butoon update
+
import {
Button,
Flex,
@@ -9,12 +362,15 @@ import {
useColorModeValue,
Avatar,
Center,
+ CloseButton, // Import CloseButton
} from "@chakra-ui/react";
-import { useRef, useState } from "react";
+import { useRef, useState, useEffect } from "react";
import { useRecoilState } from "recoil";
+import { useNavigate } from 'react-router-dom'; // Import useNavigate
import userAtom from "../atoms/userAtom";
import usePreviewImg from "../hooks/usePreviewImg";
import useShowToast from "../hooks/useShowToast";
+import { useTranslation } from 'react-i18next'; // Import useTranslation
export default function UpdateProfilePage() {
const [user, setUser] = useRecoilState(userAtom);
@@ -27,10 +383,24 @@ export default function UpdateProfilePage() {
});
const fileRef = useRef(null);
const [updating, setUpdating] = useState(false);
-
+ const navigate = useNavigate(); // Initialize useNavigate
const showToast = useShowToast();
-
const { handleImageChange, imgUrl } = usePreviewImg();
+ const { t, i18n } = useTranslation(); // Initialize the translation hook
+ const [language, setLanguage] = useState(i18n.language); // Add a state for language
+
+ // Handle language change
+ useEffect(() => {
+ const handleLanguageChange = (lng) => {
+ setLanguage(lng);
+ };
+
+ i18n.on('languageChanged', handleLanguageChange);
+
+ return () => {
+ i18n.off('languageChanged', handleLanguageChange);
+ };
+ }, [i18n]);
const handleSubmit = async (e) => {
e.preventDefault();
@@ -44,20 +414,27 @@ export default function UpdateProfilePage() {
},
body: JSON.stringify({ ...inputs, profilePic: imgUrl }),
});
- const data = await res.json(); // updated user object
+ const data = await res.json();
if (data.error) {
- showToast("Error", data.error, "error");
+ showToast(t("Error"), data.error, "error"); // Translate error message
return;
}
- showToast("Success", "Profile updated successfully", "success");
+ showToast(t("Success"), t("Profile updated successfully"), "success"); // Translate success message
setUser(data);
localStorage.setItem("user-threads", JSON.stringify(data));
} catch (error) {
- showToast("Error", error, "error");
+ showToast(t("Error"), error.message, "error"); // Translate error message
} finally {
setUpdating(false);
}
};
+
+ // Handle delete button click
+ const handleDelete = () => {
+ // Redirect to the user profile page
+ navigate(`/${user.username}`); // Use the username to navigate to the profile page
+ };
+
return (