Added dates to tracking page and improved charts.

2026-01-18 06:40:27 +00:00 · 2020-06-26 13:31:04 +02:00
parent 1276ed013b
commit 64a6399a15
6 changed files with 92 additions and 45 deletions
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.0.2 // indirect
 	github.com/emvi/api-go v0.0.0-20191210194347-0a945446f6a8
 	github.com/emvi/logbuch v1.1.1
-	github.com/emvi/pirsch v0.0.0-20200625233854-9bc410bf1483
+	github.com/emvi/pirsch v1.0.0
 	github.com/gorilla/mux v1.7.4
 	github.com/gosimple/slug v1.9.0
 	github.com/jmoiron/sqlx v1.2.0
--- a/go.sum
+++ b/go.sum
@@ -99,6 +99,8 @@ github.com/emvi/pirsch v0.0.0-20200625182355-75f0aba03718 h1:FOaeJg2A9rGb5WMZsnW
 github.com/emvi/pirsch v0.0.0-20200625182355-75f0aba03718/go.mod h1:+YmBbltJ3feZz9L/QQyqwywltYvQKBfzrGD51TPKl5g=
 github.com/emvi/pirsch v0.0.0-20200625233854-9bc410bf1483 h1:hTW+M/0XaAEn1+bpXL/z2DZAFU1xgvKk56OgL1lodSU=
 github.com/emvi/pirsch v0.0.0-20200625233854-9bc410bf1483/go.mod h1:+YmBbltJ3feZz9L/QQyqwywltYvQKBfzrGD51TPKl5g=
+github.com/emvi/pirsch v1.0.0 h1:PAxXw98iZcN3CKamp0ShzKJYPRGagmTPaBGYHe9FHhk=
+github.com/emvi/pirsch v1.0.0/go.mod h1:+YmBbltJ3feZz9L/QQyqwywltYvQKBfzrGD51TPKl5g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE=
--- a/main.go
+++ b/main.go
@@ -128,11 +128,27 @@ func serveTracking() http.HandlerFunc {
 			start = 7
 		}

-		totalVisitorsLabels, totalVisitorsDps := tracking.GetTotalVisitors(start)
-		hourlyVisitorsLabels, hourlyVisitorsDps := tracking.GetHourlyVisitors(start)
+		var startDate, endDate time.Time
+
+		if err := r.ParseForm(); err != nil {
+			logbuch.Warn("Error parsing tracking form", logbuch.Fields{"err": err})
+		} else {
+			startDate, _ = time.Parse("2006-01-02", r.FormValue("start-date"))
+			endDate, _ = time.Parse("2006-01-02", r.FormValue("end-date"))
+		}
+
+		if startDate.IsZero() || endDate.IsZero() {
+			startDate = time.Now().UTC().Add(-time.Hour * 24 * time.Duration(start))
+			endDate = time.Now().UTC()
+		}
+
+		totalVisitorsLabels, totalVisitorsDps := tracking.GetTotalVisitors(startDate, endDate)
+		hourlyVisitorsLabels, hourlyVisitorsDps := tracking.GetHourlyVisitors(startDate, endDate)
 		hourlyVisitorsTodayLabels, hourlyVisitorsTodayDps := tracking.GetHourlyVisitorsToday()
 		tplCache.RenderWithoutCache(w, "tracking.html", struct {
 			Start                     int
+			StartDate                 time.Time
+			EndDate                   time.Time
 			TotalVisitorsLabels       template.JS
 			TotalVisitorsDps          template.JS
 			PageVisits                []tracking.PageVisits
@@ -144,10 +160,12 @@ func serveTracking() http.HandlerFunc {
 			ActiveVisitors            int
 		}{
 			start,
+			startDate,
+			endDate,
 			totalVisitorsLabels,
 			totalVisitorsDps,
-			tracking.GetPageVisits(start),
-			tracking.GetLanguages(start),
+			tracking.GetPageVisits(startDate, endDate),
+			tracking.GetLanguages(startDate, endDate),
 			hourlyVisitorsLabels,
 			hourlyVisitorsDps,
 			hourlyVisitorsTodayLabels,
--- a/static/style.css
+++ b/static/style.css
@@ -52,6 +52,19 @@ body {
    height: 300px;
 }

+.tracking-form {
+    display: flex;
+    align-items: center;
+}
+
+.tracking-form input {
+    margin: 3px 6px 3px 0;
+}
+
+input {
+    padding: 2px;
+}
+
 section {
    margin: 80px 0;
 }
@@ -81,4 +94,8 @@ p {
    .menu {
        display: block;
    }
+
+    .tracking-form {
+        display: block;
+    }
 }
--- a/template/tracking.html
+++ b/template/tracking.html
@@ -4,7 +4,7 @@
 <section>
    <h1>Tracking</h1>
    <p>
-        This page shows tracking statistics for my website using <a href="https://github.com/emvi/pirsch" target="_blank">Pirsch</a> and <a href="https://www.chartjs.org/" target="_blank">Chart.Js</a>. The data shows unique visitors.
+        This page shows tracking statistics for my website using <a href="https://github.com/emvi/pirsch" target="_blank">Pirsch</a> and <a href="https://www.chartjs.org/" target="_blank">Chart.Js</a>. The data shows unique visitors. All times and dates are UTC.
    </p>
    <p>
        <a href="/tracking?start=7" class="button {{if eq .Start 7}}filled{{end}}">Week</a>
@@ -13,11 +13,19 @@
        <a href="/tracking?start=182" class="button {{if eq .Start 182}}filled{{end}}">Half Year</a>
        <a href="/tracking?start=365" class="button {{if eq .Start 365}}filled{{end}}">Year</a>
    </p>
+    <form class="tracking-form">
+        <input type="date" name="start-date" value="{{format .StartDate "2006-01-02"}}" />
+        <input type="date" name="end-date" value="{{format .EndDate "2006-01-02"}}" />
+        <input type="submit" value="Update" />
+    </form>
 </section>
 <section>
    <h2>Active Visitors</h2>
    <p>
-        Active within the last five minutes: {{.ActiveVisitors}}
+        Active visitors within the last five minutes: {{.ActiveVisitors}}
+    </p>
+    <p>
+        The next diagram shows active visitors for each hour of today.
    </p>
    <canvas id="hourlyVisitorsToday" class="tracking"></canvas>
 </section>
@@ -27,10 +35,37 @@
 </section>
 <section>
    <h2>Visitors Per Hour</h2>
+    <p>
+        This is the cumulated visitor count per hour on each day of the selected time frame.
+    </p>
    <canvas id="hourlyVisitors" class="tracking"></canvas>
 </section>
 <section>
-    <h2>Pages Visits</h2>
+    <h2>Languages</h2>
+    <p>
+        Here are the top 10 languages used by my visitors.
+    </p>
+    <table>
+        <thead>
+        <tr>
+            <th>Language</th>
+            <th>Absolute</th>
+            <th>Relative</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{range $data := .Languages}}
+            <tr>
+                <td>{{if $data.Language}}{{$data.Language}}{{else}}(not set){{end}}</td>
+                <td>{{$data.Visitors}}</td>
+                <td>{{round (multiply $data.RelativeVisitors 100)}} %</td>
+            </tr>
+        {{end}}
+        </tbody>
+    </table>
+</section>
+<section>
+    <h2>Page Visits</h2>
 </section>

 {{range $i, $data := .PageVisits}}
@@ -40,39 +75,14 @@
    </section>
 {{end}}

-<section>
-    <h2>Languages</h2>
-    <p>
-        Here are the top 10 languages used by my visitors.
-    </p>
-    <table>
-        <thead>
-            <tr>
-                <th>Language</th>
-                <th>Absolute</th>
-                <th>Relative</th>
-            </tr>
-        </thead>
-        <tbody>
-            {{range $data := .Languages}}
-                <tr>
-                    <td>{{if $data.Language}}{{$data.Language}}{{else}}(not set){{end}}</td>
-                    <td>{{$data.Visitors}}</td>
-                    <td>{{round (multiply $data.RelativeVisitors 100)}} %</td>
-                </tr>
-            {{end}}
-        </tbody>
-    </table>
-</section>
-
 <script type="text/javascript" src="/static/js/Chart-v2.9.3.bundle.min.js"></script>
 <script type="text/javascript">
    new Chart(document.getElementById('hourlyVisitorsToday').getContext('2d'), {
-        type: "line",
+        type: "bar",
        data: {
            labels: [{{.HourlyVisitorsTodayLabels}}],
            datasets: [{
-                backgroundColor: "rgba(127, 127, 127, 0.05)",
+                backgroundColor: "#7f7f7f",
                borderColor: "#7f7f7f",
                label: "Hourly Visitors for Today",
                data: [{{.HourlyVisitorsTodayDps}}]
@@ -94,11 +104,11 @@
    });

    new Chart(document.getElementById('hourlyVisitors').getContext('2d'), {
-        type: "line",
+        type: "bar",
        data: {
            labels: [{{.HourlyVisitorsLabels}}],
            datasets: [{
-                backgroundColor: "rgba(127, 127, 127, 0.05)",
+                backgroundColor: "#7f7f7f",
                borderColor: "#7f7f7f",
                label: "Hourly Visitors",
                data: [{{.HourlyVisitorsDps}}]
--- a/tracking/statistics.go
+++ b/tracking/statistics.go
@@ -19,8 +19,8 @@ type PageVisits struct {
 	Data   template.JS
 }

-func GetTotalVisitors(start int) (template.JS, template.JS) {
-	visitors, err := analyzer.Visitors(&pirsch.Filter{From: getStartTime(start), To: today()})
+func GetTotalVisitors(startDate, endDate time.Time) (template.JS, template.JS) {
+	visitors, err := analyzer.Visitors(&pirsch.Filter{From: startDate, To: endDate})

 	if err != nil {
 		logbuch.Error("Error reading visitor statistics", logbuch.Fields{"err": err})
@@ -30,8 +30,8 @@ func GetTotalVisitors(start int) (template.JS, template.JS) {
 	return getLabelsAndData(visitors)
 }

-func GetPageVisits(start int) []PageVisits {
-	visits, err := analyzer.PageVisits(&pirsch.Filter{From: getStartTime(start), To: today()})
+func GetPageVisits(startDate, endDate time.Time) []PageVisits {
+	visits, err := analyzer.PageVisits(&pirsch.Filter{From: startDate, To: endDate})

 	if err != nil {
 		logbuch.Error("Error reading page statistics", logbuch.Fields{"err": err})
@@ -48,8 +48,8 @@ func GetPageVisits(start int) []PageVisits {
 	return pageVisits
 }

-func GetLanguages(start int) []pirsch.VisitorLanguage {
-	languages, _, err := analyzer.Languages(&pirsch.Filter{From: getStartTime(start), To: today()})
+func GetLanguages(startDate, endDate time.Time) []pirsch.VisitorLanguage {
+	languages, _, err := analyzer.Languages(&pirsch.Filter{From: startDate, To: endDate})

 	if err != nil {
 		logbuch.Error("Error reading language statistics", logbuch.Fields{"err": err})
@@ -63,8 +63,8 @@ func GetLanguages(start int) []pirsch.VisitorLanguage {
 	return languages
 }

-func GetHourlyVisitors(start int) (template.JS, template.JS) {
-	visitors, err := analyzer.HourlyVisitors(&pirsch.Filter{From: getStartTime(start), To: today()})
+func GetHourlyVisitors(startDate, endDate time.Time) (template.JS, template.JS) {
+	visitors, err := analyzer.HourlyVisitors(&pirsch.Filter{From: startDate, To: endDate})

 	if err != nil {
 		logbuch.Error("Error reading hourly visitors", logbuch.Fields{"err": err})