tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

korrekte fehlermeldung wird ausgegeben, falls eine falsche email eingegeebn wird

Browse Source
This commit is contained in:
Michael 2019-06-06 14:44:17 +02:00
parent 37d33ced80
commit 377a936d44
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
View File

@ -65,18 +65,6 @@
</q-expansion-item> </q-expansion-item>
</q-card> </q-card>
</q-list> </q-list>
<!--<div v-show="hasAdminState">-->
<!--<p class="text-h5 q-mt-sm"> Neuen Admin hinzufügen </p>-->
<!--<q-input lazy-rules outlined filled stack-label v-model="newAdminMail"-->
<!--type="text" label="Email des Nutzers" class="col-9"-->
<!--:rules="[val=>validateEmail(val)||'Bitte Email verwenden']"/>-->
<!--<q-btn class="col-3"-->
<!--icon="arrow_right_alt"-->
<!--@click="getUser()"-->
<!--:disabled="!adminInviteChecked"-->
<!--color="positive"-->
<!--type="submit"/>-->
<!--</div>-->
</div> </div>
</q-tab-panel> </q-tab-panel>
<q-tab-panel v-if="boolAlreadyInTeam" name="teams" class="q-pa-none"> <q-tab-panel v-if="boolAlreadyInTeam" name="teams" class="q-pa-none">

16
labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
View File

@ -25,10 +25,10 @@
<q-item class="q-pr-sm "> <q-item class="q-pr-sm ">
<q-item-section> <q-item-section>
<q-item-label v-if="email === user.username" @click="gotoProfile"><a class="text-green" <q-item-label v-if="email === user.username" @click="gotoProfile"><a class="text-green"
style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a> style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
</q-item-label> </q-item-label>
<q-item-label v-if="email !== user.username"><a class="text-black" <q-item-label v-if="email !== user.username"><a class="text-black"
style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a> style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a>
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
@ -45,6 +45,7 @@
label="Email eingeben" label="Email eingeben"
unelevated color="negative" unelevated color="negative"
v-model="deleteUser" v-model="deleteUser"
:rules="[val=>validateEmail(val)||'Bitte Email verwenden']"
></q-input> ></q-input>
</div> </div>
</div> </div>
@ -188,11 +189,11 @@
// lastSum = ranking.rankingPointsSum; // lastSum = ranking.rankingPointsSum;
// } // }
}, },
resetPoints(){ resetPoints() {
if(this.deleteUser != null){ if (this.deleteUser != null) {
let username = this.deleteUser; let username = this.deleteUser;
let token = JSON.parse(localStorage.getItem('userToken')).token; let token = JSON.parse(localStorage.getItem('userToken')).token;
if(this.validateEmail(this.email)) { if (this.validateEmail(this.email)) {
console.log(this.validateEmail(this.email)); console.log(this.validateEmail(this.email));
this.$axios.put('/api/resetSingleUser', null, {params: {token, username}}) this.$axios.put('/api/resetSingleUser', null, {params: {token, username}})
@ -218,7 +219,7 @@
console.log(error.config); 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,});
}) })
}else{ } else {
this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
message: "Bitte geben Sie eine gültige Email ein", message: "Bitte geben Sie eine gültige Email ein",
title: "Ungültige Email", title: "Ungültige Email",
@ -235,8 +236,7 @@
}, },
validateEmail(email) { 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,}))$/;
let re = new RegExp('/^(([^<>()\\[\\]\\\\.,;:\\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()); return re.test(String(email).toLowerCase());
}, },