Fixed bugs from merge 👍

ReqApp · Apr 7, 2020 · 0cdc672 · 0cdc672
1 parent 7822b21
commit 0cdc672
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/client/src/components/Bet_Display_Components/userCreatedBets.jsx b/client/src/components/Bet_Display_Components/userCreatedBets.jsx
@@ -32,6 +32,7 @@ export class UserCreatedBets extends Component {
                     console.log(res);
                     this.setState({loadingBets : false, bets : res.body});
                 }else{
+                    console.log("You have not created any bets");
                     this.setState({errorMsg : 'You have not created any bets yet'});
                 }
             }

diff --git a/client/src/pages/dashboard.js b/client/src/pages/dashboard.js
@@ -185,7 +185,7 @@ class Dashboard extends React.Component{
       }
       if(redirectToBigRedButton){
         return(
-          <Redirect to='/big-red-button' push />
+          <Redirect to='/bigRedButton' push />
         )
       }
       if(renderLogin){

diff --git a/express/funcs/betFuncs.js b/express/funcs/betFuncs.js
@@ -1145,13 +1145,11 @@ function checkIfBetIsNew(bet, username){
                 return false;
             }
         });
-        if(!found){
-            bet.againstUsers.forEach(user => {
-                if(user.user_name === username){
-                    return false;
-                }
-            })
-        }
+        bet.againstUsers.forEach(user => {
+            if(user.user_name === username){
+                return false;
+            }
+        });
     }
     else{
         bet.commonBets.forEach(user => {

diff --git a/express/logFiles/bigButton.txt b/express/logFiles/bigButton.txt
@@ -1 +1 @@
-112
+118
diff --git a/express/routes/bets.js b/express/routes/bets.js
@@ -874,9 +874,9 @@ router.post('/getFinishedBets', (req, res) => {
 });
 
 router.post('/getUserCreatedBets', (req, res) => {
-    utilFuncs.isSignedIn(req.cookies).then(profile => {
-        if(profile){
-            utilFuncs.getUserCreatedBets(profile.user_name)
+    utilFuncs.isSignedIn(req.cookies).then(user_name => {
+        if(user_name){
+            utilFuncs.getUserCreatedBets(user_name)
             .then(bets => {
                 res.status(200).json({
                     'status' : 'success',
@@ -904,12 +904,12 @@ router.post('/getUserCreatedBets', (req, res) => {
 
 router.post('/getBetsForUser', (req, res) => {
     // Check if user is signed in
-    utilFuncs.isSignedIn(req.cookies).then(profile => {
-        if(profile){
+    utilFuncs.isSignedIn(req.cookies).then(user_name => {
+        if(user_name){
             // Get all bets
             utilFuncs.getBets().then(data => {
                 // Get specific bet data from user
-                utilFuncs.getBetsForUser(data, profile.user_name).then(bets => {
+                utilFuncs.getBetsForUser(data, user_name).then(bets => {
                     if(bets){
                         res.status(200).json({
                             'status' : 'success',