@ecomplus/storefront-components 1.0.0-beta.177 → 1.0.0-beta.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecomplus/storefront-components",
-  "version": "1.0.0-beta.177",
+  "version": "1.0.0-beta.179",
   "description": "Vue components for E-Com Plus Storefront",
   "main": "dist/storefront-components.min.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "@ecomplus/search-engine": "^2.6.1",
     "@ecomplus/shopping-cart": "^2.6.0",
     "@ecomplus/storefront-twbs": "^7.3.6",
-    "@glidejs/glide": "^3.6.0",
+    "@glidejs/glide": "^3.6.1",
     "@linusborg/vue-simple-portal": "^0.1.5",
     "axios": "^0.27.2 || ^1.1.2",
     "cleave.js": "^1.6.0",

package/src/html/ShippingCalculator.html

@@ -50,6 +50,18 @@
         key="services"
         class="list-group"
       >
+        <transition
+          enter-active-class="animated fadeInUp"
+          leave-active-class="animated fadeOutDown"
+        >
+          <div
+            v-if="canSelectServices && !canAutoSelectService && selectedService === null"
+            class="shipping-calculator__label"
+          >
+            <i class="i-arrow-down animated wobble"></i>
+            {{ i19selectShippingMsg }}
+          </div>
+        </transition>
         <component
           :is="canSelectServices ? 'a' : 'div'"
           :href="canSelectServices && '#'"
@@ -72,7 +84,25 @@
                 :production-deadline="productionDeadline"
                 :data-service-code="service.service_code"
               />
-              <small>{{ service.label }}</small>
+              <div
+                v-if="canSelectServices && !canAutoSelectService"
+                class="custom-control custom-radio"
+              >
+                <input
+                  type="radio"
+                  :id="`shipping-method-${service.service_code}`"
+                  name="shipping-method-select"
+                  class="custom-control-input"
+                  :checked="selectedService === i"
+                />
+                <label 
+                  class="custom-control-label" 
+                  :for="`shipping-method-${service.service_code}`"
+                >
+                  <small>{{ service.label }}</small>
+                </label>
+              </div>
+              <small v-else>{{ service.label }}</small>
             </slot>
           </span>
         </component>

package/src/js/LoginBlock.js

@@ -118,8 +118,12 @@ export default {
       }
     },
 
-    oauthPopup (link) {
-      this.ecomPassport.popupOauthLink(link)
+    oauthPopup (fnOrLink) {
+      if (typeof fnOrLink === 'function') {
+        fnOrLink()
+      } else {
+        this.ecomPassport.popupOauthLink(fnOrLink)
+      }
       this.isWaitingPopup = true
       setTimeout(() => {
         this.isWaitingPopup = false
@@ -138,6 +142,26 @@ export default {
   },
 
   created () {
+    if (Array.isArray(window.OAUTH_PROVIDERS)) {
+      this.oauthProviders = []
+      if (window.OAUTH_PROVIDERS.includes('google') && window.signInWithGoogle) {
+        this.oauthProviders.push({
+          link: window.signInWithGoogle,
+          faIcon: 'fa-google',
+          provider: 'google',
+          providerName: 'Google'
+        })
+      }
+      if (window.OAUTH_PROVIDERS.includes('facebook') && window.signInWithFacebook) {
+        this.oauthProviders.push({
+          link: window.signInWithFacebook,
+          faIcon: 'fa-facebook-f',
+          provider: 'facebook',
+          providerName: 'Facebook'
+        })
+      }
+      if (this.oauthProviders.length) return
+    }
     if (!this.canFetchOauth) return
     this.ecomPassport.fetchOauthProviders()
       .then(({ host, baseUri, oauthPath, providers }) => {

package/src/js/ShippingCalculator.js

@@ -119,6 +119,10 @@ export default {
     i19calculateShipping: () => i18n(i19calculateShipping),
     i19zipCode: () => i18n(i19zipCode),
     i19freeShipping: () => i18n(i19freeShipping).toLowerCase(),
+    i19selectShippingMsg: () => i18n({
+      pt_br: 'Selecione uma forma de envio abaixo',
+      en_us: 'Select a shipping method below'
+    }),
 
     cleaveOptions () {
       return this.countryCode === 'BR'

package/src/scss/ShippingCalculator.scss

@@ -12,6 +12,18 @@
     }
   }
 
+  &__label {
+    padding: var(--spacer-3) var(--spacer-2);
+
+    i {
+      font-size: var(--font-size-lg);
+      animation-duration: 2s;
+      animation-iteration-count: infinite;
+      margin-right: var(--spacer-2);
+      color: var(--primary-light);
+    }
+  }
+
   &__option {
     display: flex;
     justify-content: space-between;