Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template

.gitignore

@@ -209,4 +209,29 @@ buildNumber.properties
 # Ignore all local history of files
 .history
 
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+### Server and Client ###
+Server/.gradle
+Server/.idea
+
+Client/.gradle
+Client/.idea
 # End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode

Project Details/overview API's.md

@@ -0,0 +1,12 @@
+### API's and things we've come across
+
+# Maven
+Apache Maven is a software project management and comprehension tool. It can manage a project's build, reporting and documentation from a central piece of information. It is used for building and managing Jav-based projects
+# Gradle
+Gradle is a build automation tool that is designed to be flexible enough to build almost any type of software. it uses domain-specific language (DSL) instead of the XML form used by Apache Maven 
+# Spring
+Spring is a framework for dependency-injection which is a pattern that allows to build very decoupled systems.
+# Tomcat
+Tomcat is a Java Servlet Container. It implements several Java EE specifications including Java Servlet, JavaServer Pages (JSP), Java EL, and WebSocket, and provides a "pure Java" HTTP web server environment in which Java code can run.
+# Jersey
+A standard portable JAX-RS API made to simplify development of RESTful Web Services.

Server/.gitignore

@@ -0,0 +1,40 @@
+# # Maven ignores
+# target/
+# pom.xml.tag
+# pom.xml.releaseBackup
+# pom.xml.versionsBackup
+# pom.xml.next
+# release.properties
+# dependency-reduced-pom.xml
+# buildNumber.properties
+# .mvn/timing.properties
+
+# # Exclude maven wrapper
+# !/.mvn/wrapper/maven-wrapper.jar
+
+
+
+
+# Created by https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode
+# Edit at https://www.gitignore.io/?templates=java,maven,eclipse,intellij,visualstudiocode
+
+### Gradle ###
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode

Server/src/main/java/hello/Application.java

@@ -3,9 +3,11 @@ package hello;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+//application to boot with spring
 @SpringBootApplication
 public class Application {
 
+    //run the application
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }

Server/src/main/java/hello/GreetingController.java

@@ -13,6 +13,7 @@ public class GreetingController {
 
     @RequestMapping("/greeting")
     public Greeting greeting(@RequestParam(value="name", defaultValue="World") String name) {
+        //increment the id every time the page is refreshed (a new user visits the page)
         return new Greeting(counter.incrementAndGet(),
                             String.format(template, name));
     }

doc/meetings/20190225_agenda.md

@@ -3,12 +3,12 @@
 ## Opening
 > Check if everyone is present:
 - [ ] Nivard Jansen
-- [ ] Kristin Peneva
-- [ ] Daan Sneep
-- [ ] Merel SteenBergen
-- [ ] Ceren Uğurlu
-- [ ] Mika Wauben
-- [ ] Sem van der Hoeven
+- [x] Kristin Peneva
+- [x] Daan Sneep
+- [x] Merel SteenBergen
+- [x] Ceren Uğurlu
+- [x] Mika Wauben
+- [x] Sem van der Hoeven
 
 ## Points of action
 
@@ -18,9 +18,9 @@
 ### pre/during meeting
  
  - Make sure the server and client connections work
- - Our server uses spring and maven
+ - Our server uses spring and gradle
     - make sure everyone knows how spring works/what it is
-    - make sure everyone knows how maven works/what it is
+    - make sure everyone knows how gradle works/what it is
  - Discuss what we learned this week
     - what did we find online?
     - what did we get to know from tutorials we followed?
@@ -63,6 +63,8 @@
       - JSON
       - read into the database part and try to set one up
     - Brushing up on JSON and implementing it in the client-server communication
+ - Branches
+    - **be sure to use branches!**
 
 
 ## Any other business
@@ -71,7 +73,11 @@
 ## Question round
 - Questions for the TA
     - questions that were already present
-    - questions that rose during the meeting
+        - wrong email in gitlab
+        - is our current SCRUM board a good start?
+    - questions that arose during the meeting
+        - sprint: brightspace: every week, Andy said length is 2 weeks
+        - 'Add license' issue on gitlab
 
 ## Closing
 > Demo 1 is done, good job guys!