Made changes to the UI so that it looks better

Author: Madhavan7

src/main/java/entities/user_entities/User.java

@@ -3,15 +3,14 @@
 import data_access.UserDatabase;
 import entities.chat.Chat;
 import interface_adapters.profile_modification_IA.UserAuthenticationI;
-import interface_adapters.login_interface_adapters.Login;
 import use_cases.user_attribute_modification_use_case.Changeable;
 import interface_adapters.appscreen.UserAppScreenGateway;
+import use_cases.user_login_use_cases.Loginable;
 
-import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-public abstract class User implements Serializable, Changeable, Login, UserAuthenticationI {
+public abstract class User implements Serializable, Changeable, Loginable, UserAuthenticationI {
     protected String username;
     protected String password;
     protected String email;

src/main/java/screens/login_screen/UserLoginUI.java

@@ -53,14 +53,14 @@ public void getLoginCredentials(){
     public void cannotVerify() {
         JFrame cannotVerifyFrame = new JFrame();
         cannotVerifyFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        cannotVerifyFrame.setSize(300, 200);
+        cannotVerifyFrame.setSize(400, 100);
         JPanel cannotVerifyPanel = new JPanel();
         cannotVerifyPanel.setLayout(null);
         cannotVerifyFrame.add(cannotVerifyPanel);
 
-        JLabel accountExists = new JLabel("The verification code you have entered is incorrect, please try again");
-        accountExists.setBounds(10, 150, 200, 30);
-
+        JLabel cannotVerifyLabel = new JLabel("Incorrect verification code, please try again");
+        cannotVerifyLabel.setBounds(10, 25, 350, 30);
+        cannotVerifyPanel.add(cannotVerifyLabel);
         cannotVerifyFrame.setVisible(true);
 
     }

src/main/java/screens/user_registration_screen/UserRegistrationUI.java

@@ -16,7 +16,10 @@ public class UserRegistrationUI implements ActionListener, userRegCredentialsRet
     private JTextField usernameText;
     private JTextField passwordText;
     private JTextField emailText;
-
+    /*
+    currently the below variable is not used, because only email verification is implemented, but it may be used in
+    the future.
+    */
     private JTextField deliveryText;
 
     public UserRegistrationUI(UserExistsInputBoundary verifyUser) {
@@ -26,7 +29,7 @@ public UserRegistrationUI(UserExistsInputBoundary verifyUser) {
     public void getUserCredentials(){
         //Front end related objects
         JFrame registerFrame = new JFrame();
-        registerFrame.setSize(500, 300);
+        registerFrame.setSize(400, 200);
         registerFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         JPanel registerPanel = new JPanel();
         registerFrame.add(registerPanel);
@@ -60,11 +63,11 @@ public void getUserCredentials(){
         registerPanel.add(emailText);
 
         //The textbox for entering verification path
-        JLabel deliveryLabel = new JLabel("Choose verification Path(0 for email, 1 for phone)");
-        deliveryLabel.setBounds(10, 115, 200, 25);
+        JLabel deliveryLabel = new JLabel("Choose verification Path(0 for email, 1 for phone):");
+        deliveryLabel.setBounds(10, 115, 400, 25);
 
         deliveryText = new JTextField(20);
-        deliveryText.setBounds(100, 110, 50, 25);
+        deliveryText.setBounds(320, 115, 50, 25);
         registerPanel.add(deliveryLabel);
         registerPanel.add(deliveryText);
 
@@ -77,19 +80,37 @@ public void getUserCredentials(){
     }
 
     public static void main(String[] args){
-        Database testDB = new UserDatabase(new File("test20123"));
+        //Testing purposes
+        Database testDB = new UserDatabase(new File("test301"));
         UserExistsInputBoundary interactor = new UserExistsInteractor(testDB);
         new UserRegistrationUI(interactor).getUserCredentials();
     }
     @Override
     public void actionPerformed(ActionEvent e) {
-        //Need if statements for cases
         String username = usernameText.getText();
         String password = passwordText.getText();
         String email = emailText.getText();
-        String type = deliveryText.getText();
 
-        verifyUser.setCodeDeliveryMethod(type);
-        verifyUser.register(username, password, email);
+        if(username.equals("")|| password.equals("")|| email.equals("")){
+            missingCredentials();
+        }else{
+            //currently only email verification is enabled.
+            verifyUser.setCodeDeliveryMethod("Email");
+            verifyUser.register(username, password, email);
+        }
+    }
+
+    public void missingCredentials(){
+        JFrame credentialsMissing = new JFrame();
+        credentialsMissing.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        credentialsMissing.setSize(210, 100);
+        JPanel CredentialsMissingPanel = new JPanel();
+        CredentialsMissingPanel.setLayout(null);
+        credentialsMissing.add(CredentialsMissingPanel);
+
+        JLabel accountExists = new JLabel("Missing required information");
+        accountExists.setBounds(10, 20, 350, 30);
+        CredentialsMissingPanel.add(accountExists);
+        credentialsMissing.setVisible(true);
     }
 }

src/main/java/screens/user_registration_screen/UserVerificationScreen.java

@@ -19,22 +19,22 @@ public UserVerificationScreen(UserVerificationInputBoundary verificationInputBou
     @Override
     public void getVerificationCredentials() {
         JFrame verificationFrame = new JFrame();
-        verificationFrame.setSize(400, 300);
+        verificationFrame.setSize(250, 200);
         verificationFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         JPanel verificationPanel = new JPanel();
         verificationPanel.setLayout(null);
         verificationFrame.add(verificationPanel);
 
-        JLabel verificationLabel = new JLabel("Enter the verification code");
-        verificationLabel.setBounds(10, 100, 200, 25);
+        JLabel verificationLabel = new JLabel("Enter the verification code:");
+        verificationLabel.setBounds(20, 30, 200, 25);
         verificationPanel.add(verificationLabel);
 
-        verText.setBounds(10, 150, 200, 25);
+        verText.setBounds(10, 60, 200, 25);
         verificationPanel.add(verText);
 
         JButton verifyButton = new JButton("verify");
         verifyButton.addActionListener(this);
-        verifyButton.setBounds(50, 180, 150, 30);
+        verifyButton.setBounds(50, 90, 150, 30);
         verificationPanel.add(verifyButton);
         verificationFrame.setVisible(true);
     }
@@ -43,13 +43,13 @@ public void getVerificationCredentials() {
     public void presentUserExistsMessage() {
         JFrame userExistsFrame = new JFrame();
         userExistsFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        userExistsFrame.setSize(300, 200);
+        userExistsFrame.setSize(400, 100);
         JPanel userExistsPanel = new JPanel();
         userExistsPanel.setLayout(null);
         userExistsFrame.add(userExistsPanel);
 
         JLabel accountExists = new JLabel("A user with this email or username already exists");
-        accountExists.setBounds(10, 150, 200, 30);
+        accountExists.setBounds(10, 25, 350, 30);
         userExistsPanel.add(accountExists);
         userExistsFrame.setVisible(true);
     }

src/main/java/use_cases/user_login_use_cases/Loginable.java

@@ -1,6 +1,5 @@
 package use_cases.user_login_use_cases;
 
-import interface_adapters.profile_modification_IA.UserAuthenticationI;
 
 public interface Loginable {
     void login();

src/main/java/use_cases/user_login_use_cases/UserLoginInteractor.java

@@ -14,15 +14,16 @@ public UserLoginInteractor(Database database){
 
     @Override
     public void tryLogin() {
-        //TODO: complete this method and UserLoginOutputBoundary
         try{
+            //TODO: issues here with serialization
             user = database.getUser(username);
             if(user.PasswordMatch(this.password)){
                 user.login();
             }else{
                 System.out.println("the password or username is incorrect");
             }
         }catch(NullPointerException e){
+            //TODO: implement login output boundary
             System.out.println("An account with these credentials do not exist");
         }
 

src/main/java/use_cases/user_registration_use_cases/UserExistsInteractor.java

@@ -19,13 +19,12 @@ public UserExistsInteractor(Database database){
         this.verificationInputBoundary = new UserVerificationInteractor(database);
         this.code = new Random().nextInt(1321512);
         verificationInputBoundary.setCode(code);
-
+        this.existsOutputBoundary = new UserVerificationScreen(verificationInputBoundary);
     }
     @Override
     public void register(String username, String password, String email) {
         if(!database.UserExists(username, email)){
             verificationInputBoundary.setCredentials(username, password, email);
-            this.existsOutputBoundary = new UserVerificationScreen(verificationInputBoundary);
             existsOutputBoundary.getVerificationCredentials();
             codeMailMan.sendVerificationCode(email, code);
         }else{