From e09e8e2ef76e0082190a55e7d6658986a08b1edd Mon Sep 17 00:00:00 2001 From: cugurlu Date: Mon, 4 Mar 2019 10:18:36 +0100 Subject: [PATCH] Add Client, Server, Common --- .../executionHistory/executionHistory.bin | Bin 61292 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 0 bytes .../buildOutputCleanup.lock | Bin 17 -> 0 bytes Client/src/main/java/hello/Application.java | 35 - Client/src/main/java/hello/Message.java | 37 - .../executionHistory/executionHistory.bin | Bin 0 -> 169975 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/5.2.1/fileChanges/last-build.bin | Bin .../5.2.1/fileContent/fileContent.lock | Bin .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 0 -> 20247 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../5.2.1/fileHashes/resourceHashesCache.bin | Bin 19397 -> 18599 bytes .../Client}/.gradle/5.2.1/gc.properties | 0 .../5.2.1/javaCompile/classAnalysis.bin | Bin 22141 -> 23815 bytes .../.gradle/5.2.1/javaCompile/jarAnalysis.bin | Bin 22517 -> 19077 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 0 -> 17 bytes .../.gradle/5.2.1/javaCompile/taskHistory.bin | Bin 0 -> 40149 bytes .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 0 .../buildOutputCleanup/outputFiles.bin | Bin 18839 -> 19019 bytes .../Client}/.gradle/vcs-1/gc.properties | 0 {Client => OOPP/Client}/.idea/compiler.xml | 0 {Client => OOPP/Client}/.idea/encodings.xml | 0 {Client => OOPP/Client}/.idea/gradle.xml | 0 {Client => OOPP/Client}/.idea/misc.xml | 0 {Client => OOPP/Client}/.idea/modules.xml | 0 {Client => OOPP/Client}/.idea/uiDesigner.xml | 0 {Client => OOPP/Client}/.idea/workspace.xml | 207 +-- {Client => OOPP/Client}/build.gradle | 28 +- .../resources/main/application.properties | 0 .../build/resources/main/fxml/dashboard.fxml | 6 + .../build/resources/main/fxml/sample.fxml | 39 + OOPP/Client/build/resources/main/pinkleaf.jpg | Bin 0 -> 252662 bytes .../main/java/gogreen/client/Application.java | 67 + .../client/controller/UserController.java | 89 + .../java/gogreen/client/rest/UserService.java | 33 + .../src/main/resources/application.properties | 0 .../src/main/resources/fxml/dashboard.fxml | 6 + .../src/main/resources/fxml/sample.fxml | 39 + OOPP/Client/src/main/resources/pinkleaf.jpg | Bin 0 -> 252662 bytes OOPP/Common/build.gradle | 55 + .../gogreen/common/ApplicationException.java | 7 + .../java/gogreen/common/ErrorResponse.java | 17 + .../src/main/java/gogreen/common/UserDTO.java | 23 + .../executionHistory/executionHistory.bin | Bin 162998 -> 162998 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/5.2.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../5.2.1/fileContent/fileContent.lock | Bin 0 -> 17 bytes .../.gradle/5.2.1/fileHashes/fileHashes.bin | Bin 20097 -> 20097 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../5.2.1/fileHashes/resourceHashesCache.bin | Bin OOPP/Server/.gradle/5.2.1/gc.properties | 0 .../5.2.1/javaCompile/classAnalysis.bin | Bin .../.gradle/5.2.1/javaCompile/jarAnalysis.bin | Bin .../5.2.1/javaCompile/javaCompile.lock | Bin 0 -> 17 bytes .../.gradle/5.2.1/javaCompile/taskHistory.bin | Bin .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 2 + .../buildOutputCleanup/outputFiles.bin | Bin OOPP/Server/.gradle/vcs-1/gc.properties | 0 OOPP/Server/.idea/encodings.xml | 4 + OOPP/Server/.idea/gradle.xml | 20 + OOPP/Server/.idea/misc.xml | 7 + {Server => OOPP/Server}/.idea/workspace.xml | 264 +-- {Server => OOPP/Server}/build.gradle | 28 + OOPP/Server/build/jacoco/test.exec | Bin 0 -> 401199 bytes .../gogreen.server.data.model/User.html | 1 + .../gogreen.server.data.model/User.java.html | 23 + .../gogreen.server.data.model/index.html | 1 + .../index.source.html | 1 + .../RestExceptionHandler.html | 1 + .../RestExceptionHandler.java.html | 19 + .../gogreen.server.rest/UserController.html | 1 + .../UserController.java.html | 27 + .../jacocoHtml/gogreen.server.rest/index.html | 1 + .../gogreen.server.rest/index.source.html | 1 + .../gogreen.server.service/UserService.html | 1 + .../UserService.java.html | 41 + .../gogreen.server.service/index.html | 1 + .../gogreen.server.service/index.source.html | 1 + .../gogreen.server/Application.html | 1 + .../gogreen.server/Application.java.html | 14 + .../jacocoHtml/gogreen.server/index.html | 1 + .../gogreen.server/index.source.html | 1 + OOPP/Server/build/jacocoHtml/index.html | 1 + .../jacocoHtml/jacoco-resources/branchfc.gif | Bin 0 -> 91 bytes .../jacocoHtml/jacoco-resources/branchnc.gif | Bin 0 -> 91 bytes .../jacocoHtml/jacoco-resources/branchpc.gif | Bin 0 -> 91 bytes .../jacocoHtml/jacoco-resources/bundle.gif | Bin 0 -> 709 bytes .../jacocoHtml/jacoco-resources/class.gif | Bin 0 -> 586 bytes .../jacocoHtml/jacoco-resources/down.gif | Bin 0 -> 67 bytes .../jacocoHtml/jacoco-resources/greenbar.gif | Bin 0 -> 91 bytes .../jacocoHtml/jacoco-resources/group.gif | Bin 0 -> 351 bytes .../jacocoHtml/jacoco-resources/method.gif | Bin 0 -> 193 bytes .../jacocoHtml/jacoco-resources/package.gif | Bin 0 -> 227 bytes .../jacocoHtml/jacoco-resources/prettify.css | 13 + .../jacocoHtml/jacoco-resources/prettify.js | 1510 +++++++++++++++++ .../jacocoHtml/jacoco-resources/redbar.gif | Bin 0 -> 91 bytes .../jacocoHtml/jacoco-resources/report.css | 243 +++ .../jacocoHtml/jacoco-resources/report.gif | Bin 0 -> 363 bytes .../jacocoHtml/jacoco-resources/session.gif | Bin 0 -> 213 bytes .../jacocoHtml/jacoco-resources/sort.gif | Bin 0 -> 58 bytes .../build/jacocoHtml/jacoco-resources/sort.js | 147 ++ .../jacocoHtml/jacoco-resources/source.gif | Bin 0 -> 354 bytes .../build/jacocoHtml/jacoco-resources/up.gif | Bin 0 -> 67 bytes .../build/jacocoHtml/jacoco-sessions.html | 1 + ...ogreen.server.rest.UserControllerTest.html | 173 ++ .../reports/tests/test/css/base-style.css | 179 ++ .../build/reports/tests/test/css/style.css | 84 + .../build/reports/tests/test/index.html | 133 ++ .../build/reports/tests/test/js/report.js | 194 +++ .../test/packages/gogreen.server.rest.html | 103 ++ ...gogreen.server.rest.UserControllerTest.xml | 75 + .../build/test-results/test/binary/output.bin | Bin 0 -> 35512 bytes .../test-results/test/binary/output.bin.idx | Bin 0 -> 69 bytes .../test-results/test/binary/results.bin | Bin 0 -> 117 bytes .../java/gogreen/server}/Application.java | 2 +- .../java/gogreen/server/data/model/User.java | 22 + .../data/repository/UserJpaRepository.java | 8 + .../data/repository/UserRepository.java | 8 + .../server/rest/RestExceptionHandler.java | 18 + .../gogreen/server/rest/UserController.java | 26 + .../gogreen/server/service/UserService.java | 40 + .../server/rest/UserControllerTest.java | 48 + OOPP/settings.gradle | 5 + .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../5.2.1/javaCompile/javaCompile.lock | Bin 17 -> 0 bytes .../buildOutputCleanup.lock | Bin 17 -> 0 bytes .../classes/java/main/hello/Greeting.class | Bin 574 -> 0 bytes Server/src/main/java/hello/Greeting.java | 20 - doc/Pictures Group Members/.gitkeep | 0 .../Ceren_Ugurlu_Core_Quadrant.png | Bin .../Core_quadrant_Merel.png | Bin .../Pictures Group Members}/Daan_Sneep.png | Bin .../Daan_Sneep_PDP_Core_Quadrant.PNG | Bin .../Pictures Group Members}/KristinPeneva.jpg | Bin .../Merel_Steenbergen.jpg | Bin .../Pictures Group Members}/ceren_ugurlu.jpeg | Bin .../corequadrant-KP.png | Bin .../mlwaubenCoreQuadrant.jpg | Bin .../Pictures Group Members}/mlwaubenpic.jpg | Bin .../sem_van_der_hoeven.jpg | Bin .../sem_van_der_hoeven_core_quadrant.png | Bin doc/Project Details/.gitkeep | 0 ..._320136285514771_1677605103307063296_n.png | Bin ...2145104338913697_3319351636328972288_n.png | Bin .../Project Details}/GUIthing.png | Bin .../Project Details}/Mandatory_features.md | 0 .../sem_interfaceGeneralIdea_withNotes.png | Bin 152 files changed, 3776 insertions(+), 427 deletions(-) delete mode 100644 Client/.gradle/5.2.1/executionHistory/executionHistory.bin delete mode 100644 Client/.gradle/5.2.1/executionHistory/executionHistory.lock delete mode 100644 Client/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 Client/.gradle/5.2.1/javaCompile/javaCompile.lock delete mode 100644 Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 Client/src/main/java/hello/Application.java delete mode 100644 Client/src/main/java/hello/Message.java create mode 100644 OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin create mode 100644 OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock rename {Client => OOPP/Client}/.gradle/5.2.1/fileChanges/last-build.bin (100%) rename {Client => OOPP/Client}/.gradle/5.2.1/fileContent/fileContent.lock (100%) create mode 100644 OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin create mode 100644 OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock rename Client/.gradle/5.2.1/fileHashes/fileHashes.bin => OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin (92%) rename {Client => OOPP/Client}/.gradle/5.2.1/gc.properties (100%) rename {Client => OOPP/Client}/.gradle/5.2.1/javaCompile/classAnalysis.bin (75%) rename Client/.gradle/5.2.1/javaCompile/taskHistory.bin => OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin (81%) create mode 100644 OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock create mode 100644 OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin create mode 100644 OOPP/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock rename {Client => OOPP/Client}/.gradle/buildOutputCleanup/cache.properties (100%) rename {Client => OOPP/Client}/.gradle/buildOutputCleanup/outputFiles.bin (93%) rename {Client => OOPP/Client}/.gradle/vcs-1/gc.properties (100%) rename {Client => OOPP/Client}/.idea/compiler.xml (100%) rename {Client => OOPP/Client}/.idea/encodings.xml (100%) rename {Client => OOPP/Client}/.idea/gradle.xml (100%) rename {Client => OOPP/Client}/.idea/misc.xml (100%) rename {Client => OOPP/Client}/.idea/modules.xml (100%) rename {Client => OOPP/Client}/.idea/uiDesigner.xml (100%) rename {Client => OOPP/Client}/.idea/workspace.xml (72%) rename {Client => OOPP/Client}/build.gradle (62%) rename Pictures Group Members/.gitkeep => OOPP/Client/build/resources/main/application.properties (100%) create mode 100644 OOPP/Client/build/resources/main/fxml/dashboard.fxml create mode 100644 OOPP/Client/build/resources/main/fxml/sample.fxml create mode 100644 OOPP/Client/build/resources/main/pinkleaf.jpg create mode 100644 OOPP/Client/src/main/java/gogreen/client/Application.java create mode 100644 OOPP/Client/src/main/java/gogreen/client/controller/UserController.java create mode 100644 OOPP/Client/src/main/java/gogreen/client/rest/UserService.java rename Project Details/.gitkeep => OOPP/Client/src/main/resources/application.properties (100%) create mode 100644 OOPP/Client/src/main/resources/fxml/dashboard.fxml create mode 100644 OOPP/Client/src/main/resources/fxml/sample.fxml create mode 100644 OOPP/Client/src/main/resources/pinkleaf.jpg create mode 100644 OOPP/Common/build.gradle create mode 100644 OOPP/Common/src/main/java/gogreen/common/ApplicationException.java create mode 100644 OOPP/Common/src/main/java/gogreen/common/ErrorResponse.java create mode 100644 OOPP/Common/src/main/java/gogreen/common/UserDTO.java rename {Server => OOPP/Server}/.gradle/5.2.1/executionHistory/executionHistory.bin (99%) create mode 100644 OOPP/Server/.gradle/5.2.1/executionHistory/executionHistory.lock create mode 100644 OOPP/Server/.gradle/5.2.1/fileChanges/last-build.bin create mode 100644 OOPP/Server/.gradle/5.2.1/fileContent/fileContent.lock rename {Server => OOPP/Server}/.gradle/5.2.1/fileHashes/fileHashes.bin (99%) create mode 100644 OOPP/Server/.gradle/5.2.1/fileHashes/fileHashes.lock rename {Server => OOPP/Server}/.gradle/5.2.1/fileHashes/resourceHashesCache.bin (100%) create mode 100644 OOPP/Server/.gradle/5.2.1/gc.properties rename {Server => OOPP/Server}/.gradle/5.2.1/javaCompile/classAnalysis.bin (100%) rename {Server => OOPP/Server}/.gradle/5.2.1/javaCompile/jarAnalysis.bin (100%) create mode 100644 OOPP/Server/.gradle/5.2.1/javaCompile/javaCompile.lock rename {Server => OOPP/Server}/.gradle/5.2.1/javaCompile/taskHistory.bin (100%) create mode 100644 OOPP/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 OOPP/Server/.gradle/buildOutputCleanup/cache.properties rename {Server => OOPP/Server}/.gradle/buildOutputCleanup/outputFiles.bin (100%) create mode 100644 OOPP/Server/.gradle/vcs-1/gc.properties create mode 100644 OOPP/Server/.idea/encodings.xml create mode 100644 OOPP/Server/.idea/gradle.xml create mode 100644 OOPP/Server/.idea/misc.xml rename {Server => OOPP/Server}/.idea/workspace.xml (69%) rename {Server => OOPP/Server}/build.gradle (63%) create mode 100644 OOPP/Server/build/jacoco/test.exec create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.data.model/User.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.data.model/index.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/UserController.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/index.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.rest/index.source.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.service/UserService.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.service/index.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server.service/index.source.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server/Application.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server/Application.java.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server/index.html create mode 100644 OOPP/Server/build/jacocoHtml/gogreen.server/index.source.html create mode 100644 OOPP/Server/build/jacocoHtml/index.html create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/branchfc.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/branchnc.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/branchpc.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/bundle.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/class.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/down.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/greenbar.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/group.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/method.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/package.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/prettify.css create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/prettify.js create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/redbar.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/report.css create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/report.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/session.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/sort.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/sort.js create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/source.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-resources/up.gif create mode 100644 OOPP/Server/build/jacocoHtml/jacoco-sessions.html create mode 100644 OOPP/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html create mode 100644 OOPP/Server/build/reports/tests/test/css/base-style.css create mode 100644 OOPP/Server/build/reports/tests/test/css/style.css create mode 100644 OOPP/Server/build/reports/tests/test/index.html create mode 100644 OOPP/Server/build/reports/tests/test/js/report.js create mode 100644 OOPP/Server/build/reports/tests/test/packages/gogreen.server.rest.html create mode 100644 OOPP/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml create mode 100644 OOPP/Server/build/test-results/test/binary/output.bin create mode 100644 OOPP/Server/build/test-results/test/binary/output.bin.idx create mode 100644 OOPP/Server/build/test-results/test/binary/results.bin rename {Server/src/main/java/hello => OOPP/Server/src/main/java/gogreen/server}/Application.java (92%) create mode 100644 OOPP/Server/src/main/java/gogreen/server/data/model/User.java create mode 100644 OOPP/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java create mode 100644 OOPP/Server/src/main/java/gogreen/server/data/repository/UserRepository.java create mode 100644 OOPP/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java create mode 100644 OOPP/Server/src/main/java/gogreen/server/rest/UserController.java create mode 100644 OOPP/Server/src/main/java/gogreen/server/service/UserService.java create mode 100644 OOPP/Server/src/test/java/gogreen/server/rest/UserControllerTest.java create mode 100644 OOPP/settings.gradle delete mode 100644 Server/.gradle/5.2.1/executionHistory/executionHistory.lock delete mode 100644 Server/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 Server/.gradle/5.2.1/javaCompile/javaCompile.lock delete mode 100644 Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 Server/build/classes/java/main/hello/Greeting.class delete mode 100644 Server/src/main/java/hello/Greeting.java create mode 100644 doc/Pictures Group Members/.gitkeep rename {Pictures Group Members => doc/Pictures Group Members}/Ceren_Ugurlu_Core_Quadrant.png (100%) rename {Pictures Group Members => doc/Pictures Group Members}/Core_quadrant_Merel.png (100%) rename {Pictures Group Members => doc/Pictures Group Members}/Daan_Sneep.png (100%) rename {Pictures Group Members => doc/Pictures Group Members}/Daan_Sneep_PDP_Core_Quadrant.PNG (100%) rename {Pictures Group Members => doc/Pictures Group Members}/KristinPeneva.jpg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/Merel_Steenbergen.jpg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/ceren_ugurlu.jpeg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/corequadrant-KP.png (100%) rename {Pictures Group Members => doc/Pictures Group Members}/mlwaubenCoreQuadrant.jpg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/mlwaubenpic.jpg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/sem_van_der_hoeven.jpg (100%) rename {Pictures Group Members => doc/Pictures Group Members}/sem_van_der_hoeven_core_quadrant.png (100%) create mode 100644 doc/Project Details/.gitkeep rename {Project Details => doc/Project Details}/51565888_320136285514771_1677605103307063296_n.png (100%) rename {Project Details => doc/Project Details}/52113354_2145104338913697_3319351636328972288_n.png (100%) rename {Project Details => doc/Project Details}/GUIthing.png (100%) rename {Project Details => doc/Project Details}/Mandatory_features.md (100%) rename {Project Details => doc/Project Details}/sem_interfaceGeneralIdea_withNotes.png (100%) diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/Client/.gradle/5.2.1/executionHistory/executionHistory.bin deleted file mode 100644 index 53dceb73ca3fcd7251e7211e31622c9db3672c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61292 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 diff --git a/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/Client/.gradle/5.2.1/executionHistory/executionHistory.lock deleted file mode 100644 index cb37681cd609582e6dc043a6252e824c38fdc3ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZRU+&BHU`f0tH3=ohC05Wz2YXATM diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/Client/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index 5b2c181c4b63409fc767f463f5556d76a8a4a4bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZSXvkX|cCH=f10|XQR05Bv3M*si- diff --git a/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/Client/.gradle/5.2.1/javaCompile/javaCompile.lock deleted file mode 100644 index 9ef821e4be64f960f8cfea37701699e673465b91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZQ>`KI$i`q~yt1_*Ej065+Ru>b%7 diff --git a/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 2a3f2f8b105b26038bdac60ea4bf94df8cae568d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZS1Vq0$%^=`KU0|d+l04mi46951J diff --git a/Client/src/main/java/hello/Application.java b/Client/src/main/java/hello/Application.java deleted file mode 100644 index c660f5e..0000000 --- a/Client/src/main/java/hello/Application.java +++ /dev/null @@ -1,35 +0,0 @@ -package hello; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -@SpringBootApplication -public class Application { - - private static final Logger log = LoggerFactory.getLogger(Application.class); - - public static void main(String args[]) { - SpringApplication.run(Application.class); - } - - @Bean - public RestTemplate restTemplate(RestTemplateBuilder builder) { - return builder.build(); - } - - @Bean - public CommandLineRunner run(RestTemplate restTemplate) throws Exception { - return args -> { - Message message = restTemplate.getForObject( - "http://localhost:8080/greeting?name=Ceren", Message.class); - log.info(message.toString()); - }; - } -} \ No newline at end of file diff --git a/Client/src/main/java/hello/Message.java b/Client/src/main/java/hello/Message.java deleted file mode 100644 index 95f092e..0000000 --- a/Client/src/main/java/hello/Message.java +++ /dev/null @@ -1,37 +0,0 @@ -package hello; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class Message { - - private static long id; - private static String content; - - public Message() { - } - - public static long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public static String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public String toString() { - return "Message{" + - "id='" + id + '\'' + - ", content=" + content + - '}'; - } -} \ No newline at end of file diff --git a/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..45d035191b77ef954bfff67bdc730a1ed4b565a0 GIT binary patch literal 169975 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 literal 0 HcmV?d00001 diff --git a/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/OOPP/Client/.gradle/5.2.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..5d64d44f89d90d96b2310dadfed4174bf2b6f1c3 GIT binary patch literal 17 UcmZRU+&BHU`f0tH3=r@L05bCg=l}o! literal 0 HcmV?d00001 diff --git a/Client/.gradle/5.2.1/fileChanges/last-build.bin b/OOPP/Client/.gradle/5.2.1/fileChanges/last-build.bin similarity index 100% rename from Client/.gradle/5.2.1/fileChanges/last-build.bin rename to OOPP/Client/.gradle/5.2.1/fileChanges/last-build.bin diff --git a/Client/.gradle/5.2.1/fileContent/fileContent.lock b/OOPP/Client/.gradle/5.2.1/fileContent/fileContent.lock similarity index 100% rename from Client/.gradle/5.2.1/fileContent/fileContent.lock rename to OOPP/Client/.gradle/5.2.1/fileContent/fileContent.lock diff --git a/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..403e8afac0418532504e971438aecb0eb36704db GIT binary patch literal 20247 zcmeI3do)#99LJA~@=Pr1rsU1^7>sAll~?3-5i%MXDvz0)S{{+8P(mfHA|a6#l}Ac$ zCDoFqB(I_-W|dM#WmzeCO%G$vxo7Wb%{~1)|IGUBKlVB6bNBcB&iIUz*C7UDyKyU;qq&0WbgtzyKHk17H9QfB`T72EYIq00UqE41fVJ00#aq27Jhg z$k3BvFJ)0X3b6!XBuDOOm(>;Pn;Wxo>5sYV@c#z_mSeZf$PIOxyIsNj;;&}GO5D}@ zGiYN8V`%PThWVXmO=rg{JOj}94Vbsq9AX9YoIuX%5ZZ zd@%2^tae!L@ctt@zBuO3>cV7+`6k#&=_GudCZsAAQP{=I*;OcT8*TTeffK7Id66%$;1<&*|UWdo{-SY|Y49vYR>k8!bIgvDX?!YD&vPXN-cn;=xOAz8e(w{*O2EYIq z00UqE41fVJ00zJS7ytuc01SWuFaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72EYIq z00UqE41fVJ00zJS82IlDn2?92UbLoOUe}zR6!tzl^Q6?eGinKn*(LlCf)L}GDr6m` z>r1RAw+8=C@Mkt`)T=(A$BRgj<5-1hQ3-kL(ff3Qb)A{8lbY!1k6=Z^TQyWhM%g8z>{n@J@UUr0Wn6NDKv@$e7!HW}{R4#A|UWmSko3zblkmqqIzSSidz z)}wgMiR1>cwJCT`}7F2$3t8&coYVQZb@-a&`mC*H3$P@+$ zVjeSL9+i?IUFBk~eNHS(N?q`RPRvdcCMGj3GZTf9^V7fE6ISiIH@ru2@ff-8MU1Dj zuQp4VAjF?D6Wyossx#)Owg$#mv8-);i-n0JXU*w^q%kw$skhmr$jUIN;;5s+Goxzq zEXW!Kx4uOQ8)hQSvGK6>b%*nszAEL75tWI;dFZ#Vq7y_HGjTU}#m*TK$w5uEkF}%q zj*SZw3xmn)LN!(^*@@U4b?HsqJmkd55?nkyrIh!BFkxSaYOsu$2`|4kO$+u%Bh{EN z|9r7E z*|j!3t~5RNu;bJoI-!N04?>Jt0 zNp86%?T$}t<0siXI-!ZyxMaOzCIm*YyRM84y&P&8x3FE|T!?C*)j?8Ud1{-xBjwG@ zi&{s+_eaOu+{b5y6Vx|^$XU%j)TdY+`&#>_ik-h02S~0L*04VlNRA|%47Hd`B=KnD zrO@=&wBBptr+J++^0FvFUP-D+gp-{};_5BW1T6!dxbOuJCmdBYPNI3BRXj3ZIV*l` zO{K17S?2x}ma$rK;Yw74bVfDhy<{g+ DCUQ)< literal 0 HcmV?d00001 diff --git a/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/OOPP/Client/.gradle/5.2.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..2ae5f401752506a3f83b2b75a25ec3fc17291c4a GIT binary patch literal 17 UcmZSXvkX|cCH=f10|eX!05FjRv;Y7A literal 0 HcmV?d00001 diff --git a/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin similarity index 92% rename from Client/.gradle/5.2.1/fileHashes/fileHashes.bin rename to OOPP/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin index 879989b2353e0d97ccab378cbdaa64e3a8ccd45a..7864b9a5de25d7839f576556ac730427f78e9847 100644 GIT binary patch delta 206 zcmX>)opJd@#tkMCq0HL?4=mGMEM3O{1|G@(q2NGv!|I*g-<_f2tuXPNzi#{Xtw@o9 ziaWx@VKh)Ya--r8@r?!t#M6v{JV_uH1Yv=D%|eg(zF&V*v#mTRJY~T`pr9P8it78D Wl025CZc+7mSNnpMQyWtSHZuU1+ERD` literal 19397 zcmeI(|5M9x0LSrdcFhOn+x7$ zMb2JAFQX1*yLD$u&eu^TH|hCz*)B@W3EANP){pK>+3vpO#7)n>O$xf}*zTFp8kYY2 zelgvDvfX=B!-L6HT{n_FdNtc4V-v*7jE!2lH?Tcgz0k+By>>6%m28iz9$<7G7@kJ< zN%d@>r#-bkKo(;nyLunn6Azk74;4+Tpy!vdJ=tYSZb7T;BHg>PJ-tm@Vfnb(LiZJH z-=b9gXiB`-O7`fZY~NaAUFW^;%L{sbINRAh$91|!9>Z@4KmY;|fB*y_009U<00Izz z00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00I#B-vokfFL*VwR7i_!;acMah~E|8fzvhV*Zo$^1lnM)0M?CL#`}k)ehHi zMQT63aEtu%h!mpB!a~*MYh%5(uKBd3)K}}?OJy&jE^VU48DWv(Gj~C}+apzzlkxhB zryeQfS=IF-h4W@%;SyVRw$iFwmi?*A)I1kOJYRUq3qwdD{va&$UT*W^JL?VajY;)O zlK1zf1^rHf_@l5me$44k{LtN|nQ2q9le3qP<_q`F8FAzqq9|dp`@OIH*ZDIg1qE9V z|Fn(`qs4quh--y~xmKeoPS6Yrs)=cPmNu!%{;U>v?oJBPRbdfqihCTWn_i{RX;Rmi z+imX{{|?p#kV0G|Eb=97%??S*&~!|u`NX_2gTj_LWpXbFj^ zOcK}eg_oNP{a%M?hp@hO1UL|-vR>3v}0 zr5EjiC(IENzUa{+y=4zLj(_hv6mP5x=5))t5ThSfHP{l}Qe?k|s-?fZC@JEjGA3$FA7hNB!%M$ fVKGCtJoum@FtNO7qWoo$q1s;PZw#YF6kq%X7W%w? diff --git a/Client/.gradle/5.2.1/gc.properties b/OOPP/Client/.gradle/5.2.1/gc.properties similarity index 100% rename from Client/.gradle/5.2.1/gc.properties rename to OOPP/Client/.gradle/5.2.1/gc.properties diff --git a/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin similarity index 75% rename from Client/.gradle/5.2.1/javaCompile/classAnalysis.bin rename to OOPP/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin index dc515f185dae360e73b0b60cd7d1e1a8bd8730d9..d42b70d3cf69b784fb5569f8797af23b81dd96dc 100644 GIT binary patch delta 179 zcmeynhOvDY;|3E6M&Ze(5)}?-9fH|5y!NeP0E6h-|4?xDUT3nY+jeexsrCoh$lAz->){EOwpg5wau2=>XQk^w3~P3sG5yt#fr1v6nL!)OKu#+w@z me~521a1h(<=wZXRxhJTPaq=dgq|Fn8IvF?j2X%pnc18f$)=+W) delta 49 zcmZqQ#rSs(;|3E6M!w0W5*3rbN=%qMSJH#$KNK)9FeYwP{2{*4V29XdM-Ll505+Hw AjQ{`u diff --git a/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin similarity index 81% rename from Client/.gradle/5.2.1/javaCompile/taskHistory.bin rename to OOPP/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin index 6914c9234458f425fa9ae6a075a64a312715f5af..e4372a4862870f0a37910c6f1afd1dc3901728ed 100644 GIT binary patch delta 530 zcmeymp0RZ*;|5a+4qg7rHFIq4+HJO#U^l2|vSwglG6rFR?WR9hKA*$=kiBfNJZqb| zECW!qFC#T4CtuGuwYWGjJyn2f;j>B8GR%~$daF7MmHp>Uf=D|S6y#(kCzfR9=Lyt( zt=QPHMfc&C{@}z(+yXb57#L9vVPHbi#SPWQ#lXCJ@?8%JJ-y(9qRhN>Bomn!nHX3m z<`<>w73ZXxWa;_jr>CbDfkavNg0$4@C6<=tC+Fv-Wu})Fr9usG%Fi!BHG~nQg>449 zL2il3CHX~_AW8N$U`en8(uxvuQ_J&eWoRgWFSE3h`T3iy6np=>QSd!{g znwgUVQOSkXY8?7NR&#Gl&d=3LODrx)Evm@P(aTCq&MwZ+Lw2PXknfqEmoHY78c>v9 UkXlrdnOe-m$jHFZ0E}4&0Cr2cEdT%j literal 22517 zcmeI3dyHIF8Nj!N4bs#?NY-xr11M?<+POLBp0@!_S&EI(r7dYNdNrKqGW(dj&djzI zkW&7zAyQjKOXkEpKbSef`D>=G#h;NtBoGNi0+B!@5D7#Akw7F62}A;sKqL?eL;{gOBoGNi0+B!@ z5D7#Akw7F62}A;sKqL?eL;{gOBoGNi0+B!@5D7#Akw7F62}A;sKqT1BZ}>)b(@krx9IxlY-ZqQ%nrvXS z>TAu+OjJi*W=D0S_^n~RL1$ySTAQ}9?~R3RqLZPzcB4MC+TI2m#&S0?>Km0b3)S+N z;4H5XC5`cVwKf#$ddzRk>m!ND^JX@6vQn%oji#MY$s8b7E#Htu3x%t?`J2^CZ9N6tK5G3fn5jge|dha znfdgM-ee5)SF`$iO|&+O5Q-#K1e2fz^_HjHIUR5aL3tc38mVTUmm&d;wN`J zx_{r1e;)gg`Q)FvP}}BXNze^IylHF{q}q{2UQ29V_u%C6O~vV^Hr1K~AE<<9HfS0M z=7eFbunA5vYrp~2a-CYm0!y92!T#HR01x|1&EGqCoNv6bdiu@5rv`Rb2d_GO!CMqQ zdZL-zycViM6JSw`=QGckl$@qQDUU2XDJRmWj9KCcSZFjwCwjOIf_PypJjv4jzijA9BqBsjBNiV%?I zLQ)~E@ep;)rliH1Hjy2CbM@M#gIj;L;L!4&d%m=2^99FFb>W+$@@-0Vt(G@+vzph+ zQaJZSMUPiAoRB2V6rm7Qj@SU@NHQ%El3tiVD1qn_N)V)#qokvZN-3lC$_EEN_V#;@ z{NlQYPaR(T_BhpYwiel{bWV%PK{%? z^y$Ni+2 zyYKk^p&j@1{ph>n_nzE(w^1vs9*A*nkc9ziU>t45mpF~Xlkt$#xs~NsD_Iv z!-jBnPVr*zoN3~@KQF6pzwg0Y1`m!bKDcD%LzCTTd|UGAypcdZf(ddYn?6>`fwyX* zpr;7|z%cn(Drhi8Y-1-;Dg{N9A}~N8=8d6(==SYU%VB#-cjvFZdF`i8{{7hLzBSK0 zv2^YBlU?Xq)N(yu4AzCdMgJ_0bh!9fI$UYymBwg*w`qb=g0dhyC)nCRl?@hY4+ES| zwMeDY!Vv*YiW%rqZQB8GvAxv#AFnnay#Mt*k3G=;z>BMwUHqE zi&pQM=O#03N84(hvBWUY%QF&?u?Vymu=X&5DXD=d6`Fc=uE~Ie4z&WkL0;W*-D`I~ z{+)Miz5WXH>@T|jYyU&&7Bl=*+`^PgCX!2C|Q5MV(W0Y&&% z$^@GYT7UFC{ZHP!{i;K|C)Mwd9~IAZp=CLMlwny0!St9^`X0iNTg_D9nh6gb52ZmC ztxj3*1x;a4f|!-iHj4el&bgld@s<;V`Aj3Ah2`)5%omIwz0bnX`2(c0YB=mfijfL+I>d?Ozex J4Y%pv{ufg=kih@| diff --git a/OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/OOPP/Client/.gradle/5.2.1/javaCompile/javaCompile.lock new file mode 100644 index 0000000000000000000000000000000000000000..e0635d3af5785026515918a0ea97701442386393 GIT binary patch literal 17 UcmZQ>`KI$i`q~yt1_)>c068KA^#A|> literal 0 HcmV?d00001 diff --git a/OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/OOPP/Client/.gradle/5.2.1/javaCompile/taskHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..58d1af4a35e50528e36b175499f30a3c70ff4816 GIT binary patch literal 40149 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 HE^YW001gr1DyZ> literal 0 HcmV?d00001 diff --git a/Client/.gradle/buildOutputCleanup/cache.properties b/OOPP/Client/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from Client/.gradle/buildOutputCleanup/cache.properties rename to OOPP/Client/.gradle/buildOutputCleanup/cache.properties diff --git a/Client/.gradle/buildOutputCleanup/outputFiles.bin b/OOPP/Client/.gradle/buildOutputCleanup/outputFiles.bin similarity index 93% rename from Client/.gradle/buildOutputCleanup/outputFiles.bin rename to OOPP/Client/.gradle/buildOutputCleanup/outputFiles.bin index 2c3f78f856f0694ecfeaaac267a02d5bcb67a3be..dc2b305b44cb92d392798630255313b39c3fd426 100644 GIT binary patch delta 309 zcmbO}nep@##tkMCnz9Xw_TP%mM$cgY1CNXUp`b};)A`>a{>>0^FVV@a5)A@7H~x{` zzH(6kM9}l>FK0(&lgl-n`S|1MN;_vEV*78VTu_%XB(M|YCM4|wuFguv22u>*}!@cs($)pS;+ta z*%G6kl|S9|p^DWfrve3IW-bh>+~1}NRrzu9TFEFTrjr{Le~5212oT-u=n=*^dA|qm P-g>m|1#tkMCg2D}o_TP%mM$cgY1CNW7V5BV$*xi! Zlb1>bF)`lUsQ5#Cqk)6iW=D@OMgV+y7?}V7 diff --git a/Client/.gradle/vcs-1/gc.properties b/OOPP/Client/.gradle/vcs-1/gc.properties similarity index 100% rename from Client/.gradle/vcs-1/gc.properties rename to OOPP/Client/.gradle/vcs-1/gc.properties diff --git a/Client/.idea/compiler.xml b/OOPP/Client/.idea/compiler.xml similarity index 100% rename from Client/.idea/compiler.xml rename to OOPP/Client/.idea/compiler.xml diff --git a/Client/.idea/encodings.xml b/OOPP/Client/.idea/encodings.xml similarity index 100% rename from Client/.idea/encodings.xml rename to OOPP/Client/.idea/encodings.xml diff --git a/Client/.idea/gradle.xml b/OOPP/Client/.idea/gradle.xml similarity index 100% rename from Client/.idea/gradle.xml rename to OOPP/Client/.idea/gradle.xml diff --git a/Client/.idea/misc.xml b/OOPP/Client/.idea/misc.xml similarity index 100% rename from Client/.idea/misc.xml rename to OOPP/Client/.idea/misc.xml diff --git a/Client/.idea/modules.xml b/OOPP/Client/.idea/modules.xml similarity index 100% rename from Client/.idea/modules.xml rename to OOPP/Client/.idea/modules.xml diff --git a/Client/.idea/uiDesigner.xml b/OOPP/Client/.idea/uiDesigner.xml similarity index 100% rename from Client/.idea/uiDesigner.xml rename to OOPP/Client/.idea/uiDesigner.xml diff --git a/Client/.idea/workspace.xml b/OOPP/Client/.idea/workspace.xml similarity index 72% rename from Client/.idea/workspace.xml rename to OOPP/Client/.idea/workspace.xml index 8e8f505..06551d4 100644 --- a/Client/.idea/workspace.xml +++ b/OOPP/Client/.idea/workspace.xml @@ -18,7 +18,7 @@ hello.* - + @@ -65,57 +65,33 @@ - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -133,10 +109,10 @@ @@ -147,7 +123,7 @@ - - - - - + - + + @@ -233,7 +157,7 @@ - + - + @@ -321,15 +245,6 @@ - - - - - - - - - @@ -351,12 +266,21 @@ + + + + + + + + + - + - + @@ -365,17 +289,17 @@ - + - + - + - + @@ -428,50 +352,47 @@ - + - - - - - - - - - - - - - - - + + - - + + + + + - + - - + + + + + + + + + - - + + - - - - + + + + diff --git a/Client/build.gradle b/OOPP/Client/build.gradle similarity index 62% rename from Client/build.gradle rename to OOPP/Client/build.gradle index 9a17529..feb783b 100644 --- a/Client/build.gradle +++ b/OOPP/Client/build.gradle @@ -13,6 +13,28 @@ apply plugin: 'idea' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' +//apply plugin: 'checkstyle' +// +//checkstyle { +// version = '7.8.1' +// config = 'checkstyle/checkstyle.xml' as File +//} +// +//checkstyleMain { +// source ='src/main/java' +//} +// +//checkstyleTest { +// source ='src/test/java' +//} +// +//tasks.withType(Checkstyle) { +// reports { +// xml.enabled false +// html.enabled true +// html.stylesheet resources.text.fromFile('config/xsl/checkstyle-custom.xsl') +// } +//} sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -31,7 +53,11 @@ repositories { } dependencies { - compile("org.springframework.boot:spring-boot-starter-web") + compile("org.springframework.boot:spring-boot-starter") + compile("org.springframework:spring-web") + compile("com.fasterxml.jackson.core:jackson-databind") + testCompile("junit:junit") + compile project(':Common') testCompile('org.springframework.boot:spring-boot-starter-test') testCompile( 'junit:junit:4.12', diff --git a/Pictures Group Members/.gitkeep b/OOPP/Client/build/resources/main/application.properties similarity index 100% rename from Pictures Group Members/.gitkeep rename to OOPP/Client/build/resources/main/application.properties diff --git a/OOPP/Client/build/resources/main/fxml/dashboard.fxml b/OOPP/Client/build/resources/main/fxml/dashboard.fxml new file mode 100644 index 0000000..e40f1e1 --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/dashboard.fxml @@ -0,0 +1,6 @@ + + + + + + diff --git a/OOPP/Client/build/resources/main/fxml/sample.fxml b/OOPP/Client/build/resources/main/fxml/sample.fxml new file mode 100644 index 0000000..f0dc2db --- /dev/null +++ b/OOPP/Client/build/resources/main/fxml/sample.fxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + +