From 7a693d51f9f181a76245c63ff840b0afb78d05e0 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Tue, 23 Apr 2019 16:58:22 +0200
Subject: [PATCH 01/62] register page added

---
 frontend/src/layouts/MyLayout.vue |  14 +++
 frontend/src/pages/Register.vue   | 180 ++++++++++++++++++++++++++++++
 frontend/src/router/routes.js     |   5 +
 3 files changed, 199 insertions(+)
 create mode 100644 frontend/src/pages/Register.vue

diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index 6bc4eb9..ab73ffc 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -99,6 +99,20 @@
             <q-item-label>Login</q-item-label>
           </q-item-section>
         </q-item>
+        <q-item
+          clickable
+          class="text-primary"
+          v-ripple
+          tag="a"
+          to="/Register"
+        >
+          <q-item-section avatar>
+            <q-icon name="assignment"/>
+          </q-item-section>
+          <q-item-section>
+            <q-item-label>Register</q-item-label>
+          </q-item-section>
+        </q-item>
       </q-list>
     </q-drawer>
 
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
new file mode 100644
index 0000000..efb2487
--- /dev/null
+++ b/frontend/src/pages/Register.vue
@@ -0,0 +1,180 @@
+<template>
+  <div class="q-pa-md">
+    <form class="register">
+      <div class="q-pa-md">
+        <div class="column q-gutter-lg" style="">
+          <div class="col">
+            <div class="">
+              <div class="" style="max-width: 440px">
+                <q-input outlined filled stack-label v-model="user.name" type="text"
+                         label="Nutzername eingeben (mindestens 2 Zeichen)"/>
+              </div>
+            </div>
+          </div>
+            <div class="col">
+              <div class="">
+                <div class="" style="max-width: 440px">
+                  <q-input outlined filled stack-label v-model="user.email" type="text" label="Email eingeben (gültige Email)"/>
+                </div>
+              </div>
+            </div>
+            <div class="col">
+              <div class="">
+                <div class="" style="max-width: 440px">
+                  <q-input outlined filled stack-label v-model="user.checkemail" type="text"
+                           label="Email erneut eingeben" placeholer="Email"/>
+                </div>
+              </div>
+            </div>
+            <div class="col">
+              <div class="">
+                <div class="" style="max-width: 440px">
+                  <q-input outlined filled stack-label v-model="user.password" type="password"
+                           label="Passwort eingeben (mindestens 8 Zeichen)"/>
+                </div>
+              </div>
+            </div>
+            <div class="col">
+              <div class="">
+                <div class="" style="max-width: 440px">
+                  <q-input outlined filled stack-label v-model="user.checkpassword" type="password"
+                           label="Passwort erneut eingeben"/>
+                </div>
+              </div>
+            </div>
+            <div class="col">
+              <div class="">
+                <div class="" style="max-width: 440px">
+                  <q-btn
+                    label="Sign up"
+                    color="primary"
+                    class="full-width"
+                    type="submit"
+                    @click="register()"
+                    unelevated
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+    </form>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return{
+        user: {
+          name:"",
+          email:"",
+          checkemail:"",
+          password: "",
+          checkpassword: "",
+        },
+      }
+    },
+    methods: {
+      register: function () {
+        this.login();
+        console.log(localStorage.getItem('registerToken'));
+        if(this.user.email===this.user.checkemail&&this.user.password===this.user.checkpassword){
+          this.login();
+          const data = {
+            name: this.user.name,
+            password: this.user.password,
+            email: this.user.email,
+            roles: [
+              {
+                role: "CACHER",
+                domain: "geocaching.de"
+              }
+            ]
+          };
+
+          console.log("POST /api/register/ - json: " + JSON.stringify(data));
+
+          this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data)
+            .then((response) => {
+              console.log("POST /api/login/ - response: ");
+              console.log(response.data);
+              console.log("TOKEN");
+              console.log(response.data.token);
+            })
+            .catch((error) => {
+              let message;
+              let header = "Fehler: ";
+              if (error.response) {
+                console.log("ERROR RESPONSE")
+                // The request was made and the server responded with a status code
+                // that falls out of the range of 2xx
+                message = error.response.data.error;
+                header += error.response.status;
+              } else if (error.request) {
+                // The request was made but no response was received
+                // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+                // http.ClientRequest in node.js
+                message = error.request;
+              } else {
+                // Something happened in setting up the request that triggered an Error
+                console.log('Error', error.message);
+                message = error.message;
+              }
+              console.log(error.config);
+              this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: message, title: header,});
+            })
+        } else {
+
+          if(this.user.email!=this.user.checkemail) {
+            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
+              message: "Email stimmt nicht überein",
+              title: "Fehler",
+            });
+          } else if (this.user.password!=this.user.checkpassword){
+            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
+              message: "Passwort stimmt nicht überein",
+              title: "Fehler",
+            });
+          }
+        }
+      },
+      login: function () {
+
+        const logindata = {
+          email: "register@bugageocaching.de",
+          password: "reguser2019"
+        };
+
+        console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
+
+        this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', logindata)
+          .then((response) => {
+            localStorage.setItem('registerToken', JSON.stringify(response.data));
+          })
+          .catch((error) => {
+            let message;
+            let header = "Fehler: ";
+            if (error.response) {
+              console.log("ERROR RESPONSE")
+              // The request was made and the server responded with a status code
+              // that falls out of the range of 2xx
+              message = error.response.data.error;
+              header += error.response.status;
+            } else if (error.request) {
+              // The request was made but no response was received
+              // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+              // http.ClientRequest in node.js
+              message = error.request;
+            } else {
+              // Something happened in setting up the request that triggered an Error
+              console.log('Error', error.message);
+              message = error.message;
+            }
+            console.log(error.config);
+            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
+          })
+      },
+    },
+  };
+</script>
diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js
index 362b097..03ffe42 100644
--- a/frontend/src/router/routes.js
+++ b/frontend/src/router/routes.js
@@ -54,6 +54,11 @@ const routes = [
    path: "/profile/",
       component: () => import("layouts/MyLayout.vue"),
     children: [{ path: "", component: () => import("pages/Profile.vue") }]
+  },
+  {
+    path: "/register/",
+    component: () => import("layouts/MyLayout.vue"),
+    children: [{ path: "", component: () => import("pages/Register.vue") }]
   }
 ];
 

From 57c5c7c39a877a16b0092880631eea27bf42660a Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 12:38:04 +0200
Subject: [PATCH 02/62] redirect finished station to CacheEnd. not tested

---
 frontend/src/pages/CacheEnd.vue    |  2 +-
 frontend/src/pages/StationView.vue | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/CacheEnd.vue b/frontend/src/pages/CacheEnd.vue
index 8ccc20b..faf8813 100644
--- a/frontend/src/pages/CacheEnd.vue
+++ b/frontend/src/pages/CacheEnd.vue
@@ -5,7 +5,7 @@
       <p class="text-h5">{{ end1 + rankingPoints + end2 }}</p>
 
       <div class="column q-gutter-y-md">
-        <q-btn unelevated v-if="IsLoggedIn" color="primary" label="Zur Rangliste" to="/ranking/"/>
+        <q-btn unelevated v-if="isLoggedIn" color="primary" label="Zur Rangliste" to="/ranking/"/>
         <q-btn unelevated v-if="isLoggedIn" color="primary" label="Zur Belohnung" @click="reward = true" />
           <q-dialog v-model="reward">
             <q-card>
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 75fb24a..453ffb8 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -51,7 +51,7 @@
 
     data() {
       return {
-        code: "",
+        //code: "",
         cache: null,
         data: {
           cacheId: 22,
@@ -165,8 +165,8 @@
       setParams() {
         console.log("setParams: ");
         let params = {};
-        params.cacheID = this.code.split('/')[0];
-        params.stationID = this.code.split('/')[1];
+        params.cacheID = this.result.split('/')[0];
+        params.stationID = this.result.split('/')[1];
         params.durchgefuehrterCacheID = this.cacheID;
         console.log(params.cacheID + " und " + params.stationID);
         if (localStorage.getItem('userToken')) {
@@ -198,7 +198,11 @@
             .then((response) => {
               console.log("resolve(true)");
               resolve(true);
-              this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
+              if (response.data.cache_acces_definition === 0) {
+                this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
+              } else if (response.data.cache_acces_definition === 1) {
+                this.$router.push({path: `/CacheEnd/${params.cacheID}`});
+              }
             }).catch((error) => {
             console.log("resolve(false)");
             // Error

From a8b0b1bbb4ba621f081fd0123b811295202e5025 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 12:40:56 +0200
Subject: [PATCH 03/62] added createTeam

---
 .../bugageocaching/controller/Controller.java | 51 ++++++++++++++++++-
 .../labsw/bugageocaching/entities/Team.java   |  9 ----
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index ac8fd0e..076e4e4 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -48,7 +48,6 @@ public class Controller {
   @Autowired
   User_InfoRepository user_infoRepository;
 
-
   @PostConstruct
   public void init() {
     fetchPublicKey();
@@ -424,6 +423,56 @@ public class Controller {
     }
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/createTeam")
+  @ResponseBody
+  public ResponseEntity createTeam(@RequestParam String token,
+                                   @RequestParam String name) {
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //Get User_Info
+    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
+
+    if (getUser_Info.getStatusCodeValue() != 200) {
+      return getUser_Info;
+    }
+
+    User_Info user_info = (User_Info) getUser_Info.getBody();
+    //----------------------
+    if (user_info.getTeam() != null) {
+      return ResponseEntity.status(400).body("You already have a team");
+    }
+
+    for (Team team : teamRepository.findAll()) {
+      if (team.getName().equals(name)) {
+        return ResponseEntity.status(400).body("The teamname is already taken");
+      }
+    }
+
+    Team team = new Team();
+    team.setName(name);
+    teamRepository.save(team);
+
+    user_info.setTeam(team);
+    user_infoRepository.save(user_info);
+
+    return ResponseEntity.status(200).body(new Gson().toJson(team));
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Team.java b/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
index d4dd2c2..935929f 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
@@ -13,7 +13,6 @@ public class Team {
   private int id;
 
   private String name;
-  private int rankingPoints;
 
   public int getId() {
     return id;
@@ -30,12 +29,4 @@ public class Team {
   public void setName(String name) {
     this.name = name;
   }
-
-  public int getRankingPoints() {
-    return rankingPoints;
-  }
-
-  public void setRankingPoints(int rankingPoints) {
-    this.rankingPoints = rankingPoints;
-  }
 }

From a7223a49cb47e7ec3038621c78d748a649bafeb5 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 13:55:27 +0200
Subject: [PATCH 04/62] finished user story Registrierung

---
 frontend/src/pages/Register.vue | 43 ++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index efb2487..6a80aa9 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -7,14 +7,14 @@
             <div class="">
               <div class="" style="max-width: 440px">
                 <q-input outlined filled stack-label v-model="user.name" type="text"
-                         label="Nutzername eingeben (mindestens 2 Zeichen)"/>
+                         label="Nutzername eingeben" :rules="[val=>val.length>=2||'Name muss mindestens 2 Zeichen lang sein!']"/>
               </div>
             </div>
           </div>
             <div class="col">
               <div class="">
                 <div class="" style="max-width: 440px">
-                  <q-input outlined filled stack-label v-model="user.email" type="text" label="Email eingeben (gültige Email)"/>
+                  <q-input outlined filled stack-label v-model="user.email" type="text" label="Email eingeben" :rules="[val=>validateEmail(val)||'Email muss valide sein']"/>
                 </div>
               </div>
             </div>
@@ -22,7 +22,7 @@
               <div class="">
                 <div class="" style="max-width: 440px">
                   <q-input outlined filled stack-label v-model="user.checkemail" type="text"
-                           label="Email erneut eingeben" placeholer="Email"/>
+                           label="Email erneut eingeben" placeholer="Email" :rules="[val=>val===user.email||'Email stimmt nicht überein']"/>
                 </div>
               </div>
             </div>
@@ -30,7 +30,7 @@
               <div class="">
                 <div class="" style="max-width: 440px">
                   <q-input outlined filled stack-label v-model="user.password" type="password"
-                           label="Passwort eingeben (mindestens 8 Zeichen)"/>
+                           label="Passwort eingeben" :rules="[val=>val.length>=8||'Passwort muss mindestens 8 Zeichen lang sein!']"/>
                 </div>
               </div>
             </div>
@@ -38,7 +38,7 @@
               <div class="">
                 <div class="" style="max-width: 440px">
                   <q-input outlined filled stack-label v-model="user.checkpassword" type="password"
-                           label="Passwort erneut eingeben"/>
+                           label="Passwort erneut eingeben" :rules="[val=>val===user.password||'Passwort stimmt nicht überein']"/>
                 </div>
               </div>
             </div>
@@ -46,6 +46,7 @@
               <div class="">
                 <div class="" style="max-width: 440px">
                   <q-btn
+                    :disabled="!validationSuccesful"
                     label="Sign up"
                     color="primary"
                     class="full-width"
@@ -75,10 +76,24 @@
         },
       }
     },
+    computed: {
+      validationSuccesful(){
+        if(this.user.name.length>=2
+          &&this.validateEmail(this.user.email)
+          &&this.user.email===this.user.checkemail
+          &&this.user.password.length>=8
+          &&this.user.password===this.user.checkpassword){
+          return true;
+        }
+        return false;
+      }
+    },
     methods: {
+      validateEmail(email) {
+        var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        return re.test(String(email).toLowerCase());
+      },
       register: function () {
-        this.login();
-        console.log(localStorage.getItem('registerToken'));
         if(this.user.email===this.user.checkemail&&this.user.password===this.user.checkpassword){
           this.login();
           const data = {
@@ -94,13 +109,17 @@
           };
 
           console.log("POST /api/register/ - json: " + JSON.stringify(data));
-
-          this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data)
+          const token = JSON.parse(localStorage.getItem('registerToken')).token;
+          this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data,{
+            headers: {
+              'Authorization': 'Bearer ' + token,
+            }
+          })
             .then((response) => {
-              console.log("POST /api/login/ - response: ");
               console.log(response.data);
-              console.log("TOKEN");
-              console.log(response.data.token);
+              if(response.status === 201){
+                this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: "Deine Registrierung war erfolgreich!", title: "Registrierungsprozess", color: "blue"});
+              }
             })
             .catch((error) => {
               let message;

From b10226b5b92b885af13fc357dc5f61b05a2e6fdc Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 14:22:43 +0200
Subject: [PATCH 05/62] added joinTeam

---
 .../bugageocaching/controller/Controller.java | 48 +++++++++++++++++++
 .../labsw/bugageocaching/util/FinderUtil.java |  9 ++++
 2 files changed, 57 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 076e4e4..a98e143 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -473,6 +473,54 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/joinTeam")
+  @ResponseBody
+  public ResponseEntity joinTeam(@RequestParam String token,
+                                 @RequestParam String teamID) {
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //Get User_Info
+    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
+
+    if (getUser_Info.getStatusCodeValue() != 200) {
+      return getUser_Info;
+    }
+
+    User_Info user_info = (User_Info) getUser_Info.getBody();
+    //----------------------
+    if (user_info.getTeam() != null) {
+      return ResponseEntity.status(400).body("You already have a team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(teamID);
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+
+    user_info.setTeam(team);
+
+    return ResponseEntity.status(200).body(team);
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 37f81a1..4b4c595 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -152,4 +152,13 @@ public class FinderUtil {
     }
   }
 
+  public static ResponseEntity findTeamById(String teamID) {
+    Optional<Team> teamOptional = teamRepository.findById(Integer.valueOf(teamID));
+    if (teamOptional.isPresent()) {
+      return ResponseEntity.status(200).body(teamOptional.get());
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find User_Info " + teamID);
+    }
+  }
+
   }

From 5e10ffbe1bc50e9ccb45e88faf4122fa0e0c80cf Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 14:26:14 +0200
Subject: [PATCH 06/62] fixed a bug

---
 .../java/hhn/labsw/bugageocaching/controller/Controller.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index a98e143..764a265 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -518,6 +518,8 @@ public class Controller {
 
     user_info.setTeam(team);
 
+    user_infoRepository.save(user_info);
+
     return ResponseEntity.status(200).body(team);
   }
 

From e81338dd38ff05c70f6c4b807a59354eb3c95be8 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 25 Apr 2019 14:33:58 +0200
Subject: [PATCH 07/62] more bugfixes

---
 .../labsw/bugageocaching/controller/Controller.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 764a265..06702d4 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -516,6 +516,18 @@ public class Controller {
 
     Team team = (Team) getTeam.getBody();
 
+    int i = 0;
+
+    for (User_Info userInfo1 : user_infoRepository.findAll()) {
+      if (userInfo1.getTeam().equals(team)) {
+        i++;
+      }
+    }
+
+    if (i >= 10) {
+      return ResponseEntity.status(400).body("The team already has 10 members");
+    }
+
     user_info.setTeam(team);
 
     user_infoRepository.save(user_info);

From ccba1fcab18c85379a3dc59875e36fa4a0188d28 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Fri, 26 Apr 2019 19:38:58 +0200
Subject: [PATCH 08/62] Fixed RankingPoints Vue

---
 build.gradle                                        |  2 +-
 .../labsw/bugageocaching/controller/Controller.java |  3 ++-
 .../bugageocaching/helper/RankingListHelper.java    | 13 +++++++++----
 .../bugageocaching/repositories/UserRepository.java |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 90a4591..e1cfe7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ dependencies {
 
     compile 'org.springframework.boot:spring-boot-starter-tomcat'
     //compile 'org.springframework.boot:spring-boot-starter-security'
-    //compile 'org.springframework.boot:spring-boot-starter-actuator'
+    compile 'org.springframework.boot:spring-boot-starter-actuator'
     //compile 'org.springframework.boot:spring-boot-starter-aop'
     //ompile group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.2.0.RELEASE'
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 06702d4..493d66a 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -389,7 +389,8 @@ public class Controller {
     List<RankingListHelper> sendBackUsers = new LinkedList<>();
     List<Object[]> rankingUsers = userRepository.getRankingList();
     for (Object[] obj : rankingUsers) {
-      RankingListHelper tmp = new RankingListHelper((String) obj[1], (int) obj[2]);
+      RankingListHelper tmp = new RankingListHelper((String) obj[1], (Integer) obj[2]);
+      System.out.println(tmp);
       sendBackUsers.add(tmp);
     }
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
index 13f474a..9e3b2b2 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
@@ -3,11 +3,11 @@ package hhn.labsw.bugageocaching.helper;
 public class RankingListHelper {
 
   private String username;
-  private int ranking_Points;
+  private int rankingPointsSum;
 
   public RankingListHelper(String username, int ranking_Points) {
     this.username = username;
-    this.ranking_Points = ranking_Points;
+    this.rankingPointsSum = ranking_Points;
   }
 
   public String getUsername() {
@@ -19,10 +19,15 @@ public class RankingListHelper {
   }
 
   public int getRanking_Points() {
-    return ranking_Points;
+    return rankingPointsSum;
   }
 
   public void setRanking_Points(int ranking_Points) {
-    this.ranking_Points = ranking_Points;
+    this.rankingPointsSum = ranking_Points;
+  }
+
+  @Override
+  public String toString() {
+    return "( " + username + " | " + rankingPointsSum + " )";
   }
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index b09f2a9..7820046 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -16,7 +16,7 @@ public interface UserRepository extends CrudRepository<User, Integer> {
       "WHERE u.id = ui.user_id\n" +
       "AND u.id = ur.user_id\n" +
       "order by ranking_points_sum DESC\n" +
-      "LIMIT 100;", nativeQuery = true)
+      "LIMIT 10;", nativeQuery = true)
   List<Object[]> getRankingList();
 
   @Query(value = "SELECT Rang\n" +

From 35ad020c842ab6fdb8a6b0c8b2801cc57630f55f Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 19:48:14 +0200
Subject: [PATCH 09/62] added leaveTeam and added some comments

---
 .../bugageocaching/controller/Controller.java | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 493d66a..5c2d6e6 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -429,12 +429,14 @@ public class Controller {
   @ResponseBody
   public ResponseEntity createTeam(@RequestParam String token,
                                    @RequestParam String name) {
+    // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
 
     if (verifyToken.getStatusCodeValue() != 200) {
       return verifyToken;
     }
 
+    // get user
     Claims claims = (Claims) verifyToken.getBody();
 
     ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
@@ -458,6 +460,7 @@ public class Controller {
       return ResponseEntity.status(400).body("You already have a team");
     }
 
+    // checkt, ob der name bereits vorhanden ist
     for (Team team : teamRepository.findAll()) {
       if (team.getName().equals(name)) {
         return ResponseEntity.status(400).body("The teamname is already taken");
@@ -479,12 +482,14 @@ public class Controller {
   @ResponseBody
   public ResponseEntity joinTeam(@RequestParam String token,
                                  @RequestParam String teamID) {
+    // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
 
     if (verifyToken.getStatusCodeValue() != 200) {
       return verifyToken;
     }
 
+    // get user
     Claims claims = (Claims) verifyToken.getBody();
 
     ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
@@ -519,16 +524,19 @@ public class Controller {
 
     int i = 0;
 
+    // zählt teammitglieder
     for (User_Info userInfo1 : user_infoRepository.findAll()) {
       if (userInfo1.getTeam().equals(team)) {
         i++;
       }
     }
 
+    // wenn maximalanzahl der teammitglieder erreicht...
     if (i >= 10) {
       return ResponseEntity.status(400).body("The team already has 10 members");
     }
 
+    // tritt dem team bei
     user_info.setTeam(team);
 
     user_infoRepository.save(user_info);
@@ -536,6 +544,72 @@ public class Controller {
     return ResponseEntity.status(200).body(team);
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/leaveTeam")
+  @ResponseBody
+  public ResponseEntity leaveTeam(@RequestParam String token) {
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //Get User_Info
+    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
+
+    if (getUser_Info.getStatusCodeValue() != 200) {
+      return getUser_Info;
+    }
+
+    User_Info user_info = (User_Info) getUser_Info.getBody();
+    //----------------------
+    if (user_info.getTeam() == null) {
+      return ResponseEntity.status(400).body("You aren´t in any team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+
+    // verlässt team
+    user_info.setTeam(null);
+
+    int i = 0;
+    // zählt teammitglieder
+    for (User_Info userInfo1 : user_infoRepository.findAll()) {
+      if (userInfo1.getTeam().equals(team)) {
+        i++;
+      }
+    }
+
+    // löscht team, wenn keine teammitglieder mehr vorhanden
+    if (i == 0) {
+      teamRepository.delete(team);
+    }
+
+    user_infoRepository.save(user_info);
+
+    return ResponseEntity.status(200).body("Ok");
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));

From c4b3c52fea71c9f1fbdf150c215072029c6e4b7f Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 20:12:51 +0200
Subject: [PATCH 10/62] added getTeamRankingList sql query

---
 .../repositories/UserRepository.java               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index 7820046..8d1bab7 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -35,4 +35,18 @@ public interface UserRepository extends CrudRepository<User, Integer> {
       "WHERE Name = ?1", nativeQuery = true)
   int getRankingPlaceFromUser(String username);
 
+  @Query(value = "SELECT DISTINCT t.name AS teamname, SUM(ui.ranking_points_sum) AS Ranglistenpunkte\n" +
+      "FROM user u,\n" +
+      "     user_info ui,\n" +
+      "     user_roles ur,\n" +
+      "     team t\n" +
+      "WHERE u.id = ui.user_id\n" +
+      "  AND u.id = ur.user_id\n" +
+      "  AND t.id = ui.team_id\n" +
+      "  AND ui.team_id IS NOT NULL\n" +
+      "GROUP BY teamname\n" +
+      "ORDER by ranking_points_sum DESC" +
+      "LIMIT 10;", nativeQuery = true)
+  List<Object[]> getTeamRankingList();
+
 }

From 50f7204cf54669a1a77080877c18a73117873cad Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 20:15:18 +0200
Subject: [PATCH 11/62] added teamRankingListHelper

---
 .../helper/TeamRankingListHelper.java         | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java

diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java b/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java
new file mode 100644
index 0000000..9a81386
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java
@@ -0,0 +1,34 @@
+package hhn.labsw.bugageocaching.helper;
+
+public class TeamRankingListHelper {
+
+  private String teamname;
+  private int rankingPointsSum;
+
+  public TeamRankingListHelper(String teamname, int ranking_Points) {
+    this.teamname = teamname;
+    this.rankingPointsSum = ranking_Points;
+  }
+
+  public String getTeamname() {
+    return teamname;
+  }
+
+  public void setTeamname(String teamname) {
+    this.teamname = teamname;
+  }
+
+  public int getRanking_Points() {
+    return rankingPointsSum;
+  }
+
+  public void setRanking_Points(int ranking_Points) {
+    this.rankingPointsSum = ranking_Points;
+  }
+
+  @Override
+  public String toString() {
+    return "( " + teamname + " | " + rankingPointsSum + " )";
+  }
+
+}

From 1a6fb9d35ec8539af97f6cd117380c34fc90bc9e Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 20:17:24 +0200
Subject: [PATCH 12/62] added a getTeamRankingList API method

---
 .../bugageocaching/controller/Controller.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 5c2d6e6..881f78c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -3,6 +3,7 @@ package hhn.labsw.bugageocaching.controller;
 import com.google.gson.Gson;
 import hhn.labsw.bugageocaching.entities.*;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
+import hhn.labsw.bugageocaching.helper.TeamRankingListHelper;
 import hhn.labsw.bugageocaching.repositories.*;
 import hhn.labsw.bugageocaching.util.FinderUtil;
 import hhn.labsw.bugageocaching.util.VerificationUtil;
@@ -396,6 +397,21 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getTeamRankingList")
+  @ResponseBody
+  public ResponseEntity getTeamRankingList() {
+
+    List<TeamRankingListHelper> sendBackTeams = new LinkedList<>();
+    List<Object[]> rankingTeams = userRepository.getTeamRankingList();
+    for (Object[] obj : rankingTeams) {
+      TeamRankingListHelper tmp = new TeamRankingListHelper((String) obj[0], (Integer) obj[1]);
+      System.out.println(tmp);
+      sendBackTeams.add(tmp);
+    }
+    return ResponseEntity.status(200).body(new Gson().toJson(sendBackTeams));
+  }
+
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/getUser")
   @ResponseBody

From c10820d83251471f222b2d7f246ad593c810ea2d Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 21:43:23 +0200
Subject: [PATCH 13/62] myProfile and myTeams MOCKUP version added

---
 frontend/quasar.conf.js        |   1 +
 frontend/src/pages/Profile.vue | 196 +++++++++++++++++++++++++++++----
 2 files changed, 176 insertions(+), 21 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 9ee4e06..1ceac6e 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -68,6 +68,7 @@ module.exports = function (ctx) {
         'QEditor',
         'QSelect',
         'QField',
+        'QBtnDropdown',
       ],
 
       directives: [
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index d3a76c6..44f4ff8 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -1,20 +1,21 @@
 <template>
   <q-page class="column no-wrap">
     <div class="bg-red col col-shrink" style="">
-        <q-tabs
-          v-model="tab"
-          class="bg-grey-2"
-          inline-label
-          align="justify"
-          active-bg-color="bg-grey-1"
-          active-color="cyan-14"
-          indicator-color="cyan-14"
-          switch-indicator
-        >
-          <q-tab name="profile" label="Profil" icon="perm_identity"/>
-          <q-tab name="startedCaches" label="Angefangene Caches" icon="playlist_play"/>
-          <q-tab name="finishedCaches" label="Beendete Caches" icon="playlist_add_check"/>
-        </q-tabs>
+      <q-tabs
+        v-model="tab"
+        class="bg-grey-2"
+        inline-label
+        align="justify"
+        active-bg-color="bg-grey-1"
+        active-color="cyan-14"
+        indicator-color="cyan-14"
+        switch-indicator
+      >
+        <q-tab name="profile" label="Profil" icon="perm_identity"/>
+        <q-tab name="teams" label="Teams" icon="group"/>
+        <q-tab name="startedCaches" label="Angefangene Caches" icon="playlist_play"/>
+        <q-tab name="finishedCaches" label="Beendete Caches" icon="playlist_add_check"/>
+      </q-tabs>
       <q-separator color="grey-4"/>
     </div>
 
@@ -22,6 +23,151 @@
       <q-tab-panels v-model="tab" animated swipeable class="col">
 
         <q-tab-panel name="profile" class=" fit">
+
+          <div class="row">
+            <div class="col" align="center">
+              <b>
+                Mein Nutzername
+              </b>
+            </div>
+            <div class="col" align="center">
+              BuGaCacher2019
+            </div>
+          </div>
+          <hr/>
+          <div class="row text-center">
+            <div class="col">
+              <b>
+                Meine Email
+              </b>
+            </div>
+            <div class="col" align="center">
+              muster.mail@muster.de
+            </div>
+          </div>
+          <hr/>
+          <div class="row">
+            <div class="col" align="center">
+              <b>
+                Meine Ranglistenposition
+              </b>
+            </div>
+            <div class="col" align="center">
+              1234
+            </div>
+          </div>
+          <hr/>
+          <div align="center">
+            <b>
+              Meine Teams
+            </b>
+          </div>
+          <br/>
+          <div class="col" align="center">
+            BuGa19Community
+            <br/>
+            GeoCachingHeilbronn
+            <br/>
+            RunForTheFlowers
+          </div>
+          <br/>
+          <div align="center">
+            <b>
+              Offene Teameinladungen
+            </b>
+          </div>
+          <br/>
+          <div class="col" align="center">
+            HNcachingHN
+          </div>
+        </q-tab-panel>
+        <q-tab-panel name="teams">
+            <div class="q-pa-md" align="center">
+              <q-btn-dropdown color="primary" label="BuGa19Community" size="30px">
+                <q-list>
+                  <q-item clickable v-close-popup>
+                    <q-item-section>
+                      <q-item-label>BuGa19Community</q-item-label>
+                    </q-item-section>
+                  </q-item>
+
+                  <q-item clickable v-close-popup>
+                    <q-item-section>
+                      <q-item-label>GeoCachingHeilbronn</q-item-label>
+                    </q-item-section>
+                  </q-item>
+
+                  <q-item clickable v-close-popup>
+                    <q-item-section>
+                      <q-item-label>RunForTheFlowers</q-item-label>
+                    </q-item-section>
+                  </q-item>
+
+                  <q-item clickable v-close-popup>
+                    <q-item-section>
+                      <q-item-label>HNcachingHN</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-btn-dropdown>
+            </div>
+          <hr/>
+          <div align="center">
+            <b>
+              Teammitglieder
+            </b>
+          </div>
+          <br/>
+          <div align="center">
+            BuGaCacher2019
+            <br/>
+            Max
+            <br/>
+            Timo
+            <br/>
+            Katharina
+            <br/>
+            Michael
+            <br/>
+            Robin
+          </div>
+          <br/>
+          <div class="row">
+            <div class="col" align="center">
+              <q-input outlined filled stack-label v-model="inviteMail"
+                       type="text" label="Email des Nutzers der ins Team aufgenommen werden soll"
+                       :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
+            </div>
+            <div class="col" align="center">
+              <q-btn label="Einladung versenden"
+                     color="primary"
+                     type="submit"
+                     size="22px"/>
+            </div>
+          </div>
+          <hr/>
+          <div align="center">
+            <b>
+              Aktueller Teamstatus
+            </b>
+          </div>
+          <br/>
+          <div>
+            Lorem ipsum dolor sit amet consectetur adipisicing elit. Fugit nihil praesentium molestias a adipisci,
+            dolore vitae odit, quidem consequatur optio voluptates asperiores pariatur eos numquam rerum delectus
+            commodi perferendis voluptate?
+          </div>
+          <br/>
+          <q-input outlined filled stack-label v-model="teamStatus"
+                   type="text" label="Neuer Teamstatus"/>
+          <br/>
+          <div align="center">
+            <q-btn label="Teamstatus aktualisieren"
+                   size="20px"
+                   color="primary"
+                   type="submit"/>
+          </div>
+
         </q-tab-panel>
 
         <q-tab-panel name="startedCaches" class=" fit">
@@ -76,7 +222,9 @@
                     <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
                   </q-item-section>
                   <q-item-section>
-                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints }}</q-item-label>
+                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints
+                      }}
+                    </q-item-label>
                   </q-item-section>
 
                   <q-item-section side top class="self-center">
@@ -107,6 +255,8 @@
       return {
         tab: 'profile',
         startedCaches: [],
+        inviteMail: "",
+        teamStatus: "",
       }
     },
     mounted: function () {
@@ -116,17 +266,17 @@
         return this.$store.getters['auth/GET_ADMINSTATE'];
       }
     },
-    created: function() {
+    created: function () {
       this.fetchUserCaches();
       this.$store.commit('auth/SET_AUTHENTICATED');
       this.$store.commit('auth/SET_USER');
     },
     methods: {
-      fetchUserCaches: function() {
+      fetchUserCaches: function () {
         const token = JSON.parse(localStorage.getItem('userToken')).token;
-        this.$axios.get('/api/getMyCaches', { params: {token}} )
+        this.$axios.get('/api/getMyCaches', {params: {token}})
           .then((response) => {
-          this.startedCaches = response.data;
+            this.startedCaches = response.data;
           }).catch((error) => {
           // Error
           let msg;
@@ -147,11 +297,15 @@
             console.log('Error', error.message);
           }
           console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
         })
       },
       continueCache(cacheID) {
-      }
+      },
+      validateEmail(email) {
+        var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        return re.test(String(email).toLowerCase());
+      },
     }
   }
 </script>

From 8c10b4286d9161317500641dbb7f84125925dc63 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 21:52:53 +0200
Subject: [PATCH 14/62] ranking for teams added (MOCKUP)

---
 frontend/src/pages/Profile.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 44f4ff8..e05e043 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -112,6 +112,16 @@
               </q-btn-dropdown>
             </div>
           <hr/>
+          <div align="center">
+            <b>
+              Ranglistenposition des Teams
+            </b>
+          </div>
+          <br/>
+          <div align="center">
+            2019
+          </div>
+          <hr/>
           <div align="center">
             <b>
               Teammitglieder

From 62de51f07da7bbbbcaff11e810a030df41e33b61 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Sat, 27 Apr 2019 22:06:06 +0200
Subject: [PATCH 15/62] create Team added (MOCKUP)

---
 frontend/src/pages/Profile.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index e05e043..f9e7375 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -109,6 +109,15 @@
                     </q-item-section>
                   </q-item>
                 </q-list>
+
+                <q-item clickable v-close-popup>
+                  <q-item-section avatar>
+                    <q-avatar icon="add" color="primary" text-color="white" />
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label>Neues Team erstellen</q-item-label>
+                  </q-item-section>
+                </q-item>
               </q-btn-dropdown>
             </div>
           <hr/>

From 45cef7d5f394d295b145dd07776f0fc81c8f4492 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Sun, 28 Apr 2019 20:53:06 +0200
Subject: [PATCH 16/62] Profile mockup updated for presentation

---
 frontend/src/pages/Profile.vue | 111 +++++++++++++--------------------
 1 file changed, 43 insertions(+), 68 deletions(-)

diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index f9e7375..c3a28d9 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -57,78 +57,58 @@
             </div>
           </div>
           <hr/>
-          <div align="center">
-            <b>
-              Meine Teams
-            </b>
+          <div class="row">
+            <div class="col" align="center">
+              <b>
+                Mein Team
+              </b>
+            </div>
+            <div class="col" align="center">
+              BuGa19Community
+            </div>
           </div>
-          <br/>
-          <div class="col" align="center">
-            BuGa19Community
-            <br/>
-            GeoCachingHeilbronn
-            <br/>
-            RunForTheFlowers
-          </div>
-          <br/>
-          <div align="center">
-            <b>
-              Offene Teameinladungen
-            </b>
-          </div>
-          <br/>
-          <div class="col" align="center">
-            HNcachingHN
+          <hr/>
+          <div class="row">
+            <div class="col" align="center">
+              <b>
+                Teamranglistenposition
+              </b>
+            </div>
+            <div class="col" align="center">
+              2019
+            </div>
           </div>
+          <hr/>
         </q-tab-panel>
         <q-tab-panel name="teams">
-            <div class="q-pa-md" align="center">
-              <q-btn-dropdown color="primary" label="BuGa19Community" size="30px">
-                <q-list>
-                  <q-item clickable v-close-popup>
-                    <q-item-section>
-                      <q-item-label>BuGa19Community</q-item-label>
-                    </q-item-section>
-                  </q-item>
-
-                  <q-item clickable v-close-popup>
-                    <q-item-section>
-                      <q-item-label>GeoCachingHeilbronn</q-item-label>
-                    </q-item-section>
-                  </q-item>
-
-                  <q-item clickable v-close-popup>
-                    <q-item-section>
-                      <q-item-label>RunForTheFlowers</q-item-label>
-                    </q-item-section>
-                  </q-item>
-
-                  <q-item clickable v-close-popup>
-                    <q-item-section>
-                      <q-item-label>HNcachingHN</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                </q-list>
+          <div class="q-pa-md" align="center">
+            <q-btn-dropdown color="primary" label="BuGa19Community" size="20px">
+              <q-list>
+                <q-item clickable v-close-popup>
+                  <q-item-section>
+                    <q-item-label>BuGa19Community</q-item-label>
+                  </q-item-section>
+                </q-item>
 
                 <q-item clickable v-close-popup>
                   <q-item-section avatar>
-                    <q-avatar icon="add" color="primary" text-color="white" />
+                    <q-avatar icon="add" color="primary" text-color="white"/>
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label>Offene Teameinladungen</q-item-label>
+                  </q-item-section>
+                </q-item>
+
+                <q-item clickable v-close-popup>
+                  <q-item-section avatar>
+                    <q-avatar icon="add" color="primary" text-color="white"/>
                   </q-item-section>
                   <q-item-section>
                     <q-item-label>Neues Team erstellen</q-item-label>
                   </q-item-section>
                 </q-item>
-              </q-btn-dropdown>
-            </div>
-          <hr/>
-          <div align="center">
-            <b>
-              Ranglistenposition des Teams
-            </b>
-          </div>
-          <br/>
-          <div align="center">
-            2019
+              </q-list>
+            </q-btn-dropdown>
           </div>
           <hr/>
           <div align="center">
@@ -154,14 +134,13 @@
           <div class="row">
             <div class="col" align="center">
               <q-input outlined filled stack-label v-model="inviteMail"
-                       type="text" label="Email des Nutzers der ins Team aufgenommen werden soll"
+                       type="text" label="Email des Nutzers"
                        :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
             </div>
             <div class="col" align="center">
               <q-btn label="Einladung versenden"
                      color="primary"
-                     type="submit"
-                     size="22px"/>
+                     type="submit"/>
             </div>
           </div>
           <hr/>
@@ -172,17 +151,13 @@
           </div>
           <br/>
           <div>
-            Lorem ipsum dolor sit amet consectetur adipisicing elit. Fugit nihil praesentium molestias a adipisci,
-            dolore vitae odit, quidem consequatur optio voluptates asperiores pariatur eos numquam rerum delectus
-            commodi perferendis voluptate?
+            Dienstag 15:00 Treffen zum Blumencache.
           </div>
           <br/>
           <q-input outlined filled stack-label v-model="teamStatus"
                    type="text" label="Neuer Teamstatus"/>
-          <br/>
           <div align="center">
             <q-btn label="Teamstatus aktualisieren"
-                   size="20px"
                    color="primary"
                    type="submit"/>
           </div>

From bd811fbe99152846d0780b3a33287dbb939616c8 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Sun, 28 Apr 2019 20:56:05 +0200
Subject: [PATCH 17/62] icon for teaminvites updated

---
 frontend/src/pages/Profile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index c3a28d9..810a559 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -92,7 +92,7 @@
 
                 <q-item clickable v-close-popup>
                   <q-item-section avatar>
-                    <q-avatar icon="add" color="primary" text-color="white"/>
+                    <q-avatar icon="group_add" color="primary" text-color="white"/>
                   </q-item-section>
                   <q-item-section>
                     <q-item-label>Offene Teameinladungen</q-item-label>

From 54e488ac28298c673a28f3076a496f049e163c99 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 10:19:52 +0200
Subject: [PATCH 18/62] added sendTeamInvite API method and all needed database
 tables

---
 .../bugageocaching/controller/Controller.java | 68 +++++++++++++++++++
 .../bugageocaching/entities/TeamInvite.java   | 42 ++++++++++++
 .../repositories/TeamInviteRepository.java    |  9 +++
 .../repositories/UserRepository.java          |  2 +-
 4 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
 create mode 100644 src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 881f78c..f278cd5 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -49,6 +49,9 @@ public class Controller {
   @Autowired
   User_InfoRepository user_infoRepository;
 
+  @Autowired
+  TeamInviteRepository teamInviteRepository;
+
   @PostConstruct
   public void init() {
     fetchPublicKey();
@@ -626,6 +629,71 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/sendTeamInvite")
+  @ResponseBody
+  public ResponseEntity sendTeamInvite(@RequestParam String token,
+                                       @RequestParam String invitedUserEmail) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    // get InvitedUser
+
+    User invitedUser = userRepository.findByEmail(invitedUserEmail);
+
+    if (invitedUser == null) {
+      return ResponseEntity.status(404).body("There isnt any user with that email");
+    }
+    //----------------------
+
+
+    //Get User_Info
+    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
+
+    if (getUser_Info.getStatusCodeValue() != 200) {
+      return getUser_Info;
+    }
+
+    User_Info user_info = (User_Info) getUser_Info.getBody();
+    //----------------------
+    if (user_info.getTeam() == null) {
+      return ResponseEntity.status(400).body("You aren´t in any team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+
+    TeamInvite teamInvite = new TeamInvite();
+    teamInvite.setUser(invitedUser);
+    teamInvite.setTeam(team);
+
+    teamInviteRepository.save(teamInvite);
+
+    return ResponseEntity.status(200).body("OK");
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java b/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
new file mode 100644
index 0000000..6d25351
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
@@ -0,0 +1,42 @@
+package hhn.labsw.bugageocaching.entities;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+public class TeamInvite {
+
+  @Id
+  @GeneratedValue
+  private int id;
+
+  @OneToOne
+  private User user;
+
+  @OneToOne
+  private Team team;
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+
+  public Team getTeam() {
+    return team;
+  }
+
+  public void setTeam(Team team) {
+    this.team = team;
+  }
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
new file mode 100644
index 0000000..42ba9f5
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
@@ -0,0 +1,9 @@
+package hhn.labsw.bugageocaching.repositories;
+
+import hhn.labsw.bugageocaching.entities.Cache;
+import hhn.labsw.bugageocaching.entities.TeamInvite;
+import hhn.labsw.bugageocaching.entities.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TeamInviteRepository extends JpaRepository<TeamInvite, Integer> {
+}
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index 8d1bab7..d8784ec 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -7,7 +7,7 @@ import org.springframework.data.repository.CrudRepository;
 import java.util.List;
 
 public interface UserRepository extends CrudRepository<User, Integer> {
-  User findByUsername(String username);
+  User findByEmail(String email);
 
   @Query(value = "SELECT DISTINCT u.id AS ID, SUBSTRING_INDEX(u.email, '@', 1) AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
       "FROM user u,\n" +

From 06e2b54aef5d6f564964b09d12477c4b423c6fae Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 10:51:49 +0200
Subject: [PATCH 19/62] added getMyTeamInvites API method

---
 .../bugageocaching/controller/Controller.java | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index f278cd5..804986f 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -694,6 +694,39 @@ public class Controller {
     return ResponseEntity.status(200).body("OK");
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getMyTeamInvites")
+  @ResponseBody
+  public ResponseEntity getMyTeamInvites(@RequestParam String token) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    List<TeamInvite> teamInvitesList = new ArrayList<>();
+
+    for(TeamInvite teamInvite : teamInviteRepository.findAll()) {
+      if(teamInvite.getUser() == user) {
+        teamInvitesList.add(teamInvite);
+      }
+    }
+
+    return ResponseEntity.status(200).body(teamInvitesList);
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));

From 80510eb4677e9d006b6fd6c3897a28418d60ab27 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 10:58:09 +0200
Subject: [PATCH 20/62] improved sendTeamInvite

---
 .../bugageocaching/controller/Controller.java | 32 +++++++++++++++++--
 .../repositories/TeamInviteRepository.java    |  2 ++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 804986f..c394c38 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -685,6 +685,10 @@ public class Controller {
 
     Team team = (Team) getTeam.getBody();
 
+    if(teamInviteRepository.findByUserAndTeam(invitedUser, team) != null) {
+      return ResponseEntity.status(400).body("The user is already invited to this team");
+    }
+
     TeamInvite teamInvite = new TeamInvite();
     teamInvite.setUser(invitedUser);
     teamInvite.setTeam(team);
@@ -718,8 +722,8 @@ public class Controller {
 
     List<TeamInvite> teamInvitesList = new ArrayList<>();
 
-    for(TeamInvite teamInvite : teamInviteRepository.findAll()) {
-      if(teamInvite.getUser() == user) {
+    for (TeamInvite teamInvite : teamInviteRepository.findAll()) {
+      if (teamInvite.getUser() == user) {
         teamInvitesList.add(teamInvite);
       }
     }
@@ -727,6 +731,30 @@ public class Controller {
     return ResponseEntity.status(200).body(teamInvitesList);
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/deleteTeamInvite")
+  @ResponseBody
+  public ResponseEntity deleteTeamInvite(@RequestParam String token,
+                                         @RequestParam ) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
index 42ba9f5..1454dfa 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
@@ -1,9 +1,11 @@
 package hhn.labsw.bugageocaching.repositories;
 
 import hhn.labsw.bugageocaching.entities.Cache;
+import hhn.labsw.bugageocaching.entities.Team;
 import hhn.labsw.bugageocaching.entities.TeamInvite;
 import hhn.labsw.bugageocaching.entities.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TeamInviteRepository extends JpaRepository<TeamInvite, Integer> {
+  TeamInvite findByUserAndTeam(User user, Team team);
 }

From ac15616e22d7d0dd598e788ee05cd4030db4bdf0 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 11:02:43 +0200
Subject: [PATCH 21/62] added deleteTeamInvite API method

---
 .../bugageocaching/controller/Controller.java | 20 ++++++++++---------
 .../labsw/bugageocaching/util/FinderUtil.java | 16 +++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index c394c38..a4f8784 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -685,7 +685,7 @@ public class Controller {
 
     Team team = (Team) getTeam.getBody();
 
-    if(teamInviteRepository.findByUserAndTeam(invitedUser, team) != null) {
+    if (teamInviteRepository.findByUserAndTeam(invitedUser, team) != null) {
       return ResponseEntity.status(400).body("The user is already invited to this team");
     }
 
@@ -735,7 +735,7 @@ public class Controller {
   @RequestMapping("/api/deleteTeamInvite")
   @ResponseBody
   public ResponseEntity deleteTeamInvite(@RequestParam String token,
-                                         @RequestParam ) {
+                                         @RequestParam String teamInviteID) {
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
 
@@ -743,16 +743,18 @@ public class Controller {
       return verifyToken;
     }
 
-    //get User
-    Claims claims = (Claims) verifyToken.getBody();
+    // get teaminvite
+    ResponseEntity getTeamInvite = FinderUtil.findTeamInviteByID(teamInviteID);
 
-    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
-
-    if (getUser.getStatusCodeValue() != 200) {
-      return getUser;
+    if (getTeamInvite.getStatusCodeValue() != 200) {
+      return getTeamInvite;
     }
 
-    User user = (User) getUser.getBody();
+    TeamInvite teamInvite = (TeamInvite) getTeamInvite.getBody();
+
+    teamInviteRepository.delete(teamInvite);
+
+    return ResponseEntity.status(200).body("OK");
   }
 
   @RequestMapping("/api/hello")
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 4b4c595..66e10e1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -31,6 +31,8 @@ public class FinderUtil {
 
   static User_InfoRepository user_infoRepository;
 
+  static TeamInviteRepository teamInviteRepository;
+
 
   @Autowired
   public void setCacheRepository(CacheRepository cacheRepository) {
@@ -72,6 +74,11 @@ public class FinderUtil {
     FinderUtil.user_infoRepository = user_infoRepository;
   }
 
+  @Autowired
+  public void setTeamInviteRepository(TeamInviteRepository teamInviteRepository) {
+    FinderUtil.teamInviteRepository = teamInviteRepository;
+  }
+
 
   public static ResponseEntity findCacheById(String cacheID) {
 
@@ -161,4 +168,13 @@ public class FinderUtil {
     }
   }
 
+  public static ResponseEntity findTeamInviteByID(String teamInviteID) {
+    Optional<TeamInvite> teamInviteOptional = teamInviteRepository.findById(Integer.valueOf(teamInviteID));
+    if (teamInviteOptional.isPresent()) {
+      return ResponseEntity.status(200).body(teamInviteOptional.get());
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find User_Info " + teamInviteID);
+    }
+  }
+
   }

From ac484e5d0c6ada74cf66d4b5a9ae81e56bac899a Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 11:03:59 +0200
Subject: [PATCH 22/62] removed old unneeded methods

---
 .../java/hhn/labsw/bugageocaching/util/FinderUtil.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 66e10e1..98b7b6b 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -111,16 +111,6 @@ public class FinderUtil {
     return ResponseEntity.status(404).body("The user has not started this cache yet");
   }
 
-  public static ResponseEntity findUserByUsername(String username) {
-
-    User user = userRepository.findByUsername(username);
-    if (user != null) {
-      return ResponseEntity.status(200).body(user);
-    }
-
-    return ResponseEntity.status(404).body("Couldnt find user with username " + username);
-  }
-
   public static ResponseEntity findCacheAccesDefinitionById(String cacheAccesDefinitionID) {
     Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID));
     if (cacheAccesDefinitionOptional.isPresent()) {

From d9a76e978352d2dfda72a6bc2ef186f103d91f99 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 11:15:24 +0200
Subject: [PATCH 23/62] added teamStatus and setTeamStatus API method

---
 .../bugageocaching/controller/Controller.java | 52 +++++++++++++++++++
 .../labsw/bugageocaching/entities/Team.java   | 10 ++++
 2 files changed, 62 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index a4f8784..5e392f7 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -757,6 +757,58 @@ public class Controller {
     return ResponseEntity.status(200).body("OK");
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/setTeamStatus")
+  @ResponseBody
+  public ResponseEntity setTeamStatus(@RequestParam String token,
+                                      @RequestParam String teamStatus) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //Get User_Info
+    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
+
+    if (getUser_Info.getStatusCodeValue() != 200) {
+      return getUser_Info;
+    }
+
+    User_Info user_info = (User_Info) getUser_Info.getBody();
+    //----------------------
+    if (user_info.getTeam() == null) {
+      return ResponseEntity.status(400).body("You aren´t in any team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+    team.setTeamStatus(teamStatus);
+
+    teamRepository.save(team);
+
+    return ResponseEntity.status(200).body(teamStatus);
+  }
+
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Team.java b/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
index 935929f..55b87d4 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Team.java
@@ -14,6 +14,8 @@ public class Team {
 
   private String name;
 
+  private String teamStatus;
+
   public int getId() {
     return id;
   }
@@ -29,4 +31,12 @@ public class Team {
   public void setName(String name) {
     this.name = name;
   }
+
+  public String getTeamStatus() {
+    return teamStatus;
+  }
+
+  public void setTeamStatus(String teamStatus) {
+    this.teamStatus = teamStatus;
+  }
 }

From 37af0bb49e5391aa6475e4907fe309e01f90bc8b Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 11:40:29 +0200
Subject: [PATCH 24/62] changed return body to JSON

---
 .../hhn/labsw/bugageocaching/controller/Controller.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 5e392f7..528af69 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -560,7 +560,7 @@ public class Controller {
 
     user_infoRepository.save(user_info);
 
-    return ResponseEntity.status(200).body(team);
+    return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
@@ -728,7 +728,7 @@ public class Controller {
       }
     }
 
-    return ResponseEntity.status(200).body(teamInvitesList);
+    return ResponseEntity.status(200).body(new Gson().toJson(teamInvitesList));
   }
 
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
@@ -805,7 +805,7 @@ public class Controller {
 
     teamRepository.save(team);
 
-    return ResponseEntity.status(200).body(teamStatus);
+    return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
   }
 
 

From c53fbaf9d51a6e9e5d14e990d5191ba690e31a5e Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 14:44:38 +0200
Subject: [PATCH 25/62] added table annotation for teaminvite

---
 .../java/hhn/labsw/bugageocaching/entities/TeamInvite.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java b/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
index 6d25351..22a3e30 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/TeamInvite.java
@@ -1,9 +1,9 @@
 package hhn.labsw.bugageocaching.entities;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 
+@Entity
+@Table
 public class TeamInvite {
 
   @Id

From 9816cdf488112e23f8d8f19cb050ba04f94d2844 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Mon, 29 Apr 2019 17:35:50 +0200
Subject: [PATCH 26/62] Some changes

---
 frontend/quasar.conf.js                       |   2 +-
 frontend/src/pages/CacheStart.vue             |   3 +-
 frontend/src/pages/Register.vue               |   4 +-
 frontend/src/pages/StationView.vue            |   3 +-
 .../bugageocaching/controller/Controller.java | 180 +++++++++---------
 .../bugageocaching/entities/User_Info.java    |   4 +
 .../repositories/User_InfoRepository.java     |  10 +-
 .../labsw/bugageocaching/util/FinderUtil.java |  12 +-
 8 files changed, 118 insertions(+), 100 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 1ceac6e..13253ee 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,7 +109,7 @@ module.exports = function (ctx) {
           API: JSON.stringify('http://localhost:8080')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching')
+          //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching')
           API: JSON.stringify('http://localhost:8080')
         }
     },
diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 2cc51de..d1b4466 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -97,7 +97,8 @@
         params.cacheID = this.result.split('/')[0];
         params.stationID = this.result.split('/')[1];
         params.durchgefuehrterCacheID = this.cacheID;
-        console.log(params.cacheID + " und " + params.stationID);
+        console.log("CacheID: " + params.cacheID + " und StationID: " + params.stationID);
+        console.log(params.durchgefuehrterCacheID);
         if (localStorage.getItem('userToken')) {
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
         }
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 6a80aa9..318552a 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -110,7 +110,7 @@
 
           console.log("POST /api/register/ - json: " + JSON.stringify(data));
           const token = JSON.parse(localStorage.getItem('registerToken')).token;
-          this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data,{
+          this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/register', data,{
             headers: {
               'Authorization': 'Bearer ' + token,
             }
@@ -167,7 +167,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
 
-        this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', logindata)
+        this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/login', logindata)
           .then((response) => {
             localStorage.setItem('registerToken', JSON.stringify(response.data));
           })
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 453ffb8..8696cf7 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -167,7 +167,8 @@
         let params = {};
         params.cacheID = this.result.split('/')[0];
         params.stationID = this.result.split('/')[1];
-        params.durchgefuehrterCacheID = this.cacheID;
+        params.durchgefuehrterCacheID = params.cacheID;
+        console.log(params.durchgefuehrterCacheID);
         console.log(params.cacheID + " und " + params.stationID);
         if (localStorage.getItem('userToken')) {
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 881f78c..6504a54 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -16,7 +16,6 @@ import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Optional;
 
 import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.createCacheUtil;
 import static hhn.labsw.bugageocaching.util.CacheConstructionUtil.deleteCacheUtil;
@@ -61,88 +60,88 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll()));
   }
 
-  // alte startCache-methode
-//  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-//  @RequestMapping("/api/startCache")
-//  @ResponseBody
-//  public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
-//                                   @RequestParam String cacheID) {
-//
-//    if (!token.equals("-1")) { // ein angemeldeter user startet den cache(es werden zwei parameter übergeben)
-//
-//      Bearbeitet bearbeitet = new Bearbeitet();
-//
-//
-//      //----------------------
-//      //Verify token
-//      ResponseEntity tokenVerification = VerificationUtil.verifyToken(token);
-//
-//      //Error in token verification
-//      if (tokenVerification.getStatusCodeValue() != 200) {
-//        return tokenVerification;
-//      }
-//
-//      Claims claims = (Claims) tokenVerification.getBody();
-//
-//      ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
-//
-//      if (getUser.getStatusCodeValue() != 200) {
-//        return getUser;
-//      }
-//
-//      User user = (User) getUser.getBody();
-//
-//      bearbeitet.setUser(user);
-//
-//      //----------------------
-//      //Get Cache
-//      ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
-//
-//      if (getCache.getStatusCodeValue() != 200) {
-//        return getCache;
-//      }
-//
-//      Cache cache = (Cache) getCache.getBody();
-//      //----------------------
-//
-//      if (bearbeitetRepository.findByUserAndCache(user, cache) != null) {
-//        Bearbeitet bearbeitet1 = bearbeitetRepository.findByUserAndCache(user, cache);
-//        return ResponseEntity.status(200).body(bearbeitet1);
-//      }
-//
-//      bearbeitet.setCache(cache);
-//
-//      Station startStation = cache.getStationen().get(0);
-//      bearbeitet.setAktuelleStation(startStation);
-//
-//      //Get CacheAccesDefinition
-//      ResponseEntity getCacheAccesDefinition = FinderUtil.findCacheAccesDefinitionById("0");
-//
-//      if (getCacheAccesDefinition.getStatusCodeValue() != 200) {
-//        return getCacheAccesDefinition;
-//      }
-//
-//      CacheAccesDefinition cacheAccesDefinition = (CacheAccesDefinition) getCacheAccesDefinition.getBody();
-//      //----------------------
-//      bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
-//
-//      bearbeitetRepository.save(bearbeitet);
-//
-//      return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet));
-//
-//    } else { // kein angemeldeter User startet den cache(es wird nur der cache als parameter übergeben)
-//
-//      ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
-//
-//      if (getCache.getStatusCodeValue() != 200) {
-//        return getCache;
-//      }
-//
-//      Cache cache = (Cache) getCache.getBody();
-//
-//      return ResponseEntity.status(200).body(new Gson().toJson(cache));
-//    }
-//  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/startCache")
+  @ResponseBody
+  public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
+                                   @RequestParam String cacheID) {
+
+    if (!token.equals("-1")) { // ein angemeldeter user startet den cache(es werden zwei parameter übergeben)
+
+      Bearbeitet bearbeitet = new Bearbeitet();
+
+
+      //----------------------
+      //Verify token
+      ResponseEntity tokenVerification = VerificationUtil.verifyToken(token);
+
+      //Error in token verification
+      if (tokenVerification.getStatusCodeValue() != 200) {
+        return tokenVerification;
+      }
+
+      Claims claims = (Claims) tokenVerification.getBody();
+
+      ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+      if (getUser.getStatusCodeValue() != 200) {
+        return getUser;
+      }
+
+      User user = (User) getUser.getBody();
+
+      bearbeitet.setUser(user);
+
+      //----------------------
+      //Get Cache
+      ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
+
+      if (getCache.getStatusCodeValue() != 200) {
+        return getCache;
+      }
+
+      Cache cache = (Cache) getCache.getBody();
+      //----------------------
+
+      if (bearbeitetRepository.findByUserAndCache(user, cache) != null) {
+        Bearbeitet bearbeitet1 = bearbeitetRepository.findByUserAndCache(user, cache);
+        return ResponseEntity.status(200).body(bearbeitet1);
+      }
+
+      bearbeitet.setCache(cache);
+
+      Station startStation = cache.getStationen().get(0);
+      bearbeitet.setAktuelleStation(startStation);
+
+      //Get CacheAccesDefinition
+      ResponseEntity getCacheAccesDefinition = FinderUtil.findCacheAccesDefinitionById("0");
+
+      if (getCacheAccesDefinition.getStatusCodeValue() != 200) {
+        return getCacheAccesDefinition;
+      }
+
+      CacheAccesDefinition cacheAccesDefinition = (CacheAccesDefinition) getCacheAccesDefinition.getBody();
+      //----------------------
+      bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
+
+      //bearbeitetRepository.save(bearbeitet);
+
+      return ResponseEntity.status(201).body(new Gson().toJson(bearbeitet));
+
+    } else { // kein angemeldeter User startet den cache(es wird nur der cache als parameter übergeben)
+
+      ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
+
+      if (getCache.getStatusCodeValue() != 200) {
+        return getCache;
+      }
+
+      Cache cache = (Cache) getCache.getBody();
+
+      return ResponseEntity.status(200).body(new Gson().toJson(cache));
+    }
+  }
 
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/checkStation")
@@ -205,8 +204,11 @@ public class Controller {
     Station station = (Station) getStation.getBody();
     //----------------------
 
-    if (cache != durchgefuehrterCache) {
-      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station");
+    System.out.println(cache.getName());
+    System.out.println(durchgefuehrterCache.getName());
+
+    if (!cacheID.equals(durchgefuehrterCacheID)) {
+      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station (Name)");
     }
 
     if (!cache.getStationen().contains(station)) {
@@ -220,6 +222,7 @@ public class Controller {
     if (getBearbeitet.getStatusCodeValue() != 200) {
       if (cache.getStationen().get(0).equals(station)) {
         // start Cache
+        System.out.println("Startstation");
         Bearbeitet bearbeitet = new Bearbeitet();
         bearbeitet.setUser(user);
         bearbeitet.setCache(cache);
@@ -256,7 +259,7 @@ public class Controller {
     int i = cache.getStationen().indexOf(station);
 
     if (i == 0) {
-      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station");
+      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station (i==0)");
     }
 
     if (cache.getStationen().get(i - 1).equals(aktuelleStation)) {
@@ -274,6 +277,7 @@ public class Controller {
         //----------------------
         bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
         //Get User_Info
+        System.out.println(String.valueOf(user.getId()));
         ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
 
         if (getUser_Info.getStatusCodeValue() != 200) {
@@ -282,13 +286,13 @@ public class Controller {
 
         User_Info user_info = (User_Info) getUser_Info.getBody();
         //----------------------
-        user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
+        //user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
         user_infoRepository.save(user_info);
       }
       bearbeitetRepository.save(bearbeitet);
       return ResponseEntity.status(200).body(new Gson().toJson(bearbeitet));
     } else {
-      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station");
+      return ResponseEntity.status(400).body("The scanned station isn´t the correct following station(nicht letzte)");
     }
 
   }
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java b/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
index 74ff0a3..4aa135a 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
@@ -2,6 +2,7 @@ package hhn.labsw.bugageocaching.entities;
 
 import org.springframework.context.annotation.Primary;
 
+import javax.annotation.Generated;
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -15,6 +16,8 @@ public class User_Info implements Serializable {
   private User user;
 
   @Id
+  private int id;
+
   private int rankingPointsSum;
 
   @ManyToOne
@@ -47,4 +50,5 @@ public class User_Info implements Serializable {
   public void setTeam(Team team) {
     this.team = team;
   }
+
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
index a96b12d..06917b0 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
@@ -1,8 +1,16 @@
 package hhn.labsw.bugageocaching.repositories;
 
+import hhn.labsw.bugageocaching.entities.User;
 import hhn.labsw.bugageocaching.entities.User_Info;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
-public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
+import java.util.List;
+import java.util.Optional;
 
+public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
+  User_Info findByUser(User user);
+
+  @Query(value = "SELECT * FROM user_info WHERE user_id = ?1", nativeQuery = true)
+  User_Info findUser_InfoByUserId(int UserId);
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 4b4c595..0c4312f 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Optional;
 
 @Component
@@ -124,12 +125,11 @@ public class FinderUtil {
   }
 
   public static ResponseEntity findUser_InfoByID(String infoID) {
-    Optional<User_Info> user_InfoOptional = user_infoRepository.findById(Integer.valueOf(infoID));
-    if (user_InfoOptional.isPresent()) {
-      return ResponseEntity.status(200).body(user_InfoOptional.get());
-    } else {
-      return ResponseEntity.status(404).body("Couldnt find User_Info " + infoID);
-    }
+    User_Info user_info = user_infoRepository.findUser_InfoByUserId(Integer.valueOf(infoID));
+
+
+
+    return ResponseEntity.status(200).body(user_info);
   }
 
   public static ResponseEntity findUserFromClaim(Claims claims) {

From 565bf98432a39eb8826a5ca39bb6e138473f8ad7 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Mon, 29 Apr 2019 19:48:32 +0200
Subject: [PATCH 27/62] Added some team methods

---
 .../bugageocaching/controller/Controller.java |  12 ++
 .../repositories/TeamRepository.java          |  20 +++
 .../labsw/bugageocaching/util/FinderUtil.java | 124 +++++++++++-------
 3 files changed, 109 insertions(+), 47 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 528af69..ec97905 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -808,6 +808,18 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
   }
 
+  @RequestMapping("/api/getTeam")
+  public ResponseEntity getTeam(@RequestParam String name){
+    ResponseEntity responseEntity = FinderUtil.findTeamByName(name);
+
+    return responseEntity;
+  }
+
+  @RequestMapping("/api/getTeamMembers")
+  public ResponseEntity getTeamMembers(@RequestParam String name){
+    return FinderUtil.findTeammemberByTeamName(name);
+  }
+
 
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamRepository.java
index 77c69d9..9390a7c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamRepository.java
@@ -1,8 +1,28 @@
 package hhn.labsw.bugageocaching.repositories;
 
 import hhn.labsw.bugageocaching.entities.Team;
+import hhn.labsw.bugageocaching.entities.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
+import java.util.List;
+
 public interface TeamRepository extends JpaRepository<Team, Integer> {
+
+  Team findByName(String name);
+
+  @Query(value = "SELECT *\n" +
+      "FROM user\n" +
+      "WHERE id = (\n" +
+      "    SELECT user_id\n" +
+      "    FROM user_info\n" +
+      "    WHERE team_id = (SELECT team_id\n" +
+      "                     FROM team\n" +
+      "                     WHERE name = ?1\n" +
+      "    )\n" +
+      ")", nativeQuery = true)
+  List<Object[]> getTeammembers(String name);
+
+
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 98b7b6b..a79d112 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
 
 @Component
@@ -33,53 +35,6 @@ public class FinderUtil {
 
   static TeamInviteRepository teamInviteRepository;
 
-
-  @Autowired
-  public void setCacheRepository(CacheRepository cacheRepository) {
-    FinderUtil.cacheRepository= cacheRepository;
-  }
-
-  @Autowired
-  public void setRewardRepository(RewardRepository rewardRepository) {
-    FinderUtil.rewardRepository = rewardRepository;
-  }
-
-  @Autowired
-  public void setStationRepository(StationRepository stationRepository) {
-    FinderUtil.stationRepository = stationRepository;
-  }
-
-  @Autowired
-  public void setBearbeitetRepository(BearbeitetRepository bearbeitetRepository) {
-    FinderUtil.bearbeitetRepository = bearbeitetRepository;
-  }
-
-  @Autowired
-  public void setCacheAccesDefinitionRepository(CacheAccesDefinitionRepository cacheAccesDefinitionRepository) {
-    FinderUtil.cacheAccesDefinitionRepository = cacheAccesDefinitionRepository;
-  }
-
-  @Autowired
-  public void setTeamRepository(TeamRepository teamRepository) {
-    FinderUtil.teamRepository = teamRepository;
-  }
-
-  @Autowired
-  public void setUserRepository(UserRepository userRepository) {
-    FinderUtil.userRepository = userRepository;
-  }
-
-  @Autowired
-  public void setUser_infoRepository(User_InfoRepository user_infoRepository) {
-    FinderUtil.user_infoRepository = user_infoRepository;
-  }
-
-  @Autowired
-  public void setTeamInviteRepository(TeamInviteRepository teamInviteRepository) {
-    FinderUtil.teamInviteRepository = teamInviteRepository;
-  }
-
-
   public static ResponseEntity findCacheById(String cacheID) {
 
     Optional<Cache> cacheOptional = cacheRepository.findById(Integer.valueOf(cacheID));
@@ -167,4 +122,79 @@ public class FinderUtil {
     }
   }
 
+  public static ResponseEntity findTeamByName(String name) {
+
+    Team team = teamRepository.findByName(name);
+    if (team != null) {
+      return ResponseEntity.status(200).body(team);
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find Team with name " + name);
+    }
   }
+
+  public static ResponseEntity findTeammemberByTeamName(String name) {
+
+    List<Object[]> list = teamRepository.getTeammembers(name);
+    if (list != null) {
+
+      List<User> sendBack = new LinkedList<>();
+
+      for (Object[] obj :
+          list) {
+        User tmp = new User();
+        tmp.setUsername((String) obj[3]);
+        sendBack.add(tmp);
+      }
+
+      return ResponseEntity.status(200).body(sendBack);
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find Team member of Team " + name);
+    }
+  }
+
+  @Autowired
+  public void setCacheRepository(CacheRepository cacheRepository) {
+    FinderUtil.cacheRepository = cacheRepository;
+  }
+
+  @Autowired
+  public void setRewardRepository(RewardRepository rewardRepository) {
+    FinderUtil.rewardRepository = rewardRepository;
+  }
+
+  @Autowired
+  public void setStationRepository(StationRepository stationRepository) {
+    FinderUtil.stationRepository = stationRepository;
+  }
+
+  @Autowired
+  public void setBearbeitetRepository(BearbeitetRepository bearbeitetRepository) {
+    FinderUtil.bearbeitetRepository = bearbeitetRepository;
+  }
+
+  @Autowired
+  public void setCacheAccesDefinitionRepository(CacheAccesDefinitionRepository cacheAccesDefinitionRepository) {
+    FinderUtil.cacheAccesDefinitionRepository = cacheAccesDefinitionRepository;
+  }
+
+  @Autowired
+  public void setTeamRepository(TeamRepository teamRepository) {
+    FinderUtil.teamRepository = teamRepository;
+  }
+
+  @Autowired
+  public void setUserRepository(UserRepository userRepository) {
+    FinderUtil.userRepository = userRepository;
+  }
+
+  @Autowired
+  public void setUser_infoRepository(User_InfoRepository user_infoRepository) {
+    FinderUtil.user_infoRepository = user_infoRepository;
+  }
+
+  @Autowired
+  public void setTeamInviteRepository(TeamInviteRepository teamInviteRepository) {
+    FinderUtil.teamInviteRepository = teamInviteRepository;
+  }
+
+}

From 51b9587410df795bd68bbfeac3909b282dc1437f Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 19:51:12 +0200
Subject: [PATCH 28/62] started logical implementation of profile and team

---
 frontend/src/pages/Login.vue                  |  3 +-
 frontend/src/pages/Profile.vue                | 77 ++++++++++++++++---
 .../bugageocaching/controller/Controller.java |  2 +
 3 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 881b3d7..26c6716 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -6,7 +6,7 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <q-input outlined filled stack-label v-model="user.email" type="text" label="Benutzername"
+                <q-input outlined filled stack-label v-model="user.email" type="text" label="Email"
                          autocomplete="username"/>
               </div>
             </div>
@@ -103,6 +103,7 @@
             console.log("TOKEN");
             console.log(response.data.token);
             localStorage.setItem('userToken', JSON.stringify(response.data));
+            localStorage.setItem('userMail', JSON.stringify(data.email));
             this.evalAuthentication();
           })
           .catch((error) => {
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 810a559..310cb39 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -30,8 +30,8 @@
                 Mein Nutzername
               </b>
             </div>
-            <div class="col" align="center">
-              BuGaCacher2019
+            <div id="username" class="col" align="center">
+              <span v-html="userNameContent"></span>
             </div>
           </div>
           <hr/>
@@ -42,7 +42,7 @@
               </b>
             </div>
             <div class="col" align="center">
-              muster.mail@muster.de
+              <span v-html="emailContent"></span>
             </div>
           </div>
           <hr/>
@@ -53,7 +53,7 @@
               </b>
             </div>
             <div class="col" align="center">
-              1234
+              <span v-html="userRanking"></span>
             </div>
           </div>
           <hr/>
@@ -64,7 +64,7 @@
               </b>
             </div>
             <div class="col" align="center">
-              BuGa19Community
+              <span v-html="teamName"></span>
             </div>
           </div>
           <hr/>
@@ -75,22 +75,22 @@
               </b>
             </div>
             <div class="col" align="center">
-              2019
+              <span v-html="teamRanking"></span>
             </div>
           </div>
           <hr/>
         </q-tab-panel>
         <q-tab-panel name="teams">
           <div class="q-pa-md" align="center">
-            <q-btn-dropdown color="primary" label="BuGa19Community" size="20px">
+            <q-btn-dropdown color="primary" :label="dropDownSelectedItem" size="20px">
               <q-list>
-                <q-item clickable v-close-popup>
+                <q-item clickable v-close-popup @click="dropDownSelectItem('team')">
                   <q-item-section>
-                    <q-item-label>BuGa19Community</q-item-label>
+                    <q-item-label v-html="teamName"></q-item-label>
                   </q-item-section>
                 </q-item>
 
-                <q-item clickable v-close-popup>
+                <q-item clickable v-close-popup @click="dropDownSelectItem('Offene Teameinladungen')">
                   <q-item-section avatar>
                     <q-avatar icon="group_add" color="primary" text-color="white"/>
                   </q-item-section>
@@ -99,7 +99,7 @@
                   </q-item-section>
                 </q-item>
 
-                <q-item clickable v-close-popup>
+                <q-item clickable v-close-popup @click="dropDownSelectItem('Neues Team erstellen')">
                   <q-item-section avatar>
                     <q-avatar icon="add" color="primary" text-color="white"/>
                   </q-item-section>
@@ -251,6 +251,12 @@
         startedCaches: [],
         inviteMail: "",
         teamStatus: "",
+        userNameContent: null,
+        emailContent: null,
+        userRanking: null,
+        teamName: null,
+        teamRanking: null,
+        dropDownSelectedItem: null,
       }
     },
     mounted: function () {
@@ -258,12 +264,18 @@
     computed: {
       hasAdminState() {
         return this.$store.getters['auth/GET_ADMINSTATE'];
-      }
+      },
     },
     created: function () {
       this.fetchUserCaches();
       this.$store.commit('auth/SET_AUTHENTICATED');
       this.$store.commit('auth/SET_USER');
+      this.userNameContent = JSON.parse(localStorage.getItem('userToken')).name;
+      this.emailContent = JSON.parse(localStorage.getItem('userMail'));
+      this.userRanking = "1234";
+      this.teamName = "BuGa19Community";
+      this.dropDownSelectedItem = this.teamName;
+      this.teamRanking = "2019";
     },
     methods: {
       fetchUserCaches: function () {
@@ -300,6 +312,47 @@
         var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return re.test(String(email).toLowerCase());
       },
+      getPersonalRanking() {
+        const name = JSON.parse(localStorage.getItem('userToken')).name;
+        JSON.stringify(name);
+        this.$axios.get('/api/hello', {params: {name}})
+          .then((response) => {
+            this.userRanking = response.data;
+            console.log(response.data);
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
+        })
+      },
+      getTeamData() {
+
+      },
+
+      dropDownSelectItem(item){
+        if(item === 'team'){
+          this.dropDownSelectedItem = this.teamName;
+        } else {
+          this.dropDownSelectedItem = item;
+        }
+      },
     }
   }
 </script>
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 881f78c..837b7df 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -626,7 +626,9 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/hello")
+  @ResponseBody
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
   }

From 65d3e77558fc52b10ac8cca94466178d6d638e09 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 20:37:30 +0200
Subject: [PATCH 29/62] fixed some bugs and created data-store for current
 cache

---
 frontend/src/layouts/MyLayout.vue      | 29 ++++++++-------
 frontend/src/pages/Login.vue           | 12 +++----
 frontend/src/pages/Overview.vue        | 49 ++++++--------------------
 frontend/src/pages/Profile.vue         |  8 +++--
 frontend/src/pages/StationView.vue     |  2 +-
 frontend/src/store/dialog/mutations.js |  8 ++---
 frontend/src/store/index.js            | 12 +++++--
 7 files changed, 54 insertions(+), 66 deletions(-)

diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index a2a51d5..7054c59 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -86,6 +86,7 @@
           </q-item-section>
         </q-item>
         <q-item
+          v-if="this.$store.state.auth.isAuthenticated"
           clickable
           class="text-primary"
           v-ripple
@@ -104,13 +105,13 @@
           class="text-primary"
           v-ripple
           tag="a"
-          to="/Login"
+          to="/Register"
         >
           <q-item-section avatar>
-            <q-icon name="logout"/>
+            <q-icon name="assignment"/>
           </q-item-section>
           <q-item-section>
-            <q-item-label>Login</q-item-label>
+            <q-item-label>Registrieren</q-item-label>
           </q-item-section>
         </q-item>
         <q-item
@@ -118,13 +119,13 @@
           class="text-primary"
           v-ripple
           tag="a"
-          to="/Register"
+          to="/Login"
         >
           <q-item-section avatar>
-            <q-icon name="assignment"/>
+            <q-icon name="logout"/>
           </q-item-section>
           <q-item-section>
-            <q-item-label>Register</q-item-label>
+            <q-item-label>{{ loginText }}</q-item-label>
           </q-item-section>
         </q-item>
       </q-list>
@@ -172,37 +173,41 @@
       };
     },
     computed: {
+      loginText() {
+        let text = this.$store.state.auth.isAuthenticated ? "Logout" : "Login";
+        return text;
+      },
       dialogShow: {
         get() {
-          console.log("get dialogShow: "+this.$store.state.dialog.dialog.show)
+          // console.log("get dialogShow: "+this.$store.state.dialog.dialog.show)
           return this.$store.state.dialog.dialog.show;
         },
         set(val) {
-          console.log("set dialogShow: "+val)
+          // console.log("set dialogShow: "+val)
           this.$store.state.dialog.dialog.show = val;
         }
       },
       dialogMessage: {
         get() {
-          console.log("get dialogMessage: "+this.$store.state.dialog.dialog.message)
+          // console.log("get dialogMessage: "+this.$store.state.dialog.dialog.message)
           return this.$store.state.dialog.dialog.message;
         },
       },
       dialogTitle: {
         get() {
-          console.log("get dialogTitle: "+this.$store.state.dialog.dialog.title)
+          // console.log("get dialogTitle: "+this.$store.state.dialog.dialog.title)
           return this.$store.state.dialog.dialog.title;
         },
       },
       dialogColorBg: {
         get() {
-          console.log("get dialogColorBg: " + this.$store.state.dialog.dialog.colorBackground)
+          // console.log("get dialogColorBg: " + this.$store.state.dialog.dialog.colorBackground)
           return this.$store.state.dialog.dialog.colorBackground;
         },
       },
       dialogColorBtn: {
         get() {
-          console.log("get dialogColorBtn: "+this.$store.state.dialog.dialog.colorButton)
+          // console.log("get dialogColorBtn: "+this.$store.state.dialog.dialog.colorButton)
           return this.$store.state.dialog.dialog.colorButton;
         },
       }
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 881b3d7..21376da 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -23,9 +23,9 @@
             <div class="">
               <div class="" style="max-width: 440px">
                 <q-btn
+                  :loading="loading"
                   :outline="userAuthenticated"
                   :disabled="userAuthenticated"
-                  :loading="loading"
                   label="Login"
                   color="primary"
                   class="full-width"
@@ -80,9 +80,8 @@
     },
     computed: {
       userAuthenticated() {
-        console.log("login: userAuthenticated()")
-        // console.log(this.$store.getters['auth/IS_AUTHENTICATED']);
-        // return this.$store.getters['auth/IS_AUTHENTICATED']
+        console.log("login: userAuthenticated()");
+        console.log(this.$store.state.auth.isAuthenticated);
         return this.$store.state.auth.isAuthenticated;
       }
     },
@@ -103,13 +102,13 @@
             console.log("TOKEN");
             console.log(response.data.token);
             localStorage.setItem('userToken', JSON.stringify(response.data));
-            this.evalAuthentication();
+            this.$router.push({path: `/overview`})
           })
           .catch((error) => {
             let message;
             let header = "Fehler: ";
             if (error.response) {
-              console.log("ERROR RESPONSE")
+              console.log("ERROR RESPONSE");
               // The request was made and the server responded with a status code
               // that falls out of the range of 2xx
               message = error.response.data.error;
@@ -128,6 +127,7 @@
             this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
           }).finally(() => {
             this.loading = false;
+            this.evalAuthentication();
         })
       },
       evalAuthentication: function () {
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index ee39fe9..20dc7e7 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -26,7 +26,6 @@
             <q-card class="q-mb-md" v-for="cache in caches" :key="cache.id">
               <q-expansion-item
                 class=""
-                expand-icon-toggle
                 expand-separator
                 icon="location_on"
                 :label="cache.name"
@@ -174,43 +173,17 @@
         })
       },
       startCache(cacheID) {
-        const userToken = JSON.parse(localStorage.getItem('userToken')).token;
-        let params = {cacheID: cacheID};
-        if (userToken != null) {
-          params.token = userToken;
-        }
-        console.log(params);
-
-        this.$axios.get('/api/startCache', {params})
-          .then((response) => {
-            console.log(response.data);
-            // TODO wenn cache angefangen, dann suche die letzte gefundene Station
-            let stationID = this.caches.find(x => x.id === cacheID).stationen[0].id;
-            console.log(stationID);
-            //this.$router.push({path: `/station/${stationID}`})
-            this.$router.push({path: `/CacheStart/${cacheID}`})
-          }).catch((error) => {
-          // Error
-          let msg;
-          let title;
-          if (error.response) {
-            // The request was made and the server responded with a status code
-            title = "Problem with response!";
-            msg = error.response;
-          } else if (error.request) {
-            // The request was made but no response was received
-            title = "Problem with request!";
-            msg = "Error occured due to wrong server request!"
-            console.log(error.request);
-          } else {
-            // Something happened in setting up the request that triggered an Error
-            title = "Error";
-            msg = error.message;
-            console.log('Error', error.message);
-          }
-          console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
-        })
+        console.log("startCache()");
+        // const userToken = JSON.parse(localStorage.getItem('userToken')).token;
+        // let params = {cacheID: cacheID};
+        // if (userToken != null) {
+        //   params.token = userToken;
+        // }
+        // console.log(params);
+        this.$store.state.currentCache.cache = this.caches.find(cache => cache.id === Number(cacheID));
+        console.log(this.$store.state.currentCache.cache);
+        this.$store.state.currentCache.currentCacheID = Number(cacheID);
+        this.$router.push({path: `/CacheStart/${cacheID}`})
       }
     }
   }
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 810a559..8fe3df2 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -267,7 +267,11 @@
     },
     methods: {
       fetchUserCaches: function () {
-        const token = JSON.parse(localStorage.getItem('userToken')).token;
+        if (localStorage.getItem('userToken')) {
+          const token = JSON.parse(localStorage.getItem('userToken')).token;
+        } else {
+          return;
+        }
         this.$axios.get('/api/getMyCaches', {params: {token}})
           .then((response) => {
             this.startedCaches = response.data;
@@ -297,7 +301,7 @@
       continueCache(cacheID) {
       },
       validateEmail(email) {
-        var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return re.test(String(email).toLowerCase());
       },
     }
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 453ffb8..1a19b9c 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -80,7 +80,7 @@
       }
     },
     created: function () {
-      console.log("StationView: ")
+      console.log("StationView: ");
       // console.log("'id' from url: " + this.$route.params.id)
       // console.log("'cache' from url: " + this.$route.params.cache)
       this.fetchData();
diff --git a/frontend/src/store/dialog/mutations.js b/frontend/src/store/dialog/mutations.js
index 8994399..4a14ffa 100644
--- a/frontend/src/store/dialog/mutations.js
+++ b/frontend/src/store/dialog/mutations.js
@@ -1,12 +1,12 @@
 
 export function NEW_MESSAGE_DIALOG (state, messageObject) {
-  console.log("NEW_MESSAGE_DIALOG");
-  console.log(messageObject);
+  // console.log("NEW_MESSAGE_DIALOG");
+  // console.log(messageObject);
   if (messageObject == null) {
     state.dialog.show = true;
     return;
   }
-  console.log(messageObject);
+  // console.log(messageObject);
 
   if (messageObject.hasOwnProperty('color')) {
     switch (messageObject.color) {
@@ -39,7 +39,7 @@ export function NEW_MESSAGE_DIALOG (state, messageObject) {
   state.dialog.show = true;
 }
 export function RESET_MESSAGE_DIALOG (state) {
-  console.log("RESET_MESSAGE_DIALOG");
+  // console.log("RESET_MESSAGE_DIALOG");
   state.dialog.colorBackground = "bg-red-9 text-white";
   state.dialog.colorButton = "red-9";
   state.dialog.message = "Ein unbekannter Fehler ist aufgetreten. Bitte versuchen Sie es noch einmal.";
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 58a40f8..9a7a3b2 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -4,6 +4,7 @@ import Axios from "axios";
 import auth from "./auth"
 import cacheCollector from "./cacheCollector"
 import dialog from "./dialog"
+import currentCache from "./currentCache"
 
 // import example from './module-example'
 
@@ -19,7 +20,8 @@ export default function (/* { ssrContext } */) {
     modules: {
       auth,
       cacheCollector,
-      dialog
+      dialog,
+      currentCache
     },
 
     // enable strict mode (adds overhead!)
@@ -42,11 +44,15 @@ export default function (/* { ssrContext } */) {
     module.hot.accept(['./cacheCollector'], () => {
       const cacheCollector = require('./cacheCollector').default;
       store.hotUpdate({ modules: { cacheCollector: newCacheCollector } })
-    })
+    });
     module.hot.accept(['./dialog'], () => {
       const dialog = require('./dialog').default;
       store.hotUpdate({ modules: { dialog: newDialog } })
-    })
+    });
+    module.hot.accept(['./currentCache'], () => {
+      const currentCache = require('./currentCache').default;
+      store.hotUpdate({ modules: { currentCache: newCurrentCache } })
+    });
   }
 
   return Store

From e1944ff8d4ae107c0b58ba09805bfa0f6369cd2c Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 20:51:40 +0200
Subject: [PATCH 30/62] works???? pls?

---
 .../bugageocaching/controller/Controller.java | 34 +++----------------
 .../bugageocaching/entities/User_Info.java    | 10 ++++++
 .../bugageocaching/entities/User_InfoID.java  |  2 +-
 .../repositories/User_InfoRepository.java     |  5 +--
 .../labsw/bugageocaching/util/FinderUtil.java | 12 ++-----
 5 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 6504a54..4082012 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -278,15 +278,9 @@ public class Controller {
         bearbeitet.setCacheAccesDefinition(cacheAccesDefinition);
         //Get User_Info
         System.out.println(String.valueOf(user.getId()));
-        ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-        if (getUser_Info.getStatusCodeValue() != 200) {
-          return getUser_Info;
-        }
-
-        User_Info user_info = (User_Info) getUser_Info.getBody();
+        User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
         //----------------------
-        //user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
+        user_info.setRankingPointsSum(user_info.getRankingPointsSum() + cache.getRankingPoints());
         user_infoRepository.save(user_info);
       }
       bearbeitetRepository.save(bearbeitet);
@@ -468,13 +462,7 @@ public class Controller {
     User user = (User) getUser.getBody();
 
     //Get User_Info
-    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-    if (getUser_Info.getStatusCodeValue() != 200) {
-      return getUser_Info;
-    }
-
-    User_Info user_info = (User_Info) getUser_Info.getBody();
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
     //----------------------
     if (user_info.getTeam() != null) {
       return ResponseEntity.status(400).body("You already have a team");
@@ -521,13 +509,7 @@ public class Controller {
     User user = (User) getUser.getBody();
 
     //Get User_Info
-    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-    if (getUser_Info.getStatusCodeValue() != 200) {
-      return getUser_Info;
-    }
-
-    User_Info user_info = (User_Info) getUser_Info.getBody();
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
     //----------------------
     if (user_info.getTeam() != null) {
       return ResponseEntity.status(400).body("You already have a team");
@@ -588,13 +570,7 @@ public class Controller {
     User user = (User) getUser.getBody();
 
     //Get User_Info
-    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-    if (getUser_Info.getStatusCodeValue() != 200) {
-      return getUser_Info;
-    }
-
-    User_Info user_info = (User_Info) getUser_Info.getBody();
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
     //----------------------
     if (user_info.getTeam() == null) {
       return ResponseEntity.status(400).body("You aren´t in any team");
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java b/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
index 4aa135a..c74c428 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/User_Info.java
@@ -1,5 +1,6 @@
 package hhn.labsw.bugageocaching.entities;
 
+import org.hibernate.validator.constraints.UniqueElements;
 import org.springframework.context.annotation.Primary;
 
 import javax.annotation.Generated;
@@ -16,6 +17,7 @@ public class User_Info implements Serializable {
   private User user;
 
   @Id
+  @GeneratedValue
   private int id;
 
   private int rankingPointsSum;
@@ -27,6 +29,14 @@ public class User_Info implements Serializable {
   public User_Info() {
   }
 
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
   public User getUser() {
     return user;
   }
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/User_InfoID.java b/src/main/java/hhn/labsw/bugageocaching/entities/User_InfoID.java
index 4d63e41..2c04860 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/User_InfoID.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/User_InfoID.java
@@ -4,5 +4,5 @@ import java.io.Serializable;
 
 public class User_InfoID implements Serializable {
   private int user;
-  private int rankingPointsSum;
+  private int id;
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
index 06917b0..309cc41 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/User_InfoRepository.java
@@ -9,8 +9,5 @@ import java.util.List;
 import java.util.Optional;
 
 public interface User_InfoRepository extends CrudRepository<User_Info, Integer> {
-  User_Info findByUser(User user);
-
-  @Query(value = "SELECT * FROM user_info WHERE user_id = ?1", nativeQuery = true)
-  User_Info findUser_InfoByUserId(int UserId);
+  User_Info findUser_InfoByUser(User user);
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 0c4312f..06fce97 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -35,7 +35,7 @@ public class FinderUtil {
 
   @Autowired
   public void setCacheRepository(CacheRepository cacheRepository) {
-    FinderUtil.cacheRepository= cacheRepository;
+    FinderUtil.cacheRepository = cacheRepository;
   }
 
   @Autowired
@@ -124,14 +124,6 @@ public class FinderUtil {
     }
   }
 
-  public static ResponseEntity findUser_InfoByID(String infoID) {
-    User_Info user_info = user_infoRepository.findUser_InfoByUserId(Integer.valueOf(infoID));
-
-
-
-    return ResponseEntity.status(200).body(user_info);
-  }
-
   public static ResponseEntity findUserFromClaim(Claims claims) {
 
     try {
@@ -161,4 +153,4 @@ public class FinderUtil {
     }
   }
 
-  }
+}

From 33ed2e32b9489a3bf81866e59a76837fa8e2f0e8 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 21:34:26 +0200
Subject: [PATCH 31/62] fixed cache process

---
 frontend/src/boot/axios.js         |  2 +-
 frontend/src/pages/CacheStart.vue  |  8 +++-
 frontend/src/pages/StationView.vue | 75 +++++++-----------------------
 frontend/src/pages/qr-scanner.vue  | 35 +++++++-------
 4 files changed, 43 insertions(+), 77 deletions(-)

diff --git a/frontend/src/boot/axios.js b/frontend/src/boot/axios.js
index ea842da..88a12cd 100644
--- a/frontend/src/boot/axios.js
+++ b/frontend/src/boot/axios.js
@@ -2,7 +2,7 @@ import axios from "axios";
 
 const axiosInstance = axios.create({
   baseURL: process.env.API,
-  timeout: 3000
+  timeout: 6000
 });
 console.log("process.env.DEV: "+process.env.DEV);
 console.log("process.env.API: "+process.env.API);
diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 2cc51de..fadcfb1 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -126,8 +126,14 @@
           this.$axios.get('/api/checkStation', {params})
             .then((response) => {
               console.log("resolve(true)");
+              console.log("cache access definition");
+              console.log(response.data.cacheAccesDefinition);
               resolve(true);
-              this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
+              if (Number(response.data.cacheAccesDefinition.id) === 0) {
+                this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
+              } else if (Number(response.data.cacheAccesDefinition.id) === 1) {
+                this.$router.push({path: `/CacheEnd/${params.cacheID}`});
+              }
             }).catch((error) => {
             console.log("resolve(false)");
             // Error
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 1a19b9c..450e925 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -52,6 +52,8 @@
     data() {
       return {
         //code: "",
+        cacheID: "",
+        cacheName: "",
         cache: null,
         data: {
           cacheId: 22,
@@ -91,9 +93,13 @@
     },
     computed: {
       showCacheProgress() {
-        let stationCount = this.cache.stationen.length;
-        let stationPos = 1 + this.cache.stationen.findIndex(station => station.id === Number(this.$route.params.id));
-        return `${stationPos} von ${stationCount}`;
+        if (this.cache !== null) {
+          let stationCount = this.cache.stationen.length;
+          let stationPos = 1 + this.cache.stationen.findIndex(station => station.id === Number(this.$route.params.id));
+          return `${stationPos} von ${stationCount}`;
+        } else {
+          return "";
+        }
       }
     },
     methods: {
@@ -105,61 +111,10 @@
             console.log(this.data);
             console.log(response.data);
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
-            this.data.cacheId = cache.id;
-            this.data.cacheName = cache.name;
             this.cache = cache;
-            console.log(JSON.stringify(this.data));
-            this.$axios.get('/api/getAllStations')
-              .then((response) => {
-                console.log("/api/getAllStations");
-                console.log(response.data);
-                const stationView = response.data.find(station => station.id === Number(this.$route.params.id));
-                console.log(JSON.stringify(stationView));
-                this.data.station = stationView;
-              }).catch((error) => {
-              // Error
-              let msg;
-              let title;
-              if (error.response) {
-                // The request was made and the server responded with a status code
-                title = "Problem with response!";
-                msg = error.response;
-              } else if (error.request) {
-                // The request was made but no response was received
-                title = "Problem with request!";
-                msg = "Error occured due to wrong server request!"
-                console.log(error.request);
-              } else {
-                // Something happened in setting up the request that triggered an Error
-                title = "Error";
-                msg = error.message;
-                console.log('Error', error.message);
-              }
-              console.log(error.config);
-              this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
-            })
-          }).catch((error) => {
-          // Error
-          let msg;
-          let title;
-          if (error.response) {
-            // The request was made and the server responded with a status code
-            title = "Problem with response!";
-            msg = error.response;
-          } else if (error.request) {
-            // The request was made but no response was received
-            title = "Problem with request!";
-            msg = "Error occured due to wrong server request!"
-            console.log(error.request);
-          } else {
-            // Something happened in setting up the request that triggered an Error
-            title = "Error";
-            msg = error.message;
-            console.log('Error', error.message);
-          }
-          console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
-        })
+            this.cacheName = cache.name;
+            this.cacheID = this.$route.params.cache;
+          })
       },
 
       setParams() {
@@ -197,10 +152,12 @@
           this.$axios.get('/api/checkStation', {params})
             .then((response) => {
               console.log("resolve(true)");
+              console.log("cache access definition");
+              console.log(response.data.cacheAccesDefinition);
               resolve(true);
-              if (response.data.cache_acces_definition === 0) {
+              if (Number(response.data.cacheAccesDefinition.id) === 0) {
                 this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
-              } else if (response.data.cache_acces_definition === 1) {
+              } else if (Number(response.data.cacheAccesDefinition.id) === 1) {
                 this.$router.push({path: `/CacheEnd/${params.cacheID}`});
               }
             }).catch((error) => {
diff --git a/frontend/src/pages/qr-scanner.vue b/frontend/src/pages/qr-scanner.vue
index 087cb71..e111c73 100644
--- a/frontend/src/pages/qr-scanner.vue
+++ b/frontend/src/pages/qr-scanner.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div v-if="askForPermission">
+  <div >
+    <div class="q-ma-md" v-if="askForPermission">
       <p>Um den QR-Code scannen zu können, müssen Sie den Zugriff auf Ihre Kamera erlauben.</p>
 
       <q-btn @click="toggleCamera(!activateCamera)" :loading="loading" unelevated color="positive" stack
@@ -61,12 +61,18 @@
 
       validate() {
         return new Promise(resolve => {
-          this.setParams(0);
-          let params = this.params;
+          let params = this.setParams();
           this.$axios.get('/api/checkStation', {params})
             .then((response) => {
               console.log("resolve(true)");
-              resolve(true)
+              console.log("cache access definition");
+              console.log(response.data.cacheAccesDefinition);
+              resolve(true);
+              if (Number(response.data.cacheAccesDefinition.id) === 0) {
+                this.$router.push({path: `/station/${params.cacheID}/${params.stationID}`});
+              } else if (Number(response.data.cacheAccesDefinition.id) === 1) {
+                this.$router.push({path: `/CacheEnd/${params.cacheID}`});
+              }
             }).catch((error) => {
             console.log("resolve(false)");
             // Error
@@ -96,20 +102,17 @@
         })
       },
 
-      setParams(cacheID) {
+      setParams() {
         console.log("setParams: ");
-        let resCacheID = this.result.split('/')[0];
-        let resStationID = this.result.split('/')[1];
-        console.log(resCacheID + " und " + resStationID);
-        this.params = {
-          token: null,
-          cacheID: resCacheID,
-          stationID: resStationID,
-          durchgefuehrterCacheID: cacheID
-        };
+        let params = {};
+        params.cacheID = this.result.split('/')[0];
+        params.stationID = this.result.split('/')[1];
+        params.durchgefuehrterCacheID = params.cacheID;
+        console.log(params.cacheID + " und " + params.stationID);
         if (localStorage.getItem('userToken')) {
-          this.params.token = JSON.parse(localStorage.getItem('userToken')).token;
+          params.token = JSON.parse(localStorage.getItem('userToken')).token;
         }
+        return params;
       },
 
       pauseCamera() {

From 2b691fa6f3e264995b487ffaed3dd1ae1206f6fc Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 21:51:33 +0200
Subject: [PATCH 32/62] fixed git problems

---
 frontend/quasar.conf.js                      |  2 +-
 frontend/src/pages/CacheStart.vue            |  3 ++-
 frontend/src/pages/Register.vue              |  4 ++--
 frontend/src/pages/StationView.vue           |  3 ++-
 frontend/src/store/currentCache/actions.js   |  4 ++++
 frontend/src/store/currentCache/getters.js   |  4 ++++
 frontend/src/store/currentCache/index.js     | 12 ++++++++++++
 frontend/src/store/currentCache/mutations.js |  4 ++++
 frontend/src/store/currentCache/state.js     |  5 +++++
 9 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/store/currentCache/actions.js
 create mode 100644 frontend/src/store/currentCache/getters.js
 create mode 100644 frontend/src/store/currentCache/index.js
 create mode 100644 frontend/src/store/currentCache/mutations.js
 create mode 100644 frontend/src/store/currentCache/state.js

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 1ceac6e..13253ee 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,7 +109,7 @@ module.exports = function (ctx) {
           API: JSON.stringify('http://localhost:8080')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching')
+          //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching')
           API: JSON.stringify('http://localhost:8080')
         }
     },
diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index fadcfb1..5880e30 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -97,7 +97,8 @@
         params.cacheID = this.result.split('/')[0];
         params.stationID = this.result.split('/')[1];
         params.durchgefuehrterCacheID = this.cacheID;
-        console.log(params.cacheID + " und " + params.stationID);
+        console.log("CacheID: " + params.cacheID + " und StationID: " + params.stationID);
+        console.log(params.durchgefuehrterCacheID);
         if (localStorage.getItem('userToken')) {
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
         }
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 6a80aa9..318552a 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -110,7 +110,7 @@
 
           console.log("POST /api/register/ - json: " + JSON.stringify(data));
           const token = JSON.parse(localStorage.getItem('registerToken')).token;
-          this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/register', data,{
+          this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/register', data,{
             headers: {
               'Authorization': 'Bearer ' + token,
             }
@@ -167,7 +167,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
 
-        this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', logindata)
+        this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/login', logindata)
           .then((response) => {
             localStorage.setItem('registerToken', JSON.stringify(response.data));
           })
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 450e925..e55a014 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -122,7 +122,8 @@
         let params = {};
         params.cacheID = this.result.split('/')[0];
         params.stationID = this.result.split('/')[1];
-        params.durchgefuehrterCacheID = this.cacheID;
+        params.durchgefuehrterCacheID = params.cacheID;
+        console.log(params.durchgefuehrterCacheID);
         console.log(params.cacheID + " und " + params.stationID);
         if (localStorage.getItem('userToken')) {
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
diff --git a/frontend/src/store/currentCache/actions.js b/frontend/src/store/currentCache/actions.js
new file mode 100644
index 0000000..4787a5f
--- /dev/null
+++ b/frontend/src/store/currentCache/actions.js
@@ -0,0 +1,4 @@
+/*
+export function someAction (context) {
+}
+*/
diff --git a/frontend/src/store/currentCache/getters.js b/frontend/src/store/currentCache/getters.js
new file mode 100644
index 0000000..cc054a3
--- /dev/null
+++ b/frontend/src/store/currentCache/getters.js
@@ -0,0 +1,4 @@
+/*
+export function someGetter (state) {
+}
+*/
diff --git a/frontend/src/store/currentCache/index.js b/frontend/src/store/currentCache/index.js
new file mode 100644
index 0000000..b41a219
--- /dev/null
+++ b/frontend/src/store/currentCache/index.js
@@ -0,0 +1,12 @@
+import state from './state'
+import * as getters from './getters'
+import * as mutations from './mutations'
+import * as actions from './actions'
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions
+}
diff --git a/frontend/src/store/currentCache/mutations.js b/frontend/src/store/currentCache/mutations.js
new file mode 100644
index 0000000..63131e2
--- /dev/null
+++ b/frontend/src/store/currentCache/mutations.js
@@ -0,0 +1,4 @@
+/*
+export function someMutation (state) {
+}
+*/
diff --git a/frontend/src/store/currentCache/state.js b/frontend/src/store/currentCache/state.js
new file mode 100644
index 0000000..dbc1d63
--- /dev/null
+++ b/frontend/src/store/currentCache/state.js
@@ -0,0 +1,5 @@
+export default {
+  cache: {},
+  currentCacheID: null,
+  currentStationID: null,
+}

From 8636443f87b6ab5532a269292334a0f905dda8ac Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 22:03:46 +0200
Subject: [PATCH 33/62] fixed merge problems

---
 frontend/src/pages/CacheEnd.vue               |  13 +-
 .../bugageocaching/controller/Controller.java | 185 +-----------------
 .../repositories/UserRepository.java          |   2 +-
 3 files changed, 12 insertions(+), 188 deletions(-)

diff --git a/frontend/src/pages/CacheEnd.vue b/frontend/src/pages/CacheEnd.vue
index faf8813..77d71f6 100644
--- a/frontend/src/pages/CacheEnd.vue
+++ b/frontend/src/pages/CacheEnd.vue
@@ -10,7 +10,11 @@
           <q-dialog v-model="reward">
             <q-card>
               <q-card-section>
-                <div>Jetzt ist eine gute Zeit, etwas Neues zu beginnen.</div>
+                <div class="text-h6">Deine Belohnung: </div>
+              </q-card-section>
+
+              <q-card-section>
+                <div>{{ cache.reward.rewardDescription }}</div>
               </q-card-section>
             </q-card>
           </q-dialog>
@@ -27,6 +31,9 @@
         reward: false,
         cacheID: "",
         cacheName: "",
+        cache: {
+          reward: "",
+        },
         rankingPoints: "",
         end1: "Gut gemacht, Du hast alle Stationen dieses Cache gefunden. Dir wurden ",
         end2: " Punkte gutgeschrieben." //TODO Punkte wirklich gutschreiben, ggf. Cache auf erledigt setzen
@@ -45,10 +52,10 @@
         this.$axios.get('/api/allCaches')
           .then((response) => {
             console.log("/api/allCaches");
-            console.log(JSON.stringify(this.data));
-            console.log(this.data);
+            console.log(JSON.stringify(this.response.data));
             console.log(response.data);
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
+            this.cache = cache;
             this.cacheName = cache.name;
             this.rankingPoints = cache.rankingPoints;
             this.cacheID = this.$route.params.cache;
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 332a903..4082012 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -48,9 +48,6 @@ public class Controller {
   @Autowired
   User_InfoRepository user_infoRepository;
 
-  @Autowired
-  TeamInviteRepository teamInviteRepository;
-
   @PostConstruct
   public void init() {
     fetchPublicKey();
@@ -546,7 +543,7 @@ public class Controller {
 
     user_infoRepository.save(user_info);
 
-    return ResponseEntity.status(200).body(new Gson().toJson(team));
+    return ResponseEntity.status(200).body(team);
   }
 
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
@@ -609,186 +606,6 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
-
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/sendTeamInvite")
-  @ResponseBody
-  public ResponseEntity sendTeamInvite(@RequestParam String token,
-                                       @RequestParam String invitedUserEmail) {
-    // verify user
-    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
-
-    if (verifyToken.getStatusCodeValue() != 200) {
-      return verifyToken;
-    }
-
-    //get User
-    Claims claims = (Claims) verifyToken.getBody();
-
-    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
-
-    if (getUser.getStatusCodeValue() != 200) {
-      return getUser;
-    }
-
-    User user = (User) getUser.getBody();
-
-    // get InvitedUser
-
-    User invitedUser = userRepository.findByEmail(invitedUserEmail);
-
-    if (invitedUser == null) {
-      return ResponseEntity.status(404).body("There isnt any user with that email");
-    }
-    //----------------------
-
-
-    //Get User_Info
-    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-    if (getUser_Info.getStatusCodeValue() != 200) {
-      return getUser_Info;
-    }
-
-    User_Info user_info = (User_Info) getUser_Info.getBody();
-    //----------------------
-    if (user_info.getTeam() == null) {
-      return ResponseEntity.status(400).body("You aren´t in any team");
-    }
-
-    //Get team
-    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
-
-    if (getTeam.getStatusCodeValue() != 200) {
-      return getTeam;
-    }
-
-    Team team = (Team) getTeam.getBody();
-
-    if (teamInviteRepository.findByUserAndTeam(invitedUser, team) != null) {
-      return ResponseEntity.status(400).body("The user is already invited to this team");
-    }
-
-    TeamInvite teamInvite = new TeamInvite();
-    teamInvite.setUser(invitedUser);
-    teamInvite.setTeam(team);
-
-    teamInviteRepository.save(teamInvite);
-
-    return ResponseEntity.status(200).body("OK");
-  }
-
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/getMyTeamInvites")
-  @ResponseBody
-  public ResponseEntity getMyTeamInvites(@RequestParam String token) {
-    // verify user
-    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
-
-    if (verifyToken.getStatusCodeValue() != 200) {
-      return verifyToken;
-    }
-
-    //get User
-    Claims claims = (Claims) verifyToken.getBody();
-
-    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
-
-    if (getUser.getStatusCodeValue() != 200) {
-      return getUser;
-    }
-
-    User user = (User) getUser.getBody();
-
-    List<TeamInvite> teamInvitesList = new ArrayList<>();
-
-    for (TeamInvite teamInvite : teamInviteRepository.findAll()) {
-      if (teamInvite.getUser() == user) {
-        teamInvitesList.add(teamInvite);
-      }
-    }
-
-    return ResponseEntity.status(200).body(new Gson().toJson(teamInvitesList));
-  }
-
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/deleteTeamInvite")
-  @ResponseBody
-  public ResponseEntity deleteTeamInvite(@RequestParam String token,
-                                         @RequestParam String teamInviteID) {
-    // verify user
-    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
-
-    if (verifyToken.getStatusCodeValue() != 200) {
-      return verifyToken;
-    }
-
-    // get teaminvite
-    ResponseEntity getTeamInvite = FinderUtil.findTeamInviteByID(teamInviteID);
-
-    if (getTeamInvite.getStatusCodeValue() != 200) {
-      return getTeamInvite;
-    }
-
-    TeamInvite teamInvite = (TeamInvite) getTeamInvite.getBody();
-
-    teamInviteRepository.delete(teamInvite);
-
-    return ResponseEntity.status(200).body("OK");
-  }
-
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/setTeamStatus")
-  @ResponseBody
-  public ResponseEntity setTeamStatus(@RequestParam String token,
-                                      @RequestParam String teamStatus) {
-    // verify user
-    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
-
-    if (verifyToken.getStatusCodeValue() != 200) {
-      return verifyToken;
-    }
-
-    //get User
-    Claims claims = (Claims) verifyToken.getBody();
-
-    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
-
-    if (getUser.getStatusCodeValue() != 200) {
-      return getUser;
-    }
-
-    User user = (User) getUser.getBody();
-
-    //Get User_Info
-    ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId()));
-
-    if (getUser_Info.getStatusCodeValue() != 200) {
-      return getUser_Info;
-    }
-
-    User_Info user_info = (User_Info) getUser_Info.getBody();
-    //----------------------
-    if (user_info.getTeam() == null) {
-      return ResponseEntity.status(400).body("You aren´t in any team");
-    }
-
-    //Get team
-    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
-
-    if (getTeam.getStatusCodeValue() != 200) {
-      return getTeam;
-    }
-
-    Team team = (Team) getTeam.getBody();
-    team.setTeamStatus(teamStatus);
-
-    teamRepository.save(team);
-
-    return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
-  }
-
-
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index d8784ec..8d1bab7 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -7,7 +7,7 @@ import org.springframework.data.repository.CrudRepository;
 import java.util.List;
 
 public interface UserRepository extends CrudRepository<User, Integer> {
-  User findByEmail(String email);
+  User findByUsername(String username);
 
   @Query(value = "SELECT DISTINCT u.id AS ID, SUBSTRING_INDEX(u.email, '@', 1) AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
       "FROM user u,\n" +

From 2536996b169dbd2ecc86b4f5eaa8cfc635d66e11 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Mon, 29 Apr 2019 22:17:58 +0200
Subject: [PATCH 34/62] CacheEnd now shows reward correctly

---
 frontend/src/pages/CacheEnd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/CacheEnd.vue b/frontend/src/pages/CacheEnd.vue
index 77d71f6..7ba09e1 100644
--- a/frontend/src/pages/CacheEnd.vue
+++ b/frontend/src/pages/CacheEnd.vue
@@ -52,7 +52,7 @@
         this.$axios.get('/api/allCaches')
           .then((response) => {
             console.log("/api/allCaches");
-            console.log(JSON.stringify(this.response.data));
+            console.log(JSON.stringify(response.data));
             console.log(response.data);
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
             this.cache = cache;

From 865d48cd63d7b86f506f41571dcac5dd0fcfeef3 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 02:00:38 +0200
Subject: [PATCH 35/62] reworked cache creation

---
 frontend/src/layouts/MyLayout.vue             |   1 +
 frontend/src/pages/Cache.vue                  | 101 ++++++++++++------
 frontend/src/pages/Login.vue                  |   2 +-
 frontend/src/pages/Overview.vue               |  44 ++++----
 frontend/src/pages/StationEdit.vue            |   2 +-
 frontend/src/store/cacheCollector/getters.js  |   4 +
 .../src/store/cacheCollector/mutations.js     |   4 +
 frontend/src/store/cacheCollector/state.js    |  40 +------
 .../labsw/bugageocaching/entities/Cache.java  |   2 +-
 9 files changed, 108 insertions(+), 92 deletions(-)

diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index 7054c59..3bc0414 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -101,6 +101,7 @@
           </q-item-section>
         </q-item>
         <q-item
+          v-if="!this.$store.state.auth.isAuthenticated"
           clickable
           class="text-primary"
           v-ripple
diff --git a/frontend/src/pages/Cache.vue b/frontend/src/pages/Cache.vue
index db80dbb..183e401 100644
--- a/frontend/src/pages/Cache.vue
+++ b/frontend/src/pages/Cache.vue
@@ -5,9 +5,8 @@
     <form>
       <div class="q-pa-md q-gutter-y-md">
         <p class="text-h5">{{ isNewCache ? "Neuen Cache erstellen" : "Cache bearbeiten"}}</p>
-        <q-input class="col" dense stack-label filled v-model="tempCache.name" label="Name" @change="cacheToStore"/>
-        <q-input class="col" dense stack-label filled v-model="tempCache.rankingPoints" label="Punktewert"
-                 @change="cacheToStore"/>
+        <q-input class="col" dense stack-label filled v-model="computedCache.name" label="Name"/>
+        <q-input class="col" dense stack-label filled v-model="computedCache.rankingPoints" label="Punktewert"/>
         <p class="text-h6">Beschreibung</p>
         <q-editor
           :toolbar="[
@@ -16,10 +15,9 @@
             ['hr', 'link'],
             ['fullscreen'],
           ]"
-          v-model="tempCache.description"
+          v-model="computedCache.description"
           min-height="5rem"
           max-height="50vh"
-          @change="cacheToStore"
         />
         <p class="text-h6">Belohnung</p>
         <q-editor
@@ -29,15 +27,14 @@
             ['hr', 'link'],
             ['fullscreen'],
           ]"
-          v-model="tempCache.reward"
+          v-model="computedCache.reward.rewardDescription"
           min-height="5rem"
           max-height="50vh"
-          @change="cacheToStore"
         />
         <p class="text-h6">Stationen</p>
         <q-list bordered separator class="rounded-borders">
 
-          <q-item v-for="(station, index) in cache.stationen" :key="index">
+          <q-item v-for="(station, index) in computedCache.stationen" :key="index">
             <q-item-section avatar>
               <q-avatar color="primary" text-color="white">
                 {{ index + 1 }}
@@ -73,19 +70,19 @@
           <q-item>
             <q-item-section avatar>
               <q-avatar color="primary" text-color="white">
-                {{ tempCache.stationen.length + 1 }}
+                {{ computedCache.stationen.length + 1 }}
               </q-avatar>
             </q-item-section>
 
             <q-item-section top>
               <q-item-label lines="1">
-                <span class="text-grey-8">ID: {{ endStation.id ? endStation.id : "keine" }}</span>
+                <span class="text-grey-8">ID: {{ computedEndstation.id ? computedEndstation.id : "keine" }}</span>
               </q-item-label>
               <q-item-label lines="1" class="q-mt-xs text-body2">
                 <span class="cursor-pointer">Endstation</span>
               </q-item-label>
               <q-item-label caption lines="1">
-                Koordinaten: {{ endStation.lattitude }}, {{ endStation.longitude }}
+                Koordinaten: {{ computedEndstation.lattitude }}, {{ computedEndstation.longitude }}
               </q-item-label>
             </q-item-section>
 
@@ -114,6 +111,8 @@
     name: "Cache",
     data() {
       return {
+        // stations: [],
+        // endStation: {},
         //endStation: {},
         scrolldown: false,
         isNewCache: this.$route.params.id === undefined,
@@ -128,7 +127,7 @@
     created: function () {
       console.log("isNewCache: " + this.isNewCache);
       console.log("fetch Caches from Store");
-      this.tempCache = JSON.parse(JSON.stringify(this.cache));
+      //this.tempCache = JSON.parse(JSON.stringify(this.cache));
     },
     beforeMount: function () {
     },
@@ -159,20 +158,32 @@
         }
 
       },
-      cacheToStore() {
-        // push tempCache to Store
-        console.log("set Cache");
-        this.$store.commit('cacheCollector/SET_CACHE', JSON.parse(JSON.stringify(this.tempCache)));
-        // this.SET_CACHE(JSON.parse(JSON.stringify(this.tempCache)));
-      },
+      // getStations() {
+      //   console.log("get Stations");
+      //   let stations = this.computedStations.get();
+      //   this.stations = stations.filter(station => station.description !== "Endstation");
+      //   console.log(this.stations);
+      //   this.endStation = stations.filter(station => station.description === "Endstation");
+      //   console.log(this.endStation);
+      // },
+      // setStations() {
+      //   let stations = this.stations;
+      //   stations.push(this.endStation);
+      //   this.computedStations.set(stations);
+      // },
+      // cacheToStore() {
+      //   // push tempCache to Store
+      //   console.log("set Cache");
+      //   this.$store.commit('cacheCollector/SET_CACHE', JSON.parse(JSON.stringify(this.tempCache)));
+      //   // this.SET_CACHE(JSON.parse(JSON.stringify(this.tempCache)));
+      // },
       addStation() {
         this.$router.push({path: '/station'});
-        //this.swapComponent(station);
-        // create Station and add it to array tempCache.stationen
       },
       editStation(index) {
         console.log("editStation(" + index + ")");
-        const station = this.cache.stationen[index];
+        console.log(this.$store.getters['cacheCollector/GET_STATIONS']);
+        const station = this.$store.getters['cacheCollector/GET_STATIONS'][index];
         console.log(station);
         if (station.hasOwnProperty('id')) {
           //this.$router.push({ path: '/station/'+station.id});
@@ -189,9 +200,9 @@
       saveCache() {
         // commit to store, send to api, if success -> reset store
         if (this.isNewCache) {
-          console.log(this.cache);
-          let cache = this.cache;
-          cache.stationen.push(this.endStation);
+          let cache = JSON.parse(JSON.stringify(this.computedCache));
+          console.log(cache);
+          cache.stationen.push(this.computedEndstation);
 
           this.$axios.post('/api/createCache', cache)
             .then((response) => {
@@ -227,18 +238,46 @@
     },
     computed: {
       ...mapGetters({
-        cache: 'cacheCollector/GET_CACHE',
-        endStation: 'cacheCollector/GET_ENDSTATION'
+        //cache: 'cacheCollector/GET_CACHE',
+        //endStation: 'cacheCollector/GET_ENDSTATION'
       }),
-      // computedCache: {
+      // computedStations: {
       //   set(value) {
-      //     console.log("set cache")
+      //     console.log("set stations");
+      //     this.computedCache.set(value);
       //   },
       //   get() {
-      //     console.log("get cache");
-      //     return this.$store.getters.cacheCollector.GET_CACHE
+      //     console.log("get stations");
+      //     let stations = this.computedCache.stationen;
+      //     return stations.filter(station => station.description !== "Endstation");
       //   }
-      // }
+      // },
+      computedCache: {
+        set(value) {
+          console.log("set cache");
+          this.$store.commit('cacheCollector/SET_CACHE', value);
+        },
+        get() {
+          console.log("get cache");
+          return this.$store.getters['cacheCollector/GET_CACHE'];
+        }
+      },
+      computedStations: {
+        set(value) {
+          this.$store.commit('cacheCollector/SET_STATIONS', value);
+        },
+        get() {
+          return this.$store.getters['cacheCollector/GET_STATIONS'];
+        }
+      },
+      computedEndstation: {
+        set(value) {
+          this.$store.commit('cacheCollector/SET_ENDSTATION', value);
+        },
+        get() {
+          return this.$store.getters['cacheCollector/GET_ENDSTATION'];
+        }
+      },
     }
   }
 </script>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 21376da..cde8361 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -117,7 +117,7 @@
               // The request was made but no response was received
               // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
               // http.ClientRequest in node.js
-              message = error.request;
+              message = "Anfrage fehlgeschlagen.";
             } else {
               // Something happened in setting up the request that triggered an Error
               console.log('Error', error.message);
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 20dc7e7..902d15d 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -117,26 +117,26 @@
             console.log("Caches: " + this.caches);
             this.caches = response.data;
           }).catch((error) => {
-          // Error
-          let msg;
-          let title;
+          let message;
+          let header = "Fehler: ";
           if (error.response) {
+            console.log("ERROR RESPONSE");
             // The request was made and the server responded with a status code
-            title = "Problem with response!";
-            msg = error.response;
+            // that falls out of the range of 2xx
+            message = error.response.data.error;
+            header += error.response.status;
           } else if (error.request) {
             // The request was made but no response was received
-            title = "Problem with request!";
-            msg = "Error occured due to wrong server request!"
-            console.log(error.request);
+            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+            // http.ClientRequest in node.js
+            message = "Anfrage fehlgeschlagen.";
           } else {
             // Something happened in setting up the request that triggered an Error
-            title = "Error";
-            msg = error.message;
             console.log('Error', error.message);
+            message = error.message;
           }
           console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
         })
       },
       addCache() {
@@ -150,26 +150,26 @@
           .then((response) => {
             this.fetchAllCaches()
           }).catch((error) => {
-          // Error
-          let msg;
-          let title;
+          let message;
+          let header = "Fehler: ";
           if (error.response) {
+            console.log("ERROR RESPONSE");
             // The request was made and the server responded with a status code
-            title = "Problem with response!";
-            msg = error.response;
+            // that falls out of the range of 2xx
+            message = error.response.data.error;
+            header += error.response.status;
           } else if (error.request) {
             // The request was made but no response was received
-            title = "Problem with request!";
-            msg = "Error occured due to wrong server request!"
-            console.log(error.request);
+            // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+            // http.ClientRequest in node.js
+            message = "Anfrage fehlgeschlagen.";
           } else {
             // Something happened in setting up the request that triggered an Error
-            title = "Error";
-            msg = error.message;
             console.log('Error', error.message);
+            message = error.message;
           }
           console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: message, title: header, });
         })
       },
       startCache(cacheID) {
diff --git a/frontend/src/pages/StationEdit.vue b/frontend/src/pages/StationEdit.vue
index 3e1a6e8..a1736d9 100644
--- a/frontend/src/pages/StationEdit.vue
+++ b/frontend/src/pages/StationEdit.vue
@@ -49,7 +49,7 @@
         description: "Rätsel, Aufgabe und Informationen zur Station.",
         latlang: "",
         station: {
-          description: "Beschreibung",
+          description: "Rätsel, Aufgabe und Informationen zur Station.",
           lattitude: "0.000",
           longitude: "0.000",
           solution: "",
diff --git a/frontend/src/store/cacheCollector/getters.js b/frontend/src/store/cacheCollector/getters.js
index d2bea70..a09722a 100644
--- a/frontend/src/store/cacheCollector/getters.js
+++ b/frontend/src/store/cacheCollector/getters.js
@@ -10,3 +10,7 @@ export const GET_ENDSTATION = (state) => {
   console.log("GET_ENDSTATION: retrieve cache from store. ");
   return state.endStation;
 };
+export const GET_STATIONS = (state) => {
+  console.log("GET_STATIONEN: retrieve cache from store. ");
+  return state.newCache.stationen;
+};
diff --git a/frontend/src/store/cacheCollector/mutations.js b/frontend/src/store/cacheCollector/mutations.js
index 72f58e1..13e6b94 100644
--- a/frontend/src/store/cacheCollector/mutations.js
+++ b/frontend/src/store/cacheCollector/mutations.js
@@ -10,6 +10,10 @@ export const SET_ENDSTATION = (state, station) => {
   console.log("SET_ENDSTATION: "+station);
   state.endStation = station;
 };
+export const SET_STATIONS = (state, station) => {
+  console.log("SET_STATIONEN: "+station);
+  state.newCache.stationen = station;
+};
 export const ADD_STATION = (state, station) => {
   console.log("ADD_STATION: add new station to cache: "+station);
   state.newCache.stationen.push(station);
diff --git a/frontend/src/store/cacheCollector/state.js b/frontend/src/store/cacheCollector/state.js
index 0f32de1..aef4926 100644
--- a/frontend/src/store/cacheCollector/state.js
+++ b/frontend/src/store/cacheCollector/state.js
@@ -3,48 +3,16 @@ export default {
     name: "",
     description: "",
     rankingPoints: 0,
-    reward: "",
+    reward: {
+      rewardDescription: "",
+    },
     stationen: []
   },
-  // newCache: {
-  //   name: "Blumencache",
-  //   description: "Dieser Cache umfasst 4 Stationen mit Rätseln rund um das Thema Blumen",
-  //   rankingPoints: 100,
-  //   stationen: [
-  //     {
-  //       description: "Ein kleines winterliches Schlaginstrument. Welche Blume ist damit gemeint?",
-  //       longitude: 9.206628,
-  //       lattitude: 49.147734,
-  //       code: 213812,
-  //       solution: "Schneeglöckchen"
-  //     },
-  //     {
-  //       description: "Ein blühendes Federvieh. Welche Blume ist damit gemeint?",
-  //       longitude: 9.206806,
-  //       lattitude: 49.147318,
-  //       code: 237823,
-  //       solution: "Gänseblümchen"
-  //     },
-  //     {
-  //       description: "Eine wertvolle Farbe. Welche Blume ist damit gemeint?",
-  //       longitude: 9.207844,
-  //       lattitude: 49.148032,
-  //       code: 899423,
-  //       solution: "Edelweiß"
-  //     },
-  //     {
-  //       description: "Ein Zerkleinerungsgerät in der Brüllöffnung eines Raubtieres. Welche Blume ist damit gemeint?",
-  //       longitude: 9.207649,
-  //       lattitude: 49.150142,
-  //       code: 347923,
-  //       solution: "Löwenzahn"
-  //     }
-  //   ]
-  // },
   tempStation: {},
   endStation: {
     description: "Endstation",
     longitude: 9.206628,
     lattitude: 49.147734,
+    solution: "",
   },
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
index 465b2cc..81166b6 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
@@ -20,7 +20,7 @@ public class Cache {
   @OneToMany
   private List<Station> stationen = new ArrayList<>();
 
-  @ManyToOne
+  @ManyToOne (cascade = {CascadeType.ALL})
   private Reward reward;
 
   public Cache() {

From 5246249bf84d6662edaffe2c4ad04bed117776e3 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Tue, 30 Apr 2019 13:46:12 +0200
Subject: [PATCH 36/62] Added getCurrentStation

---
 .../bugageocaching/controller/Controller.java | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 4082012..0d718af 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -606,6 +606,41 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+  @RequestMapping("/api/getCurrentStation")
+  public ResponseEntity getStationFromUserAndCache(@RequestParam String token, @RequestParam String cacheID){
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    // get user
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //----------------------
+    //Get Cache
+    ResponseEntity getCache = FinderUtil.findCacheById(cacheID);
+
+    if (getCache.getStatusCodeValue() != 200) {
+      return getCache;
+    }
+
+    Cache cache = (Cache) getCache.getBody();
+    //----------------------
+
+    return ResponseEntity.status(200).body(bearbeitetRepository.findByUserAndCache(user, cache));
+  }
+
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));

From 247e7622894f99419a3dd9a6c32bff80f3a5f499 Mon Sep 17 00:00:00 2001
From: rchrist <rchrist@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 14:21:22 +0200
Subject: [PATCH 37/62] design of profl

---
 frontend/quasar.conf.js                       |   3 +
 frontend/src/pages/Profile.vue                | 280 +++++++++++-------
 .../bugageocaching/controller/Controller.java |   2 +
 3 files changed, 174 insertions(+), 111 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 1ceac6e..48f675b 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -69,6 +69,9 @@ module.exports = function (ctx) {
         'QSelect',
         'QField',
         'QBtnDropdown',
+        'QPopupEdit',
+        'QSlideTransition',
+        'QToggle',
       ],
 
       directives: [
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 310cb39..dd4ef3e 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -12,7 +12,7 @@
         switch-indicator
       >
         <q-tab name="profile" label="Profil" icon="perm_identity"/>
-        <q-tab name="teams" label="Teams" icon="group"/>
+        <q-tab name="teams" label="Team" icon="group"/>
         <q-tab name="startedCaches" label="Angefangene Caches" icon="playlist_play"/>
         <q-tab name="finishedCaches" label="Beendete Caches" icon="playlist_add_check"/>
       </q-tabs>
@@ -23,62 +23,15 @@
       <q-tab-panels v-model="tab" animated swipeable class="col">
 
         <q-tab-panel name="profile" class=" fit">
-
-          <div class="row">
-            <div class="col" align="center">
-              <b>
-                Mein Nutzername
-              </b>
-            </div>
-            <div id="username" class="col" align="center">
-              <span v-html="userNameContent"></span>
-            </div>
-          </div>
-          <hr/>
-          <div class="row text-center">
-            <div class="col">
-              <b>
-                Meine Email
-              </b>
-            </div>
-            <div class="col" align="center">
-              <span v-html="emailContent"></span>
-            </div>
-          </div>
-          <hr/>
-          <div class="row">
-            <div class="col" align="center">
-              <b>
-                Meine Ranglistenposition
-              </b>
-            </div>
-            <div class="col" align="center">
-              <span v-html="userRanking"></span>
-            </div>
-          </div>
-          <hr/>
-          <div class="row">
-            <div class="col" align="center">
-              <b>
-                Mein Team
-              </b>
-            </div>
-            <div class="col" align="center">
-              <span v-html="teamName"></span>
-            </div>
-          </div>
-          <hr/>
-          <div class="row">
-            <div class="col" align="center">
-              <b>
-                Teamranglistenposition
-              </b>
-            </div>
-            <div class="col" align="center">
-              <span v-html="teamRanking"></span>
-            </div>
-          </div>
-          <hr/>
+          <p class="text-h5"> Persönliche Daten </p>
+          <q-table
+            :data="data"
+            :columns="columns"
+            row-key="name"
+            hide-header
+            hide-bottom
+            table-class="my-custom"
+          />
         </q-tab-panel>
         <q-tab-panel name="teams">
           <div class="q-pa-md" align="center">
@@ -110,58 +63,36 @@
               </q-list>
             </q-btn-dropdown>
           </div>
-          <hr/>
+          <p class="text-h5"> Teammitglieder </p>
+          <q-table
+            :data="teamData"
+            :columns="teamColumns"
+            row-key="name"
+            table-class="my-custom"
+            hide-bottom
+            :pagination.sync="pagination"
+          />
+          <br/>
+          <p class="text-h5"> Einladungen </p>
+          <q-input outlined filled stack-label v-model="inviteMail"
+                   type="text" label="Email des Nutzers"
+                   :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
           <div align="center">
-            <b>
-              Teammitglieder
-            </b>
-          </div>
-          <br/>
-          <div align="center">
-            BuGaCacher2019
-            <br/>
-            Max
-            <br/>
-            Timo
-            <br/>
-            Katharina
-            <br/>
-            Michael
-            <br/>
-            Robin
-          </div>
-          <br/>
-          <div class="row">
-            <div class="col" align="center">
-              <q-input outlined filled stack-label v-model="inviteMail"
-                       type="text" label="Email des Nutzers"
-                       :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>
-            </div>
-            <div class="col" align="center">
-              <q-btn label="Einladung versenden"
-                     color="primary"
-                     type="submit"/>
-            </div>
-          </div>
-          <hr/>
-          <div align="center">
-            <b>
-              Aktueller Teamstatus
-            </b>
-          </div>
-          <br/>
-          <div>
-            Dienstag 15:00 Treffen zum Blumencache.
+            <q-btn label="Einladung versenden"
+                   color="primary"
+                   type="submit"/>
           </div>
           <br/>
+          <p class="text-h5"> Teamstatus </p>
+          <p>{{currentTeamStatus}}</p>
           <q-input outlined filled stack-label v-model="teamStatus"
-                   type="text" label="Neuer Teamstatus"/>
+                   type="text" label="Neuer Teamstatus"
+                   :rules="[val=>val.length<=160||'Status zu lang!']"/>
           <div align="center">
             <q-btn label="Teamstatus aktualisieren"
                    color="primary"
                    type="submit"/>
           </div>
-
         </q-tab-panel>
 
         <q-tab-panel name="startedCaches" class=" fit">
@@ -236,10 +167,17 @@
 </template>
 
 <style>
-  /*
-    .my-list-card-item
-      padding-left: 8px
-  */
+  .my-custom th {
+    color: #027BE3 !important;
+  }
+
+  .my-custom tr {
+    color: #027BE3 !important;
+  }
+
+  .my-custom td {
+    color: #027BE3 !important;
+  }
 </style>
 <script>
   //import {dom} from 'quasar'
@@ -250,13 +188,102 @@
         tab: 'profile',
         startedCaches: [],
         inviteMail: "",
+        currentTeamStatus: "Dienstag 15:00 Treffen zum Blumencache",
         teamStatus: "",
-        userNameContent: null,
-        emailContent: null,
+        userName: null,
+        email: null,
         userRanking: null,
         teamName: null,
         teamRanking: null,
         dropDownSelectedItem: null,
+        columns: [
+          {
+            name: 'desc',
+            required: true,
+            align: 'left',
+            field: row => row.name,
+            format: val => `${val}`,
+          },
+          {
+            name: 'userData',
+            required: true,
+            align: 'left',
+            field: 'userData',
+          }
+        ],
+        data: [
+          {
+            name: 'Mein Nutzername',
+            userData: this.userName,
+          },
+          {
+            name: 'Meine Email',
+            userData: this.email,
+          },
+          {
+            name: 'Meine Ranglistenposition',
+            userData: this.userRanking,
+          },
+          {
+            name: 'Mein Team',
+            userData: this.teamName,
+          },
+          {
+            name: 'Teamranglistenposition',
+            userData: this.teamRanking,
+          },
+        ],
+        teamColumns: [
+          {
+            name: 'desc',
+            label: 'Benutzername',
+            required: true,
+            align: 'left',
+            field: row => row.name,
+            format: val => `${val}`,
+          },
+          {
+            name: 'ranking',
+            label: 'Solo-Ranglistenpunkte',
+            required: true,
+            align: 'left',
+            field: 'ranking',
+            sortable: true,
+          }
+        ],
+        teamData: [
+          {
+            name: 'BuGaCacher2019',
+            ranking: 10,
+          },
+          {
+            name: 'Max',
+            ranking: 5,
+          },
+          {
+            name: 'Timo',
+            ranking: 4,
+          },
+          {
+            name: 'Katharina',
+            ranking: 3,
+          },
+          {
+            name: 'Michael',
+            ranking: 2,
+          },
+          {
+            name: 'Robin',
+            ranking: 1,
+          },
+        ],
+        pagination: {
+          sortBy: 'name',
+          descending: false,
+          page: 1,
+          rowsPerPage: 10
+          // rowsNumber: xx if getting data from a server
+        },
       }
     },
     mounted: function () {
@@ -270,12 +297,17 @@
       this.fetchUserCaches();
       this.$store.commit('auth/SET_AUTHENTICATED');
       this.$store.commit('auth/SET_USER');
-      this.userNameContent = JSON.parse(localStorage.getItem('userToken')).name;
-      this.emailContent = JSON.parse(localStorage.getItem('userMail'));
+      this.userName = JSON.parse(localStorage.getItem('userToken')).name;
+      this.data[0].userData = this.userName;
+      this.email = JSON.parse(localStorage.getItem('userMail'));
+      this.data[1].userData = this.email;
       this.userRanking = "1234";
+      this.data[2].userData = this.userRanking;
       this.teamName = "BuGa19Community";
+      this.data[3].userData = this.teamName;
       this.dropDownSelectedItem = this.teamName;
       this.teamRanking = "2019";
+      this.data[4].userData = this.teamRanking;
     },
     methods: {
       fetchUserCaches: function () {
@@ -314,7 +346,7 @@
       },
       getPersonalRanking() {
         const name = JSON.parse(localStorage.getItem('userToken')).name;
-        JSON.stringify(name);
+        console.log(JSON.parse(localStorage.getItem('userToken')).name);
         this.$axios.get('/api/hello', {params: {name}})
           .then((response) => {
             this.userRanking = response.data;
@@ -343,11 +375,37 @@
         })
       },
       getTeamData() {
+        const userName = {name: JSON.parse(localStorage.getItem('userToken')).name};
+        this.$axios.get('/api/getTeam', {params: userName})
+          .then(response => {
+            console.log("getTeam: " + response);
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
+        })
 
       },
 
-      dropDownSelectItem(item){
-        if(item === 'team'){
+      dropDownSelectItem(item) {
+        if (item === 'team') {
           this.dropDownSelectedItem = this.teamName;
         } else {
           this.dropDownSelectedItem = item;
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 4dc8489..7e451ee 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -807,6 +807,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/getTeam")
   public ResponseEntity getTeam(@RequestParam String name){
     ResponseEntity responseEntity = FinderUtil.findTeamByName(name);
@@ -814,6 +815,7 @@ public class Controller {
     return responseEntity;
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/getTeamMembers")
   public ResponseEntity getTeamMembers(@RequestParam String name){
     return FinderUtil.findTeammemberByTeamName(name);

From a3a61dbce0103fdafb270aeba0e382ce08b28afb Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Tue, 30 Apr 2019 15:24:56 +0200
Subject: [PATCH 38/62] New Rankingplace Method

---
 .../bugageocaching/controller/Controller.java | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 7e451ee..cadd2c6 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -826,6 +826,32 @@ public class Controller {
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
   }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getRankingPlace")
+  public ResponseEntity getRankingPlace(@RequestParam String token){
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
+  }
+
 }
 
 

From bac0a31fd34f9eb0ac1044eadcf8749a2748b175 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 15:30:50 +0200
Subject: [PATCH 39/62] fixed bugs in cache creation and processing

---
 frontend/src/layouts/MyLayout.vue  |  1 +
 frontend/src/pages/Profile.vue     | 11 ++++++++---
 frontend/src/pages/StationView.vue | 24 ++++++++----------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index 3bc0414..f677cad 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -44,6 +44,7 @@
           </q-item-section>
         </q-item>
         <q-item
+          v-if="this.$store.state.auth.isAuthenticated"
           clickable
           class="text-primary"
           v-ripple
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 8fe3df2..701a102 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -166,10 +166,14 @@
 
         <q-tab-panel name="startedCaches" class=" fit">
           <q-list>
-            <q-card class="q-mb-md" v-for="startedCache in startedCaches" :key="startedCache.id">
+            <q-card
+              class="q-mb-md"
+              v-for="startedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 0)"
+              :key="startedCache.id"
+            >
               <q-expansion-item
                 class=""
-                v-if="startedCache.cacheAccesDefinition.description === 'angefangen'"
+
                 expand-icon-toggle
                 expand-separator
                 icon="location_on"
@@ -267,8 +271,9 @@
     },
     methods: {
       fetchUserCaches: function () {
+        let token;
         if (localStorage.getItem('userToken')) {
-          const token = JSON.parse(localStorage.getItem('userToken')).token;
+          token = JSON.parse(localStorage.getItem('userToken')).token;
         } else {
           return;
         }
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index e55a014..65f8119 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -6,10 +6,10 @@
            src="https://www.buga2019.de/we-bilder/3.Gartenausstellung/Gelaendeplan/190320_Gelaendeplan-quadratisch.jpg"
     ></q-img>
     <div class="q-ma-md">
-      <p class="text-h4">{{ data.cacheName }}</p>
+      <p class="text-h4">{{ cache.name }}</p>
       <p class="text-h5">Station {{ showCacheProgress }}</p>
 <!--      <p class="text-h5">Station {{ data.station.position }}</p>-->
-      <p>{{ data.station.description }}</p>
+      <p>{{ station.description }}</p>
       <!--<q-input-->
       <!--v-model="description"-->
       <!--filled-->
@@ -54,19 +54,9 @@
         //code: "",
         cacheID: "",
         cacheName: "",
+        //cache: null,
         cache: null,
-        data: {
-          cacheId: 22,
-          cacheName: "Wasserfall Cache",
-          station: {
-            id: 22,
-            description: "Ein kleines winterliches Schlaginstrument. Welche Blume ist damit gemeint?",
-            longitude: 9.206628,
-            lattitude: 49.147734,
-            code: 213812,
-            solution: "Schneeglöckchen"
-          }
-        },
+        station: null,
 
         // Following Params belong to QR-Code Scanner
         askForPermission: true,
@@ -107,13 +97,15 @@
         this.$axios.get('/api/allCaches')
           .then((response) => {
             console.log("/api/allCaches");
-            console.log(JSON.stringify(this.data));
-            console.log(this.data);
             console.log(response.data);
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
             this.cache = cache;
+            this.station = cache.stationen.find(station => station.id === Number(this.$route.params.id));
             this.cacheName = cache.name;
             this.cacheID = this.$route.params.cache;
+            console.log(JSON.stringify(this.cache));
+            console.log(JSON.stringify(this.station));
+            console.log(this.cache);
           })
       },
 

From 6f4789fff0b8304c6319cb133331e66d73d4f6c0 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 16:45:27 +0200
Subject: [PATCH 40/62] fixed login & separated profile from mycaches

---
 frontend/src/layouts/MyLayout.vue |  16 +-
 frontend/src/pages/Login.vue      |   5 +-
 frontend/src/pages/MyCaches.vue   | 347 ++++++++++++++++++++++++++++++
 frontend/src/pages/Profile.vue    | 107 ---------
 frontend/src/router/routes.js     |   5 +
 5 files changed, 370 insertions(+), 110 deletions(-)
 create mode 100644 frontend/src/pages/MyCaches.vue

diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index f677cad..943c3f7 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -69,7 +69,21 @@
             <q-icon name="map"/>
           </q-item-section>
           <q-item-section>
-            <q-item-label>Caches</q-item-label>
+            <q-item-label>Alle Caches</q-item-label>
+          </q-item-section>
+        </q-item>
+        <q-item
+          clickable
+          class="text-primary"
+          v-ripple
+          tag="a"
+          to="/mycaches"
+        >
+          <q-item-section avatar>
+            <q-icon name="map"/>
+          </q-item-section>
+          <q-item-section>
+            <q-item-label>Meine Caches</q-item-label>
           </q-item-section>
         </q-item>
         <q-item
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index ceedb71..9ec6a11 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="q-pa-md">
-    <form class="login" @submit.prevent="login">
+    <form class="login">
       <div class="q-pa-md">
         <div class="column q-gutter-lg" style="">
           <div class="col">
@@ -29,7 +29,7 @@
                   label="Login"
                   color="primary"
                   class="full-width"
-                  type="submit"
+                  @click="login"
                   unelevated
                 >
                   <template v-slot:loading>
@@ -87,6 +87,7 @@
     },
     methods: {
       login: function () {
+        console.log("login called");
         this.loading = true;
         const data = {
           email: this.user.email,
diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
new file mode 100644
index 0000000..9f39752
--- /dev/null
+++ b/frontend/src/pages/MyCaches.vue
@@ -0,0 +1,347 @@
+<template>
+  <q-page class="column no-wrap">
+    <div class="bg-red col col-shrink" style="">
+      <q-tabs
+        v-model="tab"
+        class="bg-grey-2"
+        inline-label
+        align="justify"
+        active-bg-color="bg-grey-1"
+        active-color="cyan-14"
+        indicator-color="cyan-14"
+        switch-indicator
+      >
+        <q-tab name="startedCaches" label="Angefangene Caches" icon="playlist_play"/>
+        <q-tab name="finishedCaches" label="Beendete Caches" icon="playlist_add_check"/>
+      </q-tabs>
+      <q-separator color="grey-4"/>
+    </div>
+
+    <div class="col flex column">
+      <q-tab-panels v-model="tab" animated swipeable class="col">
+
+        <q-tab-panel name="startedCaches" class=" fit">
+          <q-list>
+            <q-card
+              class="q-mb-md"
+              v-for="startedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 0)"
+              :key="startedCache.id"
+            >
+              <q-expansion-item
+                class=""
+                expand-icon-toggle
+                expand-separator
+                icon="location_on"
+                :label="startedCache.cache.name"
+                :caption=" startedCache.cache.description"
+              >
+                <q-item>
+                  <q-item-section top avatar class="self-center">
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label caption>{{'Nächste Aufgabe: ' + startedCache.aktuelleStation.description }}
+                    </q-item-label>
+                    <q-item-label caption>{{'Ranglistenpunkte für diesen Cache: ' + startedCache.cache.rankingPoints}}
+                    </q-item-label>
+                  </q-item-section>
+
+                  <q-item-section side top class="self-center">
+                  </q-item-section>
+                </q-item>
+                <q-item class="q-pr-sm reverse q-gutter-x-sm">
+                  <q-btn @click="continueCache(startedCache.id)" unelevated color="positive" stack icon="arrow_forward"
+                         label="Fortfahren" size="sm"/>
+                </q-item>
+              </q-expansion-item>
+            </q-card>
+          </q-list>
+        </q-tab-panel>
+
+        <q-tab-panel name="finishedCaches" class="fit">
+          <q-list>
+            <q-card class="q-mb-md" v-for="startedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 1)" :key="startedCache.id">
+              <q-expansion-item
+                class=""
+                expand-icon-toggle
+                expand-separator
+                icon="location_on"
+                :label="startedCache.cache.name"
+                :caption=" startedCache.cache.description"
+              >
+                <q-item>
+                  <q-item-section top avatar class="self-center">
+                    <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints
+                      }}
+                    </q-item-label>
+                  </q-item-section>
+
+                  <q-item-section side top class="self-center">
+                  </q-item-section>
+                </q-item>
+              </q-expansion-item>
+            </q-card>
+          </q-list>
+        </q-tab-panel>
+
+      </q-tab-panels>
+    </div>
+  </q-page>
+
+</template>
+
+<style>
+  .my-custom th {
+    color: #027BE3 !important;
+  }
+
+  .my-custom tr {
+    color: #027BE3 !important;
+  }
+
+  .my-custom td {
+    color: #027BE3 !important;
+  }
+</style>
+<script>
+  //import {dom} from 'quasar'
+  //const {height, width} = dom
+  export default {
+    data() {
+      return {
+        tab: 'startedCaches',
+        startedCaches: [],
+        inviteMail: "",
+        currentTeamStatus: "Dienstag 15:00 Treffen zum Blumencache",
+        teamStatus: "",
+        userName: null,
+        email: null,
+        userRanking: null,
+        teamName: null,
+        teamRanking: null,
+        dropDownSelectedItem: null,
+        columns: [
+          {
+            name: 'desc',
+            required: true,
+            align: 'left',
+            field: row => row.name,
+            format: val => `${val}`,
+          },
+          {
+            name: 'userData',
+            required: true,
+            align: 'left',
+            field: 'userData',
+          }
+        ],
+        data: [
+          {
+            name: 'Mein Nutzername',
+            userData: this.userName,
+          },
+          {
+            name: 'Meine Email',
+            userData: this.email,
+          },
+          {
+            name: 'Meine Ranglistenposition',
+            userData: this.userRanking,
+          },
+          {
+            name: 'Mein Team',
+            userData: this.teamName,
+          },
+          {
+            name: 'Teamranglistenposition',
+            userData: this.teamRanking,
+          },
+        ],
+        teamColumns: [
+          {
+            name: 'desc',
+            label: 'Benutzername',
+            required: true,
+            align: 'left',
+            field: row => row.name,
+            format: val => `${val}`,
+          },
+          {
+            name: 'ranking',
+            label: 'Solo-Ranglistenpunkte',
+            required: true,
+            align: 'left',
+            field: 'ranking',
+            sortable: true,
+          }
+        ],
+        teamData: [
+          {
+            name: 'BuGaCacher2019',
+            ranking: 10,
+          },
+          {
+            name: 'Max',
+            ranking: 5,
+          },
+          {
+            name: 'Timo',
+            ranking: 4,
+          },
+          {
+            name: 'Katharina',
+            ranking: 3,
+          },
+          {
+            name: 'Michael',
+            ranking: 2,
+          },
+          {
+            name: 'Robin',
+            ranking: 1,
+          },
+        ],
+        pagination: {
+          sortBy: 'name',
+          descending: false,
+          page: 1,
+          rowsPerPage: 10
+          // rowsNumber: xx if getting data from a server
+        },
+      }
+    },
+    mounted: function () {
+    },
+    computed: {
+      hasAdminState() {
+        return this.$store.getters['auth/GET_ADMINSTATE'];
+      },
+    },
+    created: function () {
+      this.fetchUserCaches();
+      this.$store.commit('auth/SET_AUTHENTICATED');
+      this.$store.commit('auth/SET_USER');
+      this.userName = JSON.parse(localStorage.getItem('userToken')).name;
+      this.data[0].userData = this.userName;
+      this.email = JSON.parse(localStorage.getItem('userMail'));
+      this.data[1].userData = this.email;
+      this.userRanking = "1234";
+      this.data[2].userData = this.userRanking;
+      this.teamName = "BuGa19Community";
+      this.data[3].userData = this.teamName;
+      this.dropDownSelectedItem = this.teamName;
+      this.teamRanking = "2019";
+      this.data[4].userData = this.teamRanking;
+    },
+    methods: {
+      fetchUserCaches: function () {
+        let token;
+        if (localStorage.getItem('userToken')) {
+          token = JSON.parse(localStorage.getItem('userToken')).token;
+        } else {
+          return;
+        }
+        this.$axios.get('/api/getMyCaches', {params: {token}})
+          .then((response) => {
+            this.startedCaches = response.data;
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
+        })
+      },
+      continueCache(cacheID) {
+      },
+      validateEmail(email) {
+        let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+        return re.test(String(email).toLowerCase());
+      },
+      getPersonalRanking() {
+        const name = JSON.parse(localStorage.getItem('userToken')).name;
+        console.log(JSON.parse(localStorage.getItem('userToken')).name);
+        this.$axios.get('/api/hello', {params: {name}})
+          .then((response) => {
+            this.userRanking = response.data;
+            console.log(response.data);
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
+        })
+      },
+      getTeamData() {
+        const userName = {name: JSON.parse(localStorage.getItem('userToken')).name};
+        this.$axios.get('/api/getTeam', {params: userName})
+          .then(response => {
+            console.log("getTeam: " + response);
+          }).catch((error) => {
+          // Error
+          let msg;
+          let title;
+          if (error.response) {
+            // The request was made and the server responded with a status code
+            title = "Problem with response!";
+            msg = error.response;
+          } else if (error.request) {
+            // The request was made but no response was received
+            title = "Problem with request!";
+            msg = "Error occured due to wrong server request!"
+            console.log(error.request);
+          } else {
+            // Something happened in setting up the request that triggered an Error
+            title = "Error";
+            msg = error.message;
+            console.log('Error', error.message);
+          }
+          console.log(error.config);
+          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
+        })
+
+      },
+
+      dropDownSelectItem(item) {
+        if (item === 'team') {
+          this.dropDownSelectedItem = this.teamName;
+        } else {
+          this.dropDownSelectedItem = item;
+        }
+      },
+    }
+  }
+</script>
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index c87fa1d..75f3199 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -13,8 +13,6 @@
       >
         <q-tab name="profile" label="Profil" icon="perm_identity"/>
         <q-tab name="teams" label="Team" icon="group"/>
-        <q-tab name="startedCaches" label="Angefangene Caches" icon="playlist_play"/>
-        <q-tab name="finishedCaches" label="Beendete Caches" icon="playlist_add_check"/>
       </q-tabs>
       <q-separator color="grey-4"/>
     </div>
@@ -95,75 +93,6 @@
           </div>
         </q-tab-panel>
 
-        <q-tab-panel name="startedCaches" class=" fit">
-          <q-list>
-            <q-card
-              class="q-mb-md"
-              v-for="startedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 0)"
-              :key="startedCache.id"
-            >
-              <q-expansion-item
-                class=""
-
-                expand-icon-toggle
-                expand-separator
-                icon="location_on"
-                :label="startedCache.cache.name"
-                :caption=" startedCache.cache.description"
-              >
-                <q-item>
-                  <q-item-section top avatar class="self-center">
-                    <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
-                  </q-item-section>
-                  <q-item-section>
-                    <q-item-label caption>{{'Nächste Aufgabe: ' + startedCache.aktuelleStation.description }}
-                    </q-item-label>
-                    <q-item-label caption>{{'Ranglistenpunkte für diesen Cache: ' + startedCache.cache.rankingPoints}}
-                    </q-item-label>
-                  </q-item-section>
-
-                  <q-item-section side top class="self-center">
-                  </q-item-section>
-                </q-item>
-                <q-item class="q-pr-sm reverse q-gutter-x-sm">
-                  <q-btn @click="continueCache(startedCache.id)" unelevated color="positive" stack icon="arrow_forward"
-                         label="Fortfahren" size="sm"/>
-                </q-item>
-              </q-expansion-item>
-            </q-card>
-          </q-list>
-        </q-tab-panel>
-
-        <q-tab-panel name="finishedCaches" class="fit">
-          <q-list>
-            <q-card class="q-mb-md" v-for="startedCache in startedCaches" :key="startedCache.id">
-              <q-expansion-item
-                class=""
-                v-if="startedCache.cacheAccesDefinition.description === 'abgeschlossen'"
-                expand-icon-toggle
-                expand-separator
-                icon="location_on"
-                :label="startedCache.cache.name"
-                :caption=" startedCache.cache.description"
-              >
-                <q-item>
-                  <q-item-section top avatar class="self-center">
-                    <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
-                  </q-item-section>
-                  <q-item-section>
-                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints
-                      }}
-                    </q-item-label>
-                  </q-item-section>
-
-                  <q-item-section side top class="self-center">
-                  </q-item-section>
-                </q-item>
-              </q-expansion-item>
-            </q-card>
-          </q-list>
-        </q-tab-panel>
-
       </q-tab-panels>
     </div>
   </q-page>
@@ -298,7 +227,6 @@
       },
     },
     created: function () {
-      this.fetchUserCaches();
       this.$store.commit('auth/SET_AUTHENTICATED');
       this.$store.commit('auth/SET_USER');
       this.userName = JSON.parse(localStorage.getItem('userToken')).name;
@@ -314,41 +242,6 @@
       this.data[4].userData = this.teamRanking;
     },
     methods: {
-      fetchUserCaches: function () {
-        let token;
-        if (localStorage.getItem('userToken')) {
-          token = JSON.parse(localStorage.getItem('userToken')).token;
-        } else {
-          return;
-        }
-        this.$axios.get('/api/getMyCaches', {params: {token}})
-          .then((response) => {
-            this.startedCaches = response.data;
-          }).catch((error) => {
-          // Error
-          let msg;
-          let title;
-          if (error.response) {
-            // The request was made and the server responded with a status code
-            title = "Problem with response!";
-            msg = error.response;
-          } else if (error.request) {
-            // The request was made but no response was received
-            title = "Problem with request!";
-            msg = "Error occured due to wrong server request!"
-            console.log(error.request);
-          } else {
-            // Something happened in setting up the request that triggered an Error
-            title = "Error";
-            msg = error.message;
-            console.log('Error', error.message);
-          }
-          console.log(error.config);
-          this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
-        })
-      },
-      continueCache(cacheID) {
-      },
       validateEmail(email) {
         let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return re.test(String(email).toLowerCase());
diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js
index 79fa81c..6a39f45 100644
--- a/frontend/src/router/routes.js
+++ b/frontend/src/router/routes.js
@@ -75,6 +75,11 @@ const routes = [
       component: () => import("layouts/MyLayout.vue"),
     children: [{ path: "", component: () => import("pages/Profile.vue") }]
   },
+  {
+   path: "/mycaches/",
+      component: () => import("layouts/MyLayout.vue"),
+    children: [{ path: "", component: () => import("pages/MyCaches.vue") }]
+  },
   {
     path: "/register/",
     component: () => import("layouts/MyLayout.vue"),

From 8c647b0b095313585d3aa516a1214a0f97bac83b Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 17:09:51 +0200
Subject: [PATCH 41/62] changed some configurations for https

---
 frontend/quasar.conf.js                       |  3 +-
 frontend/src/pages/Login.vue                  |  2 +-
 frontend/src/pages/MyCaches.vue               | 14 +++++++---
 .../bugageocaching/controller/Controller.java | 28 +++++++++----------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index c3a8c30..d1aadbd 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,7 +109,8 @@ module.exports = function (ctx) {
       },
       env: ctx.dev
         ? { // Base URL for API-Calls: DEV
-          API: JSON.stringify('http://localhost:8080')
+          //API: JSON.stringify('http://localhost:8080')
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
           //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching')
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 9ec6a11..72158f5 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -96,7 +96,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(data));
 
-        this.$axios.post('http://www.se.hs-heilbronn.de:8090/buga19usermanagement/account/login', data)
+        this.$axios.post('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement/account/login', data)
           .then((response) => {
             console.log("GET/POST /api/login/ - response: ");
             console.log(response.data);
diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index 9f39752..3a81425 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -270,10 +270,16 @@
         })
       },
       continueCache(cacheID) {
-      },
-      validateEmail(email) {
-        let re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-        return re.test(String(email).toLowerCase());
+        let currentCache;
+        let params;
+
+        this.$axios.get('/api/currentStation', {params})
+          .then((response) => {
+          })
+          .catch((error) => {
+        });
+
+        this.$router.push({path: `/station/${cacheID}`})
       },
       getPersonalRanking() {
         const name = JSON.parse(localStorage.getItem('userToken')).name;
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 0d718af..6bdf3ef 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -53,7 +53,7 @@ public class Controller {
     fetchPublicKey();
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/allCaches")
   @ResponseBody
   public ResponseEntity getAllCaches() {
@@ -61,7 +61,7 @@ public class Controller {
   }
 
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/startCache")
   @ResponseBody
   public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
@@ -143,7 +143,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/checkStation")
   @ResponseBody
   public ResponseEntity checkStation(@RequestParam String token,
@@ -291,14 +291,14 @@ public class Controller {
 
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/createCache")
   @ResponseBody
   public ResponseEntity createCache(@RequestBody Cache cache) {
     return createCacheUtil(cache);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/checkAdmin")
   @ResponseBody
   public ResponseEntity checkAdmin(@RequestParam String token) {
@@ -329,14 +329,14 @@ public class Controller {
     return ResponseEntity.status(401).body(false);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getAllStations")
   @ResponseBody
   public ResponseEntity getAllStations() {
     return ResponseEntity.status(200).body(new Gson().toJson(stationRepository.findAll()));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/deleteCache")
   @ResponseBody
   public ResponseEntity deleteCache(@RequestParam String cacheID) {
@@ -344,7 +344,7 @@ public class Controller {
   }
 
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getMyCaches")
   @ResponseBody
   public ResponseEntity getMyCaches(@RequestParam String token) {
@@ -380,7 +380,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getRankingList")
   @ResponseBody
   public ResponseEntity getRankingList() {
@@ -395,7 +395,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getTeamRankingList")
   @ResponseBody
   public ResponseEntity getTeamRankingList() {
@@ -410,7 +410,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackTeams));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getUser")
   @ResponseBody
   public ResponseEntity getUser(@RequestParam String token) {
@@ -438,7 +438,7 @@ public class Controller {
     }
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/createTeam")
   @ResponseBody
   public ResponseEntity createTeam(@RequestParam String token,
@@ -485,7 +485,7 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/joinTeam")
   @ResponseBody
   public ResponseEntity joinTeam(@RequestParam String token,
@@ -546,7 +546,7 @@ public class Controller {
     return ResponseEntity.status(200).body(team);
   }
 
-  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/leaveTeam")
   @ResponseBody
   public ResponseEntity leaveTeam(@RequestParam String token) {

From a9450d448f1a839487a2e8ec70581c90122f595f Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 17:49:58 +0200
Subject: [PATCH 42/62] fixed delete cache

---
 frontend/quasar.conf.js         | 4 ++--
 frontend/src/pages/Overview.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index d1aadbd..22e0e74 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -113,8 +113,8 @@ module.exports = function (ctx) {
           API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          //API: JSON.stringify('http://seserver.se.hs-heilbronn.de:9080/buga19geocaching')
-          API: JSON.stringify('http://localhost:8080')
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
+          //API: JSON.stringify('http://localhost:8080')
         }
     },
 
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 902d15d..89157e5 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -145,8 +145,8 @@
       editCache() {
       },
       deleteCache(id) {
-        console.log('delete cache: ' + id)
-        this.$axios.delete('/api/deleteCache', {params: {cacheID: id}})
+        console.log('delete cache: ' + id);
+        this.$axios.get('/api/deleteCache', {params: {cacheID: id}})
           .then((response) => {
             this.fetchAllCaches()
           }).catch((error) => {

From a97b3f1c918706dc4c8fdcba7830cd9c15aa6711 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 17:59:13 +0200
Subject: [PATCH 43/62] USER_API in quasar.conf

---
 frontend/quasar.conf.js                        | 6 ++++--
 frontend/src/pages/Login.vue                   | 2 +-
 frontend/src/pages/Register.vue                | 4 ++--
 frontend/src/store/cacheCollector/mutations.js | 9 +++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 22e0e74..28e7ec3 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -110,10 +110,12 @@ module.exports = function (ctx) {
       env: ctx.dev
         ? { // Base URL for API-Calls: DEV
           //API: JSON.stringify('http://localhost:8080')
-          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching')
+          API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
           //API: JSON.stringify('http://localhost:8080')
         }
     },
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 72158f5..bd7c0d1 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -96,7 +96,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(data));
 
-        this.$axios.post('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement/account/login', data)
+        this.$axios.post(process.env.USER_API+'/account/login', data)
           .then((response) => {
             console.log("GET/POST /api/login/ - response: ");
             console.log(response.data);
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 318552a..eab75e5 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -110,7 +110,7 @@
 
           console.log("POST /api/register/ - json: " + JSON.stringify(data));
           const token = JSON.parse(localStorage.getItem('registerToken')).token;
-          this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/register', data,{
+          this.$axios.post(process.env.USER_API+'/account/register', data,{
             headers: {
               'Authorization': 'Bearer ' + token,
             }
@@ -167,7 +167,7 @@
 
         console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
 
-        this.$axios.post('http://www.se.hs-heilbronn.de:9080/buga19usermanagement/account/login', logindata)
+        this.$axios.post(process.env.USER_API+'/account/login', logindata)
           .then((response) => {
             localStorage.setItem('registerToken', JSON.stringify(response.data));
           })
diff --git a/frontend/src/store/cacheCollector/mutations.js b/frontend/src/store/cacheCollector/mutations.js
index 13e6b94..fb9ae86 100644
--- a/frontend/src/store/cacheCollector/mutations.js
+++ b/frontend/src/store/cacheCollector/mutations.js
@@ -35,13 +35,18 @@ export const RESET_NEW_CACHE = (state) => {
     name: "",
     description: "",
     rankingPoints: 0,
+    reward: {
+      rewardDescription: "",
+    },
     stationen: []
   };
   state.endStation = {
     description: "Endstation",
-    longitude: 0.0001,
-    lattitude: 0.0001,
+      longitude: 9.206628,
+      lattitude: 49.147734,
+      solution: "",
   };
+
   console.log("resetted new Cache");
 };
 export const LOAD_REMOTE_CACHE = (state, id) => {

From 44086c630d631e4d8c5d6a19d2ad015ef39101c1 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 19:07:18 +0200
Subject: [PATCH 44/62] fixed register & continue cache

---
 frontend/src/pages/MyCaches.vue               | 24 ++++++++++++-------
 frontend/src/pages/Overview.vue               |  2 +-
 frontend/src/pages/Register.vue               |  1 -
 frontend/src/pages/StationView.vue            |  7 ++++--
 .../bugageocaching/controller/Controller.java |  3 +++
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index 3a81425..aa82501 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -49,7 +49,7 @@
                   </q-item-section>
                 </q-item>
                 <q-item class="q-pr-sm reverse q-gutter-x-sm">
-                  <q-btn @click="continueCache(startedCache.id)" unelevated color="positive" stack icon="arrow_forward"
+                  <q-btn @click="continueCache(startedCache.cache.id)" unelevated color="positive" stack icon="arrow_forward"
                          label="Fortfahren" size="sm"/>
                 </q-item>
               </q-expansion-item>
@@ -245,6 +245,7 @@
         }
         this.$axios.get('/api/getMyCaches', {params: {token}})
           .then((response) => {
+            console.log(response.data)
             this.startedCaches = response.data;
           }).catch((error) => {
           // Error
@@ -270,16 +271,23 @@
         })
       },
       continueCache(cacheID) {
+        console.log("cacheID")
+        console.log(cacheID)
         let currentCache;
-        let params;
+        if (localStorage.getItem('userToken')) {
+          let params = {cacheID: cacheID};
+          params.token = JSON.parse(localStorage.getItem('userToken')).token;
+          this.$axios.get('/api/getCurrentStation', {params})
+            .then((response) => {
+              console.log(response.data)
+            })
+            .catch((error) => {
+            });
 
-        this.$axios.get('/api/currentStation', {params})
-          .then((response) => {
-          })
-          .catch((error) => {
-        });
+        }
 
-        this.$router.push({path: `/station/${cacheID}`})
+
+        //this.$router.push({path: `/station/${cacheID}`})
       },
       getPersonalRanking() {
         const name = JSON.parse(localStorage.getItem('userToken')).name;
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 89157e5..22575e3 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -36,7 +36,7 @@
                     <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
                   </q-item-section>
                   <q-item-section>
-                    <q-item-label caption>{{ cache.description }}</q-item-label>
+                    <q-item-label caption v-html="cache.description"></q-item-label>
                   </q-item-section>
 
                   <q-item-section side top class="self-center">
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index eab75e5..11d7795 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -50,7 +50,6 @@
                     label="Sign up"
                     color="primary"
                     class="full-width"
-                    type="submit"
                     @click="register()"
                     unelevated
                   />
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 65f8119..a7a7845 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -55,8 +55,11 @@
         cacheID: "",
         cacheName: "",
         //cache: null,
-        cache: null,
-        station: null,
+        cache: {
+          name: "",
+          stationen: [],
+        },
+        station: {},
 
         // Following Params belong to QR-Code Scanner
         askForPermission: true,
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 6bdf3ef..2c6dc5b 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -606,7 +606,9 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getCurrentStation")
+  @ResponseBody
   public ResponseEntity getStationFromUserAndCache(@RequestParam String token, @RequestParam String cacheID){
 
     // verify user
@@ -641,6 +643,7 @@ public class Controller {
     return ResponseEntity.status(200).body(bearbeitetRepository.findByUserAndCache(user, cache));
   }
 
+  @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));

From 57c62d421d0f16bbc83e21bd5ee26efaccb3a9ef Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Tue, 30 Apr 2019 19:17:18 +0200
Subject: [PATCH 45/62] changed registration process

---
 frontend/src/pages/Register.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 11d7795..a1d5b2c 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -47,7 +47,7 @@
                 <div class="" style="max-width: 440px">
                   <q-btn
                     :disabled="!validationSuccesful"
-                    label="Sign up"
+                    label="Registrieren"
                     color="primary"
                     class="full-width"
                     @click="register()"
@@ -87,14 +87,17 @@
         return false;
       }
     },
+    created() {
+      this.login();
+    },
     methods: {
       validateEmail(email) {
         var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
         return re.test(String(email).toLowerCase());
       },
       register: function () {
+
         if(this.user.email===this.user.checkemail&&this.user.password===this.user.checkpassword){
-          this.login();
           const data = {
             name: this.user.name,
             password: this.user.password,
@@ -157,7 +160,7 @@
           }
         }
       },
-      login: function () {
+      login() {
 
         const logindata = {
           email: "register@bugageocaching.de",

From 1f2ee957e8bf426815aac367a1133c8866d68d71 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Wed, 1 May 2019 21:23:59 +0200
Subject: [PATCH 46/62] cacheview now properly loads new data

---
 frontend/src/pages/CacheStart.vue  |  2 --
 frontend/src/pages/StationView.vue | 30 +++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 5880e30..9c525c3 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -67,8 +67,6 @@
         this.$axios.get('/api/allCaches')
           .then((response) => {
             console.log("/api/allCaches");
-            console.log(JSON.stringify(this.data));
-            console.log(this.data);
             console.log(response.data);
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
             this.cacheName = cache.name;
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index a7a7845..1a0ee7a 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -74,16 +74,40 @@
 
       }
     },
+    beforeRouteUpdate (to, from, next) {
+      console.log("beforeRouteUpdate: reset data and fetch");
+      this.cacheID = "";
+      this.cacheName = "";
+      this.cache = {
+        name: "",
+        stationen: [],
+      };
+      this.station = {};
+      this.askForPermission = true;
+      this.activateCamera = false;
+      this.isValid = false;
+      this.validating = false;
+      this.loading = false;
+      this.paused = false;
+      this.result = null;
+      this.params = null;
+      this.noStreamApiSupport = false;
+
+      this.fetchData();
+      next()
+    },
     created: function () {
-      console.log("StationView: ");
-      // console.log("'id' from url: " + this.$route.params.id)
-      // console.log("'cache' from url: " + this.$route.params.cache)
+      console.log("StationView: created!");
+      console.log("'id' from url: " + this.$route.params.id);
+      console.log("'cache' from url: " + this.$route.params.cache);
       this.fetchData();
     },
     beforeMount: function () {
     },
     mounted: function () {
     },
+    updated: function () {
+    },
     computed: {
       showCacheProgress() {
         if (this.cache !== null) {

From e660a7bba7945985a0050725a6bf5e3fb1f2baa0 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Wed, 1 May 2019 21:31:14 +0200
Subject: [PATCH 47/62] continue cache works

---
 frontend/src/pages/MyCaches.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index aa82501..0327872 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -271,15 +271,17 @@
         })
       },
       continueCache(cacheID) {
-        console.log("cacheID")
-        console.log(cacheID)
-        let currentCache;
+        console.log("cacheID");
+        console.log(cacheID);
+        let currentStationID;
         if (localStorage.getItem('userToken')) {
           let params = {cacheID: cacheID};
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
           this.$axios.get('/api/getCurrentStation', {params})
             .then((response) => {
-              console.log(response.data)
+              console.log(response.data);
+              currentStationID = response.data.aktuelleStation.id;
+              this.$router.push({path: `/station/${cacheID}/${currentStationID}`});
             })
             .catch((error) => {
             });

From ea006b391543a8a5af1d49536c5919a119dae582 Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Wed, 1 May 2019 21:40:13 +0200
Subject: [PATCH 48/62] cachers can now access their rewards at mycaches page

---
 frontend/src/pages/MyCaches.vue | 147 ++++++--------------------------
 1 file changed, 25 insertions(+), 122 deletions(-)

diff --git a/frontend/src/pages/MyCaches.vue b/frontend/src/pages/MyCaches.vue
index 0327872..e817543 100644
--- a/frontend/src/pages/MyCaches.vue
+++ b/frontend/src/pages/MyCaches.vue
@@ -59,21 +59,21 @@
 
         <q-tab-panel name="finishedCaches" class="fit">
           <q-list>
-            <q-card class="q-mb-md" v-for="startedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 1)" :key="startedCache.id">
+            <q-card class="q-mb-md" v-for="finishedCache in startedCaches.filter(cache => cache.cacheAccesDefinition.id === 1)" :key="finishedCache.id">
               <q-expansion-item
                 class=""
                 expand-icon-toggle
                 expand-separator
                 icon="location_on"
-                :label="startedCache.cache.name"
-                :caption=" startedCache.cache.description"
+                :label="finishedCache.cache.name"
+                :caption=" finishedCache.cache.description"
               >
                 <q-item>
                   <q-item-section top avatar class="self-center">
                     <!--<q-icon rounded color="cyan-14" name="location_on" size="3rem"/>-->
                   </q-item-section>
                   <q-item-section>
-                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints
+                    <q-item-label caption>{{'Erhaltene Punkte für diesen Cache: ' + finishedCache.cache.rankingPoints
                       }}
                     </q-item-label>
                   </q-item-section>
@@ -81,6 +81,10 @@
                   <q-item-section side top class="self-center">
                   </q-item-section>
                 </q-item>
+                <q-item class="q-pr-sm reverse q-gutter-x-sm">
+                  <q-btn @click="goToReward(finishedCache.cache.id)" unelevated color="primary" stack icon="arrow_forward"
+                         label="Belohnung ansehen" size="sm"/>
+                </q-item>
               </q-expansion-item>
             </q-card>
           </q-list>
@@ -93,17 +97,6 @@
 </template>
 
 <style>
-  .my-custom th {
-    color: #027BE3 !important;
-  }
-
-  .my-custom tr {
-    color: #027BE3 !important;
-  }
-
-  .my-custom td {
-    color: #027BE3 !important;
-  }
 </style>
 <script>
   //import {dom} from 'quasar'
@@ -118,98 +111,6 @@
         teamStatus: "",
         userName: null,
         email: null,
-        userRanking: null,
-        teamName: null,
-        teamRanking: null,
-        dropDownSelectedItem: null,
-        columns: [
-          {
-            name: 'desc',
-            required: true,
-            align: 'left',
-            field: row => row.name,
-            format: val => `${val}`,
-          },
-          {
-            name: 'userData',
-            required: true,
-            align: 'left',
-            field: 'userData',
-          }
-        ],
-        data: [
-          {
-            name: 'Mein Nutzername',
-            userData: this.userName,
-          },
-          {
-            name: 'Meine Email',
-            userData: this.email,
-          },
-          {
-            name: 'Meine Ranglistenposition',
-            userData: this.userRanking,
-          },
-          {
-            name: 'Mein Team',
-            userData: this.teamName,
-          },
-          {
-            name: 'Teamranglistenposition',
-            userData: this.teamRanking,
-          },
-        ],
-        teamColumns: [
-          {
-            name: 'desc',
-            label: 'Benutzername',
-            required: true,
-            align: 'left',
-            field: row => row.name,
-            format: val => `${val}`,
-          },
-          {
-            name: 'ranking',
-            label: 'Solo-Ranglistenpunkte',
-            required: true,
-            align: 'left',
-            field: 'ranking',
-            sortable: true,
-          }
-        ],
-        teamData: [
-          {
-            name: 'BuGaCacher2019',
-            ranking: 10,
-          },
-          {
-            name: 'Max',
-            ranking: 5,
-          },
-          {
-            name: 'Timo',
-            ranking: 4,
-          },
-          {
-            name: 'Katharina',
-            ranking: 3,
-          },
-          {
-            name: 'Michael',
-            ranking: 2,
-          },
-          {
-            name: 'Robin',
-            ranking: 1,
-          },
-        ],
-        pagination: {
-          sortBy: 'name',
-          descending: false,
-          page: 1,
-          rowsPerPage: 10
-          // rowsNumber: xx if getting data from a server
-        },
       }
     },
     mounted: function () {
@@ -223,17 +124,6 @@
       this.fetchUserCaches();
       this.$store.commit('auth/SET_AUTHENTICATED');
       this.$store.commit('auth/SET_USER');
-      this.userName = JSON.parse(localStorage.getItem('userToken')).name;
-      this.data[0].userData = this.userName;
-      this.email = JSON.parse(localStorage.getItem('userMail'));
-      this.data[1].userData = this.email;
-      this.userRanking = "1234";
-      this.data[2].userData = this.userRanking;
-      this.teamName = "BuGa19Community";
-      this.data[3].userData = this.teamName;
-      this.dropDownSelectedItem = this.teamName;
-      this.teamRanking = "2019";
-      this.data[4].userData = this.teamRanking;
     },
     methods: {
       fetchUserCaches: function () {
@@ -285,11 +175,24 @@
             })
             .catch((error) => {
             });
-
         }
-
-
-        //this.$router.push({path: `/station/${cacheID}`})
+      },
+      goToReward(cacheID) {
+        console.log("cacheID");
+        console.log(cacheID);
+        let currentStationID;
+        if (localStorage.getItem('userToken')) {
+          let params = {cacheID: cacheID};
+          params.token = JSON.parse(localStorage.getItem('userToken')).token;
+          this.$axios.get('/api/getCurrentStation', {params})
+            .then((response) => {
+              console.log(response.data);
+              currentStationID = response.data.aktuelleStation.id;
+              this.$router.push({path: `/CacheEnd/${params.cacheID}`});
+            })
+            .catch((error) => {
+            });
+        }
       },
       getPersonalRanking() {
         const name = JSON.parse(localStorage.getItem('userToken')).name;

From 800c9d96cd78fe858e1164a369f29db10b01c923 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 2 May 2019 12:46:37 +0200
Subject: [PATCH 49/62] fixed previous merge conflict mistakes

---
 .../bugageocaching/controller/Controller.java | 171 +++++++++++++++++-
 .../repositories/UserRepository.java          |   2 +-
 .../labsw/bugageocaching/util/FinderUtil.java |  26 ++-
 3 files changed, 187 insertions(+), 12 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 2c6dc5b..0a61704 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -48,6 +48,9 @@ public class Controller {
   @Autowired
   User_InfoRepository user_infoRepository;
 
+  @Autowired
+  TeamInviteRepository teamInviteRepository;
+
   @PostConstruct
   public void init() {
     fetchPublicKey();
@@ -543,7 +546,7 @@ public class Controller {
 
     user_infoRepository.save(user_info);
 
-    return ResponseEntity.status(200).body(team);
+    return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
@@ -606,6 +609,172 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/sendTeamInvite")
+  @ResponseBody
+  public ResponseEntity sendTeamInvite(@RequestParam String token,
+                                       @RequestParam String invitedUserEmail) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    // get InvitedUser
+
+    User invitedUser = userRepository.findByEmail(invitedUserEmail);
+
+    if (invitedUser == null) {
+      return ResponseEntity.status(404).body("There isnt any user with that email");
+    }
+    //----------------------
+
+
+    //Get User_Info
+    User_Info user_info =  user_infoRepository.findUser_InfoByUser(user);
+    //----------------------
+    if (user_info.getTeam() == null) {
+      return ResponseEntity.status(400).body("You aren´t in any team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+
+    if (teamInviteRepository.findByUserAndTeam(invitedUser, team) != null) {
+      return ResponseEntity.status(400).body("The user is already invited to this team");
+    }
+
+    TeamInvite teamInvite = new TeamInvite();
+    teamInvite.setUser(invitedUser);
+    teamInvite.setTeam(team);
+
+    teamInviteRepository.save(teamInvite);
+
+    return ResponseEntity.status(200).body("OK");
+  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getMyTeamInvites")
+  @ResponseBody
+  public ResponseEntity getMyTeamInvites(@RequestParam String token) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    List<TeamInvite> teamInvitesList = new ArrayList<>();
+
+    for (TeamInvite teamInvite : teamInviteRepository.findAll()) {
+      if (teamInvite.getUser() == user) {
+        teamInvitesList.add(teamInvite);
+      }
+    }
+
+    return ResponseEntity.status(200).body(new Gson().toJson(teamInvitesList));
+  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/deleteTeamInvite")
+  @ResponseBody
+  public ResponseEntity deleteTeamInvite(@RequestParam String token,
+                                         @RequestParam String teamInviteID) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    // get teaminvite
+    ResponseEntity getTeamInvite = FinderUtil.findTeamInviteByID(teamInviteID);
+
+    if (getTeamInvite.getStatusCodeValue() != 200) {
+      return getTeamInvite;
+    }
+
+    TeamInvite teamInvite = (TeamInvite) getTeamInvite.getBody();
+
+    teamInviteRepository.delete(teamInvite);
+
+    return ResponseEntity.status(200).body("OK");
+  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/setTeamStatus")
+  @ResponseBody
+  public ResponseEntity setTeamStatus(@RequestParam String token,
+                                      @RequestParam String teamStatus) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    //Get User_Info
+    User_Info user_info =  user_infoRepository.findUser_InfoByUser(user);
+    //----------------------
+    if (user_info.getTeam() == null) {
+      return ResponseEntity.status(400).body("You aren´t in any team");
+    }
+
+    //Get team
+    ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId()));
+
+    if (getTeam.getStatusCodeValue() != 200) {
+      return getTeam;
+    }
+
+    Team team = (Team) getTeam.getBody();
+    team.setTeamStatus(teamStatus);
+
+    teamRepository.save(team);
+
+    return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
+  }
+
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getCurrentStation")
   @ResponseBody
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index 8d1bab7..d8784ec 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -7,7 +7,7 @@ import org.springframework.data.repository.CrudRepository;
 import java.util.List;
 
 public interface UserRepository extends CrudRepository<User, Integer> {
-  User findByUsername(String username);
+  User findByEmail(String email);
 
   @Query(value = "SELECT DISTINCT u.id AS ID, SUBSTRING_INDEX(u.email, '@', 1) AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" +
       "FROM user u,\n" +
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 06fce97..83b8765 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -32,6 +32,8 @@ public class FinderUtil {
 
   static User_InfoRepository user_infoRepository;
 
+  static TeamInviteRepository teamInviteRepository;
+
 
   @Autowired
   public void setCacheRepository(CacheRepository cacheRepository) {
@@ -73,6 +75,11 @@ public class FinderUtil {
     FinderUtil.user_infoRepository = user_infoRepository;
   }
 
+  @Autowired
+  public void setTeamInviteRepository(TeamInviteRepository teamInviteRepository) {
+    FinderUtil.teamInviteRepository = teamInviteRepository;
+  }
+
 
   public static ResponseEntity findCacheById(String cacheID) {
 
@@ -105,16 +112,6 @@ public class FinderUtil {
     return ResponseEntity.status(404).body("The user has not started this cache yet");
   }
 
-  public static ResponseEntity findUserByUsername(String username) {
-
-    User user = userRepository.findByUsername(username);
-    if (user != null) {
-      return ResponseEntity.status(200).body(user);
-    }
-
-    return ResponseEntity.status(404).body("Couldnt find user with username " + username);
-  }
-
   public static ResponseEntity findCacheAccesDefinitionById(String cacheAccesDefinitionID) {
     Optional<CacheAccesDefinition> cacheAccesDefinitionOptional = cacheAccesDefinitionRepository.findById(Integer.valueOf(cacheAccesDefinitionID));
     if (cacheAccesDefinitionOptional.isPresent()) {
@@ -153,4 +150,13 @@ public class FinderUtil {
     }
   }
 
+  public static ResponseEntity findTeamInviteByID(String teamInviteID) {
+    Optional<TeamInvite> teamInviteOptional = teamInviteRepository.findById(Integer.valueOf(teamInviteID));
+    if (teamInviteOptional.isPresent()) {
+      return ResponseEntity.status(200).body(teamInviteOptional.get());
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find User_Info " + teamInviteID);
+    }
+  }
+
 }

From 2c1f40bc5f5e0f40054d5d021fd75ad236ad09b4 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 2 May 2019 12:57:06 +0200
Subject: [PATCH 50/62] fixed more previous merge mistakes...

---
 .../bugageocaching/controller/Controller.java | 14 +++++++++
 .../labsw/bugageocaching/util/FinderUtil.java | 30 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 0a61704..667589c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -775,6 +775,20 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getTeam")
+  public ResponseEntity getTeam(@RequestParam String name){
+    ResponseEntity responseEntity = FinderUtil.findTeamByName(name);
+
+    return responseEntity;
+  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getTeamMembers")
+  public ResponseEntity getTeamMembers(@RequestParam String name){
+    return FinderUtil.findTeammemberByTeamName(name);
+  }
+
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getCurrentStation")
   @ResponseBody
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
index 83b8765..4fc883c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -159,4 +160,33 @@ public class FinderUtil {
     }
   }
 
+  public static ResponseEntity findTeamByName(String name) {
+
+    Team team = teamRepository.findByName(name);
+    if (team != null) {
+      return ResponseEntity.status(200).body(team);
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find Team with name " + name);
+    }
+  }
+
+  public static ResponseEntity findTeammemberByTeamName(String name) {
+
+    List<Object[]> list = teamRepository.getTeammembers(name);
+    if (list != null) {
+
+      List<User> sendBack = new LinkedList<>();
+
+      for (Object[] obj :
+          list) {
+        User tmp = new User();
+        tmp.setUsername((String) obj[3]);
+        sendBack.add(tmp);
+      }
+
+      return ResponseEntity.status(200).body(sendBack);
+    } else {
+      return ResponseEntity.status(404).body("Couldnt find Team member of Team " + name);
+    }
+  }
 }

From a5c630d0d53e2b8f2d7169023169b8568fe4d620 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 2 May 2019 13:27:36 +0200
Subject: [PATCH 51/62] more merge fixes...

---
 .../bugageocaching/controller/Controller.java | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 667589c..0afc9c5 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -792,7 +792,8 @@ public class Controller {
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getCurrentStation")
   @ResponseBody
-  public ResponseEntity getStationFromUserAndCache(@RequestParam String token, @RequestParam String cacheID){
+  public ResponseEntity getStationFromUserAndCache(@RequestParam String token,
+                                                   @RequestParam String cacheID){
 
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
@@ -826,6 +827,31 @@ public class Controller {
     return ResponseEntity.status(200).body(bearbeitetRepository.findByUserAndCache(user, cache));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getRankingPlace")
+  public ResponseEntity getRankingPlace(@RequestParam String token){
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
+  }
+
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {

From 742d2b5d66d937c93d00d8f353fadcdb67b9c1f5 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Thu, 2 May 2019 19:31:16 +0200
Subject: [PATCH 52/62] Startes Swagger Documentation

---
 build.gradle                                     |  8 ++++++--
 frontend/src/pages/Login.vue                     |  4 ++--
 .../hhn/labsw/bugageocaching/Application.java    | 16 ++++++++++++++++
 .../bugageocaching/controller/Controller.java    |  2 +-
 .../bugageocaching/util/VerificationUtil.java    |  2 +-
 src/main/resources/application.properties        |  3 ++-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1cfe7a..52be867 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'idea'
 apply plugin: 'com.moowork.node'
-apply plugin: 'war'
+//apply plugin: 'war'
 
 group = 'de.hhn.labsw'
 version = '0.0.1-SNAPSHOT'
@@ -47,13 +47,17 @@ dependencies {
     compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE'
     //compile group: 'at.favre.lib', name: 'bcrypt', version: '{latest-version}'
 
-    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+    //providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 
     //JWT
     compile 'io.jsonwebtoken:jjwt-api:0.10.5'
     runtime 'io.jsonwebtoken:jjwt-impl:0.10.5',
             'io.jsonwebtoken:jjwt-jackson:0.10.5'
 
+    compile "io.springfox:springfox-swagger2:2.9.2"
+
+    compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.0.2'
+
 }
 
 node {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index bd7c0d1..56efa31 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -61,8 +61,8 @@
       return {
         loading: false,
         user: {
-          email: "volkmann@geocaching.de",
-          password: "0123456789",
+          email: "",
+          password: "",
           //token: "",
           // evalAuthentication: false
         },
diff --git a/src/main/java/hhn/labsw/bugageocaching/Application.java b/src/main/java/hhn/labsw/bugageocaching/Application.java
index 75f1fb0..3fb3f66 100644
--- a/src/main/java/hhn/labsw/bugageocaching/Application.java
+++ b/src/main/java/hhn/labsw/bugageocaching/Application.java
@@ -6,8 +6,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
+@EnableSwagger2
 public class Application extends SpringBootServletInitializer{
 
   @Override
@@ -18,4 +25,13 @@ public class Application extends SpringBootServletInitializer{
   public static void main(String[] args) {
     SpringApplication.run(Application.class, args);
   }
+
+  @Bean
+  public Docket swagger(){
+    return new Docket(DocumentationType.SWAGGER_2)
+        .select()
+        .apis(RequestHandlerSelectors.any())
+        .paths(PathSelectors.any())
+        .build();
+  }
 }
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 2c6dc5b..330a68e 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -54,7 +54,7 @@ public class Controller {
   }
 
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/allCaches")
+  @RequestMapping(value = "/api/allCaches", method = RequestMethod.GET)
   @ResponseBody
   public ResponseEntity getAllCaches() {
     return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll()));
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
index b29ae41..4fac803 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
@@ -20,7 +20,7 @@ public class VerificationUtil {
   public static void fetchPublicKey() {
     RestTemplate restTemplate = new RestTemplate();
     try {
-      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:8090/buga19usermanagement/token/publickey", PublicKey.class);
+      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:9080/buga19usermanagement/token/publickey", PublicKey.class);
       byte[] decodedKey = Base64.getDecoder().decode(response.getMessage());
       KeyFactory factory = KeyFactory.getInstance("RSA");
       X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(decodedKey);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 87fb0b7..6dee0a4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,4 +5,5 @@ spring.jmx.default-domain=buga19geocaching
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.jooq.sql-dialect=org.hibernate.dialect.MariaDBDialect
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
\ No newline at end of file
+spring.jpa.show-sql=true
+debug=true
\ No newline at end of file

From 5c5adebbc43b086b20d8a799706603d0014c9d62 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Thu, 2 May 2019 19:55:39 +0200
Subject: [PATCH 53/62] Started Swagger Documentation

---
 .../labsw/bugageocaching/controller/Controller.java   |  7 +++++--
 .../java/hhn/labsw/bugageocaching/entities/Cache.java | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 3b6099d..af8bdb1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -8,6 +8,7 @@ import hhn.labsw.bugageocaching.repositories.*;
 import hhn.labsw.bugageocaching.util.FinderUtil;
 import hhn.labsw.bugageocaching.util.VerificationUtil;
 import io.jsonwebtoken.Claims;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -56,16 +57,18 @@ public class Controller {
     fetchPublicKey();
   }
 
+  @ApiOperation(value = "Retrieves all Caches, including their Stations, from the Database")
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping(value = "/api/allCaches", method = RequestMethod.GET)
+  @RequestMapping(value = "/api/allCaches", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getAllCaches() {
     return ResponseEntity.status(200).body(new Gson().toJson(cacheRepository.findAll()));
   }
 
 
+  @ApiOperation(value = "Starts the given Cache for the given User")
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/startCache")
+  @RequestMapping(value = "/api/startCache", method = RequestMethod.POST, produces = "application/json")
   @ResponseBody
   public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
                                    @RequestParam String cacheID) {
diff --git a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
index 81166b6..013e1b8 100644
--- a/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
+++ b/src/main/java/hhn/labsw/bugageocaching/entities/Cache.java
@@ -1,6 +1,9 @@
 package hhn.labsw.bugageocaching.entities;
 
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,15 +14,23 @@ public class Cache {
 
   @Id
   @GeneratedValue
+  @ApiModelProperty(notes = "The autogenerated CacheID (Primary Key)")
   private int id;
 
+  @ApiModelProperty(notes = "The name of the Cache")
   private String name;
+
+  @ApiModelProperty(notes = "The Description of the Cache")
   private String description;
+
+  @ApiModelProperty(notes = "The number of ranking points the user gets fro completing the cache")
   private int rankingPoints;
 
   @OneToMany
+  @ApiModelProperty(notes = "All stations included in the Cache")
   private List<Station> stationen = new ArrayList<>();
 
+  @ApiModelProperty(notes = "The Reward for the Cache")
   @ManyToOne (cascade = {CascadeType.ALL})
   private Reward reward;
 

From d92d43e63e817f44b85d459767655638340ac284 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Thu, 2 May 2019 20:31:13 +0200
Subject: [PATCH 54/62] More Swagger Doku

---
 .../hhn/labsw/bugageocaching/Application.java |  2 +-
 .../bugageocaching/controller/Controller.java | 83 ++++++++++++++++---
 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/Application.java b/src/main/java/hhn/labsw/bugageocaching/Application.java
index 3fb3f66..f835849 100644
--- a/src/main/java/hhn/labsw/bugageocaching/Application.java
+++ b/src/main/java/hhn/labsw/bugageocaching/Application.java
@@ -28,7 +28,7 @@ public class Application extends SpringBootServletInitializer{
 
   @Bean
   public Docket swagger(){
-    return new Docket(DocumentationType.SWAGGER_2)
+    return new Docket(DocumentationType.SWAGGER_2).useDefaultResponseMessages(false)
         .select()
         .apis(RequestHandlerSelectors.any())
         .paths(PathSelectors.any())
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index af8bdb1..5cbb663 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -8,7 +8,10 @@ import hhn.labsw.bugageocaching.repositories.*;
 import hhn.labsw.bugageocaching.util.FinderUtil;
 import hhn.labsw.bugageocaching.util.VerificationUtil;
 import io.jsonwebtoken.Claims;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -68,6 +71,11 @@ public class Controller {
 
   @ApiOperation(value = "Starts the given Cache for the given User")
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @RequestMapping(value = "/api/startCache", method = RequestMethod.POST, produces = "application/json")
   @ResponseBody
   public ResponseEntity startCache(@RequestParam(value = "token", defaultValue = "-1") String token,
@@ -149,8 +157,15 @@ public class Controller {
     }
   }
 
+  @ApiOperation(value = "Checks if the given Station is the correct next Station in the Cache")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 400, message = "Given Station is NOT the correct following station"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/checkStation")
+  @RequestMapping(value = "/api/checkStation", method = RequestMethod.PUT, produces = "application/json")
   @ResponseBody
   public ResponseEntity checkStation(@RequestParam String token,
                                      @RequestParam String cacheID,
@@ -297,15 +312,26 @@ public class Controller {
 
   }
 
+  @ApiOperation(value = "Creates a new Cache")
+  @ApiResponses(value = {
+      @ApiResponse(code = 400, message = "Something wrong with the given Parameters")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/createCache")
+  @RequestMapping(value = "/api/createCache", method = RequestMethod.POST, produces = "application/json")
   @ResponseBody
   public ResponseEntity createCache(@RequestBody Cache cache) {
     return createCacheUtil(cache);
   }
 
+  @ApiOperation(value = "Checks if the given User has an admin role")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/checkAdmin")
+  @RequestMapping(value = "/api/checkAdmin", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity checkAdmin(@RequestParam String token) {
 
@@ -335,23 +361,36 @@ public class Controller {
     return ResponseEntity.status(401).body(false);
   }
 
+  @ApiOperation(value = "Returns all Stations")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getAllStations")
+  @RequestMapping(value = "/api/getAllStations", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getAllStations() {
     return ResponseEntity.status(200).body(new Gson().toJson(stationRepository.findAll()));
   }
 
+  @ApiOperation(value = "Deletes a Cache")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/deleteCache")
+  @RequestMapping(value = "/api/deleteCache", method = RequestMethod.DELETE, produces = "application/json")
   @ResponseBody
   public ResponseEntity deleteCache(@RequestParam String cacheID) {
     return deleteCacheUtil(cacheID);
   }
 
-
+  @ApiOperation(value = "Returns all Caches finished/started by a given User")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getMyCaches")
+  @RequestMapping(value = "/api/getMyCaches", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getMyCaches(@RequestParam String token) {
 
@@ -386,8 +425,12 @@ public class Controller {
     }
   }
 
+  @ApiOperation(value = "Returns the rankinglist")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getRankingList")
+  @RequestMapping(value = "/api/getRankingList", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getRankingList() {
 
@@ -401,8 +444,12 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers));
   }
 
+  @ApiOperation(value = "Returns the Team Rankinglist")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getTeamRankingList")
+  @RequestMapping(value = "/api/getTeamRankingList", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getTeamRankingList() {
 
@@ -416,8 +463,14 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(sendBackTeams));
   }
 
+  @ApiOperation(value = "Returns a user from a given token")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getUser")
+  @RequestMapping(value = "/api/getUser", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getUser(@RequestParam String token) {
 
@@ -444,8 +497,14 @@ public class Controller {
     }
   }
 
+  @ApiOperation(value = "Creates a new Team")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/createTeam")
+  @RequestMapping(value = "/api/createTeam", method = RequestMethod.POST, produces = "application/json")
   @ResponseBody
   public ResponseEntity createTeam(@RequestParam String token,
                                    @RequestParam String name) {
@@ -491,6 +550,8 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
+  //---------
+
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/joinTeam")
   @ResponseBody

From e78157e2f5c3b897eb65a6038ccee004bd75bbb7 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Fri, 3 May 2019 17:06:32 +0200
Subject: [PATCH 55/62] More documentation

---
 .../bugageocaching/controller/Controller.java | 85 ++++++++++++++++---
 1 file changed, 73 insertions(+), 12 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 5cbb663..612c5e7 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -551,9 +551,14 @@ public class Controller {
   }
 
   //---------
-
+  @ApiOperation(value = "Lets the user join a Team")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/joinTeam")
+  @RequestMapping(value = "/api/joinTeam", method = RequestMethod.PUT, produces = "application/json")
   @ResponseBody
   public ResponseEntity joinTeam(@RequestParam String token,
                                  @RequestParam String teamID) {
@@ -613,8 +618,14 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(team));
   }
 
+  @ApiOperation(value = "Removes the user from the Team")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/leaveTeam")
+  @RequestMapping(value = "/api/leaveTeam", method = RequestMethod.PUT, produces = "application/json")
   @ResponseBody
   public ResponseEntity leaveTeam(@RequestParam String token) {
 
@@ -673,8 +684,14 @@ public class Controller {
     return ResponseEntity.status(200).body("Ok");
   }
 
+  @ApiOperation(value = "Sends a Team Invite to the invitedUserEmail from the User (token)")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/sendTeamInvite")
+  @RequestMapping(value = "/api/sendTeamInvite", method = RequestMethod.POST, produces = "application/json")
   @ResponseBody
   public ResponseEntity sendTeamInvite(@RequestParam String token,
                                        @RequestParam String invitedUserEmail) {
@@ -735,8 +752,14 @@ public class Controller {
     return ResponseEntity.status(200).body("OK");
   }
 
+  @ApiOperation(value = "Returns all User invites for a specific User")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/getMyTeamInvites")
+  @RequestMapping(value = "/api/getMyTeamInvites", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getMyTeamInvites(@RequestParam String token) {
     // verify user
@@ -768,8 +791,14 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(teamInvitesList));
   }
 
+  @ApiOperation(value = "Removes a team invite from a user (called if a user declined a team invite)")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/deleteTeamInvite")
+  @RequestMapping(value = "/api/deleteTeamInvite", method = RequestMethod.DELETE, produces = "application/json")
   @ResponseBody
   public ResponseEntity deleteTeamInvite(@RequestParam String token,
                                          @RequestParam String teamInviteID) {
@@ -794,8 +823,14 @@ public class Controller {
     return ResponseEntity.status(200).body("OK");
   }
 
+  @ApiOperation(value = "Sets the team status")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/setTeamStatus")
+  @RequestMapping(value = "/api/setTeamStatus", method = RequestMethod.PUT, produces = "application/json")
   @ResponseBody
   public ResponseEntity setTeamStatus(@RequestParam String token,
                                       @RequestParam String teamStatus) {
@@ -839,22 +874,36 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(teamStatus));
   }
 
+  @ApiOperation(value = "Returns a team by a name")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/getTeam")
+  @RequestMapping(value = "/api/getTeam", method = RequestMethod.GET, produces = "application/json")
   public ResponseEntity getTeam(@RequestParam String name){
     ResponseEntity responseEntity = FinderUtil.findTeamByName(name);
 
     return responseEntity;
   }
 
+  @ApiOperation(value = "Returns all teammembers by the team name")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/getTeamMembers")
+  @RequestMapping(value = "/api/getTeamMembers", method = RequestMethod.GET, produces = "application/json")
   public ResponseEntity getTeamMembers(@RequestParam String name){
     return FinderUtil.findTeammemberByTeamName(name);
   }
 
+  @ApiOperation(value = "Returns the station the user is currently at (for a specific cache)")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/getCurrentStation")
+  @RequestMapping(value = "/api/getCurrentStation", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getStationFromUserAndCache(@RequestParam String token,
                                                    @RequestParam String cacheID){
@@ -891,8 +940,14 @@ public class Controller {
     return ResponseEntity.status(200).body(bearbeitetRepository.findByUserAndCache(user, cache));
   }
 
+  @ApiOperation(value = "Returns the ranking place on the leaderboard for a specific user")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping("/api/getRankingPlace")
+  @RequestMapping(value = "/api/getRankingPlace", method = RequestMethod.GET, produces = "application/json")
   public ResponseEntity getRankingPlace(@RequestParam String token){
 
     // verify user
@@ -916,8 +971,14 @@ public class Controller {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
   }
 
+  @ApiOperation(value = "Test method (Changes its purpose often)")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
-  @RequestMapping("/api/hello")
+  @RequestMapping(value = "/api/hello", method = RequestMethod.GET, produces = "application/json")
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
   }

From 3cc9fd5597ba55168e39f1f0b8db8abb8c4fbebf Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Fri, 3 May 2019 18:43:09 +0200
Subject: [PATCH 56/62] added StationPOI helper class

---
 .../bugageocaching/helper/StationPOI.java     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java

diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java b/src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java
new file mode 100644
index 0000000..6b2566b
--- /dev/null
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java
@@ -0,0 +1,41 @@
+package hhn.labsw.bugageocaching.helper;
+
+public class StationPOI {
+
+  private String Name;
+  private float Latitude;
+  private float Longitude;
+  private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation)
+
+  public String getName() {
+    return Name;
+  }
+
+  public void setName(String name) {
+    Name = name;
+  }
+
+  public float getLatitude() {
+    return Latitude;
+  }
+
+  public void setLatitude(float latitude) {
+    Latitude = latitude;
+  }
+
+  public float getLongitude() {
+    return Longitude;
+  }
+
+  public void setLongitude(float longitude) {
+    Longitude = longitude;
+  }
+
+  public int getCategoryID() {
+    return CategoryID;
+  }
+
+  public void setCategoryID(int categoryID) {
+    CategoryID = categoryID;
+  }
+}

From c86ce22d27538a81b96182c8378d556cd39415cb Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Fri, 3 May 2019 18:48:02 +0200
Subject: [PATCH 57/62] renamed the helper class

---
 .../hhn/labsw/bugageocaching/controller/Controller.java     | 6 ++++++
 .../bugageocaching/helper/{StationPOI.java => POI.java}     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename src/main/java/hhn/labsw/bugageocaching/helper/{StationPOI.java => POI.java} (96%)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 612c5e7..45cfefd 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -971,6 +971,12 @@ public class Controller {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+//  @RequestMapping(value = "/api/getRankingPlace", method = RequestMethod.GET, produces = "application/json")
+  public ResponseEntity getMyMap() {
+
+  }
+
   @ApiOperation(value = "Test method (Changes its purpose often)")
   @ApiResponses(value = {
       @ApiResponse(code = 404, message = "Database error"),
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
similarity index 96%
rename from src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java
rename to src/main/java/hhn/labsw/bugageocaching/helper/POI.java
index 6b2566b..1c1b908 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/StationPOI.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
@@ -1,6 +1,6 @@
 package hhn.labsw.bugageocaching.helper;
 
-public class StationPOI {
+public class POI {
 
   private String Name;
   private float Latitude;

From 6ca87f84fc0bbbd7aa5b0c431863cf9672b0e6a6 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Fri, 3 May 2019 19:10:03 +0200
Subject: [PATCH 58/62] implemented getStationPOIS

---
 .../bugageocaching/controller/Controller.java | 73 +++++++++++++++++--
 .../hhn/labsw/bugageocaching/helper/POI.java  |  7 ++
 2 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 45cfefd..c1e0bd2 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -2,6 +2,7 @@ package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
 import hhn.labsw.bugageocaching.entities.*;
+import hhn.labsw.bugageocaching.helper.POI;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
 import hhn.labsw.bugageocaching.helper.TeamRankingListHelper;
 import hhn.labsw.bugageocaching.repositories.*;
@@ -724,7 +725,7 @@ public class Controller {
 
 
     //Get User_Info
-    User_Info user_info =  user_infoRepository.findUser_InfoByUser(user);
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
     //----------------------
     if (user_info.getTeam() == null) {
       return ResponseEntity.status(400).body("You aren´t in any team");
@@ -853,7 +854,7 @@ public class Controller {
     User user = (User) getUser.getBody();
 
     //Get User_Info
-    User_Info user_info =  user_infoRepository.findUser_InfoByUser(user);
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
     //----------------------
     if (user_info.getTeam() == null) {
       return ResponseEntity.status(400).body("You aren´t in any team");
@@ -880,7 +881,7 @@ public class Controller {
   })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping(value = "/api/getTeam", method = RequestMethod.GET, produces = "application/json")
-  public ResponseEntity getTeam(@RequestParam String name){
+  public ResponseEntity getTeam(@RequestParam String name) {
     ResponseEntity responseEntity = FinderUtil.findTeamByName(name);
 
     return responseEntity;
@@ -892,7 +893,7 @@ public class Controller {
   })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping(value = "/api/getTeamMembers", method = RequestMethod.GET, produces = "application/json")
-  public ResponseEntity getTeamMembers(@RequestParam String name){
+  public ResponseEntity getTeamMembers(@RequestParam String name) {
     return FinderUtil.findTeammemberByTeamName(name);
   }
 
@@ -906,7 +907,7 @@ public class Controller {
   @RequestMapping(value = "/api/getCurrentStation", method = RequestMethod.GET, produces = "application/json")
   @ResponseBody
   public ResponseEntity getStationFromUserAndCache(@RequestParam String token,
-                                                   @RequestParam String cacheID){
+                                                   @RequestParam String cacheID) {
 
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
@@ -948,7 +949,7 @@ public class Controller {
   })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping(value = "/api/getRankingPlace", method = RequestMethod.GET, produces = "application/json")
-  public ResponseEntity getRankingPlace(@RequestParam String token){
+  public ResponseEntity getRankingPlace(@RequestParam String token) {
 
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
@@ -971,10 +972,66 @@ public class Controller {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
   }
 
+  @ApiOperation(value = "Returns startstations and all other stations he user already visited as POIS")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-//  @RequestMapping(value = "/api/getRankingPlace", method = RequestMethod.GET, produces = "application/json")
-  public ResponseEntity getMyMap() {
+  @RequestMapping(value = "/api/getStationPOIS", method = RequestMethod.GET, produces = "application/json")
+  public ResponseEntity getStationPOIS(@RequestParam String token) {
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
 
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+    //
+
+    ArrayList<POI> poisList = new ArrayList<>();
+    for (Cache cache : cacheRepository.findAll()) {
+      Station station = cache.getStationen().get(0);
+      POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 0);
+      poisList.add(poi);
+    }
+
+    for (Bearbeitet bearbeitet : bearbeitetRepository.findAll()) {
+      if (bearbeitet.getUser() == user) {
+        Cache cache = bearbeitet.getCache();
+        Station aktuelleStation = bearbeitet.getAktuelleStation();
+        int index = cache.getStationen().indexOf(aktuelleStation);
+        for (int i = 1; i <= index; i++) {
+          Station station = cache.getStationen().get(i);
+          int categoryID;
+          if (i < cache.getStationen().size() - 1) { // isnt endstation
+            categoryID = 1;
+          } else { // is endstation
+            categoryID = 2;
+          }
+          POI poi = new POI(cache.getName() + "_Station" + (i + 1), (float) station.getLattitude(), (float) station.getLongitude(), categoryID);
+          poisList.add(poi);
+        }
+      }
+    }
+
+    POI[] pois = new POI[poisList.size()];
+    for (int i = 0; i < poisList.size(); i++) {
+      pois[i] = poisList.get(i);
+    }
+
+    return ResponseEntity.status(200).body(new Gson().toJson(pois));
   }
 
   @ApiOperation(value = "Test method (Changes its purpose often)")
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
index 1c1b908..2bb91c7 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
@@ -7,6 +7,13 @@ public class POI {
   private float Longitude;
   private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation)
 
+  public POI(String name, float latitude, float longitude, int categoryID) {
+    Name = name;
+    Latitude = latitude;
+    Longitude = longitude;
+    CategoryID = categoryID;
+  }
+
   public String getName() {
     return Name;
   }

From ed3fb3ff0edc8959e04e14f82d293af398818dad Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Fri, 3 May 2019 19:13:21 +0200
Subject: [PATCH 59/62] renamed to getMyStationPOIS

---
 .../java/hhn/labsw/bugageocaching/controller/Controller.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index c1e0bd2..de86d5d 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -979,8 +979,8 @@ public class Controller {
       @ApiResponse(code = 400, message = "Something went wrong at verification")
   })
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
-  @RequestMapping(value = "/api/getStationPOIS", method = RequestMethod.GET, produces = "application/json")
-  public ResponseEntity getStationPOIS(@RequestParam String token) {
+  @RequestMapping(value = "/api/getMyStationPOIS", method = RequestMethod.GET, produces = "application/json")
+  public ResponseEntity getMyStationPOIS(@RequestParam String token) {
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
 

From 68098b1fffdd7c10c5fc88923747df1758fa55c4 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Fri, 3 May 2019 19:18:47 +0200
Subject: [PATCH 60/62] fixed a spelling mistake

---
 .../java/hhn/labsw/bugageocaching/controller/Controller.java  | 4 +++-
 src/main/java/hhn/labsw/bugageocaching/helper/POI.java        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index de86d5d..fe2525c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -972,7 +972,7 @@ public class Controller {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
   }
 
-  @ApiOperation(value = "Returns startstations and all other stations he user already visited as POIS")
+  @ApiOperation(value = "Returns startstations and all other stations the user already visited as POIS")
   @ApiResponses(value = {
       @ApiResponse(code = 404, message = "Database error"),
       @ApiResponse(code = 401, message = "JWT Token expired"),
@@ -1003,6 +1003,7 @@ public class Controller {
     ArrayList<POI> poisList = new ArrayList<>();
     for (Cache cache : cacheRepository.findAll()) {
       Station station = cache.getStationen().get(0);
+      // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
       POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 0);
       poisList.add(poi);
     }
@@ -1014,6 +1015,7 @@ public class Controller {
         int index = cache.getStationen().indexOf(aktuelleStation);
         for (int i = 1; i <= index; i++) {
           Station station = cache.getStationen().get(i);
+          // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
           int categoryID;
           if (i < cache.getStationen().size() - 1) { // isnt endstation
             categoryID = 1;
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
index 2bb91c7..d6a4051 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
@@ -5,6 +5,7 @@ public class POI {
   private String Name;
   private float Latitude;
   private float Longitude;
+  // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
   private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation)
 
   public POI(String name, float latitude, float longitude, int categoryID) {

From ef819e5e54cc0e6e59cb0abb7a0a33dc03a11042 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Mon, 6 May 2019 13:53:42 +0200
Subject: [PATCH 61/62] Usermanagement fixed

---
 .../java/hhn/labsw/bugageocaching/util/VerificationUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
index 4fac803..b29ae41 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
@@ -20,7 +20,7 @@ public class VerificationUtil {
   public static void fetchPublicKey() {
     RestTemplate restTemplate = new RestTemplate();
     try {
-      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:9080/buga19usermanagement/token/publickey", PublicKey.class);
+      PublicKey response = restTemplate.getForObject("http://seserver.se.hs-heilbronn.de:8090/buga19usermanagement/token/publickey", PublicKey.class);
       byte[] decodedKey = Base64.getDecoder().decode(response.getMessage());
       KeyFactory factory = KeyFactory.getInstance("RSA");
       X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(decodedKey);

From 51e87c239a2cec135acc405f8820a84feec4b0d3 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Mon, 6 May 2019 15:49:54 +0200
Subject: [PATCH 62/62] Added getTeamOfUser

---
 build.gradle                                  |  4 +--
 .../bugageocaching/controller/Controller.java | 34 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 52be867..841dd55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'idea'
 apply plugin: 'com.moowork.node'
-//apply plugin: 'war'
+apply plugin: 'war'
 
 group = 'de.hhn.labsw'
 version = '0.0.1-SNAPSHOT'
@@ -47,7 +47,7 @@ dependencies {
     compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE'
     //compile group: 'at.favre.lib', name: 'bcrypt', version: '{latest-version}'
 
-    //providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 
     //JWT
     compile 'io.jsonwebtoken:jjwt-api:0.10.5'
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index fe2525c..abd7b33 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -9,7 +9,6 @@ import hhn.labsw.bugageocaching.repositories.*;
 import hhn.labsw.bugageocaching.util.FinderUtil;
 import hhn.labsw.bugageocaching.util.VerificationUtil;
 import io.jsonwebtoken.Claims;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -1036,6 +1035,38 @@ public class Controller {
     return ResponseEntity.status(200).body(new Gson().toJson(pois));
   }
 
+  @ApiOperation(value = "Returns the Team of a user")
+  @ApiResponses(value = {
+      @ApiResponse(code = 404, message = "Database error"),
+      @ApiResponse(code = 401, message = "JWT Token expired"),
+      @ApiResponse(code = 400, message = "Something went wrong at verification")
+  })
+  @RequestMapping(value = "/api/getTeamOfUser", method = RequestMethod.GET, produces = "application/json")
+  public ResponseEntity getTeamOfUser(@RequestParam String token){
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    User_Info user_info = user_infoRepository.findUser_InfoByUser(user);
+
+    return ResponseEntity.status(200).body(user_info.getTeam());
+  }
+
   @ApiOperation(value = "Test method (Changes its purpose often)")
   @ApiResponses(value = {
       @ApiResponse(code = 404, message = "Database error"),
@@ -1047,6 +1078,7 @@ public class Controller {
   public ResponseEntity hello(@RequestParam String name) {
     return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name));
   }
+
 }