Index: backend/controllers/reviewController.js =================================================================== --- backend/controllers/reviewController.js (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) +++ backend/controllers/reviewController.js (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -0,0 +1,105 @@ +const prisma = require('../lib/prisma'); +const ForumPost = require('../models/ForumPost'); +const ForumController = require('./forumController'); +const filter = require("leo-profanity"); +const safeWords = require("../filters/safeWords"); + + +const createReviewPost = async (req, res) => { + const { title, content, authorId, authorName } = req.body; + + try { + // Create domain object first + const post = new ForumPost({ + title, + content, + authorName, + }); + const savedPost = await prisma.to_be_reviewed.create({ + data: { + title: post.title, + content: post.content, + author_id: authorId, + author_name: post.authorName, + }, + }); + + post.id = savedPost.id; + + res.status(201).json({ + message: 'Forum post created successfully', + post: savedPost, + }); + } catch (err) { + console.error('Server error:', err); + res.status(500).json({ error: 'Internal server error' }); + } +}; + +const getReviewPosts = async (req, res) => { + try { + console.log('Fetching to be reviewed posts '); + const page = parseInt(req.query.page) || 0; + const limit = parseInt(req.query.limit) || 5; + const skip = page * limit; + + // Use Prisma to fetch posts with pagination + const posts = await prisma.to_be_reviewed.findMany({ + skip, + take: limit, + orderBy: { + date_created: 'desc', + }, + }); + + // Convert to domain objects + const forumPosts = posts.map( + (post) => + new ForumPost({ + id: post.id, + title: post.title, + content: post.content, + authorName: post.author_name, + dateCreated: post.date_created, + commentCount: post.comment_count, + }) + ); + + res.status(200).json(forumPosts); + } catch (err) { + console.error('Server error:', err); + res.status(500).json({ error: 'Internal server error' }); + } +}; + +const deleteReviewPost = async (req, res) => { + const { id } = req.params; + + try { + // Delete using Prisma + await prisma.to_be_reviewed.delete({ + where: { id }, + }); + + res.status(204).send(); + } catch (err) { + // Prisma throws when record not found + 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' }); + } +}; + +const approveReviewPost = async (req, res) => { + await ForumController.createForumPost(req, res) + await deleteReviewPost(req, res) +} + +module.exports = { + createReviewPost, + getReviewPosts, + deleteReviewPost, + approveReviewPost +} Index: backend/prisma/schema.prisma =================================================================== --- backend/prisma/schema.prisma (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) +++ backend/prisma/schema.prisma (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -11,41 +11,53 @@ /// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info. model comments { - id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid - dateCreated DateTime @default(now()) @db.Timestamptz(6) - post_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid - content String? @default("") - author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid - author_name String? - users users? @relation(fields: [author_id], references: [id], onDelete: Cascade) - forum_posts forum_posts? @relation(fields: [post_id], references: [id], onDelete: Cascade) + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + dateCreated DateTime @default(now()) @db.Timestamptz(6) + post_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + content String? @default("") + author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + author_name String? + users users? @relation(fields: [author_id], references: [id], onDelete: Cascade, map: "comments_author_id_fkey") + to_be_reviewed forum_posts? @relation(fields: [post_id], references: [id], onDelete: Cascade, map: "comments_to_be_reviewed_post_id_fkey") +} + +model to_be_reviewed { + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + title String? + created_at DateTime @default(now()) @db.Timestamptz(6) + content String? + author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + author_name String? + comment_count Int? @default(0) @db.SmallInt + users users? @relation(fields: [author_id], references: [id], onDelete: NoAction, onUpdate: NoAction, map: "to_be_reviewed_author_id_fkey") } /// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info. model forum_posts { - id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid - title String @default("") - content String? @default("") - author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid - author_name String? - date_created DateTime? @default(now()) @db.Date - comment_count Int @default(0) - comments comments[] - users users? @relation(fields: [author_id], references: [id], onDelete: Restrict, onUpdate: Restrict) + id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid + title String @default("") + content String? @default("") + author_id String? @default(dbgenerated("gen_random_uuid()")) @db.Uuid + author_name String? + date_created DateTime? @default(now()) @db.Date + comment_count Int @default(0) + comments comments[] + users users? @relation(fields: [author_id], references: [id], onDelete: Restrict, onUpdate: Restrict, map: "forum_posts_author_id_fkey") } model users { - id String @id @default(dbgenerated("auth.uid()")) @db.Uuid - username String @unique - email String @unique + id String @id @default(dbgenerated("auth.uid()")) @db.Uuid + username String @unique + email String @unique name String? - solved_problems BigInt? @default(0) - rank String? @default("Novice") - points BigInt? @default(0) - commentCounter Int? @default(3) @db.SmallInt - commentCheckCounter Int? @default(0) @db.SmallInt - postCounter Int? @default(3) @db.SmallInt - postCheckCounter Int? @default(0) @db.SmallInt - isModerator Boolean @default(false) + solved_problems BigInt? @default(0) + rank String? @default("Novice") + points BigInt? @default(0) + commentCounter Int? @default(3) @db.SmallInt + commentCheckCounter Int? @default(0) @db.SmallInt + postCounter Int? @default(3) @db.SmallInt + postCheckCounter Int? @default(0) @db.SmallInt + isModerator Boolean @default(false) comments comments[] forum_posts forum_posts[] + to_be_reviewed to_be_reviewed[] } Index: backend/routers/reviewRouter.js =================================================================== --- backend/routers/reviewRouter.js (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) +++ backend/routers/reviewRouter.js (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -0,0 +1,11 @@ +const express = require('express'); +const router = express.Router(); +const reviewController = require('../controllers/reviewController'); + +// Review Routes + +router.post('/posts/:id', reviewController.approveReviewPost); +router.get('/posts', reviewController.getReviewPosts); +router.delete('/posts/:id', reviewController.deleteReviewPost); + +module.exports = router; Index: backend/server.js =================================================================== --- backend/server.js (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) +++ backend/server.js (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -6,4 +6,5 @@ const forumRouter = require('./routers/forumRouter'); +const reviewRouter = require('./routers/reviewRouter'); app.use(express.json()); @@ -17,4 +18,5 @@ app.use('/forum', forumRouter); +app.use('/review', reviewRouter); app.get('/', indexRouter); app.use((req, res, next) => { Index: ient/src/Dashboard/Dashboard.jsx =================================================================== --- client/src/Dashboard/Dashboard.jsx (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) +++ (revision ) @@ -1,179 +1,0 @@ -import React, { useState, useEffect } from 'react'; -import { useNavigate } from 'react-router-dom'; -import logoIcon from '../assets/images/logoIcon.png'; -import logoText from '../assets/images/logoText.png'; -import pp from '../assets/images/pp.svg'; - -import Task from './components/Task'; -import LeaderBoardEx from '@/LandingPage/components/LeaderBoardEx'; -import Forum from './components/Forum'; -import Profile from './components/Profile'; -import CreatePost from '../CreatePost/CreatePost'; -import ForumPostDetail from './components/ForumPostDetail'; - -const Dashboard = () => { - const [activePage, setActivePage] = useState('home'); - const [user, setUser] = useState(null); - const [selectedForumPost, setSelectedForumPost] = useState(null); - const navigate = useNavigate(); - - useEffect(() => { - const storedUser = localStorage.getItem('user'); - if (!storedUser) { - navigate('/login'); - } else { - setUser(JSON.parse(storedUser)); - } - }, [navigate]); - - const renderPage = () => { - if (selectedForumPost) { - return ( - setSelectedForumPost(null)} - /> - ); - } - switch (activePage) { - case 'home': - return ; - case 'forum': - return ( - - ); - case 'leaderboard': - return ; - case 'profile': - return ; - case 'createPost': - return ; - default: - return ( -
- Page Not Found -
- ); - } - }; - - if (!user) { - return
Loading...
; // or a loading spinner - } - - return ( -
- - -
{renderPage()}
-
- ); -}; - -export default Dashboard; Index: client/src/Dashboard/components/ManagePosts.jsx =================================================================== --- client/src/Dashboard/components/ManagePosts.jsx (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) +++ client/src/Dashboard/components/ManagePosts.jsx (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -0,0 +1,175 @@ +import React, {useState, useEffect} from 'react'; +import {useNavigate} from 'react-router-dom'; +import doneAll from '../../assets/images/done-all.svg'; +import trashIcon from '../../assets/images/delete.svg'; // Add this import +import Navbar from './Navbar'; + +const ManagePosts = () => { + const navigate = useNavigate(); + const [posts, setPosts] = useState([]); + const [page, setPage] = useState(0); + const [hasMore, setHasMore] = useState(true); + const postsPerPage = 5; + const user = JSON.parse(localStorage.getItem('user')); + + useEffect(() => { + fetchPosts(); + }, [page]); + + const fetchPosts = async () => { + try { + const response = await fetch( + `/review/posts?page=${page}&limit=${postsPerPage}` + ); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + const data = await response.json(); + if (page === 0) { + setPosts(data); + console.log('Fetched posts:', data); + } else { + setPosts((prevPosts) => [...prevPosts, ...data]); + } + if (data.length < postsPerPage) { + setHasMore(false); + } + } catch (error) { + console.error('Error fetching forum posts:', error); + } + }; + + const handleDeletePost = async (postId) => { + try { + const response = await fetch(`/review/posts/${postId}`, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', + }, + }); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + setPosts((prevPosts) => prevPosts.filter((post) => post.id !== postId)); + console.log('Post deleted successfully'); + } catch (error) { + console.error('Error deleting post:', error); + } + }; + + const handleApprovePost = async (postId) => { + try { + const response = await fetch(`/review/posts/${postId}`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + authorId: user.id, + authorName: user.name, + }), + }); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + setPosts((prevPosts) => prevPosts.filter((post) => post.id !== postId)); + console.log('Post approved successfully'); + } catch (error) { + console.error('Error approving post:', error); + } + } + + const handleLoadMore = () => { + setPage((prevPage) => prevPage + 1); + }; + + return ( +
+ +
+
+

Posts that need approval

+
+ {posts.map((post) => ( +
+ + + + +
+

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

+
+ +

+ By {post.authorName},{' '} + {post.dateCreated.split('T')[0]} +

+

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

+ +
+ ))} +
+ {hasMore && ( +
+ +
+ )} +
+
+
+ ); +}; + +export default ManagePosts; Index: client/src/Dashboard/components/Navbar.jsx =================================================================== --- client/src/Dashboard/components/Navbar.jsx (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) +++ client/src/Dashboard/components/Navbar.jsx (revision 8d2824b890bdb7b88fceac4e0aa65a28e34bdf8b) @@ -1,3 +1,3 @@ -import React, { useState, useEffect } from 'react'; +import React from 'react'; import { useNavigate } from 'react-router-dom'; import logoIcon from '../../assets/images/logoIcon.png'; @@ -81,5 +81,5 @@