diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue index d0abf78..d6efe52 100644 --- a/frontend/src/pages/Profile.vue +++ b/frontend/src/pages/Profile.vue @@ -107,12 +107,12 @@ class="" expand-icon-toggle expand-separator - icon="location_on" - :label="teamInvite.teamName" - caption="Tritt diesem Team bei" + icon="group" + :label="teamInvite.team.name" + :caption="teamInvite.team.teamStatus" > - @@ -407,14 +407,14 @@ }) }, joinTeam(inviteId) { - let params; + let params = {}; if (localStorage.getItem('userToken')) { params.token = JSON.parse(localStorage.getItem('userToken')).token; } else { return; } params.teamID = inviteId; - this.$axios.put('/api/joinTeam', {params: {params}}) + this.$axios.put('/api/joinTeam', null, {params}) .then((response) => { console.log(response.data); this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { @@ -427,21 +427,21 @@ }) }, deleteTeamInvite(inviteId) { - let params; + let params = {}; if (localStorage.getItem('userToken')) { params.token = JSON.parse(localStorage.getItem('userToken')).token; } else { return; } params.teamInviteID = inviteId; - this.$axios.delete('/api/deleteTeamInvite', {params: {params}}) + this.$axios.delete('/api/deleteTeamInvite', {params}) .then((response) => { - console.log(response.data); this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: "Du hast die Anfrage von Team " + response.data.teamName + " gelöscht!", title: "Teambeitrittsanfrage", color: "blue" }); + this.getTeamData(); }).catch((error) => { this.handleError(error); }) diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index 404948e..ccd2b3f 100644 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -81,7 +81,7 @@ }, computed: { validationSuccesful() { - if (this.user.name >= 2 + if (this.user.name.length >= 2 && this.validateEmail(this.user.email) && this.user.email === this.user.checkemail && this.user.password.length >= 8