@lancom/shared 0.0.418 → 0.0.419

package/assets/js/api/admin.js

@@ -3,6 +3,12 @@ import { _get, _post, _delete, _put } from './helpers';
 import { sortSizes } from './../utils/sizes';
 import { sortByName } from './../utils/filters';
 
+const CACHE = {
+  PRINT_AREAS: 'print-areas',
+  PACKAGES: 'packages'
+};
+const promiseCache = new Map();
+
 export default {
   updateInventoryFromLink(link, warehouse) {
     const url = `admin/products/inventory/link${warehouse ? `?warehouse=${warehouse}` : ''}`;
@@ -215,8 +221,13 @@ export default {
   removeCategory(id) {
     return _delete(`admin/categories/${id}`);
   },
+  dropPackagesCache() {
+    promiseCache.delete(CACHE.PACKAGES);
+  },
   fetchPackages() {
-    return _get('admin/packages');
+    const promise = promiseCache.get(CACHE.PACKAGES) || _get('admin/packages');
+    promiseCache.set(CACHE.PACKAGES, promise);
+    return promise;
   },
   fetchPackageById(id) {
     return _get(`admin/packages/${id}`);
@@ -660,8 +671,16 @@ export default {
   removePrintType(id) {
     return _delete(`admin/print-types/${id}`);
   },
-  fetchPrintAreas() {
-    return _get('admin/print-areas');
+  dropPrintAreasCache() {
+    promiseCache.delete(CACHE.PRINT_AREAS);
+  },
+  fetchPrintAreas(params) {
+    if (params) {
+      return _get('admin/print-areas', params);
+    }
+    const promise = promiseCache.get(CACHE.PRINT_AREAS) || _get('admin/print-areas');
+    promiseCache.set(CACHE.PRINT_AREAS, promise);
+    return promise;
   },
   fetchPrintAreaById(id) {
     return _get(`admin/print-areas/${id}`);
@@ -672,8 +691,8 @@ export default {
   removePrintArea(id) {
     return _delete(`admin/print-areas/${id}`);
   },
-  fetchPrintSizes() {
-    return _get('admin/print-sizes');
+  fetchPrintSizes(params) {
+    return _get('admin/print-sizes', params);
   },
   fetchPrintSizeById(id) {
     return _get(`admin/print-sizes/${id}`);

package/assets/js/api/index.js

@@ -1,10 +1,15 @@
-
 import { _get, _post, _put, _delete, _patch } from './helpers';
 import adminApi from './admin';
 import { unminifySimpleProducts } from './utils/simple-products';
 import { unminifyProduct } from './utils/product';
+import { getSharePromise } from './../utils/share-promises';
+
+const shareRequestsPromises = getSharePromise(5 * 60 * 1000);
 
 const api = {
+  clearAllSharePromises() {
+    return _post('clear-share-promises');
+  },
   fetchClientSettings(shop, params) {
     return _get(`shop/${shop}/client-settings`, params);
   },
@@ -20,6 +25,9 @@ const api = {
   saveCustomer(customer, shop) {
     return customer._id ? _patch(`shop/${shop}/customer/${customer.accessToken}`, customer) : _post(`shop/${shop}/customer`, customer);
   },
+  fetchCustomer(accessToken, shop) {
+    return _get(`shop/${shop}/customer/${accessToken}`);
+  },
   authCustomer(customer, shop) {
     return _post(`shop/${shop}/customer/login`, customer);
   },
@@ -69,7 +77,8 @@ const api = {
     return _get(`shop/${shop}/menus`);
   },
   fetchBanners(shop, params) {
-    return _get(`shop/${shop}/banners`, params);
+    const KEY = `shop/${shop}/banners_${JSON.stringify(params || {})}`;
+    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/banners`, params));
   },
   fetchProductsKits(shop, params) {
     return _get(`shop/${shop}/products-kit`, params);
@@ -84,7 +93,8 @@ const api = {
     return _get(`shop/${shop}/news/${alias}?preview=${preview}`);
   },
   fetchNewsTags(shop, params) {
-    return _get(`shop/${shop}/news-tag`, params);
+    const KEY = `shop/${shop}/news-tag_${JSON.stringify(params || {})}`
+    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/news-tag`, params));
   },
   fetchNewsTag(shop, alias) {
     return _get(`shop/${shop}/news-tag/${alias}`);

package/assets/js/utils/share-promises/index.js

@@ -0,0 +1,76 @@
+const MAX_PROMISES_COUNT = 1000;
+const DEFAULT_SHARE_LIFETIME = 10 * 1000;
+
+export class SharePromises {
+  constructor(clearSharesTimeoutDelay) {
+    this.promises = new Map();
+    this.clearSharesTimeout = null;
+    this.clearSharesTimeoutDelay = clearSharesTimeoutDelay || DEFAULT_SHARE_LIFETIME;
+  }
+
+  startClearTimeout(key) {
+    const promise = this.promises.get(key);
+    if (promise) {
+      clearTimeout(promise.timeout);
+      promise.timeout = setTimeout(() => {
+        this.promises.delete(key);
+      }, this.clearSharesTimeoutDelay);
+    }
+  }
+
+  share(keyObj, promiseFactory) {
+    const key = `${keyObj}`;
+    let promise = this.promises.get(key);
+    if (!promise) {
+      this.checkMaxPromisesCount();
+
+      promise = {
+        promise: promiseFactory(),
+        timeout: null
+      };
+
+      this.promises.set(key, promise);
+
+      this.startClearTimeout(key);
+    }
+
+    promise.promise = promise.promise.then((result) => result);
+
+    return promise.promise;
+  }
+
+  checkMaxPromisesCount() {
+    if (this.promises.size >= MAX_PROMISES_COUNT) {
+      this.clear();
+    }
+  }
+
+  clear() {
+    this.promises.forEach(promise => {
+      clearTimeout(promise.timeout);
+    });
+    this.promises.clear();
+  }
+
+  clearPromise(keyObj) {
+    const key = `${keyObj}`;
+    let promise = this.promises.get(key);
+    if (promise) {
+      clearTimeout(promise.timeout);
+      this.promises.delete(key);
+    }
+  }
+}
+
+const allSharePromises = [];
+export function getSharePromise(timeout) {
+  const sharePromise = new SharePromises(timeout);
+  allSharePromises.push(sharePromise);
+  return sharePromise;
+}
+
+export function clearAllSharePromises() {
+  for (const sharePromise of allSharePromises) {
+    sharePromise.clear();
+  }
+}

package/components/common/coupon_select/coupon-select.vue

@@ -74,7 +74,7 @@
       <div
         v-else
         class="lc_caption form-help is-danger">
-        Invalid coupon: Min Order for Coupon: {{ value.minOrderValue | price(currency) }}
+        Invalid coupon: Min Order for Coupon: {{ minOrderValue | price(currency) }}
       </div>
       <div v-if="hasQualifyingProducts" class="lc_caption mb-10">
         <div v-if="noQualifyingProductsInCart">
@@ -129,8 +129,18 @@ export default {
     hasQualifyingProductsInCart() {
       return this.sumQualifyingProductsInCart > 0;
     },
+    minOrderValue() {
+      const value = [
+        this.value,
+        ...(this.value?.values || [])
+      ]
+      .filter(v => v?.minOrderValue > 0)
+      .sort((a, b) => a.minOrderValue - b.minOrderValue)[0];
+
+      return value?.minOrderValue || 0;
+    },
     isValidPricing() {
-      return !this.value?.minOrderValue || this.pricing.coupon;
+      return !this.minOrderValue || this.pricing.coupon;
     },
     model: {
       get() {

package/components/common/phone_input/phone-input.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div class="form-row">
+    <div :class="containerClassname">
       <label
         v-if="labelless"
-        class="form-label"
+        :class="labelClassname"
         @click="$refs.phone.$el.focus()">
         {{ displayLabelText }}
       </label>
@@ -31,8 +31,8 @@
               :disabled="disabled"
               :name="'phone' + uniqueKey"
               type="text"
-              class="form-field"
               :class="{
+                [inputClassname]: true,
                 'is-danger': errors.length,
                 filled: model,
                 labelless
@@ -115,6 +115,18 @@ export default {
     namePrefix: {
       type: String,
       default: ''
+    },
+    containerClassname: {
+      type: String,
+      default: 'form-row'
+    },
+    labelClassname: {
+      type: String,
+      default: 'form-label'
+    },
+    inputClassname: {
+      type: String,
+      default: 'form-field'
     }
   },
   data() {

package/components/common/postcode_select/postcode-select.vue

@@ -177,7 +177,9 @@ export default {
     if (this.suburb) {
       const option = this.createOptionFromSuburb(this.suburb);
       this.selected = option;
-      await this.handleSearch(this.selected.value.trim())
+      if (this.selected.value) {
+        await this.handleSearch(this.selected.value.trim());
+      }
     }
   },
   methods: {

package/components/customer/customer_navigation_menu/customer-navigation-menu.vue

@@ -15,6 +15,12 @@
 <script>
 export default {
   name: 'CustomerMenu',
+  props: {
+    activeMenuItem: {
+      type: String,
+      required: true
+    }
+  },
   data() {
     return {
       menuItems: [{
@@ -29,14 +35,12 @@ export default {
         label: 'Coupons',
         key: 'coupons',
         url: '/customer/coupons'
+      }, {
+        label: 'Preferences',
+        key: 'preferences',
+        url: '/customer/preferences'
       }]
     };
-  },
-  props: {
-    activeMenuItem: {
-      type: String,
-      required: true
-    }
   }
 };
 </script>
@@ -68,5 +72,5 @@ export default {
       background-color: $green;
     }
   }
-} 
+}
 </style>

package/components/customer/customer_preferences_form/customer-preferences-form.scss

@@ -0,0 +1,12 @@
+@import "@/assets/scss/variables";
+
+.CustomerPreferencesForm {
+  &__error {
+    font-weight: bold;
+    font-size: 14px;
+    padding: 18px 10px;
+    text-align: center;
+    color: $white;
+    background: #EA3434;
+  }
+}

package/components/customer/customer_preferences_form/customer-preferences-form.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="form__wrapper CustomerFrom__wrapper">
+    <validation-observer ref="form">
+      <div class="mt-10">
+        <div
+          class="row"
+          style="margin-top: -20px">
+          <div class="col-12">
+            <div class="form-row">
+              <label class="form-label">
+                <checkbox v-model="customer.signUpForNewsletter" />
+                <span class="lc_regular12 lc__grey1">
+                  Sign up for newsletter
+                </span>
+              </label>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form__footer mt-5">
+        <div
+          v-if="errorMessage"
+          class="CustomerForm__error">
+          {{ errorMessage }}
+        </div>
+        <div class="form-actions full">
+          <btn
+            class="btn btn-black"
+            :btn-processing="processing"
+            :btn-disabled="processing"
+            :btn-label="customer._id ? 'Save' : 'Create Account'"
+            @onclick="submit()">
+          </btn>
+        </div>
+      </div>
+    </validation-observer>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import api from '@lancom/shared/assets/js/api';
+
+export default {
+  name: 'CustomerPreferencesForm',
+  props: {
+    customer: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      errorMessage: null,
+      processing: false
+    };
+  },
+  computed: {
+    ...mapGetters(['shop'])
+  },
+  methods: {
+    async submit() {
+      this.errorMessage = null;
+
+      const isValid = await this.$refs.form.validate();
+      if (!isValid) {
+        return;
+      }
+
+      try {
+        this.processing = true;
+        const result = await api.saveCustomer(this.customer, this.shop._id);
+        this.$emit('save', result);
+      } catch ({ response }) {
+        const { data } = response || {};
+        this.errorMessage = data && data.error;
+      } finally {
+        this.processing = false;
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'customer-preferences-form.scss';
+</style>

package/components/pages/customer/preferences/preferences.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="CustomerPreferences__wrapper">
+    <customer-preferences-form
+      v-if="customer"
+      ref="customerForm"
+      :customer="customer"
+      @save="onSave"
+      @customer-loaded="onCustomerLoaded" />
+  </div>
+</template>
+
+<script>
+import api from '@lancom/shared/assets/js/api';
+import { mapGetters, mapActions } from 'vuex';
+import CustomerPreferencesForm from '@lancom/shared/components/customer/customer_preferences_form/customer-preferences-form';
+
+export default {
+  name: 'CustomerPreferences',
+  components: {
+    CustomerPreferencesForm
+  },
+  data() {
+    return {
+      customer: null,
+      loading: false,
+      error: null
+    };
+  },
+  computed: {
+    ...mapGetters(['shop']),
+    ...mapGetters('auth', ['user'])
+  },
+  async created() {
+    await this.loadCustomerData();
+  },
+  methods: {
+    ...mapActions('auth', ['update_user']),
+    async loadCustomerData() {
+      try {
+        this.processing = true;
+        const customer = await api.fetchCustomer(this.user.accessToken, this.shop._id);
+        console.log('customer: ', customer);
+        this.customer = customer;
+      } catch (e) {
+        console.log(e);
+        const errorMessage = e?.response?.data?.error;
+        this.$toastr.e(errorMessage || 'Customer failed to load');
+      } finally {
+        this.processing = false;
+      }
+    },
+    onSave({ customer: user, token }) {
+      this.$toastr.s('Customer successfully saved');
+      this.update_user({ user, token });
+    },
+    onCustomerLoaded(customer) {
+      this.customer = customer;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.loading-message {
+  text-align: center;
+  padding: 2rem;
+  font-size: 1.1rem;
+  color: #666;
+}
+
+.error-message {
+  text-align: center;
+  padding: 2rem;
+  color: #d32f2f;
+  background-color: #ffebee;
+  border-radius: 4px;
+  margin: 1rem 0;
+}
+</style>

package/components/product/product.vue

@@ -32,12 +32,6 @@
         <section class="Product__section">
           <wizard-editor />
         </section>
-        <!-- <section class="Product__section">
-          <product-colors-selector v-if="productDetails" />
-        </section> -->
-        <!-- <section class="Product__section">
-          <product-tier-prices :product="product" />
-        </section> -->
         <section class="Product__section">
           <product-fabric-and-size-info :product="product" />
         </section>
@@ -59,23 +53,17 @@ import RelatedProducts from '@lancom/shared/components/product/related_products/
 import Gallery from '@lancom/shared/components/product/gallery/gallery';
 import { generateProductLink } from '@lancom/shared/assets/js/utils/product';
 import ProductMainInfo from './layouts/product_main_info/product-main-info';
-import ProductColorsSelector from './product_colors_selector/product-colors-selector';
-import ProductTierPrices from './layouts/product_tier_prices/product-tier-prices';
 import ProductFabricAndSizeInfo from './layouts/product_fabric_and_size_info/product-fabric-and-size-info';
 import ProductPackaging from './layouts/product_packaging/product-packaging';
 import ProductModelMeasurements from './layouts/product_model_measurements/product-model-measurements';
 import ProductSizeTable from './layouts/product_size_table/product-size-table';
 import WizardEditor from './wizard-editor/wizard-editor.vue';
 
-    
-// import ProductLabelsCustomization from './layouts/product_labels_customization/product-labels-customization';
 
 export default {
   name: 'Product',
   components: {
     ProductMainInfo,
-    ProductColorsSelector,
-    ProductTierPrices,
     ProductFabricAndSizeInfo,
     ProductPackaging,
     ProductModelMeasurements,

package/components/product/product_reviews/product-reviews.vue

@@ -41,6 +41,12 @@ export default {
     ProductReview
   },
   mixins: [],
+  props: {
+    product: {
+      type: Object,
+      required: true
+    }
+  },
   data() {
     const reviews = this.product.reviews || [];
     const [, mainReviewId] = (this.$route.hash || '').match(/review-([a-z0-9]+)/i) || [];
@@ -56,12 +62,6 @@ export default {
       ].filter(review => !!review)
     };
   },
-  props: {
-    product: {
-      type: Object,
-      required: true
-    }
-  },
   computed: {
     currentReview() {
       return this.reviews[this.activeIndex];

package/components/product/related_products/related-products.vue

@@ -36,15 +36,15 @@ export default {
       products: []
     };
   },
+  async fetch() {
+    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
+    this.products = products.splice(0, 6);
+  },
   computed: {
     ...mapGetters(['shop']),
     hasProducts() {
       return this.products.length > 0;
     }
-  },
-  async fetch() {
-    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
-    this.products = products.splice(0, 6);
   }
 };
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.418",
+  "version": "0.0.419",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/pages/customer/preferences.vue

@@ -0,0 +1,33 @@
+<template>
+  <div
+    :data-aos="aosFadeLeft"
+    class="CustomerPreferencesPage__wrapper">
+    <customer-preferences />
+  </div>
+</template>
+
+<script>
+import metaInfo from '@lancom/shared/mixins/meta-info';
+
+export default {
+  name: 'CustomerPreferencesPage',
+  components: {
+    CustomerPreferences: () => import('@lancom/shared/components/pages/customer/preferences/preferences')
+  },
+  mixins: [metaInfo]
+};
+</script>
+
+<style lang="scss" scoped>
+  @import "@/assets/scss/variables";
+
+  .CustomerPreferencesPage {
+    &__wrapper {
+      margin: 100px auto;
+      width: 500px;
+      @media (max-width: $bp-extra-small-max) {
+        width: auto;
+      }
+    }
+  }
+</style>

package/routes/index.js

@@ -122,6 +122,11 @@ module.exports = function(routes, resolve, config) {
     path: '/customer/coupons',
     component: resolve('@lancom/shared/pages/customer/coupons.vue'),
     chunkName: 'pages/customer/coupons'
+  }, {
+    name: 'customer-preferences',
+    path: '/customer/preferences',
+    component: resolve('@lancom/shared/pages/customer/preferences.vue'),
+    chunkName: 'pages/customer/preferences'
   }, {
     name: 'customer-recovery',
     path: '/customer/recovery',
@@ -137,6 +142,11 @@ module.exports = function(routes, resolve, config) {
     path: '/customer/password/:token',
     component: resolve('@lancom/shared/pages/customer/password/_token.vue'),
     chunkName: 'pages/customer/password/reset'
+  }, {
+    name: 'customer-preferences',
+    path: '/customer/preferences',
+    component: resolve('@lancom/shared/pages/customer/preferences.vue'),
+    chunkName: 'pages/customer/preferences'
   }, {
     name: 'checkout-cart',
     path: '/checkout/cart',

package/store/index.js

@@ -4,9 +4,13 @@ import { getAuthToken } from '@lancom/shared/assets/js/utils/auth';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
 import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
+import { getSharePromise, clearAllSharePromises } from '@lancom/shared/assets/js/utils/share-promises';
+
 const cookieparser = process.server ? require('cookieparser') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
 
+const shareShopInfo = getSharePromise(60 * 1000);
+
 export const state = () => ({
   googleClickId: null,
   stockCountry: null,
@@ -69,9 +73,14 @@ export const actions = {
       await commit('setShop', shop);
     }
   },
-  async nuxtServerInit({ commit }, { req }) {
-    const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
-    const menus = await api.fetchMenus(shop._id);
+  async nuxtServerInit({ commit }, { req, query }) {
+    if (query?.cache === 'false') {
+      clearAllSharePromises();
+      await api.clearAllSharePromises();
+    }
+
+    const shop = await shareShopInfo.share(process.env.HOST_NAME, () => api.fetchShopByUrl(process.env.HOST_NAME));
+    const menus = await shareShopInfo.share(`menus_${shop._id}`, () => api.fetchMenus(shop._id));
     commit('setMenus', menus);
     commit('setShop', shop);
     // if (req.headers.cookie) {