From c23344e8efa89dc74478371ead70985786efa680 Mon Sep 17 00:00:00 2001 From: Ceren Ugurlu Date: Sun, 17 Mar 2019 13:24:32 +0000 Subject: [PATCH] Revert "Merge branch 'master' into 'vegetarian_meal'" This reverts commit b3eeffdb32aa058f9f1aa6b9cbec3d05e2d07b8f --- src/.idea/workspace.xml | 22 +- .../controller/DashBoardController.java | 4 +- .../greenify/client/rest/UserService.java | 23 - .../src/main/resources/fxml/dashboard.fxml | 2 +- .../data/repository/UserRepository.java | 6 +- .../greenify/server/service/UserService.java | 1 - src/src/.classpath | 7 - src/src/.idea/checkstyle-idea.xml | 16 - src/src/.idea/checkstyleidea-libs/readme.txt | 6 - src/src/.idea/compiler.xml | 8 - src/src/.idea/encodings.xml | 4 - src/src/.idea/gradle.xml | 23 - src/src/.idea/misc.xml | 7 - src/src/.idea/uiDesigner.xml | 124 --- src/src/.idea/vcs.xml | 6 - src/src/.idea/workspace.xml | 985 ------------------ src/src/.project | 17 - src/src/Client/.classpath | 270 ----- src/src/Client/.idea/compiler.xml | 9 - src/src/Client/.idea/encodings.xml | 4 - src/src/Client/.idea/gradle.xml | 20 - src/src/Client/.idea/misc.xml | 7 - src/src/Client/.idea/modules.xml | 8 - src/src/Client/.idea/uiDesigner.xml | 124 --- src/src/Client/.idea/workspace.xml | 489 --------- src/src/Client/.project | 17 - src/src/Client/build.gradle | 83 -- .../java/greenify/client/Application.java | 45 - .../controller/DashBoardController.java | 73 -- .../controller/RegisterWindowController.java | 68 -- .../client/controller/UserController.java | 112 -- .../greenify/client/rest/UserService.java | 62 -- .../src/main/resources/addActivity1.png | Bin 8381 -> 0 bytes .../src/main/resources/addActivity2.png | Bin 8406 -> 0 bytes .../src/main/resources/application.properties | 0 .../main/resources/fxml/RegisterWindow.fxml | 44 - .../src/main/resources/fxml/dashboard.fxml | 99 -- .../src/main/resources/fxml/sample.fxml | 34 - .../Client/src/main/resources/pinkleaf.jpg | Bin 252662 -> 0 bytes .../src/main/resources/registerBackground.png | Bin 19748 -> 0 bytes .../resources/stylesheets/Big Designer.ttf | Bin 222308 -> 0 bytes .../resources/stylesheets/DesignioRegular.otf | Bin 20716 -> 0 bytes .../resources/stylesheets/dashboardStyle.css | 31 - .../Client/src/test/java/UserServiceTest.java | 35 - src/src/Common/.classpath | 11 - src/src/Common/.project | 17 - src/src/Common/build.gradle | 45 - .../greenify/common/ApplicationException.java | 7 - .../java/greenify/common/ErrorResponse.java | 19 - .../main/java/greenify/common/UserDTO.java | 35 - .../src/test/java/ErrorResponseTest.java | 23 - src/src/Common/src/test/java/UserDTOTest.java | 25 - src/src/Server/.classpath | 439 -------- src/src/Server/.idea/encodings.xml | 4 - src/src/Server/.idea/gradle.xml | 20 - src/src/Server/.idea/misc.xml | 7 - src/src/Server/.idea/workspace.xml | 443 -------- src/src/Server/.project | 17 - src/src/Server/build.gradle | 66 -- .../java/greenify/server/Application.java | 13 - .../java/greenify/server/data/model/User.java | 82 -- .../data/repository/UserRepository.java | 10 - .../greenify/server/rest/MainController.java | 38 - .../server/rest/RestExceptionHandler.java | 17 - .../greenify/server/rest/UserController.java | 32 - .../greenify/server/service/UserService.java | 68 -- .../src/main/resources/application.properties | 6 - .../Server/src/test/java/ApplicationTest.java | 16 - .../src/test/java/UserControllerTest.java | 46 - src/src/Server/src/test/java/UserTest.java | 46 - 70 files changed, 10 insertions(+), 4437 deletions(-) delete mode 100644 src/src/.classpath delete mode 100644 src/src/.idea/checkstyle-idea.xml delete mode 100644 src/src/.idea/checkstyleidea-libs/readme.txt delete mode 100644 src/src/.idea/compiler.xml delete mode 100644 src/src/.idea/encodings.xml delete mode 100644 src/src/.idea/gradle.xml delete mode 100644 src/src/.idea/misc.xml delete mode 100644 src/src/.idea/uiDesigner.xml delete mode 100644 src/src/.idea/vcs.xml delete mode 100644 src/src/.idea/workspace.xml delete mode 100644 src/src/.project delete mode 100644 src/src/Client/.classpath delete mode 100644 src/src/Client/.idea/compiler.xml delete mode 100644 src/src/Client/.idea/encodings.xml delete mode 100644 src/src/Client/.idea/gradle.xml delete mode 100644 src/src/Client/.idea/misc.xml delete mode 100644 src/src/Client/.idea/modules.xml delete mode 100644 src/src/Client/.idea/uiDesigner.xml delete mode 100644 src/src/Client/.idea/workspace.xml delete mode 100644 src/src/Client/.project delete mode 100644 src/src/Client/build.gradle delete mode 100644 src/src/Client/src/main/java/greenify/client/Application.java delete mode 100644 src/src/Client/src/main/java/greenify/client/controller/DashBoardController.java delete mode 100644 src/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java delete mode 100644 src/src/Client/src/main/java/greenify/client/controller/UserController.java delete mode 100644 src/src/Client/src/main/java/greenify/client/rest/UserService.java delete mode 100644 src/src/Client/src/main/resources/addActivity1.png delete mode 100644 src/src/Client/src/main/resources/addActivity2.png delete mode 100644 src/src/Client/src/main/resources/application.properties delete mode 100644 src/src/Client/src/main/resources/fxml/RegisterWindow.fxml delete mode 100644 src/src/Client/src/main/resources/fxml/dashboard.fxml delete mode 100644 src/src/Client/src/main/resources/fxml/sample.fxml delete mode 100644 src/src/Client/src/main/resources/pinkleaf.jpg delete mode 100644 src/src/Client/src/main/resources/registerBackground.png delete mode 100644 src/src/Client/src/main/resources/stylesheets/Big Designer.ttf delete mode 100644 src/src/Client/src/main/resources/stylesheets/DesignioRegular.otf delete mode 100644 src/src/Client/src/main/resources/stylesheets/dashboardStyle.css delete mode 100644 src/src/Client/src/test/java/UserServiceTest.java delete mode 100644 src/src/Common/.classpath delete mode 100644 src/src/Common/.project delete mode 100644 src/src/Common/build.gradle delete mode 100644 src/src/Common/src/main/java/greenify/common/ApplicationException.java delete mode 100644 src/src/Common/src/main/java/greenify/common/ErrorResponse.java delete mode 100644 src/src/Common/src/main/java/greenify/common/UserDTO.java delete mode 100644 src/src/Common/src/test/java/ErrorResponseTest.java delete mode 100644 src/src/Common/src/test/java/UserDTOTest.java delete mode 100644 src/src/Server/.classpath delete mode 100644 src/src/Server/.idea/encodings.xml delete mode 100644 src/src/Server/.idea/gradle.xml delete mode 100644 src/src/Server/.idea/misc.xml delete mode 100644 src/src/Server/.idea/workspace.xml delete mode 100644 src/src/Server/.project delete mode 100644 src/src/Server/build.gradle delete mode 100644 src/src/Server/src/main/java/greenify/server/Application.java delete mode 100644 src/src/Server/src/main/java/greenify/server/data/model/User.java delete mode 100644 src/src/Server/src/main/java/greenify/server/data/repository/UserRepository.java delete mode 100644 src/src/Server/src/main/java/greenify/server/rest/MainController.java delete mode 100644 src/src/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java delete mode 100644 src/src/Server/src/main/java/greenify/server/rest/UserController.java delete mode 100644 src/src/Server/src/main/java/greenify/server/service/UserService.java delete mode 100644 src/src/Server/src/main/resources/application.properties delete mode 100644 src/src/Server/src/test/java/ApplicationTest.java delete mode 100644 src/src/Server/src/test/java/UserControllerTest.java delete mode 100644 src/src/Server/src/test/java/UserTest.java diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index b69fda1..02586c2 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -76,20 +76,20 @@ - + - + - + @@ -353,7 +353,7 @@ - + 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 3e4b76e..a7df146 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Controller; @Controller public class DashBoardController { - - private int count = 0; + @Autowired + UserService userService; @FXML public AnchorPane menuBar; diff --git a/src/Client/src/main/java/greenify/client/rest/UserService.java b/src/Client/src/main/java/greenify/client/rest/UserService.java index 9ede326..b5e2865 100644 --- a/src/Client/src/main/java/greenify/client/rest/UserService.java +++ b/src/Client/src/main/java/greenify/client/rest/UserService.java @@ -12,7 +12,6 @@ import org.springframework.web.util.UriComponentsBuilder; @Service public class UserService { - @Autowired RestTemplate restTemplate; @@ -37,26 +36,4 @@ public class UserService { System.out.println(builder.build().encode().toUri()); return this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class); } - - public UserDTO loginUser(String name, String password) { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", MediaType.APPLICATION_JSON_VALUE); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http://localhost:8080/loginUser") - .queryParam("name", name) - .queryParam("password", password); - HttpEntity entity = new HttpEntity<>(headers); - System.out.println(builder.build().encode().toUri()); - return this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class); - } - - public UserDTO addVeganMeal(Long id, String name) { - HttpHeaders headers = new HttpHeaders(); - headers.set("Accept", MediaType.APPLICATION_JSON_VALUE); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("http://localhost:8080/addVeganMeal") - .queryParam("id", id) - .queryParam("name", name); - HttpEntity entity = new HttpEntity<>(headers); - System.out.println(builder.build().encode().toUri()); - return this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class); - } } diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml index 43fd60d..1627774 100644 --- a/src/Client/src/main/resources/fxml/dashboard.fxml +++ b/src/Client/src/main/resources/fxml/dashboard.fxml @@ -10,7 +10,7 @@ -