diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index e1ca22d..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,37 +0,0 @@ -# This file is a template, and might need editing before it works on your project. -# This is the Gradle build system for JVM applications -# https://gradle.org/ -# https://github.com/gradle/gradle -image: gradle:alpine - -# Disable the Gradle daemon for Continuous Integration servers as correctness -# is usually a priority over speed in CI environments. Using a fresh -# runtime for each build is more reliable since the runtime is completely -# isolated from any previous builds. -variables: - GRADLE_OPTS: "-Dorg.gradle.daemon=false" - -before_script: - - export GRADLE_USER_HOME=`pwd`/.gradle - -build: - stage: build - script: gradle --build-cache assemble - cache: - key: "$CI_COMMIT_REF_NAME" - policy: push - paths: - - build - - .gradle - - -test: - stage: test - script: gradle check - cache: - key: "$CI_COMMIT_REF_NAME" - policy: pull - paths: - - build - - .gradle - diff --git a/.gradle/5.2.1/fileHashes/fileHashes.lock b/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index a52b897..0000000 Binary files a/.gradle/5.2.1/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 31d8bd2..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 33a22c2..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Mar 06 09:20:30 CET 2019 -gradle.version=5.2.1 diff --git a/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin b/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin and /dev/null differ diff --git a/GoGreen/Server/.gradle/5.2.1/gc.properties b/GoGreen/Server/.gradle/5.2.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/GoGreen/Server/.gradle/vcs-1/gc.properties b/GoGreen/Server/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/OOP-Project.iml b/OOP-Project.iml deleted file mode 100644 index 391e562..0000000 --- a/OOP-Project.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - file://$MODULE_DIR$/src/Server/src/main/java/hello/Application.java - file://$MODULE_DIR$/src/Client/src/main/java/hello/Application.java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index b1b2ccf..df57719 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,4 @@ -# CSE1105 Template Repository - -This a template repository to help you get started on making the best project possible! - -You can download the latest version [here](https://github.com/SERG-Delft/TI1216/releases) - -http://stackoverflow.com/a/6466993 - -## How to import into your IDE - -Eclipse: -[http://javapapers.com/java/import-maven-project-into-eclipse/](http://javapapers.com/java/import-maven-project-into-eclipse/) - -Intellij: -[https://www.jetbrains.com/help/idea/2016.2/importing-project-from-maven-model.html](https://www.jetbrains.com/help/idea/2016.2/importing-project-from-maven-model.html) - -## Getting your weekly reports +## Getting your weekly reports **Jacoco**: Run `maven install` ([Intellij](https://www.jetbrains.com/help/idea/2016.3/getting-started-with-maven.html#execute_maven_goal)/[Eclipse](http://imgur.com/a/6q7pV)) @@ -158,41 +142,3 @@ By working on the project with the chosen programs, I’ll get more experienced ### W - Will I will reach my goal by working actively together with my teammates using lots of the useful programs given. - - -# Kristin Peneva (4926587, kpeneva) -![picture](https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template/blob/master/Pictures%20Group%20Members/KristinPeneva.jpg) - -## Personal Development Plan -![CoreQuadrant](https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template/blob/master/Pictures%20Group%20Members/corequadrant-KP.png) - - Strong points: - 1. I believe I am a good leader. - 2. I am ambitious and hardworking. - - - Weaker points: - 1. I prefer to work alone, but If I am working in a team, usually I tend to be bossy - 2. I easily get lost into details and want to do extra unnecessry things, which results in slowing down my work. - - -### G - Goal - During this course I would like to further develop my teamwork and my time management skills. I would also - would like to improve my programming skills and to learn new things. Learning how to communicate and colaborate - with other people will be essential for my future career. Furthermore, computer science is one of the most fast-paced areas -at the moment,so having strong programming skills will be necessary for successing in the future. - -### R - Reality (Your current situation) - with this project I will understand and experience first hand how working on a big programming project is and how to divide -all the work but at the same time work efficiently as a team. - -### O - Options - -As a beginer at programming, doing the necessary amount of work will help me keep up with my fellow teammates so we could -deliver on time our project. - -### W - Will (Motivation, plan of action) - -I am going to work hard,really hard to achieve my goal and also to make the project successful.During the whole process of -creating this project I will stick to the deadlines and do the required workload. I belive by doing so, I will be able to achieve -my goal. If however I stumble upon a problem, I will try and ask for help from my fellow teammates. diff --git a/doc/Project Details/score schema/Score schema+register ideas.docx b/doc/Project Details/score schema/Score schema+register ideas.docx deleted file mode 100644 index 6035000..0000000 Binary files a/doc/Project Details/score schema/Score schema+register ideas.docx and /dev/null differ diff --git a/doc/sprint1/agenda.md b/doc/meetings/agenda.md similarity index 100% rename from doc/sprint1/agenda.md rename to doc/meetings/agenda.md diff --git a/doc/sprint1/backlog_sprint1edit.xlsx b/doc/sprints/sprint1/backlog_sprint1edit.xlsx similarity index 100% rename from doc/sprint1/backlog_sprint1edit.xlsx rename to doc/sprints/sprint1/backlog_sprint1edit.xlsx diff --git a/doc/sprint1/retrospective_sprint1.xlsx b/doc/sprints/sprint1/retrospective_sprint1.xlsx similarity index 100% rename from doc/sprint1/retrospective_sprint1.xlsx rename to doc/sprints/sprint1/retrospective_sprint1.xlsx diff --git a/doc/sprint1/backlog_sprint2.xlsx b/doc/sprints/sprint2/backlog_sprint2.xlsx similarity index 100% rename from doc/sprint1/backlog_sprint2.xlsx rename to doc/sprints/sprint2/backlog_sprint2.xlsx diff --git a/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin rename to src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.bin diff --git a/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock rename to src/GoGreen/Client/.gradle/5.2.1/executionHistory/executionHistory.lock diff --git a/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin similarity index 100% rename from .gradle/5.2.1/fileChanges/last-build.bin rename to src/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin diff --git a/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock rename to src/GoGreen/Client/.gradle/5.2.1/fileContent/fileContent.lock diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.bin diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock diff --git a/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin rename to src/GoGreen/Client/.gradle/5.2.1/fileHashes/resourceHashesCache.bin diff --git a/.gradle/5.2.1/gc.properties b/src/GoGreen/Client/.gradle/5.2.1/gc.properties similarity index 100% rename from .gradle/5.2.1/gc.properties rename to src/GoGreen/Client/.gradle/5.2.1/gc.properties diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/classAnalysis.bin diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/jarAnalysis.bin diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/javaCompile.lock diff --git a/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin rename to src/GoGreen/Client/.gradle/5.2.1/javaCompile/taskHistory.bin diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock similarity index 100% rename from GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock rename to src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from GoGreen/Client/.gradle/buildOutputCleanup/cache.properties rename to src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties diff --git a/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin similarity index 100% rename from GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin rename to src/GoGreen/Client/.gradle/buildOutputCleanup/outputFiles.bin diff --git a/.gradle/vcs-1/gc.properties b/src/GoGreen/Client/.gradle/vcs-1/gc.properties similarity index 100% rename from .gradle/vcs-1/gc.properties rename to src/GoGreen/Client/.gradle/vcs-1/gc.properties diff --git a/GoGreen/Client/.idea/compiler.xml b/src/GoGreen/Client/.idea/compiler.xml similarity index 100% rename from GoGreen/Client/.idea/compiler.xml rename to src/GoGreen/Client/.idea/compiler.xml diff --git a/GoGreen/Client/.idea/encodings.xml b/src/GoGreen/Client/.idea/encodings.xml similarity index 100% rename from GoGreen/Client/.idea/encodings.xml rename to src/GoGreen/Client/.idea/encodings.xml diff --git a/GoGreen/Client/.idea/gradle.xml b/src/GoGreen/Client/.idea/gradle.xml similarity index 100% rename from GoGreen/Client/.idea/gradle.xml rename to src/GoGreen/Client/.idea/gradle.xml diff --git a/GoGreen/Client/.idea/misc.xml b/src/GoGreen/Client/.idea/misc.xml similarity index 100% rename from GoGreen/Client/.idea/misc.xml rename to src/GoGreen/Client/.idea/misc.xml diff --git a/GoGreen/Client/.idea/modules.xml b/src/GoGreen/Client/.idea/modules.xml similarity index 100% rename from GoGreen/Client/.idea/modules.xml rename to src/GoGreen/Client/.idea/modules.xml diff --git a/GoGreen/Client/.idea/uiDesigner.xml b/src/GoGreen/Client/.idea/uiDesigner.xml similarity index 100% rename from GoGreen/Client/.idea/uiDesigner.xml rename to src/GoGreen/Client/.idea/uiDesigner.xml diff --git a/GoGreen/Client/.idea/workspace.xml b/src/GoGreen/Client/.idea/workspace.xml similarity index 100% rename from GoGreen/Client/.idea/workspace.xml rename to src/GoGreen/Client/.idea/workspace.xml diff --git a/GoGreen/Client/build.gradle b/src/GoGreen/Client/build.gradle similarity index 100% rename from GoGreen/Client/build.gradle rename to src/GoGreen/Client/build.gradle diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController$AlertHelper.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/UserController.java.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.controller/index.source.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/UserService.java.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client.rest/index.source.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/Application.java.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client/index.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.html diff --git a/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html b/src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html rename to src/GoGreen/Client/build/jacocoHtml/gogreen.client/index.source.html diff --git a/GoGreen/Client/build/jacocoHtml/index.html b/src/GoGreen/Client/build/jacocoHtml/index.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/index.html rename to src/GoGreen/Client/build/jacocoHtml/index.html diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchfc.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchnc.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/branchpc.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/bundle.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/class.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/down.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/greenbar.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/group.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/method.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/package.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.css diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/prettify.js diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/redbar.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.css diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/report.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/session.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/sort.js diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/source.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif b/src/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif rename to src/GoGreen/Client/build/jacocoHtml/jacoco-resources/up.gif diff --git a/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html b/src/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html similarity index 100% rename from GoGreen/Client/build/jacocoHtml/jacoco-sessions.html rename to src/GoGreen/Client/build/jacocoHtml/jacoco-sessions.html diff --git a/GoGreen/Client/build/resources/main/application.properties b/src/GoGreen/Client/build/resources/main/application.properties similarity index 100% rename from GoGreen/Client/build/resources/main/application.properties rename to src/GoGreen/Client/build/resources/main/application.properties diff --git a/GoGreen/Client/build/resources/main/fxml/dashboard.fxml b/src/GoGreen/Client/build/resources/main/fxml/dashboard.fxml similarity index 100% rename from GoGreen/Client/build/resources/main/fxml/dashboard.fxml rename to src/GoGreen/Client/build/resources/main/fxml/dashboard.fxml diff --git a/GoGreen/Client/build/resources/main/fxml/sample.fxml b/src/GoGreen/Client/build/resources/main/fxml/sample.fxml similarity index 100% rename from GoGreen/Client/build/resources/main/fxml/sample.fxml rename to src/GoGreen/Client/build/resources/main/fxml/sample.fxml diff --git a/GoGreen/Client/build/resources/main/pinkleaf.jpg b/src/GoGreen/Client/build/resources/main/pinkleaf.jpg similarity index 100% rename from GoGreen/Client/build/resources/main/pinkleaf.jpg rename to src/GoGreen/Client/build/resources/main/pinkleaf.jpg diff --git a/GoGreen/Client/src/main/java/gogreen/client/Application.java b/src/GoGreen/Client/src/main/java/gogreen/client/Application.java similarity index 100% rename from GoGreen/Client/src/main/java/gogreen/client/Application.java rename to src/GoGreen/Client/src/main/java/gogreen/client/Application.java diff --git a/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java b/src/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java similarity index 100% rename from GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java rename to src/GoGreen/Client/src/main/java/gogreen/client/controller/UserController.java diff --git a/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java b/src/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java similarity index 100% rename from GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java rename to src/GoGreen/Client/src/main/java/gogreen/client/rest/UserService.java diff --git a/GoGreen/Client/src/main/resources/application.properties b/src/GoGreen/Client/src/main/resources/application.properties similarity index 100% rename from GoGreen/Client/src/main/resources/application.properties rename to src/GoGreen/Client/src/main/resources/application.properties diff --git a/GoGreen/Client/src/main/resources/fxml/dashboard.fxml b/src/GoGreen/Client/src/main/resources/fxml/dashboard.fxml similarity index 100% rename from GoGreen/Client/src/main/resources/fxml/dashboard.fxml rename to src/GoGreen/Client/src/main/resources/fxml/dashboard.fxml diff --git a/GoGreen/Client/src/main/resources/fxml/sample.fxml b/src/GoGreen/Client/src/main/resources/fxml/sample.fxml similarity index 100% rename from GoGreen/Client/src/main/resources/fxml/sample.fxml rename to src/GoGreen/Client/src/main/resources/fxml/sample.fxml diff --git a/GoGreen/Client/src/main/resources/pinkleaf.jpg b/src/GoGreen/Client/src/main/resources/pinkleaf.jpg similarity index 100% rename from GoGreen/Client/src/main/resources/pinkleaf.jpg rename to src/GoGreen/Client/src/main/resources/pinkleaf.jpg diff --git a/GoGreen/Client/src/test/java/UserServiceTest.java b/src/GoGreen/Client/src/test/java/UserServiceTest.java similarity index 100% rename from GoGreen/Client/src/test/java/UserServiceTest.java rename to src/GoGreen/Client/src/test/java/UserServiceTest.java diff --git a/GoGreen/Common/build.gradle b/src/GoGreen/Common/build.gradle similarity index 100% rename from GoGreen/Common/build.gradle rename to src/GoGreen/Common/build.gradle diff --git a/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java b/src/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java similarity index 100% rename from GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java rename to src/GoGreen/Common/src/main/java/gogreen/common/ApplicationException.java diff --git a/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java b/src/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java similarity index 100% rename from GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java rename to src/GoGreen/Common/src/main/java/gogreen/common/ErrorResponse.java diff --git a/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java b/src/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java similarity index 100% rename from GoGreen/Common/src/main/java/gogreen/common/UserDTO.java rename to src/GoGreen/Common/src/main/java/gogreen/common/UserDTO.java diff --git a/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin rename to src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.bin diff --git a/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock b/src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock rename to src/GoGreen/Server/.gradle/5.2.1/executionHistory/executionHistory.lock diff --git a/GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin b/src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/fileChanges/last-build.bin rename to src/GoGreen/Server/.gradle/5.2.1/fileChanges/last-build.bin diff --git a/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock b/src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock rename to src/GoGreen/Server/.gradle/5.2.1/fileContent/fileContent.lock diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.bin diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/fileHashes.lock diff --git a/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin b/src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin rename to src/GoGreen/Server/.gradle/5.2.1/fileHashes/resourceHashesCache.bin diff --git a/GoGreen/Client/.gradle/5.2.1/gc.properties b/src/GoGreen/Server/.gradle/5.2.1/gc.properties similarity index 100% rename from GoGreen/Client/.gradle/5.2.1/gc.properties rename to src/GoGreen/Server/.gradle/5.2.1/gc.properties diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/classAnalysis.bin diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/jarAnalysis.bin diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/javaCompile.lock diff --git a/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin b/src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin similarity index 100% rename from GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin rename to src/GoGreen/Server/.gradle/5.2.1/javaCompile/taskHistory.bin diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock similarity index 100% rename from GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock rename to src/GoGreen/Server/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties b/src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from GoGreen/Server/.gradle/buildOutputCleanup/cache.properties rename to src/GoGreen/Server/.gradle/buildOutputCleanup/cache.properties diff --git a/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin b/src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin similarity index 100% rename from GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin rename to src/GoGreen/Server/.gradle/buildOutputCleanup/outputFiles.bin diff --git a/GoGreen/Client/.gradle/vcs-1/gc.properties b/src/GoGreen/Server/.gradle/vcs-1/gc.properties similarity index 100% rename from GoGreen/Client/.gradle/vcs-1/gc.properties rename to src/GoGreen/Server/.gradle/vcs-1/gc.properties diff --git a/GoGreen/Server/.idea/encodings.xml b/src/GoGreen/Server/.idea/encodings.xml similarity index 100% rename from GoGreen/Server/.idea/encodings.xml rename to src/GoGreen/Server/.idea/encodings.xml diff --git a/GoGreen/Server/.idea/gradle.xml b/src/GoGreen/Server/.idea/gradle.xml similarity index 100% rename from GoGreen/Server/.idea/gradle.xml rename to src/GoGreen/Server/.idea/gradle.xml diff --git a/GoGreen/Server/.idea/misc.xml b/src/GoGreen/Server/.idea/misc.xml similarity index 100% rename from GoGreen/Server/.idea/misc.xml rename to src/GoGreen/Server/.idea/misc.xml diff --git a/GoGreen/Server/.idea/workspace.xml b/src/GoGreen/Server/.idea/workspace.xml similarity index 100% rename from GoGreen/Server/.idea/workspace.xml rename to src/GoGreen/Server/.idea/workspace.xml diff --git a/GoGreen/Server/build.gradle b/src/GoGreen/Server/build.gradle similarity index 100% rename from GoGreen/Server/build.gradle rename to src/GoGreen/Server/build.gradle diff --git a/GoGreen/Server/build/jacoco/test.exec b/src/GoGreen/Server/build/jacoco/test.exec similarity index 100% rename from GoGreen/Server/build/jacoco/test.exec rename to src/GoGreen/Server/build/jacoco/test.exec diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/User.java.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.data.model/index.source.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/RestExceptionHandler.java.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/UserController.java.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.rest/index.source.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/UserService.java.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server.service/index.source.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/Application.java.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server/index.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.html diff --git a/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html b/src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html rename to src/GoGreen/Server/build/jacocoHtml/gogreen.server/index.source.html diff --git a/GoGreen/Server/build/jacocoHtml/index.html b/src/GoGreen/Server/build/jacocoHtml/index.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/index.html rename to src/GoGreen/Server/build/jacocoHtml/index.html diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchfc.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchnc.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/branchpc.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/bundle.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/class.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/down.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/greenbar.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/group.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/method.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/package.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.css diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/prettify.js diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/redbar.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.css diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/report.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/session.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/sort.js diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/source.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif b/src/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif rename to src/GoGreen/Server/build/jacocoHtml/jacoco-resources/up.gif diff --git a/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html b/src/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html similarity index 100% rename from GoGreen/Server/build/jacocoHtml/jacoco-sessions.html rename to src/GoGreen/Server/build/jacocoHtml/jacoco-sessions.html diff --git a/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html b/src/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html similarity index 100% rename from GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html rename to src/GoGreen/Server/build/reports/tests/test/classes/gogreen.server.rest.UserControllerTest.html diff --git a/GoGreen/Server/build/reports/tests/test/css/base-style.css b/src/GoGreen/Server/build/reports/tests/test/css/base-style.css similarity index 100% rename from GoGreen/Server/build/reports/tests/test/css/base-style.css rename to src/GoGreen/Server/build/reports/tests/test/css/base-style.css diff --git a/GoGreen/Server/build/reports/tests/test/css/style.css b/src/GoGreen/Server/build/reports/tests/test/css/style.css similarity index 100% rename from GoGreen/Server/build/reports/tests/test/css/style.css rename to src/GoGreen/Server/build/reports/tests/test/css/style.css diff --git a/GoGreen/Server/build/reports/tests/test/index.html b/src/GoGreen/Server/build/reports/tests/test/index.html similarity index 100% rename from GoGreen/Server/build/reports/tests/test/index.html rename to src/GoGreen/Server/build/reports/tests/test/index.html diff --git a/GoGreen/Server/build/reports/tests/test/js/report.js b/src/GoGreen/Server/build/reports/tests/test/js/report.js similarity index 100% rename from GoGreen/Server/build/reports/tests/test/js/report.js rename to src/GoGreen/Server/build/reports/tests/test/js/report.js diff --git a/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html b/src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html similarity index 100% rename from GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html rename to src/GoGreen/Server/build/reports/tests/test/packages/gogreen.server.rest.html diff --git a/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml b/src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml similarity index 100% rename from GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml rename to src/GoGreen/Server/build/test-results/test/TEST-gogreen.server.rest.UserControllerTest.xml diff --git a/GoGreen/Server/build/test-results/test/binary/output.bin b/src/GoGreen/Server/build/test-results/test/binary/output.bin similarity index 100% rename from GoGreen/Server/build/test-results/test/binary/output.bin rename to src/GoGreen/Server/build/test-results/test/binary/output.bin diff --git a/GoGreen/Server/build/test-results/test/binary/output.bin.idx b/src/GoGreen/Server/build/test-results/test/binary/output.bin.idx similarity index 100% rename from GoGreen/Server/build/test-results/test/binary/output.bin.idx rename to src/GoGreen/Server/build/test-results/test/binary/output.bin.idx diff --git a/GoGreen/Server/build/test-results/test/binary/results.bin b/src/GoGreen/Server/build/test-results/test/binary/results.bin similarity index 100% rename from GoGreen/Server/build/test-results/test/binary/results.bin rename to src/GoGreen/Server/build/test-results/test/binary/results.bin diff --git a/GoGreen/Server/src/main/java/gogreen/server/Application.java b/src/GoGreen/Server/src/main/java/gogreen/server/Application.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/Application.java rename to src/GoGreen/Server/src/main/java/gogreen/server/Application.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/data/model/User.java rename to src/GoGreen/Server/src/main/java/gogreen/server/data/model/User.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java rename to src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserJpaRepository.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java b/src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java rename to src/GoGreen/Server/src/main/java/gogreen/server/data/repository/UserRepository.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java b/src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java rename to src/GoGreen/Server/src/main/java/gogreen/server/rest/RestExceptionHandler.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java b/src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java rename to src/GoGreen/Server/src/main/java/gogreen/server/rest/UserController.java diff --git a/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java b/src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java similarity index 100% rename from GoGreen/Server/src/main/java/gogreen/server/service/UserService.java rename to src/GoGreen/Server/src/main/java/gogreen/server/service/UserService.java diff --git a/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java b/src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java similarity index 100% rename from GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java rename to src/GoGreen/Server/src/test/java/gogreen/server/rest/UserControllerTest.java diff --git a/GoGreen/settings.gradle b/src/GoGreen/settings.gradle similarity index 100% rename from GoGreen/settings.gradle rename to src/GoGreen/settings.gradle diff --git a/src/main/java/grade/ProjectGrade.java b/src/main/java/grade/ProjectGrade.java deleted file mode 100644 index ebedd94..0000000 --- a/src/main/java/grade/ProjectGrade.java +++ /dev/null @@ -1,36 +0,0 @@ -package grade; - -import java.util.stream.IntStream; - -public class ProjectGrade { - - /** - * Returns a grade depending on if you used git and the project compiles. - * @param usedGit true if git was used - * @param compiles true if the project compiled - * @param grade grade calculated from the rubric - * @return grade - */ - public static double calculateGrade(boolean usedGit, boolean compiles, double grade) { - if (!usedGit || !compiles) { - return 1.0; - } - - return grade; - } - - public static boolean usesLambda() { - return IntStream.of(0, 2, 4, 6, 8, 10).map(i -> i * i) - .allMatch(i -> (i + 1) % 2 == 1); - } - - /** - * Tells you when the ta is happy. - * @param bringCake true if you brought cake - * @return happyness of the TA - */ - public static boolean taIsHappy(boolean bringCake) { - return bringCake; - } - -} diff --git a/src/main/main.iml b/src/main/main.iml deleted file mode 100644 index 908ad4f..0000000 --- a/src/main/main.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/java/grade/ProjectGradeTest.java b/src/test/java/grade/ProjectGradeTest.java deleted file mode 100644 index a83e24f..0000000 --- a/src/test/java/grade/ProjectGradeTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package grade; - -import org.junit.Assert; -import org.junit.Test; - -public class ProjectGradeTest { - - private static final double DELTA = 0.001; - - @Test - public void getGoodGradeIfCorrect() { - - double grade = ProjectGrade.calculateGrade(true, true, 7.5); - - Assert.assertEquals(7.5, grade, DELTA); - } - - @Test - public void getBadGradeIfNotCompiles() { - - double grade = ProjectGrade.calculateGrade(true, false, 7.5); - - Assert.assertEquals(1, grade, DELTA); - } - - @Test - public void getBadGradeIfNotUsedGit() { - - double grade = ProjectGrade.calculateGrade(false, true, 7.5); - - Assert.assertEquals(1, grade, DELTA); - } - - @Test - public void testTaIsNotHappy() { - Assert.assertFalse(ProjectGrade.taIsHappy(false)); - } - - @Test - public void testTaIsHappy() { - Assert.assertTrue(ProjectGrade.taIsHappy(true)); - } - - @Test - public void testIsUsingLambda() { - Assert.assertTrue(ProjectGrade.usesLambda()); - } -} \ No newline at end of file diff --git a/src/test/test.iml b/src/test/test.iml deleted file mode 100644 index a0e49a3..0000000 --- a/src/test/test.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file