added "rewards" field to new challenge form

updated seed data with sample rewards #60
IBM-Cloud · Jun 21, 2017 · 1aa759e · 1aa759e
1 parent d8cdb58
commit 1aa759e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/routes/account/workouts.js b/routes/account/workouts.js
@@ -24,7 +24,6 @@ router.get('/', checkAuthenticated, (req, res) => {
     if (err) {
       res.status(500).send({ ok: false });
     } else {
-      // console.log('Retrieved', result);
       res.send(result.docs);
     }
   });

diff --git a/routes/market.js b/routes/market.js
@@ -44,7 +44,6 @@ router.get('/organization/challenges', checkAuthenticated, (req, res) => {
     if (err) {
       res.status(500).send({ ok: false });
     } else {
-      // console.log('Retrieved', result);
       res.send(result.docs);
     }
   });

diff --git a/seed/market.json b/seed/market.json
@@ -9,7 +9,8 @@
     "goal": 10,
     "unit": "workout",
     "activity": "CYCLING",
-    "description": "Earn a water bottle for 10 bike commutes to work"
+    "description": "Earn a water bottle for 10 bike commutes to work",
+    "rewards": 1000
   },
   {
     "_id": "fitForWork",
@@ -21,7 +22,8 @@
     "goal": 30,
     "unit": "workout",
     "activity": "ANY",
-    "description": "$100 health insurance credit for 30 workouts a year"
+    "description": "$100 health insurance credit for 30 workouts a year",
+    "rewards": 100
   },
   {
     "_id": "stairChallenge",
@@ -33,7 +35,8 @@
     "goal": 1000,
     "unit": "workout",
     "activity": "STAIRS",
-    "description": "Bobble hat for 1000 stairs climbed this winter"
+    "description": "Bobble hat for 1000 stairs climbed this winter",
+    "rewards": 1000
   },
   {
     "_id": "runnersLifeInsurance",
@@ -45,7 +48,8 @@
     "goal": 20,
     "unit": "workout",
     "activity": "RUNNING",
-    "description": "20% discount for 20 runs a year"
+    "description": "20% discount for 20 runs a year",
+    "rewards": 750
   },
   {
     "_id": "marathonQualifying",
@@ -57,6 +61,7 @@
     "goal": 1,
     "unit": "workout",
     "activity": "RUNNING",
-    "description": "Run one marathon in less than 4 hours"
+    "description": "Run one marathon in less than 4 hours",
+    "rewards": 500
   }
 ]
diff --git a/ui-react/src/Organization/NewChallenge.js b/ui-react/src/Organization/NewChallenge.js
@@ -17,7 +17,8 @@ class NewChallenge extends Component {
       goal: 1,
       unit: 'workout',
       activity: 'RUNNING',
-      description: 'Run one marathon in less than 4 hours'
+      description: 'Run one marathon in less than 4 hours',
+      rewards: 100
     };
     this.handleInputChange = this.handleInputChange.bind(this);
     this.submitNewChallenge = this.submitNewChallenge.bind(this);
@@ -105,16 +106,35 @@ class NewChallenge extends Component {
                   onChange={this.handleInputChange}
                 />
               </FormGroup>
-              <FormGroup className="some-class" legendText="Goal">
 
+              <FormGroup className="some-class" legendText="Goal">
+                <p>
+                  Number of Workouts
+                </p>
                 <TextInput
                   className="some-class"
                   id="goal"
                   label="Number of Workouts"
+                  type="number"
                   value={this.state.goal}
                   onChange={this.handleInputChange}
                 />
               </FormGroup>
+
+              <FormGroup className="some-class" legendText="Rewards">
+                <p>
+                  Reward tokens in the system
+                </p>
+                <TextInput
+                  className="some-class"
+                  id="rewards"
+                  label="Rewards"
+                  type="number"
+                  value={this.state.rewards}
+                  onChange={this.handleInputChange}
+                />
+              </FormGroup>
+
               <Button onClick={this.submitNewChallenge}>Submit</Button>
             </div>
           </div>