Merge branch 'master' of ssh://github.com/coding-blocks/boss

Author: championswimmer

public_static/images/favicon.ico

@@ -113,6 +113,10 @@ route.get('/claims/view', (req, res) => {
   }
 
   var menuH = {}
+  var current 
+  if(req.user) {
+    current = req.user.usergithub.username
+  }
 
   if (options.status == 'claimed') menuH[options.status] = 'active'
   else if (options.status == 'accepted') menuH[options.status] = 'active'
@@ -182,6 +186,7 @@ route.get('/claims/view', (req, res) => {
         },
         status: options.status,
         menuH,
+        current,
         filter: filter,
         filterproj: filterproj,
         username: options.username,
@@ -250,4 +255,38 @@ route.post('/claims/:id/update', auth.adminOnly, (req, res) => {
     })
 })
 
+route.get('/claims/:id/edit', auth.ensureLoggedInGithub, (req, res) => {
+
+  du.getClaimById(req.params.id)
+    .then(claim => {
+      if (!claim) throw new Error('No claim found')
+      res.render('pages/claims/edit', { claim })
+    })
+    .catch(err => {
+      res.send('Error fetching claim id = ' + escapeHtml(req.params.id))
+    })
+})
+
+route.post('/claims/:id/edit', auth.ensureLoggedInGithub,(req, res) => {
+
+  du.updateClaim(req.params.id, req.body)
+   .then(result => {
+     res.redirect('/claims/view')
+   })
+   .catch(error => {
+     res.send('Error updating claim')
+   })
+})
+
+route.get('/claims/:id/delete', auth.ensureLoggedInGithub, (req, res) => {
+  
+  du.delClaim(req.params.id)
+  .then(() => {
+    res.redirect('/claims/view')
+  })
+  .catch(error => {
+    res.send('Error Deleting Claim')
+  })
+})
+
 module.exports = route

routes/root.js

@@ -121,13 +121,13 @@ function getCounts() {
         'bounty',
         'sum'
     );
-    if (Number.isNaN(accepted)) {
-        accepted = 0;
-    }
-    if (Number.isNaN(totalclaimed)) {
-        totalclaimed = 0;
-    }
-    return Promise.all([participants, claims, accepted, totalclaimed]);
+
+    var filterNaN = (data) => data || 0;
+
+    var counts = Promise.all([participants, claims, accepted, totalclaimed])
+                .then((values) => values.map(filterNaN));
+
+    return counts;
 }
 
 module.exports = {

utils/datautils.js

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     <title>BOSS</title>
+    <link rel='shortcut icon' type='image/x-icon' href='/images/favicon.ico' />
     <link href="/lib/jquery-ui/jquery-ui.min.css" rel="stylesheet">
     <link href="/lib/semantic/semantic.min.css" rel="stylesheet">
     <script src="/lib/jquery-3.2.1.min.js"></script>
@@ -173,7 +174,7 @@
       <i class="github icon"></i>
       Open Issues
     </a>
-    <a class="item" href="https://gitter.im/coding-blocks/boss-2018-lobby" target="_blank" >
+    <a class="item" href="https://gitter.im/coding-blocks/boss-2019-lobby" target="_blank" >
       <i class="gitter icon"></i> Gitter
     </a>
   </div>

views/layouts/main.hbs

@@ -0,0 +1,32 @@
+<form class="ui form" method="post" action="/claims/{{claim.id}}/edit">
+    <div class="field">
+        <label>Github Username</label>
+        <input name="user" placeholder="Github Username, eg. 'championswimmer'" disabled type="text" value="{{claim.user}}" required>
+    </div>
+    <div class="field">
+        <label>Issue URL</label>
+        <input name="issue_url" placeholder="URL of Issue, eg. http://github.com/org/proj/issue/7" type="url" value="{{claim.issueUrl}}" required>
+    </div>
+    <div class="field">
+        <label>Pull Request URL</label>
+        <input name="pull_url" placeholder="URL of PR, eg. http://github.com/org/proj/pull/7" type="url" value="{{claim.pullUrl}}" required>
+    </div>
+    <div class="field">
+        <label>Bounty</label>
+        <input name="bounty" placeholder="Bounty Points you are claiming for this" type="number" value="{{claim.bounty}}" required>
+    </div>
+    <div class="ui container center aligned">
+        <button class="ui button green" type="submit">Save</button>
+    </div>
+    <div class="ui container center aligned">
+        <a href="/claims/{{claim.id}}/delete" class="ui button red">Delete
+        </a>
+    </div>
+</form>
+{{#if error}}
+<div class="ui negative message">
+  <div class="header" align="center">
+    {{error}}
+  </div>
+</div>
+{{/if}}

views/pages/claims/edit.hbs

@@ -156,6 +156,13 @@
                     {{/if}}
                     {{#equal claim.status "claimed"}}
                         <div class="ui label yellow">{{claim.status}}</div>
+                        {{#equal claim.user ../current }}
+                            <a href="/claims/{{claim.id}}/edit" style="color:white">
+                                <div class="ui label blue">
+                                    Edit
+                                </div>
+                            </a>
+                        {{/equal}}
                     {{/equal}}
                     {{#equal claim.status "accepted"}}
                         <div class="ui label green">{{claim.status}}</div>