@lancom/shared 0.0.451 → 0.0.453

package/assets/js/api/helpers.js

@@ -18,7 +18,7 @@ if (process.client) {
   axiosApiInstance.interceptors.response.use(
     response => response,
     error => {
-      if (error.response.status === 401) {
+      if (error.response?.status === 401) {
         removeAuthToken();
         const currentPath = window.location.pathname;
         if (currentPath && currentPath !== '/') {

package/assets/js/api/index.js

@@ -96,6 +96,9 @@ const api = {
   fetchRelatedProducts(shop, alias, params) {
     return _get(`shop/${shop}/products/${alias}/related-products`, params);
   },
+  fetchOtherProducts(shop, alias, params) {
+    return _get(`shop/${shop}/products/${alias}/other-products`, params);
+  },
   fetchHelpMessages(shop, group) {
     return _get(`shop/${shop}/help-messages/${group}`);
   },

package/assets/js/utils/fabric/selection-style.js

@@ -49,20 +49,21 @@ export function setupCustomControls(fabricHelper) {
   ['tl', 'bl', 'br'].forEach(key => {
     fabric.Object.prototype.controls[key].sizeX = 7;
     fabric.Object.prototype.controls[key].sizeY = 7;
+    fabric.Object.prototype.controls[key].actionName = 'scaling';
   });
 
   fabric.Object.prototype.controls.tr = new fabric.Control({
     x: 0.5,
     y: -0.5,
     cursorStyle: 'pointer',
-    mouseUpHandler: function(eventData, transform) {
+    mouseUpHandler(eventData, transform) {
       const target = transform.target;
       fabricHelper.dispatch('removeLayer', target.layer);
       fabricHelper.editor.remove(target);
       fabricHelper.editor.renderAll();
       return true;
     },
-    render: function(ctx, left, top, styleOverride, fabricObject) {
+    render(ctx, left, top, styleOverride, fabricObject) {
       const size = 10;
       ctx.save();
       ctx.translate(left, top);
@@ -91,7 +92,7 @@ export function setupCustomControls(fabricHelper) {
     cursorStyle: 'pointer',
     actionHandler: fabric.controlsUtils.rotationWithSnapping,
     actionName: 'rotate',
-    render: function(ctx, left, top, styleOverride, fabricObject) {
+    render(ctx, left, top, styleOverride, fabricObject) {
       if (rotateImg) {
         renderIcon(ctx, left, top, styleOverride, fabricObject, rotateImg);
       }
@@ -106,7 +107,7 @@ export function setupCustomControls(fabricHelper) {
     offsetY: -30,
     offsetX: 30,
     cursorStyle: 'pointer',
-    mouseUpHandler: function(eventData, transform) {
+    mouseUpHandler(eventData, transform) {
       const target = transform.target;
       const helper = fabricHelper;
 
@@ -134,7 +135,7 @@ export function setupCustomControls(fabricHelper) {
 
       return true;
     },
-    render: function(ctx, left, top, styleOverride, fabricObject) {
+    render(ctx, left, top, styleOverride, fabricObject) {
       if (centerImg) {
         renderIcon(ctx, left, top, styleOverride, fabricObject, centerImg);
       } else {

package/assets/js/utils/fabric-helper.js

@@ -275,13 +275,7 @@ export default class FabricHelper {
     object.on('rotating', () => {
       this.dispatch('setField', { field: 'angle', value: parseInt(object.angle) });
     });
-    object.on('moved', () => {
-      this.dispatch('setField', { field: 'top', value: Math.round(object.top) });
-      this.dispatch('setField', { field: 'left', value: Math.round(object.left) });
-    });
-    object.on('moving', () => this.checkBoundingIntersection(object));
     object.on('scaling', () => {
-      this.checkBoundingIntersection(object);
       if (object.type === 'art') {
         const measure = this.getEditorDPI();
         const originalRatio = object.originalSize.width / object.width;
@@ -290,17 +284,16 @@ export default class FabricHelper {
       }
     });
 
-    object.on('scaled', () => {
-      this.dispatch('setField', { field: 'boundingRect', value: object.getBoundingRect() });
-    });
-    object.on('moved', () => {
+    object.on('modified', () => {
+      this.dispatch('setField', { field: 'top', value: Math.round(object.top) });
+      this.dispatch('setField', { field: 'left', value: Math.round(object.left) });
       this.dispatch('setField', { field: 'boundingRect', value: object.getBoundingRect() });
     });
     /*
     ** TEXT OBJECT EVENTS
     */
     if (type === 'text') {
-      object.on('scaled', target => {
+      object.on('modified', target => {
         const fontSize = Math.round(object.fontSize * object.scaleX);
         // const strokeWidth = Math.round(object.strokeWidth * object.scaleX);
         this.dispatch('setField', { field: 'fontSize', value: fontSize });
@@ -331,7 +324,7 @@ export default class FabricHelper {
     ** ART OBJECT EVENTS
     */
     if (type === 'art') {
-      object.on('scaled', () => {
+      object.on('modified', () => {
         this.dispatch('setField', { field: 'scaleX', value: object.scaleX });
         this.dispatch('setField', { field: 'scaleY', value: object.scaleY });
       });

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue

@@ -386,11 +386,12 @@ export default {
       });
       this.fabricHelper.on('removeLayer', (layer) => {
         setTimeout(() => {
-          if (!this.editModeSelectedLayer) {
-            this.removeTemplateLayer(layer);
-          } else if (!layer.copy) {
-            this.fabricHelper.dispatch('setField', { field: 'isEditMode', value: false });;
-          }
+          this.removeTemplateLayer(layer);
+          // if (!this.editModeSelectedLayer) {
+          //   this.removeTemplateLayer(layer);
+          // } else if (!layer.copy) {
+          //   this.fabricHelper.dispatch('setField', { field: 'isEditMode', value: false });;
+          // }
         }, 100);
       });
       this.fabricHelper.on('outOfPrintArea', this.setOffsetWarningVisibility);
@@ -462,7 +463,7 @@ export default {
     async createTextLayer() {
       this.addedFromCanvas = true;
       window.scrollTo(0, 0);
-      const layer = await this.createLayer({ type: 'text', isEditMode: this.isEditMode });
+      const layer = this.printAreaLayers?.length > 0 ? this.printAreaLayers[0] : (await this.createLayer({ type: 'text', isEditMode: this.isEditMode }));
       this.visibleWireframe = true;
       if (!this.isEditMode) {
         setTimeout(() => {

package/components/product/other_products/other-products.vue

@@ -29,9 +29,13 @@ export default {
     OtherProduct
   },
   props: {
-    additionalCondition: {
+    product: {
       type: Object,
-      default: () => ({})
+      required: true
+    },
+    toEditor: {
+      type: Boolean,
+      default: true
     },
     limit: {
       type: Number,
@@ -55,13 +59,11 @@ export default {
       try {
         this.loading = true;
         const condition = {
-          ...this.additionalCondition,
           country: this.country?._id,
           currency: this.currency?._id,
           limit: this.limit
         };
-        this.products = (await api.fetchProducts(this.shop._id, condition)).products;
-        console.log('this.products: ', this.products);
+        this.products = (await api.fetchOtherProducts(this.shop._id, this.product.alias, condition)).products;
       } catch (e) {
       } finally {
         this.loading = false;

package/mixins/product-view.js

@@ -125,7 +125,8 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
       return (thumbProductImages.length > 0 ? thumbProductImages : this.images).slice(0, 6);
     },
     mainProductImageSrc() {
-      return this.mainProductImage && staticLink(this.mainProductImage.extralarge || this.mainProductImage.large);
+      const image = (this.isEditor && this.mainProductImage.extralarge) || this.mainProductImage.large;
+      return this.mainProductImage && staticLink(image);
     },
     mainProductImageStyles() {
       return this.mainProductImageSrc ? { 'background-image': `url(${this.mainProductImageSrc});` } : {};
@@ -342,7 +343,7 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING, isEditor = false) => ({
     if (brand) {
       productSchema.brand = {
         '@type': 'Brand',
-        logo: staticLink(brand.logo),
+        logo: staticLink(brand.smallLogo || brand.logo),
         name: brand.name
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.451",
+  "version": "0.0.453",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/simpletee/lancom-shared#readme",
   "dependencies": {
+    "axios": "0.21.4",
     "basic-auth": "^2.0.1",
     "lodash.get": "^4.4.2",
     "nuxt-client-init-module": "^0.3.0",