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 @@
-
-
-
-
-
-
-
-
-
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 @@
-
-
@@ -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);
}
-
- }
- },
+ },
+ }
}
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 () {
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.");
}
}
}