fixed merge conflicts

frontend/src/pages/Profile.vue

@@ -342,7 +342,6 @@
           }).catch((error) => {
           this.handleError(error);
         })
-
       },
 
       dropDownSelectItem(item) {
@@ -371,7 +370,7 @@
           return;
         }
         params.name = this.newTeamName;
-        this.$axios.post('/api/createTeam', {params})
+        this.$axios.post('/api/createTeam', {params: {params}})
           .then(response => {
             console.log("createTeam: " + response);
             this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {

frontend/src/pages/Register.vue

@@ -6,64 +6,35 @@
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <<<<<<< HEAD
-                <q-input outlined filled stack-label v-model="user.name" type="text"
-                         label="Nutzername eingeben"
-                         :rules="[val=>val.length>=2||'Name muss mindestens 2 Zeichen lang sein!']"/>
-                =======
                 <q-input lazy-rules outlined filled stack-label v-model="user.email" type="text" label="E-Mail"
                          :rules="[val=>validateEmail(val)||'Bitte gültige E-Mail angeben!']"/>
-                >>>>>>> develop
               </div>
             </div>
           </div>
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <<<<<<< HEAD
-                <q-input outlined filled stack-label v-model="user.email" type="text" label="Email eingeben"
-                         :rules="[val=>validateEmail(val)||'Email muss valide sein']"/>
-              </div>
-            </div>
-          </div>
-          <div class="col">
-            <div class="">
-              <div class="" style="max-width: 440px">
-                <q-input outlined filled stack-label v-model="user.checkemail" type="text"
-                         label="Email erneut eingeben" placeholer="Email"
-                         :rules="[val=>val===user.email||'Email stimmt nicht überein']"/>
-                =======
                 <q-input lazy-rules outlined filled stack-label v-model="user.checkemail" type="text"
                          label="E-Mail erneut eingeben" placeholer="Email"
                          :rules="[val=>val===user.email||'E-Mail stimmt nicht überein!']"/>
-                >>>>>>> develop
               </div>
             </div>
           </div>
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <<<<<<< HEAD
-                <q-input outlined filled stack-label v-model="user.password" type="password"
-                         label="Passwort eingeben"
-                =======
                 <q-input lazy-rules outlined filled stack-label v-model="user.password" type="password"
                          label="Passwort"
-                >>>>>>> develop
+                         :rules="[val=>val.length>=8||'Passwort muss mindestens 8 Zeichen lang sein!']"/>
-                  :rules="[val=>val.length>=8||'Passwort muss mindestens 8 Zeichen lang sein!']"/>
               </div>
             </div>
           </div>
           <div class="col">
             <div class="">
               <div class="" style="max-width: 440px">
-                <<<<<<< HEAD
-                <q-input outlined filled stack-label v-model="user.checkpassword" type="password"
-                =======
                 <q-input lazy-rules outlined filled stack-label v-model="user.checkpassword" type="password"
-                >>>>>>> develop
+                         label="Passwort erneut eingeben"
-                  label="Passwort erneut eingeben"
+                         :rules="[val=>val===user.password||'Passwort stimmt nicht überein']"/>
-                  :rules="[val=>val===user.password||'Passwort stimmt nicht überein']"/>
               </div>
             </div>
           </div>
@@ -92,38 +63,21 @@
     data() {
       return {
         user: {
-          < < < < < < < HEAD
+          email: "",
-        name: "",
+          checkemail: "",
-      === === =
+          password: "",
-    >>>>>>>
+          checkpassword: "",
-      develop
+        },
-      email: "",
+      }
-        checkemail
-    :
-      "",
-        password
-    :
-      "",
-        checkpassword
-    :
-      "",
-    },
-    }
     },
     computed: {
       validationSuccesful() {
-      <<<<<<<
+        if (this.validateEmail(this.user.email)
-        HEAD
+          && this.user.email === this.user.checkemail
-        if (this.user.name.length >= 2
+          && this.user.password.length >= 8
-        && this.validateEmail(this.user.email)
+          && this.user.password === this.user.checkpassword) {
-        === === =
+          return true;
-          if (this.validateEmail(this.user.email)
+        }
-            >>> >>> > develop
-            && this.user.email === this.user.checkemail
-            && this.user.password.length >= 8
-            && this.user.password === this.user.checkpassword) {
-            return true;
-          }
         return false;
       }
     },
@@ -149,6 +103,8 @@
               }
             ]
           };
+
+          console.log("POST /api/register/ - json: " + JSON.stringify(data));
           const token = JSON.parse(localStorage.getItem('registerToken')).token;
           this.$axios.post(process.env.USER_API + '/account/register', data, {
             headers: {
@@ -172,8 +128,8 @@
               if (error.response) {
                 console.log(error.response)
                 if (error.response.status === 409) {
-                  message = "Die E-Mail-Adresse wird bereits verwendet!";
+                  message= "Die E-Mail-Adresse wird bereits verwendet!";
-                  header = "Anmeldedaten überprüfen!";
+                  header= "Anmeldedaten überprüfen!";
                 }
               } else if (error.request) {
                 console.log(error.request);
@@ -203,15 +159,6 @@
           email: "register@bugageocaching.de",
           password: "reguser2019"
         };
-      <<<<<<<
-        HEAD
-
-        console.log("GET /api/login/ - json: " + JSON.stringify(logindata));
-
-      ======
-        =
-      >>>>>>>
-        develop
         this.$axios.post(process.env.USER_API + '/account/login', logindata)
           .then((response) => {
             localStorage.setItem('registerToken', JSON.stringify(response.data));
@@ -233,33 +180,7 @@
             this.$router.push({path: `/overview`});
           })
           .catch((error) => {
-          <<<<<<<
+            this.$router.push("/login");
-            HEAD
-            let message;
-            let header = "Fehler: ";
-            if (error.response) {
-              console.log("ERROR RESPONSE")
-              // The request was made and the server responded with a status code
-              // that falls out of the range of 2xx
-              message = error.response.data.error;
-              header += error.response.status;
-            } else if (error.request) {
-              // The request was made but no response was received
-              // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
-              // http.ClientRequest in node.js
-              message = error.request;
-            } else {
-              // Something happened in setting up the request that triggered an Error
-              console.log('Error', error.message);
-              message = error.message;
-            }
-            console.log(error.config);
-            this.$store.commit('dialog/NEW_MESSAGE_DIALOG', {message: message, title: header,});
-          ======
-            =
-              this.$router.push("/login");
-          >>>>>>>
-            develop
           })
           .finally(() => {
           });