Working voting system - bug - removes the player from the stats box

Fraganya · Nov 20, 2016 · 7033efd · 7033efd
1 parent 23909b1
commit 7033efd
Show file tree

Hide file tree

Showing 20 changed files with 1,166 additions and 167 deletions.
diff --git a/Game.php b/Game.php
@@ -23,12 +23,14 @@
 $Asset->file(APIPATH."Helpers.php");
 $Asset->file(APIPATH."Screen.php");
 
-
+/**
+* Extract URI parts
+*/
 /*-----------------------------------------------------------------------------
 |                        Get Controller and action
 -----------------------------------------------------------------------------*/
-$controller=(isset($_GET['controller'])) ? ucfirst($_GET['controller']) : 'Setup';
-$method=(isset($_GET['method'])) ? $_GET['method'] : 'index';
+$controller=(isset($_GET['controller']) && !empty($_GET['controller'])) ? ucfirst($_GET['controller']) : 'Setup';
+$method=(isset($_GET['method']) && !empty($_GET['method'])) ? $_GET['method'] : 'index';
 
 /*-----------------------------------------------------------------------------
 |                        Validate the route

diff --git a/Game/Assets/css/custom.css b/Game/Assets/css/custom.css
@@ -196,6 +196,9 @@ ul.contestant-bar li.active {
 .validation-error {
   border-color: red;
 }
+.focused {
+  border-color: orange;
+}
 .loader {
   border: 16px solid #E3F2FD;
   border-radius: 50%;

diff --git a/Game/Assets/css/custom.less b/Game/Assets/css/custom.less
@@ -243,7 +243,9 @@ ul.contestant-bar li.active
     border-color:red;
 
 }
-
+.focused{
+   border-color:orange;
+}
 .loader {
   border: 16px solid @base-bg;
   border-radius: 50%;

diff --git a/Game/Assets/js/Components/AdminWidgets.js b/Game/Assets/js/Components/AdminWidgets.js
diff --git a/Game/Assets/js/Components/contributions.js b/Game/Assets/js/Components/contributions.js
@@ -8,7 +8,7 @@ var SuggestBox=React.createClass({displayName: "SuggestBox",
     getInitialState:function()
     {
         return {status:'not-suggesting',statusMsg:"Hi! How would you like to contribute ?",
-                    formErr:false,err:"Sorry something went wrong.Try again"};
+                    formErr:false,err:"Sorry something went wrong.Try again",done:false};
     },
     validateInputs:function(tag){
         var qInputs=$(tag);
@@ -92,7 +92,9 @@ var SuggestBox=React.createClass({displayName: "SuggestBox",
 
         promiseToAddQ.then(function(fromResolve){
             if(fromResolve){
-                this.setState({status:'not-suggesting'});
+                this.refs.qBox.value="";
+                this.refs.aBox.value="";
+                this.setState({done:true});
             }
         }.bind(this))
 
@@ -137,7 +139,7 @@ var SuggestBox=React.createClass({displayName: "SuggestBox",
             ), 
 
             React.createElement("button", {type: "button", className: "btn wk-btn", onClick: this.sendQuestionSuggestion}, "Suggest"), 
-            React.createElement("button", {type: "button", className: "btn wk-btn marg-1", onClick: this.abort}, "Cancel")
+            React.createElement("button", {type: "button", id: "doneBtn", className: "btn wk-btn marg-1", onClick: this.abort}, (this.state.done)?"done":"cancel")
             )
         );
     },

diff --git a/Game/Assets/js/Components/help.js b/Game/Assets/js/Components/help.js
@@ -206,7 +206,7 @@ var AcknowledgementList=React.createClass({displayName: "AcknowledgementList",
         return(
             React.createElement("div", null, 
               this.state.projects.map(function(library,index){
-                  return  React.createElement("a", {target: "_blank", href: 'http:://'+library.website, key: index, className: "list-group-item"}, library.project)
+                  return  React.createElement("a", {target: "_blank", href: 'http://'+library.website, key: index, className: "list-group-item"}, library.project)
               })
             )
         )