after merge

Author: filrak

CHANGELOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.0] - 2018.10.22
+
+### Added
+- Contact form mailer - #1875 - Akbar Abdrakhmanov @akbarik
+- oauth2 configuration in setup - #1865 - Krister Andersson @Cyclonecode
+- GraphQL schema extendibility in the API - Yoann Vié
+- A lot of new docs - Natalia Tepluhina @NataliTepluhina
+- Magento2 integrated importer 
+
+### Changed
+- New Modules API, and base modules (cart, wishlist, newsletter ...) refactored [read more...](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/about-modules.md) - Filip Rakowski @filrak
+
+### Fixed
+- The `regionId` field added to Order interface - #1258 - Jim Hil @jimcreate78
+- SSR Memory leaks fixed - #1882 Tomasz Duda @tomasz-duda
+- E2E tests fixed - #1861 - Patryk Tomczyk @patzik
+- UI animations - #1857 - Javier Villanueva @jahvi
+- Disabled buttons fixed - #1852 - Patryk Tomczyk @patzik
+- Mailchimp / Newsletter modules rebuilt - Filip Rakowski @filrak
+- Search component UX fixes - #1862 - Adrian Cagaanan @diboy2
+
 ## [1.4.0] - 2018.10.05
 
 ### Added

PULL_REQUEST_TEMPLATE.md

@@ -23,4 +23,4 @@
 
 - [ ] I read and followed [contribution rules](https://github.com/DivanteLtd/vue-storefront/blob/master/CONTRIBUTING.md)
 - [ ] I read the [TypeScript Action Plan](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/TypeScript%20Action%20Plan.md) and adjusted my PR according to it
-- [ ] I read about [Vue Storefront Modules](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/about-modules.md) and [refactoring plan for them](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/refactoring-to-modules.md)
+- [ ] I read about [Vue Storefront Modules](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/api-modules/about-modules.md) and I am aware that every new feature should be a module

README.md

@@ -205,9 +205,9 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
       <td align="center" valign="middle">
         <a href="https://divante.co/">
           <img
-            src="https://divante.co/static/img/logo.svg"
+            src="https://divante.co/about us/LOGO.png"
             alt="Divante"
-            height="50"
+            width="120"
           >
         </a>
       </td>
@@ -436,6 +436,53 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
         </a>
       </td>
     </tr>
+     <tr>
+       <td align="center" valign="middle">
+        <a href="http://copex.io/">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/copex-io-logo.png"
+            alt="Copex.io"
+            height="50"
+          >
+        </a>
+      </td>
+         <td align="center" valign="middle">
+        <a href="https://www.badger.blue/">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/BlueBadger-Logo.png"
+            alt="Badger Blue"
+            height="50"
+          >
+        </a>
+      </td>
+        <td align="center" valign="middle">
+        <a href="">
+          <img
+            src=""
+            alt=""
+            height="50"
+          >
+        </a>
+      </td>
+    <td align="center" valign="middle">
+        <a href="">
+          <img
+            src=""
+            alt=""
+            height="50"
+          >
+        </a>
+      </td>
+         <td align="center" valign="middle">
+        <a href="">
+          <img
+            src=""
+            alt=""
+            height="50"
+          >
+        </a>
+      </td>
+    </tr>
   </tbody>
 </table>
 

config/default.json

@@ -274,7 +274,10 @@
       "endpoint": "http://localhost:8080/api/ext/mailchimp-subscribe/subscribe"
     },
     "mailer": {
-      "endpoint": "http://localhost:8080/api/ext/mail-service/send-email",
+      "endpoint": {
+        "send": "http://localhost:8080/api/ext/mail-service/send-email",
+        "token": "http://localhost:8080/api/ext/mail-service/get-token"
+      },
       "contactAddress": "[email protected]",
       "sendConfirmation": true
     },

core/app.ts

@@ -20,6 +20,7 @@ import App from 'theme/App.vue'
 import themeModules from 'theme/store'
 import themeExtensionEntryPoints from 'theme/extensions'
 import extensionEntryPoints from 'src/extensions'
+import { once } from './helpers'
 
 // Declare Apollo graphql client
 import ApolloClient from 'apollo-client'
@@ -32,13 +33,15 @@ import { enabledModules } from './modules-entry'
 import { takeOverConsole } from '@vue-storefront/core/helpers/log'
 
 if (buildTimeConfig.console.verbosityLevel !== 'display-everything') {
-  takeOverConsole(buildTimeConfig.console.verbosityLevel)
+  once('__TAKE_OVER_CONSOLE__', () => {
+    takeOverConsole(buildTimeConfig.console.verbosityLevel)
+  })
 }
 
 
 export function createApp (ssrContext, config): { app: Vue, router: any, store: any } {
   sync(store, router)
-  store.state.version = '1.4.0'
+  store.state.version = '1.5.0'
   store.state.config = config
   store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
   if(ssrContext) Vue.prototype.$ssrRequestContext = ssrContext
@@ -50,43 +53,47 @@ export function createApp (ssrContext, config): { app: Vue, router: any, store:
     console.debug('Registering Vuex module', moduleName)
     store.registerModule(moduleName, storeModules[moduleName])
   }
-  
+
   const storeView = prepareStoreView(null) // prepare the default storeView
   store.state.storeView = storeView
   // store.state.shipping.methods = shippingMethods
-  
+
   Vue.use(Vuelidate)
   Vue.use(VueLazyload, {attempt: 2})
   Vue.use(Meta)
   Vue.use(VueObserveVisibility)
-  
-  require('theme/plugins')
-  const pluginsObject = plugins()
-  Object.keys(pluginsObject).forEach(key => {
-    Vue.use(pluginsObject[key])
-  })
-  
-  const mixinsObject = mixins()
-  Object.keys(mixinsObject).forEach(key => {
-    Vue.mixin(mixinsObject[key])
+
+  once('__VUE_EXTEND__', () => {
+    console.debug('Registering Vue plugins')
+    require('theme/plugins')
+    const pluginsObject = plugins()
+    Object.keys(pluginsObject).forEach(key => {
+      Vue.use(pluginsObject[key])
+    })
+
+    console.debug('Registering Vue mixins')
+    const mixinsObject = mixins()
+    Object.keys(mixinsObject).forEach(key => {
+      Vue.mixin(mixinsObject[key])
+    })
   })
-  
+
   const filtersObject = filters()
   Object.keys(filtersObject).forEach(key => {
     Vue.filter(key, filtersObject[key])
   })
     const httpLink = new HttpLink({
       uri: store.state.config.graphql.host.indexOf('://') >= 0 ? store.state.config.graphql.host : (store.state.config.server.protocol + '://' + store.state.config.graphql.host + ':' + store.state.config.graphql.port + '/graphql')
     })
-  
+
   const apolloClient = new ApolloClient({
     link: httpLink,
     cache: new InMemoryCache(),
     connectToDevTools: true
   })
-  
+
   let loading = 0
-  
+
   const apolloProvider = new VueApollo({
     clients: {
         a: apolloClient
@@ -104,9 +111,9 @@ export function createApp (ssrContext, config): { app: Vue, router: any, store:
         console.error(error)
     }
   })
-  
+
   Vue.use(VueApollo)
-  // End declare Apollo graphql client    
+  // End declare Apollo graphql client
   const app = new Vue({
     router,
     store,

core/components/Notification.js

@@ -21,16 +21,15 @@ export default {
         this.action('close', this.notifications.length - 1)
       }, data.timeToLive || 5000)
     },
-    action (action, id) {
-      this.$bus.$emit('notification-after-' + action, id)
+    action (action, id, notification) {
+      this.$bus.$emit('notification-after-' + action, notification)
       switch (action) {
-        case 'close':
-          this.notifications.splice(id, 1)
-          break
         case 'goToCheckout':
           this.$router.push(this.localizedRoute('/checkout'))
           this.notifications.splice(id, 1)
           break
+        default:
+          this.notifications.splice(id, 1)
       }
     }
   }

core/components/blocks/Checkout/Shipping.js

@@ -137,7 +137,7 @@ export default {
     },
     getCurrentShippingMethod () {
       let shippingCode = this.shipping.shippingMethod
-      let currentMethod = this.shippingMethods.find(item => item.method_code === shippingCode)
+      let currentMethod = this.shippingMethods ? this.shippingMethods.find(item => item.method_code === shippingCode) : {}
       return currentMethod
     },
     changeShippingMethod () {

core/helpers/index.js

@@ -9,3 +9,13 @@ export function slugify (text) {
     .replace(/[^\w-]+/g, '') // Remove all non-word chars
     .replace(/--+/g, '-') // Replace multiple - with single -
 }
+
+export function once (key, fn) {
+  const { process = {} } = global
+  const processKey = key + '__ONCE__'
+  if (!process.hasOwnProperty(processKey)) {
+    console.debug(`Once ${key}`)
+    process[processKey] = true
+    fn()
+  }
+}

core/helpers/log.js

@@ -2,7 +2,7 @@
  * @param {string} level available options: 'no-console', 'only-errors', 'all'
  */
 export function takeOverConsole (level = 'no-console') {
-  var console = typeof window !== 'undefined' ? window.console : global.console
+  const console = typeof window !== 'undefined' ? window.console : global.console
   if (!console) return
 
   function intercept (method) {
@@ -26,7 +26,7 @@ export function takeOverConsole (level = 'no-console') {
         original.apply(console, arguments)
       } else {
         // Do this for IE
-        var message = Array.prototype.slice.apply(arguments).join(' ')
+        const message = Array.prototype.slice.apply(arguments).join(' ')
         original(message)
       }
     }

core/modules/cart/store/actions.ts

@@ -609,7 +609,13 @@ const actions: ActionTree<CartState, RootState> = {
       Vue.prototype.$bus.$emit('servercart-after-diff', { diffLog: diffLog, serverItems: serverItems, clientItems: clientItems, dryRun: event.dry_run, event: event }) // send the difflog
       console.log('Server sync diff', diffLog)
     } else {
-      console.error(event.result)
+      console.error(event.result) // override with guest cart   
+      if (rootStore.state.cart.bypassCount < MAX_BYPASS_COUNT) {
+        console.log('Bypassing with guest cart', rootStore.state.cart.bypassCount)
+        rootStore.state.cart.bypassCount = rootStore.state.cart.bypassCount + 1
+        rootStore.dispatch('cart/serverCreate', { guestCart: true }, { root: true })
+        console.error(event.result)
+      }
     }
   },
   servercartAfterItemUpdated (context, event) {

core/modules/cart/store/mutations.ts

@@ -66,7 +66,7 @@ const mutations: MutationTree<CartState> = {
     state.cartIsLoaded = true
     state.cartSavedAt = Date.now()
 
-    Vue.prototype.$bus.$emit('order/PROCESS_QUEUE', { config: rootStore.state.config }) // process checkout queue
+    // Vue.prototype.$bus.$emit('order/PROCESS_QUEUE', { config: rootStore.state.config }) // process checkout queue
     Vue.prototype.$bus.$emit('sync/PROCESS_QUEUE', { config: rootStore.state.config }) // process checkout queue
     Vue.prototype.$bus.$emit('application-after-loaded')
     Vue.prototype.$bus.$emit('cart-after-loaded')

core/modules/mailer/components/EmailForm.ts

@@ -9,33 +9,22 @@ export const EmailForm = {
   },
   methods: {
     sendEmail (letter: MailItem, success, failure) {
-      this.$store.dispatch('mailer/getToken')
+      this.$store.dispatch('mailer/sendEmail', letter)
       .then(res => {
         if (res.ok) {
-          return res.json()
-        }
-        throw new Error()
-      })
-      .then(tokenResponse => {
-        this.token = tokenResponse.result
-        return this.$store.dispatch('mailer/sendEmail', { ...letter, token: this.token })
-      })
-      .then(res => {
-        if (res.ok) {
-          success(i18n.t('Email has successfully been sent'))
-          this.$store.dispatch('mailer/sendConfirmation', { ...letter, token: this.token })
+          if (success) success(i18n.t('Email has successfully been sent'))
         } else {
           return res.json()
         }
       })
       .then(errorResponse => {
         if (errorResponse) {
           const errorMessage = errorResponse.result
-          failure(i18n.t(errorMessage))
+          if (failure) failure(i18n.t(errorMessage))
         }
       })
       .catch(() => {
-        failure(i18n.t('Could not send an email. Please try again later.'))
+        if (failure) failure(i18n.t('Could not send an email. Please try again later.'))
       })
     }
   }