From fa241b08e7f5502a4f988ba6d5614abd90db1e13 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 4 Oct 2021 10:42:02 -0700
Subject: [PATCH] Rename charts snippets and add register chart file

---
 .../settings/dashboard/dashboard.html         | 15 ++++++++----
 .../dashboard/registration_chart.html         | 24 +++++++++++++++++++
 ...rd_status_chart.html => status_chart.html} |  0
 ...hboard_user_chart.html => user_chart.html} |  0
 bookwyrm/views/admin/dashboard.py             | 11 +++++++++
 5 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/templates/settings/dashboard/registration_chart.html
 rename bookwyrm/templates/settings/dashboard/{dashboard_status_chart.html => status_chart.html} (100%)
 rename bookwyrm/templates/settings/dashboard/{dashboard_user_chart.html => user_chart.html} (100%)

diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html
index fbf3ff72a..863df40d9 100644
--- a/bookwyrm/templates/settings/dashboard/dashboard.html
+++ b/bookwyrm/templates/settings/dashboard/dashboard.html
@@ -95,9 +95,9 @@
         </div>
     </form>
 
-    <div class="columns">
+    <div class="columns is-multiline">
         <div class="column">
-            <h3>{% trans "User signup activity" %}</h3>
+            <h3>{% trans "Total users" %}</h3>
             <div class="box">
                 <canvas id="user_stats"></canvas>
             </div>
@@ -108,6 +108,12 @@
                 <canvas id="status_stats"></canvas>
             </div>
         </div>
+        <div class="column">
+            <h3>{% trans "User signup activity" %}</h3>
+            <div class="box">
+                <canvas id="user_stats"></canvas>
+            </div>
+        </div>
     </div>
 </div>
 
@@ -115,6 +121,7 @@
 
 {% block scripts %}
 <script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
-{% include 'settings/dashboard/dashboard_user_chart.html' %}
-{% include 'settings/dashboard/dashboard_status_chart.html' %}
+{% include 'settings/dashboard/user_chart.html' %}
+{% include 'settings/dashboard/status_chart.html' %}
+{% include 'settings/dashboard/registration_chart.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/settings/dashboard/registration_chart.html b/bookwyrm/templates/settings/dashboard/registration_chart.html
new file mode 100644
index 000000000..eec909ed3
--- /dev/null
+++ b/bookwyrm/templates/settings/dashboard/registration_chart.html
@@ -0,0 +1,24 @@
+{% load i18n %}
+<script>
+const labels = [{% for label in registration_stats.labels %}"{{ label }}",{% endfor %}];
+const data = {
+    labels: labels,
+    datasets: [{
+        label: '{% trans "Active this month" %}',
+        backgroundColor: 'rgb(75, 192, 192)',
+        borderColor: 'rgb(75, 192, 192)',
+        data: {{ register_stats.total }},
+    }]
+};
+
+const config = {
+    type: 'line',
+    data: data,
+    options: {}
+};
+
+var userStats = new Chart(
+    document.getElementById('user_stats'),
+    config
+);
+</script>
diff --git a/bookwyrm/templates/settings/dashboard/dashboard_status_chart.html b/bookwyrm/templates/settings/dashboard/status_chart.html
similarity index 100%
rename from bookwyrm/templates/settings/dashboard/dashboard_status_chart.html
rename to bookwyrm/templates/settings/dashboard/status_chart.html
diff --git a/bookwyrm/templates/settings/dashboard/dashboard_user_chart.html b/bookwyrm/templates/settings/dashboard/user_chart.html
similarity index 100%
rename from bookwyrm/templates/settings/dashboard/dashboard_user_chart.html
rename to bookwyrm/templates/settings/dashboard/user_chart.html
diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py
index 66dd9c90f..27edc3438 100644
--- a/bookwyrm/views/admin/dashboard.py
+++ b/bookwyrm/views/admin/dashboard.py
@@ -63,6 +63,16 @@ class Dashboard(View):
             }
         )
 
+        register_chart = Chart(
+            queryset=user_queryset,
+            queries = {
+                "total": lambda q, s, e: q.filter(
+                    created_date__gt=s,
+                    created_date__lte=e,
+                ).count()
+            }
+        )
+
         data = {
             "start": start.strftime("%Y-%m-%d"),
             "end": end.strftime("%Y-%m-%d"),
@@ -79,6 +89,7 @@ class Dashboard(View):
             ).count(),
             "user_stats": user_chart.get_chart(start, end, interval),
             "status_stats": status_chart.get_chart(start, end, interval),
+            "register_stats": register_chart.get_chart(start, end, interval),
         }
         return TemplateResponse(request, "settings/dashboard/dashboard.html", data)