From df83e5e5c641b5ea856ef2242671435e8ee32d4f Mon Sep 17 00:00:00 2001
From: Daniel Becker <dbecker.fl@gmail.com>
Date: Sun, 5 Jul 2020 16:44:08 -0500
Subject: [PATCH] Added total score, fading shots, and dueling tree shot record

---
 .idea/workspace.xml                           | 153 ++++++------------
 .../mainScreen/shooting/ShotRecord.js         |  11 +-
 .../shootingModes/duelingTree/DuelingShoot.js |  43 ++---
 3 files changed, 74 insertions(+), 133 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cae0e35..decb919 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1329be04-a561-4802-8866-c40ae65b7eea" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/TargetCanvas.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/TargetCanvas.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/targetScreen/ProjectorScreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/targetScreen/ProjectorScreen.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotFeed.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotFeed.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,11 +32,16 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.travis.yml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/standard/StandardShoot.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="702">
-              <caret line="105" column="82" selection-start-line="105" selection-start-column="82" selection-end-line="105" selection-end-column="82" />
+            <state relative-caret-position="621">
+              <caret line="124" column="24" selection-start-line="124" selection-start-column="24" selection-end-line="124" selection-end-column="38" />
               <folding>
                 <element signature="e#0#26#0" expanded="true" />
               </folding>
@@ -91,8 +96,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="115" selection-start-line="12" selection-start-column="115" selection-end-line="12" selection-end-column="115" />
+            <state relative-caret-position="775">
+              <caret line="63" column="57" selection-start-line="63" selection-start-column="57" selection-end-line="63" selection-end-column="57" />
               <folding>
                 <element signature="e#0#26#0" expanded="true" />
               </folding>
@@ -109,23 +114,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/app/store.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
-              <folding>
-                <element signature="e#0#72#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="387">
-              <caret line="179" column="8" lean-forward="true" selection-start-line="179" selection-start-column="8" selection-end-line="194" selection-end-column="9" />
+            <state relative-caret-position="3104">
+              <caret line="207" column="38" selection-start-line="207" selection-start-column="38" selection-end-line="207" selection-end-column="38" />
               <folding>
                 <element signature="e#0#26#0" expanded="true" />
               </folding>
@@ -137,8 +130,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>white</find>
-      <find>youtube</find>
       <find>fabricslice</find>
       <find>cls-1</find>
       <find>this.canvas</find>
@@ -165,8 +156,10 @@
       <find>8uc3</find>
       <find>shotdetector</find>
       <find>processvideo</find>
-      <find>shotfeed</find>
       <find>addshot</find>
+      <find>updatetarget</find>
+      <find>shotfeed</find>
+      <find>loadtarget</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/src/components</dir>
@@ -222,12 +215,12 @@
         <option value="$PROJECT_DIR$/src/components/mainScreen/shootingModes/standard/StandardConfigure.js" />
         <option value="$PROJECT_DIR$/src/app/slices/configSlice.js" />
         <option value="$PROJECT_DIR$/src/app/store.js" />
-        <option value="$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js" />
-        <option value="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js" />
         <option value="$PROJECT_DIR$/src/components/mainScreen/shootingModes/standard/StandardShoot.js" />
         <option value="$PROJECT_DIR$/src/components/targetScreen/ProjectorScreen.js" />
         <option value="$PROJECT_DIR$/public/index.html" />
         <option value="$PROJECT_DIR$/src/components/TargetCanvas.js" />
+        <option value="$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js" />
+        <option value="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js" />
         <option value="$PROJECT_DIR$/src/components/mainScreen/shooting/ShotFeed.js" />
       </list>
     </option>
@@ -252,58 +245,43 @@
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name=".firebase" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="nonTargetImages" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="targets" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
-              <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
-              <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="nonTargetImages" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="slices" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="targets" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="components" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
               <item name="take-aim" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="components" type="462c0819:PsiDirectoryNode" />
-              <item name="mainScreen" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
@@ -311,7 +289,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="components" type="462c0819:PsiDirectoryNode" />
               <item name="mainScreen" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
@@ -347,28 +324,6 @@
               <item name="shootingModes" type="462c0819:PsiDirectoryNode" />
               <item name="standard" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
-              <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="components" type="462c0819:PsiDirectoryNode" />
-              <item name="mainScreen" type="462c0819:PsiDirectoryNode" />
-              <item name="shootingModes" type="462c0819:PsiDirectoryNode" />
-              <item name="svgs" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
-              <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="components" type="462c0819:PsiDirectoryNode" />
-              <item name="targetScreen" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="take-aim" type="b2602c69:ProjectViewProjectNode" />
-              <item name="take-aim" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="util" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -444,12 +399,12 @@
       <workItem from="1593901396511" duration="9946000" />
       <workItem from="1593923867312" duration="1230000" />
       <workItem from="1593967040247" duration="7560000" />
-      <workItem from="1593980049746" duration="3420000" />
+      <workItem from="1593980049746" duration="4857000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="159357000" />
+    <option name="totallyTimeSpent" value="160794000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -479,13 +434,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/pages/SelectMode.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="36" lean-forward="true" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/util/GoogleAnalyticsUtils.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -779,66 +727,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js">
+    <entry file="file://$PROJECT_DIR$/src/components/targetScreen/ProjectorScreen.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="115" selection-start-line="12" selection-start-column="115" selection-end-line="12" selection-end-column="115" />
+        <state relative-caret-position="1110">
+          <caret line="74" column="57" selection-start-line="74" selection-start-column="57" selection-end-line="74" selection-end-column="57" />
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js">
+    <entry file="file://$PROJECT_DIR$/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="179" column="8" lean-forward="true" selection-start-line="179" selection-start-column="8" selection-end-line="194" selection-end-column="9" />
+        <state>
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/standard/StandardShoot.js">
+    <entry file="file://$PROJECT_DIR$/public/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="702">
-          <caret line="105" column="82" selection-start-line="105" selection-start-column="82" selection-end-line="105" selection-end-column="82" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="720">
+          <caret line="48" column="42" selection-start-line="48" selection-start-column="42" selection-end-line="48" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/targetScreen/ProjectorScreen.js">
+    <entry file="file://$PROJECT_DIR$/src/components/TargetCanvas.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1110">
-          <caret line="74" column="57" selection-start-line="74" selection-start-column="57" selection-end-line="74" selection-end-column="57" />
+        <state relative-caret-position="772">
+          <caret line="67" column="110" selection-start-line="67" selection-start-column="110" selection-end-line="67" selection-end-column="110" />
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.js">
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/standard/StandardShoot.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
+        <state relative-caret-position="621">
+          <caret line="124" column="24" selection-start-line="124" selection-start-column="24" selection-end-line="124" selection-end-column="38" />
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
+    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="48" column="42" selection-start-line="48" selection-start-column="42" selection-end-line="48" selection-end-column="42" />
+        <state relative-caret-position="3104">
+          <caret line="207" column="38" selection-start-line="207" selection-start-column="38" selection-end-line="207" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/TargetCanvas.js">
+    <entry file="file://$PROJECT_DIR$/src/components/mainScreen/shooting/ShotRecord.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="772">
-          <caret line="67" column="110" selection-start-line="67" selection-start-column="110" selection-end-line="67" selection-end-column="110" />
+        <state relative-caret-position="775">
+          <caret line="63" column="57" selection-start-line="63" selection-start-column="57" selection-end-line="63" selection-end-column="57" />
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
diff --git a/src/components/mainScreen/shooting/ShotRecord.js b/src/components/mainScreen/shooting/ShotRecord.js
index 048b2a0..26b2caf 100644
--- a/src/components/mainScreen/shooting/ShotRecord.js
+++ b/src/components/mainScreen/shooting/ShotRecord.js
@@ -24,10 +24,16 @@ class ShotRecord extends React.Component {
     }
 
     renderCard(title, shots) {
+        const total = shots.reduce((acc, cur) => {
+            if (cur.hasOwnProperty("score") && !isNaN(cur.score.pointValue)) {
+                return acc + cur.score.pointValue
+            };
+            return acc
+        }, 0)
         return (
             <Card className={"text-center"} style={{marginBottom: "20px"}}>
                 <h4 style={{textDecoration: "underline"}}>{title}</h4>
-                <div style={{maxHeight: "150px", overflowY: "scroll"}}>
+                <div style={{height: "150px", overflowY: "scroll"}}>
                     <table style={{width: "100%", textAlign: "center"}}>
                         <thead style={{textDecoration: "underline"}}>
                         <tr>
@@ -54,6 +60,9 @@ class ShotRecord extends React.Component {
                         </tbody>
                     </table>
                 </div>
+                <div style={{paddingRight: "10px", paddingTop: "10px"}}>
+                    <h6 className={"float-right"}>Total: {total}</h6>
+                </div>
                 <div id={"canvashere"}></div>
             </Card>
         );
diff --git a/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js b/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js
index e75307b..a36a844 100644
--- a/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js
+++ b/src/components/mainScreen/shootingModes/duelingTree/DuelingShoot.js
@@ -10,6 +10,7 @@ import {setTwoPlayerStatus} from "../../../../app/slices/configSlice";
 import {connect} from "react-redux";
 import Card from "../../../Card";
 import {batch} from "react-redux";
+import ShotRecord from "../../shooting/ShotRecord";
 
 class DuelingShoot extends React.Component {
     constructor(props) {
@@ -165,14 +166,16 @@ class DuelingShoot extends React.Component {
                 this.props.addTarget(toAdd[i])
             }
         });
-        this.setState({
-            targetIds: targetIds,
-            plateOrientations: plateOrientations
-        }, () => {
-            if (this.state.competitionStarted && (this.state.plateOrientations.indexOf("left") < 0 || this.state.plateOrientations.indexOf("right") < 0)) {
-                this.stopCompetition()
-            }
-        })
+        if (targetsToRemove.length > 0 || toAdd.length > 0) {
+            this.setState({
+                targetIds: targetIds,
+                plateOrientations: plateOrientations
+            }, () => {
+                if (this.state.competitionStarted && (this.state.plateOrientations.indexOf("left") < 0 || this.state.plateOrientations.indexOf("right") < 0)) {
+                    this.stopCompetition()
+                }
+            })
+        }
     }
 
     render() {
@@ -202,29 +205,7 @@ class DuelingShoot extends React.Component {
                 </Row>
                 <Row>
                     <Col sm={4}  className={"text-center"}>
-                        <Card >
-                            <h4 style={{textDecoration: "underline"}}>Competition</h4>
-                            <table>
-                                <thead>
-                                <tr>
-                                    <th>Player 1</th>
-                                    <th>Player 2</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td>{this.state.plateOrientations.filter(a => a === "left").length}</td>
-                                    <td>{this.state.plateOrientations.filter(a => a === "right").length}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            {!this.state.competitionStarted &&
-                                <div style={{marginTop: "20px"}}>
-                                    <Button   onClick={() => {this.startCompetition()}}>Start Competition</Button>
-                                    <p style={{fontSize: "80%"}}>Competition will start on beep after 5 secnod delay</p>
-                                </div>
-                            }
-                        </Card>
+                        <ShotRecord />
                     </Col>
                     <Col sm={8}>
                         <ShotFeed videoRef={this.props.videoRef} ref={this.shotFeedRef} scoringZones={scoringZones}/>