From 7512c2e49e07bafa491a9332f0d589d259d60510 Mon Sep 17 00:00:00 2001
From: Katharina Will <kwill@stud.hs-heilbronn.de>
Date: Tue, 7 May 2019 14:36:43 +0200
Subject: [PATCH 1/4] Added map to CacheStart view

---
 frontend/src/pages/CacheStart.vue | 19 ++++++++++-----
 frontend/src/pages/ranking.vue    | 40 +++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 9c525c3..869b874 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <q-img transition="fade"
+    <iframe transition="fade"
            class="q-mb-md "
-           :ratio="16/9"
-           src="https://www.buga2019.de/we-bilder/3.Gartenausstellung/Gelaendeplan/190320_Gelaendeplan-quadratisch.jpg"
-    ></q-img>
+           height= "200px"
+           width= "100%"
+           :src= "iFrameURL" frameborder="0"></iframe>
     <div class="q-ma-md">
       <p class="text-h4">{{ cacheName }}</p>
       <p>{{ instruction }}</p>
@@ -55,7 +55,11 @@
         paused: false,
         result: null,
         params: null,
-        noStreamApiSupport: false
+        noStreamApiSupport: false,
+        lon: "",
+        lat: "",
+        stationID: [],
+        iFrameURL: ""
 
       }
     },
@@ -71,9 +75,12 @@
             const cache = response.data.find(cache => cache.id === Number(this.$route.params.cache));
             this.cacheName = cache.name;
             this.cacheID = this.$route.params.cache;
+            this.stationID = cache.stationen[0];
+            this.lon = this.stationID.longitude;
+            this.lat = this.stationID.lattitude;
+            this.iFrameURL = `http://www.se.hs-heilbronn.de:3000/api/map/lon=${this.lon}&lat=${this.lat}`
           })
       },
-
       checkStation() {
         let params = this.setParams();
         console.log(params);
diff --git a/frontend/src/pages/ranking.vue b/frontend/src/pages/ranking.vue
index 04b5acb..d4328eb 100644
--- a/frontend/src/pages/ranking.vue
+++ b/frontend/src/pages/ranking.vue
@@ -36,13 +36,13 @@
 
         <q-tab-panel name="team" class=" fit">
           <q-list>
-            <q-card class="q-mb-md">
+            <q-card class="q-mb-md" v-for="(team,index) in teamRankinglist" :key="team.id">
               <q-item class="q-pr-sm ">
                 <q-item-section>
-                  <q-item-label>Single line item</q-item-label>
+                  <q-item-label><a class="text-black" style="text-decoration: none"><span>{{index+1}}. {{team.name}}</span></a></q-item-label>
                 </q-item-section>
                 <q-item-section side>
-                  <span class="text-grey"> Punkte </span>
+                  <span class="text-grey">{{team.ranking_points}} Punkte </span>
                 </q-item-section>
               </q-item>
             </q-card>
@@ -68,12 +68,15 @@
     data() {
       return {
         tab: 'solo',
-        rankinglist: []
+        rankinglist: [],
+        teamRankinglist: []
       }
     },
     created: function() {
       console.log("created(): " + this.rankinglist);
+      console.log("created(): " + this.teamRankinglist);
       this.fetchRankinglist();
+      this.fetchTeamRankinglist();
     },
     methods: {
       fetchRankinglist() {
@@ -104,6 +107,35 @@
           console.log(error.config);
           this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
         })
+      },
+      fetchTeamRankinglist() {
+        this.$axios.get('/api/getTeamRankingList')
+          .then((response) => {
+            console.log("Team-Rankinglist: ");
+            console.log(response.data);
+            this.teamRankinglist = 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, });
+        })
       }
     }
 }

From 2e315c61257dece9e94d32e1855cb050f1d78427 Mon Sep 17 00:00:00 2001
From: Katharina Will <kwill@stud.hs-heilbronn.de>
Date: Wed, 8 May 2019 20:14:37 +0200
Subject: [PATCH 2/4] Started implementation of map view in Overview

---
 frontend/src/pages/Overview.vue | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 22575e3..3df177f 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -91,6 +91,8 @@
       return {
         tab: 'list',
         caches: [],
+        stations: [],
+        pois: []
       }
     },
     mounted: function () {
@@ -114,8 +116,19 @@
       fetchAllCaches() {
         this.$axios.get('/api/allCaches')
           .then((response) => {
-            console.log("Caches: " + this.caches);
             this.caches = response.data;
+            for(let cache in this.caches) {
+
+              this.stations[cache]=(this.caches[cache].stationen[0]);
+              const poiItem = {
+                Name: this.caches[cache].name,
+                CategoryID: 3,
+                Latitude: this.stations[cache].lattitude,
+                Longitude: this.stations[cache].longitude
+              };
+              this.pois.push(poiItem);
+            }
+            this.initMap();
           }).catch((error) => {
           let message;
           let header = "Fehler: ";
@@ -144,9 +157,23 @@
       },
       editCache() {
       },
+      initMap(){
+        console.log("Signalwort: " + this.pois);
+      //   this.$axios.post('http://seserver.se.hs-heilbronn.de:3000/api/map', {
+      //     body: this.pois
+      //   }).then((response)=>{
+      //     console.log(response)
+      //   })
+      // },
+        this.$axios.get('http://www.se.hs-heilbronn.de:3000/api/map/lon=9&lat=49', {
+          body: this.pois
+        }).then((response)=>{
+          console.log(response)
+        })
+      },
       deleteCache(id) {
         console.log('delete cache: ' + id);
-        this.$axios.get('/api/deleteCache', {params: {cacheID: id}})
+        axios.get('/api/deleteCache', {params: {cacheID: id}})
           .then((response) => {
             this.fetchAllCaches()
           }).catch((error) => {

From 20bf3bfd51f91ca27496c687d866cbeb572161af Mon Sep 17 00:00:00 2001
From: Katharina Will <kwill@stud.hs-heilbronn.de>
Date: Wed, 8 May 2019 20:39:36 +0200
Subject: [PATCH 3/4] Applied final changes to team rankinglist view

---
 frontend/src/pages/CacheStart.vue | 4 ++--
 frontend/src/pages/ranking.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 8c23d33..2973271 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -35,7 +35,6 @@
         validating: false,
         loading: false,
         paused: false,
-        result: null,
         params: null,
         noStreamApiSupport: false,
         lon: "",
@@ -90,7 +89,8 @@
           params.token = JSON.parse(localStorage.getItem('userToken')).token;
         }
         return params;
-      }
+      },
+
       updateResult(event) {
         console.log("updateResult()");
         console.log(event);
diff --git a/frontend/src/pages/ranking.vue b/frontend/src/pages/ranking.vue
index d4328eb..aac2964 100644
--- a/frontend/src/pages/ranking.vue
+++ b/frontend/src/pages/ranking.vue
@@ -39,10 +39,10 @@
             <q-card class="q-mb-md" v-for="(team,index) in teamRankinglist" :key="team.id">
               <q-item class="q-pr-sm ">
                 <q-item-section>
-                  <q-item-label><a class="text-black" style="text-decoration: none"><span>{{index+1}}. {{team.name}}</span></a></q-item-label>
+                  <q-item-label><a class="text-black" style="text-decoration: none"><span>{{index+1}}. {{team.teamname}}</span></a></q-item-label>
                 </q-item-section>
                 <q-item-section side>
-                  <span class="text-grey">{{team.ranking_points}} Punkte </span>
+                  <span class="text-grey">{{team.rankingPointsSum}} Punkte </span>
                 </q-item-section>
               </q-item>
             </q-card>

From 525e705bf9d4c18d33a4419dd32523ddf1baa0bf Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Thu, 9 May 2019 13:06:41 +0200
Subject: [PATCH 4/4] Fixed Create Team

---
 build.gradle                                                 | 3 +++
 frontend/quasar.conf.js                                      | 4 ++--
 .../java/hhn/labsw/bugageocaching/controller/Controller.java | 4 +++-
 .../java/hhn/labsw/bugageocaching/util/VerificationUtil.java | 5 ++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 841dd55..e2a06be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,6 +58,9 @@ dependencies {
 
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.0.2'
 
+    // https://mvnrepository.com/artifact/com.mashape.unirest/unirest-java
+    compile group: 'com.mashape.unirest', name: 'unirest-java', version: '1.3.1'
+
 }
 
 node {
diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 4df0238..7e353ec 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -111,12 +111,12 @@ module.exports = function (ctx) {
         ? { // Base URL for API-Calls: DEV
           API: JSON.stringify('http://localhost:8080'),
           // API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
-          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
           API: JSON.stringify('http://localhost:8080'),
           //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19geocaching'),
-          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:8443/buga19usermanagement')
+          USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
         }
     },
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 7a6ea22..1759ab0 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -1,6 +1,7 @@
 package hhn.labsw.bugageocaching.controller;
 
 import com.google.gson.Gson;
+import com.mashape.unirest.http.exceptions.UnirestException;
 import hhn.labsw.bugageocaching.entities.*;
 import hhn.labsw.bugageocaching.helper.POI;
 import hhn.labsw.bugageocaching.helper.RankingListHelper;
@@ -57,7 +58,7 @@ public class Controller {
   TeamInviteRepository teamInviteRepository;
 
   @PostConstruct
-  public void init() {
+  public void init(){
     fetchPublicKey();
   }
 
@@ -544,6 +545,7 @@ public class Controller {
 
     Team team = new Team();
     team.setName(name);
+    team.setTeamStatus("");
     teamRepository.save(team);
 
     user_info.setTeam(team);
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
index b29ae41..1ad5b5f 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
@@ -4,7 +4,6 @@ import hhn.labsw.bugageocaching.fetchObjects.PublicKey;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
@@ -17,10 +16,10 @@ public class VerificationUtil {
 
   public static Key publicKey;
 
-  public static void fetchPublicKey() {
+  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);