Merge branch 'master' of https://github.com/YuStudy-Inc/QuizSlayer

Author: Nickthecan

Backend/config/DatabaseConnection.js

@@ -1,6 +1,7 @@
 import mongoose from 'mongoose';
 // Uses path of first file to import (should be server.js)
-//import dotenv from 'dotenv';
+// import dotenv from 'dotenv';
+// dotenv.config();
 //dotenv.config({path: 'Backend/.env'});
 
 // const DatabaseConnection = async () => {

Backend/controllers/quizController.js

@@ -56,11 +56,14 @@ export const deleteQuiz = async(req, res) => {
         const quizId = req.body.quizId
         console.log(quizId)
 
+        await Question.deleteMany({ quizId: quizId })
+
         const deletedQuiz = await Quiz.findByIdAndDelete(quizId);
         if (!deletedQuiz) {
             res.status(500).json({error: "Quiz was not found"})
             return;
         }
+
         res.status(200).json({message: 'Quiz deleted successfullly' }) 
     }
     catch(err){
@@ -115,4 +118,35 @@ export const getQuestionsFromQuiz = async(req, res) => {
         console.log(e)
         res.status(500).json({error: "Error finding questions for that quiz"})
     }
-}
+}
+export const getFinishedQuizzes = async(req, res) => {
+    try {
+        const userId = req.params.id
+        const quizzesFinished = await Quiz.find({user: userId, completed: true})
+        res.status(200).json({quizzesFinished})
+    } catch (e) {
+        res.status(500).json({error: 'Error retreiving quizzes under TODO status'})
+        console.log(e)
+    }
+}
+export const updateFinished = async (req, res) => {
+    try {
+        const userId = req.params.id;
+        const quizId = req.body.quizId;
+
+        const updatedQuiz = await Quiz.findOneAndUpdate(
+            { _id: quizId, user: userId },
+            { $set: { completed: true } },
+            { new: true }
+          );
+          console.log(updatedQuiz);
+        if (!updatedQuiz) {
+            return res.status(404).json({ error: 'Quiz not found or does not belong to the user' });
+        }
+
+        res.status(200).json({ message: 'Quiz marked as completed', quiz: updatedQuiz });
+    } catch (e) {
+        console.error(e);
+        res.status(500).json({ error: 'Error updating quiz completion status' });
+    }
+};

Backend/controllers/userController.js

@@ -21,7 +21,6 @@ const passwordMatch = (async(passwordFromUser, savedPasswordFromDB) => {
 //     const active = user.isOnline;
 //     return await User.findOneAndUpdate({ username: user.username }, { isOnline: !active })
 // })
-
 export const getUser = async(req, res) => {
     try {
         const userId = req.session.userID;
@@ -71,8 +70,7 @@ export const createUser = async(req, res) => {
             username,
             email,
             password: hashedPassword,
-            isOneline: true,
-            pfp: "", //pfp string url, save a temp one for now after creation
+            isOneline: true, //got rid of pfp so it uses the default values
             description: "", //description, empty for now (could default to "" in the schema)
             friendsList: [],
             friendRequest: [],
@@ -485,7 +483,7 @@ export const acceptFriendRequest = async(req, res) => {
 export const rejectFriendRequest = async(req, res) => {
     try {
         const userId = req.params.id
-        const user = await User.findByid(userId)
+        const user = await User.findById(userId)
 
         const otherUser = req.body.friendId;
         const rejectingUser = await User.findById(otherUser);
@@ -499,6 +497,10 @@ export const rejectFriendRequest = async(req, res) => {
             return;
         }
 
+        if (!user.friendRequests.includes(otherUser)) {
+            return res.status(400).json({ message: "No such friend request exists" });
+        }
+
         user.friendRequests.pull(rejectingUser._id);
         await user.save()
         res.status(200).json({message: 'Friend request rejected!'})
@@ -577,4 +579,22 @@ export const updateUsersCoins = async (req, res) => {
     catch (e) {
         res.status(500).json({error: "error fetching user's coins"})
     }
+}
+export const updateUserMonstersSlain = async(req, res) =>{
+    try{
+        const userId = req.params.id;
+        const monstersSlain = req.body.monstersSlain;
+        const user = await User.findById(userId).select("monstersSlain");
+        if (!user) {
+            res.status(404).json({error: "user doesn't exist"})
+            return
+        }
+        const adjust = user.monstersSlain + monstersSlain;
+        const updatedUsers = await User.findByIdAndUpdate(userId, { monstersSlain : adjust }, { new: true }).select("monstersSlain")
+        await updatedUsers.save();
+        res.status(200).json({ monstersSlain: updatedUsers.monstersSlain })
+    }
+    catch(e){
+        res.status(500).json({error: "error updating user's monsters slain"});
+    }
 }

Backend/routes/quizRoutes.js

@@ -1,15 +1,17 @@
 import express from 'express'
-import { createQuiz, editQuiz, deleteQuiz, getQuiz, getQuizzes, getToDoQuizzes, getQuestionsFromQuiz } from '../controllers/quizController.js'
+import { createQuiz, editQuiz, deleteQuiz, getQuiz, getQuizzes, getToDoQuizzes, getQuestionsFromQuiz, updateFinished, getFinishedQuizzes } from '../controllers/quizController.js'
 
 const router = express.Router();
 
 /* router.get('/getQuizzes', getQuizzesFromUserID) */
 router.post('/createQuiz', createQuiz)
 router.put('/editQuiz/:id', editQuiz)
+router.put('/quizFinished/:id', updateFinished)
 router.delete('/deleteQuiz', deleteQuiz)
 router.get('/getQuiz/:id', getQuiz)
 router.get('/getQuizzes/:id', getQuizzes)
 router.get('/getToDoQuizzes/:id', getToDoQuizzes)
+router.get('/getFinishedQuizzes/:id', getFinishedQuizzes)
 router.get('/getQuestionsFromQuiz/:id', getQuestionsFromQuiz)
 router.get('/', (req, res) => {
     res.send('Users route works!');

Backend/routes/userRoutes.js

@@ -2,7 +2,8 @@ import express from 'express';
 import { createUser, loginUser, editUser, editUserPassword, deleteUser, getUser, getUsername, getDescription, 
   getActiveFriends, getFriends, getCharacterList, getInventory, getTop10, 
   getFriendRequests, acceptFriendRequest, rejectFriendRequest, sendFriendRequest, updateSelections,
-  getAICreations, increaseAICreations, getUsersCoins, updateUsersCoins, addCharacterToList, addItemToInventory } from '../controllers/userController.js';
+  getAICreations, increaseAICreations, getUsersCoins, updateUsersCoins, addCharacterToList, addItemToInventory, 
+  updateUserMonstersSlain} from '../controllers/userController.js';
 
 const router = express.Router();
 router.post('/createUser', createUser);
@@ -29,6 +30,7 @@ router.get('/getUsersCoins/:id', getUsersCoins)
 router.put('/updateCoins/:id', updateUsersCoins)
 router.put('/addCharacter/:id', addCharacterToList)
 router.put('/addItem/:id', addItemToInventory)
+router.put('/updateMonstersSlain/:id', updateUserMonstersSlain)
 
 /* router.get('/getFriends/:id', getFriendsFromUserID) */
 router.get('/', (req, res) => {

Frontend/.env

@@ -1,2 +1,4 @@
 VITE_APP_URI=https://00qy8vpnab.execute-api.us-east-1.amazonaws.com/
-GAME_URI=https://quizslayergame.s3.us-east-1.amazonaws.com/QuizSlayerBuild/index.html?sessionId
+VITE_GAME_URI=https://quizslayergame.s3.us-east-1.amazonaws.com/index.html
+
+

Frontend/.env.development

@@ -1,3 +1,4 @@
-# VITE_APP_URI=https://00qy8vpnab.execute-api.us-east-1.amazonaws.com/
-VITE_APP_URI=http://localhost:3000/
-VITE_GAME_URI=https://quizslayergame.s3.us-east-1.amazonaws.com/QuizSlayerBuild/index.html?sessionId
+VITE_APP_URI=https://00qy8vpnab.execute-api.us-east-1.amazonaws.com/
+VITE_GAME_URI=https://quizslayergame.s3.us-east-1.amazonaws.com/index.html
+
+

Frontend/src/Components/Home/FriendRequest.jsx

@@ -25,6 +25,7 @@ const FriendRequest = ({ index, friendId, incomingFriendPfp, incomingFriendName,
     }
 
     const reject = async () => {
+        console.log(friendId)
         try {
             const response = await axios.put(`${URI}users/rejectFriendRequest/${userId}`, {
                 friendId: friendId

Frontend/src/Components/Home/Notifications.jsx

@@ -18,7 +18,7 @@ const Notifications = () => {
                 })
                 if (response.status === 200) {
                     setFriendRequestList(response.data.friendRequests)
-                    console.log(response.data)
+                    console.log(response.data.friendRequests)
                 }
             }
             catch (e) {
@@ -32,7 +32,7 @@ const Notifications = () => {
     return(
         <>
             <div className="notifications-container">
-                {friendRequestList.map((friendRequest, index) => (
+                {Array.isArray(friendRequestList) && friendRequestList.map((friendRequest, index) => (
                     <FriendRequest key={index} index={index} friendId={friendRequest._id} incomingFriendPfp={FriendRequest.pfp} incomingFriendName={friendRequest.username} friendRequestList={friendRequestList} setFriendRequestList={setFriendRequestList}/>
                 ))}
             </div>

Frontend/src/Components/LandingPage/LandingPageAboutUs.jsx

@@ -13,9 +13,9 @@ const LandingPageAboutUs = () => {
                     </div>
                     <div className="about-us-words">
                         <h1 className="about-us-title">About Us</h1>
-                        <p>QuizSlayer is an interactive study app that turns your studying into an adventure. 
-                            Create flashcards on your own or through AI features and test your knowledge in an idle fighting game. Win battles, earn prizes. 
-                            Compete against friends or against others to the be the best adventurer there is!!!</p>
+                        <p>QuizSlayer is an interactive study app that turns your studying into an adventure.
+                            Create flashcards on your own or through AI features and test your knowledge in an idle fighting game. 
+                            Win battles, earn prizes. Compete against friends or against others to the be the best adventurer there is!!!</p>
                     </div>
                 </div>
             </div>