feat: added more stats, improved contributor-stats page

Author: ErikBjare

Makefile

@@ -50,4 +50,7 @@ _includes/tables: contributor-stats
 img/stats: stats
 	cd stats && poetry install
 	mkdir -p img/stats
-	cd stats && mkdir -p out && poetry run python analyze_stats.py --since 2017-07-01 --column downloads --save ../img/stats/downloads.png
+	mkdir -p stats/out
+	cd stats && poetry run python analyze_stats.py --since 2017-07-01 --column downloads --per-day --save ../img/stats/downloads.png
+	cd stats && poetry run python analyze_stats.py --since 2017-07-01 --column 'Chrome WAU' --title 'Chrome Weekly Active Users' --save ../img/stats/chrome-wau.png
+	cd stats && poetry run python analyze_stats.py --since 2017-07-01 --column 'Firefox DAU' --resample 7D --title 'Firefox Daily Active Users (7D mean)' --save ../img/stats/firefox-dau-7d.png

_includes/header.pug

@@ -32,7 +32,7 @@ html
               .dropdown-menu(aria-labelledby='navbarDropdown')
                 a.dropdown-item.text-secondary.font-weight-bold(href='/stats/')
                   i.fa.fa-download.mr-2
-                  | Downloads
+                  | Downloads & Users
                 a.dropdown-item.text-secondary.font-weight-bold(href='/contributors/')
                   i.fa.fa-users.mr-2
                   | Contributors

_sass/_base.scss

@@ -225,3 +225,22 @@ pre {
         }
     }
 }
+
+// Details & summary styling
+details {
+  margin-bottom: 0.5em;
+}
+details > summary {
+  background-color: $grey-color-light;
+  cursor: pointer;
+  padding: .25rem 1rem;
+}
+
+details > summary > * {
+  display: inline-block;
+}
+
+details {
+  border: 2px solid $grey-color-light;
+  margin-top: 0;
+}

contributors.html

@@ -5,20 +5,39 @@
 ---
 
 <p>
-  Here you can see some statistics of all our hard working contributors. The list is updated every 24 hours.
+  Here you can see some statistics of all our hard working contributors.
 </p>
 
 <p>
   <a href="https://github.com/ActivityWatch/activitywatch/blob/master/CONTRIBUTING.md">Contribute yourself</a> to get your name on this page!
 </p>
 
+<p>
+  The list is updated every 24 hours.
+</p>
+
+<br>
 <h3>Visualization</h3>
 <p>
     Here we have a have a visualization of development history:
 </p>
 <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/zjIn43lZq3U" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 
+<p>
+  The script used to generate the video can be found <a href="https://github.com/ActivityWatch/contributor-stats/tree/master/video">here</a>.
+</p>
+
+<br>
 <h3>Tables</h3>
+<p>
+  Here we have tables of contribution statistics, both for across all repos and for each individual repo.
+  The statistics are generated using the <a href="https://github.com/ActivityWatch/contributor-stats">contributor-stats</a> repository.
+</p>
+
+<p>
+  GitGitLog also provides a view of the stats <a href="https://gitgitlog.com/ActivityWatch">here</a>.
+</p>
+
 <p>
   <small>
     <b>Note:</b>
@@ -28,27 +47,35 @@ <h3>Tables</h3>
   </small>
 </p>
 
-<p>
-  GitGitLog also provides a view of the stats <a href="https://gitgitlog.com/ActivityWatch">here</a>.
-</p>
-
 {% assign modules = "total,aw-core,aw-server,aw-server-rust,aw-webui,aw-qt,aw-android,aw-client,aw-client-js,aw-client-rust,aw-watcher-window,aw-watcher-afk,aw-watcher-web,aw-watcher-vim,aw-watcher-vscode,docs,activitywatch.github.io,activitywatch" | split: ',' %}
 
 <b>Table of contents</b>
 <ul>
   {% for module in modules %}
-    <li><a href="#{{ module }}">{{ module }}</a>
+  <li><a href="#{{ module }}">{{ module }}</a></li>
   {% endfor %}
 </ul>
 
 <div class="contributor-stats">
   {% for module in modules %}
-    <a {% if module != "total" %} href="https://github.com/activitywatch/{{ module }}" {% endif %}>
-      <h3 id={{ module }}>{{ module }}</h3>
-    </a>
+    {% if module != "total" %}
+    <details>
+      <summary>
+    {% endif %}
+        <h4 id={{ module }}>{{ module }}</h4>
+    {% if module != "total" %}
+      </summary>
+    {% endif %}
 
     {% assign table_filename = "tables/" | append: module %}
     {% include {{ table_filename }}.html %}
+
+    {% if module != "total" %}
+      <div class="small px-2 pb-2" >
+        You can also see these stats <a href="https://github.com/activitywatch/{{ module }}/graphs/contributors">on GitHub</a>.
+      </div>
+    </details>
+    {% endif %}
   {% endfor %}
 </div>
 

stats.pug

@@ -7,13 +7,21 @@ permalink: /stats/
 // Bullshit to get the page to render: https://github.com/DougBeney/jekyll-pug/issues/19#issuecomment-1131441149
 | {% if 1 %}{% endif %}
 
-h2 Downloads
+h3 Downloads
 p
   | Here you can see some download statistics, updated every 24h.
 img(src="/img/stats/downloads.png" width="100%")
 
 hr
 
-h2 Stargazers over time
+h3 Active users
+p
+  | How many people are using the aw-watcher-web extension in Chrome or Firefox.
+img(src="/img/stats/chrome-wau.png" width="100%")
+img(src="/img/stats/firefox-dau-7d.png" width="100%")
+
+hr
+
+h3 Stargazers over time
 a(href="https://starchart.cc/ActivityWatch/activitywatch")
   img(title="Stargazers over time" src="https://starchart.cc/ActivityWatch/activitywatch.svg" width="100%")