From 563c72ffec678aeee6fc5114d69f51dcff7d7cfa Mon Sep 17 00:00:00 2001 From: cugurlu Date: Mon, 18 Mar 2019 16:56:44 +0100 Subject: [PATCH 1/5] Update branch --- .../src/main/java/greenify/client/Application.java | 2 -- .../client/controller/DashBoardController.java | 14 ++++++-------- .../greenify/client/controller/UserController.java | 1 - src/Client/src/main/resources/fxml/dashboard.fxml | 1 + src/Client/src/main/resources/fxml/sample.fxml | 10 +++------- .../main/resources/stylesheets/dashboardStyle.css | 9 --------- .../java/greenify/server/rest/UserController.java | 6 +++--- src/Server/src/test/java/ApplicationTest.java | 1 + .../greenify/server/service/UserServiceTest.java | 1 - 9 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/Application.java b/src/Client/src/main/java/greenify/client/Application.java index 519055a..77ae0c0 100644 --- a/src/Client/src/main/java/greenify/client/Application.java +++ b/src/Client/src/main/java/greenify/client/Application.java @@ -43,8 +43,6 @@ public class Application extends javafx.application.Application { Parent rootNode = load(this.getClass().getClassLoader().getResource("fxml/sample.fxml")); primaryStage.setTitle("Greenify"); Scene scene = new Scene(rootNode); - scene.getStylesheets() - .add(getClass().getClassLoader().getResource("stylesheets/LoginWindowStyle.css").toExternalForm()); primaryStage.setScene(scene); primaryStage.show(); } diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java index 8f2f5e8..6d1a762 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -36,12 +36,16 @@ public class DashBoardController { @FXML private Label welcomebacktext; - FadeTransition fadeTrans; + private FadeTransition fadeTrans; public void initialize() { welcomebacktext.setText("Welcome back, " + userService.currentUser.getName() + "!"); } + /** + * Add transition between scenes. + * @param node for method + */ public void addFadeTransition(Node node) { fadeTrans = new FadeTransition(Duration.millis(400), node); @@ -50,7 +54,6 @@ public class DashBoardController { fadeTrans.play(); } - /** * displays the dashboard pane. * @param event the event (clicking the button) @@ -71,7 +74,6 @@ public class DashBoardController { */ public void displayActivities(ActionEvent event) { addFadeTransition(activitiesPane); - totalVeganMealCounter.setText("" + userService.currentUser.getVeganMeal()); System.out.println("display activities"); dashboardPane.setVisible(false); @@ -90,8 +92,6 @@ public class DashBoardController { dashboardPane.setVisible(false); userPane.setVisible(true); activitiesPane.setVisible(false); - - } /** @@ -99,8 +99,6 @@ public class DashBoardController { * @param event the event (clicking the button) */ public void addVeganMeal(ActionEvent event) { - FadeTransition updateTrans = new FadeTransition(Duration.millis(200), totalVeganMealCounter); - count++; int net = userService.currentUser.getVeganMeal() + count; totalVeganMealCounter.setText("" + net); @@ -110,4 +108,4 @@ public class DashBoardController { userService.currentUser.getName()); System.out.println("Vegetarian meal is added"); } -} \ No newline at end of file +} diff --git a/src/Client/src/main/java/greenify/client/controller/UserController.java b/src/Client/src/main/java/greenify/client/controller/UserController.java index 998564e..04fd9fe 100644 --- a/src/Client/src/main/java/greenify/client/controller/UserController.java +++ b/src/Client/src/main/java/greenify/client/controller/UserController.java @@ -71,7 +71,6 @@ public class UserController { .getResource("stylesheets/dashboardStyle.css").toExternalForm()); Stage appStage = new Stage(); appStage.setScene(scene); - appStage.setTitle("Greenify - " + usernameField.getText()); appStage.show(); } diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml index d0ec88a..9c82caf 100644 --- a/src/Client/src/main/resources/fxml/dashboard.fxml +++ b/src/Client/src/main/resources/fxml/dashboard.fxml @@ -216,3 +216,4 @@ + diff --git a/src/Client/src/main/resources/fxml/sample.fxml b/src/Client/src/main/resources/fxml/sample.fxml index 9087fc3..ea80989 100644 --- a/src/Client/src/main/resources/fxml/sample.fxml +++ b/src/Client/src/main/resources/fxml/sample.fxml @@ -1,14 +1,10 @@ - - - - @@ -17,15 +13,15 @@ - +