From 377a936d4461df5d708bc57ccad70918390547f5 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Thu, 6 Jun 2019 14:44:17 +0200
Subject: [PATCH] korrekte fehlermeldung wird ausgegeben, falls eine falsche
 email eingegeebn wird

---
 .../frontend/src/pages/Profile.vue               | 12 ------------
 .../frontend/src/pages/ranking.vue               | 16 ++++++++--------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
index b909293..a9c7bdf 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Profile.vue
@@ -65,18 +65,6 @@
                 </q-expansion-item>
               </q-card>
             </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>
         </q-tab-panel>
         <q-tab-panel v-if="boolAlreadyInTeam" name="teams" class="q-pa-none">
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
index e933cde..113ee01 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/ranking.vue
@@ -25,10 +25,10 @@
               <q-item class="q-pr-sm ">
                 <q-item-section>
                   <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 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-section>
                 <q-item-section side>
@@ -45,6 +45,7 @@
                              label="Email eingeben"
                              unelevated color="negative"
                              v-model="deleteUser"
+                             :rules="[val=>validateEmail(val)||'Bitte Email verwenden']"
                     ></q-input>
                   </div>
                 </div>
@@ -188,11 +189,11 @@
         //   lastSum = ranking.rankingPointsSum;
         // }
       },
-      resetPoints(){
-        if(this.deleteUser != null){
+      resetPoints() {
+        if (this.deleteUser != null) {
           let username = this.deleteUser;
           let token = JSON.parse(localStorage.getItem('userToken')).token;
-          if(this.validateEmail(this.email)) {
+          if (this.validateEmail(this.email)) {
             console.log(this.validateEmail(this.email));
 
             this.$axios.put('/api/resetSingleUser', null, {params: {token, username}})
@@ -218,7 +219,7 @@
               console.log(error.config);
               this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: msg, title: title,});
             })
-          }else{
+          } else {
             this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
               message: "Bitte geben Sie eine gültige Email ein",
               title: "Ungültige Email",
@@ -235,8 +236,7 @@
 
       },
       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 = 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,}))$/');
+        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,}))$/;
         return re.test(String(email).toLowerCase());
       },