saving progress

emmanueposu · May 26, 2024 · 37f7dd6 · 37f7dd6
1 parent 4d06733
commit 37f7dd6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/trivia-forge/frontend/src/Components/Nav.jsx b/trivia-forge/frontend/src/Components/Nav.jsx
@@ -29,10 +29,10 @@ function Navigation() {
                     <Nav.Link href="/triviaGen">Create New Trivia</Nav.Link>
                     <Nav.Link href="/myTrivia">My Trivia</Nav.Link>
                 </Nav>
-                <Nav style={{marginRight: ".5rem"}}>
+                <Nav style={{ marginRight: ".5rem" }}>
                     {currentUser ? (
                         <Button onClick={handleLogout}>
-                            <i className="bi bi-person-circle" style={{ marginRight: ".5rem" }}></i>Logout
+                            <i className="bi bi-person-circle" style={{ marginRight: ".5rem" }}></i>Logout: {currentUser.username}
                         </Button>
                     ) : (
                         <Button onClick={handleShow}>

diff --git a/trivia-forge/frontend/src/Pages/MyTrivia.jsx b/trivia-forge/frontend/src/Pages/MyTrivia.jsx
@@ -35,7 +35,8 @@ function MyTrivia() {
 
     // fetch game with details when the user changes
     useEffect(() => {
-        if (currentUser && !loaded) {
+        console.log("loaded:", loaded)
+        if (currentUser && loaded === false) {
             setLoaded(true);
             //console.log("calling getGamesWithDetails");
             getGamesWithDetails(currentUser.id).then(res => {

diff --git a/trivia-forge/frontend/src/Pages/TriviaReviewPage.jsx b/trivia-forge/frontend/src/Pages/TriviaReviewPage.jsx
@@ -19,9 +19,10 @@ function TriviaReviewPage() {
 		navigate('/myTrivia');
 	};
 
-	const HandleCreateGame = () => {
-		AddAllForGame(game);
+	const HandleCreateGame = async () => {
+		await AddAllForGame(game);
 		navigate('/myTrivia');
+
 	};
 
 	return (

diff --git a/trivia-forge/frontend/src/Services/Services.jsx b/trivia-forge/frontend/src/Services/Services.jsx
@@ -26,30 +26,30 @@ import { Choice } from '../Models/Choice';
 export const AddAllForGame = async (game) => {
     try {
         // Add the game to the database
-        console.log("Adding game:", game);
+        //console.log("Adding game:", game);
         const newGame = await db.addGame(game);
-        console.log("Added game with ID:", newGame.id);
+        //console.log("Added game with ID:", newGame.id);
 
         // Process each category in the game's categories
         for (const category of game.categories) {
             category.gameID = newGame.id; // Link category to the game
-            console.log("Adding category:", category);
+            //console.log("Adding category:", category);
             const newCategory = await db.addCategory(category);
-            console.log("Added category with ID:", newCategory.id);
+            //console.log("Added category with ID:", newCategory.id);
 
             // Process each question in the category's questions
             for (const question of category.questions) {
                 question.categoryID = newCategory.id; // Link question to the category
-                console.log("Adding question:", question);
+                //console.log("Adding question:", question);
                 const newQuestion = await db.addQuestion(question);
-                console.log("Added question with ID:", newQuestion.id);
+                //console.log("Added question with ID:", newQuestion.id);
 
                 // Process each choice in the question's choices
                 for (const choice of question.choices) {
                     choice.questionID = newQuestion.id; // Link choice to the question
-                    console.log("Adding choice:", choice);
+                    //console.log("Adding choice:", choice);
                     const newChoice = await db.addChoice(choice);
-                    console.log("Added choice with ID:", newChoice.id);
+                    //console.log("Added choice with ID:", newChoice.id);
                 }
             }
         }

diff --git a/trivia-forge/frontend/src/Services/TF-db_services.jsx b/trivia-forge/frontend/src/Services/TF-db_services.jsx
@@ -153,11 +153,11 @@ export const getQuestion = async (question) => {
 };
 
 export const addQuestion = async (question) => {
-    console.log("questionCategoryID:", question.categoryID)
+    //console.log("questionCategoryID:", question.categoryID)
     let newQuestion = new Question(question.question, question.answer, question.hint, question.multipleChoice, question.categoryID);
     try {
         const response = await axios.post(`${API_URL}/questions`, newQuestion.toJsonObject());
-        console.log("question:", newQuestion.toJsonObject())
+        //console.log("question:", newQuestion.toJsonObject())
         return response.data;
     } catch (error) {
         console.error('Failed to add question');
@@ -278,7 +278,7 @@ export const getChoice = async (choice) => {
 
 export const addChoice = async (choice) => {
     let newChoice = new Choice(choice.text, choice.questionID);
-    console.log("newChoice:", newChoice.toJsonObject())
+    //console.log("newChoice:", newChoice.toJsonObject())
     try {
         const response = await axios.post(`${API_URL}/choices`, newChoice.toJsonObject());
         return response.data;