Merge branch 'origin/main'

.woodpecker.yml

@@ -8,13 +8,6 @@ steps:
       - VITE_API_URL=https://api.treadl.com
       - VITE_IMAGINARY_URL=https://images.treadl.com
       - VITE_SENTRY_DSN=https://7c88f77dd19c57bfb92bb9eb53e33c4b@o4508066290532352.ingest.de.sentry.io/4508075022090320
-      - VITE_SOURCE_REPO_URL=https://git.wilw.dev/wilw/treadl
-      - VITE_PATREON_URL=https://www.patreon.com/treadl
-      - VITE_KOFI_URL=https://ko-fi.com/wilw88
-      - VITE_IOS_APP_URL=https://apps.apple.com/gb/app/treadl/id1525094357
-      - "VITE_ANDROID_APP_URL=https://play.google.com/store/apps/details/Treadl?id=com.treadl"
-      - VITE_CONTACT_EMAIL=hello@treadl.com
-      - VITE_APP_NAME=Treadl
     commands:
       - cd web
       - npm install

Taskfile.yml

@@ -94,3 +94,25 @@ tasks:
     cmds:
       - echo "Building Docker image..."
       - docker build -f docker/Dockerfile -t wilw/treadl --platform linux/amd64,linux/arm64 .
+  
+  deploy:
+    desc: Deploy all
+    deps:
+      - deploy-web
+      - deploy-api
+  
+  deploy-web:
+    desc: Deploy web front-end
+    dir: 'web'
+    cmds:
+      - npm install
+      - npx vite build
+      - aws --profile personal s3 sync dist s3://treadl.com
+      - 'curl -X POST -H "AccessKey: $BUNNY_PERSONAL" https://api.bunny.net/pullzone/782753/purgeCache'
+  
+  deploy-api:
+    desc: Deploy API
+    dir: 'api'
+    cmds:
+      - docker build -t wilw/treadl-api --platform linux/amd64 .
+      - docker push wilw/treadl-api

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM amd64/python:3.12-slim
 
 # set work directory
 WORKDIR /app

api/api/projects.py

@@ -12,6 +12,7 @@ default_pattern = {
         "defaultColour": "178,53,111",
         "defaultSpacing": 1,
         "defaultThickness": 1,
+        "guideFrequency": 8,
     },
     "weft": {
         "treadles": 8,
@@ -19,6 +20,7 @@ default_pattern = {
         "defaultColour": "53,69,178",
         "defaultSpacing": 1,
         "defaultThickness": 1,
+        "guideFrequency": 8,
     },
     "tieups": [[]] * 8,
     "colours": [

api/util/wif.py

@@ -233,6 +233,7 @@ def loads(wif_file):
         draft["warp"]["threading"][int(x) - 1] = {"shaft": shaft}
         if shaft > draft["warp"]["shafts"]:
             draft["warp"]["shafts"] = shaft
+    draft["warp"]["guideFrequency"] = draft["warp"]["shafts"]
     try:
         warp_colours = config["warp colors"]
         for x in warp_colours:
@@ -269,6 +270,7 @@ def loads(wif_file):
         draft["weft"]["treadling"][int(x) - 1] = {"treadle": treadle}
         if treadle > draft["weft"]["treadles"]:
             draft["weft"]["treadles"] = treadle
+    draft["weft"]["guideFrequency"] = draft["weft"]["treadles"]
     try:
         weft_colours = config["weft colors"]
         for x in weft_colours:
@@ -359,6 +361,9 @@ def draw_image(obj, with_plan=False):
     drawdown_left = warp_left if with_plan else 0
     drawdown_bottom = weft_bottom if with_plan else full_height
 
+    warp_guides = warp.get("guideFrequency") or 0
+    weft_guides = weft.get("guideFrequency") or 0
+
     WHITE = (255, 255, 255)
     GREY = (150, 150, 150)
     BLACK = (0, 0, 0)
@@ -384,7 +389,10 @@ def draw_image(obj, with_plan=False):
                 width=1,
                 joint=None,
             )
+        col_index = 1
         for i, x in enumerate(range(len(warp["threading"]) - 1, 0, -1)):
+            is_guide = warp_guides and col_index % warp_guides == 0
+            col_index += 1
             thread = warp["threading"][i]
             xcoord = x * BASE_SIZE
             draw.line(
@@ -392,8 +400,8 @@ def draw_image(obj, with_plan=False):
                     (xcoord, warp_top),
                     (xcoord, warp_bottom),
                 ],
-                fill=GREY,
-                width=1,
+                fill=BLACK if is_guide else GREY,
+                width=2 if is_guide else 1,
                 joint=None,
             )
             if thread.get("shaft", 0) > 0:
@@ -433,7 +441,10 @@ def draw_image(obj, with_plan=False):
                 width=1,
                 joint=None,
             )
+        row_index = 0
         for i, y in enumerate(range(0, len(weft["treadling"]))):
+            is_guide = weft_guides and row_index % weft_guides == 0
+            row_index += 1
             thread = weft["treadling"][i]
             ycoord = weft_top + y * BASE_SIZE
             draw.line(
@@ -441,8 +452,8 @@ def draw_image(obj, with_plan=False):
                     (weft_left, ycoord),
                     (weft_right, ycoord),
                 ],
-                fill=GREY,
-                width=1,
+                fill=BLACK if is_guide else GREY,
+                width=2 if is_guide else 1,
                 joint=None,
             )
             if thread.get("treadle", 0) > 0:
@@ -521,7 +532,9 @@ def draw_image(obj, with_plan=False):
             shaft = 0 if warp_thread["shaft"] > warp["shafts"] else warp_thread["shaft"]
 
             # Work out if should be warp or weft in "front"
-            tieup = tieups[treadle - 1] if treadle > 0 else []
+            tieup = (
+                tieups[treadle - 1] if (treadle > 0 and treadle <= len(tieups)) else []
+            )
             tieup = [t for t in tieup if t <= warp["shafts"]]
             thread_type = "warp" if shaft in tieup else "weft"
 

web/.eslintignore

@@ -1,2 +0,0 @@
-node_modules/
-build/

web/.eslintrc

@@ -1,17 +0,0 @@
-{
-  "env": {
-    "browser": true
-  },
-  "extends": ["react-app", "airbnb"],
-  "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
-  "rules": {
-    "no-underscore-dangle": [2, { "allow": ["_id"] }],
-    "max-len": 0
-  }
-}