Voting added

app/routes/addpolls.js

@@ -10,6 +10,7 @@ function getpolldata(userid, req, res, next){
 
   polls.find(searchfor, function(err, pollarr){
     if(err) throw err;
+    console.log(pollarr);
     res.locals.result = pollarr;
     next();
   });
@@ -69,6 +70,23 @@ router.get('/polls/getone/:pollid',
 );
 
 //=====POST REQUESTS====================================================
+
+router.post('/vote/:pollid', function(req, res, next){
+  if(req.body.vote && req.params.pollid){
+    polls.findOne({_id: req.params.pollid}, function(err, found){
+      if(err) res.redirect('/');
+      found.updateVotes(+req.body.vote);
+      found.save(function(err){
+        if(err) throw err;
+        res.redirect('/single?pollid='+req.params.pollid);
+      });
+    });
+  }
+  else{
+    res.end(JSON.stringify({"error": "Invalid query"}));;
+  }
+});
+
 router.post('/polls', 
   function(req, res, next){
     if(req.user){
@@ -102,23 +120,6 @@ router.post('/polls',
             }
           break;
 
-          //====VOTE ON A POLL================================================
-          case "vote":
-            if(req.body.pollid && req.body.option){
-              polls.findOne({_id: req.body.pollid}, function(err, found){
-                if(err) throw err;
-                found.updateVotes(+req.body.option);
-                found.save(function(err){
-                  if(err) throw err;
-                  res.end();
-                });
-              });
-            }
-            else{
-              res.end(JSON.stringify({"error": "Invalid query"}));;
-            }
-            break;
-
           //====ADD AN OPTION====================================================
           case "addoption":
             if(req.body.pollid && req.body.option){

app/static/dev/css/single.scss

@@ -5,15 +5,15 @@
   & .allcharts {
     display:block; 
     margin-top:20px;   
-
+    padding: 0 20px 0 20px;
+
     & .charts{
       display: inline-block;
-      float: right;
+      float: left;
       position:relative;
       width: 50%; 
 
       & canvas{
-        //box-shadow: 0px 2px 3px fade-out(#000, 0.8);
         padding-bottom: 15px;
         padding-top: 15px;
       }
@@ -23,7 +23,7 @@
 
 .options{
   display: block;
-  float: right;
+  float: left;
   padding-bottom: 20px;
   padding-top: 50px;
   width: 50%;

app/static/dev/js/createCharts.js

@@ -18,7 +18,7 @@ function createCharts (res, allcharts, detailed){
       a.classList.add('charts');
       a.setAttribute('href', '/single?pollid='+id);
       a.appendChild(canvas);
-      allcharts.appendChild(a);
+      allcharts.insertBefore(a, allcharts.firstChild);
       var chart = new Chart(canvas, config);
   }
 

app/static/dist/css/single.css

@@ -227,10 +227,11 @@ body {
   display: block; }
   .single .allcharts {
     display: block;
-    margin-top: 20px; }
+    margin-top: 20px;
+    padding: 0 20px 0 20px; }
     .single .allcharts .charts {
       display: inline-block;
-      float: right;
+      float: left;
       position: relative;
       width: 50%; }
       .single .allcharts .charts canvas {
@@ -239,7 +240,7 @@ body {
 
 .options {
   display: block;
-  float: right;
+  float: left;
   padding-bottom: 20px;
   padding-top: 50px;
   width: 50%; }

app/static/dist/js/createCharts.js

@@ -17,7 +17,7 @@ function createCharts(res, allcharts, detailed) {
         a.classList.add('charts');
         a.setAttribute('href', '/single?pollid=' + id);
         a.appendChild(canvas);
-        allcharts.appendChild(a);
+        allcharts.insertBefore(a, allcharts.firstChild);
         var chart = new Chart(canvas, config);
     }
 

app/views/single.pug

@@ -9,8 +9,9 @@ html
 
     div.single
       div.allcharts(id=pollid)
-        form.options(id="votes")
+        form.options(id="votes" method="post" action="vote/"+pollid)
           ul.optionlist(id="optionlist")
+          input.submit(type="submit" value="vote")
 
     script(src="https://cdnjs.cloudflare.com/ajax/libs/qwest/4.4.5/qwest.min.js")
     script(src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.2.2/Chart.min.js")
@@ -28,17 +29,20 @@ html
           _in.setAttribute('type', 'radio'),
           _in.setAttribute('name', 'vote'),
           _in.setAttribute('id', id),
+          _in.setAttribute('value', i),
           label.setAttribute('for', id),
           label.classList.add('votelabel'),
           label.innerHTML = arr[i].optionName;
-
+          if(i===0) _in.setAttribute('checked', true);
           li.appendChild(_in),
           li.appendChild(label);
 
           document.getElementById('optionlist').appendChild(li);
         }
       }
 
+
+
       var a=document.getElementsByClassName('allcharts')[0],
       i=a.getAttribute('id');
       qwest.get('/polls/getone/'+i)