From 0e81d3375191504d039d7087717048b74e286ec1 Mon Sep 17 00:00:00 2001 From: ZartaX0O3 <76948902+ZartaX0O3@users.noreply.github.com> Date: Fri, 3 Dec 2021 17:26:11 +0100 Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20du=20projet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/discord.xml | 7 ++ code/.gitignore | 2 +- code/{src => ressources}/css/anchor.css | 1 - code/{src => ressources}/css/sample.css | 0 .../sample => ressources/fxml}/MainPage.fxml | 9 ++- .../fxml}/TopPlayers.fxml | 27 ++++--- code/ressources/image/button/add.png | Bin 0 -> 1853 bytes code/ressources/image/button/backup.png | Bin 0 -> 1071 bytes code/ressources/image/button/burger.png | Bin 0 -> 295 bytes code/ressources/image/button/data.png | Bin 0 -> 675 bytes code/ressources/image/button/exit.png | Bin 0 -> 1056 bytes code/ressources/image/button/home.png | Bin 0 -> 862 bytes code/ressources/{ => image}/fire.gif | Bin code/ressources/{ => image}/logo.png | Bin .../MainPageController.java | 8 +-- .../TopPlayerController.java | 9 +-- code/src/launcher/Main.java | 68 +++++++++++++----- code/src/{sample => model}/DataTable.java | 9 +-- code/src/{sample => model}/Database.java | 2 +- .../projetjavafx/fxml/ConfigurationMenu.fxml | 25 +++++++ 20 files changed, 108 insertions(+), 59 deletions(-) create mode 100644 .idea/discord.xml rename code/{src => ressources}/css/anchor.css (95%) rename code/{src => ressources}/css/sample.css (100%) rename code/{src/sample => ressources/fxml}/MainPage.fxml (91%) rename code/{src/sample => ressources/fxml}/TopPlayers.fxml (90%) create mode 100644 code/ressources/image/button/add.png create mode 100644 code/ressources/image/button/backup.png create mode 100644 code/ressources/image/button/burger.png create mode 100644 code/ressources/image/button/data.png create mode 100644 code/ressources/image/button/exit.png create mode 100644 code/ressources/image/button/home.png rename code/ressources/{ => image}/fire.gif (100%) rename code/ressources/{ => image}/logo.png (100%) rename code/src/{sample => controller}/MainPageController.java (86%) rename code/src/{sample => controller}/TopPlayerController.java (76%) rename code/src/{sample => model}/DataTable.java (77%) rename code/src/{sample => model}/Database.java (97%) create mode 100644 out/production/projetjavafx/fxml/ConfigurationMenu.fxml diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..8cf359d --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/code/.gitignore b/code/.gitignore index 03ecfe8..8f73520 100644 --- a/code/.gitignore +++ b/code/.gitignore @@ -6,7 +6,7 @@ # BlueJ files *.ctxt - +/.idea # Mobile Tools for Java (J2ME) .mtj.tmp/ diff --git a/code/src/css/anchor.css b/code/ressources/css/anchor.css similarity index 95% rename from code/src/css/anchor.css rename to code/ressources/css/anchor.css index 82d8e80..f8e560d 100644 --- a/code/src/css/anchor.css +++ b/code/ressources/css/anchor.css @@ -1,5 +1,4 @@ #player{ -fx-text-fill: #ffffff; - } \ No newline at end of file diff --git a/code/src/css/sample.css b/code/ressources/css/sample.css similarity index 100% rename from code/src/css/sample.css rename to code/ressources/css/sample.css diff --git a/code/src/sample/MainPage.fxml b/code/ressources/fxml/MainPage.fxml similarity index 91% rename from code/src/sample/MainPage.fxml rename to code/ressources/fxml/MainPage.fxml index a169378..a336485 100644 --- a/code/src/sample/MainPage.fxml +++ b/code/ressources/fxml/MainPage.fxml @@ -8,20 +8,19 @@ - - + xmlns="http://javafx.com/javafx/11" fx:controller="controller.MainPageController"> - + + - + diff --git a/code/src/sample/TopPlayers.fxml b/code/ressources/fxml/TopPlayers.fxml similarity index 90% rename from code/src/sample/TopPlayers.fxml rename to code/ressources/fxml/TopPlayers.fxml index b4165a2..cadb8fa 100644 --- a/code/src/sample/TopPlayers.fxml +++ b/code/ressources/fxml/TopPlayers.fxml @@ -10,16 +10,15 @@ - - - - + + - + - + -