diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java index b982f08..e94be59 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherGUI.java @@ -50,7 +50,7 @@ public class ClientLauncherGUI extends Application { }).start(); }); - stage.setTitle("La mia app"); + stage.setTitle("Mesos"); stage.setScene(loginView.getScene()); stage.show(); } diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java index 5c2070b..78d7cbf 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java @@ -48,7 +48,7 @@ public class ClientController { */ public void setModel(Game model) { localController.setModel(model); - view.update(localController.getModel()); + view.setModel(localController.getModel()); } diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java index b9a9d63..9a49330 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java @@ -18,10 +18,10 @@ public class GUI implements IView { // stessa interfaccia che implementa TUI this.stage = stage; } - @Override - public void update(Game model) { + public void setModel(Game model) { this.model = model; + mainView.setModel(model); } /** @@ -31,6 +31,7 @@ public class GUI implements IView { // stessa interfaccia che implementa TUI @Override public void render() { Platform.runLater(() -> { + mainView.render(); stage.setScene(mainView.getScene()); }); } diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java new file mode 100644 index 0000000..8e6cba6 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java @@ -0,0 +1,44 @@ +package it.polimi.ingsw.gc14.View.GUI; + +import javafx.fxml.FXML; +import javafx.scene.control.*; + +public class LoginFXMLController { + + @FXML private TextField campoNome; + @FXML private TextField campoNumPlayers; + @FXML private TextField campoIP; + @FXML private RadioButton btnRMI; + @FXML private RadioButton btnTCP; + @FXML private Button btnAccedi; + @FXML private Label labelErrore; + + @FXML + public void initialize() { + // I RadioButton vanno collegati a un ToggleGroup a mano + // perché FXML non lo fa automaticamente + ToggleGroup group = new ToggleGroup(); + btnRMI.setToggleGroup(group); + btnTCP.setToggleGroup(group); + } + + // --- Getter esposti a LoginView --- + + public Button getBtnAccedi() { return btnAccedi; } + + public String getNome() { return campoNome.getText().trim(); } + + public int getNumPlayers() { + try { + return Integer.parseInt(campoNumPlayers.getText().trim()); + } catch (NumberFormatException e) { + return -1; + } + } + + public int getNetworkType() { return btnRMI.isSelected() ? 0 : 1; } + + public String getIP() { return campoIP.getText().trim(); } + + public void setErrore(String messaggio) { labelErrore.setText(messaggio); } +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginView.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginView.java index 1067009..51eaf1b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginView.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginView.java @@ -1,75 +1,35 @@ package it.polimi.ingsw.gc14.View.GUI; -import javafx.geometry.Insets; -import javafx.geometry.Pos; +import javafx.fxml.FXMLLoader; import javafx.scene.Scene; -import javafx.scene.control.*; -import javafx.scene.layout.VBox; +import javafx.scene.control.Button; + +import java.io.IOException; public class LoginView { - private final Scene scene; - - private final TextField campoNome = new TextField(); - private final TextField campoNumPlayers = new TextField(); - private final TextField campoIP = new TextField(); - private final ToggleGroup networkGroup = new ToggleGroup(); - private final RadioButton btnRMI = new RadioButton("RMI"); - private final RadioButton btnTCP = new RadioButton("TCP"); - private final Button btnAccedi = new Button("Connetti"); - private final Label labelErrore = new Label(""); + private final Scene scene; + private final LoginFXMLController fxmlController; public LoginView() { - campoNome.setPromptText("Nome utente"); - campoNumPlayers.setPromptText("Numero di giocatori"); - campoIP.setPromptText("IP server"); - - btnRMI.setToggleGroup(networkGroup); - btnTCP.setToggleGroup(networkGroup); - btnRMI.setSelected(true); // RMI selezionato di default - - labelErrore.setStyle("-fx-text-fill: red;"); - - VBox layout = new VBox(10, - new Label("Nome utente:"), campoNome, - new Label("Num. giocatori:"), campoNumPlayers, - new Label("Protocollo:"), btnRMI, btnTCP, - new Label("IP server:"), campoIP, - labelErrore, - btnAccedi - ); - layout.setAlignment(Pos.CENTER_LEFT); - layout.setPadding(new Insets(40)); - - scene = new Scene(layout, 350, 380); - } - - // --- Getter esposti al launcher --- - - public Scene getScene() { return scene; } - public Button getBtnAccedi() { return btnAccedi; } - - public String getNome() { - return campoNome.getText().trim(); - } - - public int getNumPlayers() { try { - return Integer.parseInt(campoNumPlayers.getText().trim()); - } catch (NumberFormatException e) { - return -1; // il launcher controlla questo e mostra errore + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/GUIScene/login.fxml") + ); + scene = new Scene(loader.load(), 350, 380); + fxmlController = loader.getController(); + } catch (IOException e) { + throw new RuntimeException("Impossibile caricare login.fxml", e); } } - public int getNetworkType() { - return btnRMI.isSelected() ? 0 : 1; - } + // --- Delega tutto al controller FXML --- - public String getIP() { - return campoIP.getText().trim(); - } - - public void setErrore(String messaggio) { - labelErrore.setText(messaggio); - } + public Scene getScene() { return scene; } + public Button getBtnAccedi() { return fxmlController.getBtnAccedi(); } + public String getNome() { return fxmlController.getNome(); } + public int getNumPlayers() { return fxmlController.getNumPlayers(); } + public int getNetworkType() { return fxmlController.getNetworkType(); } + public String getIP() { return fxmlController.getIP(); } + public void setErrore(String messaggio) { fxmlController.setErrore(messaggio); } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java new file mode 100644 index 0000000..d178bdd --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java @@ -0,0 +1,47 @@ +package it.polimi.ingsw.gc14.View.GUI; + +import it.polimi.ingsw.gc14.Model.Cards.TribeCard; +import it.polimi.ingsw.gc14.Model.Game; +import javafx.fxml.FXML; +import javafx.scene.image.*; +import javafx.scene.layout.*; +import javafx.scene.shape.*; + +import java.util.List; + +public class MainFXMLController { + + @FXML + private HBox board; + @FXML private HBox upperList; + @FXML private HBox lowerList; + @FXML private HBox myHand; + @FXML private VBox playersHand; + + private Game model; + + public void setModel(Game model) { + this.model = model; + } + + public void render() { + Image placeholder = new Image(getClass().getResourceAsStream("/GUIImages/Fronts/card-001.png")); + + for (TribeCard card : model.getUpperListTribeCards()) { + ImageView view = new ImageView(placeholder); + view.setFitWidth(80); + view.setFitHeight(120); + view.setPreserveRatio(true); + upperList.getChildren().add(view); + } + + for (TribeCard card : model.getLowerListTribeCards()) { + ImageView view = new ImageView(placeholder); + view.setFitWidth(80); + view.setFitHeight(120); + view.setPreserveRatio(true); + lowerList.getChildren().add(view); + } + System.out.println("AGGIORNO GAGAGAGA"); + } +} diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainView.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainView.java index 96c8e33..fd62922 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainView.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainView.java @@ -1,23 +1,39 @@ package it.polimi.ingsw.gc14.View.GUI; +import it.polimi.ingsw.gc14.Model.Game; +import javafx.fxml.FXMLLoader; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Label; import javafx.scene.layout.VBox; +import java.io.IOException; + public class MainView { private final Scene scene; - private final Label labelStato = new Label("In attesa di aggiornamenti..."); + private final MainFXMLController fxmlController; + private Game model; public MainView() { - VBox layout = new VBox(16, labelStato); - layout.setAlignment(Pos.CENTER); - layout.setPadding(new Insets(40)); - scene = new Scene(layout, 800, 600); + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/GUIScene/main.fxml") + ); + scene = new Scene(loader.load(), 350, 380); + fxmlController = loader.getController(); + } catch (IOException e) { + throw new RuntimeException("Impossibile caricare login.fxml", e); + } } public Scene getScene() { return scene; } - public void setStato(String testo) { labelStato.setText(testo); } + public void setModel(Game model) { + this.model = model; + fxmlController.setModel(model); + } + public void render() { + fxmlController.render(); + } } \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/View/IView.java b/src/main/java/it/polimi/ingsw/gc14/View/IView.java index 2169583..5025588 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/IView.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/IView.java @@ -4,7 +4,7 @@ import it.polimi.ingsw.gc14.Model.Game; import it.polimi.ingsw.gc14.Network.NetworkEvent; public interface IView { - public void update(Game game); + public void setModel(Game game); public void render(); public void showMessage(String message); public void showError(String message); diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java index e97f1ad..1b4896c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/TUI.java @@ -19,7 +19,7 @@ public class TUI implements IView { } @Override - public void update(Game model) { + public void setModel(Game model) { this.model = model; } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index e178647..3adc89b 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -18,4 +18,8 @@ module it.polimi.ingsw.gc14 { exports it.polimi.ingsw.gc14.Network.RMI.Client to java.rmi; exports it.polimi.ingsw.gc14.Network to java.rmi; exports it.polimi.ingsw.gc14.Model to java.rmi, com.google.gson; + + // GUI + opens it.polimi.ingsw.gc14.View.GUI to javafx.fxml; + exports it.polimi.ingsw.gc14.View.GUI; } \ No newline at end of file diff --git a/src/main/resources/GUI images/Backs/back-001.png b/src/main/resources/GUIImages/Backs/back-001.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-001.png rename to src/main/resources/GUIImages/Backs/back-001.png diff --git a/src/main/resources/GUI images/Backs/back-030.png b/src/main/resources/GUIImages/Backs/back-030.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-030.png rename to src/main/resources/GUIImages/Backs/back-030.png diff --git a/src/main/resources/GUI images/Backs/back-058.png b/src/main/resources/GUIImages/Backs/back-058.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-058.png rename to src/main/resources/GUIImages/Backs/back-058.png diff --git a/src/main/resources/GUI images/Backs/back-095.png b/src/main/resources/GUIImages/Backs/back-095.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-095.png rename to src/main/resources/GUIImages/Backs/back-095.png diff --git a/src/main/resources/GUI images/Backs/back-097.png b/src/main/resources/GUIImages/Backs/back-097.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-097.png rename to src/main/resources/GUIImages/Backs/back-097.png diff --git a/src/main/resources/GUI images/Backs/back-103.png b/src/main/resources/GUIImages/Backs/back-103.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-103.png rename to src/main/resources/GUIImages/Backs/back-103.png diff --git a/src/main/resources/GUI images/Backs/back-110.png b/src/main/resources/GUIImages/Backs/back-110.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-110.png rename to src/main/resources/GUIImages/Backs/back-110.png diff --git a/src/main/resources/GUI images/Backs/back-118.png b/src/main/resources/GUIImages/Backs/back-118.png similarity index 100% rename from src/main/resources/GUI images/Backs/back-118.png rename to src/main/resources/GUIImages/Backs/back-118.png diff --git a/src/main/resources/GUI images/Fronts/card-001.png b/src/main/resources/GUIImages/Fronts/card-001.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-001.png rename to src/main/resources/GUIImages/Fronts/card-001.png diff --git a/src/main/resources/GUI images/Fronts/card-002.png b/src/main/resources/GUIImages/Fronts/card-002.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-002.png rename to src/main/resources/GUIImages/Fronts/card-002.png diff --git a/src/main/resources/GUI images/Fronts/card-003.png b/src/main/resources/GUIImages/Fronts/card-003.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-003.png rename to src/main/resources/GUIImages/Fronts/card-003.png diff --git a/src/main/resources/GUI images/Fronts/card-004.png b/src/main/resources/GUIImages/Fronts/card-004.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-004.png rename to src/main/resources/GUIImages/Fronts/card-004.png diff --git a/src/main/resources/GUI images/Fronts/card-005.png b/src/main/resources/GUIImages/Fronts/card-005.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-005.png rename to src/main/resources/GUIImages/Fronts/card-005.png diff --git a/src/main/resources/GUI images/Fronts/card-006.png b/src/main/resources/GUIImages/Fronts/card-006.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-006.png rename to src/main/resources/GUIImages/Fronts/card-006.png diff --git a/src/main/resources/GUI images/Fronts/card-007.png b/src/main/resources/GUIImages/Fronts/card-007.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-007.png rename to src/main/resources/GUIImages/Fronts/card-007.png diff --git a/src/main/resources/GUI images/Fronts/card-008.png b/src/main/resources/GUIImages/Fronts/card-008.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-008.png rename to src/main/resources/GUIImages/Fronts/card-008.png diff --git a/src/main/resources/GUI images/Fronts/card-009.png b/src/main/resources/GUIImages/Fronts/card-009.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-009.png rename to src/main/resources/GUIImages/Fronts/card-009.png diff --git a/src/main/resources/GUI images/Fronts/card-010.png b/src/main/resources/GUIImages/Fronts/card-010.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-010.png rename to src/main/resources/GUIImages/Fronts/card-010.png diff --git a/src/main/resources/GUI images/Fronts/card-011.png b/src/main/resources/GUIImages/Fronts/card-011.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-011.png rename to src/main/resources/GUIImages/Fronts/card-011.png diff --git a/src/main/resources/GUI images/Fronts/card-012.png b/src/main/resources/GUIImages/Fronts/card-012.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-012.png rename to src/main/resources/GUIImages/Fronts/card-012.png diff --git a/src/main/resources/GUI images/Fronts/card-013.png b/src/main/resources/GUIImages/Fronts/card-013.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-013.png rename to src/main/resources/GUIImages/Fronts/card-013.png diff --git a/src/main/resources/GUI images/Fronts/card-014.png b/src/main/resources/GUIImages/Fronts/card-014.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-014.png rename to src/main/resources/GUIImages/Fronts/card-014.png diff --git a/src/main/resources/GUI images/Fronts/card-015.png b/src/main/resources/GUIImages/Fronts/card-015.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-015.png rename to src/main/resources/GUIImages/Fronts/card-015.png diff --git a/src/main/resources/GUI images/Fronts/card-016.png b/src/main/resources/GUIImages/Fronts/card-016.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-016.png rename to src/main/resources/GUIImages/Fronts/card-016.png diff --git a/src/main/resources/GUI images/Fronts/card-017.png b/src/main/resources/GUIImages/Fronts/card-017.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-017.png rename to src/main/resources/GUIImages/Fronts/card-017.png diff --git a/src/main/resources/GUI images/Fronts/card-018.png b/src/main/resources/GUIImages/Fronts/card-018.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-018.png rename to src/main/resources/GUIImages/Fronts/card-018.png diff --git a/src/main/resources/GUI images/Fronts/card-019.png b/src/main/resources/GUIImages/Fronts/card-019.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-019.png rename to src/main/resources/GUIImages/Fronts/card-019.png diff --git a/src/main/resources/GUI images/Fronts/card-020.png b/src/main/resources/GUIImages/Fronts/card-020.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-020.png rename to src/main/resources/GUIImages/Fronts/card-020.png diff --git a/src/main/resources/GUI images/Fronts/card-021.png b/src/main/resources/GUIImages/Fronts/card-021.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-021.png rename to src/main/resources/GUIImages/Fronts/card-021.png diff --git a/src/main/resources/GUI images/Fronts/card-022.png b/src/main/resources/GUIImages/Fronts/card-022.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-022.png rename to src/main/resources/GUIImages/Fronts/card-022.png diff --git a/src/main/resources/GUI images/Fronts/card-023.png b/src/main/resources/GUIImages/Fronts/card-023.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-023.png rename to src/main/resources/GUIImages/Fronts/card-023.png diff --git a/src/main/resources/GUI images/Fronts/card-024.png b/src/main/resources/GUIImages/Fronts/card-024.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-024.png rename to src/main/resources/GUIImages/Fronts/card-024.png diff --git a/src/main/resources/GUI images/Fronts/card-025.png b/src/main/resources/GUIImages/Fronts/card-025.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-025.png rename to src/main/resources/GUIImages/Fronts/card-025.png diff --git a/src/main/resources/GUI images/Fronts/card-026.png b/src/main/resources/GUIImages/Fronts/card-026.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-026.png rename to src/main/resources/GUIImages/Fronts/card-026.png diff --git a/src/main/resources/GUI images/Fronts/card-027.png b/src/main/resources/GUIImages/Fronts/card-027.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-027.png rename to src/main/resources/GUIImages/Fronts/card-027.png diff --git a/src/main/resources/GUI images/Fronts/card-028.png b/src/main/resources/GUIImages/Fronts/card-028.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-028.png rename to src/main/resources/GUIImages/Fronts/card-028.png diff --git a/src/main/resources/GUI images/Fronts/card-029.png b/src/main/resources/GUIImages/Fronts/card-029.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-029.png rename to src/main/resources/GUIImages/Fronts/card-029.png diff --git a/src/main/resources/GUI images/Fronts/card-030.png b/src/main/resources/GUIImages/Fronts/card-030.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-030.png rename to src/main/resources/GUIImages/Fronts/card-030.png diff --git a/src/main/resources/GUI images/Fronts/card-031.png b/src/main/resources/GUIImages/Fronts/card-031.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-031.png rename to src/main/resources/GUIImages/Fronts/card-031.png diff --git a/src/main/resources/GUI images/Fronts/card-032.png b/src/main/resources/GUIImages/Fronts/card-032.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-032.png rename to src/main/resources/GUIImages/Fronts/card-032.png diff --git a/src/main/resources/GUI images/Fronts/card-033.png b/src/main/resources/GUIImages/Fronts/card-033.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-033.png rename to src/main/resources/GUIImages/Fronts/card-033.png diff --git a/src/main/resources/GUI images/Fronts/card-034.png b/src/main/resources/GUIImages/Fronts/card-034.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-034.png rename to src/main/resources/GUIImages/Fronts/card-034.png diff --git a/src/main/resources/GUI images/Fronts/card-035.png b/src/main/resources/GUIImages/Fronts/card-035.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-035.png rename to src/main/resources/GUIImages/Fronts/card-035.png diff --git a/src/main/resources/GUI images/Fronts/card-036.png b/src/main/resources/GUIImages/Fronts/card-036.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-036.png rename to src/main/resources/GUIImages/Fronts/card-036.png diff --git a/src/main/resources/GUI images/Fronts/card-037.png b/src/main/resources/GUIImages/Fronts/card-037.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-037.png rename to src/main/resources/GUIImages/Fronts/card-037.png diff --git a/src/main/resources/GUI images/Fronts/card-038.png b/src/main/resources/GUIImages/Fronts/card-038.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-038.png rename to src/main/resources/GUIImages/Fronts/card-038.png diff --git a/src/main/resources/GUI images/Fronts/card-039.png b/src/main/resources/GUIImages/Fronts/card-039.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-039.png rename to src/main/resources/GUIImages/Fronts/card-039.png diff --git a/src/main/resources/GUI images/Fronts/card-040.png b/src/main/resources/GUIImages/Fronts/card-040.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-040.png rename to src/main/resources/GUIImages/Fronts/card-040.png diff --git a/src/main/resources/GUI images/Fronts/card-041.png b/src/main/resources/GUIImages/Fronts/card-041.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-041.png rename to src/main/resources/GUIImages/Fronts/card-041.png diff --git a/src/main/resources/GUI images/Fronts/card-042.png b/src/main/resources/GUIImages/Fronts/card-042.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-042.png rename to src/main/resources/GUIImages/Fronts/card-042.png diff --git a/src/main/resources/GUI images/Fronts/card-043.png b/src/main/resources/GUIImages/Fronts/card-043.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-043.png rename to src/main/resources/GUIImages/Fronts/card-043.png diff --git a/src/main/resources/GUI images/Fronts/card-044.png b/src/main/resources/GUIImages/Fronts/card-044.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-044.png rename to src/main/resources/GUIImages/Fronts/card-044.png diff --git a/src/main/resources/GUI images/Fronts/card-045.png b/src/main/resources/GUIImages/Fronts/card-045.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-045.png rename to src/main/resources/GUIImages/Fronts/card-045.png diff --git a/src/main/resources/GUI images/Fronts/card-046.png b/src/main/resources/GUIImages/Fronts/card-046.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-046.png rename to src/main/resources/GUIImages/Fronts/card-046.png diff --git a/src/main/resources/GUI images/Fronts/card-047.png b/src/main/resources/GUIImages/Fronts/card-047.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-047.png rename to src/main/resources/GUIImages/Fronts/card-047.png diff --git a/src/main/resources/GUI images/Fronts/card-048.png b/src/main/resources/GUIImages/Fronts/card-048.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-048.png rename to src/main/resources/GUIImages/Fronts/card-048.png diff --git a/src/main/resources/GUI images/Fronts/card-049.png b/src/main/resources/GUIImages/Fronts/card-049.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-049.png rename to src/main/resources/GUIImages/Fronts/card-049.png diff --git a/src/main/resources/GUI images/Fronts/card-050.png b/src/main/resources/GUIImages/Fronts/card-050.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-050.png rename to src/main/resources/GUIImages/Fronts/card-050.png diff --git a/src/main/resources/GUI images/Fronts/card-051.png b/src/main/resources/GUIImages/Fronts/card-051.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-051.png rename to src/main/resources/GUIImages/Fronts/card-051.png diff --git a/src/main/resources/GUI images/Fronts/card-052.png b/src/main/resources/GUIImages/Fronts/card-052.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-052.png rename to src/main/resources/GUIImages/Fronts/card-052.png diff --git a/src/main/resources/GUI images/Fronts/card-053.png b/src/main/resources/GUIImages/Fronts/card-053.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-053.png rename to src/main/resources/GUIImages/Fronts/card-053.png diff --git a/src/main/resources/GUI images/Fronts/card-054.png b/src/main/resources/GUIImages/Fronts/card-054.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-054.png rename to src/main/resources/GUIImages/Fronts/card-054.png diff --git a/src/main/resources/GUI images/Fronts/card-055.png b/src/main/resources/GUIImages/Fronts/card-055.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-055.png rename to src/main/resources/GUIImages/Fronts/card-055.png diff --git a/src/main/resources/GUI images/Fronts/card-056.png b/src/main/resources/GUIImages/Fronts/card-056.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-056.png rename to src/main/resources/GUIImages/Fronts/card-056.png diff --git a/src/main/resources/GUI images/Fronts/card-057.png b/src/main/resources/GUIImages/Fronts/card-057.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-057.png rename to src/main/resources/GUIImages/Fronts/card-057.png diff --git a/src/main/resources/GUI images/Fronts/card-058.png b/src/main/resources/GUIImages/Fronts/card-058.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-058.png rename to src/main/resources/GUIImages/Fronts/card-058.png diff --git a/src/main/resources/GUI images/Fronts/card-059.png b/src/main/resources/GUIImages/Fronts/card-059.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-059.png rename to src/main/resources/GUIImages/Fronts/card-059.png diff --git a/src/main/resources/GUI images/Fronts/card-060.png b/src/main/resources/GUIImages/Fronts/card-060.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-060.png rename to src/main/resources/GUIImages/Fronts/card-060.png diff --git a/src/main/resources/GUI images/Fronts/card-061.png b/src/main/resources/GUIImages/Fronts/card-061.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-061.png rename to src/main/resources/GUIImages/Fronts/card-061.png diff --git a/src/main/resources/GUI images/Fronts/card-062.png b/src/main/resources/GUIImages/Fronts/card-062.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-062.png rename to src/main/resources/GUIImages/Fronts/card-062.png diff --git a/src/main/resources/GUI images/Fronts/card-063.png b/src/main/resources/GUIImages/Fronts/card-063.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-063.png rename to src/main/resources/GUIImages/Fronts/card-063.png diff --git a/src/main/resources/GUI images/Fronts/card-064.png b/src/main/resources/GUIImages/Fronts/card-064.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-064.png rename to src/main/resources/GUIImages/Fronts/card-064.png diff --git a/src/main/resources/GUI images/Fronts/card-065.png b/src/main/resources/GUIImages/Fronts/card-065.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-065.png rename to src/main/resources/GUIImages/Fronts/card-065.png diff --git a/src/main/resources/GUI images/Fronts/card-066.png b/src/main/resources/GUIImages/Fronts/card-066.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-066.png rename to src/main/resources/GUIImages/Fronts/card-066.png diff --git a/src/main/resources/GUI images/Fronts/card-067.png b/src/main/resources/GUIImages/Fronts/card-067.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-067.png rename to src/main/resources/GUIImages/Fronts/card-067.png diff --git a/src/main/resources/GUI images/Fronts/card-068.png b/src/main/resources/GUIImages/Fronts/card-068.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-068.png rename to src/main/resources/GUIImages/Fronts/card-068.png diff --git a/src/main/resources/GUI images/Fronts/card-069.png b/src/main/resources/GUIImages/Fronts/card-069.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-069.png rename to src/main/resources/GUIImages/Fronts/card-069.png diff --git a/src/main/resources/GUI images/Fronts/card-070.png b/src/main/resources/GUIImages/Fronts/card-070.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-070.png rename to src/main/resources/GUIImages/Fronts/card-070.png diff --git a/src/main/resources/GUI images/Fronts/card-071.png b/src/main/resources/GUIImages/Fronts/card-071.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-071.png rename to src/main/resources/GUIImages/Fronts/card-071.png diff --git a/src/main/resources/GUI images/Fronts/card-072.png b/src/main/resources/GUIImages/Fronts/card-072.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-072.png rename to src/main/resources/GUIImages/Fronts/card-072.png diff --git a/src/main/resources/GUI images/Fronts/card-073.png b/src/main/resources/GUIImages/Fronts/card-073.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-073.png rename to src/main/resources/GUIImages/Fronts/card-073.png diff --git a/src/main/resources/GUI images/Fronts/card-074.png b/src/main/resources/GUIImages/Fronts/card-074.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-074.png rename to src/main/resources/GUIImages/Fronts/card-074.png diff --git a/src/main/resources/GUI images/Fronts/card-075.png b/src/main/resources/GUIImages/Fronts/card-075.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-075.png rename to src/main/resources/GUIImages/Fronts/card-075.png diff --git a/src/main/resources/GUI images/Fronts/card-076.png b/src/main/resources/GUIImages/Fronts/card-076.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-076.png rename to src/main/resources/GUIImages/Fronts/card-076.png diff --git a/src/main/resources/GUI images/Fronts/card-077.png b/src/main/resources/GUIImages/Fronts/card-077.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-077.png rename to src/main/resources/GUIImages/Fronts/card-077.png diff --git a/src/main/resources/GUI images/Fronts/card-078.png b/src/main/resources/GUIImages/Fronts/card-078.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-078.png rename to src/main/resources/GUIImages/Fronts/card-078.png diff --git a/src/main/resources/GUI images/Fronts/card-079.png b/src/main/resources/GUIImages/Fronts/card-079.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-079.png rename to src/main/resources/GUIImages/Fronts/card-079.png diff --git a/src/main/resources/GUI images/Fronts/card-080.png b/src/main/resources/GUIImages/Fronts/card-080.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-080.png rename to src/main/resources/GUIImages/Fronts/card-080.png diff --git a/src/main/resources/GUI images/Fronts/card-081.png b/src/main/resources/GUIImages/Fronts/card-081.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-081.png rename to src/main/resources/GUIImages/Fronts/card-081.png diff --git a/src/main/resources/GUI images/Fronts/card-082.png b/src/main/resources/GUIImages/Fronts/card-082.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-082.png rename to src/main/resources/GUIImages/Fronts/card-082.png diff --git a/src/main/resources/GUI images/Fronts/card-083.png b/src/main/resources/GUIImages/Fronts/card-083.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-083.png rename to src/main/resources/GUIImages/Fronts/card-083.png diff --git a/src/main/resources/GUI images/Fronts/card-084.png b/src/main/resources/GUIImages/Fronts/card-084.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-084.png rename to src/main/resources/GUIImages/Fronts/card-084.png diff --git a/src/main/resources/GUI images/Fronts/card-085.png b/src/main/resources/GUIImages/Fronts/card-085.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-085.png rename to src/main/resources/GUIImages/Fronts/card-085.png diff --git a/src/main/resources/GUI images/Fronts/card-086.png b/src/main/resources/GUIImages/Fronts/card-086.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-086.png rename to src/main/resources/GUIImages/Fronts/card-086.png diff --git a/src/main/resources/GUI images/Fronts/card-087.png b/src/main/resources/GUIImages/Fronts/card-087.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-087.png rename to src/main/resources/GUIImages/Fronts/card-087.png diff --git a/src/main/resources/GUI images/Fronts/card-088.png b/src/main/resources/GUIImages/Fronts/card-088.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-088.png rename to src/main/resources/GUIImages/Fronts/card-088.png diff --git a/src/main/resources/GUI images/Fronts/card-089.png b/src/main/resources/GUIImages/Fronts/card-089.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-089.png rename to src/main/resources/GUIImages/Fronts/card-089.png diff --git a/src/main/resources/GUI images/Fronts/card-090.png b/src/main/resources/GUIImages/Fronts/card-090.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-090.png rename to src/main/resources/GUIImages/Fronts/card-090.png diff --git a/src/main/resources/GUI images/Fronts/card-091.png b/src/main/resources/GUIImages/Fronts/card-091.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-091.png rename to src/main/resources/GUIImages/Fronts/card-091.png diff --git a/src/main/resources/GUI images/Fronts/card-092.png b/src/main/resources/GUIImages/Fronts/card-092.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-092.png rename to src/main/resources/GUIImages/Fronts/card-092.png diff --git a/src/main/resources/GUI images/Fronts/card-093.png b/src/main/resources/GUIImages/Fronts/card-093.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-093.png rename to src/main/resources/GUIImages/Fronts/card-093.png diff --git a/src/main/resources/GUI images/Fronts/card-094.png b/src/main/resources/GUIImages/Fronts/card-094.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-094.png rename to src/main/resources/GUIImages/Fronts/card-094.png diff --git a/src/main/resources/GUI images/Fronts/card-095.png b/src/main/resources/GUIImages/Fronts/card-095.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-095.png rename to src/main/resources/GUIImages/Fronts/card-095.png diff --git a/src/main/resources/GUI images/Fronts/card-096.png b/src/main/resources/GUIImages/Fronts/card-096.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-096.png rename to src/main/resources/GUIImages/Fronts/card-096.png diff --git a/src/main/resources/GUI images/Fronts/card-097.png b/src/main/resources/GUIImages/Fronts/card-097.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-097.png rename to src/main/resources/GUIImages/Fronts/card-097.png diff --git a/src/main/resources/GUI images/Fronts/card-098.png b/src/main/resources/GUIImages/Fronts/card-098.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-098.png rename to src/main/resources/GUIImages/Fronts/card-098.png diff --git a/src/main/resources/GUI images/Fronts/card-099.png b/src/main/resources/GUIImages/Fronts/card-099.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-099.png rename to src/main/resources/GUIImages/Fronts/card-099.png diff --git a/src/main/resources/GUI images/Fronts/card-100.png b/src/main/resources/GUIImages/Fronts/card-100.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-100.png rename to src/main/resources/GUIImages/Fronts/card-100.png diff --git a/src/main/resources/GUI images/Fronts/card-101.png b/src/main/resources/GUIImages/Fronts/card-101.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-101.png rename to src/main/resources/GUIImages/Fronts/card-101.png diff --git a/src/main/resources/GUI images/Fronts/card-102.png b/src/main/resources/GUIImages/Fronts/card-102.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-102.png rename to src/main/resources/GUIImages/Fronts/card-102.png diff --git a/src/main/resources/GUI images/Fronts/card-103.png b/src/main/resources/GUIImages/Fronts/card-103.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-103.png rename to src/main/resources/GUIImages/Fronts/card-103.png diff --git a/src/main/resources/GUI images/Fronts/card-104.png b/src/main/resources/GUIImages/Fronts/card-104.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-104.png rename to src/main/resources/GUIImages/Fronts/card-104.png diff --git a/src/main/resources/GUI images/Fronts/card-105.png b/src/main/resources/GUIImages/Fronts/card-105.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-105.png rename to src/main/resources/GUIImages/Fronts/card-105.png diff --git a/src/main/resources/GUI images/Fronts/card-106.png b/src/main/resources/GUIImages/Fronts/card-106.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-106.png rename to src/main/resources/GUIImages/Fronts/card-106.png diff --git a/src/main/resources/GUI images/Fronts/card-107.png b/src/main/resources/GUIImages/Fronts/card-107.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-107.png rename to src/main/resources/GUIImages/Fronts/card-107.png diff --git a/src/main/resources/GUI images/Fronts/card-108.png b/src/main/resources/GUIImages/Fronts/card-108.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-108.png rename to src/main/resources/GUIImages/Fronts/card-108.png diff --git a/src/main/resources/GUI images/Fronts/card-109.png b/src/main/resources/GUIImages/Fronts/card-109.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-109.png rename to src/main/resources/GUIImages/Fronts/card-109.png diff --git a/src/main/resources/GUI images/Fronts/card-110.png b/src/main/resources/GUIImages/Fronts/card-110.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-110.png rename to src/main/resources/GUIImages/Fronts/card-110.png diff --git a/src/main/resources/GUI images/Fronts/card-111.png b/src/main/resources/GUIImages/Fronts/card-111.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-111.png rename to src/main/resources/GUIImages/Fronts/card-111.png diff --git a/src/main/resources/GUI images/Fronts/card-112.png b/src/main/resources/GUIImages/Fronts/card-112.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-112.png rename to src/main/resources/GUIImages/Fronts/card-112.png diff --git a/src/main/resources/GUI images/Fronts/card-113.png b/src/main/resources/GUIImages/Fronts/card-113.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-113.png rename to src/main/resources/GUIImages/Fronts/card-113.png diff --git a/src/main/resources/GUI images/Fronts/card-114.png b/src/main/resources/GUIImages/Fronts/card-114.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-114.png rename to src/main/resources/GUIImages/Fronts/card-114.png diff --git a/src/main/resources/GUI images/Fronts/card-115.png b/src/main/resources/GUIImages/Fronts/card-115.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-115.png rename to src/main/resources/GUIImages/Fronts/card-115.png diff --git a/src/main/resources/GUI images/Fronts/card-116.png b/src/main/resources/GUIImages/Fronts/card-116.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-116.png rename to src/main/resources/GUIImages/Fronts/card-116.png diff --git a/src/main/resources/GUI images/Fronts/card-117.png b/src/main/resources/GUIImages/Fronts/card-117.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-117.png rename to src/main/resources/GUIImages/Fronts/card-117.png diff --git a/src/main/resources/GUI images/Fronts/card-118.png b/src/main/resources/GUIImages/Fronts/card-118.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-118.png rename to src/main/resources/GUIImages/Fronts/card-118.png diff --git a/src/main/resources/GUI images/Fronts/card-A.png b/src/main/resources/GUIImages/Fronts/card-A.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-A.png rename to src/main/resources/GUIImages/Fronts/card-A.png diff --git a/src/main/resources/GUI images/Fronts/card-B.png b/src/main/resources/GUIImages/Fronts/card-B.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-B.png rename to src/main/resources/GUIImages/Fronts/card-B.png diff --git a/src/main/resources/GUI images/Fronts/card-C.png b/src/main/resources/GUIImages/Fronts/card-C.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-C.png rename to src/main/resources/GUIImages/Fronts/card-C.png diff --git a/src/main/resources/GUI images/Fronts/card-D.png b/src/main/resources/GUIImages/Fronts/card-D.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-D.png rename to src/main/resources/GUIImages/Fronts/card-D.png diff --git a/src/main/resources/GUI images/Fronts/card-E.png b/src/main/resources/GUIImages/Fronts/card-E.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-E.png rename to src/main/resources/GUIImages/Fronts/card-E.png diff --git a/src/main/resources/GUI images/Fronts/card-F.png b/src/main/resources/GUIImages/Fronts/card-F.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-F.png rename to src/main/resources/GUIImages/Fronts/card-F.png diff --git a/src/main/resources/GUI images/Fronts/card-G.png b/src/main/resources/GUIImages/Fronts/card-G.png similarity index 100% rename from src/main/resources/GUI images/Fronts/card-G.png rename to src/main/resources/GUIImages/Fronts/card-G.png diff --git a/src/main/resources/GUIScene/login.fxml b/src/main/resources/GUIScene/login.fxml new file mode 100644 index 0000000..9e55c8f --- /dev/null +++ b/src/main/resources/GUIScene/login.fxml @@ -0,0 +1,28 @@ + + + + + + + + + +