Merge pull request #73 from 3daddict/dev

Dev
3daddict · Jan 13, 2019 · 13d48fc · 13d48fc
2 parents ee9f25b + 9af8f0a
commit 13d48fc
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 7 deletions.
diff --git a/dist/assets/fonts/5dc69b589619839f15ec5f46fcdb6206.woff b/dist/assets/fonts/5dc69b589619839f15ec5f46fcdb6206.woff
diff --git a/dist/assets/fonts/82db10236a062ea1c20ac6364c26453a.woff b/dist/assets/fonts/82db10236a062ea1c20ac6364c26453a.woff
diff --git a/dist/assets/fonts/8e038814a58389ca1f0f08a911289397.woff2 b/dist/assets/fonts/8e038814a58389ca1f0f08a911289397.woff2
diff --git a/dist/assets/fonts/9559f8691b41e6aa69d85c458557680e.woff2 b/dist/assets/fonts/9559f8691b41e6aa69d85c458557680e.woff2
diff --git a/dist/assets/fonts/a875fbb13eb0d6a0503b634aa25645fa.woff b/dist/assets/fonts/a875fbb13eb0d6a0503b634aa25645fa.woff
diff --git a/dist/assets/fonts/d61eeca843f89d0bc70e55a217517ce0.woff2 b/dist/assets/fonts/d61eeca843f89d0bc70e55a217517ce0.woff2
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "Sunil Kumar Jain <[email protected]@gmail.com> (https://github.com/sunilsj99)",
     "Cintia Tahirih <[email protected]> (https://github.com/cTahirih)",
     "Prashant Chaudhari <[email protected]> (https://github.com/pandaa880)",
-    "Alexis Pandaan <[email protected]> (https://github.com/Alexius08)" 
+    "Alexis Pandaan <[email protected]> (https://github.com/Alexius08)"
   ],
   "license": "ISC",
   "repository": {

diff --git a/src/components/app.js b/src/components/app.js
@@ -158,14 +158,34 @@ class App extends Component {
   handleClick(index) {
     const newRevealStates = this.state.cardRevealStates;
     newRevealStates[index] = true;
-
-    this.setState({
-      cardRevealStates: newRevealStates
+    //cards actively flipped counter 
+    let cardsFlipped = 0;
+
+    //adds how many active cards flipped there are
+    newRevealStates.forEach(function(el) {
+      if (el === true) {
+        cardsFlipped++;
+      } else {
+        return;
+      }
     });
 
-    // console.log("Clicked");
-    this.checkForMatch();
-    this.addNumberOfClicks();
+    //checks if only two cards are flipped
+    if (cardsFlipped < 3) {
+      //if only 2 are flipped it continues on
+      this.setState({
+        cardRevealStates: newRevealStates
+      });
+
+      this.checkForMatch();
+
+      this.addNumberOfClicks();
+    } else {
+      //if more then two are it returns and doesn't let you flip another
+      return;
+    }
+
+
   }
 
   addNumberOfClicks() {