refactor: renamed UserController to LoginController

Group-5 · Mar 26, 2026 · 1fc75a7 · 1fc75a7
1 parent c8341af
commit 1fc75a7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 33 deletions.
diff --git a/...du/group5/app/control/UserController.java → ...u/group5/app/control/LoginController.java b/...du/group5/app/control/UserController.java → ...u/group5/app/control/LoginController.java
@@ -1,29 +1,18 @@
 package edu.group5.app.control;
 
 import edu.group5.app.model.AppState;
-import edu.group5.app.model.donation.Donation;
-import edu.group5.app.model.donation.DonationService;
-import edu.group5.app.model.organization.Organization;
-import edu.group5.app.model.organization.OrganizationService;
-import edu.group5.app.model.user.Customer;
 import edu.group5.app.model.user.User;
 import edu.group5.app.model.user.UserService;
 import edu.group5.app.view.loginpage.LoginPageView;
 import edu.group5.app.view.loginpage.SignInPageView;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class UserController {
+public class LoginController {
   private final AppState appState;
   private final NavigationController nav;
   private final UserService userService;
 
-  public UserController(AppState appState, NavigationController nav, UserService userService) {
+  public LoginController(AppState appState, NavigationController nav, UserService userService) {
     this.appState = appState;
     this.nav = nav;
     this.userService = userService;

diff --git a/src/main/java/edu/group5/app/control/NavigationController.java b/src/main/java/edu/group5/app/control/NavigationController.java
@@ -23,7 +23,7 @@ public class NavigationController {
 
   private final AppState appState;
 
-  private final UserController userController;
+  private final LoginController loginController;
   private final DonationController donationController;
   private final OrganizationController organizationController;
 
@@ -34,7 +34,7 @@ public NavigationController(BorderPane root, AppState appState, UserService user
 
     this.appState = appState;
 
-    this.userController = new UserController(appState, this, userService);
+    this.loginController = new LoginController(appState, this, userService);
     this.donationController = new DonationController(appState, this, donationService);
     this.organizationController = new OrganizationController(appState, this, organizationService);
   }
@@ -46,12 +46,12 @@ public void showHomePage() {
 
   public void showLoginPage() {
     root.setTop(loginHeader);
-    root.setCenter(new LoginPageView(appState, this, userController));
+    root.setCenter(new LoginPageView(appState, this, loginController));
   }
 
   public void showSignInPage() {
     root.setTop(loginHeader);
-    root.setCenter(new SignInPageView(appState, this, userController));
+    root.setCenter(new SignInPageView(appState, this, loginController));
   }
 
   public void showPaymentCompletePage() {
@@ -80,6 +80,6 @@ public void showAboutUsPage() {
 
   public void showUserPage() {
     root.setTop(header);
-    root.setCenter(new UserPageView(appState, this, userController, donationController, organizationController));
+    root.setCenter(new UserPageView(appState, this, loginController, donationController, organizationController));
   }
 }
diff --git a/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java b/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java
@@ -1,7 +1,7 @@
 package edu.group5.app.view.loginpage;
 
 import edu.group5.app.control.NavigationController;
-import edu.group5.app.control.UserController;
+import edu.group5.app.control.LoginController;
 import edu.group5.app.model.AppState;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -15,16 +15,16 @@
 public class LoginPageView extends BorderPane {
   private final AppState appState;
   private final NavigationController nav;
-  private final UserController userController;
+  private final LoginController loginController;
 
   private TextField emailField;
   private PasswordField passwordField;
   private Label errorLabel;
 
-  public LoginPageView(AppState appState, NavigationController nav, UserController userController) {
+  public LoginPageView(AppState appState, NavigationController nav, LoginController loginController) {
     this.appState = appState;
     this.nav = nav;
-    this.userController = userController;
+    this.loginController = loginController;
 
     HBox content = new HBox();
     content.setFillHeight(true);
@@ -97,7 +97,7 @@ private Button getLoginBtn() {
     Button loginBtn = new Button("Log In");
     loginBtn.setMaxWidth(300);
     loginBtn.setId("login-btn");
-    loginBtn.setOnMouseClicked(e -> userController.handleLogin(
+    loginBtn.setOnMouseClicked(e -> loginController.handleLogin(
         this,
         getEmail(),
         getPassword()

diff --git a/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java b/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java
@@ -1,7 +1,7 @@
 package edu.group5.app.view.loginpage;
 
 import edu.group5.app.control.NavigationController;
-import edu.group5.app.control.UserController;
+import edu.group5.app.control.LoginController;
 import edu.group5.app.model.AppState;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -16,18 +16,18 @@
 public class SignInPageView extends BorderPane {
   private final AppState appState;
   private final NavigationController nav;
-  private final UserController userController;
+  private final LoginController loginController;
 
   private TextField nameField;
   private TextField surnameField;
   private TextField emailField;
   private PasswordField passwordField;
   private Label errorLabel;
 
-  public SignInPageView(AppState appState, NavigationController nav, UserController userController) {
+  public SignInPageView(AppState appState, NavigationController nav, LoginController loginController) {
     this.appState = appState;
     this.nav = nav;
-    this.userController = userController;
+    this.loginController = loginController;
 
     HBox content = new HBox();
     content.setFillHeight(true);
@@ -130,7 +130,7 @@ private Button getSignInBtn() {
     Button signInBtn = new Button("Sign In");
     signInBtn.setMaxWidth(300);
     signInBtn.setId("login-btn");
-    signInBtn.setOnMouseClicked(e -> userController.handleSignIn(
+    signInBtn.setOnMouseClicked(e -> loginController.handleSignIn(
         this,
         getFirstName(),
         getLastName(),

diff --git a/src/main/java/edu/group5/app/view/userpage/UserPageView.java b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
@@ -3,7 +3,7 @@
 import edu.group5.app.control.DonationController;
 import edu.group5.app.control.NavigationController;
 import edu.group5.app.control.OrganizationController;
-import edu.group5.app.control.UserController;
+import edu.group5.app.control.LoginController;
 import edu.group5.app.model.AppState;
 import edu.group5.app.model.donation.Donation;
 import edu.group5.app.model.organization.Organization;
@@ -25,14 +25,14 @@
 public class UserPageView extends BorderPane {
   private final AppState appState;
   private final NavigationController nav;
-  private final UserController userController;
+  private final LoginController loginController;
   private final DonationController donationController;
   private final OrganizationController organizationController;
 
-  public UserPageView(AppState appState, NavigationController nav, UserController userController, DonationController donationController, OrganizationController organizationController) {
+  public UserPageView(AppState appState, NavigationController nav, LoginController loginController, DonationController donationController, OrganizationController organizationController) {
     this.appState = appState;
     this.nav = nav;
-    this.userController = userController;
+    this.loginController = loginController;
     this.donationController = donationController;
     this.organizationController = organizationController;
 
@@ -64,7 +64,7 @@ private HBox createProfileSection() {
 
     Button logoutBtn = new Button("Logout");
     logoutBtn.getStyleClass().add("logout-button");
-    logoutBtn.setOnAction(e -> userController.handleLogout());
+    logoutBtn.setOnAction(e -> loginController.handleLogout());
 
     VBox info = new VBox(10, name, email, location, logoutBtn);
     info.setAlignment(Pos.CENTER_LEFT);