Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) +++ backend/controllers/forumController.js (revision 1f20dcf3b8cf36394e2b47f2b2d0e38fae9f2b84) @@ -155,5 +155,5 @@ const daysSince = Math.floor((now - createdAt) / (1000 * 60 * 60 * 24)); const commentCount = post.comment_count || 0; - const score = commentCount * 2 - daysSince; + const score = Math.max(0, 100 - daysSince * 5) + commentCount * 2; return { ...post, @@ -308,15 +308,8 @@ } - if ( - dateSort === 'past-week' || - dateSort === 'past-month' || - dateSort === 'past-year' - ) { - const fromDate = new Date(); - if (dateSort === 'past-week') fromDate.setDate(fromDate.getDate() - 7); - if (dateSort === 'past-month') fromDate.setMonth(fromDate.getMonth() - 1); - if (dateSort === 'past-year') - fromDate.setFullYear(fromDate.getFullYear() - 1); - filters.push({ date_created: { gte: fromDate } }); + if (dateSort === 'newest') { + orderBy.push({ date_created: 'desc' }); + } else { + orderBy.push({ date_created: 'asc' }); } @@ -344,5 +337,5 @@ } - const [posts, totalCount] = await Promise.all([ + const [posts, totalCount, userPostsCount] = await Promise.all([ prisma.forum_posts.findMany({ where: whereCondition, @@ -362,4 +355,9 @@ where: whereCondition, }), + prisma.forum_posts.count({ + where: { + author_id: userId, + }, + }), ]); @@ -375,4 +373,5 @@ totalPages: Math.ceil(totalCount / limit), currentPage: page, + userPostsCount: userPostsCount, }); } catch (err) { Index: backend/controllers/reviewController.js =================================================================== --- backend/controllers/reviewController.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) +++ backend/controllers/reviewController.js (revision 1f20dcf3b8cf36394e2b47f2b2d0e38fae9f2b84) @@ -172,14 +172,23 @@ const userId = req.user.sub; - const pendingPosts = await prisma.to_be_reviewed.findMany({ - where: { - author_id: userId, - }, - orderBy: { - created_at: 'desc', - }, - }); - - res.status(200).json(pendingPosts); + const [pendingPosts, pendingCount] = await Promise.all([ + prisma.to_be_reviewed.findMany({ + where: { + author_id: userId, + }, + orderBy: { + created_at: 'desc', + }, + }), + prisma.to_be_reviewed.count({ + where: { + author_id: userId, + }, + }), + ]); + + res + .status(200) + .json({ pendingPosts: pendingPosts, pendingCount: pendingCount }); } catch (err) { console.error("Error fetching user's pending posts:", err); Index: client/src/CreatePost/CreatePost.jsx =================================================================== --- client/src/CreatePost/CreatePost.jsx (revision 909821d87b77e470a89d64f5600d2259fb44dc15) +++ client/src/CreatePost/CreatePost.jsx (revision 1f20dcf3b8cf36394e2b47f2b2d0e38fae9f2b84) @@ -1,14 +1,19 @@ -import React, { useState, useEffect } from "react"; -import { useNavigate } from "react-router-dom"; -import { createForumPost } from "@/services/forumService"; -import { useAuth } from "@/contexts/AuthContext"; +import React, { useState, useEffect } from 'react'; +import { useNavigate, useLocation } from 'react-router-dom'; +import { createForumPost } from '@/services/forumService'; +import { useAuth } from '@/contexts/AuthContext'; import { createApprovalForumPost, discardApprovalForumPost, -} from "@/services/reviewService"; -import { getTasksForForumPost } from "@/services/taskService"; +} from '@/services/reviewService'; +import { getTasksForForumPost } from '@/services/taskService'; const CreatePost = () => { - const [title, setTitle] = useState(""); - const [content, setContent] = useState(""); + const [title, setTitle] = useState(''); + const [content, setContent] = useState(''); + const location = useLocation(); + const fromPath = location.state?.from || '/dashboard/forum'; + + const fromForumSearchParams = location.state?.fromForumSearch; + const fromUserPostsSearchParams = location.state?.fromUserPostsSearch; const { user } = useAuth(); const [isSubmitting, setIsSubmitting] = useState(false); @@ -16,29 +21,37 @@ const [selectedChallengeId, setSelectedChallengeId] = useState(0); const [challenges, setChallenges] = useState([]); - const [topic, setTopic] = useState("general"); - const [modal, setModal] = useState({ isOpen: false, message: "", type: "" }); + const [topic, setTopic] = useState('general'); + const [modal, setModal] = useState({ isOpen: false, message: '', type: '' }); const navigate = useNavigate(); useEffect(() => { if (modal.isOpen) { - document.body.style.overflow = "hidden"; + document.body.style.overflow = 'hidden'; } else { - document.body.style.overflow = "unset"; + document.body.style.overflow = 'unset'; } return () => { - document.body.style.overflow = "unset"; + document.body.style.overflow = 'unset'; }; }, [modal.isOpen]); - const showModal = (message, type = "info") => { + const showModal = (message, type = 'info') => { setModal({ isOpen: true, message, type }); }; const closeModal = () => { - setModal({ isOpen: false, message: "", type: "" }); - if (modal.type === "success" || modal.type === "pending") { - navigate("/dashboard/forum"); - } else if (modal.type === "auth") { - navigate("/login"); + setModal({ isOpen: false, message: '', type: '' }); + if (modal.type === 'success' || modal.type === 'pending') { + let targetUrl = fromPath; + + if (fromForumSearchParams) { + targetUrl = `${fromPath}?${fromForumSearchParams}`; + } else if (fromUserPostsSearchParams) { + targetUrl = `${fromPath}?${fromUserPostsSearchParams}`; + } + + navigate(targetUrl); + } else if (modal.type === 'auth') { + navigate('/login'); } }; @@ -48,5 +61,5 @@ setTopic(selectedTopic); - if (selectedTopic === "daily-challenge") { + if (selectedTopic === 'daily-challenge') { console.log(challenges); if (!challenges || challenges.length === 0) { @@ -56,8 +69,8 @@ } catch (error) { setChallenges([]); - console.error("Error fetching challenges:", error); + console.error('Error fetching challenges:', error); showModal( - "Failed to load challenges. Please try again later.", - "error" + 'Failed to load challenges. Please try again later.', + 'error' ); } @@ -71,5 +84,5 @@ if (!user || !user.id || !user.username) { - showModal("You must be logged in to create a post.", "auth"); + showModal('You must be logged in to create a post.', 'auth'); setIsSubmitting(false); return; @@ -84,32 +97,32 @@ topic, challengeId: - topic === "daily-challenge" && challenges.length > 0 + topic === 'daily-challenge' && challenges.length > 0 ? challenges[selectedChallengeId]?.id || null : null, }; const res = await createForumPost(postData); - if (res.reason === "USER_FLAGGED") { + if (res.reason === 'USER_FLAGGED') { console.log(res.message); setPendingModerator(true); - showModal(res.message, "moderatorPrompt"); - } else if (res.message.includes("moderator approval")) { - showModal(res.message, "pending"); + showModal(res.message, 'moderatorPrompt'); + } else if (res.message.includes('moderator approval')) { + showModal(res.message, 'pending'); } else { - showModal("Post created successfully!", "success"); + showModal('Post created successfully!', 'success'); } } catch (error) { - console.error("Error creating post:", error); + console.error('Error creating post:', error); if (error.response) { if ( error.response.status === 202 && - error.response.data?.message?.includes("moderator approval") + error.response.data?.message?.includes('moderator approval') ) { showModal( error.response.data.message || - "Content is too long. Your post has been submitted for moderator approval.", - "pending" + 'Content is too long. Your post has been submitted for moderator approval.', + 'pending' ); } else if (error.response.status === 401) { - showModal("Authentication failed. Please log in again.", "auth"); + showModal('Authentication failed. Please log in again.', 'auth'); } else { showModal( @@ -117,9 +130,9 @@ error.response.data?.message || `Error: ${error.message}`, - "error" + 'error' ); } } else { - showModal(`An unexpected error occurred: ${error.message}`, "error"); + showModal(`An unexpected error occurred: ${error.message}`, 'error'); } } finally { @@ -129,5 +142,5 @@ const handleModeratorDecision = async (decision) => { setPendingModerator(false); - if (decision === "yes") { + if (decision === 'yes') { try { const postData = { @@ -140,21 +153,21 @@ showModal( - res.message || "Your post has been submitted for moderator approval.", - "pending" + res.message || 'Your post has been submitted for moderator approval.', + 'pending' ); } catch (error) { showModal( error.response?.data?.error || - "Failed to submit post for moderator approval.", - "error" + 'Failed to submit post for moderator approval.', + 'error' ); } } else { discardApprovalForumPost(user.id); - setModal({ isOpen: false, message: "", type: "" }); + setModal({ isOpen: false, message: '', type: '' }); } }; useEffect(() => { - if (topic === "daily-challenge" && challenges.length > 0) { + if (topic === 'daily-challenge' && challenges.length > 0) { setSelectedChallengeId(0); } @@ -172,5 +185,10 @@ @@ -488,5 +506,5 @@
- {modal.type === "success" && ( + {modal.type === 'success' && (
)} - {modal.type === "pending" && ( + {modal.type === 'pending' && (
)} - {modal.type == "moderatorPrompt" && ( + {modal.type == 'moderatorPrompt' && (
)} - {(modal.type === "auth" || modal.type === "error") && ( + {(modal.type === 'auth' || modal.type === 'error') && (
- {modal.type === "auth" ? ( + {modal.type === 'auth' ? ( - {modal.type === "success" && "Success!"} - {modal.type === "pending" && "Pending Approval"} - {modal.type === "auth" && "Authentication Required"} - {modal.type === "error" && "Error"} - {modal.type === "moderatorPrompt" && - "We found your recent posts inappropriate"} + {modal.type === 'success' && 'Success!'} + {modal.type === 'pending' && 'Pending Approval'} + {modal.type === 'auth' && 'Authentication Required'} + {modal.type === 'error' && 'Error'} + {modal.type === 'moderatorPrompt' && + 'We found your recent posts inappropriate'}
@@ -580,9 +598,9 @@
- {modal.type === "moderatorPrompt" ? ( + {modal.type === 'moderatorPrompt' ? ( <> @@ -295,5 +309,12 @@
@@ -646,5 +665,5 @@ - {filters.dateSort === 'oldest' + {filters.dateSort === 'oldest-first' ? 'Oldest First' : 'Most Recent'} @@ -763,5 +782,5 @@ {post.challengeTitle && ( - {post.challengeTitle} + {formatFilterLabel(post.challengeTitle)} )} Index: client/src/services/forumService.js =================================================================== --- client/src/services/forumService.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) +++ client/src/services/forumService.js (revision 1f20dcf3b8cf36394e2b47f2b2d0e38fae9f2b84) @@ -85,5 +85,5 @@ } - if (filters.dateSort && filters.dateSort !== 'newest') { + if (filters.dateSort) { url += `&sort=${filters.dateSort}`; }