From a7446a00da6c4b20db1e112a644ce72f41aee6f8 Mon Sep 17 00:00:00 2001
From: Titus Kristiansen <titusk@stud.ntnu.no>
Date: Fri, 29 Apr 2022 15:22:03 +0200
Subject: [PATCH] Validate errors working in register

---
 src/components/FormComponents/LoginForm.vue   |  4 ++--
 .../FormComponents/RegisterForm.vue           | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/FormComponents/LoginForm.vue b/src/components/FormComponents/LoginForm.vue
index b493d4c..f3259d7 100644
--- a/src/components/FormComponents/LoginForm.vue
+++ b/src/components/FormComponents/LoginForm.vue
@@ -84,11 +84,11 @@ export default {
     return {
       user: {
         email: {
-          required,
+          required: helpers.withMessage(`Feltet må være utfylt`, required),
           email: helpers.withMessage(`E-posten er ugyldig`, email),
         },
         password: {
-          required,
+          required: helpers.withMessage(`Feltet må være utfylt`, required),
         },
       },
     };
diff --git a/src/components/FormComponents/RegisterForm.vue b/src/components/FormComponents/RegisterForm.vue
index e01d8ba..5eef8af 100644
--- a/src/components/FormComponents/RegisterForm.vue
+++ b/src/components/FormComponents/RegisterForm.vue
@@ -156,7 +156,7 @@
 <script>
 import useVuelidate from "@vuelidate/core";
 import { doLogin, registerUser } from "@/utils/apiutil";
-import { required, email, minLength, sameAs } from "@vuelidate/validators";
+import {required, email, minLength, sameAs, helpers} from "@vuelidate/validators";
 import Button from "@/components/BaseComponents/ColoredButton"
 
 // const isEmailTaken = (value) =>
@@ -182,18 +182,21 @@ export default {
   validations() {
     return {
       email: {
-        required,
-        email,
+        required: helpers.withMessage(`Feltet må være utfylt`, required),
+        email: helpers.withMessage('E-posten er ugyldig', email),
         // isUnique: helpers.withAsync(isEmailTaken),
       },
       password: {
-        required,
-        minLength: minLength(8),
+        required: helpers.withMessage(`Feltet må være utfylt`, required),
+        minLength: helpers.withMessage('Passordet må være minst 8 karakterer lang', minLength(8)),
       },
-      confirmPassword: { sameAs: sameAs(this.password) },
-      firstName: { required },
-      lastName: { required },
-      address: { required },
+      confirmPassword: {
+        sameAs: helpers.withMessage('Passordene må være like', sameAs(this.password)),
+        required: helpers.withMessage(`Feltet må være utfylt`, required)
+      },
+      firstName: {required: helpers.withMessage(`Feltet må være utfylt`, required)},
+      lastName: {required: helpers.withMessage(`Feltet må være utfylt`, required)},
+      address: {required: helpers.withMessage(`Feltet må være utfylt`, required)},
     };
   },
   methods: {
-- 
GitLab