From 3e0e25edefcbddf2ef715a1df997db9a02ad6845 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Mon, 5 Feb 2024 13:56:44 +0300
Subject: [PATCH 1/5] chore: add matomo js stuff

---
 snappass/templates/base.html | 40 ++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/snappass/templates/base.html b/snappass/templates/base.html
index ff9c0076..a456c16b 100644
--- a/snappass/templates/base.html
+++ b/snappass/templates/base.html
@@ -1,13 +1,41 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>SafePass - Share Secrets Safely!</title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <link href="{{ config.STATIC_URL }}/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="{{ config.STATIC_URL }}/fontawesome/css/font-awesome.min.css?v=4.7.0" rel="stylesheet">
-    <link href="{{ config.STATIC_URL }}/snappass/css/custom.css" rel="stylesheet">
+    <link
+      href="{{ config.STATIC_URL }}/bootstrap/css/bootstrap.min.css"
+      rel="stylesheet"
+    />
+    <link
+      href="{{ config.STATIC_URL }}/fontawesome/css/font-awesome.min.css?v=4.7.0"
+      rel="stylesheet"
+    />
+    <link
+      href="{{ config.STATIC_URL }}/snappass/css/custom.css"
+      rel="stylesheet"
+    />
+
+    <!-- Matomo -->
+    <script>
+      let _paq = (window._paq = window._paq || []);
+      _paq.push(["trackPageView"]);
+      _paq.push(["enableLinkTracking"]);
+      (function () {
+        const u = "{{matomo_url}}";
+        _paq.push(["setTrackerUrl", u + "matomo.php"]);
+        _paq.push(["setSiteId", "{{site_id}}"]);
+        let d = document,
+          g = d.createElement("script"),
+          s = d.getElementsByTagName("script")[0];
+        g.async = true;
+        g.src = u + "matomo.js";
+        s.parentNode.insertBefore(g, s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
   </head>
   <body>
     <nav class="navbar navbar-default navbar-static-top">

From 4a9cc7ab4bc8a09ecb45f4a5d46e462888cb1d0e Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Mon, 5 Feb 2024 14:01:50 +0300
Subject: [PATCH 2/5] chore: add matomo values injector

---
 snappass/main.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snappass/main.py b/snappass/main.py
index 00c4d018..6cfcd4f1 100644
--- a/snappass/main.py
+++ b/snappass/main.py
@@ -16,6 +16,13 @@
 HOST_OVERRIDE = os.environ.get('HOST_OVERRIDE', None)
 TOKEN_SEPARATOR = '~'
 
+# Get environment variables for matomo
+MATOMO_URL = os.environ.get('MATOMO_URL', None)
+SITE_ID = os.environ.get('MATOMO_SITE_ID', None)
+MATOMO_DATA = {
+    'matomo_url': MATOMO_URL,
+    'site_id': SITE_ID
+}
 
 # Initialize Flask Application
 app = Flask(__name__)
@@ -153,6 +160,11 @@ def clean_input():
 
     return TIME_CONVERSION[time_period], request.form['password']
 
+# inject matomo data in all templates
+@app.context_processor
+def injectMatomoData():
+    return MATOMO_DATA
+
 
 @app.route('/', methods=['GET'])
 def index():

From a397b51280fb80b6a408337cc32020d24b6ca7dd Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Mon, 5 Feb 2024 14:05:06 +0300
Subject: [PATCH 3/5] chore: add matomo build args to drone

---
 .drone.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 8b0f82e2..d017fa88 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,6 +15,11 @@ steps:
     image: plugins/docker
     settings:
       repo: josaorg/safepass
+      build_args:
+        [
+          MATOMO_URL=https://track.josa.ngo/,
+          MATOMO_SITE_ID=14,
+        ]
       tags:
         - ${DRONE_COMMIT_SHA}
         - stable

From a3c94404200a4cb7e341bfe32b6931d896a717f9 Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Tue, 6 Feb 2024 12:23:15 +0300
Subject: [PATCH 4/5] chore: fix matomo.php's path

---
 snappass/templates/base.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/snappass/templates/base.html b/snappass/templates/base.html
index a456c16b..55977502 100644
--- a/snappass/templates/base.html
+++ b/snappass/templates/base.html
@@ -25,13 +25,14 @@
       _paq.push(["enableLinkTracking"]);
       (function () {
         const u = "{{matomo_url}}";
-        _paq.push(["setTrackerUrl", u + "matomo.php"]);
+        _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+        _paq.push(["setTrackerUrl", u + "/matomo.php"]);
         _paq.push(["setSiteId", "{{site_id}}"]);
         let d = document,
           g = d.createElement("script"),
           s = d.getElementsByTagName("script")[0];
         g.async = true;
-        g.src = u + "matomo.js";
+        g.src = u + "/matomo.js";
         s.parentNode.insertBefore(g, s);
       })();
     </script>

From e7ff721997f932f2338e5d498e620f3b6bb3514c Mon Sep 17 00:00:00 2001
From: Baraa Al-Masri <pub@mbaraa.com>
Date: Tue, 6 Feb 2024 12:27:00 +0300
Subject: [PATCH 5/5] chore: update matomo's dev id

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index d017fa88..0c011a39 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,7 +18,7 @@ steps:
       build_args:
         [
           MATOMO_URL=https://track.josa.ngo/,
-          MATOMO_SITE_ID=14,
+          MATOMO_SITE_ID=15,
         ]
       tags:
         - ${DRONE_COMMIT_SHA}
