Some changes to reset.

Author: Tarek

client/src/MyBets.js

@@ -173,15 +173,9 @@ class MyBets extends Component {
 				</div>
 			)
 		} else if (isLoading === false && balance != undefined) {
-			var augmentBal = false;
-			bets.map((bet => {
-				if (bet.settled) {
-					augmentBal = true;
-				}
-			}))
 			return (
         <div className="Balance">
-          <button onClick={this.setShowStuffToTrue}> Balance: ${augmentBal ? balance + 10 : balance} </button>
+          <button onClick={this.setShowStuffToTrue}> Balance: ${balance} </button>
         </div>
       )
 		}

client/src/SignUp.js

@@ -21,7 +21,7 @@ class SignUp extends Component {
           <Row form>
             <Col md={5}>
               <FormGroup>
-                <Label for="name">Name</Label>
+                <Label for="name">Full Name</Label>
                 <Input type="text" name="name" id="name" required />
               </FormGroup>
             </Col>

server/app.js

@@ -21,7 +21,7 @@ app.use(bodyParser.json());
 app.use(session({
   secret: 'f29a0fa9g49s095gas0csa1g08',
   resave: true,
-  saveUninitialized:true })
+  saveUninitialized:true }) // Session secret.
 );
 app.use(passport.initialize());
 app.use(passport.session()); // persistent login sessions

server/config/passport/passport.js

@@ -12,6 +12,7 @@ module.exports = function(passport,user){
 
   // used to deserialize the user
   passport.deserializeUser(function(id, done) {
+    
     User.findById(id).then(function(user) {
       if(user){
         done(null, user.get());
@@ -41,15 +42,18 @@ module.exports = function(passport,user){
       User.findOne({where: {email:email}}).then(function(user){
 
         if(user)
-        {
-          return done(null, false, {message : 'That email is already taken'} );
-        }
 
-        else
+        {
+          return done(null, false, {
+            message : 'The email you provided is already taken'
+          });
+        } else
         {
           var userPassword = generateHash(password);
+
           var data =
-          { email:email,
+          {
+            email:email,
             password:userPassword,
             firstname: req.body.firstname,
             lastname: req.body.lastname

server/routes/routes.js

@@ -2,6 +2,7 @@ var sleep = require('sleep');
 const sequelize = require("sequelize");
 var authController = require('../controllers/authcontroller.js');
 var models = require("../models");
+const Op = sequelize.Op;
 
 var appRouter = function (app, passport) {
   app.get("/", function (req, res) {
@@ -56,33 +57,33 @@ var appRouter = function (app, passport) {
     models.question.update({
         result: 'yes' }, { where: { id: req.body.question_primary_id }}
     )
-    models.bet_primary.findAll({ where: { question_id: req.body.question_primary_id }})
-    .then(bets => {
-      bets.forEach(bet => {
-      bet.update({settled: true })
-      })
-    })
+    models.bet_primary.update({
+      settled: 'yes'}, { where: {question_id: req.body.question_primary_id}}
+    )
+    models.match.update({
+      settled: 'yes'}, { where: {question_id: req.body.question_primary_id}}
+    )
 
-    models.match.findAll({ where: { question_id: req.body.question_primary_id }})
-    .then(bets => {
-      bets.forEach(bet => {
-      bet.update({settled: true })
-      })
-    })
-    // console.log(models.user.findAll())
-    // console.log("yooooooooooo")
-    models.bet_primary.findAll({ where: { question_id: req.body.question_primary_id}})
+    // models.match.findAll({ where: { question_id: req.body.question_primary_id}})
+    // .then(matches => {
+    //   matches.forEach(matche => {
+    //     models.user.findAll({ where: { id: matche.yes_user_id}})
+    //     .then(users => {
+    //       console.log('USERS----------:\n', users)
+    //       users.forEach(yes_user => {
+    //         var prev_balance = yes_user.balance;
+    //         yes_user.update({
+    //           balance: prev_balance + matche.amount * (float(matche.yes_odds_numerator) / float(matche.yes_odds_denominator))
+    //         });
+    //       });
+    //     });
+    //   });
+    // });
+
+    models.user.findAll({ where: { question_id: req.body.question_primary_id}})
     .then(bets => {
       console.log(bets)
       bets.forEach(bet => {
-      // console.log(bet.user_id)
-      // .then(use => {
-      //   var use_balance = use.balance
-      //   user.update({
-      //     balance: use_balance + (1 *int(bet.option === 'yes') - 1 * int(bet.option === 'no')) * (float(bet.odds_numerator) / float(bet.odds_denominator)) * bet.amount
-      //   })
-      // })
-
       bet.update({resolved: true })
       })
     })
@@ -254,7 +255,7 @@ var appRouter = function (app, passport) {
   app.get('/signup', authController.signup);
   app.get('/signin', authController.signin);
   app.post('/signup', passport.authenticate('local-signup', {
-      successRedirect: '/rolou',
+      successRedirect: '/questions',
       failureRedirect: '/signup'
     }
   ));