Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/controllers/forumController.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -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,11 +206,11 @@ }); } else if (!commentSort) { - orderBy.push({ date_created: "desc" }); + orderBy.push({ date_created: 'desc' }); } if (search) { filters.push({ OR: [ - { title: { contains: search, mode: "insensitive" } }, - { content: { contains: search, mode: "insensitive" } }, + { title: { contains: search, mode: 'insensitive' } }, + { content: { contains: search, mode: 'insensitive' } }, ], }); @@ -220,11 +220,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' }); } @@ -254,5 +254,5 @@ })); if ( - (sort === "past-week" || sort === "past-month" || sort == "past-year") && + (sort === 'past-week' || sort === 'past-month' || sort == 'past-year') && !commentSort ) { @@ -261,18 +261,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' }); } }; @@ -281,14 +281,102 @@ const userId = req.user.sub; try { - const posts = await prisma.forum_posts.findMany({ - where: { author_id: userId }, - orderBy: { - date_created: "desc", - }, - }); - res.status(200).json(posts); + const page = parseInt(req.query.page) || 1; + const limit = parseInt(req.query.limit) || 20; + const skip = (page - 1) * limit; + const take = limit; + + const { + topic, + date: selectedDate, + sort: dateSort, + commentSort, + search: searchText, + } = req.query; + + const filters = []; + let orderBy = []; + + filters.push({ author_id: userId }); + + if (topic && topic !== 'all') { + filters.push({ topic: topic.trim() }); + } + + if (selectedDate) { + const dateObj = new Date(selectedDate); + filters.push({ date_created: dateObj }); + } + + 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 (searchText && searchText.trim()) { + const search = searchText.trim(); + filters.push({ + OR: [ + { title: { contains: search, mode: 'insensitive' } }, + { content: { contains: search, mode: 'insensitive' } }, + ], + }); + } + + const whereCondition = filters.length > 0 ? { AND: filters } : {}; + + if (commentSort && commentSort !== 'none') { + if (commentSort === 'most-popular') { + orderBy.push({ comment_count: 'desc' }); + } else { + orderBy.push({ comment_count: 'asc' }); + } + orderBy.push({ date_created: 'desc' }); + } else { + orderBy.push({ date_created: 'desc' }); + } + + const [posts, totalCount] = await Promise.all([ + prisma.forum_posts.findMany({ + where: whereCondition, + orderBy: orderBy, + skip: skip, + take: take, + include: { + challenges: { + select: { + id: true, + title: true, + }, + }, + }, + }), + prisma.forum_posts.count({ + where: whereCondition, + }), + ]); + + // Map posts to include challengeTitle + const processedPosts = posts.map((post) => ({ + ...post, + challengeTitle: post.challenges?.title || null, + })); + + res.status(200).json({ + posts: processedPosts, + totalCount, + totalPages: Math.ceil(totalCount / limit), + currentPage: page, + }); } 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' }); } }; @@ -308,5 +396,5 @@ if (!post) { - return res.status(404).json({ error: "Forum post not found" }); + return res.status(404).json({ error: 'Forum post not found' }); } @@ -316,5 +404,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', }); } @@ -335,9 +423,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' }); } }; @@ -349,5 +437,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', }); } @@ -362,7 +450,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', }); } @@ -395,10 +483,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' }); } }; @@ -410,5 +498,5 @@ return res .status(400) - .json({ error: "post_id query parameter is required" }); + .json({ error: 'post_id query parameter is required' }); } @@ -419,5 +507,5 @@ }, orderBy: { - dateCreated: "desc", + dateCreated: 'desc', }, }); @@ -436,6 +524,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' }); } }; @@ -451,5 +539,5 @@ if (!comment) { - return res.status(404).json({ error: "Comment not found" }); + return res.status(404).json({ error: 'Comment not found' }); } @@ -462,5 +550,5 @@ return res .status(404) - .json({ error: "Post associated with comment not found" }); + .json({ error: 'Post associated with comment not found' }); } @@ -470,5 +558,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', }); } @@ -501,9 +589,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: backend/controllers/reviewController.js =================================================================== --- backend/controllers/reviewController.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/controllers/reviewController.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -1,16 +1,16 @@ -const prisma = require("../lib/prisma"); -const ToBeReviewedPost = require("../models/ToBeReviewedPost"); -const ForumPost = require("../models/ForumPost"); -const ForumController = require("./forumController"); -const filter = require("leo-profanity"); -const safeWords = require("../filters/safeWords"); -const verifyModeratorStatus = require("../services/checkModeratorStatus"); -const { resetPostCheckCounter } = require("../services/forumCountersReset"); +const prisma = require('../lib/prisma'); +const ToBeReviewedPost = require('../models/ToBeReviewedPost'); +const ForumPost = require('../models/ForumPost'); +const ForumController = require('./forumController'); +const filter = require('leo-profanity'); +const safeWords = require('../filters/safeWords'); +const verifyModeratorStatus = require('../services/checkModeratorStatus'); +const { resetPostCheckCounter } = require('../services/forumCountersReset'); const { sendApprovalEmail, sendDeletionEmail, sendModeratorManyPendingPostsEmail, -} = require("../services/emailService"); -const { equal } = require("assert"); +} = require('../services/emailService'); +const { equal } = require('assert'); const createReviewPost = async (req, res) => { @@ -59,9 +59,9 @@ await resetPostCheckCounter(authorId); return res.status(201).json({ - message: "Post submitted for moderator approval", - }); - } catch (err) { - console.error("Server error:", err); - res.status(500).json({ error: "Internal server error" }); + message: 'Post submitted for moderator approval', + }); + } catch (err) { + console.error('Server error:', err); + res.status(500).json({ error: 'Internal server error' }); } }; @@ -71,7 +71,7 @@ const { userId } = req.params; await resetPostCheckCounter(userId); - res.status(200).json({ message: "Post check counter reset successfully" }); + res.status(200).json({ message: 'Post check counter reset successfully' }); } catch (e) { - console.error("Error resetting post check counter:", e); + console.error('Error resetting post check counter:', e); } }; @@ -82,8 +82,8 @@ page = 0, limit = 5, - search = "", - date = "", - topic = "all", - dateSort = "newest", + search = '', + date = '', + topic = 'all', + dateSort = 'newest', } = req.query; const skip = parseInt(page) * parseInt(limit); @@ -92,5 +92,5 @@ if (!hasModeratorStatus) { return res.status(403).json({ - error: "Access denied. Only moderators can access review posts.", + error: 'Access denied. Only moderators can access review posts.', }); } @@ -102,7 +102,7 @@ whereClause.AND.push({ OR: [ - { title: { contains: search, mode: "insensitive" } }, - { content: { contains: search, mode: "insensitive" } }, - { author_name: { contains: search, mode: "insensitive" } }, + { title: { contains: search, mode: 'insensitive' } }, + { content: { contains: search, mode: 'insensitive' } }, + { author_name: { contains: search, mode: 'insensitive' } }, ], }); @@ -122,5 +122,5 @@ }); } - if (topic && topic !== "all") { + if (topic && topic !== 'all') { whereClause.AND.push({ topic: { @@ -139,5 +139,5 @@ take: parseInt(limit), orderBy: { - created_at: dateSort === "oldest" ? "asc" : "desc", + created_at: dateSort === 'oldest' ? 'asc' : 'desc', }, include: { @@ -159,10 +159,10 @@ res.status(200).json({ posts: reviewPosts, totalPages }); } catch (dbError) { - console.error("Database query error:", dbError); - res.status(500).json({ error: "Error fetching posts from database" }); - } - } catch (err) { - console.error("Server error:", err); - res.status(500).json({ error: "Internal server error" }); + console.error('Database query error:', dbError); + res.status(500).json({ error: 'Error fetching posts from database' }); + } + } catch (err) { + console.error('Server error:', err); + res.status(500).json({ error: 'Internal server error' }); } }; @@ -177,5 +177,5 @@ }, orderBy: { - created_at: "desc", + created_at: 'desc', }, }); @@ -184,31 +184,41 @@ } catch (err) { console.error("Error fetching user's pending posts:", err); - res.status(500).json({ error: "Failed to fetch pending posts" }); + res.status(500).json({ error: 'Failed to fetch pending posts' }); } }; const deleteReviewPost = async (req, res) => { - const { id } = req.params; - const { userId } = req.params; - const hasModeratorStatus = await verifyModeratorStatus(userId); - if (!hasModeratorStatus) { - console.log("Access denied: User is not a moderator"); - return res.status(403).json({ - error: "Access denied. Only moderators can access review posts.", - }); - } + const { id, userId } = req.params; + try { const post = await prisma.to_be_reviewed.findUnique({ where: { id }, }); + + if (!post) { + return res.status(404).json({ error: 'Forum post not found' }); + } + + const isAuthor = post.author_id === userId; + const isModerator = await verifyModeratorStatus(userId); + + if (!isAuthor && !isModerator) { + console.log('Access denied: Not author or moderator'); + return res.status(403).json({ + error: + 'Access denied. Only the author or a moderator can delete this post.', + }); + } + const author = await prisma.users.findUnique({ where: { id: post.author_id }, select: { email: true }, }); + await prisma.to_be_reviewed.delete({ where: { id }, }); - if (author && author.email) { + if (author?.email) { sendDeletionEmail(author.email, post.title); } @@ -216,9 +226,9 @@ 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' }); } }; @@ -232,7 +242,7 @@ if (!hasModeratorStatus) { - console.log("Access denied: User is not a moderator"); + console.log('Access denied: User is not a moderator'); return res.status(403).json({ - error: "Access denied. Only moderators can access review posts.", + error: 'Access denied. Only moderators can access review posts.', }); } @@ -243,5 +253,5 @@ if (!postToApprove) { - return res.status(404).json({ error: "Post not found" }); + return res.status(404).json({ error: 'Post not found' }); } @@ -280,10 +290,10 @@ res.status(200).json({ - message: "Post approved and published successfully", + message: 'Post approved and published successfully', post: newForumPost, }); } catch (err) { - console.error("Error approving post:", err); - res.status(500).json({ error: "Failed to approve post" }); + console.error('Error approving post:', err); + res.status(500).json({ error: 'Failed to approve post' }); } }; Index: backend/controllers/taskController.js =================================================================== --- backend/controllers/taskController.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/controllers/taskController.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -1,7 +1,6 @@ -const { get } = require("http"); -const prisma = require("../lib/prisma"); -const verifyModeratorStatus = require("../services/checkModeratorStatus"); -const Challenge = require("../models/challenge"); -const { at } = require("../filters/macedonianProfanity"); +const { get } = require('http'); +const prisma = require('../lib/prisma'); +const verifyModeratorStatus = require('../services/checkModeratorStatus'); +const Challenge = require('../models/challenge'); //Helper functions @@ -12,5 +11,5 @@ return value.toISOString(); } - if (typeof value === "bigint") { + if (typeof value === 'bigint') { return value.toString(); } @@ -20,23 +19,53 @@ }; -const getAllTasks = async (req, res) => { +const getChallenges = async (req, res) => { const userId = req.user.sub; + const page = parseInt(req.query.page) || 0; + const limit = parseInt(req.query.limit) || 20; + const searchText = req.query.searchText; + const dateSort = req.query.dateSort; + const selectedDate = req.query.selectedDate; try { const isModerator = await verifyModeratorStatus(userId); if (!isModerator) { - return res.status(403).json({ message: "Access denied" }); - } - const page = parseInt(req.query.page) || 1; - const pageSize = parseInt(req.query.pageSize) || 10; + return res.status(403).json({ message: 'Access denied' }); + } + let filters = []; + orderBy = []; + if (dateSort) { + orderBy.push({ solving_date: 'asc' }); + } else { + orderBy.push({ solving_date: 'desc' }); + } + if (searchText) { + filters.push({ + OR: [ + { title: { contains: searchText, mode: 'insensitive' } }, + { content: { contains: searchText, mode: 'insensitive' } }, + ], + }); + } + if (selectedDate) { + const formattedDate = new Date(selectedDate); + if (!isNaN(formattedDate.getTime())) { + filters.push({ solving_date: formattedDate }); + } else { + console.error(`Invalid date provided: "${selectedDate}"`); + } + } + const whereCondition = filters.length > 0 ? { AND: filters } : {}; const [challenges, total] = await Promise.all([ prisma.challenges.findMany({ include: { test_cases: true }, - orderBy: { solving_date: "desc" }, - skip: (page - 1) * pageSize, - take: pageSize, + orderBy: orderBy, + skip: (page - 1) * limit, + take: limit, + where: whereCondition, }), - prisma.challenges.count(), + prisma.challenges.count({ + where: whereCondition, + }), ]); @@ -57,14 +86,14 @@ challenges: processedChallenges, total, - totalPages: Math.ceil(total / pageSize), + totalPages: Math.ceil(total / limit), currentPage: page, - pageSize, - }); - } catch (error) { - console.error("Error fetching all challenges:", error); + limit, + }); + } catch (error) { + console.error('Error fetching all challenges:', error); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: error.message, - stack: process.env.NODE_ENV === "development" ? error.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? error.stack : undefined, }); } @@ -104,5 +133,5 @@ }); if (tasks.length === 0) { - return res.status(404).json({ message: "No tasks found for this date" }); + return res.status(404).json({ message: 'No tasks found for this date' }); } @@ -113,6 +142,6 @@ safeTask.test_cases = safeTask.test_cases.map((testCase) => ({ id: testCase.id, - input: testCase.input || "", - output: testCase.output || "", + input: testCase.input || '', + output: testCase.output || '', challenge_id: testCase.challenge_id, })); @@ -122,13 +151,13 @@ }); - res.setHeader("Content-Type", "application/json"); + res.setHeader('Content-Type', 'application/json'); res.status(200).json(processedTasks); } catch (error) { - console.error("Error fetching tasks:", error); + console.error('Error fetching tasks:', error); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: error.message, - stack: process.env.NODE_ENV === "development" ? error.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? error.stack : undefined, }); } @@ -137,5 +166,5 @@ const getTasksForForumPost = async (req, res) => { try { - console.log("Called"); + console.log('Called'); const now = new Date(); const today = new Date( @@ -156,5 +185,5 @@ }, }, - orderBy: { solving_date: "desc" }, + orderBy: { solving_date: 'desc' }, }); @@ -174,9 +203,9 @@ res.status(200).json(processedChallenges); } catch (err) { - console.error("Error fetching tasks for forum post:", err); + console.error('Error fetching tasks for forum post:', err); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: err.message, - stack: process.env.NODE_ENV === "development" ? err.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? err.stack : undefined, }); } @@ -200,5 +229,5 @@ if (testCases.length === 0) { - return res.status(404).json({ message: "No test cases found for today" }); + return res.status(404).json({ message: 'No test cases found for today' }); } @@ -206,11 +235,11 @@ testCases[Math.floor(Math.random() * testCases.length)]; - res.setHeader("Content-Type", "application/json"); + res.setHeader('Content-Type', 'application/json'); res.status(200).json(randomTestCase); } catch (error) { - console.error("Error fetching test cases:", error); + console.error('Error fetching test cases:', error); res .status(500) - .json({ message: "Internal server error", error: error.message }); + .json({ message: 'Internal server error', error: error.message }); } }; @@ -231,5 +260,5 @@ }); if (challenges.length === 0) { - return res.status(404).json({ message: "No tasks found for this date" }); + return res.status(404).json({ message: 'No tasks found for this date' }); } @@ -240,6 +269,6 @@ safeTask.test_cases = safeTask.test_cases.map((testCase) => ({ id: testCase.id, - input: testCase.input || "", - output: testCase.output || "", + input: testCase.input || '', + output: testCase.output || '', challenge_id: testCase.challenge_id, })); @@ -250,9 +279,9 @@ res.status(200).json(parsedChallenges); } catch (error) { - console.error("Error searching tasks by date:", error); + console.error('Error searching tasks by date:', error); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: error.message, - stack: process.env.NODE_ENV === "development" ? error.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? error.stack : undefined, }); } @@ -273,12 +302,12 @@ }); if (!testCase) { - return res.status(404).json({ message: "Test case not found" }); + return res.status(404).json({ message: 'Test case not found' }); } res.status(200).json(testCase); } catch (error) { - console.error("Error fetching specific test case by ID:", error); + console.error('Error fetching specific test case by ID:', error); res .status(500) - .json({ message: "Internal server error", error: error.message }); + .json({ message: 'Internal server error', error: error.message }); } }; @@ -300,13 +329,13 @@ return res .status(404) - .json({ message: "No test cases found for this task" }); + .json({ message: 'No test cases found for this task' }); } res.status(200).json(testCases); } catch (error) { - console.error("Error fetching all test cases for task:", error); + console.error('Error fetching all test cases for task:', error); res .status(500) - .json({ message: "Internal server error", error: error.message }); + .json({ message: 'Internal server error', error: error.message }); } }; @@ -317,5 +346,5 @@ if (!testCaseId) { - return res.status(400).json({ message: "testCaseId is required" }); + return res.status(400).json({ message: 'testCaseId is required' }); } @@ -328,29 +357,29 @@ res.status(200).json({ user: updatedUser }); } catch (error) { - console.error("Error updating user daily test case ID:", error); - if (error.code === "P2025") { - return res.status(404).json({ message: "User not found" }); + console.error('Error updating user daily test case ID:', error); + if (error.code === 'P2025') { + return res.status(404).json({ message: 'User not found' }); } res .status(500) - .json({ message: "Internal server error", error: error.message }); + .json({ message: 'Internal server error', error: error.message }); } }; const RANK_DATA = { - Novice: { id: 1, title: "Novice", requiredPoints: 0 }, - Learner: { id: 2, title: "Learner", requiredPoints: 300 }, - "Junior Developer": { id: 3, title: "Junior Developer", requiredPoints: 800 }, - Developer: { id: 4, title: "Developer", requiredPoints: 1500 }, - "Senior Developer": { + Novice: { id: 1, title: 'Novice', requiredPoints: 0 }, + Learner: { id: 2, title: 'Learner', requiredPoints: 300 }, + 'Junior Developer': { id: 3, title: 'Junior Developer', requiredPoints: 800 }, + Developer: { id: 4, title: 'Developer', requiredPoints: 1500 }, + 'Senior Developer': { id: 5, - title: "Senior Developer", + title: 'Senior Developer', requiredPoints: 2500, }, - Expert: { id: 6, title: "Expert", requiredPoints: 4000 }, - Master: { id: 7, title: "Master", requiredPoints: 6000 }, - "Grand Master": { id: 8, title: "Grand Master", requiredPoints: 8500 }, - "FINKI Royalty": { id: 9, title: "FINKI Royalty", requiredPoints: 11000 }, - "FINKI Legend": { id: 10, title: "FINKI Legend", requiredPoints: 16000 }, + Expert: { id: 6, title: 'Expert', requiredPoints: 4000 }, + Master: { id: 7, title: 'Master', requiredPoints: 6000 }, + 'Grand Master': { id: 8, title: 'Grand Master', requiredPoints: 8500 }, + 'FINKI Royalty': { id: 9, title: 'FINKI Royalty', requiredPoints: 11000 }, + 'FINKI Legend': { id: 10, title: 'FINKI Legend', requiredPoints: 16000 }, }; @@ -364,5 +393,5 @@ } } - return RANK_DATA["Novice"]; + return RANK_DATA['Novice']; } @@ -396,17 +425,17 @@ str .toString() - .replace(/[^\w.-]/g, "") + .replace(/[^\w.-]/g, '') .trim() .toLowerCase(); const normalizeArray = (str) => { - const cleaned = str.replace(/[\[\]]/g, ""); + const cleaned = str.replace(/[\[\]]/g, ''); return cleaned .split(/[\s,]+/) - .filter((val) => val !== "") + .filter((val) => val !== '') .map((val) => val.trim()); }; - if (outputType === "integer") { + if (outputType === 'integer') { const cleanedUserOutput = normalizeString(userOutput); const cleanedExpectedOutput = normalizeString(expectedOutput); @@ -414,5 +443,5 @@ } - if (outputType === "float") { + if (outputType === 'float') { const cleanedUserOutput = normalizeString(userOutput); const cleanedExpectedOutput = normalizeString(expectedOutput); @@ -424,5 +453,5 @@ } - if (outputType === "array") { + if (outputType === 'array') { const userArr = normalizeArray(userOutput); const expectedArr = normalizeArray(expectedOutput); @@ -444,5 +473,5 @@ try { if (!testCaseId || !userOutput || !userId) { - return res.status(400).json({ message: "Missing required fields" }); + return res.status(400).json({ message: 'Missing required fields' }); } const testCase = await prisma.test_cases.findUnique({ @@ -455,13 +484,13 @@ return res .status(400) - .json({ message: "Test case does not belong to the task" }); + .json({ message: 'Test case does not belong to the task' }); } let user = await prisma.users.findUnique({ where: { id: userId } }); if (!user) { - return res.status(404).json({ message: "User not found" }); + return res.status(404).json({ message: 'User not found' }); } if (user.solvedDailyChallenge) { - return res.status(404).json({ message: "User daily challenge solved" }); + return res.status(404).json({ message: 'User daily challenge solved' }); } let attempts = user.attempts || 0; @@ -485,7 +514,7 @@ const attemptScore = getAttemptScore(attempts + 1); const difficultyScore = - task.difficulty === "Easy" + task.difficulty === 'Easy' ? 10 - : task.difficulty === "Medium" + : task.difficulty === 'Medium' ? 20 : 30; @@ -507,5 +536,5 @@ const responseUser = { ...updatedUser }; - if (typeof responseUser.points === "bigint") { + if (typeof responseUser.points === 'bigint') { responseUser.points = responseUser.points.toString(); } @@ -518,5 +547,5 @@ return res.status(200).json({ success: true, - message: "Challenge solved successfully!", + message: 'Challenge solved successfully!', scoreAwarded: totalScore, newTotalPoints: responseUser.points, @@ -534,7 +563,7 @@ return res.status(200).json({ success: false, - message: "Incorrect solution. Try again!", + message: 'Incorrect solution. Try again!', attemptsMade: - typeof newAttempts === "bigint" + typeof newAttempts === 'bigint' ? newAttempts.toString() : newAttempts, @@ -542,7 +571,7 @@ } } catch (error) { - console.error("Error evaluating task:", error); + console.error('Error evaluating task:', error); return res.status(500).json({ - message: "Internal server error during evaluation.", + message: 'Internal server error during evaluation.', error: error.message, }); @@ -557,5 +586,5 @@ if (!isModeratorOrAdmin) { return res.status(403).json({ - message: "You do not have permission to create challenges", + message: 'You do not have permission to create challenges', }); } @@ -584,11 +613,11 @@ expired: false, examples: examples, - output_type: output_type || "string", - difficulty: difficulty || "Easy", + output_type: output_type || 'string', + difficulty: difficulty || 'Easy', }); const validation = challenge.validate(); if (!validation.isValid) { return res.status(400).json({ - message: "Challenge validation failed", + message: 'Challenge validation failed', errors: validation.errors, }); @@ -615,5 +644,5 @@ res.status(201).json({ - message: "Challenge created successfully", + message: 'Challenge created successfully', challenge: { id: createdChallenge.id, @@ -624,9 +653,9 @@ }); } catch (error) { - console.error("Error creating challenge:", error); + console.error('Error creating challenge:', error); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: error.message, - stack: process.env.NODE_ENV === "development" ? error.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? error.stack : undefined, }); } @@ -650,17 +679,17 @@ res.status(200).json({ - message: "Challenge and associated test cases deleted successfully", + message: 'Challenge and associated test cases deleted successfully', }); } else { res.status(403).json({ - message: "You do not have permission to delete this challenge", - }); - } - } catch (error) { - console.error("Error deleting challenge:", error); + message: 'You do not have permission to delete this challenge', + }); + } + } catch (error) { + console.error('Error deleting challenge:', error); res.status(500).json({ - message: "Internal server error", + message: 'Internal server error', error: error.message, - stack: process.env.NODE_ENV === "development" ? error.stack : undefined, + stack: process.env.NODE_ENV === 'development' ? error.stack : undefined, }); } @@ -674,5 +703,5 @@ fetchTestCaseForToday, evaluateTask, - getAllTasks, + getChallenges, getAllTestCasesForTask, deleteTask, Index: backend/routers/taskRouter.js =================================================================== --- backend/routers/taskRouter.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/routers/taskRouter.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -1,22 +1,22 @@ -const express = require("express"); +const express = require('express'); const router = express.Router(); -const taskController = require("../controllers/taskController"); +const taskController = require('../controllers/taskController'); -router.get("/all", taskController.getAllTasks); -router.get("/", taskController.getTaskByDate); -router.get("/forum-post", taskController.getTasksForForumPost); -router.get("/:id/test-case", taskController.fetchTestCaseForToday); -router.get("/:id/test-cases", taskController.getAllTestCasesForTask); -router.get("/test-cases/:testCaseId", taskController.getSpecificTestCaseById); -router.get("/search", taskController.searchTaskByDate); +router.get('/', taskController.getChallenges); +router.get('/today', taskController.getTaskByDate); +router.get('/forum-post', taskController.getTasksForForumPost); +router.get('/:id/test-case', taskController.fetchTestCaseForToday); +router.get('/:id/test-cases', taskController.getAllTestCasesForTask); +router.get('/test-cases/:testCaseId', taskController.getSpecificTestCaseById); +router.get('/search', taskController.searchTaskByDate); router.put( - "/users/:userId/daily-test-case-id", + '/users/:userId/daily-test-case-id', taskController.updateUserDailyChallengeId ); -router.post("/:id/evaluate", taskController.evaluateTask); -router.post("/create", taskController.createNewTask); +router.post('/:id/evaluate', taskController.evaluateTask); +router.post('/create', taskController.createNewTask); -router.delete("/:id", taskController.deleteTask); +router.delete('/:id', taskController.deleteTask); module.exports = router; Index: backend/scripts/dailyResets.js =================================================================== --- backend/scripts/dailyResets.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/scripts/dailyResets.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -91,2 +91,4 @@ process.exit(0); }); + +dailyResets(); Index: backend/scripts/scriptForTesting.js =================================================================== --- backend/scripts/scriptForTesting.js (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ backend/scripts/scriptForTesting.js (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -23,7 +23,7 @@ // console.log( -// "Querying between (UTC dates):", +// 'Querying between (UTC dates):', // startOfEffectiveDay.toISOString(), -// "and", +// 'and', // startOfNextDay.toISOString() // ); @@ -46,5 +46,5 @@ // console.log(challenges); // } else { -// console.log("No challenges found for today."); +// console.log('No challenges found for today.'); // } // } catch (error) { @@ -53,5 +53,5 @@ // } finally { // await prisma.$disconnect(); -// console.log("Disconnected from database."); +// console.log('Disconnected from database.'); // } // } @@ -80,71 +80,71 @@ // resetUsers(); -async function sendmailToModerators() { - try { - // 1. Define the time threshold (24 hours ago) - const oneDayAgo = new Date(); - oneDayAgo.setDate(oneDayAgo.getDate()); +// async function sendmailToModerators() { +// try { +// // 1. Define the time threshold (24 hours ago) +// const oneDayAgo = new Date(); +// oneDayAgo.setDate(oneDayAgo.getDate()); - // 2. Check if there are any posts older than the threshold - const posts = await prisma.to_be_reviewed.findMany({ - where: { - created_at: { - lt: oneDayAgo, // 'lt' means "less than" - }, - }, - select: { - title: true, - created_at: true, - }, - orderBy: { - created_at: 'asc', - }, - }); +// // 2. Check if there are any posts older than the threshold +// const posts = await prisma.to_be_reviewed.findMany({ +// where: { +// created_at: { +// lt: oneDayAgo, // 'lt' means "less than" +// }, +// }, +// select: { +// title: true, +// created_at: true, +// }, +// orderBy: { +// created_at: 'asc', +// }, +// }); - console.log(`Found ${posts.length} post(s) older than 24 hours.`); +// console.log(`Found ${posts.length} post(s) older than 24 hours.`); - // 3. If no old posts, exit gracefully - if (posts.length === 0) { - console.log('No old posts to review. No emails sent.'); - return; - } - console.log('Posts awaiting review:'); - posts.forEach((post, index) => { - console.log( - `${index + 1}. ${post.title} (ID: ${ - post.id - }) - Created at: ${post.created_at.toISOString()}` - ); - }); +// // 3. If no old posts, exit gracefully +// if (posts.length === 0) { +// console.log('No old posts to review. No emails sent.'); +// return; +// } +// console.log('Posts awaiting review:'); +// posts.forEach((post, index) => { +// console.log( +// `${index + 1}. ${post.title} (ID: ${ +// post.id +// }) - Created at: ${post.created_at.toISOString()}` +// ); +// }); - // 4. If there are old posts, get all moderators - const moderators = await prisma.users.findMany({ - where: { - isModerator: true, - }, - select: { - email: true, // Only select the email field - }, - }); +// // 4. If there are old posts, get all moderators +// const moderators = await prisma.users.findMany({ +// where: { +// isModerator: true, +// }, +// select: { +// email: true, // Only select the email field +// }, +// }); - if (moderators.length === 0) { - console.log( - 'Found old posts, but no moderators are defined in the system.' - ); - return; - } +// if (moderators.length === 0) { +// console.log( +// 'Found old posts, but no moderators are defined in the system.' +// ); +// return; +// } - const moderatorEmails = moderators.map((m) => m.email); +// const moderatorEmails = moderators.map((m) => m.email); - moderatorEmails.forEach((email) => { - sendModeratorEmail(email, posts); - }); - } catch (error) { - console.error('Error in sendEmailToModerators script:', error); - process.exitCode = 1; - } finally { - await prisma.$disconnect(); - } -} +// moderatorEmails.forEach((email) => { +// sendModeratorEmail(email, posts); +// }); +// } catch (error) { +// console.error('Error in sendEmailToModerators script:', error); +// process.exitCode = 1; +// } finally { +// await prisma.$disconnect(); +// } +// } -sendmailToModerators(); +// sendmailToModerators(); Index: client/src/Dashboard/DashboardLayout.jsx =================================================================== --- client/src/Dashboard/DashboardLayout.jsx (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ client/src/Dashboard/DashboardLayout.jsx (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -1,6 +1,6 @@ -import React, { useState } from "react"; +import React, { useState } from 'react'; -import { Outlet, useSearchParams } from "react-router-dom"; -import Navbar from "./components/Navbar"; +import { Outlet, useSearchParams } from 'react-router-dom'; +import Navbar from './components/Navbar'; const DashboardLayout = () => { Index: client/src/Dashboard/components/CalendarPopover.jsx =================================================================== --- client/src/Dashboard/components/CalendarPopover.jsx (revision 420d7b9b1837b208cbebd6615b98ec8012e3d42e) +++ client/src/Dashboard/components/CalendarPopover.jsx (revision 909821d87b77e470a89d64f5600d2259fb44dc15) @@ -1,6 +1,12 @@ -import React, { useRef, useEffect } from "react"; -import "cally"; +import React, { useRef, useEffect } from 'react'; +import 'cally'; -const CalendarPopover = ({ isOpen, onClose, onDateSelect, selectedDate }) => { +const CalendarPopover = ({ + isOpen, + onClose, + onDateSelect, + selectedDate, + isFromManageChallenges, +}) => { const popoverRef = useRef(null); const calendarRef = useRef(null); @@ -13,13 +19,12 @@ }; if (isOpen) { - document.addEventListener("mousedown", handleClickOutside); + document.addEventListener('mousedown', handleClickOutside); } // Cleanup the event listener return () => { - document.removeEventListener("mousedown", handleClickOutside); + document.removeEventListener('mousedown', handleClickOutside); }; }, [isOpen, onClose]); - // Effect to set the calendar's initial value when it opens useEffect(() => { if (isOpen && calendarRef.current && selectedDate) { @@ -27,5 +32,5 @@ const timezoneOffset = date.getTimezoneOffset() * 60000; const adjustedDate = new Date(date.getTime() - timezoneOffset); - calendarRef.current.value = adjustedDate.toISOString().split("T")[0]; + calendarRef.current.value = adjustedDate.toISOString().split('T')[0]; } }, [isOpen, selectedDate]); @@ -36,5 +41,5 @@ const handleDateChange = (event) => { if (event.target.value) { - const selected = new Date(event.target.value + "T00:00:00"); + const selected = new Date(event.target.value + 'T00:00:00'); onDateSelect(selected); onClose(); @@ -43,10 +48,10 @@ if (isOpen && calendarEl) { - calendarEl.addEventListener("change", handleDateChange); + calendarEl.addEventListener('change', handleDateChange); } return () => { if (calendarEl) { - calendarEl.removeEventListener("change", handleDateChange); + calendarEl.removeEventListener('change', handleDateChange); } }; @@ -59,5 +64,5 @@ const timezoneOffset = today.getTimezoneOffset() * 60000; // Get timezone offset in milliseconds const adjustedDate = new Date(today.getTime() - timezoneOffset); // Adjust to UTC - const maxDate = adjustedDate.toISOString().split("T")[0]; + const maxDate = adjustedDate.toISOString().split('T')[0]; return ( @@ -69,5 +74,5 @@ ref={calendarRef} class="cally bg-base-100 border border-base-300 shadow-md rounded-box w-full mb-4" - max={maxDate} + max={isFromManageChallenges ? '' : maxDate} > { @@ -22,6 +22,6 @@ const [modal, setModal] = useState({ isOpen: false, - message: "", - type: "", + message: '', + type: '', postId: null, }); @@ -31,9 +31,9 @@ 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 }); }; @@ -64,6 +64,4 @@ } }; - - // Only fetch posts on component mount const fetchPosts = useCallback( @@ -103,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); } @@ -120,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()) { @@ -132,5 +130,4 @@ }, [forumSearchParams, fetchPosts]); - // Apply all selected filters const applyFilters = () => { const newSearchParams = new URLSearchParams(); @@ -141,17 +138,19 @@ } } - newSearchParams.set("page", "1"); + newSearchParams.set('page', '1'); setForumSearchParams(newSearchParams); }; - const handleRemoveFilter = (filterKeyToRemove) => { - const newSearchParams = new URLSearchParams(forumSearchParams); - const newFilters = { - ...filters, - [filterKeyToRemove]: defaultFilters[filterKeyToRemove], - }; - newSearchParams.delete(filterKeyToRemove); - newSearchParams.set("page", "1"); - setForumSearchParams(newSearchParams); + + const handleRemoveFilter = (filterKey) => { + const newFilters = { ...filters, [filterKey]: defaultFilters[filterKey] }; setFilters(newFilters); + + if (forumSearchParams.has(filterKey)) { + const newSearchParams = new URLSearchParams(forumSearchParams); + newSearchParams.delete(filterKey); + setPage(1); + newSearchParams.set('page', '1'); + setForumSearchParams(newSearchParams); + } }; @@ -161,5 +160,5 @@ const freshDefaultFilters = { ...defaultFilters }; setFilters(freshDefaultFilters); - setForumSearchParams({ page: "1" }); + setForumSearchParams({ page: '1' }); setPage(1); @@ -173,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(' '); }; @@ -192,49 +191,50 @@
{/* Sticky Header Section */} -
-
-
- - -
-
+
+ +
- {/* Filter Navbar */}
@@ -245,16 +245,15 @@ Filters {/* Active filter count indicator */} - {(filters.topic !== "all" || - filters.dateSort !== "newest" || + {(filters.topic !== 'all' || + filters.dateSort !== 'newest' || filters.selectedDate || - filters.commentSort !== "none" || (filters.searchText && filters.searchText.trim())) && ( { [ - 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 @@ -269,5 +268,5 @@ - {/* Mobile-First Filter Layout */} -
+ {/* Mobile-First Filter Layout - Compact Version */} +
{/* Search Filter - Full width on mobile, 2 cols on desktop */} -
+