Merge pull request #6 from Team334/pwa

PWA + Fixes

app/app.py

@@ -95,6 +95,17 @@ def handle_exception(e):
     def rate_limit_error(e):
         return render_template("429.html"), 429
 
+    @app.route('/static/manifest.json')
+    def serve_manifest():
+        return send_from_directory(app.static_folder, 'manifest.json')
+
+    @app.route('/static/js/service-worker.js')
+    def serve_service_worker():
+        response = make_response(send_from_directory(app.static_folder, 'js/service-worker.js'))
+        response.headers['Service-Worker-Allowed'] = '/'
+        response.headers['Cache-Control'] = 'no-cache'
+        return response
+
     return app
 
 

app/static/js/CanvasCoordinateSystem.js

@@ -94,7 +94,9 @@ class CanvasCoordinateSystem {
     }
 
     drawPath(points, color = 'red', width = 2) {
-        if (!points || points.length < 2) return;
+        if (!points || points.length < 2) {
+          return;
+        }
 
         this.ctx.beginPath();
         this.ctx.moveTo(points[0].x, points[0].y);

app/static/js/scout.add.js

@@ -59,15 +59,19 @@ function startDrawing(e) {
 }
 
 function draw(e) {
-    if (!isDrawing) return;
+    if (!isDrawing) {
+      return;
+    }
     e.preventDefault();
     const point = getPointFromEvent(e);
     currentPath.push(point);
     redrawPaths();
 }
 
 function stopDrawing(e) {
-    if (!isDrawing) return;
+    if (!isDrawing) {
+      return;
+    }
     e.preventDefault();
     isDrawing = false;
     if (currentPath.length > 1) {
@@ -123,13 +127,13 @@ function redrawPaths() {
 
 function updateHiddenInput() {
     const input = document.getElementById('auto_path');
-    input.value = JSON.stringify(paths);
+    input.value = paths.length > 0 ? JSON.stringify(paths) : JSON.stringify([]);
 }
 
 function undoLastPath() {
     paths.pop();
     redrawPaths();
-    updateHiddenInput();
+    updateHiddenInput();w
 }
 
 function clearCanvas() {
@@ -145,7 +149,9 @@ function resetZoom() {
 }
 
 function zoomIn(event) {
-    if (!coordSystem) return;
+    if (!coordSystem) {
+      return;
+    }
     const rect = canvas.getBoundingClientRect();
     let mouseX, mouseY;
 
@@ -165,7 +171,9 @@ function zoomIn(event) {
 }
 
 function zoomOut(event) {
-    if (!coordSystem) return;
+    if (!coordSystem) {
+      return;
+    }
     const rect = canvas.getBoundingClientRect();
     let mouseX, mouseY;
 
@@ -210,6 +218,12 @@ document.addEventListener('DOMContentLoaded', function() {
             const eventCode = form.querySelector('input[name="event_code"]').value;
             const matchNumber = form.querySelector('input[name="match_number"]').value;
 
+            // Initialize auto_path with empty array if not set
+            const autoPathInput = form.querySelector('input[name="auto_path"]');
+            if (!autoPathInput.value) {
+                autoPathInput.value = JSON.stringify([]);
+            }
+
             try {
                 const response = await fetch(`/scouting/check_team?team=${teamNumber}&event=${eventCode}&match=${matchNumber}`);
                 const data = await response.json();

app/static/js/scout.edit.js

@@ -32,15 +32,39 @@ function initCanvas() {
     if (pathDataInput && pathDataInput.value) {
         try {
             const rawValue = pathDataInput.value;
-            const cleanValue = rawValue.replace(/^"(.*)"$/, '$1');
-            const unescapedValue = cleanValue.replace(/\\"/g, '"');
-            paths = JSON.parse(unescapedValue);
+            // First, try parsing directly
+            try {
+                paths = JSON.parse(rawValue);
+            } catch {
+                // If direct parsing fails, try cleaning the string
+                const cleanValue = rawValue.replace(/^"(.*)"$/, '$1');
+                const unescapedValue = cleanValue.replace(/\\"/g, '"');
+                paths = JSON.parse(unescapedValue);
+            }
 
+            // Ensure paths is an array of arrays
             if (!Array.isArray(paths)) {
-                console.error('Invalid path data format');
-                paths = [];
+                paths = [[paths]];
+            } else if (!Array.isArray(paths[0])) {
+                paths = [paths];
             }
 
+            // Validate path structure
+            paths = paths.map(path => {
+                if (Array.isArray(path)) {
+                    return path.map(point => {
+                        if (typeof point === 'object' && 'x' in point && 'y' in point) {
+                            return {
+                                x: parseFloat(point.x),
+                                y: parseFloat(point.y)
+                            };
+                        }
+                        return null;
+                    }).filter(point => point !== null);
+                }
+                return [];
+            }).filter(path => path.length > 0);
+
             redrawPaths();
         } catch (error) {
             console.error('Error parsing path data:', error);
@@ -95,15 +119,19 @@ function startDrawing(e) {
 }
 
 function draw(e) {
-    if (!isDrawing) return;
+    if (!isDrawing) {
+      return;
+    }
     e.preventDefault();
     const point = getPointFromEvent(e);
     currentPath.push(point);
     redrawPaths();
 }
 
 function stopDrawing(e) {
-    if (!isDrawing) return;
+    if (!isDrawing) {
+      return;
+    }
     e.preventDefault();
     isDrawing = false;
     if (currentPath.length > 1) {
@@ -152,7 +180,9 @@ function resetZoom() {
 }
 
 function zoomIn(event) {
-    if (!coordSystem) return;
+    if (!coordSystem) {
+      return;
+    }
     const rect = canvas.getBoundingClientRect();
     let mouseX, mouseY;
 
@@ -172,7 +202,9 @@ function zoomIn(event) {
 }
 
 function zoomOut(event) {
-    if (!coordSystem) return;
+    if (!coordSystem) {
+      return;
+    }
     const rect = canvas.getBoundingClientRect();
     let mouseX, mouseY;
 

app/static/js/scout.list.js

@@ -32,7 +32,9 @@ function resizeModalCanvas() {
 }
 
 function redrawPaths() {
-    if (!modalCoordSystem || !currentPathData) return;
+    if (!modalCoordSystem || !currentPathData) {
+      return;
+    }
 
     modalCoordSystem.clear();
 
@@ -68,7 +70,9 @@ function redrawPaths() {
 }
 
 function zoomIn(event) {
-    if (!modalCoordSystem) return;
+    if (!modalCoordSystem) {
+      return;
+    }
     const rect = modalCanvas.getBoundingClientRect();
     let mouseX = rect.width / 2;
     let mouseY = rect.height / 2;
@@ -78,7 +82,9 @@ function zoomIn(event) {
 }
 
 function zoomOut(event) {
-    if (!modalCoordSystem) return;
+    if (!modalCoordSystem) {
+      return;
+    }
     const rect = modalCanvas.getBoundingClientRect();
     let mouseX = rect.width / 2;
     let mouseY = rect.height / 2;
@@ -88,7 +94,9 @@ function zoomOut(event) {
 }
 
 function resetZoom() {
-    if (!modalCoordSystem) return;
+    if (!modalCoordSystem) {
+      return;
+    }
     modalCoordSystem.resetView();
     redrawPaths();
 }