From 3b712a2b8e68962718dea45713b5129cd1c5e725 Mon Sep 17 00:00:00 2001
From: Dora Jurcevic <dora.jurcevic@akretion.com>
Date: Tue, 2 Apr 2024 15:32:45 +0200
Subject: [PATCH 1/4] imp: selected variant displayed with border

---
 components/product/ProductVariants.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/components/product/ProductVariants.vue b/components/product/ProductVariants.vue
index 7b9fa46c..b1592b27 100644
--- a/components/product/ProductVariants.vue
+++ b/components/product/ProductVariants.vue
@@ -12,6 +12,7 @@
         v-if="product?.images?.[0]"
         :image="product.images[0]"
         class="hit__image"
+        :class="{'hit__image--selected': selected === product.id}"
       >
       </product-image>
       <div class="hit__title">
@@ -36,9 +37,16 @@ export default {
       return this.variants.filter((variant) => variant.id !== null)
     }
   },
+  data() {
+    return {
+      selected: null as number | null
+    }
+  },
   methods: {
     selectVariant(product: Product) {
+      this.selected = product.id
       this.$emit('selectVariant', product)
+
     },
     mouseoverVariant(product: Product) {
       this.$emit('mouseover', product)
@@ -56,6 +64,9 @@ export default {
     @apply w-1/5 pr-2;
     .hit__image {
       @apply cursor-pointer border p-2;
+      &--selected {
+        @apply border-primary;
+      }
     }
     .hit__title {
       @apply text-center text-xs font-bold uppercase;

From 7b74648d9f8177751a9fb7c67b9f0022016cd056 Mon Sep 17 00:00:00 2001
From: Dora Jurcevic <dora.jurcevic@akretion.com>
Date: Tue, 2 Apr 2024 17:56:26 +0200
Subject: [PATCH 2/4] fix: fixed tailwind colors and header redirect

---
 components/global/header/HeaderUser.vue | 2 +-
 tailwind.config.ts                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/global/header/HeaderUser.vue b/components/global/header/HeaderUser.vue
index 5a20105e..cf2c1959 100644
--- a/components/global/header/HeaderUser.vue
+++ b/components/global/header/HeaderUser.vue
@@ -16,7 +16,7 @@ const auth = useShopinvaderService('auth')
 const user = auth?.getUser()
 const next = () => {
   const localePath = useLocalePath()
-  auth?.loginRedirect(localePath({name: 'account'}))
+  auth?.loginRedirect(localePath({name: 'login'}))
 }
 </script>
 <style lang="scss">
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 1388ed58..10cc8224 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -62,7 +62,7 @@ export default {
       {
         mytheme: {
           fontFamily: 'Montserrat,"sanssecondaryerif"',
-          primary: '#13263d',
+          primary: colors.primary.DEFAULT,
           secondary: '#dca11d',
           accent: '#def2ff',
           neutral: '#42536d',

From c05d2949711e3ac07bf0b365d3c988eb1b5a6788 Mon Sep 17 00:00:00 2001
From: Dora Jurcevic <dora.jurcevic@akretion.com>
Date: Wed, 17 Apr 2024 14:48:49 +0200
Subject: [PATCH 3/4] fix: nuxtlink fixed on account menu

---
 components/account/AccountIcon.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/account/AccountIcon.vue b/components/account/AccountIcon.vue
index 5dc87d24..53cdef31 100644
--- a/components/account/AccountIcon.vue
+++ b/components/account/AccountIcon.vue
@@ -1,5 +1,5 @@
 <template>
-  <nuxt-link :to="link" class="account-link">
+  <nuxt-link :to="localePath({ path: link })"  class="account-link">
     <div class="account-link__icon">
       <icon :name="icon" />
     </div>
@@ -8,28 +8,28 @@
 </template>
 <script lang="ts">
 export default {
-  name: 'AccountIcon',
+  name: "AccountIcon",
   props: {
     icon: {
       required: true,
-      type: String
+      type: String,
     },
     label: {
       required: false,
       type: String,
-      default: ''
+      default: "",
     },
     link: {
       required: false,
       type: String,
-      default: ''
-    }
-  }
-}
+      default: "",
+    },
+  },
+};
 </script>
 <style lang="scss">
 .account-link {
-  @apply flex w-auto cursor-pointer flex-col items-center justify-center card card-body bg-base-100 p-5 ;
+  @apply flex w-auto cursor-pointer flex-col items-center justify-center card card-body bg-base-100 p-5;
   &__icon {
     @apply my-5 rounded-full bg-primary p-4 text-4xl text-white;
   }

From 1f3c2f82b3cd8c45b95827bbc949cb915393dbc2 Mon Sep 17 00:00:00 2001
From: Dora Jurcevic <dora.jurcevic@akretion.com>
Date: Wed, 17 Apr 2024 17:42:35 +0200
Subject: [PATCH 4/4] fix: price model fixed with default price

---
 models/Product.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/models/Product.ts b/models/Product.ts
index 617cfc98..e2b58644 100644
--- a/models/Product.ts
+++ b/models/Product.ts
@@ -137,6 +137,8 @@ export class Product extends Model {
     let price = data?.price?.[priceLists?.[0]] || null
     if(price) {
       this.price = new ProductPrice(price) || null
+    } else {
+      this.price = data?.price?.default || null
     }
 
     this.images = [] as ProductImageSet[]