From 0238dbf0c8c454d756d584dbf5bd411210048126 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 27 Nov 2019 17:39:55 +0100
Subject: [PATCH 1/4] small fixes

---
 .../components/core/blocks/Footer/Footer.vue      | 15 ++++++++++++++-
 src/themes/default/pages/MyAccount.vue            |  1 -
 src/themes/default/pages/Static.vue               |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index e5c9328047..326259dfea 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -15,9 +15,12 @@
                 {{ $t('Orders') }}
               </h3>
               <div class="mt15">
-                <router-link class="cl-secondary" :to="localizedRoute('/my-account')" exact>
+                <router-link v-if="isLogged" class="cl-secondary" :to="localizedRoute('/my-account')" exact>
                   {{ $t('My account') }}
                 </router-link>
+                <a v-else class="cl-secondary" href="#" @click.prevent="goToAccount">
+                  {{ $t('My account') }}
+                </a>
               </div>
               <div class="mt15">
                 <router-link class="cl-secondary" :to="localizedRoute('/delivery')" exact>
@@ -158,6 +161,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import CurrentPage from 'theme/mixins/currentPage'
 import LanguageSwitcher from '../../LanguageSwitcher.vue'
 import Newsletter from 'theme/components/core/blocks/Footer/Newsletter'
@@ -167,7 +171,16 @@ import config from 'config'
 export default {
   mixins: [CurrentPage],
   name: 'MainFooter',
+  methods: {
+    goToAccount () {
+      console.log('TEST')
+      this.$bus.$emit('modal-toggle', 'modal-signup')
+    },
+  },
   computed: {
+    ...mapGetters({
+      isLogged: 'user/isLoggedIn'
+    }),
     multistoreEnabled () {
       return config.storeViews.multistore
     },
diff --git a/src/themes/default/pages/MyAccount.vue b/src/themes/default/pages/MyAccount.vue
index 6dbd763dc2..e348186a91 100644
--- a/src/themes/default/pages/MyAccount.vue
+++ b/src/themes/default/pages/MyAccount.vue
@@ -4,7 +4,6 @@
       <div class="container">
         <breadcrumbs
           :with-homepage="true"
-          :routes="[{name: 'Homepage', route_link: '/'}]"
           active-route="My Account"
         />
         <h1>
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 280f0e334a..51813d4611 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="bg-cl-secondary py35 pl20">
       <div class="container">
-        <breadcrumbs :with-homepage="true" :routes="[{name: 'Homepage', route_link: '/'}]" :active-route="$props.title" />
+        <breadcrumbs :with-homepage="true" :active-route="$props.title" />
         <h2 class="fs-big">
           {{ $props.title }}
         </h2>

From 104b744c6e7c5c16ad1ea984d4429b846903aba0 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 27 Nov 2019 17:42:18 +0100
Subject: [PATCH 2/4] small fixes

---
 src/themes/default/components/core/blocks/Footer/Footer.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index 326259dfea..ecc6b523d0 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -173,9 +173,8 @@ export default {
   name: 'MainFooter',
   methods: {
     goToAccount () {
-      console.log('TEST')
       this.$bus.$emit('modal-toggle', 'modal-signup')
-    },
+    }
   },
   computed: {
     ...mapGetters({

From 3def2c5b4e3ba5c84d900ea129938d385be31769 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 27 Nov 2019 17:48:27 +0100
Subject: [PATCH 3/4] fix product image, update changelog

---
 CHANGELOG.md                                        | 1 +
 src/themes/default/components/core/ProductImage.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd8d3ccb1b..2500ae7737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Sorting fixed on category page - @AdKamil (#3785)
 - Mount app in 'beforeResolve' if it's not dispatched in 'onReady' - @gibkigonzo (#3669)
 - change translation from jp-JP to ja-JP - @gibkigonzo (#3824)
+- Fix product images, my account link, warnings in console - @andrzejewsky (#3850)
 
 ## [1.10.4] - 18.10.2019
 
diff --git a/src/themes/default/components/core/ProductImage.vue b/src/themes/default/components/core/ProductImage.vue
index a72f9e231c..5e4bb27e57 100644
--- a/src/themes/default/components/core/ProductImage.vue
+++ b/src/themes/default/components/core/ProductImage.vue
@@ -99,7 +99,6 @@ export default {
       top: 50%;
       left: 50%;
       width: auto;
-      height: 100%;
       transform: translate3d(-50%, -50%, 0);
       &--placeholder{
         width: auto;

From 54263c3d52d21bc6d7861edf9ab990ac871d7a98 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Thu, 28 Nov 2019 10:40:09 +0100
Subject: [PATCH 4/4] remove v-if

---
 src/themes/default/components/core/blocks/Footer/Footer.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index ecc6b523d0..3441168315 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -15,10 +15,10 @@
                 {{ $t('Orders') }}
               </h3>
               <div class="mt15">
-                <router-link v-if="isLogged" class="cl-secondary" :to="localizedRoute('/my-account')" exact>
+                <router-link v-show="isLogged" class="cl-secondary" :to="localizedRoute('/my-account')" exact>
                   {{ $t('My account') }}
                 </router-link>
-                <a v-else class="cl-secondary" href="#" @click.prevent="goToAccount">
+                <a v-show="!isLogged" class="cl-secondary" href="#" @click.prevent="goToAccount">
                   {{ $t('My account') }}
                 </a>
               </div>