From 32a6da73b95bea0dcef5f17382544b9064c899cb Mon Sep 17 00:00:00 2001
From: Timo Volkmann <volkmann@stud.hs-heilbronn.de>
Date: Sat, 22 Jun 2019 17:14:10 +0200
Subject: [PATCH 1/2] fixed number inputs in mapChooser

---
 .../frontend/src/components/map.vue           | 22 ----------
 .../frontend/src/components/mapClickable.vue  | 42 ++-----------------
 .../bugageocaching/util/VerificationUtil.java |  2 +-
 3 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue

diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue
deleted file mode 100644
index dc55020..0000000
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'mymap',
-  data () {
-    return {
-      zoom: 15,
-      center: [ 9.208858198755664, 49.14785422283188],
-      rotation: 0,
-      geolocPosition: undefined,
-    }
-  }
-}
-</script>
-
-<style>
-</style>
diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue
index db4ab64..4a9d7e2 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/components/mapClickable.vue
@@ -64,9 +64,9 @@
       </vl-map>
     </div>
     <div class="row q-col-gutter-md">
-      <q-input class="col" dense stack-label filled v-model="center[1]"
+      <q-input class="col" dense stack-label filled v-model.number="center[1]"
                label="Breitengrad"/>
-      <q-input class="col" dense stack-label filled v-model="center[0]"
+      <q-input class="col" dense stack-label filled v-model.number="center[0]"
                label="Längengrad"/>
       <div class="col-shrink">
         <q-btn unelevated color="primary" class="full-height" icon="my_location" @click="setCenter(deviceCoordinate)"/>
@@ -110,39 +110,6 @@
     geometryTypeToCmpName(type) {
       return 'vl-geom-' + kebabCase(type)
     },
-    /**
-     * Packman layer Style function factory
-     * @return {ol.StyleFunction}
-     */
-    pacmanStyleFunc() {
-      const pacman = [
-        createStyle({
-          strokeColor: '#de9147',
-          strokeWidth: 3,
-          fillColor: [222, 189, 36, 0.8],
-        }),
-      ]
-      const path = [
-        createStyle({
-          strokeColor: 'blue',
-          strokeWidth: 1,
-        }),
-        createStyle({
-          imageRadius: 5,
-          imageFillColor: 'orange',
-          geom(feature) {
-            // geometry is an LineString, convert it to MultiPoint to style vertex
-            return createMultiPointGeom(feature.getGeometry().getCoordinates())
-          },
-        }),
-      ]
-      const eye = [
-        createStyle({
-          imageRadius: 6,
-          imageFillColor: '#444444',
-        }),
-      ]
-    },
     /**
      * Cluster layer style function factory
      * @return {ol.StyleFunction}
@@ -327,9 +294,8 @@
           this.center = val;
           this.$emit('updatecoords', this.center);
         }
-
-      }
-    },
+      },
+    }
   }
 </script>
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
index 8c092ce..ff42137 100644
--- a/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
+++ b/src/main/java/hhn/labsw/bugageocaching/util/VerificationUtil.java
@@ -58,7 +58,7 @@ public class VerificationUtil {
       return ResponseEntity.status(401).body("Bitte loggen sie sich erneut ein.");
     } catch (Exception e) {
       logger.debug("VERIFY TOKEN: Something went wrong verificating");
-      return ResponseEntity.status(401).body("Bitte loggen sie sich erneut ein.");
+      return ResponseEntity.status(401).body("Login nicht möglich. Wenden Sie sich an den Administrator.");
     }
   }
 }

From 81a4d38ac4d95b80d8820602c34f567a34f3e655 Mon Sep 17 00:00:00 2001
From: Michael <mdietz@stud.hs-heilbronn.de>
Date: Mon, 24 Jun 2019 11:22:20 +0200
Subject: [PATCH 2/2] fixed email verification

---
 .../frontend/src/pages/Register.vue                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
index c627de1..d0ac870 100644
--- a/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
+++ b/labswp_2019_sose_geocaching_frontend/frontend/src/pages/Register.vue
@@ -97,8 +97,8 @@
     },
     methods: {
       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,}))$/');
+        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,}))$/');
         return re.test(String(email).toLowerCase());
       },
       register: function () {