diff --git a/lib/gather/gather.js b/lib/gather/gather.js index eac3ee7..3a19f03 100644 --- a/lib/gather/gather.js +++ b/lib/gather/gather.js @@ -25,7 +25,7 @@ function Gather (options) { this.TEAM_SIZE = 6; this.gatherers = []; - this.ELECTION_INTERVAL = 10000; // 10 Seconds (temporarily) + this.ELECTION_INTERVAL = 300000; // 5 mins this.electionStartTime = null; this.initState(); } diff --git a/lib/react/gather.jsx b/lib/react/gather.jsx index 6ed5141..77fedca 100644 --- a/lib/react/gather.jsx +++ b/lib/react/gather.jsx @@ -143,7 +143,7 @@ var ElectionProgressBar = React.createClass({ return { num: msTranspired, den: interval, - barMessage: Math.floor((interval - msTranspired) / 100) + "s remaining" + barMessage: Math.floor((interval - msTranspired) / 1000) + "s remaining" } }, componentWillUnmount: function () { diff --git a/lib/react/user.jsx b/lib/react/user.jsx index a5cb6b3..e9fe7a3 100644 --- a/lib/react/user.jsx +++ b/lib/react/user.jsx @@ -112,10 +112,32 @@ var CurrentUser = React.createClass({ render: function () { if (this.props.user) { return ( - {this.props.user.username}  User Avatar + + ); } else { return false; diff --git a/public/js/app.js b/public/js/app.js index 1e5cb0b..f67d599 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -143,7 +143,7 @@ var ElectionProgressBar = React.createClass({displayName: "ElectionProgressBar", return { num: msTranspired, den: interval, - barMessage: Math.floor((interval - msTranspired) / 100) + "s remaining" + barMessage: Math.floor((interval - msTranspired) / 1000) + "s remaining" } }, componentWillUnmount: function () { @@ -910,10 +910,32 @@ var CurrentUser = React.createClass({displayName: "CurrentUser", render: function () { if (this.props.user) { return ( - React.createElement("a", {href: "#"}, this.props.user.username, "  ", React.createElement("img", {src: this.props.user.avatar, - alt: "User Avatar", - height: "20", - width: "20"})) + React.createElement("li", {class: "dropdown"}, + React.createElement("a", {className: "dropdown-toggle", "data-toggle": "dropdown", href: "#"}, + this.props.user.username, "  ", React.createElement("img", {src: this.props.user.avatar, + alt: "User Avatar", + height: "20", + width: "20"}), " ", React.createElement("i", {className: "fa fa-caret-down"}) + ), + React.createElement("ul", {className: "dropdown-menu dropdown-user"}, + React.createElement("li", null, + React.createElement("a", {href: "#"}, React.createElement("i", {className: "fa fa-gear fa-fw"}), " Profile") + ), + React.createElement("li", null, + React.createElement("a", {href: "#"}, React.createElement("i", {className: "fa fa-flag fa-fw"}), " Notifications") + ), + React.createElement("li", null, + React.createElement("a", {href: "#"}, React.createElement("i", {className: "fa fa-music fa-fw"}), " Sounds") + ), + React.createElement("li", null, + React.createElement("a", {href: "#", "data-toggle": "modal", "data-target": "#designmodal"}, "Design Goals") + ), + React.createElement("li", {className: "divider"}), + React.createElement("li", null, React.createElement("a", {href: "login.html"}, React.createElement("i", {className: "fa fa-sign-out fa-fw"}), " Logout") + ) + ) + ) + ); } else { return false; diff --git a/views/partials/menu.hbs b/views/partials/menu.hbs index 7f7f247..764d182 100644 --- a/views/partials/menu.hbs +++ b/views/partials/menu.hbs @@ -36,29 +36,7 @@ ENSL.org Gathers Alpha -