sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update changes

Browse Source
This commit is contained in:
cugurlu
2019-03-17 15:19:43 +01:00
parent 50c58da035
commit a605e1a92e
16 changed files with 647 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

622
src/.idea/workspace.xml generated
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/Server/src/test/java/greenify/server/rest/UserControllerTest.java" description="@WebMvcTest(UserController.class)" line="1" />
</component>
<component name="ChangeListManager">
<list default="true" id="317f638e-9a63-4072-b3f3-0ddf783c2024" name="Default Changelist" comment="" />
<ignored path="$PROJECT_DIR$/.gradle/" />
@@ -76,20 +79,26 @@
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="src" type="f1a62948:ProjectNode" />
<item name=":src:Server" type="2d1252cf:ModuleNode" />
<item name="OOPP" type="2d1252cf:ModuleNode" />
<item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="src" type="f1a62948:ProjectNode" />
<item name="OOPP" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="src" type="f1a62948:ProjectNode" />
<item name=":src:Server" type="2d1252cf:ModuleNode" />
<item name="OOPP" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="application" type="c8890929:TasksNode$1" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="src" type="f1a62948:ProjectNode" />
<item name=":src:Server" type="2d1252cf:ModuleNode" />
<item name="OOPP" type="2d1252cf:ModuleNode" />
<item name="Tasks" type="e4a08cd1:TasksNode" />
<item name="build" type="c8890929:TasksNode$1" />
</path>
@@ -103,110 +112,19 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/dashboard.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<entry file="file://$PROJECT_DIR$/../build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/sample.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="48" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/rest/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<folding>
<element signature="e#637#638#0" expanded="true" />
<element signature="e#675#676#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="29" selection-start-column="29" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/RegisterWindow.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="44" selection-start-line="44" selection-end-line="44" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="12" selection-start-line="12" selection-end-line="12" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/RegisterWindowController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="61" selection-start-line="61" selection-end-line="61" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="95" column="5" selection-start-line="95" selection-start-column="5" selection-end-line="95" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="67" selection-start-line="67" selection-end-line="67" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="247">
<caret line="23" column="49" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../build.gradle">
<entry file="file://$PROJECT_DIR$/Server/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="23" column="36" selection-start-line="23" selection-start-column="36" selection-end-line="23" selection-end-column="36" />
<state relative-caret-position="85">
<caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
</state>
</provider>
</entry>
@@ -227,6 +145,8 @@
<find>add</find>
<find>sig</find>
<find>regis</find>
<find>greenify</find>
<find>userC</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -235,11 +155,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Common/src/main/java/gogreen/common/UserDTO.java" />
<option value="$PROJECT_DIR$/Common/src/main/java/gogreen/common/ApplicationException.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/model/User.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserRepository.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/UserController.java" />
<option value="$PROJECT_DIR$/Common/src/main/java/gogreen/common/ErrorResponse.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/ExceptionHandler.java" />
@@ -253,10 +168,8 @@
<option value="$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java" />
<option value="$PROJECT_DIR$/Common/src/test/java/gogreen/common/UserDTOTest.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java" />
<option value="$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserJpaRepository.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java" />
<option value="$PROJECT_DIR$/Common/src/test/java/ErrorResponseTest.java" />
<option value="$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java" />
<option value="$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java" />
@@ -266,22 +179,32 @@
<option value="$PROJECT_DIR$/Server/src/resources/application.properties" />
<option value="$PROJECT_DIR$/Server/src/application.properties" />
<option value="$PROJECT_DIR$/Server/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java" />
<option value="$PROJECT_DIR$/Common/build.gradle" />
<option value="$PROJECT_DIR$/Server/build.gradle" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java" />
<option value="$PROJECT_DIR$/Client/src/main/resources/stylesheets/dashboardStyle.css" />
<option value="$PROJECT_DIR$/Client/src/main/resources/fxml/dashboard.fxml" />
<option value="$PROJECT_DIR$/Client/src/main/resources/fxml/sample.fxml" />
<option value="$PROJECT_DIR$/Client/src/main/resources/fxml/RegisterWindow.fxml" />
<option value="$PROJECT_DIR$/Client/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/RegisterWindowController.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/rest/UserService.java" />
<option value="$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java" />
<option value="$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java" />
<option value="$PROJECT_DIR$/Client/src/test/java/ApplicationStartTest.java" />
<option value="$PROJECT_DIR$/Client/src/test/java/ApplicationTest.java" />
<option value="$PROJECT_DIR$/Server/build.gradle" />
<option value="$PROJECT_DIR$/Server/src/test/java/UserRepoIntegrationTest.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/UserRepositoryTest.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/greenify/server/data/repository/UserRepositoryTest.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/greenify/server/service/UserServiceTest.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java" />
<option value="$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java" />
<option value="$PROJECT_DIR$/Server/src/test/java/greenify/server/rest/UserControllerTest.java" />
<option value="$PROJECT_DIR$/../build.gradle" />
</list>
</option>
@@ -293,7 +216,8 @@
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="820" />
<option name="x" value="-9" />
<option name="y" value="-9" />
<option name="width" value="1110" />
<option name="height" value="1040" />
</component>
@@ -311,6 +235,32 @@
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
</path>
<path>
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
</path>
<path>
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="Server" type="2674bda8:ScopeViewTreeModel$GroupNode" />
</path>
<path>
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="Server" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
</path>
<path>
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="src" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="Server" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="main" type="2674bda8:ScopeViewTreeModel$GroupNode" />
<item name="resources" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="src" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="OOPP" type="2674bda8:ScopeViewTreeModel$GroupNode" />
@@ -329,7 +279,7 @@
<property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" />
<property name="ToolWindowCheckStyle.ShowToolbar" value="false" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552772044348" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552831813951" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../My Courses/OOP project/OOPP" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
@@ -340,6 +290,9 @@
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="gogreen.client" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\ceren\Desktop\lastGreenify\template-master\src\Server\src\test\java\greenify\server\rest" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -353,7 +306,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Gradle.src:Client [bootRun]">
<component name="RunManager" selected="Gradle.src::Users:ceren:Desktop:lastGreenify:template-master [build]">
<configuration name="src:Client [bootRun]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
@@ -414,7 +367,7 @@
<configuration name="src::Users:ceren:Desktop:lastGreenify:template-master [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/Server" />
<option name="externalProjectPath" value="$PROJECT_DIR$/.." />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
@@ -466,6 +419,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Gradle.src::Users:ceren:Desktop:lastGreenify:template-master [build]" />
<item itemvalue="Gradle.src::Users:ceren:Desktop:lastGreenify:template-master [clean]" />
<item itemvalue="Gradle.src::Users:ceren:Desktop:lastGreenify:template-master [bootRun]" />
<item itemvalue="Gradle.src:Client [bootRun]" />
<item itemvalue="Gradle.src:Server [bootRun]" />
</list>
@@ -485,26 +441,35 @@
<servers />
</component>
<component name="TestHistory">
<history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 13s.xml">
<configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 45m 33s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 18s.xml">
<configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 48m 28s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="src_Common_[test] - 2019.03.16 at 13h 48m 29s.xml">
<configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 49m 13s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="src_Common_[test] - 2019.03.16 at 13h 49m 26s.xml">
<configuration name="src:Common [test]" configurationId="GradleRunConfiguration" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 51m 31s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="ErrorResponseTest - 2019.03.16 at 13h 49m 37s.xml">
<configuration name="ErrorResponseTest" configurationId="JUnit" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 52m 57s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="src_Client_[test] - 2019.03.16 at 13h 50m 28s.xml">
<configuration name="src:Client [test]" configurationId="GradleRunConfiguration" />
<history-entry file="src_Server_[test] - 2019.03.17 at 13h 53m 31s.xml">
<configuration name="src:Server [test]" configurationId="GradleRunConfiguration" />
</history-entry>
<history-entry file="All_in_OOPP_src_Client_test - 2019.03.16 at 13h 51m 04s.xml">
<configuration name="All in OOPP.src.Client.test" configurationId="JUnit" />
<history-entry file="UserControllerTest_(1) - 2019.03.17 at 13h 56m 29s.xml">
<configuration name="UserControllerTest (1)" configurationId="JUnit" />
</history-entry>
<history-entry file="UserControllerTest_(1) - 2019.03.17 at 13h 57m 01s.xml">
<configuration name="UserControllerTest (1)" configurationId="JUnit" />
</history-entry>
<history-entry file="UserControllerTest_(1) - 2019.03.17 at 13h 57m 25s.xml">
<configuration name="UserControllerTest (1)" configurationId="JUnit" />
</history-entry>
<history-entry file="UserControllerTest_(1) - 2019.03.17 at 14h 02m 58s.xml">
<configuration name="UserControllerTest (1)" configurationId="JUnit" />
</history-entry>
</component>
<component name="TodoView">
@@ -518,25 +483,24 @@
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49789914" weight="0.8080537" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49789914" visible="true" weight="0.67785233" />
<window_info id="Structure" order="1" sideWeight="0.5021008" side_tool="true" weight="0.17315437" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="Capture Tool" order="4" />
<window_info id="UI Designer" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32808024" />
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32719547" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.88724834" visible="true" weight="0.2917847" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.88590604" visible="true" weight="0.41926345" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="7" weight="0.32719547" />
<window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.32719547" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11275168" side_tool="true" weight="0.43201134" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11409396" side_tool="true" weight="0.41926345" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3286119" />
<window_info anchor="bottom" id="Build" order="11" weight="0.3286119" />
<window_info anchor="bottom" id="CheckStyle" order="12" weight="0.3295129" />
@@ -546,29 +510,29 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
<window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Maven" order="5" weight="0.32885906" />
<window_info anchor="right" id="Gradle" order="6" sideWeight="0.1922078" visible="true" weight="0.17181209" />
<window_info anchor="right" id="Theme Preview" order="7" />
<window_info anchor="right" id="Capture Analysis" order="8" />
<window_info anchor="right" id="Palette&#9;" order="9" />
<window_info anchor="right" id="Theme Preview" order="6" />
<window_info anchor="right" id="Capture Analysis" order="7" />
<window_info anchor="right" id="Palette&#9;" order="8" />
<window_info anchor="right" id="Gradle" order="9" sideWeight="0.1922078" weight="0.23959732" />
</layout>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49789914" weight="0.957047" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49789914" weight="0.67785233" />
<window_info id="Structure" order="1" sideWeight="0.5021008" side_tool="true" weight="0.17315437" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="Capture Tool" order="4" />
<window_info id="UI Designer" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32808024" />
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4986577" weight="0.32719547" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.88724834" visible="true" weight="0.2917847" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.88590604" visible="true" weight="0.41926345" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="7" weight="0.32719547" />
<window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49932885" weight="0.32719547" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11275168" side_tool="true" weight="0.43201134" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.11409396" side_tool="true" visible="true" weight="0.41926345" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3286119" />
<window_info anchor="bottom" id="Build" order="11" weight="0.3286119" />
<window_info anchor="bottom" id="CheckStyle" order="12" weight="0.3295129" />
@@ -578,10 +542,10 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
<window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Maven" order="5" weight="0.32885906" />
<window_info anchor="right" id="Gradle" order="6" sideWeight="0.1922078" weight="0.17181209" />
<window_info anchor="right" id="Theme Preview" order="7" />
<window_info anchor="right" id="Capture Analysis" order="8" />
<window_info anchor="right" id="Palette&#9;" order="9" />
<window_info anchor="right" id="Theme Preview" order="6" />
<window_info anchor="right" id="Capture Analysis" order="7" />
<window_info anchor="right" id="Palette&#9;" order="8" />
<window_info anchor="right" id="Gradle" order="9" sideWeight="0.1922078" weight="0.23959732" />
</layout-to-restore>
</component>
<component name="antWorkspaceConfiguration">
@@ -589,28 +553,10 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/UserDTO.java" />
<entry file="file://$PROJECT_DIR$/Common/src/test/java/gogreen/common/UserDTOTest.java" />
<entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java" />
<entry file="file://$PROJECT_DIR$/Common/src/main/java/gogreen/common/ApplicationException.java" />
<entry file="file://$PROJECT_DIR$/Server/src/test/java/gogreen/server/rest/UserControllerTest.java" />
<entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserRepository.java" />
<entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/service/UserService.java" />
<entry file="file://$PROJECT_DIR$/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java" />
<entry file="file://$PROJECT_DIR$/settings.gradle" />
<entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/rest/UserService.java" />
<entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/controller/UserController.java" />
<entry file="file://$PROJECT_DIR$/Client/src/main/java/gogreen/client/Application.java" />
<entry file="file://$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="32" column="1" selection-start-line="32" selection-start-column="1" selection-end-line="32" selection-end-column="1" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../settings.gradle">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -666,97 +612,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="34" column="47" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/Application.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="e#241#242#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
<folding>
<element signature="e#0#411#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/UserControllerTest.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="45" selection-end-column="3" />
<folding>
<element signature="e#0#2135#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/UserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731">
<caret line="46" selection-start-line="46" selection-end-line="46" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1088">
<caret line="64" column="1" selection-start-line="64" selection-start-column="1" selection-end-line="64" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/UserDTO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
@@ -764,27 +619,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ApplicationException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="40" column="13" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/stylesheets/dashboardStyle.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
@@ -792,6 +626,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/RegisterWindow.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="393">
<caret line="44" selection-start-line="44" selection-end-line="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../CSE1105.checkstyle.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/dashboard.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<provider selected="true" editor-type-id="text-editor">
@@ -808,35 +653,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/fxml/RegisterWindow.fxml">
<provider editor-type-id="JavaFX-Scene-Builder" />
<entry file="file://$PROJECT_DIR$/Client/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="44" selection-start-line="44" selection-end-line="44" />
<state>
<caret column="53" selection-start-column="53" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java">
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/model/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="12" selection-start-line="12" selection-end-line="12" />
<state relative-caret-position="697">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java">
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/DashBoardController.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="29" selection-start-column="29" selection-end-column="29" />
<state relative-caret-position="342">
<caret line="69" column="8" selection-start-line="69" selection-start-column="8" selection-end-line="69" selection-end-column="8" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/RegisterWindowController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="61" selection-start-line="61" selection-end-line="61" />
<state relative-caret-position="35">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -845,18 +692,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="95" column="5" selection-start-line="95" selection-start-column="5" selection-end-line="95" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="67" selection-start-line="67" selection-end-line="67" />
<state relative-caret-position="1000">
<caret line="102" column="25" selection-start-line="102" selection-start-column="25" selection-end-line="102" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -865,19 +702,188 @@
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/rest/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<state relative-caret-position="-585">
<caret line="17" column="10" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/test/java/ApplicationStartTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding>
<element signature="e#637#638#0" expanded="true" />
<element signature="e#675#676#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#229#230#0" expanded="true" />
<element signature="e#285#286#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/test/java/ApplicationTest.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/main/java/greenify/client/Application.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-193">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#664#665#0" expanded="true" />
<element signature="e#692#693#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/UserRepoIntegrationTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="62" selection-start-line="4" selection-start-column="62" selection-end-line="4" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/data/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" selection-start-line="10" selection-end-line="10" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework/spring-core/5.0.9.RELEASE/ab4feec73b188109eb1a3aa8aed83c1f97ed1168/spring-core-5.0.9.RELEASE-sources.jar!/org/springframework/util/Assert.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="37" column="58" selection-start-line="37" selection-start-column="58" selection-end-line="37" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/test/java/UserServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="46" column="104" selection-start-line="46" selection-start-column="104" selection-end-line="46" selection-end-column="104" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/greenify/server/data/model/UserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="6" lean-forward="true" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="67" lean-forward="true" selection-start-line="67" selection-end-line="67" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ApplicationException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Common/src/main/java/greenify/common/ErrorResponse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/RestExceptionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/greenify/server/data/repository/UserRepositoryTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/MainController.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/greenify/server/rest/UserControllerTest.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-start-column="2" selection-end-column="31" />
<folding>
<element signature="e#0#2734#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/greenify/server/service/UserServiceTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/test/java/ApplicationTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="13" column="50" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/Application.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="9" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="e#303#304#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/java/greenify/server/rest/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="23" column="36" selection-start-line="23" selection-start-column="36" selection-end-line="23" selection-end-column="36" />
<state relative-caret-position="247">
<caret line="23" column="49" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/main/resources/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
</state>
</provider>
</entry>

21
src/Client/src/main/java/greenify/client/Application.java
View File

@@ -12,26 +12,33 @@ import org.springframework.context.ConfigurableApplicationContext;
@SpringBootApplication
public class Application extends javafx.application.Application {
private ConfigurableApplicationContext springContext;
private Parent rootNode;
private FXMLLoader fxmlLoader;
private static ConfigurableApplicationContext springContext;
private static final Logger log = LoggerFactory.getLogger(Application.class);
public static void main(String[] args) {
launch(args);
}
public static Parent load(java.net.URL url) {
FXMLLoader loader = new FXMLLoader();
loader.setControllerFactory(springContext::getBean);
loader.setLocation(url);
try {
return loader.load();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@Override
public void init() throws Exception {
springContext = SpringApplication.run(Application.class);
fxmlLoader = new FXMLLoader();
fxmlLoader.setControllerFactory(springContext::getBean);
}
@Override
public void start(Stage primaryStage) throws Exception {
fxmlLoader.setLocation(this.getClass().getClassLoader().getResource("fxml/sample.fxml"));
rootNode = fxmlLoader.load();
Parent rootNode = load(this.getClass().getClassLoader().getResource("fxml/sample.fxml"));
primaryStage.setTitle("Greenify");
Scene scene = new Scene(rootNode);
primaryStage.setScene(scene);

7
src/Client/src/main/java/greenify/client/controller/DashBoardController.java
View File

@@ -6,6 +6,7 @@ import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.layout.AnchorPane;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@Controller
@@ -13,6 +14,8 @@ public class DashBoardController {
@Autowired
UserService userService;
private int count = 0;
@FXML
public AnchorPane menuBar;
public AnchorPane dashboardPane;
@@ -66,8 +69,8 @@ public class DashBoardController {
public void addVeganMeal(ActionEvent event) {
count++;
counter.setText("Count: " + count);
UserService service = new UserService();
service.addVeganMeal(null, null);
System.out.println(userService);
userService.addVeganMeal(userService.currentUser.getId(), userService.currentUser.getName());
System.out.println("Vegetarian meal is added");
}
}

13
src/Client/src/main/java/greenify/client/controller/UserController.java
View File

@@ -1,5 +1,6 @@
package greenify.client.controller;
import greenify.client.Application;
import greenify.client.rest.UserService;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
@@ -64,9 +65,7 @@ public class UserController {
* @author sem
*/
public void openDashboard() throws IOException {
Parent dash = FXMLLoader.load(
this.getClass().getClassLoader().getResource("fxml/dashboard.fxml")
);
Parent dash = Application.load (this.getClass().getClassLoader().getResource("fxml/dashboard.fxml"));
Scene scene = new Scene(dash);
scene.getStylesheets().add(getClass().getClassLoader().getResource("stylesheets/dashboardStyle.css").toExternalForm());
Stage appStage = new Stage();
@@ -97,14 +96,12 @@ public class UserController {
public void handleRegisterButtonAction(ActionEvent event) throws Exception{
//load the fxml file
Parent registerWindow = FXMLLoader.load (
this.getClass().getClassLoader().getResource("fxml/RegisterWindow.fxml")
);
Parent registerWindow = Application.load (this.getClass().getClassLoader().getResource("fxml/RegisterWindow.fxml"));
//make the window use the scene
Scene registerscene = new Scene(registerWindow);
Scene registerScene = new Scene(registerWindow);
Stage registerStage = new Stage();
//open the window
registerStage.setScene(registerscene);
registerStage.setScene(registerScene);
registerStage.setTitle("Enter register credentials");
registerStage.show();
}

40
src/Client/src/main/java/greenify/client/rest/UserService.java
View File

@@ -15,6 +15,8 @@ public class UserService {
@Autowired
RestTemplate restTemplate;
public UserDTO currentUser;
@Bean
RestTemplate restTemplate(RestTemplateBuilder builder) {
return builder.build();
@@ -34,6 +36,44 @@ public class UserService {
.queryParam("password", password);
HttpEntity<?> entity = new HttpEntity<>(headers);
System.out.println(builder.build().encode().toUri());
UserDTO result = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class);
this.currentUser = result;
return result;
}
/**
* sign ins the user.
* @param name the username of the user
* @param password the password of the user
* @return a userDTO
*/
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());
UserDTO result = this.restTemplate.getForObject(builder.build().encode().toUri(), UserDTO.class);
this.currentUser = result;
return result;
}
/**
* a user adds vegan meal.
* @param id the id of the user
* @param name the username of the user
* @return a userDTO
*/
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);
}
}

1
src/Client/src/main/resources/application.properties
View File

@@ -0,0 +1 @@
logging.level.org.springframework.beans.factory=DEBUG

0
src/Client/src/test/java/ApplicationTest.java Normal file
View File

22
src/Client/src/test/java/UserServiceTest.java
View File

@@ -21,7 +21,7 @@ public class UserServiceTest {
UserService userService;
@Test
public void mocking() throws Exception {
public void userRegisterTest() throws Exception {
UserDTO testUser = new UserDTO(1L, "Eric");
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/registerUser?name=Eric&password=password"),
UserDTO.class))
@@ -30,6 +30,26 @@ public class UserServiceTest {
UserDTO user = userService.registerUser("Eric", "password");
Assert.assertEquals(testUser, user);
}
@Test
public void userLoginTest() throws Exception {
UserDTO testUser = new UserDTO(1L, "Eric");
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/loginUser?name=Eric&password=password"),
UserDTO.class))
.thenReturn(testUser);
UserDTO user = userService.loginUser("Eric", "password");
Assert.assertEquals(testUser, user);
}
@Test
public void addVeganMealTest() throws Exception {
UserDTO testUser = new UserDTO(1L, "Eric");
Mockito.when(restTemplate.getForObject(new java.net.URI("http://localhost:8080/addVeganMeal?id=1&name=Eric"),
UserDTO.class))
.thenReturn(testUser);
UserDTO user = userService.addVeganMeal(1L, "Eric");
Assert.assertEquals(testUser, user);
}
}

2
src/Server/build.gradle
View File

@@ -34,6 +34,8 @@ targetCompatibility = 1.8
dependencies {
compile("org.springframework.boot:spring-boot-starter-web")
testCompile('org.springframework.boot:spring-boot-starter-test')
testCompile('org.springframework.boot:spring-boot-test')
compile('org.springframework.boot:spring-boot-devtools')
compile project(path: ':src:Common')
compileOnly 'org.projectlombok:lombok:1.18.6'
annotationProcessor 'org.projectlombok:lombok:1.18.6'

17
src/Server/src/main/java/greenify/server/rest/UserController.java
View File

@@ -1,17 +1,21 @@
package greenify.server.rest;
import greenify.common.UserDTO;
import greenify.server.data.model.User;
import greenify.server.data.repository.UserRepository;
import greenify.server.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
public class UserController {
@Autowired
UserService userService;
@Autowired // This means to get the bean called userRepository
// Which is auto-generated by Spring, we will use it to handle the data
UserRepository userRepository;
@RequestMapping("/registerUser")
public UserDTO registerUser(@RequestParam(value = "name") String name,
@RequestParam(value = "password") String password) {
@@ -24,6 +28,13 @@ public class UserController {
return userService.loginUser(name, password);
}
@GetMapping(path="/all")
public @ResponseBody
Iterable<User> getAllUsers() {
// This returns a JSON or XML with the users
return userRepository.findAll();
}
@RequestMapping("/addVeganMeal")
public void addVeganMeal(@RequestParam(value = "id") Long id,
@RequestParam(value = "name") String name) {

7
src/Server/src/main/java/greenify/server/service/UserService.java
View File

@@ -23,10 +23,10 @@ public class UserService {
*/
public UserDTO registerUser(String name, String password) {
User user = userRepository.findByName(name);
if (user != null) {
throw new ApplicationException("User already exists");
} else {
if (user == null) {
user = userRepository.save(new User(null, name, password, 0));
} else {
throw new ApplicationException("User already exists");
}
logger.info("Created user id=" + user.getId() + ", name=" + user.getName());
return new UserDTO(user.getId(), user.getName());
@@ -61,6 +61,7 @@ public class UserService {
int count = user.getVeganMeal();
count++;
user.setVeganMeal(count);
userRepository.save(user);
logger.info("Added vegan meal to user(id=" + user.getId() + ", name=" + user.getName() + ")");
}
}

31
src/Server/src/test/java/ApplicationTest.java
View File

@@ -1,16 +1,15 @@
//import greenify.server.Application;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.test.context.junit4.SpringRunner;
//
//@RunWith(SpringRunner.class)
//public class ApplicationTest {
// @Test
// public void applicationContextLoaded() {
// }
//
// @Test
// public void applicationContextTest() {
// Application.main(new String[] {});
// }
//}
import greenify.server.Application;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootConfiguration
public class ApplicationTest {
@Test
public void contextLoads() throws Exception{ }
}

48
src/Server/src/test/java/greenify/server/data/model/UserTest.java Normal file
View File

@@ -0,0 +1,48 @@
package greenify.server.data.model;
import greenify.server.data.model.User;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class UserTest {
@Test
public void setAndGetTest() {
User user = new User(1L, "greenify", "password", 3);
User testUser = new User();
testUser.setId(1L);
testUser.setName("greenify");
testUser.setPassword("password");
testUser.setVeganMeal(3);
assertTrue(user.getId().equals(1L));
assertEquals(user.getName(), "greenify");
assertEquals(user.getPassword(), "password");
assertEquals(user.getVeganMeal(), 3);
assertEquals(user, testUser);
}
@Test
public void toStringTest() {
User user = new User(1L, "greenify", "password", 3);
assertEquals("User(id=1, name=greenify, password=password, veganMeal=3)", user.toString());
}
@Test
public void equalsTest() {
User first = new User(1L, "greenify", "password", 3);
User second = new User(1L, "greenify", "password", 3);
assertEquals(first.getId(), second.getId());
assertEquals(first.getName(), second.getName());
assertEquals(first.getPassword(), second.getPassword());
assertEquals(first.getVeganMeal(), second.getVeganMeal());
}
@Test
public void hashCodeTest() {
User first = new User(1L, "greenify", "password", 3);
User second = new User(1L, "greenify", "password", 3);
assertTrue(first.equals(second) && second.equals(first));
assertTrue(first.hashCode() == second.hashCode());
}
}

37
src/Server/src/test/java/greenify/server/data/repository/UserRepositoryTest.java Normal file
View File

@@ -0,0 +1,37 @@
//package greenify.server.data.repository;
//
//import greenify.server.data.model.User;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
//import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import static junit.framework.TestCase.assertTrue;
//import static org.junit.Assert.assertEquals;
//
//@RunWith(SpringRunner.class)
//@DataJpaTest
//public class UserRepositoryTest {
//
// @Autowired
// private TestEntityManager entityManager;
//
// @Autowired
// private UserRepository repository;
//
// @Test
// public void findByUsernameShouldReturnUser() throws Exception {
// this.entityManager.persist(new User(296L, "cugurlu", "password", 6));
// User user = this.repository.findByName("cugurlu");
// assertEquals(user.getName(), "cugurlu");
// }
//
// @Test
// public void findByUsernameWhenNoUserShouldReturnNull() throws Exception {
// this.entityManager.persist(new User(296L, "cugurlu", "password", 6));
// User user = this.repository.findByName("mouse");
// assertTrue(user == null);
// }
//}

61
src/Server/src/test/java/greenify/server/rest/UserControllerTest.java Normal file
View File

@@ -0,0 +1,61 @@
//package greenify.server.rest;
//
//import greenify.common.UserDTO;
//import greenify.server.data.model.User;
//import greenify.server.service.UserService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
//import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.boot.test.mock.mockito.MockBean;
//import org.springframework.context.ApplicationContext;
//import org.springframework.http.MediaType;
//import org.springframework.test.context.junit4.SpringRunner;
//import org.springframework.test.web.servlet.MockMvc;
//import org.springframework.test.web.servlet.ResultMatcher;
//import static org.assertj.core.internal.bytebuddy.matcher.ElementMatchers.is;
//import static org.hamcrest.Matchers.hasSize;
//import static org.mockito.BDDMockito.given;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
//import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
//import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest
//@AutoConfigureMockMvc
//@AutoConfigureTestDatabase
//public class UserControllerTest {
//
// @Autowired
// private MockMvc mvc;
//
// @Autowired
// private ApplicationContext applicationContext;
//
// @MockBean
// private UserService userService;
//
// @Test
// public void getVehicleWhenRequestingTextShouldReturnMakeAndModel() throws Exception {
// given(this.userService.loginUser("name", "password"))
// .willReturn(new UserDTO(1L, "name"));
// this.mvc.perform(get("/loginUser").accept(MediaType.APPLICATION_JSON))
// .andExpect(status().isOk()).andExpect(content().json("name=name, password=password"));
// }
//
//
// @Test
// public void givenEmployees_whenGetEmployees_thenReturnJsonArray() throws Exception {
// User alex = new User(1L, "alex", "password", 0);
// UserDTO user = userService.loginUser("alex", "password");
// given(userService.loginUser("alex", "password")).willReturn(user);
// mvc.perform(get("/loginUser")
// .contentType(MediaType.ALL))
// .andExpect(status().isOk())
// .andExpect(jsonPath("$", hasSize(1)))
// .andExpect((ResultMatcher) jsonPath("$[0].name", is(alex.getName())))
// .andExpect((ResultMatcher) jsonPath("$[0].password", is(alex.getPassword())));
// }
//}

66
src/Server/src/test/java/greenify/server/service/UserServiceTest.java Normal file
View File

@@ -0,0 +1,66 @@
package greenify.server.service;
import greenify.common.ApplicationException;
import greenify.common.UserDTO;
import greenify.server.data.model.User;
import greenify.server.data.repository.UserRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;
@RunWith(SpringRunner.class)
public class UserServiceTest {
@TestConfiguration
static class UserServiceConfiguration {
@Bean
public UserService userService() {
return new UserService();
}
}
@Autowired
private UserService userService;
@MockBean
private UserRepository userRepository;
@Before
public void setUp() {
User alex = new User(1L, "alex", "password", 0);
when(userRepository.findByName(alex.getName()))
.thenReturn(alex);
}
@Test
public void validLoginTest() {
String name = "alex";
String password = "password";
UserDTO found = userService.loginUser(name, password);
assertEquals(found.getName(), name);
}
// @Test
// public void addVeganMealTest() {
// User user = new User(1L, "x", "y", 3);
// userRepository.save(user);
// System.out.println(userRepository);
// userService.addVeganMeal(1L, "x");
// assertEquals(user.getVeganMeal(), 7);
// }
@Test
public void invalidLoginTest() {
User user = null;
assertThrows(ApplicationException.class, () -> {
userService.loginUser(null, null);
});
}
}