diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index 19653a8..02412a4 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -109,8 +109,8 @@ 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:9443/buga19geocaching'),
+ API: JSON.stringify('http://localhost:8080'),
+ //API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'),
USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
}
: { // Base URL for API-Calls: PRODUCTION (build)
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index c8482d0..c711f26 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -58,7 +58,9 @@
Neues Team erstellen
- Neues Team erstellen
(Team verlassen um Option zu nutzen)
+ Neues Team erstellen
(Team verlassen um Option zu
+ nutzen)
+
@@ -76,7 +78,7 @@
/>
Einladungen
-
@@ -89,7 +91,7 @@
Teamstatus
{{currentTeamStatus}}
-
@@ -99,6 +101,17 @@
color="primary"
type="submit"/>
+
+
+
+
+
@@ -122,7 +135,7 @@
-
{
+ console.log("createTeam: " + response);
+ this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
+ message: "Dus hast das Team " + this.teamName + " verlassen!",
+ title: "Team verlassen",
+ color: "blue"
+ });
+ this.getTeamData();
+ }).catch((error) => {
+ this.handleError(error);
+ })
+ },
fetchTeamMembers() {
let name = this.teamName;
this.$axios.get('/api/getTeamMembers', {params: {name}})
.then((response) => {
console.log(response.data);
this.teamMembers = response.data;
+ for (var i = 0; i < this.teamMembers.length; i++) {
+ let member = {};
+ member.name = this.teamMembers[i].username;
+ member.email = this.teamMembers[i].email;
+ this.getMemberRanking(member, member.email);
+ this.teamData.push(member);
+ }
}).catch((error) => {
this.handleError(error);
})
},
+ getMemberRanking(member, email) {
+ let ranking;
+ this.$axios.get('/api/getRankingPlace', {params: {email}})
+ .then((response) => {
+ ranking = response.data;
+ member.ranking = ranking;
+ }).catch((error) => {
+ this.handleError(error);
+ });
+ },
fetchTeamInvites() {
let token;
if (localStorage.getItem('userToken')) {
@@ -422,6 +468,7 @@
title: "Teambeitrittsanfrage",
color: "blue"
});
+ this.getTeamData();
}).catch((error) => {
this.handleError(error);
})