Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ backend/controllers/forumController.js (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -149,101 +149,54 @@ const getForumPosts = async (req, res) => { - console.log("BACKEND called"); - try { - // Extract parameters with strict type checking and debug output - const page = req.query.page !== undefined ? parseInt(req.query.page) : 0; - const limit = - req.query.limit !== undefined ? parseInt(req.query.limit) : 20; - - // Topic needs special handling - const topic = req.query.topic || null; - - const sort = req.query.sort || null; - const date = req.query.date || null; - const commentSort = req.query.commentSort || null; - const search = req.query.search || null; - + try { + const page = parseInt(req.query.page) || 0; + const limit = parseInt(req.query.limit) || 20; + const commentSort = req.query.commentSort; + const topic = req.query.topic?.trim(); + const date = req.query.date; + + const search = req.query.search?.trim(); + const sort = req.query.sort; const skip = page * limit; const take = limit; - // Build filter conditions - const whereCondition = {}; - - // Filter by topic if provided + const filters = []; + if (topic && topic !== "all") { - const trimmedTopic = topic.trim(); - - whereCondition.topic = trimmedTopic; - } - - // Filter by specific date if provided + filters.push({ topic }); + } + if (date) { const selectedDate = new Date(date); - - // Ensure the date is valid - if (isNaN(selectedDate.getTime())) { + if (!isNaN(selectedDate.getTime())) { + filters.push({ date_created: selectedDate }); + } else { console.error(`Invalid date provided: "${date}"`); - } else { - whereCondition.date_created = selectedDate; } } - // Filter by search text if provided - if (search && search.trim()) { - const searchTerm = search.trim(); - - // Use Prisma's OR condition to search in both title and content - // Case-insensitive search using contains with mode: 'insensitive' - const searchCondition = { + if (search) { + filters.push({ OR: [ - { - title: { - contains: searchTerm, - mode: "insensitive", - }, - }, - { - content: { - contains: searchTerm, - mode: "insensitive", - }, - }, + { title: { contains: search, mode: "insensitive" } }, + { content: { contains: search, mode: "insensitive" } }, ], - }; - - // If we already have other conditions, combine them with AND - if (Object.keys(whereCondition).length > 0) { - whereCondition.AND = [{ ...whereCondition }, searchCondition]; - - // Clear the original conditions since they're now in AND - Object.keys(whereCondition).forEach((key) => { - if (key !== "AND") { - delete whereCondition[key]; - } - }); - } else { - // If no other conditions, just use the search condition - Object.assign(whereCondition, searchCondition); - } - } + }); + } + + // Combine filters with AND if there are any + const whereCondition = filters.length > 0 ? { AND: filters } : {}; // Determine ordering - using an array to support multiple sorting criteria let orderBy = []; - // First, handle comment popularity sorting if specified if (commentSort === "most-popular") { orderBy.push({ comment_count: "desc" }); - // Add date as secondary sort to make results consistent orderBy.push({ date_created: "desc" }); } else if (commentSort === "least-popular") { orderBy.push({ comment_count: "asc" }); - - // Add date as secondary sort to make results consistent orderBy.push({ date_created: "desc" }); - } - // Only apply date sorting as primary sort if comment sorting isn't specified - else { - // Always apply date sorting (either as primary or secondary criterion) + } else { if (sort === "oldest") { orderBy.push({ date_created: "asc" }); @@ -278,24 +231,4 @@ })); - // Enhanced debug output - - // Log topic distribution to help debug topic filtering issues - if (topic && topic !== "all") { - const topicsInResult = {}; - forumPosts.forEach((post) => { - topicsInResult[post.topic] = (topicsInResult[post.topic] || 0) + 1; - }); - - // Check if filtering was successful - const nonMatchingCount = forumPosts.filter( - (post) => post.topic !== topic - ).length; - if (nonMatchingCount > 0) { - console.warn( - `WARNING: Found ${nonMatchingCount} posts with wrong topic in results!` - ); - } - } - // Set cache control headers to prevent caching res.set("Cache-Control", "no-store, no-cache, must-revalidate, private"); Index: backend/controllers/reviewController.js =================================================================== --- backend/controllers/reviewController.js (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ backend/controllers/reviewController.js (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -125,10 +125,21 @@ created_at: "asc", }, + include: { + challenges: { + select: { + id: true, + title: true, + }, + }, + }, }), ]); const totalPages = Math.ceil(totalPosts / parseInt(limit)); - - res.status(200).json({ posts, totalPages }); + const reviewPosts = posts.map((post) => ({ + ...post, + challengeTitle: post.challenges?.title, + })); + res.status(200).json({ posts: reviewPosts, totalPages }); } catch (dbError) { console.error("Database query error:", dbError); Index: backend/services/emailService.js =================================================================== --- backend/services/emailService.js (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ backend/services/emailService.js (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -204,5 +204,4 @@ try { await transporter.sendMail(mailOptions); - console.log(`Moderator email sent successfully to ${userEmail}`); } catch (error) { console.error(`Failed to send approval email to ${userEmail}:`, error); Index: client/src/Dashboard/DashboardLayout.jsx =================================================================== --- client/src/Dashboard/DashboardLayout.jsx (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ client/src/Dashboard/DashboardLayout.jsx (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -8,5 +8,5 @@ {/* Main content area */} -
+
Index: client/src/Dashboard/components/CalendarPopover.jsx =================================================================== --- client/src/Dashboard/components/CalendarPopover.jsx (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ client/src/Dashboard/components/CalendarPopover.jsx (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -64,5 +64,5 @@
-
- {/* Sticky Header Section */} -
-
-
-

- Forum Posts -

-
- - -
-
-
-
- - {/* Filter Navbar */} -
-
- {/* Mobile Filter Toggle */} -
-

- Filters - {/* Active filter count indicator */} - {(filters.topic !== "all" || - filters.dateSort !== "newest" || - filters.selectedDate || - filters.commentSort !== "none" || - (filters.searchText && filters.searchText.trim())) && ( - - { - [ - filters.topic !== "all", - filters.dateSort !== "newest", - filters.selectedDate, - filters.commentSort !== "none", - filters.searchText && filters.searchText.trim(), - ].filter(Boolean).length - } - - )} -

- -
- - {/* Filter Controls */} -
- {/* Mobile-First Filter Layout */} -
- {/* Search Filter - Full width on mobile, 2 cols on desktop */} -
- -
- - setFilters({ ...filters, searchText: e.target.value }) - } - onKeyDown={(e) => { - if (e.key === "Enter") { - applyFilters(); - } - }} - className="input input-sm input-bordered w-full text-sm pl-9 pr-3" - /> +
+
+
+
+ {/* Sticky Header Section */} +
+
+
+ + +
+
+
+ + {/* Filter Navbar */} +
+
+ {/* Mobile Filter Toggle */} +
+

+ Filters + {/* Active filter count indicator */} + {(filters.topic !== "all" || + filters.dateSort !== "newest" || + filters.selectedDate || + filters.commentSort !== "none" || + (filters.searchText && filters.searchText.trim())) && ( + + { + [ + filters.topic !== "all", + filters.dateSort !== "newest", + filters.selectedDate, + filters.commentSort !== "none", + filters.searchText && filters.searchText.trim(), + ].filter(Boolean).length + } + + )} +

+ +
+ + {/* Filter Controls */} +
+ {/* Mobile-First Filter Layout */} +
+ {/* Search Filter - Full width on mobile, 2 cols on desktop */} +
+ +
+ + setFilters({ + ...filters, + searchText: e.target.value, + }) + } + onKeyDown={(e) => { + if (e.key === "Enter") { + applyFilters(); + } + }} + className="input input-sm input-bordered w-full text-sm pl-9 pr-3" + /> + + + +
+
+ + {/* Mobile: 2-column grid for selects */} +
+ {/* Topic Filter */} +
+ + +
+ + {/* Date Sort */} +
+ + +
+
+ + {/* Mobile: Single column for date picker and popularity */} +
+
+ + +
+ {/* Specific Date Filter */} +
+ + +
+ setIsCalendarOpen(!isCalendarOpen)} // Opens popover on click + value={ + filters.selectedDate + ? new Date( + filters.selectedDate + ).toLocaleDateString("en-US", { + year: "numeric", + month: "short", + day: "numeric", + }) + : "" // Use empty string so placeholder is visible + } + placeholder="Select date" + // Style to match other inputs and add cursor-pointer + className="input input-sm input-bordered w-full text-sm pl-9 pr-3 cursor-pointer" + /> + + + +
+ {/* Render the popover here */} + setIsCalendarOpen(false)} + selectedDate={filters.selectedDate} + onDateSelect={(date) => { + setFilters({ ...filters, selectedDate: date }); + }} + /> +
+
+ + {/* Action Buttons */} +
+ +
+ {(filters.topic !== "all" || + filters.dateSort !== "newest" || + filters.selectedDate || + filters.commentSort !== "none" || + (filters.searchText && + filters.searchText.trim())) && ( + + )} + +
+
+
+ + {/* Active Filters Display - Improved Mobile Layout */} +
+ {filters.topic !== "all" && ( + + Topic: + + {filters.topic === "general" + ? "General" + : "Daily Challenge"} + + + + )} + {filters.searchText && filters.searchText.trim() && ( + + Search: + + "{filters.searchText.trim()}" + + + + )} + {filters.dateSort !== "newest" && ( + + Sort: + + {filters.dateSort === "oldest" + ? "Oldest First" + : "Most Recent"} + + + + )} + {filters.selectedDate && ( + + Date: + + {new Date(filters.selectedDate).toLocaleDateString( + "en-US", + { + year: "numeric", + month: "short", + day: "numeric", + } + )} + + + + )} + {filters.commentSort !== "none" && ( + + + {filters.commentSort === "most-popular" + ? "Most Popular" + : "Least Popular"} + + + + )}
- - {/* Mobile: 2-column grid for selects */} -
- {/* Topic Filter */} -
- - -
- - {/* Date Sort */} -
- - -
-
- - {/* Mobile: Single column for date picker and popularity */} -
-
- - -
- {/* Specific Date Filter */} -
- - -
- setIsCalendarOpen(!isCalendarOpen)} // Opens popover on click - value={ - filters.selectedDate - ? new Date(filters.selectedDate).toLocaleDateString( +
+ {(post.author_name === user.name || + post.author_name === user.username || + user.isModerator) && ( + + )} + +

{ + navigate(`/dashboard/forum-detail/${post.id}`, { + state: { post }, + }); + }} + > + {post.title} +

+ +
+ + {post.topic === "general" + ? "General" + : "Daily Challenge"} + + {post.challengeTitle && ( + + {post.challengeTitle} + + )} +
+
+

+ By{" "} + + {post.author_name} + + · + + {new Date(post.date_created).toLocaleDateString( "en-US", { @@ -365,399 +688,105 @@ day: "numeric", } - ) - : "" // Use empty string so placeholder is visible - } - placeholder="Select date" - // Style to match other inputs and add cursor-pointer - className="input input-sm input-bordered w-full text-sm pl-9 pr-3 cursor-pointer" - /> - - - -

- {/* Render the popover here */} - setIsCalendarOpen(false)} - selectedDate={filters.selectedDate} - onDateSelect={(date) => { - setFilters({ ...filters, selectedDate: date }); - }} - /> -
-
- - {/* Action Buttons */} -
- -
- {(filters.topic !== "all" || - filters.dateSort !== "newest" || - filters.selectedDate || - filters.commentSort !== "none" || - (filters.searchText && filters.searchText.trim())) && ( - - )} - -
-
-
- - {/* Active Filters Display - Improved Mobile Layout */} -
- {filters.topic !== "all" && ( - - Topic: - - {filters.topic === "general" - ? "General" - : "Daily Challenge"} - - - - )} - {filters.searchText && filters.searchText.trim() && ( - - Search: - - "{filters.searchText.trim()}" - - - - )} - {filters.dateSort !== "newest" && ( - - Sort: - - {filters.dateSort === "oldest" - ? "Oldest First" - : "Most Recent"} - - - - )} - {filters.selectedDate && ( - - Date: - - {new Date(filters.selectedDate).toLocaleDateString( - "en-US", - { - year: "numeric", - month: "short", - day: "numeric", - } - )} - - - - )} - {filters.commentSort !== "none" && ( - - - {filters.commentSort === "most-popular" - ? "Most Popular" - : "Least Popular"} - - - - )} -
-
-
-
- - {/* Main Content Area */} -
- {loading ? ( -
- -
- ) : ( -
- {/* Scrollable Posts Content */} -
-
- {posts.length === 0 ? ( -
-
- No posts found -
-

- There are no posts that match your selected filters. -

- -
- ) : ( -
- {posts.map((post) => ( -
-
- {(post.author_name === user.name || - post.author_name === user.username || - user.isModerator) && ( - - )} - -

{ - navigate(`/dashboard/forum-detail/${post.id}`, { - state: { post }, - }); - }} - > - {post.title} -

- -
-

- By{" "} - - {post.author_name} - - · - - {new Date( - post.date_created - ).toLocaleDateString("en-US", { - year: "numeric", - month: "short", - day: "numeric", - })} - -

-
- -
- - {post.topic === "general" - ? "General" - : "Daily Challenge"} - - {post.challengeTitle && ( - - {post.challengeTitle} - )} -
- -

- {post.content && post.content.length > 100 - ? post.content.slice(0, 100) + "..." - : post.content} + +

+
+ +

+ {post.content && post.content.length > 100 + ? post.content.slice(0, 100) + "..." + : post.content} +

+ +
+
{ + navigate(`/dashboard/forum-detail/${post.id}`, { + state: { post }, + }); + }} + > +

+ {post.comment_count}

- -
-
{ - navigate( - `/dashboard/forum-detail/${post.id}`, - { - state: { post }, - } - ); - }} - > -

- {post.comment_count} -

- Comment -
-
+ Comment
- ))} +
+ ))} +
+ )} + + {!loading && ( +
+ + + {Array.from({ length: Math.min(3, totalPages) }, (_, idx) => ( + + ))} + + {totalPages > 3 && ( + + ... + )} - {!loading && totalPages > 1 && ( -
- - - {Array.from( - { length: Math.min(3, totalPages) }, - (_, idx) => ( - - ) - )} - - {totalPages > 3 && ( - - ... - - )} - - {page > 2 && page < totalPages - 1 && ( - - )} - - {totalPages > 3 && ( - - )} - - -
+ {page > 2 && page < totalPages - 1 && ( + )} + + {totalPages > 3 && ( + + )} + +
-
-
+ )} + )}
Index: client/src/Dashboard/components/ManagePosts.jsx =================================================================== --- client/src/Dashboard/components/ManagePosts.jsx (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ client/src/Dashboard/components/ManagePosts.jsx (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -9,5 +9,5 @@ approveReviewPost, } from "@/services/reviewService"; -import { DatePicker } from "react-daisyui-timetools"; +import CalendarPopover from "./CalendarPopover"; import "react-datepicker/dist/react-datepicker.css"; import "cally"; @@ -17,5 +17,5 @@ const [totalPages, setTotalPages] = useState(0); const [isFetching, setIsFetching] = useState(false); - + const [isCalendarOpen, setIsCalendarOpen] = useState(false); const [error, setError] = useState(null); const postsPerPage = 5; @@ -260,330 +260,485 @@ className="dashboard min-h-screen flex bg-base-100" > -
-
-

- Posts to be reviewed: -

- - {/* Filter System */} -
-
- {/* Mobile Filter Toggle */} -
-

Filters

- +
+ + {/* Filter Controls */} +
- - - - -
- - {/* Filter Controls */} -
-
- {/* Search Filter - Takes 2 columns to be wider */} -
- - - setFilters({ ...filters, searchText: e.target.value }) - } - className="input input-sm input-bordered w-full text-sm" - /> -
- - {/* Topic Filter */} -
- - -
- - {/* Date Sort */} -
- - -
- - {/* Specific Date Filter */} -
- - { - if (date) { - try { - const validDate = new Date(date); - if (!isNaN(validDate.getTime())) { - setFilters({ - ...filters, - selectedDate: validDate, - }); - } else { - console.error("Invalid date selected:", date); - setFilters({ ...filters, selectedDate: null }); + {/* Mobile-First Filter Layout */} +
+ {/* Search Filter - Full width on mobile, 2 cols on desktop */} +
+ +
+ + setFilters({ + ...filters, + searchText: e.target.value, + }) + } + onKeyDown={(e) => { + if (e.key === "Enter") { + applyFilters(); } - } catch (err) { - console.error("Error processing date:", err); - setFilters({ ...filters, selectedDate: null }); + }} + className="input input-sm input-bordered w-full text-sm pl-9 pr-3" + /> + + + +
+
+ + {/* Mobile: 2-column grid for selects */} +
+ {/* Topic Filter */} +
+ + +
+ + {/* Date Sort */} +
+ + +
+
+ + {/* Mobile: Single column for date picker and popularity */} +
+ {/* Specific Date Filter */} +
+ + +
+ setIsCalendarOpen(!isCalendarOpen)} // Opens popover on click + value={ + filters.selectedDate + ? new Date( + filters.selectedDate + ).toLocaleDateString("en-US", { + year: "numeric", + month: "short", + day: "numeric", + }) + : "" // Use empty string so placeholder is visible + } + placeholder="Select date" + // Style to match other inputs and add cursor-pointer + className="input input-sm input-bordered w-full text-sm pl-9 pr-3 cursor-pointer" + /> + + + +
+ {/* Render the popover here */} + setIsCalendarOpen(false)} + selectedDate={filters.selectedDate} + onDateSelect={(date) => { + setFilters({ ...filters, selectedDate: date }); + }} + /> +
+
+ + {/* Action Buttons */} +
+ +
+ {(filters.topic !== "all" || + filters.dateSort !== "newest" || + filters.selectedDate || + (filters.searchText && + filters.searchText.trim())) && ( + + )} + +
-
- - {/* Active Filters Display */} -
- {filters.topic !== "all" && ( - - Topic:{" "} - {filters.topic === "general" - ? "General" - : "Daily Challenge"} - - )} - {filters.searchText && filters.searchText.trim() && ( - - Search: "{filters.searchText.trim()}" - - )} - {filters.dateSort !== "newest" && ( - - Sort:{" "} - {filters.dateSort === "oldest" - ? "Oldest First" - : "Most Recent"} - - )} - {filters.selectedDate && ( - - Date:{" "} - {filters.selectedDate instanceof Date - ? filters.selectedDate.toLocaleDateString() - : new Date(filters.selectedDate).toLocaleDateString()} - - )} + + {/* Active Filters Display - Improved Mobile Layout */} +
+ {filters.topic !== "all" && ( + + Topic: + + {appliedFilters.topic === "general" + ? "General" + : "Daily Challenge"} + + + + )} + {filters.searchText && filters.searchText.trim() && ( + + Search: + + "{filters.searchText.trim()}" + + + + )} + {filters.dateSort !== "newest" && ( + + Sort: + + {filters.dateSort === "oldest" + ? "Oldest First" + : "Most Recent"} + + + + )} + {filters.selectedDate && ( + + Date: + + {new Date(filters.selectedDate).toLocaleDateString( + "en-US", + { + year: "numeric", + month: "short", + day: "numeric", + } + )} + + + + )} +
- - {error && ( -
- {error} +
+ + {error && ( +
+ {error} +
+ )} + {isLoading && ( +
+ +
+ )} + {filteredPosts.length === 0 && !isLoading && !error && ( +
+
+ + +
- )} - {isLoading && ( -
- +

+ No posts found matching your criteria. +

+

+ {appliedFilters.searchText || + appliedFilters.topic !== "all" || + appliedFilters.selectedDate + ? "Try adjusting your filters to see more posts." + : "No posts are currently awaiting review."} +

+ {(appliedFilters.searchText || + appliedFilters.topic !== "all" || + appliedFilters.selectedDate) && ( + + )} +
+ )} + + {!isLoading && ( +
+ {filteredPosts.map((post) => ( +
+

+ {post.title} +

+
+ + +
+ + {/* Topic Badge */} +
+ + {post.topic === "general" ? "General" : "Daily Challenge"} + + {post.challengeTitle && ( + + {post.challengeTitle} + + )} +
+ +

+ By {post.author_name} + · + + {new Date(post.created_at).toLocaleDateString("en-US", { + year: "numeric", + month: "short", + day: "numeric", + })} + +

+

+ {post.content} +

+
+ ))} +
+ )} + + {!isLoading && posts.length > 0 && totalPages > 1 && ( +
+
+ Showing {filteredPosts.length} of {posts.length} posts
- )} - {filteredPosts.length === 0 && !isLoading && !error && ( -
-
- - - -
-

- No posts found matching your criteria. -

-

- {appliedFilters.searchText || - appliedFilters.topic !== "all" || - appliedFilters.selectedDate - ? "Try adjusting your filters to see more posts." - : "No posts are currently awaiting review."} -

- {(appliedFilters.searchText || - appliedFilters.topic !== "all" || - appliedFilters.selectedDate) && ( - - )} -
- )} - - {!isLoading && ( -
- {filteredPosts.map((post) => ( -
-

- {post.title} -

-
- - -
- - {/* Topic Badge */} -
- - {post.topic === "general" ? "General" : "Daily Challenge"} - -
- -

- By {post.author_name} on{" "} - - {new Date(post.created_at).toLocaleDateString("en-GB", { - day: "2-digit", - month: "2-digit", - year: "numeric", - })} - -

-

- {post.content} -

-
- ))} -
- )} - - {!isLoading && posts.length > 0 && totalPages > 1 && ( -
-
- Showing {filteredPosts.length} of {posts.length} posts -
- {Array.from({ length: totalPages }, (_, idx) => ( - - ))} -
- )} -
+ {Array.from({ length: totalPages }, (_, idx) => ( + + ))} +
+ )}
@@ -591,10 +746,10 @@ {modal.isOpen && (
-
+
{(modal.type === "approve" || modal.type === "success") && ( @@ -642,5 +797,7 @@
-

{modal.message}

+
+

{modal.message}

+
{modal.type === "approve" || modal.type === "delete" ? ( Index: client/src/LandingPage/components/Footer.jsx =================================================================== --- client/src/LandingPage/components/Footer.jsx (revision d6433e6b116b6f1c633537e18ea3f97a81143dd9) +++ client/src/LandingPage/components/Footer.jsx (revision 7829e2775936dac429a91cc6718a77cda167feae) @@ -1,8 +1,9 @@ -import React from "react"; +import React, { use } from "react"; import logoIcon from "../../assets/images/logoIcon.png"; import { useNavigate } from "react-router-dom"; - +import { useAuth } from "@/contexts/AuthContext"; const Footer = () => { const navigate = useNavigate(); + const { user } = useAuth(); return (