Index: backend/controllers/apiController.js =================================================================== --- backend/controllers/apiController.js (revision 2db3b645437625f6d4676b1dc2c1146d7762826f) +++ backend/controllers/apiController.js (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) @@ -6,5 +6,14 @@ try { const { username, email, password, name } = req.body; - + const existingUser = await prisma.users.findUnique({ + where: { username: username }, + select: { id: true }, + }); + if (existingUser) { + return res.status(400).json({ + message: 'Username already exists', + success: false, + }); + } if (!username || !email || !password || !name) { return res.status(400).json({ @@ -35,4 +44,5 @@ if (error) throw new Error(error.message); + console.log('User created in Supabase:', studentInstance); res.status(201).json({ @@ -77,7 +87,17 @@ return { studentInstance, error: null }; } catch (error) { - return { studentInstance, error }; + // Check for Prisma unique constraint error + if (error.code === 'P2002') { + const field = error.meta?.target[0]; + if (field === 'username') { + throw new Error('Username already in use'); + } else if (field === 'email') { + throw new Error('Email address already registered'); + } + } + throw error; // Re-throw any other errors } } + function convertBigIntToString(obj) { if (Array.isArray(obj)) { @@ -85,5 +105,8 @@ } else if (obj && typeof obj === 'object') { return Object.fromEntries( - Object.entries(obj).map(([k, v]) => [k, typeof v === 'bigint' ? v.toString() : convertBigIntToString(v)]) + Object.entries(obj).map(([k, v]) => [ + k, + typeof v === 'bigint' ? v.toString() : convertBigIntToString(v), + ]) ); } @@ -123,7 +146,9 @@ const safeUserData = convertBigIntToString(userData); - res - .status(200) - .json({ message: 'Login successful', success: true, user: safeUserData }); + res.status(200).json({ + message: 'Login successful', + success: true, + user: safeUserData, + }); } catch (dbError) { console.error('Database error:', dbError); Index: backend/controllers/forumController.js =================================================================== --- backend/controllers/forumController.js (revision 2db3b645437625f6d4676b1dc2c1146d7762826f) +++ backend/controllers/forumController.js (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) @@ -3,5 +3,5 @@ const Comment = require('../models/Comment'); const filter = require('leo-profanity'); -const mkProfanity = require('../filters/macedonianProfanity') +const mkProfanity = require('../filters/macedonianProfanity'); filter.add(mkProfanity); const safeWords = require('../filters/safeWords'); @@ -17,13 +17,20 @@ authorName, }); - const isProfane = filter.check(post.content + post.title); + const isProfane = filter.check(post.title); if (isProfane) { - console.log("Profanity detected!"); + console.log('Profanity detected!'); return res.status(400).json({ error: 'Content contains inappropriate language', }); - } else if(!(safeWords.includes(post.content) || safeWords.includes(post.title))) { - console.log("Safe words check failed!"); + } else if (filter.check(post.content)) { + console.log('Profanity detected in content!'); + return res.status(400).json({ + error: 'Content contains inappropriate language', + }); + } else if ( + !(safeWords.includes(post.content) || safeWords.includes(post.title)) + ) { + console.log('Safe words check failed!'); // TUKA VIKAME AI } @@ -52,4 +59,5 @@ const getForumPosts = async (req, res) => { try { + console.log('Fetching forum posts '); const page = parseInt(req.query.page) || 0; const limit = parseInt(req.query.limit) || 5; @@ -165,11 +173,10 @@ }); const profane = filter.check(comment.content); - if (profane || !safeWords.includes(comment.content)) { - console.log("not safe words or profanity detected!"); + if (profane) { + console.log('not safe words or profanity detected!'); return res.status(400).json({ error: 'Content contains inappropriate language or is not on topic', }); - } - + } // Store in database using Prisma @@ -202,5 +209,5 @@ const getComments = async (req, res) => { const postId = req.query.post_id; - + console.log('Fetching comments for post_id:', postId); if (!postId) { return res Index: client/src/CreatePost/CreatePost.jsx =================================================================== --- client/src/CreatePost/CreatePost.jsx (revision 2db3b645437625f6d4676b1dc2c1146d7762826f) +++ client/src/CreatePost/CreatePost.jsx (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) @@ -5,13 +5,17 @@ const [title, setTitle] = useState(''); const [content, setContent] = useState(''); + const [error, setError] = useState(''); + const [isSubmitting, setIsSubmitting] = useState(false); const navigate = useNavigate(); const handleSubmit = async (e) => { e.preventDefault(); - + setError(''); + setIsSubmitting(true); const user = JSON.parse(localStorage.getItem('user')); if (!user || !user.id || !user.name) { alert('You must be logged in to create a post.'); + setIsSubmitting(false); navigate('/login'); return; @@ -31,7 +35,7 @@ }), }); - + const data = await response.json(); if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status}`); + throw new Error(data.error || `HTTP error! status: ${response.status}`); } @@ -39,5 +43,7 @@ } catch (error) { console.error('Error creating post:', error); - alert(`Failed to create post: ${error.message}`); + setError(error.message); + } finally { + setIsSubmitting(false); } }; @@ -75,5 +81,5 @@
-
Index: client/src/Register/Register.jsx =================================================================== --- client/src/Register/Register.jsx (revision 2db3b645437625f6d4676b1dc2c1146d7762826f) +++ client/src/Register/Register.jsx (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) @@ -28,7 +28,9 @@ if (!validateEmail(formData.email)) { setError('Email must end with @students.finki.ukim.mk'); + return; } if (formData.username === '') { setError('Must enter username'); + return; } if (formData.password === '') { @@ -72,7 +74,21 @@ const data = await response.json(); if (data.success) { - console.log('Registration successful:', data.user); localStorage.setItem('user', JSON.stringify(data.user)); nav('/dashboard'); + } else { + console.error('Registration failed:', data.message); + + // Handle both username and email duplicate errors + if (data.message === 'Username already in use') { + setError('Username already in use'); + } else if ( + data.message.includes('Email address already registered') || + data.message.includes('email address has already been registered') + ) { + setError('Email already exists'); + } else { + // Generic error + setError(data.message || 'Registration failed'); + } } } catch (error) { Index: client/src/main.jsx =================================================================== --- client/src/main.jsx (revision 2db3b645437625f6d4676b1dc2c1146d7762826f) +++ client/src/main.jsx (revision 16160a4c1d2614a1e39956b2be6205509c92e4cd) @@ -15,21 +15,19 @@ import LeaderBoardEx from './LandingPage/components/LeaderBoardEx'; createRoot(document.getElementById('root')).render( - - - - } /> - } /> - } /> - } /> - } /> - } /> - } - /> - } /> - } /> - - - + + + } /> + } /> + } /> + } /> + } /> + } /> + } + /> + } /> + } /> + + );