diff --git a/frontend/src/boot/axios.js b/frontend/src/boot/axios.js
index 88a12cd..14c5d61 100644
--- a/frontend/src/boot/axios.js
+++ b/frontend/src/boot/axios.js
@@ -2,7 +2,7 @@ import axios from "axios";
const axiosInstance = axios.create({
baseURL: process.env.API,
- timeout: 6000
+ timeout: 10000
});
console.log("process.env.DEV: "+process.env.DEV);
console.log("process.env.API: "+process.env.API);
diff --git a/frontend/src/index.template.html b/frontend/src/index.template.html
index 5cf10d3..0223fc2 100644
--- a/frontend/src/index.template.html
+++ b/frontend/src/index.template.html
@@ -9,9 +9,9 @@
-
-
-
+
+
+
diff --git a/frontend/src/layouts/MyLayout.vue b/frontend/src/layouts/MyLayout.vue
index cfdf895..58273a9 100644
--- a/frontend/src/layouts/MyLayout.vue
+++ b/frontend/src/layouts/MyLayout.vue
@@ -98,7 +98,7 @@
- Rangliste
+ Top 10 Rangliste
+
@@ -173,6 +174,8 @@
+
+
diff --git a/frontend/src/pages/Cache.vue b/frontend/src/pages/Cache.vue
index 7e46324..8564c0e 100644
--- a/frontend/src/pages/Cache.vue
+++ b/frontend/src/pages/Cache.vue
@@ -30,7 +30,7 @@
max-height="50vh"
/>
Stationen
-
+
@@ -44,10 +44,10 @@
ID: {{ station.id ? station.id : "keine" }}
- {{ station.description }}
+
- Code: {{ station.code }}
+ Koordinaten: {{ station.lattitude }}, {{ station.longitude }}
@@ -60,8 +60,9 @@
+ Hinweis: Ein Cache muss mindestens aus zwei Stationen bestehen (inklusive der Endstation).
-
+
Endstation
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index f527745..c4d9013 100644
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -82,9 +82,9 @@
},
computed: {
validationSuccesful() {
- if (this.validateUsername(this.user.name)
+ if (this.user.name.length >= 2
&& this.validateEmail(this.user.email)
- && this.user.email.toLowerCase() === this.user.checkemail.toLowerCase()
+ && this.user.email === this.user.checkemail
&& this.user.password.length >= 8
&& this.user.password === this.user.checkpassword) {
return true;
@@ -102,7 +102,7 @@
},
register: function () {
- if (this.user.email.toLowerCase() === this.user.checkemail.toLowerCase() && this.user.password === this.user.checkpassword) {
+ if (this.user.email === this.user.checkemail && this.user.password === this.user.checkpassword) {
const data = {
name: this.user.name,
password: this.user.password,
@@ -126,7 +126,7 @@
console.log(response.data);
if (response.status === 201) {
this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {
- message: "Deine Registrierung war erfolgreich!",
+ message: "Deine Registrierung war erfolgreich! Du bist jetzt eingeloggt.",
title: "Registrierungsprozess",
color: "blue"
});
diff --git a/frontend/src/pages/StationEdit.vue b/frontend/src/pages/StationEdit.vue
index 65da5c1..4e56d67 100644
--- a/frontend/src/pages/StationEdit.vue
+++ b/frontend/src/pages/StationEdit.vue
@@ -50,8 +50,8 @@
latlang: "",
station: {
description: "Rätsel, Aufgabe und Informationen zur Station.",
- lattitude: "0.000",
- longitude: "0.000",
+ lattitude: 49.1474082,
+ longitude: 9.2065282,
solution: "",
code: ""
},
diff --git a/frontend/src/pages/StationEndEdit.vue b/frontend/src/pages/StationEndEdit.vue
index 4ec8663..a0bc1aa 100644
--- a/frontend/src/pages/StationEndEdit.vue
+++ b/frontend/src/pages/StationEndEdit.vue
@@ -37,8 +37,8 @@
latlang: "",
station: {
description: "Beschreibung",
- lattitude: "0.000",
- longitude: "0.000",
+ lattitude: 49.1474082,
+ longitude: 9.2065282,
solution: "",
code: ""
},
diff --git a/frontend/src/pages/StationView.vue b/frontend/src/pages/StationView.vue
index 5e32c7c..5464f13 100644
--- a/frontend/src/pages/StationView.vue
+++ b/frontend/src/pages/StationView.vue
@@ -21,7 +21,7 @@
import qrscanner from "../components/qrscanner";
export default {
name: "Station",
- components: {qrscanner},
+ components: { qrscanner },
data() {
return {
cacheID: "",
diff --git a/frontend/src/pages/ranking.vue b/frontend/src/pages/ranking.vue
index aac2964..accf22a 100644
--- a/frontend/src/pages/ranking.vue
+++ b/frontend/src/pages/ranking.vue
@@ -11,8 +11,8 @@
indicator-color="cyan-14"
switch-indicator
>
-
-
+
+
@@ -86,26 +86,6 @@
console.log(response.data);
this.rankinglist = response.data;
}).catch((error) => {
- // Error
- let msg;
- let title;
- if (error.response) {
- // The request was made and the server responded with a status code
- title = "Problem with response!";
- msg = error.response;
- } else if (error.request) {
- // The request was made but no response was received
- title = "Problem with request!";
- msg = "Error occured due to wrong server request!"
- console.log(error.request);
- } else {
- // Something happened in setting up the request that triggered an Error
- title = "Error";
- msg = error.message;
- console.log('Error', error.message);
- }
- console.log(error.config);
- this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
})
},
fetchTeamRankinglist() {
@@ -115,27 +95,19 @@
console.log(response.data);
this.teamRankinglist = response.data;
}).catch((error) => {
- // Error
- let msg;
- let title;
- if (error.response) {
- // The request was made and the server responded with a status code
- title = "Problem with response!";
- msg = error.response;
- } else if (error.request) {
- // The request was made but no response was received
- title = "Problem with request!";
- msg = "Error occured due to wrong server request!"
- console.log(error.request);
- } else {
- // Something happened in setting up the request that triggered an Error
- title = "Error";
- msg = error.message;
- console.log('Error', error.message);
- }
- console.log(error.config);
- this.$store.commit('dialog/NEW_MESSAGE_DIALOG', { message: msg, title: title, });
})
+ },
+ calculateRank() {
+ // TODO
+ // let rank = 0;
+ // let lastSum = null;
+ // const rankinglistCopy = this.rankinglist;
+ // for (let i = rankinglistCopy.length-1; i >= 0; i--) {
+ // if (lastSum === null || ranking.rankingPointsSum >= lastSum) {
+ // rank++;
+ // }
+ // lastSum = ranking.rankingPointsSum;
+ // }
}
}
}
diff --git a/frontend/src/statics/quasar-logo.png b/frontend/src/statics/quasar-logo.png
deleted file mode 100644
index 590e8ce..0000000
Binary files a/frontend/src/statics/quasar-logo.png and /dev/null differ
diff --git a/frontend/src/store/cacheCollector/mutations.js b/frontend/src/store/cacheCollector/mutations.js
index ec68887..90d2d1e 100644
--- a/frontend/src/store/cacheCollector/mutations.js
+++ b/frontend/src/store/cacheCollector/mutations.js
@@ -47,9 +47,9 @@ export const RESET_NEW_CACHE = (state) => {
};
state.endStation = {
description: "Endstation",
- longitude: 0.000,
- lattitude: 0.000,
- solution: "",
+ lattitude: 49.1474082,
+ longitude: 9.2065282,
+ solution: "",
};
console.log("resetted new Cache");
diff --git a/frontend/src/store/cacheCollector/state.js b/frontend/src/store/cacheCollector/state.js
index b8cb39a..4a494d1 100644
--- a/frontend/src/store/cacheCollector/state.js
+++ b/frontend/src/store/cacheCollector/state.js
@@ -12,8 +12,8 @@ export default {
tempStation: {},
endStation: {
description: "Endstation",
- longitude: 0.000,
- lattitude: 0.000,
+ lattitude: 49.1474082,
+ longitude: 9.2065282,
solution: "",
},
}