Index: backend/controllers/apiController.js =================================================================== --- backend/controllers/apiController.js (revision 801dc85b1cea6bb56d6b4c33390030636f6387a4) +++ backend/controllers/apiController.js (revision bbd9b616956a36b9f572196f4654f9096ae0ab34) @@ -19,5 +19,5 @@ }, ]); - return { data, error }; + return { studentInstance, error }; } Index: backend/models/Student.js =================================================================== --- backend/models/Student.js (revision 801dc85b1cea6bb56d6b4c33390030636f6387a4) +++ backend/models/Student.js (revision bbd9b616956a36b9f572196f4654f9096ae0ab34) @@ -13,4 +13,21 @@ this.isModerator = false; } + toJSON() { + return { + id: this.id, + username: this.username, + email: this.email, + // Add other fields you want to include: + name: this.name, + solvedProblems: this.solvedProblems, + rank: this.rank, + points: this.points, + commentCounter: this.commentCounter, + commentCheckCounter: this.commentCheckCounter, + postCounter: this.postCounter, + postCheckCounter: this.postCheckCounter, + isModerator: this.isModerator, + }; + } } Index: client/src/Dashboard/Dashboard.jsx =================================================================== --- client/src/Dashboard/Dashboard.jsx (revision 801dc85b1cea6bb56d6b4c33390030636f6387a4) +++ client/src/Dashboard/Dashboard.jsx (revision bbd9b616956a36b9f572196f4654f9096ae0ab34) @@ -1,22 +1,22 @@ -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 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 Task from './components/Task'; +import LeaderBoardEx from '@/LandingPage/components/LeaderBoardEx'; +import Forum from './components/Forum'; +import Profile from './components/Profile'; const Dashboard = () => { - const [activePage, setActivePage] = useState("home"); + const [activePage, setActivePage] = useState('home'); const [user, setUser] = useState(null); const navigate = useNavigate(); useEffect(() => { - const storedUser = localStorage.getItem("user"); + const storedUser = localStorage.getItem('user'); if (!storedUser) { - navigate("/login"); + navigate('/login'); } else { setUser(JSON.parse(storedUser)); @@ -26,11 +26,11 @@ const renderPage = () => { switch (activePage) { - case "home": + case 'home': return ; - case "competitions": + case 'competitions': return ; - case "leaderboard": + case 'leaderboard': return ; - case "profile": + case 'profile': return ; default: @@ -65,9 +65,9 @@ Index: client/src/Register/Register.jsx =================================================================== --- client/src/Register/Register.jsx (revision 801dc85b1cea6bb56d6b4c33390030636f6387a4) +++ client/src/Register/Register.jsx (revision bbd9b616956a36b9f572196f4654f9096ae0ab34) @@ -1,18 +1,18 @@ -import React from "react"; -import { Link, useNavigate } from "react-router-dom"; -import { useState } from "react"; +import React from 'react'; +import { Link, useNavigate } from 'react-router-dom'; +import { useState } from 'react'; const Register = () => { - const [error, setError] = React.useState(""); + const [error, setError] = React.useState(''); const nav = useNavigate(); const [formData, setFormData] = useState({ - username: "", - email: "", - password: "", - confirmPassword: "", - name: "", + username: '', + email: '', + password: '', + confirmPassword: '', + name: '', }); function validateEmail(email) { - return email.endsWith("@students.finki.ukim.mk"); + return email.endsWith('@students.finki.ukim.mk'); } const handleInputChange = (e) => { @@ -27,38 +27,38 @@ if (!validateEmail(formData.email)) { - setError("Email must end with @students.finki.ukim.mk"); + setError('Email must end with @students.finki.ukim.mk'); } - if (formData.username === "") { - setError("Must enter username"); + if (formData.username === '') { + setError('Must enter username'); } - if (formData.password === "") { - setError("Password is required"); + if (formData.password === '') { + setError('Password is required'); return; } - if (formData.confirmPassword === "") { - setError("Please confirm your password"); + if (formData.confirmPassword === '') { + setError('Please confirm your password'); return; } if (formData.password !== formData.confirmPassword) { - setError("Passwords do not match"); + setError('Passwords do not match'); return; } if (formData.password.length < 8) { - setError("Password must be at least 8 characters long"); + setError('Password must be at least 8 characters long'); return; } if (!/[A-Z]/.test(formData.password)) { - setError("Password must contain at least one uppercase letter"); + setError('Password must contain at least one uppercase letter'); return; } if (!/[0-9]/.test(formData.password)) { - setError("Password must contain at least one number"); + setError('Password must contain at least one number'); return; } try { - const response = await fetch("/api/register", { - method: "POST", + const response = await fetch('/api/register', { + method: 'POST', headers: { - "Content-Type": "application/json", + 'Content-Type': 'application/json', }, body: JSON.stringify({ @@ -72,9 +72,10 @@ const data = await response.json(); if (data.success) { - localStorage.setItem("user", JSON.stringify(data.user)); - nav("/dashboard"); + console.log('Registration successful:', data.user); + localStorage.setItem('user', JSON.stringify(data.user)); + nav('/dashboard'); } } catch (error) { - console.error("Registration error:", error); + console.error('Registration error:', error); throw error; }