Skip to content

Commit 4a67da6

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 3deda77 + 091b666 commit 4a67da6

File tree

3 files changed

+42
-2
lines changed

3 files changed

+42
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.awt.event.ActionEvent;
99
import java.awt.event.ActionListener;
1010
import java.io.File;
11-
11+
/** This is the screen on which the user enters his credentials in order to login **/
1212
public class UserLoginUI implements ActionListener {
1313

1414
private JTextField credentialText;
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package screens.user_registration_screen;
2+
3+
import data_access.UserDatabase;
4+
import screens.login_screen.UserLoginUI;
5+
import screens.user_registration_screen.UserRegistrationUI;
6+
7+
import javax.swing.*;
8+
import java.awt.event.ActionEvent;
9+
import java.awt.event.ActionListener;
10+
11+
/** This is the screen in which the user chooses to either register or login. **/
12+
public class LoginRegisterScreen implements ActionListener {
13+
14+
JButton login = new JButton("login");
15+
JButton register = new JButton("register");
16+
17+
public LoginRegisterScreen(){
18+
JFrame loginRegFrame = new JFrame();
19+
loginRegFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
20+
loginRegFrame.setSize(400, 200);
21+
JPanel loginRegPanel = new JPanel();
22+
loginRegFrame.add(loginRegPanel);
23+
JLabel message = new JLabel("Do you want to Login or Register?");
24+
message.setBounds(10, 30, 200, 25);
25+
loginRegPanel.add(message);
26+
login.setBounds(10, 60, 70, 30);
27+
register.setBounds(110, 60, 70, 30);
28+
}
29+
30+
@Override
31+
public void actionPerformed(ActionEvent e) {
32+
if(e.getSource().equals(login)){
33+
UserLoginUI loginUI = new UserLoginUI(new UserDatabase());
34+
loginUI.getLoginCredentials();
35+
}else{
36+
UserRegistrationUI registrationUI = new UserRegistrationUI(new UserDatabase());
37+
registrationUI.GetUserCredentials();
38+
}
39+
}
40+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.awt.event.ActionListener;
1010
import java.io.File;
1111
import java.util.Random;
12-
12+
/** This is screen on which the User enters his credentials in order to login**/
1313
public class UserRegistrationUI implements ActionListener {
1414
private final UserDatabase database;
1515
private JLabel registrationSuccess;

0 commit comments

Comments
 (0)