|
@ -36,7 +36,7 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
|
|
|
|
|
|
public SignUpGUI() { |
|
|
public SignUpGUI() { |
|
|
setTitle("Sign Up"); |
|
|
setTitle("Sign Up"); |
|
|
setSize(400, 300); // Adjusted size for accommodating more fields |
|
|
|
|
|
|
|
|
setSize(400, 300); |
|
|
setDefaultCloseOperation(EXIT_ON_CLOSE); |
|
|
setDefaultCloseOperation(EXIT_ON_CLOSE); |
|
|
setLayout(null); |
|
|
setLayout(null); |
|
|
|
|
|
|
|
@ -64,7 +64,7 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
confirmPasswordField.setBounds(140, 80, 160, 25); |
|
|
confirmPasswordField.setBounds(140, 80, 160, 25); |
|
|
add(confirmPasswordField); |
|
|
add(confirmPasswordField); |
|
|
|
|
|
|
|
|
JLabel firstNameLabel = new JLabel("First Name:"); // New field for first name |
|
|
|
|
|
|
|
|
JLabel firstNameLabel = new JLabel("First Name:"); |
|
|
firstNameLabel.setBounds(20, 110, 80, 25); |
|
|
firstNameLabel.setBounds(20, 110, 80, 25); |
|
|
add(firstNameLabel); |
|
|
add(firstNameLabel); |
|
|
|
|
|
|
|
@ -72,7 +72,7 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
firstNameField.setBounds(140, 110, 160, 25); |
|
|
firstNameField.setBounds(140, 110, 160, 25); |
|
|
add(firstNameField); |
|
|
add(firstNameField); |
|
|
|
|
|
|
|
|
JLabel surnameLabel = new JLabel("Surname:"); // New field for surname |
|
|
|
|
|
|
|
|
JLabel surnameLabel = new JLabel("Surname:"); |
|
|
surnameLabel.setBounds(20, 140, 80, 25); |
|
|
surnameLabel.setBounds(20, 140, 80, 25); |
|
|
add(surnameLabel); |
|
|
add(surnameLabel); |
|
|
|
|
|
|
|
@ -89,7 +89,7 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
add(birthdayField); |
|
|
add(birthdayField); |
|
|
|
|
|
|
|
|
signUpButton = new JButton("Sign Up"); |
|
|
signUpButton = new JButton("Sign Up"); |
|
|
signUpButton.setBounds(140, 210, 100, 25); // Adjusted position |
|
|
|
|
|
|
|
|
signUpButton.setBounds(140, 210, 100, 25); |
|
|
signUpButton.addActionListener(this); |
|
|
signUpButton.addActionListener(this); |
|
|
add(signUpButton); |
|
|
add(signUpButton); |
|
|
} |
|
|
} |
|
@ -113,6 +113,7 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
JOptionPane.showMessageDialog(this, "Username already exists!", "Sign Up Error", JOptionPane.ERROR_MESSAGE); |
|
|
JOptionPane.showMessageDialog(this, "Username already exists!", "Sign Up Error", JOptionPane.ERROR_MESSAGE); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
UUID randomUUID = UUID.randomUUID(); |
|
|
UUID randomUUID = UUID.randomUUID(); |
|
|
CreateUser user = CreateUser.createUser(randomUUID.toString(), username, password, birthday, firstName, surname); |
|
|
CreateUser user = CreateUser.createUser(randomUUID.toString(), username, password, birthday, firstName, surname); |
|
@ -124,17 +125,18 @@ public class SignUpGUI extends JFrame implements ActionListener { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Function to check if the input username doesn't already exist in the JSON file |
|
|
// Function to check if the input username doesn't already exist in the JSON file |
|
|
private boolean isUsernameAvailable(String filename, String username) { |
|
|
private boolean isUsernameAvailable(String filename, String username) { |
|
|
List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename); |
|
|
List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename); |
|
|
if (userList != null) { |
|
|
if (userList != null) { |
|
|
for (CreateUser user : userList) { |
|
|
for (CreateUser user : userList) { |
|
|
if (user.getUserName().equals(username)) { |
|
|
if (user.getUserName().equals(username)) { |
|
|
return false; // Username already exists |
|
|
|
|
|
|
|
|
return false; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return true; // Username is available |
|
|
|
|
|
|
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
public static void main(String[] args) { |
|
|