Merge branch 'feat/2024updates'

Iron-Panthers · Feb 9, 2024 · 6b150fb · 6b150fb
2 parents 9076efb + 312bd3d
commit 6b150fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/src/components/inputs/ImageClick.jsx b/src/components/inputs/ImageClick.jsx
@@ -203,12 +203,12 @@ const ImageClick = ({ prop, phase, full, locations}) => {
 
   const dispatchShot = (shotType) => {
 
-    const currentJSON = [...current, {
+    const currentJSON = [...current, JSON.stringify({
       shotType: shotType, 
       x: shotLocation.x,
       y: shotLocation.y,
       cycleTime: cycleTime,
-    }]
+    })]
 
     console.log(currentJSON)
 
@@ -223,10 +223,10 @@ const ImageClick = ({ prop, phase, full, locations}) => {
 
   const dispatchButtonLocation = (location) => {
 
-    const currentJSON = [...current, {
+    const currentJSON = [...current, JSON.stringify({
       shotType: "intakeNote", 
       location: location,
-    }]
+    })]
 
     console.log(currentJSON)
 

diff --git a/src/reducer.js b/src/reducer.js
@@ -40,13 +40,8 @@ export const initialState = {
     prevCycleTimeStamp: 0,
     scoreSpeaker: 0,
     scoreAmp: 0,
-    intakeNote: undefined,
   },
   teleop: {
-    scoreSpeaker: 0,
-    scoreAmp: 0,
-    scoreAmpedSpeaker: 0, 
-    shuttlePieces: false,
     shotData: [],
     prevCycleTimeStamp: 0,
   },
@@ -76,20 +71,20 @@ export const initialState = {
     ...teamQual
   },
 
-qualitative: {
-    team1Number: undefined,
-  team1Quickness: 1,
-  team1FieldAwareness: 1,
+// qualitative: {
+//     team1Number: undefined,
+//   team1Quickness: 1,
+//   team1FieldAwareness: 1,
 
-  team2Number: undefined,
-  team2Quickness: 1,
-  team2FieldAwareness: 1,
+//   team2Number: undefined,
+//   team2Quickness: 1,
+//   team2FieldAwareness: 1,
 
-  team3Number: undefined,
-  team3Quickness: 1,
-  team3FieldAwareness: 1,
+//   team3Number: undefined,
+//   team3Quickness: 1,
+//   team3FieldAwareness: 1,
 
-  },  
+//   },  
 
   undoStack: {
     auto: [],