diff --git a/src/components/ChatComponents/RentalMessage.vue b/src/components/ChatComponents/RentalMessage.vue
index 9bfaeaaa58b610f1e1b45605e1dbcb6ff31de39e..693407e471342595ace6a722a3a17f78c7cc7291 100644
--- a/src/components/ChatComponents/RentalMessage.vue
+++ b/src/components/ChatComponents/RentalMessage.vue
@@ -1,6 +1,6 @@
<template>
<div class="message-container">
- <div class="message">
+ <div class="message bg-gray-100 ring-1 ring-gray-300">
<div class="info">
<div class="text">
<h2 class="header">Ny utleie forespørsel</h2>
@@ -135,7 +135,6 @@ export default {
display: block;
flex-direction: column;
width: 100%;
- background: #d1d5db;
border-radius: 10px;
padding: 10px;
max-width: 50%;
diff --git a/src/components/CommunityComponents/CommunityList.vue b/src/components/CommunityComponents/CommunityList.vue
index 8354bd25ce4cd34d3644522768e19a6298e89ad6..7fb0387d636cf1f0c90df9d1f61f5002eb66e15c 100644
--- a/src/components/CommunityComponents/CommunityList.vue
+++ b/src/components/CommunityComponents/CommunityList.vue
@@ -1,6 +1,6 @@
<template>
<!-- A list conatining all the communities -->
- <p v-if="!communities.length" class="flex place-content-center text-gray-400">
+ <p v-if="!communities.length" class="flex place-content-center text-gray-400 mt-8">
Ingen grupper
</p>
<ul v-else>
diff --git a/src/components/CommunityComponents/CommunityListItem.vue b/src/components/CommunityComponents/CommunityListItem.vue
index 8001e01a3aaba188a781c75428ecfa28a02bbd72..93384ccb76c9a00c3683098d5723130f9e40cc12 100644
--- a/src/components/CommunityComponents/CommunityListItem.vue
+++ b/src/components/CommunityComponents/CommunityListItem.vue
@@ -55,7 +55,7 @@
class="h-10 w-10 flex flex-col justify-center items-center ml-2 mr-2"
>
<UserGroupIcon
- alt="Felleskapets bilde"
+ alt="Bilde"
class="h-10 w-10 text-primary-dark"
/>
</div>
@@ -65,7 +65,7 @@
>
<img
:src="community.picture"
- alt="Fellsekaps bilde"
+ alt="Bilde"
class="rounded-md"
/>
</div>
diff --git a/src/components/ItemComponents/ItemCard.vue b/src/components/ItemComponents/ItemCard.vue
index b8125f4f70bcdfd289c1c5437ee9a31764911793..ada6d6fd3fd727388d4efe7779ac429328589aff 100644
--- a/src/components/ItemComponents/ItemCard.vue
+++ b/src/components/ItemComponents/ItemCard.vue
@@ -1,11 +1,11 @@
<template>
- <div class="mt-5 px-5">
+ <div class="mt-5 px-3">
<div
- class="w-full h-full rounded bg-gray-200 overflow-hidden display:inline-block correct-size"
+ class="w-full h-full rounded bg-gray-100 ring-1 ring-gray-200 overflow-hidden display:inline-block correct-size cursor-pointer"
>
<div class="relative h-0 pb-[66.7%]">
<img
- class="w-full h-full absolute inset-0"
+ class="w-full h-full object-contain absolute"
:src="item.img || require('../../assets/default-product.png')"
alt="Item image"
/>
diff --git a/src/components/ItemComponents/NewItemForm.vue b/src/components/ItemComponents/NewItemForm.vue
index 36c84f664967cbb685a593cf64b237d49f30e9af..105c168fe8c4914af8831ceef96edf622eac730c 100644
--- a/src/components/ItemComponents/NewItemForm.vue
+++ b/src/components/ItemComponents/NewItemForm.vue
@@ -105,7 +105,7 @@
<label
class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
id="priceLabel"
- >Pris</label
+ >Pris per dag</label
>
<input
type="number"
diff --git a/src/components/ItemComponents/SearchItemList.vue b/src/components/ItemComponents/SearchItemList.vue
index 00ed0583f51be18a36e249fb9e04a599a840d862..c269744508758761f2fef5ac1167cd6ff9006d7c 100644
--- a/src/components/ItemComponents/SearchItemList.vue
+++ b/src/components/ItemComponents/SearchItemList.vue
@@ -17,7 +17,7 @@
type="text"
id="searchInput"
class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
- placeholder="Search"
+ placeholder="Søk"
v-model="search"
/>
</div>
diff --git a/src/components/UserProfileComponents/UserItems.vue b/src/components/UserProfileComponents/UserItems.vue
index 418a4f22fa9e684959fe6cfa2d5033c7ce5671c3..4088e430b28185272ad6d7e7eb6f736b1af61fa5 100644
--- a/src/components/UserProfileComponents/UserItems.vue
+++ b/src/components/UserProfileComponents/UserItems.vue
@@ -3,7 +3,7 @@
Mine gjenstander
</div>
<!-- Search field -->
- <div class="relative" id="searchComponent">
+ <div class="relative mx-4" id="searchComponent">
<span class="absolute inset-y-0 left-0 flex items-center pl-3">
<svg class="w-5 h-5 text-gray-400" viewBox="0 0 24 24" fill="none">
<path
@@ -20,12 +20,12 @@
type="text"
id="searchInput"
class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
- placeholder="Search"
+ placeholder="Søk"
v-model="search"
@change="searchWritten"
/>
</div>
- <div class="absolute inset-x-0 px-5 py-3">
+ <div class="absolute inset-x-0">
<!-- ItemCards -->
<div class="flex items-center justify-center w-screen">
<!-- Shows items based on pagination -->
@@ -39,18 +39,18 @@
v-for="item in visibleItems"
:key="item"
>
+ <div class="w-full">
<ItemCard
id="ItemCardPage"
- class="ItemCard w-fit h-fit"
+ class="ItemCard w-full h-full"
:item="item"
/>
-
- <TripleDotButton class="DotButton" @click="openDotMenu(item)">
- </TripleDotButton>
+ </div>
+ <TripleDotButton class="DotButton" @click="openDotMenu(item)"/>
<div
v-show="item.toggle"
- class="options z-10 w-44 text-base list-none bg-white rounded divide-y divide-gray-100 shadow dark:bg-gray-700"
+ class="options z-10 w-44 text-base list-none bg-white rounded divide-y divide-gray-100 shadow dark:bg-gray-700 pt-4 pl-12"
>
<ul
class="py-1 absolute bg-white ring-1 ring-gray-300 rounded-xl"
@@ -109,9 +109,11 @@
v-if="showSearchedItems"
>
<div class="cardContainer" v-for="item in searchedItems" :key="item">
- <ItemCard id="ItemCardSearch" class="ItemCard" :item="item" />
- <TripleDotButton class="DotButton" @click="openDotMenu(item)">
- </TripleDotButton>
+ <div class="w-full">
+ <ItemCard id="ItemCardSearch" class="ItemCard w-full h-full" :item="item" />
+ </div>
+ <TripleDotButton class="DotButton" @click="openDotMenu(item)"/>
+
<div
v-show="item.toggle"
diff --git a/src/views/CommunityViews/CommunityView.vue b/src/views/CommunityViews/CommunityView.vue
index 329917065b0679060da6503891b05c932ebaf18a..11767faa7299f22ceb232eb8045c4441b096faa0 100644
--- a/src/views/CommunityViews/CommunityView.vue
+++ b/src/views/CommunityViews/CommunityView.vue
@@ -48,7 +48,7 @@
type="text"
id="searchInput"
class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
- placeholder="Search"
+ placeholder="Søk"
v-model="search"
@change="searchWritten"
/>
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/community-list-item.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/community-list-item.spec.js.snap
index 4edde89c2c743d9c2411aa4a1a5c1403b7077c70..33c093ab0c3342ce0c318b824a3465f92648732f 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/community-list-item.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/community-list-item.spec.js.snap
@@ -13,7 +13,7 @@ exports[`CommunityListItem component renders correctly 1`] = `
class="h-3 w-14 flex flex-col justify-center items-center ml-2 mt-4 mb-4 mr-2"
>
<img
- alt="Fellsekaps bilde"
+ alt="Bilde"
class="rounded-md"
src="string"
/>
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/community-list.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/community-list.spec.js.snap
index fc8d4f6d97bfaa6bc5e459e517c0a2cd8b490e1e..621d0dcb78d212b5bde0bced726a30dfedacf122 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/community-list.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/community-list.spec.js.snap
@@ -23,7 +23,7 @@ exports[`CommunityList component renders correctly 1`] = `
class="h-3 w-14 flex flex-col justify-center items-center ml-2 mt-4 mb-4 mr-2"
>
<img
- alt="Fellsekaps bilde"
+ alt="Bilde"
class="rounded-md"
src="string"
/>
@@ -74,7 +74,7 @@ exports[`CommunityList component renders correctly 1`] = `
class="h-3 w-14 flex flex-col justify-center items-center ml-2 mt-4 mb-4 mr-2"
>
<img
- alt="Fellsekaps bilde"
+ alt="Bilde"
class="rounded-md"
src="string"
/>
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/item-card.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/item-card.spec.js.snap
index 9167369f515802cca42dd7be7026189a2fa8c4be..cd4d8b526a3eeaa35fec145f56e43bd69eb52ee1 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/item-card.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/item-card.spec.js.snap
@@ -2,17 +2,17 @@
exports[`ItemCard component renders correctly 1`] = `
<div
- class="mt-5 px-5"
+ class="mt-5 px-3"
>
<div
- class="w-full h-full rounded bg-gray-200 overflow-hidden display:inline-block correct-size"
+ class="w-full h-full rounded bg-gray-100 ring-1 ring-gray-200 overflow-hidden display:inline-block correct-size cursor-pointer"
>
<div
class="relative h-0 pb-[66.7%]"
>
<img
alt="Item image"
- class="w-full h-full absolute inset-0"
+ class="w-full h-full object-contain absolute"
src="String"
/>
</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 d302a72c8efaf512cedea636c34b06d59abc050e..726e3ffbefb35e0e6884a7c5cf0fb333d2a9fcae 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
@@ -148,7 +148,7 @@ exports[`NewItemForm component renders correctly 1`] = `
class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
id="priceLabel"
>
- Pris
+ Pris per dag
</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"
diff --git a/tests/unit/component-tests/community-component-tests/__snapshots__/search-item-list.spec.js.snap b/tests/unit/component-tests/community-component-tests/__snapshots__/search-item-list.spec.js.snap
index 59eecbb9003356b0debaa8228f3785d489e3ec98..bc72db68e41c51dfacfa589be41ec10c93ce3baf 100644
--- a/tests/unit/component-tests/community-component-tests/__snapshots__/search-item-list.spec.js.snap
+++ b/tests/unit/component-tests/community-component-tests/__snapshots__/search-item-list.spec.js.snap
@@ -28,7 +28,7 @@ exports[`SearchItemListComponent elements rendering renders correctly 1`] = `
<input
class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
id="searchInput"
- placeholder="Search"
+ placeholder="Søk"
type="text"
/>
</div>
diff --git a/tests/unit/component-tests/user-component-tests/__snapshots__/user-items.spec.js.snap b/tests/unit/component-tests/user-component-tests/__snapshots__/user-items.spec.js.snap
index db5d7bf26553750dd6c9f3789f9541ffc2d2f071..a5812dd15944a413f9281e682a1b364681eb63c9 100644
--- a/tests/unit/component-tests/user-component-tests/__snapshots__/user-items.spec.js.snap
+++ b/tests/unit/component-tests/user-component-tests/__snapshots__/user-items.spec.js.snap
@@ -13,7 +13,7 @@ exports[`UserItems component renders correctly 1`] = `
</div>
<!-- Search field -->
<div
- class="relative"
+ class="relative mx-4"
id="searchComponent"
>
<span
@@ -36,12 +36,12 @@ exports[`UserItems component renders correctly 1`] = `
<input
class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
id="searchInput"
- placeholder="Search"
+ placeholder="Søk"
type="text"
/>
</div>
<div
- class="absolute inset-x-0 px-5 py-3"
+ class="absolute inset-x-0"
>
<!-- ItemCards -->
<div