diff --git a/res/include/script/admin.js b/res/include/script/admin.js index 83f6fc1..4a25001 100644 --- a/res/include/script/admin.js +++ b/res/include/script/admin.js @@ -8,6 +8,8 @@ Chart.defaults.global.elements.point.radius = 0; Chart.defaults.global.tooltips.mode = "index"; Chart.defaults.global.tooltips.axis = "x"; Chart.defaults.global.tooltips.intersect = false; +Chart.defaults.global.animation.duration = 1000; +Chart.defaults.global.animation.easing = "linear"; var graph = new Chart( document.getElementById('bandwidth_chart'), @@ -19,15 +21,15 @@ var graph = new Chart( label: "Bandwidth", backgroundColor: "rgba(64, 255, 64, .01)", borderColor: "rgba(96, 255, 96, 1)", - borderWidth: 2, + borderWidth: 1.5, lineTension: 0.2, fill: true, yAxisID: "y_bandwidth" }, { label: "Views", backgroundColor: "rgba(64, 64, 255, .01)", - borderColor: "rgba(64, 64, 255, 1)", - borderWidth: 2, + borderColor: "rgba(96, 96, 255, 1)", + borderWidth: 1.5, lineTension: 0.2, fill: true, yAxisID: "y_views" @@ -78,7 +80,7 @@ var graph = new Chart( xAxes: [ { ticks: { - maxRotation: 20 + maxRotation: 16 }, gridLines: { display: false @@ -94,7 +96,7 @@ let graphTimeout = null; function loadGraph(minutes, interval, live){ if (graphTimeout !== null) { clearTimeout(graphTimeout) } if (live) { - graphTimeout = setTimeout(() => {loadGraph(60, 1, true)}, 3000) + graphTimeout = setTimeout(() => {loadGraph(minutes, interval, true)}, 1000) } let today = new Date() diff --git a/res/include/script/file_viewer/DetailsWindow.js b/res/include/script/file_viewer/DetailsWindow.js index 0ac4890..c38ed0d 100644 --- a/res/include/script/file_viewer/DetailsWindow.js +++ b/res/include/script/file_viewer/DetailsWindow.js @@ -94,18 +94,18 @@ DetailsWindow.prototype.renderGraph = function() { data: { datasets: [ { - label: "Bandwidth", + label: "Downloads", backgroundColor: "rgba(64, 255, 64, .01)", borderColor: "rgba(96, 255, 96, 1)", - borderWidth: 2, + borderWidth: 1.5, lineTension: 0.2, fill: true, yAxisID: "y_bandwidth" }, { label: "Views", backgroundColor: "rgba(64, 64, 255, .01)", - borderColor: "rgba(64, 64, 255, 1)", - borderWidth: 2, + borderColor: "rgba(96, 96, 255, 1)", + borderWidth: 1.5, lineTension: 0.2, fill: true, yAxisID: "y_views" @@ -156,7 +156,7 @@ DetailsWindow.prototype.renderGraph = function() { xAxes: [ { ticks: { - maxRotation: 20 + maxRotation: 16 }, gridLines: { display: false diff --git a/res/template/account/user_home.html b/res/template/account/user_home.html index 59c2352..567a4e5 100644 --- a/res/template/account/user_home.html +++ b/res/template/account/user_home.html @@ -33,21 +33,21 @@
diff --git a/webcontroller/user_account.go b/webcontroller/user_account.go index 57d6db7..8ba3c20 100644 --- a/webcontroller/user_account.go +++ b/webcontroller/user_account.go @@ -156,7 +156,6 @@ func (wc *WebController) loginForm(td *TemplateData, r *http.Request) (f Form) { if err != nil { formAPIError(err, &f) } else { - log.Debug("key %s", loginResp.APIKey) // Request was a success f.SubmitSuccess = true f.SubmitMessages = []template.HTML{"Success!"}