diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index 3a6bafb..386706e 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -25,38 +25,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{'Nächste Aufgabe: ' + startedCache.aktuelleStation.description }}
+
+ {{'Ranglistenpunkte für diesen Cache: ' + startedCache.cache.rankingPoints}}
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Erhaltene Punkte für diesen Cache: ' + startedCache.cache.rankingPoints }}
+
+
+
+
+
+
+
@@ -77,10 +105,7 @@
export default {
data() {
return {
- tab: 'startedCaches',
- // hheight: 71.0,
- // fheight: 36.0, //37
- //header: {h: '0px', w: 0}
+ tab: 'startedCaches' + 'finishedCaches',
startedCaches: [],
}
},
@@ -92,45 +117,36 @@
}
},
created: function() {
- console.log("created(): " + this.startedCaches);
- this.fetchStartedCaches();
- // this.fetchFinishedCaches();
+ this.fetchUserCaches();
this.$store.commit('auth/SET_AUTHENTICATED');
this.$store.commit('auth/SET_USER');
},
methods: {
- fetchStartedCaches() {
- this.$axios.get('http://localhost:8080/api/getMyCaches')
+ fetchUserCaches: function() {
+ const token = JSON.parse(localStorage.getItem('userToken'));
+ this.$axios.get('http://localhost:8080/api/getMyCaches', { params: {token}} )
.then((response) => {
- console.log("Caches: " + this.startedCaches);
- this.startedCaches = response.data;
- })
+ this.startedCaches = response.data;
+ });
},
- // fetchFinishedCaches() {
- // this.$axios.get('http://localhost:8080/api/getMyCaches')
- // .then((response) => {
- // console.log("Caches: " + this.finishedCaches);
- // this.finishedCaches = response.data;
- // })
- // },
- // startCache(cacheID) {
- // const userToken = JSON.parse(localStorage.getItem('userToken'));
- // let params = {cacheID: cacheID};
- // if (userToken != null) {
- // params.token = userToken;
- // }
- // console.log(params);
- //
- // this.$axios.get('http://localhost:8080/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: `/station/${cacheID}/${stationID}`})
- // })
- // }
+ startCache(cacheID) {
+ const userToken = JSON.parse(localStorage.getItem('userToken'));
+ let params = {cacheID: cacheID};
+ if (userToken != null) {
+ params.token = userToken;
+ }
+ console.log(params);
+
+ this.$axios.get('http://localhost:8080/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: `/station/${cacheID}/${stationID}`})
+ })
+ }
}
}