diff --git a/CTFd/themes/admin/templates/teams/team.html b/CTFd/themes/admin/templates/teams/team.html index 6f8160b..9fb9d97 100644 --- a/CTFd/themes/admin/templates/teams/team.html +++ b/CTFd/themes/admin/templates/teams/team.html @@ -130,7 +130,7 @@
-
+
{% if solves %}
@@ -148,13 +148,13 @@
{% else %} -

No solves yet

{% endif %}
-
+

Team Members

@@ -209,7 +209,7 @@ aria-controls="nav-awards" aria-selected="false">Awards -
+
\", '\", '\", \"\", \"\"].join(\"\");\n table.append(row);\n }\n });\n};\n\nvar createGraph = function createGraph() {\n _CTFd.default.api.get_scoreboard_detail({\n count: 10\n }).then(function (response) {\n var places = response.data;\n var teams = Object.keys(places);\n var traces = [];\n\n if (teams.length === 0) {\n // Replace spinner\n graph.html('
');\n return;\n }\n\n for (var i = 0; i < teams.length; i++) {\n var team_score = [];\n var times = [];\n\n for (var j = 0; j < places[teams[i]][\"solves\"].length; j++) {\n team_score.push(places[teams[i]][\"solves\"][j].value);\n var date = (0, _moment.default)(places[teams[i]][\"solves\"][j].date);\n times.push(date.toDate());\n }\n\n var trace = {\n x: times,\n y: (0, _utils.cumulativeSum)(team_score),\n mode: \"lines+markers\",\n name: places[teams[i]][\"name\"],\n marker: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n },\n line: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n }\n };\n traces.push(trace);\n }\n\n traces.sort(function (a, b) {\n var score_diff = b[\"y\"][b[\"y\"].length - 1] - a[\"y\"][a[\"y\"].length - 1];\n\n if (!score_diff) {\n return a[\"x\"][a[\"x\"].length - 1] - b[\"x\"][b[\"x\"].length - 1];\n }\n\n return score_diff;\n });\n graph.empty(); // Remove spinners\n\n graph[0].fn = \"CTFd_scoreboard_\" + new Date().toISOString().slice(0, 19);\n\n _plotly.default.newPlot(graph[0], traces, layout, config);\n });\n};\n\nvar updateGraph = function updateGraph() {\n _CTFd.default.api.get_scoreboard_detail({\n count: 10\n }).then(function (response) {\n var places = response.data;\n var teams = Object.keys(places);\n var traces = [];\n\n if (teams.length === 0) {\n return;\n }\n\n for (var i = 0; i < teams.length; i++) {\n var team_score = [];\n var times = [];\n\n for (var j = 0; j < places[teams[i]][\"solves\"].length; j++) {\n team_score.push(places[teams[i]][\"solves\"][j].value);\n var date = (0, _moment.default)(places[teams[i]][\"solves\"][j].date);\n times.push(date.toDate());\n }\n\n var trace = {\n x: times,\n y: (0, _utils.cumulativeSum)(team_score),\n mode: \"lines+markers\",\n name: places[teams[i]][\"name\"],\n marker: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n },\n line: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n }\n };\n traces.push(trace);\n }\n\n traces.sort(function (a, b) {\n var score_diff = b[\"y\"][b[\"y\"].length - 1] - a[\"y\"][a[\"y\"].length - 1];\n\n if (!score_diff) {\n return a[\"x\"][a[\"x\"].length - 1] - b[\"x\"][b[\"x\"].length - 1];\n }\n\n return score_diff;\n });\n\n _plotly.default.react(graph[0], traces, layout, config);\n });\n};\n\nfunction update() {\n updateScores();\n updateGraph();\n}\n\n(0, _jquery.default)(function () {\n setInterval(update, 300000); // Update scores every 5 minutes\n\n createGraph();\n updateGraph();\n});\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/pages/scoreboard.js?"); +eval("\n\n__webpack_require__(/*! ./main */ \"./CTFd/themes/core/assets/js/pages/main.js\");\n\nvar _jquery = _interopRequireDefault(__webpack_require__(/*! jquery */ \"./node_modules/jquery/dist/jquery.js\"));\n\nvar _CTFd = _interopRequireDefault(__webpack_require__(/*! ../CTFd */ \"./CTFd/themes/core/assets/js/CTFd.js\"));\n\nvar _plotly = _interopRequireDefault(__webpack_require__(/*! plotly.js-basic-dist */ \"./node_modules/plotly.js-basic-dist/plotly-basic.js\"));\n\nvar _moment = _interopRequireDefault(__webpack_require__(/*! moment */ \"./node_modules/moment/moment.js\"));\n\nvar _utils = __webpack_require__(/*! ../utils */ \"./CTFd/themes/core/assets/js/utils.js\");\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nvar graph = (0, _jquery.default)(\"#score-graph\");\nvar table = (0, _jquery.default)(\"#scoreboard tbody\");\nvar config = {\n displaylogo: false,\n responsive: true\n};\nvar layout = {\n title: \"Top 10 \" + (window.userMode === \"teams\" ? \"Teams\" : \"Users\"),\n paper_bgcolor: \"rgba(0,0,0,0)\",\n plot_bgcolor: \"rgba(0,0,0,0)\",\n hovermode: \"closest\",\n xaxis: {\n showgrid: false,\n showspikes: true\n },\n yaxis: {\n showgrid: false,\n showspikes: true\n },\n legend: {\n orientation: \"h\"\n }\n};\n\nvar updateScores = function updateScores() {\n _CTFd.default.api.get_scoreboard_list().then(function (response) {\n var teams = response.data;\n table.empty();\n\n for (var i = 0; i < teams.length; i++) {\n var row = [\"\", '\", '\", \"\", \"\"].join(\"\");\n table.append(row);\n }\n });\n};\n\nvar createGraph = function createGraph() {\n _CTFd.default.api.get_scoreboard_detail({\n count: 10\n }).then(function (response) {\n var places = response.data;\n var teams = Object.keys(places);\n var traces = [];\n\n if (teams.length === 0) {\n // Replace spinner\n graph.html('

No solves yet

');\n return;\n }\n\n for (var i = 0; i < teams.length; i++) {\n var team_score = [];\n var times = [];\n\n for (var j = 0; j < places[teams[i]][\"solves\"].length; j++) {\n team_score.push(places[teams[i]][\"solves\"][j].value);\n var date = (0, _moment.default)(places[teams[i]][\"solves\"][j].date);\n times.push(date.toDate());\n }\n\n var trace = {\n x: times,\n y: (0, _utils.cumulativeSum)(team_score),\n mode: \"lines+markers\",\n name: places[teams[i]][\"name\"],\n marker: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n },\n line: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n }\n };\n traces.push(trace);\n }\n\n traces.sort(function (a, b) {\n var score_diff = b[\"y\"][b[\"y\"].length - 1] - a[\"y\"][a[\"y\"].length - 1];\n\n if (!score_diff) {\n return a[\"x\"][a[\"x\"].length - 1] - b[\"x\"][b[\"x\"].length - 1];\n }\n\n return score_diff;\n });\n graph.empty(); // Remove spinners\n\n graph[0].fn = \"CTFd_scoreboard_\" + new Date().toISOString().slice(0, 19);\n\n _plotly.default.newPlot(graph[0], traces, layout, config);\n });\n};\n\nvar updateGraph = function updateGraph() {\n _CTFd.default.api.get_scoreboard_detail({\n count: 10\n }).then(function (response) {\n var places = response.data;\n var teams = Object.keys(places);\n var traces = [];\n\n if (teams.length === 0) {\n return;\n }\n\n for (var i = 0; i < teams.length; i++) {\n var team_score = [];\n var times = [];\n\n for (var j = 0; j < places[teams[i]][\"solves\"].length; j++) {\n team_score.push(places[teams[i]][\"solves\"][j].value);\n var date = (0, _moment.default)(places[teams[i]][\"solves\"][j].date);\n times.push(date.toDate());\n }\n\n var trace = {\n x: times,\n y: (0, _utils.cumulativeSum)(team_score),\n mode: \"lines+markers\",\n name: places[teams[i]][\"name\"],\n marker: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n },\n line: {\n color: (0, _utils.colorHash)(places[teams[i]][\"name\"] + places[teams[i]][\"id\"])\n }\n };\n traces.push(trace);\n }\n\n traces.sort(function (a, b) {\n var score_diff = b[\"y\"][b[\"y\"].length - 1] - a[\"y\"][a[\"y\"].length - 1];\n\n if (!score_diff) {\n return a[\"x\"][a[\"x\"].length - 1] - b[\"x\"][b[\"x\"].length - 1];\n }\n\n return score_diff;\n });\n\n _plotly.default.react(graph[0], traces, layout, config);\n });\n};\n\nfunction update() {\n updateScores();\n updateGraph();\n}\n\n(0, _jquery.default)(function () {\n setInterval(update, 300000); // Update scores every 5 minutes\n\n createGraph();\n updateGraph();\n});\n\n//# sourceURL=webpack:///./CTFd/themes/core/assets/js/pages/scoreboard.js?"); /***/ }) diff --git a/CTFd/themes/core/static/js/pages/scoreboard.min.js b/CTFd/themes/core/static/js/pages/scoreboard.min.js index 7c63898..da7bbd4 100644 --- a/CTFd/themes/core/static/js/pages/scoreboard.min.js +++ b/CTFd/themes/core/static/js/pages/scoreboard.min.js @@ -1 +1 @@ -!function(l){function e(e){for(var t,o,n=e[0],s=e[1],i=e[2],a=0,r=[];a".concat(e.body,"

")):o.find(".modal-body").append((0,r.default)(e.body));var n=(0,r.default)(c.format(e.button));return e.success&&(0,r.default)(n).click(function(){e.success()}),e.large&&o.find(".modal-dialog").addClass("modal-lg"),o.find(".modal-footer").append(n),(0,r.default)("main").append(o),o.modal("show"),(0,r.default)(o).on("hidden.bs.modal",function(){(0,r.default)(this).modal("dispose")}),o}function f(e){(0,r.default)("#ezq--notifications-toast-container").length||(0,r.default)("body").append((0,r.default)("
").attr({id:"ezq--notifications-toast-container"}).css({position:"fixed",bottom:"0",right:"0","min-width":"20%"}));var t=l.format(e.title,e.body),o=(0,r.default)(t);if(e.onclose&&(0,r.default)(o).find("button[data-dismiss=toast]").click(function(){e.onclose()}),e.onclick){var n=(0,r.default)(o).find(".toast-body");n.addClass("cursor-pointer"),n.click(function(){e.onclick()})}var s=!1!==e.autohide,i=!1!==e.animation,a=e.delay||1e4;return(0,r.default)("#ezq--notifications-toast-container").prepend(o),o.toast({autohide:s,delay:a,animation:i}),o.toast("show"),o}function j(e){var t=i.format(e.title),o=(0,r.default)(t);"string"==typeof e.body?o.find(".modal-body").append("

".concat(e.body,"

")):o.find(".modal-body").append((0,r.default)(e.body));var n=(0,r.default)(u),s=(0,r.default)(m);return o.find(".modal-footer").append(s),o.find(".modal-footer").append(n),(0,r.default)("main").append(o),(0,r.default)(o).on("hidden.bs.modal",function(){(0,r.default)(this).modal("dispose")}),(0,r.default)(n).click(function(){e.success()}),o.modal("show"),o}function h(e){if(e.target){var t=(0,r.default)(e.target);return t.find(".progress-bar").css("width",e.width+"%"),t}var o=a.format(e.width),n=i.format(e.title),s=(0,r.default)(n);return s.find(".modal-body").append((0,r.default)(o)),(0,r.default)("main").append(s),s.modal("show")}function _(e){var t={success:d,error:s}[e.type].format(e.body);return(0,r.default)(t)}var v={ezAlert:p,ezToast:f,ezQuery:j,ezProgressBar:h,ezBadge:_};t.default=v},"./CTFd/themes/core/assets/js/fetch.js":function(e,t,o){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0,o("./node_modules/whatwg-fetch/fetch.js");var n,s=(n=o("./CTFd/themes/core/assets/js/config.js"))&&n.__esModule?n:{default:n};var i=window.fetch;t.default=function(e,t){return void 0===t&&(t={method:"GET",credentials:"same-origin",headers:{}}),e=s.default.urlRoot+e,void 0===t.headers&&(t.headers={}),t.credentials="same-origin",t.headers.Accept="application/json",t.headers["Content-Type"]="application/json",t.headers["CSRF-Token"]=s.default.csrfNonce,i(e,t)}},"./CTFd/themes/core/assets/js/pages/main.js":function(e,t,o){var n=p(o("./CTFd/themes/core/assets/js/CTFd.js")),s=p(o("./node_modules/jquery/dist/jquery.js")),i=p(o("./node_modules/moment/moment.js")),a=p(o("./node_modules/nunjucks/browser/nunjucks.js")),r=o("./node_modules/howler/dist/howler.js"),l=p(o("./CTFd/themes/core/assets/js/events.js")),d=p(o("./CTFd/themes/core/assets/js/config.js")),c=p(o("./CTFd/themes/core/assets/js/styles.js")),m=p(o("./CTFd/themes/core/assets/js/times.js")),u=p(o("./CTFd/themes/core/assets/js/helpers.js"));function p(e){return e&&e.__esModule?e:{default:e}}n.default.init(window.init),window.CTFd=n.default,window.helpers=u.default,window.$=s.default,window.Moment=i.default,window.nunjucks=a.default,window.Howl=r.Howl,(0,s.default)(function(){(0,c.default)(),(0,m.default)(),(0,l.default)(d.default.urlRoot)})},"./CTFd/themes/core/assets/js/pages/scoreboard.js":function(e,t,o){o("./CTFd/themes/core/assets/js/pages/main.js");var n=i(o("./node_modules/jquery/dist/jquery.js")),s=i(o("./CTFd/themes/core/assets/js/CTFd.js")),c=i(o("./node_modules/plotly.js-basic-dist/plotly-basic.js")),m=i(o("./node_modules/moment/moment.js")),u=o("./CTFd/themes/core/assets/js/utils.js");function i(e){return e&&e.__esModule?e:{default:e}}function a(){s.default.api.get_scoreboard_detail({count:10}).then(function(e){var t=e.data,o=Object.keys(t),n=[];if(0!==o.length){for(var s=0;s",'
",'","",""].join("");r.append(n)}}),a()}(0,n.default)(function(){setInterval(l,3e5),s.default.api.get_scoreboard_detail({count:10}).then(function(e){var t=e.data,o=Object.keys(t),n=[];if(0!==o.length){for(var s=0;s')}),a()})},"./CTFd/themes/core/assets/js/patch.js":function(e,t,o){var n,r=(n=o("./node_modules/q/q.js"))&&n.__esModule?n:{default:n},s=o("./CTFd/themes/core/assets/js/api.js");function i(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function l(e,t){return function(t){for(var e=1;e>8*s&255).toString(16)).substr(-2)}return n},t.htmlEntities=function(e){return(0,a.default)("
").text(e).html()},t.cumulativeSum=function(e){for(var t=e.concat(),o=0;o'),(0,a.default)("th.sort-col").click(function(){var e=(0,a.default)(this).parents("table").eq(0),t=e.find("tr:gt(0)").toArray().sort(function(s){return function(e,t){var o=i(e,s),n=i(t,s);return a.default.isNumeric(o)&&a.default.isNumeric(n)?o-n:o.toString().localeCompare(n)}}((0,a.default)(this).index()));this.asc=!this.asc,this.asc||(t=t.reverse());for(var o=0;o".concat(e.body,"

")):o.find(".modal-body").append((0,r.default)(e.body));var n=(0,r.default)(c.format(e.button));return e.success&&(0,r.default)(n).click(function(){e.success()}),e.large&&o.find(".modal-dialog").addClass("modal-lg"),o.find(".modal-footer").append(n),(0,r.default)("main").append(o),o.modal("show"),(0,r.default)(o).on("hidden.bs.modal",function(){(0,r.default)(this).modal("dispose")}),o}function f(e){(0,r.default)("#ezq--notifications-toast-container").length||(0,r.default)("body").append((0,r.default)("
").attr({id:"ezq--notifications-toast-container"}).css({position:"fixed",bottom:"0",right:"0","min-width":"20%"}));var t=l.format(e.title,e.body),o=(0,r.default)(t);if(e.onclose&&(0,r.default)(o).find("button[data-dismiss=toast]").click(function(){e.onclose()}),e.onclick){var n=(0,r.default)(o).find(".toast-body");n.addClass("cursor-pointer"),n.click(function(){e.onclick()})}var s=!1!==e.autohide,i=!1!==e.animation,a=e.delay||1e4;return(0,r.default)("#ezq--notifications-toast-container").prepend(o),o.toast({autohide:s,delay:a,animation:i}),o.toast("show"),o}function j(e){var t=i.format(e.title),o=(0,r.default)(t);"string"==typeof e.body?o.find(".modal-body").append("

".concat(e.body,"

")):o.find(".modal-body").append((0,r.default)(e.body));var n=(0,r.default)(u),s=(0,r.default)(m);return o.find(".modal-footer").append(s),o.find(".modal-footer").append(n),(0,r.default)("main").append(o),(0,r.default)(o).on("hidden.bs.modal",function(){(0,r.default)(this).modal("dispose")}),(0,r.default)(n).click(function(){e.success()}),o.modal("show"),o}function h(e){if(e.target){var t=(0,r.default)(e.target);return t.find(".progress-bar").css("width",e.width+"%"),t}var o=a.format(e.width),n=i.format(e.title),s=(0,r.default)(n);return s.find(".modal-body").append((0,r.default)(o)),(0,r.default)("main").append(s),s.modal("show")}function _(e){var t={success:d,error:s}[e.type].format(e.body);return(0,r.default)(t)}var v={ezAlert:p,ezToast:f,ezQuery:j,ezProgressBar:h,ezBadge:_};t.default=v},"./CTFd/themes/core/assets/js/fetch.js":function(e,t,o){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0,o("./node_modules/whatwg-fetch/fetch.js");var n,s=(n=o("./CTFd/themes/core/assets/js/config.js"))&&n.__esModule?n:{default:n};var i=window.fetch;t.default=function(e,t){return void 0===t&&(t={method:"GET",credentials:"same-origin",headers:{}}),e=s.default.urlRoot+e,void 0===t.headers&&(t.headers={}),t.credentials="same-origin",t.headers.Accept="application/json",t.headers["Content-Type"]="application/json",t.headers["CSRF-Token"]=s.default.csrfNonce,i(e,t)}},"./CTFd/themes/core/assets/js/pages/main.js":function(e,t,o){var n=p(o("./CTFd/themes/core/assets/js/CTFd.js")),s=p(o("./node_modules/jquery/dist/jquery.js")),i=p(o("./node_modules/moment/moment.js")),a=p(o("./node_modules/nunjucks/browser/nunjucks.js")),r=o("./node_modules/howler/dist/howler.js"),l=p(o("./CTFd/themes/core/assets/js/events.js")),d=p(o("./CTFd/themes/core/assets/js/config.js")),c=p(o("./CTFd/themes/core/assets/js/styles.js")),m=p(o("./CTFd/themes/core/assets/js/times.js")),u=p(o("./CTFd/themes/core/assets/js/helpers.js"));function p(e){return e&&e.__esModule?e:{default:e}}n.default.init(window.init),window.CTFd=n.default,window.helpers=u.default,window.$=s.default,window.Moment=i.default,window.nunjucks=a.default,window.Howl=r.Howl,(0,s.default)(function(){(0,c.default)(),(0,m.default)(),(0,l.default)(d.default.urlRoot)})},"./CTFd/themes/core/assets/js/pages/scoreboard.js":function(e,t,o){o("./CTFd/themes/core/assets/js/pages/main.js");var n=i(o("./node_modules/jquery/dist/jquery.js")),s=i(o("./CTFd/themes/core/assets/js/CTFd.js")),c=i(o("./node_modules/plotly.js-basic-dist/plotly-basic.js")),m=i(o("./node_modules/moment/moment.js")),u=o("./CTFd/themes/core/assets/js/utils.js");function i(e){return e&&e.__esModule?e:{default:e}}function a(){s.default.api.get_scoreboard_detail({count:10}).then(function(e){var t=e.data,o=Object.keys(t),n=[];if(0!==o.length){for(var s=0;s",'
",'","",""].join("");r.append(n)}}),a()}(0,n.default)(function(){setInterval(l,3e5),s.default.api.get_scoreboard_detail({count:10}).then(function(e){var t=e.data,o=Object.keys(t),n=[];if(0!==o.length){for(var s=0;sNo solves yet')}),a()})},"./CTFd/themes/core/assets/js/patch.js":function(e,t,o){var n,r=(n=o("./node_modules/q/q.js"))&&n.__esModule?n:{default:n},s=o("./CTFd/themes/core/assets/js/api.js");function i(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function l(e,t){return function(t){for(var e=1;e>8*s&255).toString(16)).substr(-2)}return n},t.htmlEntities=function(e){return(0,a.default)("
").text(e).html()},t.cumulativeSum=function(e){for(var t=e.concat(),o=0;o'),(0,a.default)("th.sort-col").click(function(){var e=(0,a.default)(this).parents("table").eq(0),t=e.find("tr:gt(0)").toArray().sort(function(s){return function(e,t){var o=i(e,s),n=i(t,s);return a.default.isNumeric(o)&&a.default.isNumeric(n)?o-n:o.toString().localeCompare(n)}}((0,a.default)(this).index()));this.asc=!this.asc,this.asc||(t=t.reverse());for(var o=0;o -
+

Members

', i + 1, \"'.format(_CTFd.default.config.urlRoot, teams[i].account_id), (0, _utils.htmlEntities)(teams[i].name), \"\", teams[i].score, \"
', i + 1, \"'.format(_CTFd.default.config.urlRoot, teams[i].account_id), (0, _utils.htmlEntities)(teams[i].name), \"\", teams[i].score, \"
',o+1,"'.format(s.default.config.urlRoot,t[o].account_id),(0,u.htmlEntities)(t[o].name),"",t[o].score,"
',o+1,"'.format(s.default.config.urlRoot,t[o].account_id),(0,u.htmlEntities)(t[o].name),"",t[o].score,"
@@ -290,7 +290,11 @@ {% else %} -
+
+

+ No solves yet +

+
{% endif %} {% endif %} diff --git a/CTFd/themes/core/templates/teams/public.html b/CTFd/themes/core/templates/teams/public.html index 531b997..77febfe 100644 --- a/CTFd/themes/core/templates/teams/public.html +++ b/CTFd/themes/core/templates/teams/public.html @@ -168,7 +168,11 @@ {% else %} -
+
+

+ No solves yet +

+
{% endif %} {% endif %} diff --git a/CTFd/themes/core/templates/users/private.html b/CTFd/themes/core/templates/users/private.html index 407b79a..dfc7019 100644 --- a/CTFd/themes/core/templates/users/private.html +++ b/CTFd/themes/core/templates/users/private.html @@ -172,7 +172,11 @@ {% else %} -
+
+

+ No solves yet +

+
{% endif %} {% endif %} diff --git a/CTFd/themes/core/templates/users/public.html b/CTFd/themes/core/templates/users/public.html index 4eac95e..da68cc7 100644 --- a/CTFd/themes/core/templates/users/public.html +++ b/CTFd/themes/core/templates/users/public.html @@ -175,7 +175,11 @@ {% else %} -
+
+

+ No solves yet +

+
{% endif %} {% endif %}