Skip to content
Snippets Groups Projects
Commit afb3b388 authored by Henrik August Burmann's avatar Henrik August Burmann
Browse files

Merge branch 'fix-userprofile-image' into 'main'

Fix userprofile image

See merge request !115
parents 4d20da21 250a2b07
No related branches found
No related tags found
1 merge request!115Fix userprofile image
Pipeline #181252 failed
......@@ -11,27 +11,21 @@
/>
</div>
<ul class="flex justify-between">
<li class="cursor-pointer"
@click="$router.push('/newItem')"
>
<li class="cursor-pointer" @click="$router.push('/newItem')">
<PlusIcon
class="m-6 md:mr-2 h-7 text-primary-medium float-left"
alt="Legg til"
/>
<a class="hidden md:block mt-7 text-sm float-right">Legg til</a>
</li>
<li class="cursor-pointer"
@click="$router.push('/messages')"
>
<li class="cursor-pointer" @click="$router.push('/messages')">
<ChatAlt2Icon
class="m-6 md:mr-2 h-7 text-primary-medium float-left"
alt="Meldinger"
/>
<a class="hidden md:block mt-7 text-sm float-right">Meldinger</a>
</li>
<li class="cursor-pointer"
@click="loadProfile"
>
<li class="cursor-pointer" @click="loadProfile">
<UserCircleIcon
class="m-6 md:mr-2 h-7 text-primary-medium float-left"
alt="Profil"
......
......@@ -4,11 +4,11 @@
class="w-4/5 rounded bg-gray-200 h-full overflow-hidden display:inline-block correct-size"
>
<img
class="w-full"
class="h-3/4"
:src="item.img || require('../../assets/default-product.png')"
alt="Item image"
/>
<div class="p-1 m-1">
<div class="p-1 m-1 bottom-0">
<p class="text-gray-700 text-xs font-bold" id="adress">
{{ item.address }}
</p>
......
......@@ -184,8 +184,8 @@ export default {
for (var i = 0; i < this.publicCommunities.length; i++) {
for (var j = 0; j < this.myCommunities.length; j++) {
if (
this.publicCommunities[i].communityId ===
this.myCommunities[j].communityId
this.publicCommunities?.[i]?.communityId ===
this.myCommunities?.[j]?.communityId
) {
this.publicCommunities.splice(i, 1);
}
......
......@@ -9,11 +9,11 @@ exports[`ItemCard component renders correctly 1`] = `
>
<img
alt="Item image"
class="w-full"
class="h-3/4"
src="String"
/>
<div
class="p-1 m-1"
class="p-1 m-1 bottom-0"
>
<p
class="text-gray-700 text-xs font-bold"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment