Merge branch 'develop' into frontend/robin

labswp_2019_sose_geocaching_frontend/frontend/src/components/map.vue

@@ -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>

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.lazy="inputCenter0"
                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.lazy="inputCenter1"
                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}
@@ -248,6 +215,13 @@
     setCenter(position) {
       this.center = position;
       this.$emit('updatecoords', this.center);
+    },
+    setCoordInput(val) {
+      this.inputCenter0 = val[0];
+      this.inputCenter1 = val[1];
+    },
+    updateCenterValues() {
+      this.setCenter([this.inputCenter0, this.inputCenter1])
     }
   }
 
@@ -262,7 +236,9 @@
     },
     data() {
       return {
-        center: [9.208858198755664, 49.14785422283188],
+        inputCenter0: 9.208858198755664,
+        inputCenter1: 49.14785422283188,
+        //center: [9.208858198755664, 49.14785422283188],
         zoom: 15,
         rotation: 0,
         clickCoordinate: undefined,
@@ -327,9 +303,36 @@
           this.center = val;
           this.$emit('updatecoords', this.center);
         }
-
-      }
-    },
+      },
+      // center0: {
+      //   get() {
+      //     console.log("center0 get")
+      //
+      //     return this.center[0];
+      //   },
+      //   set(val) {
+      //     console.log("center0 set")
+      //     let center1 = this.center[1];
+      //     let center0 = val;
+      //     this.center = [center0, center1];
+      //     console.log(this.center)
+      //   }
+      // },
+      center: {
+        get() {
+          console.log("center get");
+          console.log("center get");
+          return [this.inputCenter0, this.inputCenter1];
+        },
+        set(val) {
+          console.log("center set");
+          this.inputCenter0 = val[0];
+          this.inputCenter1 = val[1];
+          console.log(this.inputCenter0)
+          console.log(this.inputCenter1)
+        }
+      },
+    }
   }
 </script>
 

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 () {

labswp_2019_sose_geocaching_frontend/frontend/src/pages/StationEdit.vue

@@ -3,7 +3,7 @@
     <p class="text-h5">{{ isEndstation ? "Endstation bearbeiten"
       : isNewStation ? "Neue Station"
       : "Station bearbeiten"}}</p>
-    <q-editor v-show="!isEndstation && station.description"
+    <q-editor v-show="!isEndstation"
               :toolbar="[
             ['bold', 'italic', 'strike', 'underline'],
             ['undo', 'redo'],

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.");
     }
   }
 }