Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision 51add1c0def4e413e64f210d72cedd8ba28b0458) +++ backend/controllers/forumController.js (revision de90604457c8e9d85097a1fed23eac0252f43d3a) @@ -1,23 +1,23 @@ -const prisma = require('../lib/prisma'); -const ForumPost = require('../models/ForumPost'); -const Comment = require('../models/Comment'); -const filter = require('leo-profanity'); -const mkProfanity = require('../filters/macedonianProfanity'); +const prisma = require("../lib/prisma"); +const ForumPost = require("../models/ForumPost"); +const Comment = require("../models/Comment"); +const filter = require("leo-profanity"); +const mkProfanity = require("../filters/macedonianProfanity"); filter.add(mkProfanity); -const safeWords = require('../filters/safeWords'); -const { analyzePostContent } = require('../ai/processRequestAi'); -const { createReviewPost } = require('./reviewController'); -const verifyModeratorStatus = require('../services/checkModeratorStatus'); -const { resetPostCheckCounter } = require('../services/forumCountersReset'); +const safeWords = require("../filters/safeWords"); +const { analyzePostContent } = require("../ai/processRequestAi"); +const { createReviewPost } = require("./reviewController"); +const verifyModeratorStatus = require("../services/checkModeratorStatus"); +const { resetPostCheckCounter } = require("../services/forumCountersReset"); const { sendDeletedFromForumEmail, sendDeletedCommentEmail, sendCommentedNotificationEmail, -} = require('../services/emailService'); +} = require("../services/emailService"); const createForumPost = async (req, res) => { const { title, content, authorId, authorName, topic, challengeId } = req.body; if (!title || !content || !authorId || !authorName || !topic) { return res.status(400).json({ - error: 'Title, content, authorId, and authorName are required', + error: "Title, content, authorId, and authorName are required", }); } @@ -29,5 +29,5 @@ const postCounter = user.postCounter; const postCheckCounter = user.postCheckCounter; - console.log('Post check:', postCheckCounter); + console.log("Post check:", postCheckCounter); if (postCounter >= -11) { @@ -46,9 +46,9 @@ if (isProfane) { return res.status(400).json({ - error: 'Content contains inappropriate language', + error: "Content contains inappropriate language", }); } else if (filter.check(post.content)) { return res.status(400).json({ - error: 'Content contains inappropriate language', + error: "Content contains inappropriate language", }); } else if (post.content.length > 200) { @@ -58,9 +58,9 @@ return; } catch (reviewError) { - console.error('Error submitting post for review:', reviewError); + console.error("Error submitting post for review:", reviewError); return res.status(500).json({ error: reviewError.message || - 'Failed to submit post for review due to an internal error.', + "Failed to submit post for review due to an internal error.", }); } @@ -68,6 +68,6 @@ return res.status(202).json({ message: - 'Would you like to send this post to moderator for approval?', - reason: 'USER_FLAGGED', + "Would you like to send this post to moderator for approval?", + reason: "USER_FLAGGED", }); } else if ( @@ -80,6 +80,6 @@ try { const aiResponse = await analyzePostContent(post.title, post.content); - if (aiResponse.aiResponse === 'INAPPROPRIATE') { - console.log('AI analysis says INAPPROPRIATE:', aiResponse.reason); + if (aiResponse.aiResponse === "INAPPROPRIATE") { + console.log("AI analysis says INAPPROPRIATE:", aiResponse.reason); await prisma.users.update({ where: { id: authorId }, @@ -89,11 +89,11 @@ }); return res.status(400).json({ - error: 'Content is not appropriate for the forum', + error: "Content is not appropriate for the forum", }); } } catch (error) { - console.error('AI analysis error:', error); + console.error("AI analysis error:", error); return res.status(500).json({ - error: 'AI analysis failed, please try again later', + error: "AI analysis failed, please try again later", }); } @@ -118,15 +118,15 @@ await resetPostCheckCounter(authorId); res.status(201).json({ - message: 'Forum post created successfully', + message: "Forum post created successfully", post: savedPost, }); } else { return res.status(400).json({ - error: 'You have reached the daily limit for creating posts.', + error: "You have reached the daily limit for creating posts.", }); } } catch (err) { - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; @@ -179,5 +179,5 @@ const filters = []; let orderBy = []; - if (topic && topic !== 'all') { + if (topic && topic !== "all") { filters.push({ topic }); } @@ -191,11 +191,11 @@ } } - if (sort === 'past-week' || sort === 'past-month' || sort === 'past-year') { + if (sort === "past-week" || sort === "past-month" || sort === "past-year") { const fromDate = new Date(); - if (sort === 'past-week') { + if (sort === "past-week") { fromDate.setDate(fromDate.getDate() - 7); - } else if (sort === 'past-month') { + } else if (sort === "past-month") { fromDate.setDate(fromDate.getDate() - 30); - } else if (sort === 'past-year') { + } else if (sort === "past-year") { fromDate.setDate(fromDate.getDate() - 365); } @@ -206,17 +206,17 @@ }); } else if (!commentSort) { - orderBy.push({ date_created: 'desc' }); + orderBy.push({ date_created: "desc" }); } if (search) { - const challengeSearchTerm = search.toLowerCase().replace(/\s+/g, '-'); + const challengeSearchTerm = search.toLowerCase().replace(/\s+/g, "-"); filters.push({ OR: [ - { title: { contains: search, mode: 'insensitive' } }, - { content: { contains: search, mode: 'insensitive' } }, + { title: { contains: search, mode: "insensitive" } }, + { content: { contains: search, mode: "insensitive" } }, { challenges: { title: { contains: challengeSearchTerm, - mode: 'insensitive', + mode: "insensitive", }, }, @@ -229,11 +229,11 @@ const whereCondition = filters.length > 0 ? { AND: filters } : {}; - if (commentSort === 'most-popular') { - orderBy.push({ comment_count: 'desc' }); - - orderBy.push({ date_created: 'desc' }); - } else if (commentSort === 'least-popular') { - orderBy.push({ comment_count: 'asc' }); - orderBy.push({ date_created: 'desc' }); + if (commentSort === "most-popular") { + orderBy.push({ comment_count: "desc" }); + + orderBy.push({ date_created: "desc" }); + } else if (commentSort === "least-popular") { + orderBy.push({ comment_count: "asc" }); + orderBy.push({ date_created: "desc" }); } @@ -263,5 +263,5 @@ })); if ( - (sort === 'past-week' || sort === 'past-month' || sort == 'past-year') && + (sort === "past-week" || sort === "past-month" || sort == "past-year") && !commentSort ) { @@ -270,18 +270,18 @@ // Set cache control headers to prevent caching - res.set('Cache-Control', 'no-store, no-cache, must-revalidate, private'); - res.set('Pragma', 'no-cache'); - res.set('Expires', '0'); + res.set("Cache-Control", "no-store, no-cache, must-revalidate, private"); + res.set("Pragma", "no-cache"); + res.set("Expires", "0"); // Add response information to help debug the filtering - res.set('X-Total-Posts', forumPosts.length.toString()); - res.set('X-Filter-Topic', topic || 'none'); - res.set('X-Filter-Applied', JSON.stringify(whereCondition)); - res.set('X-Sort-Order', JSON.stringify(orderBy)); + res.set("X-Total-Posts", forumPosts.length.toString()); + res.set("X-Filter-Topic", topic || "none"); + res.set("X-Filter-Applied", JSON.stringify(whereCondition)); + res.set("X-Sort-Order", JSON.stringify(orderBy)); res.status(200).json({ forumPosts, totalCount }); } catch (err) { - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; @@ -308,5 +308,5 @@ filters.push({ author_id: userId }); - if (topic && topic !== 'all') { + if (topic && topic !== "all") { filters.push({ topic: topic.trim() }); } @@ -317,16 +317,25 @@ } - if (dateSort === 'newest') { - orderBy.push({ date_created: 'desc' }); + if (dateSort === "newest") { + orderBy.push({ date_created: "desc" }); } else { - orderBy.push({ date_created: 'asc' }); + orderBy.push({ date_created: "asc" }); } if (searchText && searchText.trim()) { const search = searchText.trim(); + const challengeSearchTerm = search.toLowerCase().replace(/\s+/g, "-"); filters.push({ OR: [ - { title: { contains: search, mode: 'insensitive' } }, - { content: { contains: search, mode: 'insensitive' } }, + { title: { contains: search, mode: "insensitive" } }, + { content: { contains: search, mode: "insensitive" } }, + { + challenges: { + title: { + contains: challengeSearchTerm, + mode: "insensitive", + }, + }, + }, ], }); @@ -335,13 +344,13 @@ const whereCondition = filters.length > 0 ? { AND: filters } : {}; - if (commentSort && commentSort !== 'none') { - if (commentSort === 'most-popular') { - orderBy.push({ comment_count: 'desc' }); + if (commentSort && commentSort !== "none") { + if (commentSort === "most-popular") { + orderBy.push({ comment_count: "desc" }); } else { - orderBy.push({ comment_count: 'asc' }); + orderBy.push({ comment_count: "asc" }); } - orderBy.push({ date_created: 'desc' }); + orderBy.push({ date_created: "desc" }); } else { - orderBy.push({ date_created: 'desc' }); + orderBy.push({ date_created: "desc" }); } @@ -385,6 +394,6 @@ }); } catch (err) { - console.error('Error fetching posts by user:', err); - res.status(500).json({ error: 'Failed to fetch user posts' }); + console.error("Error fetching posts by user:", err); + res.status(500).json({ error: "Failed to fetch user posts" }); } }; @@ -404,5 +413,5 @@ if (!post) { - return res.status(404).json({ error: 'Forum post not found' }); + return res.status(404).json({ error: "Forum post not found" }); } @@ -412,5 +421,5 @@ if (!isAuthor && !isUserModerator) { return res.status(403).json({ - error: 'You do not have permission to delete this post', + error: "You do not have permission to delete this post", }); } @@ -431,9 +440,9 @@ return res.status(204).send(); } catch (err) { - if (err.code === 'P2025') { - return res.status(404).json({ error: 'Forum post not found' }); - } - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + if (err.code === "P2025") { + return res.status(404).json({ error: "Forum post not found" }); + } + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; @@ -445,5 +454,5 @@ if (!post_id || !content || !authorId || !authorName) { return res.status(400).json({ - error: 'post_id, content, authorId, and authorName are required', + error: "post_id, content, authorId, and authorName are required", }); } @@ -458,7 +467,7 @@ const profane = filter.check(comment.content); if (profane) { - console.log('not safe words or profanity detected!'); + console.log("not safe words or profanity detected!"); return res.status(400).json({ - error: 'Content contains inappropriate language or is not on topic', + error: "Content contains inappropriate language or is not on topic", }); } @@ -491,10 +500,10 @@ } res.status(201).json({ - message: 'Comment created successfully', + message: "Comment created successfully", comment: savedComment, }); } catch (err) { - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; @@ -506,5 +515,5 @@ return res .status(400) - .json({ error: 'post_id query parameter is required' }); + .json({ error: "post_id query parameter is required" }); } @@ -515,5 +524,5 @@ }, orderBy: { - dateCreated: 'desc', + dateCreated: "desc", }, }); @@ -532,6 +541,6 @@ res.status(200).json(comments); } catch (err) { - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; @@ -547,5 +556,5 @@ if (!comment) { - return res.status(404).json({ error: 'Comment not found' }); + return res.status(404).json({ error: "Comment not found" }); } @@ -558,5 +567,5 @@ return res .status(404) - .json({ error: 'Post associated with comment not found' }); + .json({ error: "Post associated with comment not found" }); } @@ -566,5 +575,5 @@ if (!isUserModerator && !isAuthor) { return res.status(403).json({ - error: 'You do not have permission to delete this comment', + error: "You do not have permission to delete this comment", }); } @@ -597,9 +606,9 @@ return res.status(204).send(); } catch (err) { - if (err.code === 'P2025') { - return res.status(404).json({ error: 'Comment not found' }); - } - console.error('Server error:', err); - res.status(500).json({ error: 'Internal server error' }); + if (err.code === "P2025") { + return res.status(404).json({ error: "Comment not found" }); + } + console.error("Server error:", err); + res.status(500).json({ error: "Internal server error" }); } }; Index: client/src/Dashboard/components/Forum.jsx =================================================================== --- client/src/Dashboard/components/Forum.jsx (revision 51add1c0def4e413e64f210d72cedd8ba28b0458) +++ client/src/Dashboard/components/Forum.jsx (revision de90604457c8e9d85097a1fed23eac0252f43d3a) @@ -1,12 +1,12 @@ -import React, { useState, useEffect, useCallback } from 'react'; -import { useNavigate, useSearchParams } from 'react-router-dom'; -import commentIcon from '../../assets/images/comment.svg'; -import trashIcon from '../../assets/images/delete.svg'; -import Navbar from './Navbar'; -import { getForumPosts, deleteForumPost } from '@/services/forumService'; -import { useAuth } from '@/contexts/AuthContext'; -import { DatePicker } from 'react-daisyui-timetools'; -import 'react-datepicker/dist/react-datepicker.css'; -import CalendarPopover from './CalendarPopover'; +import React, { useState, useEffect, useCallback } from "react"; +import { useNavigate, useSearchParams } from "react-router-dom"; +import commentIcon from "../../assets/images/comment.svg"; +import trashIcon from "../../assets/images/delete.svg"; +import Navbar from "./Navbar"; +import { getForumPosts, deleteForumPost } from "@/services/forumService"; +import { useAuth } from "@/contexts/AuthContext"; +import { DatePicker } from "react-daisyui-timetools"; +import "react-datepicker/dist/react-datepicker.css"; +import CalendarPopover from "./CalendarPopover"; // import { useForumSearchParams } from "../../contexts/ForumSearchParamsContext"; const Forum = () => { @@ -22,18 +22,18 @@ const [modal, setModal] = useState({ isOpen: false, - message: '', - type: '', + message: "", + type: "", postId: null, }); const [isDeleting, setIsDeleting] = useState(false); - const postsPerPage = 6; + const postsPerPage = 10; const { user } = useAuth(); const defaultFilters = { - topic: 'all', - dateSort: 'newest', + topic: "all", + dateSort: "newest", selectedDate: null, - commentSort: 'none', - searchText: '', + commentSort: "none", + searchText: "", }; @@ -49,10 +49,10 @@ const [showFilters, setShowFilters] = useState(false); - const showModal = (message, type = 'info', postId = null) => { + const showModal = (message, type = "info", postId = null) => { setModal({ isOpen: true, message, type, postId }); }; const closeModal = () => { - setModal({ isOpen: false, message: '', type: '', postId: null }); + setModal({ isOpen: false, message: "", type: "", postId: null }); }; @@ -101,8 +101,8 @@ setPage(pageNum); } catch (error) { - console.error('Error fetching forum posts:', error); + console.error("Error fetching forum posts:", error); if (error.response) { - console.error('Error response:', error.response); + console.error("Error response:", error.response); } @@ -118,5 +118,5 @@ ); useEffect(() => { - const pageFromUrl = parseInt(forumSearchParams.get('page') || '1', 10); + const pageFromUrl = parseInt(forumSearchParams.get("page") || "1", 10); const filtersFromUrl = { ...defaultFilters }; for (const [key, value] of forumSearchParams.entries()) { @@ -138,5 +138,5 @@ } } - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setForumSearchParams(newSearchParams); }; @@ -150,5 +150,5 @@ newSearchParams.delete(filterKey); setPage(1); - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setForumSearchParams(newSearchParams); } @@ -160,5 +160,5 @@ const freshDefaultFilters = { ...defaultFilters }; setFilters(freshDefaultFilters); - setForumSearchParams({ page: '1' }); + setForumSearchParams({ page: "1" }); setPage(1); @@ -172,15 +172,15 @@ await fetchPosts(1, false, { ...filters }); - showModal('Post deleted successfully.', 'success'); + showModal("Post deleted successfully.", "success"); } catch (error) { - console.error('Error deleting post:', error); + console.error("Error deleting post:", error); } }; const formatFilterLabel = (value) => { - if (!value) return ''; + if (!value) return ""; return value - .split('-') + .split("-") .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) - .join(' '); + .join(" "); }; @@ -196,5 +196,5 @@ navigate(`/dashboard/create-post`, { state: { - from: '/dashboard/forum', + from: "/dashboard/forum", fromForumSearch: forumSearchParams.toString(), }, @@ -222,5 +222,5 @@ navigate(`/dashboard/user-posts`, { state: { - from: '/dashboard/forum', + from: "/dashboard/forum", fromForumSearch: forumSearchParams.toString(), }, @@ -253,6 +253,6 @@ Filters {/* Active filter count indicator */} - {(filters.topic !== 'all' || - filters.dateSort !== 'newest' || + {(filters.topic !== "all" || + filters.dateSort !== "newest" || filters.selectedDate || (filters.searchText && filters.searchText.trim())) && ( @@ -260,8 +260,8 @@ { [ - filters.topic !== 'all', - filters.dateSort !== 'newest', + filters.topic !== "all", + filters.dateSort !== "newest", filters.selectedDate, - filters.commentSort !== 'none', + filters.commentSort !== "none", filters.searchText && filters.searchText.trim(), ].filter(Boolean).length @@ -276,5 +276,5 @@ @@ -308,5 +308,5 @@
- {(filters.topic !== 'all' || - filters.dateSort !== 'newest' || + {(filters.topic !== "all" || + filters.dateSort !== "newest" || filters.selectedDate || (filters.searchText && @@ -495,15 +495,15 @@ {/* Active Filters Display - Improved Mobile Layout */}
- {filters.topic !== 'all' && ( + {filters.topic !== "all" && ( - {filters.topic === 'general' - ? 'General' - : 'Daily Challenge'} + {filters.topic === "general" + ? "General" + : "Daily Challenge"}
) : ( -
+
{posts.map((post) => (
@@ -643,5 +650,5 @@

{ navigate(`/dashboard/forum-detail/${post.id}`, { @@ -659,12 +666,12 @@ - {post.topic === 'general' - ? 'General' - : 'Daily Challenge'} + {post.topic === "general" + ? "General" + : "Daily Challenge"} {post.challengeTitle && ( @@ -676,5 +683,5 @@

- By{' '} + By{" "} {post.author_name} @@ -683,9 +690,9 @@ {new Date(post.date_created).toLocaleDateString( - 'en-US', + "en-US", { - year: 'numeric', - month: 'short', - day: 'numeric', + year: "numeric", + month: "short", + day: "numeric", } )} @@ -693,7 +700,7 @@

-

+

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

@@ -730,5 +737,5 @@ onClick={() => { const newPage = page - 1; - forumSearchParams.set('page', newPage.toString()); + forumSearchParams.set("page", newPage.toString()); setForumSearchParams(forumSearchParams); }} @@ -745,8 +752,8 @@ key={idx} className={`btn btn-sm px-2 sm:px-3 ${ - page - 1 === idx ? 'border-amber-400' : 'btn-ghost' + page - 1 === idx ? "border-amber-400" : "btn-ghost" }`} onClick={() => { - forumSearchParams.set('page', (idx + 1).toString()); + forumSearchParams.set("page", (idx + 1).toString()); setForumSearchParams(forumSearchParams); }} @@ -768,5 +775,5 @@ className="btn btn-sm border-amber-400 px-2 sm:px-3" onClick={() => { - forumSearchParams.set('page', page.toString()); + forumSearchParams.set("page", page.toString()); setForumSearchParams(forumSearchParams); }} @@ -780,8 +787,8 @@ Index: client/src/Dashboard/components/ManagePosts.jsx =================================================================== --- client/src/Dashboard/components/ManagePosts.jsx (revision 51add1c0def4e413e64f210d72cedd8ba28b0458) +++ client/src/Dashboard/components/ManagePosts.jsx (revision de90604457c8e9d85097a1fed23eac0252f43d3a) @@ -1,15 +1,15 @@ -import React, { useState, useEffect, useCallback, useRef } from 'react'; -import { useSearchParams } from 'react-router-dom'; -import doneAll from '../../assets/images/done-all.svg'; -import trashIcon from '../../assets/images/delete.svg'; -import { useAuth } from '@/contexts/AuthContext'; +import React, { useState, useEffect, useCallback, useRef } from "react"; +import { useSearchParams } from "react-router-dom"; +import doneAll from "../../assets/images/done-all.svg"; +import trashIcon from "../../assets/images/delete.svg"; +import { useAuth } from "@/contexts/AuthContext"; import { getReviewPosts, deleteReviewPost, approveReviewPost, -} from '@/services/reviewService'; -import CalendarPopover from './CalendarPopover'; -import 'react-datepicker/dist/react-datepicker.css'; -import 'cally'; +} from "@/services/reviewService"; +import CalendarPopover from "./CalendarPopover"; +import "react-datepicker/dist/react-datepicker.css"; +import "cally"; const ManagePosts = () => { const [posts, setPosts] = useState([]); @@ -25,6 +25,6 @@ const [modal, setModal] = useState({ isOpen: false, - message: '', - type: '', + message: "", + type: "", postId: null, post: null, @@ -34,8 +34,8 @@ // Filter states const defaultFilters = { - topic: 'all', - dateSort: 'newest', + topic: "all", + dateSort: "newest", selectedDate: null, - searchText: '', + searchText: "", }; @@ -60,5 +60,5 @@ } } - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setPage(1); setSearchParams(newSearchParams); @@ -72,5 +72,5 @@ newSearchParams.delete(filterKey); setPage(1); - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setSearchParams(newSearchParams); } @@ -79,5 +79,5 @@ const freshDefaultFilters = { ...defaultFilters }; setFilters(freshDefaultFilters); - setSearchParams({ page: '1' }); + setSearchParams({ page: "1" }); setPage(1); }; @@ -94,11 +94,11 @@ const openViewPostModal = (post) => { - showModal('', 'view-post', post.id, post); + showModal("", "view-post", post.id, post); }; const closeModal = () => { setModal({ isOpen: false, - message: '', - type: '', + message: "", + type: "", postId: null, post: null, @@ -108,7 +108,7 @@ const confirmAction = async () => { setIsActionLoading(true); - if (modal.type === 'delete' && modal.postId) { + if (modal.type === "delete" && modal.postId) { await handleDeletePost(modal.postId); - } else if (modal.type === 'approve' && modal.post) { + } else if (modal.type === "approve" && modal.post) { await handleApprovePost(modal.post); } @@ -124,12 +124,12 @@ const filtersForApi = { - searchText: searchParams.get('searchText') || '', - topic: searchParams.get('topic') || 'all', - selectedDate: searchParams.get('selectedDate') || null, - dateSort: searchParams.get('dateSort') || 'newest', + searchText: searchParams.get("searchText") || "", + topic: searchParams.get("topic") || "all", + selectedDate: searchParams.get("selectedDate") || null, + dateSort: searchParams.get("dateSort") || "newest", }; try { - const currentPage = parseInt(searchParams.get('page') || '1', 10); + const currentPage = parseInt(searchParams.get("page") || "1", 10); setPage(currentPage); @@ -144,10 +144,10 @@ setTotalPages(data.totalPages); } catch (err) { - console.error('Error fetching review posts:', err); + console.error("Error fetching review posts:", err); setPosts([]); setTotalPages(0); setError( err.response?.data?.error || - 'Failed to fetch posts. You may not have permission.' + "Failed to fetch posts. You may not have permission." ); } finally { @@ -163,9 +163,9 @@ await deleteReviewPost(postId, user.id); setPosts((prevPosts) => prevPosts.filter((p) => p.id !== postId)); - showModal('Post deleted successfully.', 'deleted'); + showModal("Post deleted successfully.", "deleted"); } catch (err) { - console.error('Error deleting review post:', err); + console.error("Error deleting review post:", err); setError( - err.response?.data?.message || err.message || 'Failed to delete post.' + err.response?.data?.message || err.message || "Failed to delete post." ); } @@ -185,13 +185,13 @@ prevPosts.filter((p) => p.id !== postToApprove.id) ); - showModal('Post approved successfully.', 'success'); + showModal("Post approved successfully.", "success"); } catch (err) { - console.error('Error approving post:', err); + console.error("Error approving post:", err); setError( - err.response?.data?.message || err.message || 'Failed to approve post.' + err.response?.data?.message || err.message || "Failed to approve post." ); showModal( - err.response?.data?.message || err.message || 'Failed to approve post.', - 'error' + err.response?.data?.message || err.message || "Failed to approve post.", + "error" ); } @@ -199,15 +199,15 @@ const openConfirmationModal = (type, item) => { - if (type === 'delete') { + if (type === "delete") { showModal( `Are you sure you want to delete post with title "${item.title}"? This action cannot be undone.`, - 'delete', + "delete", item.id, item ); - } else if (type === 'approve') { + } else if (type === "approve") { showModal( `Are you sure you want to approve post with title "${item.title}"? It will be published to the forum.`, - 'approve', + "approve", item.id, item @@ -218,9 +218,9 @@ const isLoading = authLoading || isFetching; const formatFilterLabel = (value) => { - if (!value) return ''; + if (!value) return ""; return value - .split('-') + .split("-") .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) - .join(' '); + .join(" "); }; @@ -244,6 +244,6 @@ Filters {/* Active filter count indicator */} - {(filters.topic !== 'all' || - filters.dateSort !== 'newest' || + {(filters.topic !== "all" || + filters.dateSort !== "newest" || filters.selectedDate || (filters.searchText && filters.searchText.trim())) && ( @@ -251,8 +251,8 @@ { [ - filters.topic !== 'all', - filters.dateSort !== 'newest', + filters.topic !== "all", + filters.dateSort !== "newest", filters.selectedDate, - filters.commentSort !== 'none', + filters.commentSort !== "none", filters.searchText && filters.searchText.trim(), ].filter(Boolean).length @@ -267,5 +267,5 @@ @@ -308,5 +308,5 @@ } onKeyDown={(e) => { - if (e.key === 'Enter') { + if (e.key === "Enter") { applyFilters(); } @@ -390,10 +390,10 @@ ? new Date( filters.selectedDate - ).toLocaleDateString('en-US', { - year: 'numeric', - month: 'short', - day: 'numeric', + ).toLocaleDateString("en-US", { + year: "numeric", + month: "short", + day: "numeric", }) - : '' // Use empty string so placeholder is visible + : "" // Use empty string so placeholder is visible } placeholder="Select date" @@ -436,6 +436,6 @@
- {(filters.topic !== 'all' || - filters.dateSort !== 'newest' || + {(filters.topic !== "all" || + filters.dateSort !== "newest" || filters.selectedDate || (filters.searchText && @@ -466,15 +466,15 @@ {/* Active Filters Display - Improved Mobile Layout */}
- {filters.topic !== 'all' && ( + {filters.topic !== "all" && ( - {filters.topic === 'general' - ? 'General' - : 'Daily Challenge'} + {filters.topic === "general" + ? "General" + : "Daily Challenge"}

- {modal.type === 'view-post' && modal.post ? ( + {modal.type === "view-post" && modal.post ? (

{new Date(modal.post.created_at).toLocaleDateString( - 'en-US', + "en-US", { - year: 'numeric', - month: 'long', - day: 'numeric', + year: "numeric", + month: "long", + day: "numeric", } )} @@ -836,5 +836,5 @@ )}
- {modal.type === 'approve' || modal.type === 'delete' ? ( + {modal.type === "approve" || modal.type === "delete" ? ( <> Index: client/src/Dashboard/components/UserPosts.jsx =================================================================== --- client/src/Dashboard/components/UserPosts.jsx (revision 51add1c0def4e413e64f210d72cedd8ba28b0458) +++ client/src/Dashboard/components/UserPosts.jsx (revision de90604457c8e9d85097a1fed23eac0252f43d3a) @@ -1,13 +1,13 @@ -import { useAuth } from '../../contexts/AuthContext.jsx'; -import { act, useEffect, useState } from 'react'; -import { useLocation, useNavigate, useSearchParams } from 'react-router-dom'; -import { getPendingPosts } from '@/services/reviewService'; -import { getAllPostsByUser, deleteForumPost } from '@/services/forumService.js'; -import { deleteReviewPost } from '@/services/reviewService'; -import commentIcon from '../../assets/images/comment.svg'; -import CalendarPopover from './CalendarPopover.jsx'; -import { DatePicker } from 'react-daisyui-timetools'; -import 'react-datepicker/dist/react-datepicker.css'; -import trashIcon from '../../assets/images/delete.svg'; +import { useAuth } from "../../contexts/AuthContext.jsx"; +import { act, useEffect, useState } from "react"; +import { useLocation, useNavigate, useSearchParams } from "react-router-dom"; +import { getPendingPosts } from "@/services/reviewService"; +import { getAllPostsByUser, deleteForumPost } from "@/services/forumService.js"; +import { deleteReviewPost } from "@/services/reviewService"; +import commentIcon from "../../assets/images/comment.svg"; +import CalendarPopover from "./CalendarPopover.jsx"; +import { DatePicker } from "react-daisyui-timetools"; +import "react-datepicker/dist/react-datepicker.css"; +import trashIcon from "../../assets/images/delete.svg"; const UserPosts = () => { @@ -16,5 +16,5 @@ const [pendingPosts, setPendingPosts] = useState([]); const location = useLocation(); - const fromPath = location.state?.from || '/dashboard/forum'; + const fromPath = location.state?.from || "/dashboard/forum"; const fromForumSearchParams = location.state?.fromForumSearch; @@ -22,5 +22,5 @@ const [isCalendarOpen, setIsCalendarOpen] = useState(false); const [loading, setLoading] = useState(true); - const [activeTab, setActiveTab] = useState('published'); + const [activeTab, setActiveTab] = useState("published"); const navigate = useNavigate(); const [totalUserPosts, setTotalUserPosts] = useState(0); @@ -29,5 +29,5 @@ const [totalPages, setTotalPages] = useState(1); const [pendingCurrentPage, setPendingCurrentPage] = useState(() => { - return parseInt(searchParams.get('pendingPage') || '1', 10); + return parseInt(searchParams.get("pendingPage") || "1", 10); }); const PENDING_PAGE_SIZE = 10; @@ -35,22 +35,22 @@ // Filter states const defaultFilters = { - topic: 'all', - dateSort: 'newest', + topic: "all", + dateSort: "newest", selectedDate: null, - commentSort: 'none', - searchText: '', + commentSort: "none", + searchText: "", }; const [modal, setModal] = useState({ isOpen: false, - message: '', - type: '', + message: "", + type: "", postId: null, }); - const showModal = (message, type = 'info', postId = null) => { + const showModal = (message, type = "info", postId = null) => { setModal({ isOpen: true, message, type, postId }); }; const closeModal = () => { - setModal({ isOpen: false, message: '', type: '', postId: null }); + setModal({ isOpen: false, message: "", type: "", postId: null }); }; @@ -78,9 +78,9 @@ closeModal(); - showModal('Post removed successfully.', 'success'); + showModal("Post removed successfully.", "success"); } catch (error) { - console.error('Error removing post:', error); + console.error("Error removing post:", error); closeModal(); - showModal('Failed to remove post. Please try again.', 'error'); + showModal("Failed to remove post. Please try again.", "error"); } finally { setIsDeleting(false); @@ -107,9 +107,9 @@ setTotalUserPosts(approvedData.userPostsCount); closeModal(); - showModal('Post deleted successfully.', 'success'); + showModal("Post deleted successfully.", "success"); } catch (error) { - console.error('Error deleting post:', error); + console.error("Error deleting post:", error); closeModal(); - showModal('Failed to delete post. Please try again.', 'error'); + showModal("Failed to delete post. Please try again.", "error"); } }; @@ -126,14 +126,5 @@ return initialFilters; }); - const [appliedFilters, setAppliedFilters] = useState(() => { - //Useful? - const initialFilters = { ...defaultFilters }; - for (const [key, value] of searchParams.entries()) { - if (key in initialFilters) { - initialFilters[key] = value; - } - } - return initialFilters; - }); + const [showFilters, setShowFilters] = useState(false); const pendingTotalPages = Math.ceil(pendingPosts.length / PENDING_PAGE_SIZE); @@ -150,8 +141,8 @@ } } - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setCurrentPage(1); - if (searchParams.get('pendingPage')) { - newSearchParams.set('pendingPage', searchParams.get('pendingPage')); + if (searchParams.get("pendingPage")) { + newSearchParams.set("pendingPage", searchParams.get("pendingPage")); } setSearchParams(newSearchParams); @@ -167,5 +158,5 @@ newSearchParams.delete(filterKey); setCurrentPage(1); - newSearchParams.set('page', '1'); + newSearchParams.set("page", "1"); setSearchParams(newSearchParams); } else { @@ -178,7 +169,7 @@ setAppliedFilters({ defaultFilters }); const newSearchParams = new URLSearchParams(); - newSearchParams.set('page', '1'); - if (searchParams.get('pendingPage')) { - newSearchParams.set('pendingPage', searchParams.get('pendingPage')); + newSearchParams.set("page", "1"); + if (searchParams.get("pendingPage")) { + newSearchParams.set("pendingPage", searchParams.get("pendingPage")); } setCurrentPage(1); @@ -188,17 +179,17 @@ setPendingCurrentPage(newPage); const newSearchParams = new URLSearchParams(searchParams); - newSearchParams.set('pendingPage', newPage.toString()); + newSearchParams.set("pendingPage", newPage.toString()); setSearchParams(newSearchParams); }; const formatFilterLabel = (value) => { - if (!value) return ''; + if (!value) return ""; return value - .split('-') + .split("-") .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) - .join(' '); + .join(" "); }; useEffect(() => { const pendingPageFromUrl = parseInt( - searchParams.get('pendingPage') || '1', + searchParams.get("pendingPage") || "1", 10 ); @@ -225,5 +216,5 @@ setTotalUserPosts(approvedData.userPostsCount); } catch (error) { - console.error('Error fetching user posts:', error); + console.error("Error fetching user posts:", error); setApprovedPosts([]); // Clear posts on error setTotalPages(1); @@ -256,9 +247,9 @@
@@ -1077,6 +1071,6 @@ className={`btn btn-sm px-2 sm:px-3 ${ pendingCurrentPage === idx + 1 - ? 'border-amber-400' - : 'btn-ghost' + ? "border-amber-400" + : "btn-ghost" }`} onClick={() => @@ -1112,6 +1106,6 @@ className={`btn btn-sm px-2 sm:px-3 ${ pendingCurrentPage === pendingTotalPages - ? 'border-amber-400' - : 'btn-ghost' + ? "border-amber-400" + : "btn-ghost" }`} onClick={() => @@ -1183,6 +1177,6 @@
- {(modal.type === 'confirm' || - modal.type === 'confirmRemoval') && ( + {(modal.type === "confirm" || + modal.type === "confirmRemoval") && (
)} - {modal.type === 'success' && ( + {modal.type === "success" && (
)} - {modal.type === 'error' && ( + {modal.type === "error" && (
- {modal.type === 'confirm' - ? 'Delete Post' - : modal.type === 'success' - ? 'Success' - : modal.type === 'confirmRemoval' - ? 'Remove Post' - : 'Error'} + {modal.type === "confirm" + ? "Delete Post" + : modal.type === "success" + ? "Success" + : modal.type === "confirmRemoval" + ? "Remove Post" + : "Error"}

@@ -1249,5 +1243,5 @@

- {modal.type === 'confirm' ? ( + {modal.type === "confirm" ? ( <> - ) : modal.type === 'confirmRemoval' ? ( + ) : modal.type === "confirmRemoval" ? ( <> Index: client/src/Register/Register.jsx =================================================================== --- client/src/Register/Register.jsx (revision 51add1c0def4e413e64f210d72cedd8ba28b0458) +++ client/src/Register/Register.jsx (revision de90604457c8e9d85097a1fed23eac0252f43d3a) @@ -1,13 +1,13 @@ -import React from 'react'; -import { Link, useNavigate } from 'react-router-dom'; -import { useState } from 'react'; -import { supabase } from '../contexts/AuthContext'; -import { signInWithGoogle } from '@/services/registerLoginService'; -import { useAuth } from '../contexts/AuthContext'; +import React from "react"; +import { Link, useNavigate } from "react-router-dom"; +import { useState } from "react"; +import { supabase } from "../contexts/AuthContext"; +import { signInWithGoogle } from "@/services/registerLoginService"; +import { useAuth } from "../contexts/AuthContext"; const Register = () => { const { register } = useAuth(); const [formErrors, setFormErrors] = useState({}); - const [generalError, setGeneralError] = useState(''); + const [generalError, setGeneralError] = useState(""); const [googleLoading, setGoogleLoading] = useState(false); const nav = useNavigate(); @@ -26,12 +26,12 @@ const [formData, setFormData] = useState({ - username: '', - email: '', - password: '', - confirmPassword: '', - name: '', + username: "", + email: "", + password: "", + confirmPassword: "", + name: "", }); function validateLocalEmailFormat(email) { - return email.includes('@') && email.includes('.'); + return email.includes("@") && email.includes("."); } const handleInputChange = (e) => { @@ -44,10 +44,10 @@ setFormErrors((prev) => ({ ...prev, [name]: undefined })); } - setGeneralError(''); + setGeneralError(""); }; const handleSubmit = async (e) => { e.preventDefault(); setLoading(true); - setGeneralError(''); + setGeneralError(""); setFormErrors({}); @@ -55,5 +55,5 @@ setFormErrors((prev) => ({ ...prev, - email: 'Please enter a valid email format.', + email: "Please enter a valid email format.", })); setLoading(false); @@ -63,5 +63,5 @@ setFormErrors((prev) => ({ ...prev, - passwordMatch: 'Passwords do not match', + passwordMatch: "Passwords do not match", })); setLoading(false); @@ -75,5 +75,5 @@ !formData.confirmPassword ) { - setGeneralError('Please fill in all required fields.'); + setGeneralError("Please fill in all required fields."); setLoading(false); return; @@ -92,5 +92,5 @@ if (result.success) { - nav('/dashboard'); + nav("/dashboard"); } else { if (result.errors) { @@ -98,10 +98,10 @@ } setGeneralError( - result.error || 'Registration failed. Please try again.' + result.error || "Registration failed. Please try again." ); } } catch (error) { - console.error('Unexpected error in Register handleSubmit:', error); - setGeneralError('A client-side error occurred. Please try again.'); + console.error("Unexpected error in Register handleSubmit:", error); + setGeneralError("A client-side error occurred. Please try again."); } finally { setLoading(false); @@ -120,5 +120,5 @@ className="flex flex-col items-center justify-center h-screen overflow-y-hidden p-2 md:p-4" > -

+

Create an account

@@ -192,5 +192,5 @@ id="password" name="password" - type={showPassword.password ? 'text' : 'password'} + type={showPassword.password ? "text" : "password"} className="input input-sm w-full pr-8 2xl:input-lg" placeholder="Password" @@ -202,5 +202,5 @@ type="button" className="absolute top-0 right-0 h-full px-2 flex items-center z-10" - onClick={() => togglePasswordVisibility('password')} + onClick={() => togglePasswordVisibility("password")} tabIndex="-1" disabled={loading || googleLoading} @@ -271,5 +271,5 @@ togglePasswordVisibility('confirmPassword')} + onClick={() => togglePasswordVisibility("confirmPassword")} tabIndex="-1" disabled={loading || googleLoading} @@ -352,5 +352,5 @@ type="button" onClick={handleGoogleSignIn} - className="btn btn-outline btn-sm w-[50%] text-center " + className="btn btn-outline btn-sm 2xl:btn-md w-full text-center " disabled={loading || googleLoading} >