Merge branch 'main' into 5-feature-6-study-mode

Author: lucasprates74

.idea/misc.xml

@@ -1,4 +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
+Long Test Set,Insert Generic Description,false,2,Anthony,10,11,12,13,14,15,16,17,18,19,20,21

src/data/FlashcardSets.csv

@@ -1,6 +1,7 @@
 package create_flashcard_set_use_case;
 
 import login_and_signup_use_case.UserLoginResponseModel;
+import view.Screen;
 
 import javax.swing.*;
 import java.awt.*;
@@ -10,7 +11,7 @@
 
 // Frameworks/Drivers (Blue) layer
 
-public class CreationScreen extends JFrame implements ActionListener {
+public class CreationScreen extends Screen implements ActionListener {
     /**
      * The title of the flashcard set chosen by the user
      */

src/main/java/create_flashcard_set_use_case/CreationScreen.java

@@ -40,8 +40,9 @@ public FcCResponseModel create(FcCRequestModel requestModel) {
             return presenter.prepareFailView("Flashcard set does not exist.");
         }
         LocalDateTime creationDate = LocalDateTime.now();
-        FlashcardDsRequestModel flashcard = new FlashcardDsRequestModel(requestModel.getTerm(),
-                requestModel.getDefinition(), creationDate,-1, requestModel.getFlashcardSetId());
+        FlashcardDsRequestModel flashcard = new FlashcardDsRequestModel(
+                requestModel.getTerm().replace("\n", " "),
+                requestModel.getDefinition().replace("\n", " "), creationDate,-1, requestModel.getFlashcardSetId());
         int flashcardId = fcDataAccess.saveFlashcard(flashcard);
         fcsDataAccess.saveFlashcardID(requestModel.getFlashcardSetId(), flashcardId);
 

src/main/java/create_flashcard_use_case/FcCInteractor.java

@@ -4,14 +4,16 @@
 import create_flashcard_use_case.fcCScreens.FcCResponsePresenter;
 import create_flashcard_use_case.fcCScreens.FcCScreen;
 import data_access.*;
+import view.Screen;
+
 import javax.swing.*;
 import java.io.IOException;
 
 /**
  * Main frame for flashcard Creation.
  * @author Junyu Chen
  */
-public class FcCMain extends JFrame {
+public class FcCMain extends Screen {
     /**
      * Create main frame for the flashcard creator.
      * @param flashcardSetId id of the flashcard set which flashcard will be stored in.

src/main/java/create_flashcard_use_case/FcCMain.java

@@ -65,8 +65,8 @@ public FcCScreen(FcCController controller, JFrame fcCMain){
     public void actionPerformed(ActionEvent e) {
         try{
             //Success view.
-            FcCResponseModel responseModel = controller.create(term_text.getText().replace("\n", ""),
-                    definition_text.getText().replace("\n", ""));
+            FcCResponseModel responseModel = controller.create(term_text.getText().replace("\n", " "),
+                    definition_text.getText().replace("\n", " "));
             int action = JOptionPane.showConfirmDialog(this,
                     "Card created:\n"+responseModel.getTerm()+ "\n" + responseModel.getDefinition()
                             +"\ncreate another card?");

src/main/java/create_flashcard_use_case/fcCScreens/FcCScreen.java

@@ -3,6 +3,7 @@
 
 import data_access.DBGateway;
 import login_and_signup_use_case.UserLoginResponseModel;
+import view.Screen;
 
 import javax.swing.*;
 import java.awt.*;
@@ -12,7 +13,7 @@
 
 // Frameworks/Drivers (Blue) layer
 
-public class DeletionScreen extends JFrame implements ActionListener {
+public class DeletionScreen extends Screen implements ActionListener {
     /**
      * The id of the flashcard set to be deleted
      */

src/main/java/delete_flashcard_set_use_case/DeletionScreen.java

@@ -3,13 +3,15 @@
 import data_access.*;
 import delete_flashcard_use_case.FcRScreens.FcRController;
 import delete_flashcard_use_case.FcRScreens.FcRResponsePresenter;
+import view.Screen;
+
 import javax.swing.*;
 import java.io.IOException;
 /**
  * Main frame for flashcard removal.
  * @author Junyu Chen
  */
-public class FcRMain extends JFrame {
+public class FcRMain extends Screen {
     public FcRMain(int flashcardSetId, int flashcardId){
         DBGateway gateway;
         try{

src/main/java/delete_flashcard_use_case/FcRMain.java

@@ -5,10 +5,9 @@
 import edit_flashcard_set_use_case.screens.FCSetEditorScreen;
 import data_access.DBGateway;
 import data_access.entity_request_models.FlashcardSetDsRequestModel;
+import view.Screen;
 
-import javax.swing.*;
-
-public class FCSetEditorMain extends JFrame{
+public class FCSetEditorMain extends Screen {
     /**
      * Creates a new FCSetEditorMain object. This constructor creates the presenter, interactor and controller and
      * uses dependency inversion to follow clean architecture. This constructor makes the flashcard set edit page

src/main/java/edit_flashcard_set_use_case/FCSetEditorMain.java

@@ -5,10 +5,9 @@
 import edit_flashcard_use_case.screens.FlashcardEditorScreen;
 import data_access.*;
 import data_access.entity_request_models.FlashcardDsRequestModel;
+import view.Screen;
 
-import javax.swing.*;
-
-public class FlashcardEditorMain extends JFrame{
+public class FlashcardEditorMain extends Screen {
     /**
      * Creates a new FlashcardEditorMain object. This constructor creates the presenter, interactor and controller and
      * uses dependency inversion to follow clean architecture. This constructor makes the flashcard edit page visible.