Ver Fonte

try eslint, clean up

Bernadette Elena Hammerle há 2 anos atrás
pai
commit
f212d7cab6
6 ficheiros alterados com 106 adições e 107 exclusões
  1. 45 45
      src/Addition.js
  2. 5 5
      src/Help.js
  3. 3 3
      src/Navigation.js
  4. 46 46
      src/Subtraction.js
  5. 4 4
      src/helpers.js
  6. 3 4
      src/index.js

+ 45 - 45
src/Addition.js

@@ -37,7 +37,7 @@ function Addition() {
 
   const handleInput = (e) => {
     setInput(e.target.value);
-  }
+  };
 
   const handleResChange = (e) => {
     if(typeof e === "string"){
@@ -53,7 +53,7 @@ function Addition() {
       // add input number to result array
       resArr.unshift(imdtRes);
     }
-  }
+  };
 
   const handleCarryChange = (e, nosLeft) => {
     if(e.keyCode === 13){
@@ -61,12 +61,12 @@ function Addition() {
       carryArrCopy.unshift(e.target.value);
       setCarryArr(carryArrCopy);
 
-      let noCarry = carryArrCopy[0] === "" || carryArrCopy[0] === "0" || carryArrCopy[0] === undefined
+      let noCarry = carryArrCopy[0] === "" || carryArrCopy[0] === "0" || carryArrCopy[0] === undefined;
       if((nosLeft === 1 && noCarry) ||
          // if stop after first iteration, numbers left is undefined at first
          (isNaN(nosLeft) && realResult.toString().length === 1 && noCarry)){
         nosLeft = 0;
-        handleResChange(" ")
+        handleResChange(" ");
       }
 
       if(nosLeft === 0){
@@ -78,15 +78,15 @@ function Addition() {
         }
       }
     }
-  }
+  };
 
   const handleSubmit = (e) => {
     startCalculation();
     e.preventDefault(); // avoid page reload
-  }
+  };
 
   const startCalculation = () => {
-    if (input.includes("+")){
+    if(input.includes("+")){
       let numbers = input.split("+").map(x => parseFloat(x.replace(",",".")));
       let realRes = numbers.reduce((x,y) => x+y, 0);
       let afterComma = Math.max(...numbers.map(x => afterCommaLen(x)));
@@ -109,7 +109,7 @@ function Addition() {
         addNumbersToTable(numbersArr);
       }
     }
-  }
+  };
 
   const handleKeyMoveComma = (e) => {
     let pressedKey = e.keyCode;
@@ -140,7 +140,7 @@ function Addition() {
       let nextFocusId = Math.min(noId+1, numbers.length-1);
       document.getElementById("numbersTd" + nextFocusId).focus();
     }
-  }
+  };
 
   const addNumbersToTable = (numbersArr) => {
     let nos;
@@ -162,7 +162,7 @@ function Addition() {
       cell.tabIndex = "0";
       cell.id = "numbersTd" + noIdx;
     }
-  }
+  };
 
   const ResultCarryForm = ({handleResChange, handleCarryChange}) => {
     let resInputField = useRef(null);
@@ -198,7 +198,7 @@ function Addition() {
         if(nosLeft === 1 && (carryArr[0] === "0" || carryArr[0] === "")){
           nosLeft = 0;
           imdtResIdx = -1;
-          return <></>
+          return <></>;
         }
 
         // create label text like: d + d + .. = input
@@ -207,7 +207,7 @@ function Addition() {
           digit = 0;
         }
         labelText += digit;
-        if (parseInt(n) === numbers.length - 1){
+        if(parseInt(n) === numbers.length - 1){
           if(carryArr[0] !== undefined && carryArr[0] > 0){
             labelText += " + " + carryArr[0].toString();
           }
@@ -248,12 +248,12 @@ function Addition() {
         </>
       );
     }
-  }
+  };
 
   const addButtonsToImdtSteps = (carryArrCopy) => {
     // workaround to access DOM td after grid values are set
     setTimeout(() => {
-      let table = document.getElementById("idmtResultSteps").getElementsByTagName("table")[0]
+      let table = document.getElementById("idmtResultSteps").getElementsByTagName("table")[0];
       let trs = table.getElementsByTagName("tr");
       for(let trIdx in trs){
         let tr = trs[trIdx];
@@ -268,7 +268,7 @@ function Addition() {
         }
       }
     }, 300);
-  }
+  };
 
   const showIdmtResults = (carryArrCopy) => {
     let realResArr = realResult.toString().split("");
@@ -276,7 +276,7 @@ function Addition() {
       realResArr.unshift("&nbsp;"); // add " " before
     }
 
-    let carries = carryArrCopy.map(x => x || "0")
+    let carries = carryArrCopy.map(x => x || "0");
     carries.push("0");
     while(carries.length < resArr.length){
       carries.unshift("0"); // add "0" before
@@ -290,51 +290,51 @@ function Addition() {
       let idxNumbers = resArr.length - i - 1;
       let idxCarry = carries.length - i - 1;
       let realSum = 0;
-      for(let j=0; j<numbers.length; j++) {
+      for(let j=0; j<numbers.length; j++){
         let no = numbers[j][idxNumbers];
-        if (no!=="." && no!=="&nbsp;"){
+        if(no!=="." && no!=="&nbsp;"){
           trueNumbers = true;
           realSum += parseInt(no);
         }
-        text += no
-        if (j<numbers.length-1){
-          text += " + "
+        text += no;
+        if(j<numbers.length-1){
+          text += " + ";
         }
       }
 
       // ignore indexes without real digits
-      if (resArr[idxNumbers]!=="&nbsp;" || (carries[idxCarry]!=="&nbsp;" & carries[idxCarry]!=="0")){
+      if(resArr[idxNumbers]!=="&nbsp;" || (carries[idxCarry]!=="&nbsp;" & carries[idxCarry]!=="0")){
         trueNumbers = true;
       }
 
       // carry array has no "."
-      if (resArr[idxNumbers] === "."){
+      if(resArr[idxNumbers] === "."){
         foundComma = true;
         trueNumbers = false;
       }
-      if (foundComma){
+      if(foundComma){
         idxCarry += 1;
       }
 
       // add carry only if > 0
-      if (carries[idxCarry]!=="0"){
+      if(carries[idxCarry]!=="0"){
         realSum += parseInt(carries[idxCarry]);
-        text += " + " + carries[idxCarry] // + " Übertrag"
+        text += " + " + carries[idxCarry]; // + " Übertrag"
       }
 
-      let realCarry = parseInt(realSum/10).toString()
-      realSum = (realSum % 10).toString()
-      text += " = "
-      if (trueNumbers){
-        text += resArr[idxNumbers]
-        text += " mit Übertrag " + carries[idxCarry-1]
-        text = text.replace(/&nbsp;/g, "0")
+      let realCarry = parseInt(realSum/10).toString();
+      realSum = (realSum % 10).toString();
+      text += " = ";
+      if(trueNumbers){
+        text += resArr[idxNumbers];
+        text += " mit Übertrag " + carries[idxCarry-1];
+        text = text.replace(/&nbsp;/g, "0");
         text += resArr[idxNumbers]===realSum && carries[idxCarry-1]===realCarry ? ": Richtig " : ": Falsch ";
         stepsGridCopy.push({step: text});
       }
     }
 
-    let paragraph = document.getElementById("stepsParagraph")
+    let paragraph = document.getElementById("stepsParagraph");
     paragraph.innerHTML = "Rechenschritte: ";
 
     let btnSubmit = document.createElement("button");
@@ -356,7 +356,7 @@ function Addition() {
     document.getElementById("idmtResultSteps").style.display = "inline-block";
     document.getElementById("idmtResultSteps").tabIndex = 0;
     document.getElementById("idmtResultSteps").focus();
-  }
+  };
 
   const startOver = (idx, carryArrCopy) => {
     let invertedIdx = numbers[0].length - idx - 1;
@@ -384,7 +384,7 @@ function Addition() {
     document.getElementById("btnSubmitSteps1").remove();
     document.getElementById("btnSubmitSteps2").remove();
     document.getElementById("idmtResultSteps").style.display = "none";
-  }
+  };
 
   const finishCalculation = () => {
     document.getElementById("idmtResultSteps").innerHTML = "";
@@ -392,24 +392,24 @@ function Addition() {
     setResultsGrid([{number: resCalc}]);
     resCalc = parseFloat(resCalc);
 
-    let message = ""
+    let message = "";
     if(resCalc === realResult){
-      message = "Richtig!"
+      message = "Richtig!";
     }else{
-      message = "Das ist leider falsch."
+      message = "Das ist leider falsch.";
     }
-    message = "<p>" + message + "</p>"
+    message = "<p>" + message + "</p>";
     document.getElementById("finishCalculation").innerHTML = message;
     document.getElementById("finishCalculation").tabIndex = "0";
     document.getElementById("finishCalculation").focus();
-  }
+  };
 
   const startCommaMove = () => {
     document.getElementById("commaSubmit").style.display = "inline-block";
     setTimeout(() => {
       document.getElementById("numbersTd0").focus();
-    }, 300)
-  }
+    }, 300);
+  };
 
   const submitCommaMove = () => {
     let numbersCopy = [...numbers];
@@ -439,7 +439,7 @@ function Addition() {
     if(commaPositions.length === 0){
       setCommaIdx(-1);
       // check if no number was moved
-      commaCorrect = !numbersCopy.map(n => n[numbersLen] !== "&nbsp;").includes(false)
+      commaCorrect = !numbersCopy.map(n => n[numbersLen] !== "&nbsp;").includes(false);
 
     // correct comma positions
     }else if(commaPositions.length === 1){
@@ -472,7 +472,7 @@ function Addition() {
       paragraph.tabIndex = "0";
       paragraph.focus();
     }
-  }
+  };
 
   return (
     <main>

+ 5 - 5
src/Help.js

@@ -17,14 +17,14 @@ function Help() {
 
       <h2>2. Eingabe der Rechnung</h2>
       <p>
-        Dort k&ouml;nnen Sie dann im Eingabefeld eine Rechnung wie beispielsweise "1.4+34" oder "98-3.2" eingeben.
+        Dort k&ouml;nnen Sie dann im Eingabefeld eine Rechnung wie beispielsweise &quot;1.4+34&quot; oder &quot;98-3.2&quot; eingeben.
         Mit Hilfe der Pfeiltasten (auf und ab), k&ouml;nnen zuvor eingebene Rechnungen erneut verwendet werden.
         Dazu einfach die Liste an Vorschl&auml;gen mit den Pfeiltasten &ouml;ffnen, ebenfalls mit den Pfeiltasten bis zur gew&uuml;nschten Rechnung navigieren und die Auswahl mit Enter best&auml;tigen.
-      <br/>
+        <br/>
         Die Rechnung kann dabei beliebig viele Zahlen enthalten, allerdings m&uuml;ssen die Zahlen immer mit demselben Rechenzeichen verbunden sein.
-        Mit dem Button "berechnen" oder mit Hilfe der Enter Taste wird die Kalkulation begonnen.
+        Mit dem Button &quot;berechnen&quot; oder mit Hilfe der Enter Taste wird die Kalkulation begonnen.
         Bitte beachten Sie bei der Eingabe auch, dass derzeit bei der Subtraktion keine negativen Ergebnisse m&ouml;glich sind.
-      <br/>
+        <br/>
         Nach der Eingabe werden die einzelnen Zahlen untereinander ausgebeben und k&ouml;nnen mit Hilfe der Pfeiltasten oder der Tab-Taste navigiert werden.
         Unter den Zahlen befindet sich das Feld f&uuml;r das Ergebnis, das anfangs nat&uuml;rlich noch leer ist.
       </p>
@@ -53,7 +53,7 @@ function Help() {
         Unter den Rechenschritten befindet sich ein Button um das Ergebnis abzusenden.
         Das berechnete Ergebnis wird dann in die Box mit den Zahlen in der letzten Zeile erg&auml;nzt.
         Unter der Box wird gezeigt ob das Ergebnis richtig oder falsch ist.
-        Das Ergebnis wird genauso angezeigt, wenn beim Overlay "abgeben" statt "&uuml;berpr&uuml;fen" ausgew&auml;hlt wird, das hei&szlig;t, es wird einfach die &Uuml;berpr&uuml;fung &uuml;bersprungen.
+        Das Ergebnis wird genauso angezeigt, wenn beim Overlay &quot;abgeben&quot; statt &quot;&uuml;berpr&uuml;fen&quot; ausgew&auml;hlt wird, das hei&szlig;t, es wird einfach die &Uuml;berpr&uuml;fung &uuml;bersprungen.
       </p>
 
       <p>

+ 3 - 3
src/Navigation.js

@@ -8,9 +8,9 @@ import {
   Nav,
   NavItem,
   NavLink
-} from 'reactstrap';
+} from "reactstrap";
 
-const Navigation = (props) => {
+const Navigation = () => {
   const [isOpen, setIsOpen] = useState(false);
   const toggle = () => setIsOpen(!isOpen);
 
@@ -46,6 +46,6 @@ const Navigation = (props) => {
 
     </Navbar>
   );
-}
+};
 
 export default withRouter(Navigation);

+ 46 - 46
src/Subtraction.js

@@ -37,7 +37,7 @@ function Subtraction() {
 
   const handleInput = (e) => {
     setInput(e.target.value);
-  }
+  };
 
   const handleResChange = (e) => {
     if(typeof e === "string"){
@@ -53,7 +53,7 @@ function Subtraction() {
       // add input number to result array
       resArr.unshift(imdtRes);
     }
-  }
+  };
 
   const handleCarryChange = (e, nosLeft) => {
     if(e.keyCode === 13){
@@ -65,7 +65,7 @@ function Subtraction() {
          // if stop after first iteration, numbers left is undefined at first
          (isNaN(nosLeft) && realResult.toString().length === 1 && noCarry)){
         nosLeft = 0;
-        handleResChange("&nbsp;")
+        handleResChange("&nbsp;");
       }
 
       if(nosLeft === 0){
@@ -77,19 +77,19 @@ function Subtraction() {
         }
       }
     }
-  }
+  };
 
   const handleSubmit = (e) => {
     startCalculation();
     e.preventDefault(); // avoid page reload
-  }
+  };
 
   const startCalculation = () => {
-    if (input.includes("-")){
+    if(input.includes("-")){
       let numbers = input.split("-").map(x => parseFloat(x.replace(",",".")));
-      let realRes = numbers[0]
-      for (let i=1; i<numbers.length; i++){
-        realRes -= numbers[i]
+      let realRes = numbers[0];
+      for(let i=1; i<numbers.length; i++){
+        realRes -= numbers[i];
       }
 
       let afterComma = Math.max(...numbers.map(x => afterCommaLen(x)));
@@ -112,7 +112,7 @@ function Subtraction() {
         addNumbersToTable(numbersArr);
       }
     }
-  }
+  };
 
   const handleKeyMoveComma = (e) => {
     let pressedKey = e.keyCode;
@@ -143,7 +143,7 @@ function Subtraction() {
       let nextFocusId = Math.min(noId+1, numbers.length-1);
       document.getElementById("numbersTd" + nextFocusId).focus();
     }
-  }
+  };
 
   const addNumbersToTable = (numbersArr) => {
     let nos;
@@ -165,7 +165,7 @@ function Subtraction() {
       cell.tabIndex = "0";
       cell.id = "numbersTd" + noIdx;
     }
-  }
+  };
 
   const ResultCarryForm = ({handleResChange, handleCarryChange}) => {
     let resInputField = useRef(null);
@@ -206,7 +206,7 @@ function Subtraction() {
           if(nosLeft === 1 && (carryArr[0] === "0" || carryArr[0] === "")){
             nosLeft = 0;
             imdtResIdx = -1;
-            return <></>
+            return <></>;
           }
 
           // create label text like: d + d + (wie viel) = input
@@ -215,7 +215,7 @@ function Subtraction() {
             digit = 0;
           }
           labelText += digit;
-          if (parseInt(n) === numbers.length - 1){
+          if(parseInt(n) === numbers.length - 1){
             if(carryArr[0] !== undefined && carryArr[0] > 0){
               labelText += " + " + carryArr[0].toString();
             }
@@ -225,8 +225,8 @@ function Subtraction() {
         }
       }
 
-      labelText += " + wie viel = " + firstDigit
-      labelText = labelText.replace(/&nbsp;/g, "0")
+      labelText += " + wie viel = " + firstDigit;
+      labelText = labelText.replace(/&nbsp;/g, "0");
 
       imdtResIdx = imdtResIdx - 1;
       nosLeft = nosLeft - 1;
@@ -259,12 +259,12 @@ function Subtraction() {
         </>
       );
     }
-  }
+  };
 
   const addButtonsToImdtSteps = (carryArrCopy) => {
     // workaround to access DOM td after grid values are set
     setTimeout(() => {
-      let table = document.getElementById("idmtResultSteps").getElementsByTagName("table")[0]
+      let table = document.getElementById("idmtResultSteps").getElementsByTagName("table")[0];
       let trs = table.getElementsByTagName("tr");
       for(let trIdx in trs){
         let tr = trs[trIdx];
@@ -279,7 +279,7 @@ function Subtraction() {
         }
       }
     }, 300);
-  }
+  };
 
   const showIdmtResults = (carryArrCopy) => {
     let realResArr = realResult.toString().split("");
@@ -287,7 +287,7 @@ function Subtraction() {
       realResArr.unshift("&nbsp;"); // add " " before
     }
 
-    let carries = carryArrCopy.map(x => x || "0")
+    let carries = carryArrCopy.map(x => x || "0");
     carries.push("0");
     while(carries.length < resArr.length){
       carries.unshift("0"); // add "0" before
@@ -295,7 +295,7 @@ function Subtraction() {
 
     let foundComma = false;
     let stepsGridCopy = [];
-    for (let i=0; i<resArr.length; i++) {
+    for(let i=0; i<resArr.length; i++) {
       let text = "";
       let trueNumbers = false;
       let idxNumbers = resArr.length - i - 1;
@@ -312,44 +312,44 @@ function Subtraction() {
         }else{
           let no = numbers[j][idxNumbers];
 
-          if (j === 0){
+          if(j === 0){
             realDigitRes = parseInt(no) | 0;
           }
-          else if (no!=="." && no!=="&nbsp;"){
+          else if(no!=="." && no!=="&nbsp;"){
             trueNumbers = true;
             realDigitRes += parseInt(no);
           }
 
-          text += no
-          if (j<numbers.length-1){
-            text += " + "
+          text += no;
+          if(j<numbers.length-1){
+            text += " + ";
           }
         }
       }
 
       // ignore indexes without real digits
-      if (resArr[idxNumbers]!=="&nbsp;" || (carries[idxCarry]!=="&nbsp;" & carries[idxCarry]!=="0")){
+      if(resArr[idxNumbers]!=="&nbsp;" || (carries[idxCarry]!=="&nbsp;" & carries[idxCarry]!=="0")){
         trueNumbers = true;
       }
 
       // carry array has no "."
-      if (resArr[idxNumbers] === "."){
+      if(resArr[idxNumbers] === "."){
         foundComma = true;
         trueNumbers = false;
       }
-      if (foundComma){
+      if(foundComma){
         idxCarry += 1;
       }
 
       // add carry only if > 0
-      if (carries[idxCarry]!=="0"){
+      if(carries[idxCarry]!=="0"){
         realDigitRes += parseInt(carries[idxCarry]);
-        text += " + " + carries[idxCarry] // + " Übertrag"
+        text += " + " + carries[idxCarry]; // + " Übertrag"
       }
       let realCarry = Math.abs(parseInt(realDigitRes/10));
       realDigitRes = ((firstDigit - realDigitRes) % 10);
 
-      if (realDigitRes < 0){
+      if(realDigitRes < 0){
         realDigitRes = realDigitRes + 10;
         realCarry += 1;
       }
@@ -358,16 +358,16 @@ function Subtraction() {
       realDigitRes = realDigitRes.toString();
       text += " und ";
 
-      if (trueNumbers){
-        text += resArr[idxNumbers] + " = " + firstDigit
-        text += " mit Übertrag " + carries[idxCarry-1]
-        text = text.replace(/&nbsp;/g, "0")
+      if(trueNumbers){
+        text += resArr[idxNumbers] + " = " + firstDigit;
+        text += " mit Übertrag " + carries[idxCarry-1];
+        text = text.replace(/&nbsp;/g, "0");
         text += resArr[idxNumbers]===realDigitRes && carries[idxCarry-1]===realCarry ? ": Richtig " : ": Falsch ";
         stepsGridCopy.push({step: text});
       }
     }
 
-    let paragraph = document.getElementById("stepsParagraph")
+    let paragraph = document.getElementById("stepsParagraph");
     paragraph.innerHTML = "Rechenschritte: ";
 
     let btnSubmit = document.createElement("button");
@@ -389,7 +389,7 @@ function Subtraction() {
     document.getElementById("idmtResultSteps").style.display = "inline-block";
     document.getElementById("idmtResultSteps").tabIndex = 0;
     document.getElementById("idmtResultSteps").focus();
-  }
+  };
 
   const startOver = (idx, carryArrCopy) => {
     let invertedIdx = numbers[0].length - idx - 1;
@@ -417,7 +417,7 @@ function Subtraction() {
     document.getElementById("btnSubmitSteps1").remove();
     document.getElementById("btnSubmitSteps2").remove();
     document.getElementById("idmtResultSteps").style.display = "none";
-  }
+  };
 
   const finishCalculation = () => {
     document.getElementById("idmtResultSteps").innerHTML = "";
@@ -428,11 +428,11 @@ function Subtraction() {
     for(let r in resArr){
       let digit = resArr[r];
       if(digit==="&nbsp;"){
-        continue
+        continue;
       }
       if(digit!=="0" | beginNr | parseInt(r)===resArr.length-1){
         beginNr = true;
-        res.push(digit)
+        res.push(digit);
       }
     }
     let resCalc = res.join("");
@@ -452,14 +452,14 @@ function Subtraction() {
     document.getElementById("finishCalculation").innerHTML = message;
     document.getElementById("finishCalculation").tabIndex = "0";
     document.getElementById("finishCalculation").focus();
-  }
+  };
 
   const startCommaMove = () => {
     document.getElementById("commaSubmit").style.display = "inline-block";
     setTimeout(() => {
       document.getElementById("numbersTd0").focus();
-    }, 300)
-  }
+    }, 300);
+  };
 
   const submitCommaMove = () => {
     let numbersCopy = [...numbers];
@@ -489,7 +489,7 @@ function Subtraction() {
     if(commaPositions.length === 0){
       setCommaIdx(-1);
       // check if no number was moved
-      commaCorrect = !numbersCopy.map(n => n[numbersLen] !== "&nbsp;").includes(false)
+      commaCorrect = !numbersCopy.map(n => n[numbersLen] !== "&nbsp;").includes(false);
 
     // correct comma positions
     }else if(commaPositions.length === 1){
@@ -522,7 +522,7 @@ function Subtraction() {
       paragraph.tabIndex = "0";
       paragraph.focus();
     }
-  }
+  };
 
   return (
     <main>

+ 4 - 4
src/helpers.js

@@ -3,16 +3,16 @@ export const handleKeyDown = (e) => {
   if(e.keyCode === 13){
     document.getElementById("input_carry").focus();
   }
-}
+};
 
 
 export const afterCommaLen = (number) => {
   let noStrList = number.toString().split(".");
   if (noStrList.length > 1){
-    return noStrList[1].length
+    return noStrList[1].length;
   }
-  return 0
-}
+  return 0;
+};
 
 
 export function numbersToArrOfArr(numbers) {

+ 3 - 4
src/index.js

@@ -1,7 +1,6 @@
-import React from 'react';
-import {hydrate, render} from 'react-dom';
-import './index.css';
-import App from './App';
+import React from "react";
+import {hydrate, render} from "react-dom";
+import App from "./App";
 
 const rootElement = document.getElementById("root");
 if (rootElement.hasChildNodes()) {