Merge branch 'main' into 2025-notescouting

team4099 · Feb 6, 2025 · 5324e8f · 5324e8f
2 parents 51443e7 + 7fe7145
commit 5324e8f
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 18 deletions.
diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
@@ -1,11 +1,11 @@
 [
     {
-        "name": "2024 Scouting App",
-        "description": "Team 4099: The Falcon's 2024 scouting data collection page",
+        "name": "2025 Scouting App",
+        "description": "Team 4099: The Falcon's 2025 scouting data collection page",
         "components": [
             {
                 "type": "GenericHeaderOne",
-                "text": "2024 Scouting App"
+                "text": "2025 Scouting App"
             },
             {
                 "type": "GenericHeaderTwo",
@@ -145,14 +145,14 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop/Endgame Passing Cycles",
+                "text": "Coral L4 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
                     "blue"
                 ],
-                "id": "TeleopPassing"
+                "id": "TeleopCoralL4"
             },
             {
                 "type": "GenericTextArea",
@@ -172,21 +172,23 @@
                 "id": "Parked"
             },
             {
-                "type": "GenericToggle",
-                "text": "Did the robot climb onto the chain?",
+                "type": "GenericDropdown",
+                "text": "Did the robot climb onto the cage?",
+                "options": [
+                    "No Climb",
+                    "Deep Climb",
+                    "Shallow Climb"
+                ],
                 "id": "ClimbStatus"
-            },
-            {
-                "type": "GenericToggle",
-                "text": "If the robot climbed, did it climb onto the chain with another robot (harmonized)?",
-                "id": "Harmonized"
-            },
+            },    
+
             {
                 "type": "GenericDropdown",
-                "text": "How fast were they at climbing onto the chain?",
+                "text": "How fast were they at climbing onto the cage?",
                 "options": [
-                    "Slow",
-                    "Fast"
+                    "Slow (>10 seconds)",
+                    "Average (5-10 seconds)",
+                    "Fast (<5 seconds)"
                 ],
                 "id": "ClimbSpeed"
             },
@@ -212,6 +214,16 @@
                 "text": "Can the robot easily tip over?",
                 "id": "Tippiness"
             },
+            {
+            "type": "GenericDropdown",
+                "text": "How tippy was their robot?",
+                "options": [
+                    "Very tippy",
+                    "moderately tippy",
+                    "stable"
+                ],
+                "id": "StabilityRating"
+            },
             {
                 "type": "GenericDropdown",
                 "text": "Robot Style",
@@ -273,17 +285,20 @@
                 "TeleopSpeaker",
                 "TeleopAmp",
                 "TeleopTrap",
-                "TeleopPassing",
+                "TeleopCoralL4",
                 "TeleopNotes",
                 "Parked",
                 "ClimbStatus",
-                "Harmonized",
                 "ClimbSpeed",
                 "EndgameNotes",
                 "Disabled",
                 "Tippiness",
                 "DriverRating",
                 "IntakeDefenseRating",
+                "StabilityRating",
+                "DefenseTime",
+                "DefenseSkill",
+                "CounterDefenseSkill",
                 "RatingNotes"
             ]
         }

diff --git a/scoutingapp/tailwind.config.js b/scoutingapp/tailwind.config.js
@@ -0,0 +1,9 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  content: ["./src/**/*.{js,jsx,ts,tsx}",],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
+