From bab5ef0a9399509efe096cd52c55bfd20914af93 Mon Sep 17 00:00:00 2001 From: Marc Beyer Date: Mon, 15 Nov 2021 13:17:43 +0100 Subject: [PATCH] added css --- hellofx/app/build.gradle.kts | 8 +- .../resources/main/client/main-view.fxml | 175 ++++++++---------- .../src/main/java/client/MainApplication.java | 5 +- .../src/main/java/client/MainController.java | 6 +- .../src/main/resources/client/main-view.fxml | 65 +++---- .../app/src/main/resources/client/style.css | 6 + ...estController.java => DataController.java} | 2 +- 7 files changed, 127 insertions(+), 140 deletions(-) create mode 100644 hellofx/app/src/main/resources/client/style.css rename hellofx/data/src/main/java/res/{RestController.java => DataController.java} (98%) diff --git a/hellofx/app/build.gradle.kts b/hellofx/app/build.gradle.kts index a91eaac..6a5a8cf 100644 --- a/hellofx/app/build.gradle.kts +++ b/hellofx/app/build.gradle.kts @@ -29,13 +29,13 @@ val jar by tasks.getting(Jar::class) { }) } -tasks.register("blabla", Copy::class) { - group = "dasdas" +tasks.register("rebuild and move", Copy::class) { + group = "custom" dependsOn("clean") dependsOn("jar") from("$buildDir/libs/app.jar") - mkdir("$buildDir/newShit/") - into("$buildDir/newShit/") + mkdir("$buildDir/out/") + into("$buildDir/out/") } diff --git a/hellofx/app/build/resources/main/client/main-view.fxml b/hellofx/app/build/resources/main/client/main-view.fxml index 469829e..f2fae1d 100644 --- a/hellofx/app/build/resources/main/client/main-view.fxml +++ b/hellofx/app/build/resources/main/client/main-view.fxml @@ -6,128 +6,117 @@ - + - - + + - + - + - - - - - - - - - - + + + + + + + - - - + + + - - + - - - - - - - + + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + diff --git a/hellofx/app/src/main/java/client/MainApplication.java b/hellofx/app/src/main/java/client/MainApplication.java index 7e64ed6..777917d 100644 --- a/hellofx/app/src/main/java/client/MainApplication.java +++ b/hellofx/app/src/main/java/client/MainApplication.java @@ -4,15 +4,16 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; -import res.RestController; import java.io.IOException; +import java.util.Objects; public class MainApplication extends Application { @Override public void start(Stage stage) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); - Scene scene = new Scene(fxmlLoader.load(), 1200, 800); + Scene scene = new Scene(fxmlLoader.load(), 1200, 700); + scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("style.css")).toExternalForm()); stage.setTitle("Hello!"); stage.setScene(scene); stage.show(); diff --git a/hellofx/app/src/main/java/client/MainController.java b/hellofx/app/src/main/java/client/MainController.java index d564c3c..cd95f68 100644 --- a/hellofx/app/src/main/java/client/MainController.java +++ b/hellofx/app/src/main/java/client/MainController.java @@ -6,7 +6,7 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import res.Event; -import res.RestController; +import res.DataController; public class MainController { @FXML @@ -30,8 +30,8 @@ public class MainController { @FXML protected void onAddBtnClick(){ - RestController restController = new RestController(); - Event[] eventList = restController.getAllEvents(); + DataController dataController = new DataController(); + Event[] eventList = dataController.getAllEvents(); for(Event event : eventList){ Label label = new Label(); diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml index e3ca47b..f2fae1d 100644 --- a/hellofx/app/src/main/resources/client/main-view.fxml +++ b/hellofx/app/src/main/resources/client/main-view.fxml @@ -6,103 +6,94 @@ - + - - + + - + - + - - - - - - - - - - + + + + + + + - - - + + + diff --git a/hellofx/app/src/main/resources/client/style.css b/hellofx/app/src/main/resources/client/style.css new file mode 100644 index 0000000..96588a7 --- /dev/null +++ b/hellofx/app/src/main/resources/client/style.css @@ -0,0 +1,6 @@ + +.main-btn{ + -fx-background-color: #424242; + -fx-text-fill: white; + -fx-border-radius: 50em; +} \ No newline at end of file diff --git a/hellofx/data/src/main/java/res/RestController.java b/hellofx/data/src/main/java/res/DataController.java similarity index 98% rename from hellofx/data/src/main/java/res/RestController.java rename to hellofx/data/src/main/java/res/DataController.java index 32978d5..1ea611a 100644 --- a/hellofx/data/src/main/java/res/RestController.java +++ b/hellofx/data/src/main/java/res/DataController.java @@ -9,7 +9,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; -public class RestController { +public class DataController { private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events"; private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";