From 5e4b1f21d12be56f56620b691db9924dc733b63f Mon Sep 17 00:00:00 2001
From: pkarw <pkarwatka@divante.pl>
Date: Thu, 29 Mar 2018 12:04:26 +0200
Subject: [PATCH 1/2] Dependency fixes

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb450938d6..10b02e629e 100755
--- a/package.json
+++ b/package.json
@@ -82,7 +82,9 @@
     "vuelidate": "^0.6.2",
     "vuex": "^3.0.0",
     "vuex-router-sync": "^5.0.0",
-    "rimraf": "^2.6.0"
+    "rimraf": "^2.6.0",
+    "vue-carousel": "^0.6.9",
+    "vue-no-ssr": "^0.2.2"    
   },
   "devDependencies": {
     "babel-core": "^6.26.0",

From 2c03cadc33d422dc54ecb2f235886fb611203e37 Mon Sep 17 00:00:00 2001
From: pkarw <pkarwatka@divante.pl>
Date: Thu, 29 Mar 2018 12:23:40 +0200
Subject: [PATCH 2/2] Minor fixes

---
 core/components/blocks/Form/BaseInput.vue                    | 5 +++++
 core/resource/i18n/en-US.csv                                 | 2 +-
 .../components/core/blocks/Checkout/PersonalDetails.vue      | 1 +
 src/themes/default/components/core/blocks/Form/BaseInput.vue | 3 ++-
 .../default/components/core/blocks/Microcart/Microcart.vue   | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/components/blocks/Form/BaseInput.vue b/core/components/blocks/Form/BaseInput.vue
index cc7e1dc995..15aaa4dcf2 100644
--- a/core/components/blocks/Form/BaseInput.vue
+++ b/core/components/blocks/Form/BaseInput.vue
@@ -37,6 +37,11 @@ export default {
       required: false,
       default: false
     },
+    autofocus: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     validation: {
       type: Object,
       required: false,
diff --git a/core/resource/i18n/en-US.csv b/core/resource/i18n/en-US.csv
index 23b7d7dbd6..78ec334b75 100644
--- a/core/resource/i18n/en-US.csv
+++ b/core/resource/i18n/en-US.csv
@@ -271,7 +271,7 @@
 "You've entered an incorrect coupon code. Please try again.","You've entered an incorrect coupon code. Please try again."
 "Add a discount code","Add a discount code"
 "Discount code","Discount code"
-"Add discount code","Add discount code"
+"Add discount code","Apply"
 "color_filter","Color"
 "size_filter","Size"
 "price_filter","Price"
diff --git a/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue b/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
index 894fcc136c..6526f7f5b7 100644
--- a/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
+++ b/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
@@ -36,6 +36,7 @@
           <base-input
             class="col-xs-12 col-md-6 mb25"
             type="text"
+            :autofocus="true"
             name="first-name"
             :placeholder="$t('First name *')"
             v-model.trim="personalDetails.firstName"
diff --git a/src/themes/default/components/core/blocks/Form/BaseInput.vue b/src/themes/default/components/core/blocks/Form/BaseInput.vue
index 1601f1474b..838ed2fda9 100644
--- a/src/themes/default/components/core/blocks/Form/BaseInput.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseInput.vue
@@ -3,7 +3,7 @@
     <input
       class="
         py10 w-100 border-box brdr-none brdr-bottom
-        brdr-cl-primary h4 weight-200 sans-serif
+        brdr-cl-primary h4 sans-serif
       "
       :class="{pr30: type === 'password'}"
       :type="type === 'password' ? passType : type"
@@ -11,6 +11,7 @@
       :placeholder="placeholder"
       :autocomplete="autocomplete"
       :value="value"
+      :autofocus="autofocus"
       :ref="focus ? name : false"
       @input="$emit('input', $event.target.value)"
       @blur="$emit('blur')"
diff --git a/src/themes/default/components/core/blocks/Microcart/Microcart.vue b/src/themes/default/components/core/blocks/Microcart/Microcart.vue
index 1e894b1a26..f5909ffd3a 100644
--- a/src/themes/default/components/core/blocks/Microcart/Microcart.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Microcart.vue
@@ -58,7 +58,7 @@
         <div v-if="isOnline && segment.code === 'discount' && addCouponPressed" class="col-xs-12 pt30 coupon-wrapper">
           <div class="coupon-input">
             <label class="h6 cl-secondary">{{ $t('Discount code') }}</label>
-            <base-input type="text" id="couponinput" :focus="true" v-model.trim="couponCode" @keyup="enterCoupon"/>
+            <base-input type="text" id="couponinput" :autofocus="true" v-model.trim="couponCode" @keyup="enterCoupon"/>
           </div>
           <button-outline color="dark" :disabled="!couponCode" @click.native="applyCoupon">{{ $t('Add discount code') }}</button-outline>
         </div>