@threedddplus/logoeditor 0.0.121 → 0.0.122

package/dist/components/Rightmenu/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const fontFamilies: {
     name: string;
+    label: string;
     src: string;
 }[];
 export declare const textShapes: {

package/dist/logoeditor.cjs.development.js

@@ -2997,18 +2997,18 @@ var fabricSlice = function fabricSlice(set, get) {
         filterValue: event
       });
       if (event === 'All') {
-        get().setFilteredMascots(get().availableMascots.map(function (item) {
-          return item.thumbnail;
-        }));
+        get().setFilteredMascots(get().availableMascots
+        // get().availableMascots.map((item) => item.thumbnail)
+        );
       } else {
         var filteredData = get().availableMascots.filter(function (item) {
           return item.tags.includes(event);
         });
-        get().setFilteredMascots(filteredData.map(function (item) {
-          return item.thumbnail;
-        }));
+        get().setFilteredMascots(filteredData);
+        // get().setFilteredMascots(filteredData.map((item) => item.thumbnail));
       }
     },
+
     filterValue: '',
     displayProductColor: false,
     setDisplayProductColor: function setDisplayProductColor() {
@@ -3963,6 +3963,7 @@ var converterSlice = function converterSlice(set, get) {
     if (canvasToLoad === void 0) {
       canvasToLoad = use3dddPlus.getState().popupCanv;
     }
+    // console.log("svgstr\n",svgstr , 'color-VAL\n',colorValue ,'canvas\n' ,canvasToLoad);
     fabric.fabric.loadSVGFromString(
     //@ts-ignore
     new String(svgstr), function (objects, options) {
@@ -3984,6 +3985,7 @@ var converterSlice = function converterSlice(set, get) {
             node = item;
           }
         });
+        console.log(node, path);
         if (node && path) {
           var _resItem$node$childre, _resItem$node$childre2;
           var fontSize = (_resItem$node$childre = resItem.node.children[0]) == null ? void 0 : (_resItem$node$childre2 = _resItem$node$childre.getAttribute('font-size')) == null ? void 0 : _resItem$node$childre2.replace('px', '');
@@ -4367,12 +4369,14 @@ var converterSlice = function converterSlice(set, get) {
       if (convert === void 0) {
         convert = true;
       }
+      console.log("ext\n", ext);
       // use3dddPlus.setState({ uploadImageModalDisplay: true });
       use3dddPlus.setState({
         loading: true
       });
       if (convert) {
         if (isSVG) {
+          console.log("entering into fileupload-->");
           var reader = new FileReader();
           reader.onload = function (e) {
             use3dddPlus.setState({
@@ -4382,6 +4386,7 @@ var converterSlice = function converterSlice(set, get) {
           };
           reader.readAsText(data);
         } else {
+          console.log("entering INTO ImageTracer-->");
           ImageTracer.imageToSVG(data, function (svgstr) {
             use3dddPlus.setState({
               imageData: svgstr
@@ -4390,6 +4395,7 @@ var converterSlice = function converterSlice(set, get) {
           }, ext && (ext.toLowerCase() === 'jpg' || ext.toLowerCase() === 'jpeg') ? optionpresets.jpg : ext.toLowerCase() === 'png' ? optionpresets.png : optionpresets["default"]);
         }
       } else {
+        console.log("entering iINTO PROCESSIMAGE--->");
         processImage(data, 8);
       }
     },
@@ -6810,36 +6816,19 @@ var PopUpCanvas = function PopUpCanvas() {
       popupCanvas: popupCanvas
     });
     popupCanvas.setActiveObject(sel);
-    // {
-    //   _objects: sel._objects.filter((obj) => obj.type !== 'line'),
-    // }
-    // popupCanvas.remove(...popupCanvas.getObjects());
     popupCanvas.requestRenderAll();
     var clipboard;
     popupCanvas.getActiveObject().clone(function (cloned) {
       clipboard = cloned;
-      // });
-      // if (clipboard.type === 'activeSelection') {
-      //   clipboard.canvas = canvas;
-      //   const objs = [];
-      //   clipboard.forEachObject(function (obj) {
-      //     objs.push(obj);
-      //   });
-      //   const alltogetherObj = new fabric.Group(objs, {});
-      //   canvas.centerObject(alltogetherObj);
-      //   canvas.add(alltogetherObj);
-      //   canvas.setActiveObject(alltogetherObj);
-      //   alltogetherObj.setCoords();
-      //   use3dddPlus.getState().forStoringAllObject(alltogetherObj); //for pushing the data into array for layers
-      // } else {
-      //   canvas.add(clipboard);
-      // }
-      // canvas.requestRenderAll();
-      // popupCanvas.clear();
       if (clipboard && clipboard.type === 'activeSelection') {
         clipboard.canvas = canvas;
         var objs = [];
         clipboard.forEachObject(function (obj) {
+          if (!obj.id) {
+            obj.set({
+              id: use3dddPlus.getState().guid()
+            });
+          }
           objs.push(obj);
         });
         var alltogetherObj = new fabric.fabric.Group(objs, {});
@@ -6848,7 +6837,8 @@ var PopUpCanvas = function PopUpCanvas() {
         canvas.setActiveObject(alltogetherObj);
         alltogetherObj.set({
           //@ts-ignore
-          colorFill: use3dddPlus.getState().colorFill
+          colorFill: use3dddPlus.getState().colorFill,
+          id: use3dddPlus.getState().guid()
         });
         alltogetherObj.setCoords();
         use3dddPlus.getState().forStoringAllObject(alltogetherObj); //for pushing the data into array for layers
@@ -7336,7 +7326,7 @@ var PopUpCanvas = function PopUpCanvas() {
   }));
 };
 
-// import sharp from 'sharp';
+// import axios from 'axios';
 var UploadLogo = function UploadLogo() {
   var _useState = React.useState(null),
     setSelectedFile = _useState[1];
@@ -7360,7 +7350,7 @@ var UploadLogo = function UploadLogo() {
 
   var svgConverter = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-      var ext, tiffData, aiToSvg, formData, response, blob, imageUrl;
+      var ext, tiffData, aiToSvg, formData, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -7374,7 +7364,7 @@ var UploadLogo = function UploadLogo() {
               break;
             }
             imageToSVG(data, ext, true);
-            _context.next = 36;
+            _context.next = 27;
             break;
           case 6:
             if (!(ext === 'tif' || ext === 'tiff')) {
@@ -7386,14 +7376,13 @@ var UploadLogo = function UploadLogo() {
           case 9:
             tiffData = _context.sent;
             imageToSVG(tiffData, ext);
-            _context.next = 36;
+            _context.next = 27;
             break;
           case 13:
             if (!(ext === 'ai' || ext === 'pdf')) {
               _context.next = 21;
               break;
             }
-            // console.log(loadImageFromURL);
             use3dddPlus.setState({
               loading: true
             });
@@ -7401,7 +7390,6 @@ var UploadLogo = function UploadLogo() {
             return aiConvert(data);
           case 17:
             aiToSvg = _context.sent;
-            // console.log(aiToSvg)
             fetch(aiToSvg.s3_file_url + '?timestamp=' + Date.now()).then(function (response) {
               return response.text();
             }).then(function (svgText) {
@@ -7412,41 +7400,44 @@ var UploadLogo = function UploadLogo() {
                 loading: false
               });
             });
-            _context.next = 36;
+            _context.next = 27;
             break;
           case 21:
-            // const imageBuffer = await sharp(data)
-            //   .resize(300, 300) // Resize the image to 300x300 pixels
-            //   .toBuffer();
-            // const imaeBlob = new Blob([imageBuffer], { type: 'image/png' });
-            // let objectURL = URL.createObjectURL(data);
             formData = new FormData();
             formData.append('image', data);
-            console.log(formData);
-            _context.next = 26;
-            return fetch('https://imagesharpher-f4b4o225iq-ue.a.run.app/upload', {
+            /*  axios({
+                url: "https://vectorizer.ai/api/v1/vectorize",
+                method: "POST",
+                headers :{
+                  user: 'vks34swmmj4s8wg',
+                  pass: 'f9ivolvk1mc5khc7ja53bp2rst5d4cuk5q02oqfoj3mn1ag3sig2',
+                },
+                data: formData,
+            })
+            .then((res) => {console.log(res);})
+            .catch((err) => {console.log(err)});*/
+            _context.next = 25;
+            return fetch('https://vectorizer.ai/api/v1/vectorize', {
               method: 'POST',
+              headers: {
+                user: 'vks34swmmj4s8wg',
+                pass: 'f9ivolvk1mc5khc7ja53bp2rst5d4cuk5q02oqfoj3mn1ag3sig2'
+              },
               body: formData
             });
-          case 26:
+          case 25:
             response = _context.sent;
-            if (!response.ok) {
-              _context.next = 35;
-              break;
+            if (response.ok) {
+              console.log(response);
+              // const blob = await response.blob();
+              // const imageUrl = URL.createObjectURL(blob);
+              // imageToSVG(imageUrl, ext);
+            } else {
+              alert('Failed to process the image');
             }
-            _context.next = 30;
-            return response.blob();
-          case 30:
-            blob = _context.sent;
-            imageUrl = URL.createObjectURL(blob); // setProcessedImage(imageUrl);
-            imageToSVG(imageUrl, ext);
-            _context.next = 36;
-            break;
-          case 35:
-            alert('Failed to process the image');
-          case 36:
+          case 27:
             setSelectedFile(null);
-          case 37:
+          case 28:
           case "end":
             return _context.stop();
         }
@@ -8379,81 +8370,107 @@ var Layers = function Layers(_ref) {
 
 var fontFamilies = [{
   name: 'Accel',
+  label: 'Accel',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/accelerator_richardson.woff'
 }, {
   name: 'Athletic Block',
+  label: 'Athletic Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/athletic.ttf'
 }, {
   name: 'Ballpark',
+  label: 'Ballpark',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/ballpark.TTF'
 }, {
   name: 'BebasKai',
+  label: 'BebasKai',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/BebasKai.otf'
 }, {
   name: 'Beton CG ExtraBold',
+  label: 'Beton CG ExtraBold',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/Beton_CG_ExtraBold_Regular.otf'
 }, {
   name: 'Brush Script',
+  label: 'Brush Script',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/brush-script-3.ttf'
 }, {
   name: 'Century',
+  label: 'Century',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/richcent.woff'
 }, {
   name: 'City Block',
+  label: 'City Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/cityb.woff'
 }, {
   name: 'Condensed Block',
+  label: 'Condensed Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/aoalpha0.woff'
 }, {
   name: 'Copper',
+  label: 'Copper',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/copgothb.woff'
 }, {
   name: 'Euro Block',
+  label: 'Euro Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/handgotb.woff'
 }, {
   name: 'Full Block',
+  label: 'Full Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/full_block.woff'
 }, {
   name: 'Heritage',
+  label: 'Heritage',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/bebaskai-regular.woff'
 }, {
   name: 'LakesightPersonalUseOnly',
+  label: 'Lakesight',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/SocietyEditor_Personal_Use.ttf'
 }, {
   name: 'Machine',
+  label: 'Machine',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/machinen.woff'
 }, {
   name: 'Magento',
+  label: 'Magento',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/magnetob.woff'
 }, {
   name: 'Niramit Extrabold',
+  label: 'Niramit',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/Niramit-Bold.ttf'
 }, {
   name: 'Plain',
+  label: 'Plain',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/plain.woff'
 }, {
   name: 'Pro Block',
+  label: 'Pro Block',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/pro_block.woff'
 }, {
   name: 'Puff',
+  label: 'Puff',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/new.woff'
 }, {
   name: 'SocietyEditorPersonalUse',
+  label: 'Society',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/SocietyEditor_Personal_Use.ttf'
 }, {
   name: 'Square',
+  label: 'Square',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/sqr721be.woff'
 }, {
-  name: 'Swiss Condensed',
+  name: 'Swiss721BT-BoldCondensed',
+  label: 'Swiss Condensed',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/swz721bc.woff'
 }, {
   name: 'Tiffany',
+  label: 'Tiffany',
   src: 'https://storage.googleapis.com/3ddplusgcp/logoEditor/assets/fonts/tiffany.woff'
 }, {
   name: 'Times',
+  label: 'Times',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/timesrich.woff'
 }, {
   name: 'Uni Script',
+  label: 'Uni Script',
   src: 'https://storage.googleapis.com/3ddplusgcp/richardson-customizer/fonts/scrpjet2.woff'
 }];
 var textShapes = [{
@@ -8558,7 +8575,7 @@ var TextProperties = function TextProperties(_ref) {
   }, fontFamilies.map(function (list) {
     return React__default.createElement(React__default.Fragment, null, React__default.createElement("option", {
       value: list.name
-    }, list.name));
+    }, list.label));
   })), React__default.createElement("div", {
     className: "uppercase font-bold text-sm mb-[8.5px]"
   }, "Style"), React__default.createElement("div", {
@@ -8957,7 +8974,9 @@ var Properties = function Properties(_ref2) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             fontFamily = e.target.value;
-            textSelected.set('fontFamily', fontFamily);
+            textSelected.set({
+              'fontFamily': fontFamily
+            });
             textSelected.set({
               text: textInfo,
               charSpacing: 0
@@ -10214,7 +10233,7 @@ var Rightmenu = function Rightmenu() {
       use3dddPlus.setState({
         showCrossSave: true
       });
-      if (canvas.getObjects().length > 0) {
+      if (canvas.getObjects().length > 2) {
         var hasTransparent = allColor.includes('transparent');
         var colorCount = hasTransparent ? allColor.length - 1 : allColor.length;
         if (colorCount < 9) {
@@ -14130,9 +14149,7 @@ var AddMascot = function AddMascot() {
       });
     });
     use3dddPlus.getState().setAvailableMascots(availableMascots);
-    use3dddPlus.getState().setFilteredMascots(availableMascots.map(function (item) {
-      return item.thumbnail;
-    }));
+    use3dddPlus.getState().setFilteredMascots(availableMascots);
   }, []);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
     className: "bg-[#F7F7F7] absolute z-100 w-[90%] h-full pr-[56px]"
@@ -14174,16 +14191,16 @@ var AddMascot = function AddMascot() {
         boxShadow: '0px 0px 6px #98989829'
       },
       onClick: function onClick() {
-        return stockLogoHandler(logo);
+        return stockLogoHandler(logo.thumbnail);
       }
     }, React__default.createElement(CardMedia, {
-      src: logo,
+      src: logo.thumbnail,
       imageClass: "h-full m-[15px] mb-0"
     }), React__default.createElement(CardBody, {
       bodyClass: "p-2.5"
     }, React__default.createElement(CardTitle, {
       titleClass: "text-[11px] uppercase flex justify-center",
-      name: availableMascots[index].name
+      name: logo.name
     })));
   }) : 'No Stock Logos')))), loading && React__default.createElement(Loader, null));
 };
@@ -14402,6 +14419,13 @@ var SaveDesign = function SaveDesign(_ref) {
               console.log('ERROR in Save Logo:', ex);
             });
           case 30:
+            use3dddPlus.setState({
+              logoName: ''
+            });
+            use3dddPlus.setState({
+              logoTag: []
+            });
+          case 32:
           case "end":
             return _context.stop();
         }
@@ -14758,6 +14782,9 @@ var LogoEditor = function LogoEditor(_ref) {
   var _useState = React.useState([]),
     fontFamilies = _useState[0],
     setFontFamilies = _useState[1];
+  React.useEffect(function () {
+    setSelectedStepper(stepperId);
+  }, [stepperId]);
   React.useEffect(function () {
     setSelectedStepper(stepperId);
     if (stepperId === undefined) {
@@ -14779,7 +14806,15 @@ var LogoEditor = function LogoEditor(_ref) {
     })["catch"](function (error) {
       return console.error('Error fetching font families:', error);
     });
-  }, [stepperId, customLogoColorList, defaultColorList, customerId, logoData, myLogoHandler, setSelectedStepper]);
+  }, [
+    // stepperId,
+    // customLogoColorList,
+    // defaultColorList,
+    // customerId,
+    // logoData,
+    // myLogoHandler,
+    // setSelectedStepper,
+  ]);
   return React__default.createElement(Modal, {
     backdropStyle: "z-[7]",
     contentStyle: "top-0 bottom-0 !m-[auto] z-[7] w-[80%] p-0",