Merge pull request #66 from CSC207-2022F-UofT/Anthony's_Branch

Quiz GUI updates and bug fixes

Author: anthony-chen-ca

.idea/misc.xml

@@ -1,3 +1,4 @@
 title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
 test set 1,for testing study use case,false,0,testUser,0,1,2,3
 empty test set,for testing study use case with empty set,true,1,testUser
+Long Test Set,Insert Generic Description,false,2,testUser,10,11,12,13,14,15,16,17,18,19,20,21

.idea/vcs.xml

@@ -3,3 +3,15 @@ test card 1,the first test card,2022-11-13T15:32:26.666982800,0,0
 test card 2,the second test card,2022-11-13T15:32:27.666982800,1,0
 test card 3,the third test card,2022-11-13T15:32:28.666982800,2,0
 alphabetical order checker,to test if alphabetical order is working,2022-11-13T15:32:29.666982800,3,0
+Term A,Definition A,2022-11-13T15:32:26.666982800,10,2
+Term B,Definition B,2022-11-13T15:32:27.666982800,11,2
+Term C,Definition C,2022-11-13T15:32:28.666982800,12,2
+Term D,Definition D,2022-11-13T15:32:29.666982800,13,2
+Term E,Definition E,2022-11-13T15:32:29.666982800,14,2
+Term F,Definition F,2022-11-13T15:32:29.666982800,15,2
+Term G,Definition G,2022-11-13T15:32:29.666982800,16,2
+Term H,Definition H,2022-11-13T15:32:29.666982800,17,2
+Term I,Definition I,2022-11-13T15:32:29.666982800,18,2
+Term J,Definition J,2022-11-13T15:32:29.666982800,19,2
+Same Term,Same Definition,2022-11-13T15:32:29.666982800,20,2
+Same Term,Same Definition,2022-11-13T15:32:29.666982800,21,2

src/data/FlashcardSets.csv

@@ -1,4 +1,5 @@
 username,password,isAdmin,flashcardSetIds
 jempio,ilovejempio,false
 ducas,badpassword,false
+Anthony,123456,false,2
 testUser,password,false,0,1

src/data/Flashcards.csv

@@ -1,6 +1,10 @@
 import com.formdev.flatlaf.FlatDarculaLaf;
 
+import dataAccess.*;
 import login_and_signup_use_case.login_and_signup_use_case_screens.WelcomeScreen;
+import quiz_use_case.*;
+import quiz_use_case.screens.QuizSettingsScreen;
+
 import java.io.IOException;
 
 /**
@@ -11,6 +15,19 @@ public static void main(String[] args) throws IOException {
         // ONLY UNCOMMENT ONE THEME!!
         // FlatIntelliJLaf.setup(); // light mode
         FlatDarculaLaf.setup(); // dark mode
+        
         new WelcomeScreen();
+
+        // WILL DELETE THIS CODE SECTION AFTER I FINISH TESTING - Anthony
+        // IFlashcardSetDataAccess flashcardSetDataAccess = new FlashcardSetDataAccess(DBGateway.getFlashcardSetPath());
+        // IFlashcardDataAccess flashcardDataAccess = new FlashcardDataAccess(DBGateway.getFlashcardPath());
+        // IUserDataAccess userDataAccess = new CommonUserDataAccess(DBGateway.getUserPath());
+        // DBGateway gateway = new DBGateway(flashcardDataAccess, flashcardSetDataAccess, userDataAccess);
+
+        // QuizOutputBoundary presenter = new QuizPresenter();
+        // QuizInputBoundary interactor = new QuizInteractor(gateway, presenter);
+        // QuizController controller = new QuizController(interactor);
+
+        // new QuizSettingsScreen(controller, 2);
     }
 }

src/data/Users.csv

@@ -4,8 +4,8 @@
 import dataAccess.DBGateway;
 import delete_flashcardset_use_case.*;
 import login_and_signup_use_case.UserLoginResponseModel;
-import quizUseCase.*;
-import quizUseCase.screens.QuizSettingsScreen;
+import quiz_use_case.*;
+import quiz_use_case.screens.QuizSettingsScreen;
 import studyMode.*;
 import studyMode.screens.StudySettingsScreen;