CONFIG put all startY into the settings as a config object

AndreKelling · Feb 16, 2024 · 0d7e8b5 · 0d7e8b5
1 parent b398c17
commit 0d7e8b5
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 12 deletions.
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspdf-product-label",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "src/app.js",
   "author": "André Kelling",
   "description": "Dymo Label PDF printing.",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jspdf-template-labelprint",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "src/app.js",
   "author": "André Kelling",
   "description": "Dymo Label PDF template",

diff --git a/src/print/index.js b/src/print/index.js
@@ -21,16 +21,14 @@ export default (printDataArr) => {
 
     settings(doc);
 
-    let startY = 18;
-
     const pageWidth = doc.internal.pageSize.width;
 
     // <><>><><>><>><><><><><>>><><<><><><><>
     // COMPONENTS
     // <><>><><>><>><><><><><>>><><<><><><><>
 
     printDataArr.forEach((printData, index) => {
-        titles(doc, printData, startY, pageWidth);
+        titles(doc, printData, pageWidth);
 
         bulletPoints(doc, printData.bulletPoints, pageWidth);
 

diff --git a/src/print/partials/bullet-points.js b/src/print/partials/bullet-points.js
@@ -13,7 +13,7 @@ export default (doc, bulletPoints, pageWidth) => {
     }
 
     const startX = 2;
-    let startY = 37;
+    let startY = doc.vars.startY.bulletPoints;
     const lineSpacing = doc.vars.lineSpacing - 1.6;
 
     doc.setFontSize(doc.vars.fontSizes.NormalFontSize);

diff --git a/src/print/partials/logo.js b/src/print/partials/logo.js
@@ -13,7 +13,7 @@ export default (doc, logo) => {
         return;
     }
 
-    const startY = 1;
+    const startY = doc.vars.startY.logo;;
     const pageWidth = doc.internal.pageSize.width;
     const pageWidthInPx = Math.round((pageWidth - 4) * mmDpiFactor);  // minus 4mm, 2mm spacing for each side
     const maxHeightLogo = 18; // in mm from first startY for the productName

diff --git a/src/print/partials/product-code.js b/src/print/partials/product-code.js
@@ -13,7 +13,7 @@ export default (doc, productCode, pageWidth) => {
         return;
     }
     const pageCenterX = pageWidth / 2;
-    let startY = 55;
+    let startY = doc.vars.startY.productCode;
 
     doc.setFontSize(doc.vars.fontSizes.SmallFontSize);
 

diff --git a/src/print/partials/product-id.js b/src/print/partials/product-id.js
@@ -12,7 +12,7 @@ export default (doc, productId, pageWidth) => {
         return;
     }
     const pageCenterX = pageWidth / 2;
-    let startY = 86;
+    let startY = doc.vars.startY.productId;
 
     doc.setFontSize(doc.vars.fontSizes.IdFontSize);
 

diff --git a/src/print/partials/qr-code.js b/src/print/partials/qr-code.js
@@ -12,7 +12,7 @@ export default (doc, qrCode, pageWidth) => {
     if (!qrCode) {
         return;
     }
-    const startY = 57;
+    const startY = doc.vars.startY.qrCode;
     const qrCodeDimension = 63;
     const maxWidthInPx = qrCodeDimension;
     const maxHeightInPx = qrCodeDimension;

diff --git a/src/print/partials/settings.js b/src/print/partials/settings.js
@@ -17,6 +17,15 @@ export default (doc) => {
     // SETTINGS
     // <><>><><>><>><><><><><>>><><<><><><><>
 
+    doc.vars.startY = {
+        logo: 1,
+        titles:14,
+        bulletPoints:37,
+        productCode:55,
+        qrCode:57,
+        productId:86
+    };
+
     doc.vars.fontSizes = {
         TitleFontSize:14,
         SubTitleFontSize:12,

diff --git a/src/print/partials/titles.js b/src/print/partials/titles.js
@@ -5,11 +5,11 @@ import JsPDF from 'jspdf';
  *
  * @param {JsPDF} doc
  * @param {PrintData} printData
- * @param {number} startY
  * @param {number} pageWidth
  */
-export default (doc, printData, startY, pageWidth) => {
+export default (doc, printData, pageWidth) => {
     const pageCenterX = pageWidth / 2;
+    let startY = doc.vars.startY.titles;
 
     doc.setFontSize(doc.vars.fontSizes.TitleFontSize);
     const productName = printData.productName;