diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java index 2c17a37..8c491ea 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ClientApp.java @@ -1,5 +1,5 @@ package ch.unibas.dmi.dbis.cs108.casono.client; - +import ch.unibas.dmi.dbis.cs108.casono.client.ui.Launcher; public class ClientApp { public static void start(String arg) { String[] parts = arg.split(":", 2); @@ -10,5 +10,6 @@ public class ClientApp { int port = Integer.parseInt(parts[1]); System.out.println("You've selected the client. It will connect port " + port + " at host " + host); + Launcher.main(new String[]{}); } } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/Launcher.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/Launcher.java index 19c5f05..5096144 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/Launcher.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/Launcher.java @@ -4,7 +4,7 @@ import javafx.application.Application; public class Launcher { public static void main(String[] args) { - Application.launch(ch.unibas.dmi.dbis.cs108.casono.client.ui.lobby.Casinomainui.class, args); + Application.launch(ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui.Casinomainui.class, args); } } \ No newline at end of file diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/Casinomainui.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java similarity index 77% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/Casinomainui.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java index 811b9e9..20cc74a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/Casinomainui.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/Casinomainui.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobby; +package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui; import javafx.application.Application; import javafx.fxml.FXMLLoader; @@ -10,11 +10,11 @@ import java.io.IOException; public class Casinomainui extends Application { @Override public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("Casinomainui.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/ui-structure/Casinomainui.fxml")); Scene scene = new Scene(fxmlLoader.load(), 1200, 800); stage.setTitle("Casono"); - stage.getIcons().add(new javafx.scene.image.Image(getClass().getResource("/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/logoinverted.png").toExternalForm())); + stage.getIcons().add(new javafx.scene.image.Image(getClass().getResource("/images/logoinverted.png").toExternalForm())); stage.setScene(scene); stage.setFullScreen(true); stage.show(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/CasinomainuiController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java similarity index 88% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/CasinomainuiController.java rename to src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java index c96b035..c34990f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobby/CasinomainuiController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/CasinomainuiController.java @@ -1,4 +1,4 @@ -package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobby; +package ch.unibas.dmi.dbis.cs108.casono.client.ui.lobbyui; import javafx.application.Platform; import javafx.fxml.FXML; import javafx.scene.control.Label; @@ -37,7 +37,7 @@ public class CasinomainuiController { titleLabel.setText("Casono"); subtitleLabel.setText("Texas Hold'em Poker"); // Logo laden - logoView.setImage(new javafx.scene.image.Image(getClass().getResource("/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/logo.png").toExternalForm())); + logoView.setImage(new javafx.scene.image.Image(getClass().getResource("/images/logo.png").toExternalForm())); } @FXML diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/background.png b/src/main/resources/images/background.png similarity index 100% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/background.png rename to src/main/resources/images/background.png diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/logo.png b/src/main/resources/images/logo.png similarity index 100% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/logo.png rename to src/main/resources/images/logo.png diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/logoinverted.png b/src/main/resources/images/logoinverted.png similarity index 100% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/images/logoinverted.png rename to src/main/resources/images/logoinverted.png diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.css b/src/main/resources/ui-structure/Casinomainui.css similarity index 96% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.css rename to src/main/resources/ui-structure/Casinomainui.css index 2951f39..129c457 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.css +++ b/src/main/resources/ui-structure/Casinomainui.css @@ -7,7 +7,7 @@ .anchor-pane-bg { -fx-background-color: #ffffff; /* Optional: Bild entfernen oder als Overlay nutzen */ - -fx-background-image: url("images/background.png"); + -fx-background-image: url("/images/background.png"); -fx-background-size: cover; -fx-background-position: center center; -fx-background-repeat: no-repeat; @@ -136,9 +136,9 @@ } .button-exit { - -fx-background-color: #8b0000; - -fx-border-color: #ff4444; - -fx-text-fill: white; + -fx-background-color: #333333; + -fx-border-color: #666666; + -fx-text-fill: #CCCCCC; -fx-background-radius: 12; -fx-border-radius: 12; -fx-font-family: "Courier New"; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.fxml b/src/main/resources/ui-structure/Casinomainui.fxml similarity index 98% rename from src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.fxml rename to src/main/resources/ui-structure/Casinomainui.fxml index 02490da..3b8bee7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/resources/Casinomainui.fxml +++ b/src/main/resources/ui-structure/Casinomainui.fxml @@ -6,7 +6,7 @@