diff --git a/src/components/CommunityComponents/CommunityHamburger.vue b/src/components/CommunityComponents/CommunityHamburger.vue
index 391a9ab232be3ec69eefd513b060f274e7dcd1b4..7754ce6eb97658c51124f5bd2b476e6b14a32c0e 100644
--- a/src/components/CommunityComponents/CommunityHamburger.vue
+++ b/src/components/CommunityComponents/CommunityHamburger.vue
@@ -27,7 +27,7 @@
</li>
<li id="leaveGroup">
<div
- class="cursor-pointer block py-2 px-4 text-sm text-error hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
+ class="cursor-pointer block py-2 px-4 text-sm text-error-medium hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
@click="leaveCommunity"
>
Forlat Gruppe
diff --git a/src/components/CommunityComponents/NewCommunityForm.vue b/src/components/CommunityComponents/NewCommunityForm.vue
index 5aa2cff9fe33b91ce80a66e503d384a6947b7afd..3784e50b8ee43c15553a74f49b10e55dffb33e7f 100644
--- a/src/components/CommunityComponents/NewCommunityForm.vue
+++ b/src/components/CommunityComponents/NewCommunityForm.vue
@@ -70,11 +70,11 @@
<!-- error message for title-->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.group.name.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -96,11 +96,11 @@
<!-- error message for place-->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.group.place.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -123,11 +123,11 @@
<!-- error message for description -->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.group.description.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -161,8 +161,6 @@
>
Velg bilde
</button>
-
- <!-- Button for removing an image -->
</div>
<!-- Div box for showing all chosen images -->
@@ -176,8 +174,6 @@
<Button @click="saveClicked" id="saveButton" :text="'Lagre'"> </Button>
</div>
</div>
-
- <!--<img :src="group.image" class="w-1/2 inline" alt="Bilde av gjenstanden" />-->
</template>
<script>
@@ -201,7 +197,7 @@ export default {
group: {
name: {
required: helpers.withMessage(
- () => "Navnt kan ikke være tom",
+ () => "Navn kan ikke være tom",
required
),
max: helpers.withMessage(
@@ -244,8 +240,6 @@ export default {
image: "",
},
imageThere: false,
- imageId: -1,
- imageStringURL: "",
};
},
computed: {
@@ -258,10 +252,6 @@ export default {
},
},
methods: {
- removeImage: function () {
- this.group.images.pop();
- this.imageThere = false;
- },
checkRadioButton: function (event) {
this.group.radio = event.target.value;
@@ -281,7 +271,6 @@ export default {
async saveClicked() {
if (this.checkValidation()) {
- //this.group.image = "https://image.shutterstock.com/image-photo/distribution-delivery-concept-global-business-600w-1650964204.jpg";
const groupInfo = {
name: this.group.name,
description: this.group.description,
@@ -310,8 +299,6 @@ export default {
const id = await postNewImageCommunity(res);
const API_URL = process.env.VUE_APP_BASEURL;
- console.log(id);
- console.log(API_URL + "images/" + id);
that.group.image = API_URL + "images/" + id;
};
fileReader.readAsArrayBuffer(image);
diff --git a/src/components/FormComponents/LoginForm.vue b/src/components/FormComponents/LoginForm.vue
index 362dec931a8512d52aeea7ec1ba5a20bd1a9d9ea..4b52c2efef1be63592ab7843f55bcf7a945f4e0d 100644
--- a/src/components/FormComponents/LoginForm.vue
+++ b/src/components/FormComponents/LoginForm.vue
@@ -24,7 +24,7 @@
<!-- error message -->
<div v-for="(error, index) of v$.user.email.$errors" :key="index">
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="emailErrorId"
>
@@ -47,12 +47,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.user.password.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="passwordErrorId"
>
@@ -82,7 +82,7 @@
</div>
<div class="flex items-center justify-center text-center bg-gray-50">
<label
- class="mx-2 text-sm font-bold text-red-500 dark:text-primary-light hover:underline"
+ class="mx-2 text-sm font-bold text-error-medium dark:text-primary-light hover:underline"
>{{ message }}</label
>
</div>
diff --git a/src/components/FormComponents/NewPasswordForm.vue b/src/components/FormComponents/NewPasswordForm.vue
index d32c15d65f1d4938f01c9c862fe70cc49f58929c..7dfd1958ee78aca0bd7e1720b939d4c340ba6e9c 100644
--- a/src/components/FormComponents/NewPasswordForm.vue
+++ b/src/components/FormComponents/NewPasswordForm.vue
@@ -25,7 +25,7 @@
<!-- error message -->
<div v-for="(error, index) of v$.user.oldPassword.$errors" :key="index">
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="oldPasswordErrorId"
>
@@ -52,7 +52,7 @@
<!-- error message -->
<div v-for="(error, index) of v$.user.password.$errors" :key="index">
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="passwordErrorId"
>
@@ -82,7 +82,7 @@
<!-- error message -->
<div v-for="(error, index) of v$.user.rePassword.$errors" :key="index">
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="rePasswordErrorId"
>
diff --git a/src/components/FormComponents/RegisterForm.vue b/src/components/FormComponents/RegisterForm.vue
index 12c4a1227379f44305217b4c594c31e2ed703952..17cd3cf736afe4e9a3c53d30af6527e7a3d8602a 100644
--- a/src/components/FormComponents/RegisterForm.vue
+++ b/src/components/FormComponents/RegisterForm.vue
@@ -21,12 +21,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.email.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="emailErrorId"
>
@@ -45,12 +45,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.password.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="passwordErrorId"
>
@@ -69,12 +69,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.confirmPassword.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="confirmPasswordErrorId"
>
@@ -94,12 +94,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.firstName.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="firstNameErrorId"
>
@@ -118,12 +118,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.lastName.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="lastNameErrorId"
>
@@ -142,12 +142,12 @@
/>
<!-- error message -->
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-for="(error, index) of v$.address.$errors"
:key="index"
>
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="addressErrorId"
>
diff --git a/src/components/FormComponents/ResetPasswordForm.vue b/src/components/FormComponents/ResetPasswordForm.vue
index b075e1a983cd3e6734a57fc1fb4ab07cea02d2b3..714e615ddf080f6fb7da79f72c831efd403ae9e1 100644
--- a/src/components/FormComponents/ResetPasswordForm.vue
+++ b/src/components/FormComponents/ResetPasswordForm.vue
@@ -29,7 +29,7 @@
<!-- error message -->
<div v-for="(error, index) of v$.email.$errors" :key="index">
<div
- class="text-red-600 text-sm"
+ class="text-error-medium text-sm"
v-show="showError"
id="emailErrorId"
>
diff --git a/src/components/ItemComponents/NewItemForm.vue b/src/components/ItemComponents/NewItemForm.vue
index 67f8f3032c3dacdbfc19f2fc29652be86d3c1db5..7d7140f9079c819c3dba0fac84afbb9f9cc63917 100644
--- a/src/components/ItemComponents/NewItemForm.vue
+++ b/src/components/ItemComponents/NewItemForm.vue
@@ -24,11 +24,11 @@
<!-- error message for title-->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.item.title.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -60,11 +60,11 @@
<!-- error message for select box -->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.item.select.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -94,7 +94,8 @@
</li>
</ul>
</div>
- <label class="text-error text-sm block">{{ groupErrorMessage }}</label>
+ <!-- Error message for community -->
+ <label class="text-error-medium text-sm block">{{ groupErrorMessage }}</label>
</div>
<!-- price -->
@@ -114,11 +115,11 @@
<!-- error message for price -->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.item.price.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -141,11 +142,11 @@
<!-- error message for description -->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.item.description.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
@@ -168,11 +169,11 @@
<!-- error message for address-->
<div
- class="text-error"
+ class="text-error-medium"
v-for="(error, index) of v$.item.address.$errors"
:key="index"
>
- <div class="text-error text-sm">
+ <div class="text-error-medium text-sm">
{{ error.$message }}
</div>
</div>
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/create-new-group.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/create-new-group.spec.js.snap
index 19e292101b012b95058ea454f90fb0bdb96fe700..1b8f2021b3218a5e802c69956cd055a0f77d6b00 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/create-new-group.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/create-new-group.spec.js.snap
@@ -2,167 +2,159 @@
exports[`CreateNewGroup elements rendering renders correctly 1`] = `
<div
- data-v-app=""
+ class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
>
-
+ <!-- Component heading -->
<div
- class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
+ class="text-xl md:text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-10"
>
- <!-- Component heading -->
- <div
- class="text-xl md:text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-10"
+ Opprett ny gruppe
+ </div>
+ <!-- Radio boxes -->
+ <div
+ class="mt-6"
+ >
+ <label
+ class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
+ id="radioBoxLabel"
>
- Opprett ny gruppe
- </div>
- <!-- Radio boxes -->
+ Synlighet
+ </label>
<div
- class="mt-6"
+ class="form-check"
>
+ <input
+ class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer"
+ id="flexRadioOpen"
+ name="flexRadioDefault"
+ type="radio"
+ value="Ã…pen"
+ />
<label
- class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
- id="radioBoxLabel"
+ class="form-check-label inline-block text-gray-800"
+ for="flexRadioOpen"
+ id="radioBoxOpenLabel"
>
- Synlighet
+ Ã…pen
</label>
- <div
- class="form-check"
- >
- <input
- class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer"
- id="flexRadioOpen"
- name="flexRadioDefault"
- type="radio"
- value="Ã…pen"
- />
- <label
- class="form-check-label inline-block text-gray-800"
- for="flexRadioOpen"
- id="radioBoxOpenLabel"
- >
- Ã…pen
- </label>
- </div>
- <div
- class="form-check"
- >
- <input
- class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer"
- id="flexRadioPrivate"
- name="flexRadioDefault"
- type="radio"
- value="Privat"
- />
- <label
- class="form-check-label inline-block text-gray-800"
- for="flexRadioPrivate"
- id="radioBoxPrivateLabel"
- >
- Privat
- </label>
- </div>
</div>
- <!-- Title -->
<div
- class="mt-6"
+ class="form-check"
>
- <label
- class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
- id="titleLabel"
- >
- Gruppenavn
- </label>
<input
- class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
- id="title"
- required=""
- type="text"
+ class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer"
+ id="flexRadioPrivate"
+ name="flexRadioDefault"
+ type="radio"
+ value="Privat"
/>
- <!-- error message for title-->
-
-
- </div>
- <!-- Place -->
- <div
- class="mt-6"
- >
<label
- class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
- id="positionLabel"
+ class="form-check-label inline-block text-gray-800"
+ for="flexRadioPrivate"
+ id="radioBoxPrivateLabel"
>
- By/Sted
+ Privat
</label>
- <input
- class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
- required=""
- type="text"
- />
- <!-- error message for place-->
-
-
</div>
- <!-- Description -->
- <div
- class="mt-6"
+ </div>
+ <!-- Title -->
+ <div
+ class="mt-6"
+ >
+ <label
+ class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
+ id="titleLabel"
>
- <label
- class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400"
- id="descriptionLabel"
- >
- Beskrivelse
- </label>
- <textarea
- class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
- id="description"
- required=""
- rows="4"
- />
- <!-- error message for description -->
-
-
- </div>
- <!-- Images -->
- <div
- class="mt-6"
+ Gruppenavn
+ </label>
+ <input
+ class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
+ id="title"
+ required=""
+ type="text"
+ />
+ <!-- error message for title-->
+
+
+ </div>
+ <!-- Place -->
+ <div
+ class="mt-6"
+ >
+ <label
+ class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
+ id="positionLabel"
>
- <label
- class="block mb-2 text-xl font-medium text-gray-900 dark:text-gray-400"
- id="imageLabel"
- >
- Bilde
- </label>
- <input
- accept="image/png, image/jpeg"
- multiple=""
- style="display: none;"
- type="file"
- />
- <!-- Button for adding an image -->
- <div
- class="inline-flex rounded-md shadow-sm"
- >
- <!--<div class="text-error uppercase text-center">Midlertidig fjernet</div> -->
- <button
- class="text-black bg-gray-200 hover:bg-grey-800 focus:ring-4 focus:outline-none focus:ring-grey-300 font-medium rounded-lg text-sm sm:w-auto px-5 py-2.5 text-center dark:bg-grey-600 dark:hover:bg-grey-700 dark:focus:ring-grey-800 disabled:opacity-50"
- >
- Velg bilde
- </button>
- <!-- Button for removing an image -->
- </div>
- <!-- Div box for showing all chosen images -->
-
-
- </div>
- <!-- Save item button -->
+ By/Sted
+ </label>
+ <input
+ class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
+ required=""
+ type="text"
+ />
+ <!-- error message for place-->
+
+
+ </div>
+ <!-- Description -->
+ <div
+ class="mt-6"
+ >
+ <label
+ class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400"
+ id="descriptionLabel"
+ >
+ Beskrivelse
+ </label>
+ <textarea
+ class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
+ id="description"
+ required=""
+ rows="4"
+ />
+ <!-- error message for description -->
+
+
+ </div>
+ <!-- Images -->
+ <div
+ class="mt-6"
+ >
+ <label
+ class="block mb-2 text-xl font-medium text-gray-900 dark:text-gray-400"
+ id="imageLabel"
+ >
+ Bilde
+ </label>
+ <input
+ accept="image/png, image/jpeg"
+ multiple=""
+ style="display: none;"
+ type="file"
+ />
+ <!-- Button for adding an image -->
<div
- class="flex justify-center mt-10 float-right"
+ class="inline-flex rounded-md shadow-sm"
>
- <button-stub
- id="saveButton"
- text="Lagre"
- />
+ <!--<div class="text-error uppercase text-center">Midlertidig fjernet</div> -->
+ <button
+ class="text-black bg-gray-200 hover:bg-grey-800 focus:ring-4 focus:outline-none focus:ring-grey-300 font-medium rounded-lg text-sm sm:w-auto px-5 py-2.5 text-center dark:bg-grey-600 dark:hover:bg-grey-700 dark:focus:ring-grey-800 disabled:opacity-50"
+ >
+ Velg bilde
+ </button>
</div>
+ <!-- Div box for showing all chosen images -->
+
+
+ </div>
+ <!-- Save item button -->
+ <div
+ class="flex justify-center mt-10 float-right"
+ >
+ <button-stub
+ id="saveButton"
+ text="Lagre"
+ />
</div>
- <!--<img :src="group.image" class="w-1/2 inline" alt="Bilde av gjenstanden" />-->
-
</div>
`;
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/new-item-form.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/new-item-form.spec.js.snap
index c2789c34942918bfb9b251c3bbd6d7c71fbc0eee..26181401d016fdab5f197d4f30a46c66b2ca4c1b 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/new-item-form.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/new-item-form.spec.js.snap
@@ -100,8 +100,9 @@ exports[`NewItemForm component renders correctly 1`] = `
</li>
</ul>
</div>
+ <!-- Error message for community -->
<label
- class="text-error text-sm block"
+ class="text-error-medium text-sm block"
/>
</div>
<!-- price -->
diff --git a/tests/unit/component-tests/user-component-tests/__snapshots__/login-form.spec.js.snap b/tests/unit/component-tests/user-component-tests/__snapshots__/login-form.spec.js.snap
index f79182e421a30cc8a35db92683cee3b064bbfb02..7d3875c13b81280752f1d753d824b2f830373fc9 100644
--- a/tests/unit/component-tests/user-component-tests/__snapshots__/login-form.spec.js.snap
+++ b/tests/unit/component-tests/user-component-tests/__snapshots__/login-form.spec.js.snap
@@ -70,7 +70,7 @@ exports[`LoginForm component renders correctly 1`] = `
class="flex items-center justify-center text-center bg-gray-50"
>
<label
- class="mx-2 text-sm font-bold text-red-500 dark:text-primary-light hover:underline"
+ class="mx-2 text-sm font-bold text-error-medium dark:text-primary-light hover:underline"
/>
</div>
</div>