accept changes

abonnell · Sep 23, 2020 · 6c5b273 · 6c5b273
2 parents c3f01ad + 8ff287b
commit 6c5b273
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+TODO.md
+
+.vercel
diff --git a/src/index.css → src/App.css b/src/index.css → src/App.css
diff --git a/src/App.jsx b/src/App.jsx
@@ -49,12 +49,12 @@ const App = () => {
   }, [addAndRoll]);
 
   //Rolls pool and resets to 0 if it hits 6 or more
-  // useEffect(() => {
-  //   if (currentPool >= 6 && currentPool != 0) {
-  //     rollHelper(currentPool);
-  //     setCurrentPool(0);
-  //   }
-  // }, [currentPool]);
+  useEffect(() => {
+    if (currentPool >= 6) {
+      rollHelper(currentPool);
+      setCurrentPool(0);
+    }
+  }, [currentPool]);
 
   return (
     <div className='ui container my-container'>

diff --git a/src/RollHistory.js → src/Components/RollHistory.js b/src/RollHistory.js → src/Components/RollHistory.js
diff --git a/src/TensionButton/TensionButton.js → ...omponents/TensionButton/TensionButton.jsx b/src/TensionButton/TensionButton.js → ...omponents/TensionButton/TensionButton.jsx
diff --git a/src/TensionCard/TensionCard.css → src/Components/TensionCard/TensionCard.css b/src/TensionCard/TensionCard.css → src/Components/TensionCard/TensionCard.css
diff --git a/src/TensionCard/TensionCard.js → src/Components/TensionCard/TensionCard.jsx b/src/TensionCard/TensionCard.js → src/Components/TensionCard/TensionCard.jsx
@@ -12,8 +12,4 @@ const TensionCard = ({ label, value }) => {
   );
 };
 
-TensionCard.defaultProps = {
-  value: 5,
-};
-
 export default TensionCard;
diff --git a/src/Usage.css → src/Components/Usage/Usage.css b/src/Usage.css → src/Components/Usage/Usage.css
diff --git a/src/Usage.js → src/Components/Usage/Usage.jsx b/src/Usage.js → src/Components/Usage/Usage.jsx
diff --git a/src/index.js b/src/index.js
diff --git a/src/index.jsx b/src/index.jsx
@@ -0,0 +1,5 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+ReactDOM.render(<App />, document.querySelector('#root'));