@lancom/shared 0.0.151 → 0.0.153

package/assets/js/api/helpers.js

@@ -4,6 +4,7 @@ const Cookie = process.client ? require('js-cookie') : undefined;
 const axiosApiInstance = axios.create();
 
 if (process.client) {
+  console.log('error: ');
   axiosApiInstance.interceptors.request.use(
     config => {
       const auth = Cookie.get('auth');
@@ -13,8 +14,18 @@ if (process.client) {
       return config;
     },
     error => {
-      Promise.reject(error);
+      return Promise.reject(error);
     });
+    axiosApiInstance.interceptors.response.use(
+      response => response,
+      error => {
+        if (error.response.status === 401) {
+          Cookie.remove('auth');
+          window.location ='/';
+          return;
+        }
+        return Promise.reject(error);
+      });
 }
 
 const API_URL = process.client ? process.env.API_URL : process.env.LOCAL_API_URL;

package/assets/js/utils/filters.js

@@ -82,6 +82,8 @@ export const date = d => dayjs(d).format('ddd, MMM D, YYYY h:mm A');
 
 export const shortDate = d => dayjs(d).format('DD/MM/YYYY');
 
+export const shortUtcDate = d => dayjs(d).utc().format('DD/MM');
+
 export const sydneyTime = d => dayjs(d).utc().utcOffset(10).format('MMM D, YYYY h:mm A');
 
 export const priceInRange = (prices, amount) => ((prices || []).find(({ min, max }) => min <= amount && (!max || max >= amount)) || { price: 0 }).price;

package/assets/js/utils/prints.js

@@ -1,3 +1,5 @@
+import { generateGUID } from '@lancom/shared/assets/js/utils/guid';
+
 export function getPrintAreasSizes(printAreas, side) {
   return printAreas
     .filter(printArea => !side || printArea.side === side)
@@ -38,6 +40,7 @@ export function getPrintsFromLayers(layers, product) {
       const { setupCost, printCost, freeSetupOver } = getPrintTypeSizePricing(layerPrintType, printSize) || {};
       const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
       const data = {
+        guid: layer.printGuid || generateGUID(),
         printArea: getSimpleObj(layerPrintArea),
         printType: getSimpleObj(layerPrintType),
         printSize: getSimpleObj(layerPrintSize),
@@ -48,8 +51,10 @@ export function getPrintsFromLayers(layers, product) {
         layers: [generatePrintLayer(layer)]
       };
       prints.set(printArea, data);
+      layer.printGuid = data.guid;
     } else {
       const print = prints.get(printArea);
+      layer.printGuid = print.guid;
       print.layers.push(generatePrintLayer(layer));
       prints.set(printArea, print);
     }

package/components/faq/faq.vue

@@ -223,6 +223,7 @@ $types: delivery, general, other, printing, garments;
       line-height: 25px;
       letter-spacing: 0.02em;
       color: $dark_blue;
+      padding-right: 40px;
     }
     &-body {
       padding: 6px 30px 24px 30px;

package/components/product/product_prints_price_info/product-prints-price-info.vue

@@ -3,8 +3,7 @@
     <div class="ProductPrintsPriceInfo__toggle-gst">
       <checkbox
         v-model="inclGST"
-        :dark="true"
-        @change="onChangeInclGST">
+        :dark="true">
         <div class="ml-5">Inc. GST</div>
       </checkbox>
     </div>
@@ -46,7 +45,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import Tabs from '@lancom/shared/components/common/tabs';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 import { PRINT_TYPES, PRINT_TYPES_LIST } from '@lancom/shared/assets/js/constants/print-type';
@@ -68,8 +67,7 @@ export default {
   },
   data() {
     return {
-      inclGST: false,
-      inclGSTFinal: false,
+      inclGSTFinal: true,
       inclGSTSpinner: false,
       inclGSTSpinnerTimer: null,
       orderPrintTypes: PRINT_TYPES_LIST,
@@ -91,6 +89,7 @@ export default {
   },
   computed: {
     ...mapGetters(['shop']),
+    ...mapGetters('product', ['priceIncludeGST']),
     ...mapGetters(['helpMessages']),
     hasPrintSurcharge() {
       return this.product.printSurcharge > 0;
@@ -111,6 +110,19 @@ export default {
     currentPrintTypeMessage() {
       const { message } = this.helpMessages[this.selectedTab] || {};
       return message || '';
+    },
+    inclGST: {
+      get() {
+        return this.priceIncludeGST;
+      },
+      set(value) {
+        this.setPriceIncludeGST(value);
+      }
+    }
+  },
+  watch: {
+    inclGST() {
+      this.onChangeInclGST();
     }
   },
   mounted() {
@@ -125,6 +137,7 @@ export default {
   },
   methods: {
     ...mapActions(['loadHelpMessages']),
+    ...mapMutations('product', ['setPriceIncludeGST']),
     onChangeInclGST() {
       clearTimeout(this.inclGSTSpinnerTimer);
       this.inclGSTSpinner = true;

package/components/products/products_autocomplete/products-autocomplete.scss

@@ -29,11 +29,11 @@
       }
     }
     &-all {
+      border-top: 1px solid $gray_main;
       padding: 10px;
       text-align: center;
       display: block;
       background-color: $white;
-      border-bottom: 1px solid $gray_main;
       &:hover {
         background-color: $black;
         color: $white;

package/components/products/products_autocomplete/products-autocomplete.vue

@@ -27,13 +27,6 @@
         <spinner v-if="searching" />
       </div>
       <div v-if="hasProducts">
-        <products-autocomplete-item
-          v-for="product of products"
-          :key="product._id"
-          :to-editor="false"
-          :product="product"
-          class="ProductsAutocomplete__result-item"
-          @select="$emit('select', product)" />
         <div class="ProductsAutocomplete__result-item">
           <nuxt-link
             class="ProductsAutocomplete__result-item-all"
@@ -41,6 +34,13 @@
             click to see all results
           </nuxt-link>
         </div>
+        <products-autocomplete-item
+          v-for="product of products"
+          :key="product._id"
+          :to-editor="false"
+          :product="product"
+          class="ProductsAutocomplete__result-item"
+          @select="$emit('select', product)" />
       </div>
     </div>
   </div>

package/components/products/products_colors/products-colors.scss

@@ -57,4 +57,11 @@
       margin: 1px 4px;
     }
   }
+  &__toggle-list {
+    margin-top: 5px;
+    margin-right: 10px;
+    font-size: 11px;
+    cursor: pointer;
+    text-align: right;
+  }
 }

package/components/products/products_colors/products-colors.vue

@@ -21,7 +21,7 @@
       </div>
       <div class="ProductsColors__items">
         <products-link
-          v-for="color in colors"
+          v-for="color in visibleColors"
           :key="color._id"
           v-tooltip="color.name"
           :color="color.alias">
@@ -37,6 +37,12 @@
           </div>
         </products-link>
       </div>
+      <div
+        v-if="shortListColorsLimit < colorsCount"
+        @click="toggleDisplayAllColors()"
+        class="ProductsColors__toggle-list">
+        {{ displayAllColors ? 'Hide all colours' : 'Show all colours' }}
+      </div>
     </toggle-content>
   </div>
 </template>
@@ -56,14 +62,22 @@ export default {
   },
   data() {
     return {
-      canLoadImages: false
+      canLoadImages: false,
+      displayAllColors: false,
+      shortListColorsLimit: 15
     };
   },
   computed: {
     ...mapGetters('products', ['colors']),
+    colorsCount() {
+      return this.colors.length;
+    },
     selectedColors() {
       const colors = (this.$route.query.colors || '').split(',');
       return this.colors.filter(color => colors.includes(color.alias));
+    },
+    visibleColors() {
+      return this.displayAllColors ? this.colors : this.colors.slice(0, this.shortListColorsLimit);
     }
   },
   mounted() {
@@ -74,6 +88,9 @@ export default {
   methods: {
     isSelectedColor(color) {
       return this.selectedColors.some(c => c._id === color._id);
+    },
+    toggleDisplayAllColors() {
+      this.displayAllColors = !this.displayAllColors;
     }
   }
 };

package/components/subscribe/subscribe.vue

@@ -29,7 +29,7 @@
               v-slot="{ errors }"
               tag="div"
               name="Email"
-              rules="required"
+              rules="required|email"
               class="form-row">
               <input
                 :id="'email' + uniqueKey"

package/nuxt.config.js

@@ -56,6 +56,7 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
     // { src: '@/node_modules/@lancom/shared/plugins/vue-tables-2', ssr: false }
   ],
   modules: [
+    'nuxt-helmet',
     '@nuxtjs/axios',
     '@nuxtjs/dotenv',
     '@nuxtjs/sitemap',

package/package.json

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

package/plugins/vee-validate.js

@@ -12,7 +12,26 @@ extend('required', {
     return `${name} attribute is mandatory`;
   }
 });
-extend('email', email);
+console.log('ValidationObserver:email', email);
+extend('email', {
+  ...email,
+  validate(value) {
+    if (email.validate(value)) {
+      const auDomain = value.match(/\.co[a-z]+\.au$/i);
+      const comDomain = value.match(/\.co[a-z]+$/i);
+      if (auDomain && auDomain[0]) {
+        return auDomain[0] === '.com.au';
+      } else if (comDomain && comDomain[0]) {
+        return comDomain[0] === '.com';
+      }
+      return true;
+    }
+    return false;
+  }
+  // message(name) {
+  //   return `${name} attribute is mandatory`;
+  // }
+});
 extend('max', max);
 extend('float', float);
 extend('min_value', minValue);

package/store/cart.js

@@ -66,9 +66,12 @@ export const getters = {
 export const actions = {
   async addToCart({ state, commit }, { entities, shop, pricing }) {
     const addingEntities = [...entities];
-    const withoutPrints = e => (e.prints || []).length === 0;
+    const isSamePrints = (e, e2) => {
+      const samePrints = (e.prints || []).filter(p => (e2.prints || []).some(p2 => p2.guid === p.guid));
+      return (e.prints || []).length === samePrints.length;
+    };
     entities = entities.map(e => {
-      const entitiy = withoutPrints(e) && state.entities.find(e2 => withoutPrints(e2) && e2?.product?._id === e?.product?._id);
+      const entitiy = state.entities.find(e2 => isSamePrints(e, e2) && e2?.product?._id === e?.product?._id);
       if (entitiy) {
         e.simpleProducts.forEach(sp => {
           const simpleProduct = entitiy.simpleProducts.find(sp2 => sp2.SKU === sp.SKU);

package/store/product.js

@@ -9,6 +9,7 @@ import { getProductsForCalculatePricing } from '@lancom/shared/assets/js/utils/p
 import { sortByName } from '../assets/js/utils/filters';
 
 export const state = () => ({
+  priceIncludeGST: true,
   product: null,
   preSetPrint: null,
   loadError: null,
@@ -124,6 +125,7 @@ export const getters = {
     return [...imagesGroups.values()].reduce((images, group) => [...images, ...group], []);
   },
   editableSide: ({ editableSide }) => editableSide,
+  priceIncludeGST: ({ priceIncludeGST }) => priceIncludeGST,
   hasUnprintedPrice: ({ product }) => product.minUnprintedPrice || product.maxUnprintedPrice
 };
 
@@ -226,6 +228,9 @@ export const mutations = {
   setProduct(state, product) {
     state.product = product;
   },
+  setPriceIncludeGST(state, priceIncludeGST) {
+    state.priceIncludeGST = priceIncludeGST;
+  },
   setLoadError(state, error) {
     state.loadError = error;
   },