Merge remote-tracking branch 'origin/develop' into Real-Time-update

# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/UI/LoginForm.java
#	src/main/java/org/to/telegramfinalproject/UI/RegisterForm.java

src/main/java/org/to/telegramfinalproject/Models/User.java

@@ -118,8 +118,4 @@ public class User {
 
     public List<ChatEntry> getChatList(){return  this.chatList;}
 
-
-
-
-}
-
+}

src/main/java/org/to/telegramfinalproject/UI/LoginController.java

@@ -35,7 +35,7 @@ public class LoginController {
         visiblePasswordField.textProperty().bindBidirectional(passwordField.textProperty());
 
         try {
-            connection = new ClientConnection("localhost", 12345);
+            connection = new ClientConnection("localhost", 8000);
         } catch (Exception e) {
             System.out.println("Could not connect to server: " + e.getMessage());
         }

src/main/java/org/to/telegramfinalproject/UI/RegisterController.java

@@ -43,7 +43,7 @@ public class RegisterController {
         visibleConfirmPasswordField.textProperty().bindBidirectional(confirmPasswordField.textProperty());
 
         try {
-            connection = new ClientConnection("localhost", 12345);
+            connection = new ClientConnection("localhost", 8000);
         } catch (Exception e) {
             System.out.println("Could not connect to server: " + e.getMessage());
         }
@@ -81,7 +81,7 @@ public class RegisterController {
         String passwordRegex = "\\b(?=[^\\s]*[A-Z])(?=[^\\s]*[a-z])(?=[^\\s]*\\d)(?=[^\\s]*[!@#$%^&*])[^\\s]{8,}\\b";
 
         // 1. Empty fields
-        if (username.isEmpty() || profileName.isEmpty() || password.isEmpty() || confirmPass.isEmpty()) {
+        if (userID.isEmpty() || username.isEmpty() || profileName.isEmpty() || password.isEmpty() || confirmPass.isEmpty()) {
             showError("Please fill in all required fields.");
             return;
         }
@@ -92,8 +92,8 @@ public class RegisterController {
             return;
         }
 
-        // 3. User ID exists (if entered)
-        if (!userID.isEmpty() && userDb.existsByUserId(userID)) {
+        // 3. User ID exists
+        if (userDb.existsByUserId(userID)) {
             showError("This user ID is already taken.");
             return;
         }
@@ -114,12 +114,13 @@ public class RegisterController {
         try {
             JSONObject request = new JSONObject();
             request.put("action", "register");
-            request.put("user_id", userID.isEmpty() ? JSONObject.NULL : userID);
+            request.put("user_id", userID);
             request.put("username", username);
             request.put("password", password);
             request.put("profile_name", profileName);
             connection.send(request.toString());
 
+            // Simulate successful registration (since main.fxml isn’t ready)
             Alert alert = new Alert(Alert.AlertType.INFORMATION, "Registration successful!");
             alert.show();
 
@@ -137,7 +138,7 @@ public class RegisterController {
         try {
             FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/" + fxmlFile));
             Parent root = loader.load();
-            Stage stage = (Stage) usernameField.getScene().getWindow(); // Or any node from your current scene
+            Stage stage = (Stage) usernameField.getScene().getWindow();
             stage.setScene(new Scene(root, 500, 700));
             stage.show();
         } catch (IOException e) {

src/main/java/org/to/telegramfinalproject/UI/login_view.java

@@ -1,48 +0,0 @@
-package org.to.telegramfinalproject.UI;
-
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-
-public class login_view {
-
-    @FXML
-    private Button loginButton;
-
-    @FXML
-    private Button registerButton;
-
-    @FXML
-    public void initialize() {
-
-        loginButton.setOnAction(e -> {
-            switchScene("LoginForm.fxml");
-        });
-
-        registerButton.setOnAction(e -> {
-            switchScene("register_view.fxml");
-        });
-    }
-
-    private void switchScene(String fxmlFile) {
-        try {
-
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/" + fxmlFile));
-            Parent root = loader.load();
-
-
-            Stage stage = (Stage) loginButton.getScene().getWindow();
-            stage.setScene(new Scene(root));
-            stage.show();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
-