soccer-jersey-fork 1.0.83 → 1.0.85

package/lib/patterns/patterns.js

@@ -267,6 +267,14 @@ export const addShortSideColor = (page, color) => {
         .stroke({ width: 2, color, linecap: "butt" });
 };
 export function addShoulderSideColor(page, color) {
+    // page
+    //   .path(`m 2 35, l 16.5 -26, 19 -8`)
+    //   .fill("none")
+    //   .stroke({ width: 1, color, linecap: "butt" });
+    // page
+    //   .path(`m 4 36, l 16.5 -25, 19 -8`)
+    //   .fill("none")
+    //   .stroke({ width: 1, color, linecap: "butt" });
     // left
     page
         .path(`m 0 35, l 16.5 -26, 19 -8`)
@@ -280,11 +288,11 @@ export function addShoulderSideColor(page, color) {
 }
 export function addShirtSideColor(page, color) {
     page
-        .path(`m 25.5 45, l -0.5 50`)
+        .path(`m 25.5 45, c 1 10 1 40 0 50`)
         .fill("none")
         .stroke({ width: 2, color, linecap: "round" });
     page
-        .path(`m 76 45, l 0.5 50`)
+        .path(`m 76.5 45, c -1 10 -1 40 0 50`)
         .fill("none")
         .stroke({ width: 2, color, linecap: "round" });
 }

package/lib/utils/draw-soccer-jersey.js

@@ -37,7 +37,7 @@ export default function drawSoccerJersey({ shirtColor = "plain", sleeveColor = s
     // eslint-disable-next-line new-cap
     const page = SVG();
     shirtStyleColor = shirtStyleColor || "#eee";
-    let shirtFill = getPatternFill(page, shirtColor, shirtStyle, shirtStyleColor, shirtStyleDirection);
+    let shirtFill = getPatternFill(page, shirtColor, shirtStyle, shirtStyleColor, "shirt", shirtStyleDirection);
     // neck
     page
         .path(isBack ? pathNeckBack : pathNeck)
@@ -84,16 +84,19 @@ export default function drawSoccerJersey({ shirtColor = "plain", sleeveColor = s
     const optimizedSleeveColor = lightenDarkenColor(sleeveColor, -10);
     sleeveStyleColor = sleeveStyleColor || "#eee";
     sleeveStyleDirection = sleeveStyleDirection || "vertical";
-    const sleeveFill = getPatternFill(page, optimizedSleeveColor, sleeveStyle, sleeveStyleColor, sleeveStyleDirection);
+    const sleeveFill = getPatternFill(page, optimizedSleeveColor, sleeveStyle, sleeveStyleColor, "sleeve", sleeveStyleDirection);
     page.path(pathLeftSleeve).fill(sleeveFill);
     page.path(pathRightSleeve).fill(sleeveFill);
+    if (shoulderSideColor) {
+        addShoulderSideColor(page, shoulderSideColor);
+    }
     if (sleeveCuffColor) {
-        const pathLeftSleeveCuff = "m2 36 l 17 9";
+        const pathLeftSleeveCuff = "m1.5 36 c 5 5 12.5 8 18.5 9";
         page
             .path(pathLeftSleeveCuff)
             .fill(sleeveCuffColor)
             .stroke({ color: sleeveCuffColor, width: 3, linecap: "round" });
-        const pathRightSleeveCuff = "m100 36 l -18 9";
+        const pathRightSleeveCuff = "m100 36 c -5 5 -12.5 8 -18.5 9";
         page
             .path(pathRightSleeveCuff)
             .fill(sleeveCuffColor)
@@ -110,9 +113,6 @@ export default function drawSoccerJersey({ shirtColor = "plain", sleeveColor = s
             .fill("none")
             .stroke({ color: shirtBottomColor, width: 3, linecap: "round" });
     }
-    if (shoulderSideColor) {
-        addShoulderSideColor(page, shoulderSideColor);
-    }
     const shortsHeight = withShorts ? 40 : 0;
     if (withShorts) {
         const pathShorts = `m 23 98 c 5 6, 50 6, 56 0 l 2 ${shortsHeight} c 0 5, -27 5, -27.5 0 l -2 -10, -2 10, c 0 5, -27 5, -27.5 0 l 1 -${shortsHeight}`;
@@ -195,47 +195,33 @@ export default function drawSoccerJersey({ shirtColor = "plain", sleeveColor = s
     page.viewbox(`0 0 102 ${100 + (withShorts ? shortsHeight + 10 : 0)}`);
     return page.svg();
 }
-function getPatternFill(page, optimizedShirtColor, style, shirtStyleColor, shirtStyleDirection = "vertical") {
-    let shirtFill;
+function getPatternFill(page, baseColor, style, styleColor, type, styleDirection = "vertical") {
     switch (style) {
         case "twoColors":
-            shirtFill = drawTwoColors(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection);
-            break;
+            return drawTwoColors(page, baseColor, styleColor, styleDirection);
         case "stripedThin":
-            shirtFill = drawStriped(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection, "thin");
-            break;
+            return drawStriped(page, baseColor, styleColor, styleDirection, "thin");
         case "stripedThick":
-            shirtFill = drawStriped(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection, "thick");
-            break;
+            return drawStriped(page, baseColor, styleColor, styleDirection, "thick");
         case "striped":
-            shirtFill = drawStriped(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection, "normal");
-            break;
+            return drawStriped(page, baseColor, styleColor, styleDirection, "normal");
         case "dashed":
-            shirtFill = drawDashes(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection);
-            break;
-        case "checkeredBig":
-            shirtFill = drawCheckered(page, optimizedShirtColor, shirtStyleColor, "lg", shirtStyleDirection);
-            break;
+            return drawDashes(page, baseColor, styleColor, styleDirection);
         case "checkered":
-            shirtFill = drawCheckered(page, optimizedShirtColor, shirtStyleColor, "sm", shirtStyleDirection);
-            break;
+            return drawCheckered(page, baseColor, styleColor, "sm", styleDirection);
+        case "checkeredBig":
+            return drawCheckered(page, baseColor, styleColor, "lg", styleDirection);
         case "diamonds":
-            shirtFill = drawDiamonds(page, optimizedShirtColor, shirtStyleColor);
-            break;
+            return drawDiamonds(page, baseColor, styleColor);
         case "singleBand":
-            shirtFill = drawSingleBand(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection);
-            break;
+            return drawSingleBand(page, baseColor, styleColor, styleDirection);
         case "singleBandThin":
-            shirtFill = drawSingleBandThin(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection);
-            break;
+            return drawSingleBandThin(page, baseColor, styleColor, styleDirection);
         case "waves":
-            shirtFill = drawWaves(page, optimizedShirtColor, shirtStyleColor, shirtStyleDirection);
-            break;
+            return drawWaves(page, baseColor, styleColor, styleDirection);
         case "cross":
-            shirtFill = drawCrossLines(page, optimizedShirtColor, shirtStyleColor);
-            break;
+            return drawCrossLines(page, baseColor, styleColor);
         default:
-            shirtFill = optimizedShirtColor;
+            return baseColor;
     }
-    return shirtFill;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soccer-jersey-fork",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "Generate soccer jerseys in SVG format",
   "main": "lib/index.js",
   "scripts": {