Shot judgement

src/app/hitPointDetectionMiddleware.js

@@ -1,5 +1,5 @@
 import {addShot} from "./slices/shotSlice";
-import {all_targets} from "../components/modes/targets";
+import TargetUtil from "../util/TargetUtils"
 
 const checkBoundaries  = (target, pointCoordinates) => {
     if (pointCoordinates.x < target.x) {
@@ -23,7 +23,7 @@ export const detectHitPoints = store => next => action => {
         for (let i in currentTargets) {
             const currentTarget = currentTargets[i];
             if (checkBoundaries(currentTarget, action.payload.center)) {
-                const target = all_targets.filter(a => {return a.name === currentTarget.name})[0];
+                const target = TargetUtil.getTargetByName(currentTarget.name)
                 const canvas = document.createElement("canvas");
                 const ctx = canvas.getContext('2d');
                 if (target.hasOwnProperty("scoringZones")) {

src/components/App.js

@@ -1,17 +1,17 @@
 import React from 'react';
 import '../styles/App.css';
 
-import Loading from "./pages/Loading";
-import Welcome from "./pages/Welcome";
-import CalibrateLaser from "./pages/CalibrateLaser";
-import CalibrateWebcam from "./pages/CalibrateWebcam";
-import RunShootingMode from "./pages/RunShootingMode";
+import Loading from "./mainScreen/pages/Loading";
+import Welcome from "./mainScreen/pages/Welcome";
+import CalibrateLaser from "./mainScreen/pages/CalibrateLaser";
+import CalibrateWebcam from "./mainScreen/pages/CalibrateWebcam";
+import RunShootingMode from "./mainScreen/pages/RunShootingMode";
 
 import ProjectorScreen from "./targetScreen/ProjectorScreen";
 
 import {Container, Row, Col} from "react-bootstrap";
 import {backgroundColor, color, color4} from "../config";
-import SelectMode from "./pages/SelectMode";
+import SelectMode from "./mainScreen/pages/SelectMode";
 import ReactGA from 'react-ga';
 
 ReactGA.initialize('UA-162789074-1', { debug: false });

src/components/pages/CalibrateLaser.js → src/components/mainScreen/pages/CalibrateLaser.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import Card from '../Card';
+import Card from '../../Card';
 import {Row, Col, Button, Form} from "react-bootstrap";
 import cookie from "react-cookies";
-import LaserCalibrator from "../../util/LaserCalibrator";
+import LaserCalibrator from "../../../util/LaserCalibrator";
 
 class CalibrateLaser extends React.Component {
     constructor(props) {

src/components/pages/CalibrateWebcam.js → src/components/mainScreen/pages/CalibrateWebcam.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import {Row, Col, Button} from "react-bootstrap";
-import WebcamCalibrator from "../../util/WebcamCalibrator";
+import WebcamCalibrator from "../../../util/WebcamCalibrator";
 import cookie from "react-cookies";
-import Card from "../Card";
+import Card from "../../Card";
 import {connect} from "react-redux";
-import {addNonTargetElement, wipeNonTargetElements} from "../../app/slices/projectorSlice";
+import {addNonTargetElement, wipeNonTargetElements} from "../../../app/slices/projectorSlice";
 import {bindActionCreators} from "redux";
 
 class CalibrateWebcam extends React.Component {

src/components/pages/Loading.js → src/components/mainScreen/pages/Loading.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {Row, Col} from "react-bootstrap";
-import Card from "../Card";
+import Card from "../../Card";
 
 class Loading extends React.Component {
     constructor(props) {

src/components/pages/SelectMode.js → src/components/mainScreen/pages/SelectMode.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Row, Col, Button} from "react-bootstrap";
-import Card from "../Card";
-import {shootingModes} from "../modes/shootingModes";
+import Card from "../../Card";
+import {shootingModes} from "../shootingModes/shootingModes";
 import ReactGA from "react-ga";
 
 class SelectMode extends React.Component {

src/components/pages/Welcome.js → src/components/mainScreen/pages/Welcome.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import {Row, Col, Button} from "react-bootstrap";
-import Card from "../Card";
+import Card from "../../Card";
 import cookie from "react-cookies";
 import {faCheck, faInfoCircle, faTimes} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {color1, color3} from "../../config";
+import {color1, color3} from "../../../config";
 import {connect} from "react-redux";
 
 class Welcome extends React.Component {

src/components/shooting/ShotFeed.js → src/components/mainScreen/shooting/ShotFeed.js

@@ -1,12 +1,12 @@
 import React from 'react';
-import ShotDetector from "../../util/ShotDetector"
+import ShotDetector from "../../../util/ShotDetector"
 import {Button, Form} from "react-bootstrap";
 import cookie from 'react-cookies'
 import ReactGA from 'react-ga';
 import { connect } from "react-redux";
-import { addShot, wipeShots } from "../../app/slices/shotSlice";
+import { addShot, wipeShots } from "../../../app/slices/shotSlice";
 import { bindActionCreators } from "redux";
-import "../../styles/TargetCanvas.css";
+import "../../../styles/TargetCanvas.css";
 
 class ShotFeed extends React.Component {
     constructor(props) {

src/components/shooting/ShotRecord.js → src/components/mainScreen/shooting/ShotRecord.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import Card from "../Card";
+import Card from "../../Card";
 import { connect } from "react-redux";
 
 class ShotRecord extends React.Component {

src/components/shooting/ShotTimer.js → src/components/mainScreen/shooting/ShotTimer.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import {Button, Form} from "react-bootstrap";
-import Card from "../Card";
+import Card from "../../Card";
 import { connect } from "react-redux";
-import { setTimer } from "../../app/slices/shotSlice";
+import { setTimer } from "../../../app/slices/shotSlice";
 import { bindActionCreators } from "redux";
 
 class ShotTimer extends React.Component {

src/components/modes/standard/StandardConfigure.js → src/components/mainScreen/shootingModes/standard/StandardConfigure.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {Row, Col, Form, Button, OverlayTrigger, Tooltip} from "react-bootstrap";
-import Card from "../../Card";
+import Card from "../../../Card";
 import {all_targets} from "../targets";
 import cookie from "react-cookies";
 import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";

src/components/modes/standard/StandardShoot.js → src/components/mainScreen/shootingModes/standard/StandardShoot.js

@@ -3,9 +3,9 @@ import {Row, Col, Button} from "react-bootstrap";
 import ShotFeed from "../../shooting/ShotFeed";
 import ShotTimer from "../../shooting/ShotTimer";
 import ShotRecord from "../../shooting/ShotRecord";
-import TargetUtils from "../../../util/TargetUtils"
+import TargetUtils from "../../../../util/TargetUtils"
 import {bindActionCreators} from "redux";
-import {addTarget, wipeTargets} from "../../../app/slices/targetSlice";
+import {addTarget, wipeTargets} from "../../../../app/slices/targetSlice";
 import {connect} from "react-redux";
 
 class StandardShoot extends React.Component {

src/util/TargetUtils.js

@@ -1,5 +1,5 @@
 import cookie from "react-cookies";
-import {all_targets} from "../components/modes/targets";
+import {all_targets} from "../components/mainScreen/shootingModes/targets";
 
 class TargetUtils {
     static targetImageCache = {};