Made changes to UserRegistrationUI and UserVerificationUI the only issues that remain are related to persistance, sometimes the accounts are not saved, other times they are.

Author: Madhavan7

src/main/java/UserRegistrationUI.java

@@ -8,7 +8,7 @@
 
 public class UserRegistrationUI implements UserRegistrationUseCase, ActionListener {
     private final UserDatabase database;
-
+    private JLabel registrationSuccess;
     private JTextField usernameText;
     private JTextField passwordText;
     private JTextField emailText;
@@ -18,12 +18,16 @@ public class UserRegistrationUI implements UserRegistrationUseCase, ActionListen
 
     public UserRegistrationUI(UserDatabase database) {
         this.database = database;
-        code = new Random().nextInt(1244254);
+        /*TODO: For now the code is 389 for testing purposes, but once UserVerificationUI.sendVerificationCode() is
+            implemented this will be a random integer.
+        */
+        /*code = new Random().nextInt(1244254);*/
+        code = 389;
     }
     void GetUserCredentials(){
         //Front end related objects
         JFrame registerFrame = new JFrame();
-        registerFrame.setSize(300, 300);
+        registerFrame.setSize(500, 300);
         registerFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         JPanel registerPanel = new JPanel();
         registerFrame.add(registerPanel);
@@ -62,25 +66,26 @@ void GetUserCredentials(){
         register.addActionListener(this);
         registerPanel.add(register);
 
-
+        //Success/Failure Label
+        registrationSuccess = new JLabel("");
+        registrationSuccess.setBounds(10, 140, 350, 25);
+        registerPanel.add(registrationSuccess);
 
         registerFrame.setVisible(true);
     }
     @Override
     public void registerUser(String username, String password, String email) {
         if(database.UserExists(username, email)){
-            //Will change below to be a label
-            System.out.println("The username or password is already in use, please try again");
+            registrationSuccess.setText("The username or password is already in use, please try again");
         }else{
             database.createUser(username, password, email, "Basic");
-            //Will change below to be a label
-            System.out.println("Your account has been created, please verify to login");
+            registrationSuccess.setText("Your account has been created, please verify to login");
             UserVerificationUI verifyUser = new UserVerificationUI(code);
             verifyUser.sendVerificationCode(email);
             verifyUser.verify(email);
         }
     }
-
+    //For Testing purposes
     public static void main(String[] args){
         UserDatabase testDB = new UserDatabase(new File("TestUserDatabase2.csv"));
         System.out.println(testDB.UserExists("RandomUser", "[email protected]"));

src/main/java/UserVerificationUI.java

@@ -6,10 +6,13 @@ public class UserVerificationUI implements UserVerifier, ActionListener {
     Random random;
     private final int code;
     private JTextField verificationCodeText;
+    private JLabel success;
 
     public UserVerificationUI(int code){
         this.code = code;
     }
+
+    //Asks for the verification code from the user, and matches it with this.code to potentially verify the user
     public void verify(String email){
         //Creating the UI to input the verification code
         JFrame verificationFrame = new JFrame();
@@ -27,32 +30,38 @@ public void verify(String email){
         verificationPanel.add(verificationLabel);
         verificationPanel.add(verificationCodeText);
 
+        //Success/Failure Labels
+        success = new JLabel("");
+        success.setBounds(10, 50, 100, 25);
+        verificationPanel.add(success);
+
         JButton verifyButton = new JButton("verify");
         verifyButton.setBounds(125, 50, 100, 25);
         verificationPanel.add(verifyButton);
         verifyButton.addActionListener(this);
         verificationFrame.setVisible(true);
     }
-
+    //Sends this.code to the email address given by String email
     public void sendVerificationCode(String email){
-        //When this is implemented, a verification code(this.code) will be sent to email with email address "email",
-        //The code will be a random number that is generated, when the user presses the register
-        // button(see UserRegistrationUI).
+        /*TODO: When this is implemented, a verification code(this.code) will be sent to email with email address "email",
+           The code will be a random number that is generated, when the user presses the register
+           button(see UserRegistrationUI).*/
     }
-    public static void main(String[] args){
+
+    //For testing purposes
+    /*public static void main(String[] args){
         UserVerificationUI ver = new UserVerificationUI(389);
         ver.verify("abc");
-    }
+    }*/
 
     @Override
     public void actionPerformed(ActionEvent e) {
         int verCode = Integer.parseInt(verificationCodeText.getText());
         if(code == verCode){
-            //Going to change below to a label, and will link to LoginUI
-            System.out.println("verified");
+            //TODO: Going to change below to a label, and will link to LoginUI
+            success.setText("verified!");
         }else{
-            //Going to change below to a label
-            System.out.println("verification unsuccessful");
+            success.setText("Try again");
         }
     }
 }