From 32fd1b685e9a1ce8f9cdab2a14938e5251333f27 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez <oscgonfer@gmail.com>
Date: Mon, 31 Jul 2023 20:55:13 +0200
Subject: [PATCH 1/5] Remove angulartics from app module

---
 src/app/app.module.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/app.module.js b/src/app/app.module.js
index f17fbe64..0c8f1608 100644
--- a/src/app/app.module.js
+++ b/src/app/app.module.js
@@ -13,8 +13,6 @@ angular.module('app', [
 	'app.components',
   'papa-promise',
   'angularLoad',
-  'angulartics',
-  'angulartics.google.analytics',
   'ngSanitize',
   'angular-clipboard',
   'ngCookies',

From 0251764bbee8f6a038a2bd71371ef44ccf18f898 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez <oscgonfer@gmail.com>
Date: Mon, 31 Jul 2023 20:55:48 +0200
Subject: [PATCH 2/5] Test adding openssl-ca to env in deploy

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ba386acc..5714da06 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,6 +19,7 @@ jobs:
     - name: Test something (currently we have no tests)
       run: |
         npm install -g gulp-cli
+        export NODE_OPTIONS=--use-openssl-ca
         npm install
         gulp build
 

From 8cdfdaa54ac50d00aaa689d8fa3af3f4d26a9ae0 Mon Sep 17 00:00:00 2001
From: oscgonfer <oscgonfer@users.noreply.github.com>
Date: Mon, 31 Jul 2023 21:04:48 +0200
Subject: [PATCH 3/5] Update deploy.yml

---
 .github/workflows/deploy.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5714da06..cb342c77 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,8 +1,6 @@
 name: Deploy to GH
 
-on:
-  push:
-    branches: [ master ]
+on: [push]
 
 jobs:
   test:
@@ -28,4 +26,4 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         publish_dir: ./dist
-        if: job.status == 'success'
+      if: github.ref == 'refs/heads/master' && job.status == 'success'

From 00c308f76ba6549506631544ddb328d947be2bd5 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez <oscgonfer@gmail.com>
Date: Mon, 14 Aug 2023 01:30:20 +0200
Subject: [PATCH 4/5] Remove angulartics from html

---
 src/app/components/alert/alert.service.js     |  6 -----
 src/app/components/kit/showKit/showKit.html   | 24 +++++--------------
 src/app/components/landing/landing.html       | 21 ----------------
 src/app/components/myProfile/Kits.html        |  9 +++----
 src/app/components/myProfile/myProfile.html   |  6 ++---
 src/app/components/signup/signup.html         |  4 +---
 src/app/components/signup/signupModal.html    |  3 +--
 .../components/userProfile/userProfile.html   |  9 +++----
 8 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/src/app/components/alert/alert.service.js b/src/app/components/alert/alert.service.js
index 884ec22a..d31eed96 100644
--- a/src/app/components/alert/alert.service.js
+++ b/src/app/components/alert/alert.service.js
@@ -38,8 +38,6 @@
       10000,
       {
         button: 'Leave comment',
-        buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
-          'analytics-category="Offline Kit Comment Link"',
         href: 'https://forum.smartcitizen.me/'
       });
     }
@@ -55,8 +53,6 @@
         10000,
         {
           button: 'Leave comment',
-          buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
-            'analytics-category="Private Kit Comment Link"',
           href: 'https://forum.smartcitizen.me/'
         });
     }
@@ -66,8 +62,6 @@
         'time. Why not leave a comment to let its owner know?', 10000,
         {
           button: 'Leave comment',
-          buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
-          'analytics-category="Long time No published Kit Comment Link"',
           href: 'https://forum.smartcitizen.me/'
         });
     }
diff --git a/src/app/components/kit/showKit/showKit.html b/src/app/components/kit/showKit/showKit.html
index 9583485d..58c2555b 100644
--- a/src/app/components/kit/showKit/showKit.html
+++ b/src/app/components/kit/showKit/showKit.html
@@ -42,33 +42,25 @@
 
         <div hide show-gt-xs flex="nogrow" class="kit_navbar" active-button layout="row" layout-align="end center">
 
-          <md-button href="#" class="md-flat chart_icon btn-small" aria-label=""
-            analytics-on="click" analytics-category="Kit Detail Section Button"
-            analytics-event="click" analytics-label="Chart">
+          <md-button href="#" class="md-flat chart_icon btn-small" aria-label="">
             <md-tooltip md-direction="top">Chart</md-tooltip>
             <md-icon md-svg-src="./assets/images/chart_icon.svg">
             </md-icon>
           </md-button>
 
-          <md-button href="#" class="md-flat kit_details_icon btn-small" aria-label=""
-            analytics-on="click" analytics-category="Kit Detail Section Button"
-            analytics-event="click" analytics-label="Kit">
+          <md-button href="#" class="md-flat kit_details_icon btn-small" aria-label="">
             <md-tooltip md-direction="top">Kit Detail</md-tooltip>
             <md-icon md-svg-src="./assets/images/kit_details_icon_light.svg">
             </md-icon>
           </md-button>
 
-          <md-button href="#" class="md-flat user_details btn-small" aria-label=""
-            analytics-on="click" analytics-category="Kit Detail Section Button"
-            analytics-event="click" analytics-label="User">
+          <md-button href="#" class="md-flat user_details btn-small" aria-label="">
             <md-tooltip md-direction="top">User info</md-tooltip>
             <md-icon md-svg-src="./assets/images/user_details_icon.svg">
             </md-icon>
           </md-button>
           <!-- HACK: disable because of lodash  -->
-          <!-- <md-button href="#" class="md-flat discussion_icon" aria-label=""
-            analytics-on="click" analytics-category="Kit Detail Section Button"
-            analytics-event="click" analytics-label="Comments">
+          <!-- <md-button href="#" class="md-flat discussion_icon" aria-label="">
             <md-icon md-svg-src="./assets/images/discussion_icon.svg">
             </md-icon>
           </md-button> -->
@@ -132,9 +124,7 @@ <h2 class="title">
             </div>
             <div class="sensor_select">
               <md-select placeholder="CHOOSE SENSOR" ng-model="vm.selectedSensor">
-                <md-option ng-if="(sensor.name != 'battery' || (sensor.name == 'battery' &&  sensor.value != -1)) && !(!vm.showRaw && sensor.tags.indexOf('raw') !== -1)" ng-repeat="sensor in vm.chartSensors" ng-value="{{sensor.id}}" ng-selected="$first"
-                  analytics-on="click" analytics-category="Kit Chart"
-                  analytics-event="click" analytics-label="Metric" class="color-dropdown">
+                <md-option ng-if="(sensor.name != 'battery' || (sensor.name == 'battery' &&  sensor.value != -1)) && !(!vm.showRaw && sensor.tags.indexOf('raw') !== -1)" ng-repeat="sensor in vm.chartSensors" ng-value="{{sensor.id}}" ng-selected="$first" class="color-dropdown">
                   <md-icon md-svg-src="{{ sensor.icon }}"></md-icon>
                   <span class="md-primary">{{ sensor.name }}</span>
                 </md-option>
@@ -151,9 +141,7 @@ <h6>{{ vm.sensorNames[vm.selectedSensor] }} </h6>
               <div style="display: block; width: 100%;">
                 <span style="vertical-align: middle;">Compare with</span>
                 <md-select placeholder="NONE" ng-model="vm.selectedSensorToCompare">
-                  <md-option ng-repeat="sensor in vm.sensorsToCompare" ng-value="{{sensor.id}}" ng-if="(sensor.name != 'battery' || (sensor.name == 'battery' &&  sensor.value != -1)) && !(!vm.showRaw && sensor.tags.indexOf('raw') !== -1)"
-                    analytics-on="click" analytics-category="Kit Chart"
-                    analytics-event="click" analytics-label="Compare" class="color-dropdown">
+                  <md-option ng-repeat="sensor in vm.sensorsToCompare" ng-value="{{sensor.id}}" ng-if="(sensor.name != 'battery' || (sensor.name == 'battery' &&  sensor.value != -1)) && !(!vm.showRaw && sensor.tags.indexOf('raw') !== -1)" class="color-dropdown">
                     <md-icon md-svg-src="{{ sensor.icon }}"></md-icon>
                     <span class="md-primary">{{ sensor.name }}</span>
                   </md-option>
diff --git a/src/app/components/landing/landing.html b/src/app/components/landing/landing.html
index 4a025077..46e55517 100644
--- a/src/app/components/landing/landing.html
+++ b/src/app/components/landing/landing.html
@@ -3,8 +3,6 @@
   <img class="sc-logo" src="/assets/images/smartcitizen_logo.svg" alt="logo" />
   <a href="/kits/"
      class="btn-black-outline btn-round-new sc-off-cta-platform"
-     analytics-on="click"
-     analytics-category="Landing"
      >GO TO THE PLATFORM</a>
 
   <section class="video-section">
@@ -12,8 +10,6 @@
       <h1 class="color-white font-kanit">ORDER YOUR SMART CITIZEN KIT FROM SEEED STUDIO</h1>
       <a href="https://www.seeedstudio.com/Smart-Citizen-Starter-Kit-p-2865.html"
          class="btn-blue btn-round-new mb-30 mt-20"
-         analytics-on="click"
-         analytics-category="Landing"
          >ORDER NOW</a>
     </div>
   </section>
@@ -28,8 +24,6 @@ <h2>WE EMPOWER COMMUNITIES TO BETTER UNDERSTAND THEIR ENVIRONMENT</h2>
           <p style="margin-bottom:33px">We're a community of passionate people who believe data is critical to inform political participation at all levels. We develop tools for citizen action in environmental monitoring and methodologies for community engagement and co-creation.</p>
           <a href="https://www.youtube.com/watch?v=hvn5LyACUYw"
              class="btn-black-outline btn-round-new"
-             analytics-on="click"
-             analytics-category="Landing"
              >WATCH DOCUMENTARY</a>
         </div>
         <div flex-order-xs="1" class="img-new_sck tile tile-left tile-image border-xs-top">
@@ -44,8 +38,6 @@ <h2>INTRODUCING A NEW AND IMPROVED KIT</h2>
           <p style="margin-bottom:33px">For the past three years, we have been working on an updated version of the Kit. The new sensors collect urban data more accurately and are easier to use. The Smart Citizen Kit 2.1 is available from Seeed studio.</p>
           <a href="https://www.seeedstudio.com/Smart-Citizen-Starter-Kit-p-2865.html"
              class="btn-black-outline btn-round-new"
-             analytics-on="click"
-             analytics-category="Landing"
              >ORDER NOW</a>
         </div>
       </div>
@@ -103,8 +95,6 @@ <h2>CIVIC PARTICIPATION ACROSS THE GLOBE</h2>
       <div layout="column" layout-align="end center" style="" class="img-platform tile tile-left tile-image">
         <a href="/kits/"
           class="btn-blue btn-round-new mb-30"
-          analytics-on="click"
-          analytics-category="Landing"
           >GO TO THE PLATFORM</a>
       </div>
     </section>
@@ -123,8 +113,6 @@ <h2>AN OPEN PLATFORM TO LEARN, BUILD AND CONTRIBUTE</h2>
       <div layout="column" layout-align="end center" style="" class="img-docs tile tile-left tile-image">
         <a href="https://docs.smartcitizen.me/"
           class="btn-blue btn-round-new mb-30"
-          analytics-on="click"
-          analytics-category="Landing"
           >GO TO THE DOCS</a>
       </div>
     </section>
@@ -145,9 +133,6 @@ <h3 class="color-white text-left my-20" >SUBSCRIBE TO GET THE LATEST NEWS</h3>
                    name="subscribe"
                    id="mc-embedded-subscribe"
                    value="GO!"
-                   analytics-on="click"
-                   analytics-category="Landing"
-                   analytics-event="Subscribe to newsletter"
                    />
             <div id="mce-responses" class="clear">
               <div class="response" id="mce-error-response" style="display:none"></div>
@@ -169,8 +154,6 @@ <h3>DEVELOPER<br> READY</h3>
           <p>Use our powerful API to build amazing things using data.</p>
           <a href="https://developer.smartcitizen.me/"
              class="btn-black-outline btn-round-new"
-             analytics-on="click"
-             analytics-category="Landing"
              >USE THE API</a>
         </div>
         <div flex="30" flex-sm="100" flex-xs="100" layout="column" layout-align="space-between center" class="bg-white border-black px-20 py-40 mb-10" >
@@ -179,8 +162,6 @@ <h3>WE’RE<br>OPEN SOURCE</h3>
           <p>Fork and contribute to the project in GitHub.</p>
           <a href="https://github.com/fablabbcn?utf8=✓&q=smartcitizen"
              class="btn-black-outline btn-round-new"
-             analytics-on="click"
-             analytics-category="Landing"
              >VISIT OUR REPOS</a>
         </div>
         <div flex="30" flex-sm="100" flex-xs="100" layout="column" layout-align="space-between center" class="bg-white border-black px-20 py-40 mb-10">
@@ -189,8 +170,6 @@ <h3>JOIN THE<br>FORUM</h3>
           <p>A place to share ideas with the community or find support.<p>
           <a href="https://forum.smartcitizen.me"
              class="btn-black-outline btn-round-new"
-             analytics-on="click"
-             analytics-category="Landing"
              >GET INVOLVED</a>
         </div>
       </div>
diff --git a/src/app/components/myProfile/Kits.html b/src/app/components/myProfile/Kits.html
index d82a0638..c98123c4 100644
--- a/src/app/components/myProfile/Kits.html
+++ b/src/app/components/myProfile/Kits.html
@@ -7,18 +7,15 @@
 
         <div class="" layout="row" layout-align="center center" layout-gt-sm="column">
             <md-button ng-click="vm.filterKits('all')"
-            class="profile_sidebar_button" analytics-on="click"
-            analytics-event="Profile" analytics-action="kit filter">
+            class="profile_sidebar_button">
             ALL
             </md-button>
             <md-button ng-click="vm.filterKits('online')"
-            class="profile_sidebar_button" analytics-on="click"
-            analytics-event="Profile" analytics-action="kit filter">
+            class="profile_sidebar_button">
             ONLINE
             </md-button>
             <md-button ng-click="vm.filterKits('offline')"
-            class="profile_sidebar_button" analytics-on="click"
-            analytics-event="Profile" analytics-action="kit filter">
+            class="profile_sidebar_button">
             OFFLINE
             </md-button>
         </div>
diff --git a/src/app/components/myProfile/myProfile.html b/src/app/components/myProfile/myProfile.html
index 76c708df..cc229648 100644
--- a/src/app/components/myProfile/myProfile.html
+++ b/src/app/components/myProfile/myProfile.html
@@ -21,7 +21,7 @@ <h2 class="profile_header_name">{{ vm.user.username || 'No data' }}</h2>
 
   <div class="myProfile_tabs_parent" flex>
     <md-tabs md-dynamic-height="" class="myProfile_tabs" md-center-tabs="false" md-selected="vm.startingTab">
-      <md-tab label md-on-select="vm.selectThisTab(0, 'kits')" analytics-on="click" analytics-event="Profile" analytics-action="kits">
+      <md-tab label md-on-select="vm.selectThisTab(0, 'kits')">
         <md-tab-label>
           <md-icon md-svg-src="./assets/images/kit_details_icon_light.svg" class="myProfile_tab_icon"></md-icon>
           <span class="color-white">KITS</span>
@@ -31,7 +31,7 @@ <h2 class="profile_header_name">{{ vm.user.username || 'No data' }}</h2>
           </ui-view>
         </md-tab-body>
       </md-tab>
-      <md-tab label md-on-select="vm.selectThisTab(1, 'user')" analytics-on="click" analytics-event="Profile" analytics-action="profile">
+      <md-tab label md-on-select="vm.selectThisTab(1, 'user')">
         <md-tab-label>
           <md-icon md-svg-src="./assets/images/user_details_icon.svg" class="myProfile_tab_icon"></md-icon>
           <span class="color-white">USER</span>
@@ -42,7 +42,7 @@ <h2 class="profile_header_name">{{ vm.user.username || 'No data' }}</h2>
           </ui-view>
         </md-tab-body>
       </md-tab>
-      <!-- <md-tab label md-on-select="vm.selectThisTab(2, 'tools')" analytics-on="click" analytics-event="Profile" analytics-action="tools">
+      <!-- <md-tab label md-on-select="vm.selectThisTab(2, 'tools')">
         <md-tab-label>
           <md-icon md-svg-src="./assets/images/support_icon_white.svg" class="myProfile_tab_icon"></md-icon>
           <span class="color-white">TOOLS</span>
diff --git a/src/app/components/signup/signup.html b/src/app/components/signup/signup.html
index 064b5b57..028666af 100644
--- a/src/app/components/signup/signup.html
+++ b/src/app/components/signup/signup.html
@@ -1,5 +1,3 @@
-<md-button class="" ng-click="vm.showSignup($event)"
-  analytics-on="click" analytics-event="Signup"
-  analytics-action="click">
+<md-button class="" ng-click="vm.showSignup($event)">
   Sign Up
 </md-button>
diff --git a/src/app/components/signup/signupModal.html b/src/app/components/signup/signupModal.html
index 576e6f63..18742985 100644
--- a/src/app/components/signup/signupModal.html
+++ b/src/app/components/signup/signupModal.html
@@ -66,8 +66,7 @@ <h2>Sign up</h2>
           </md-input-container>
         </div>
 
-        <md-button class="md-primary" ng-click="openLogin()"
-          analytics-on="click" analytics-event="Signup" analytics-action="login">
+        <md-button class="md-primary" ng-click="openLogin()">
           Already have an account? Log in
         </md-button>
       </div>
diff --git a/src/app/components/userProfile/userProfile.html b/src/app/components/userProfile/userProfile.html
index 87acb915..ae50cad5 100644
--- a/src/app/components/userProfile/userProfile.html
+++ b/src/app/components/userProfile/userProfile.html
@@ -26,18 +26,15 @@ <h2 class="profile_header_name">{{ vm.user.username || 'No data' }}</h2>
       <p class="profile_sidebar_title">FILTER KITS BY</p>
       <div class="" layout="column">
         <md-button ng-click="vm.filterKits('all')"
-        class="profile_sidebar_button" analytics-on="click"
-        analytics-event="Profile" analytics-action="kit filter">
+        class="profile_sidebar_button">
           ALL
         </md-button>
         <md-button ng-click="vm.filterKits('online')"
-          class="profile_sidebar_button" analytics-on="click"
-          analytics-event="Profile" analytics-action="kit filter">
+          class="profile_sidebar_button">
           ONLINE
         </md-button>
         <md-button ng-click="vm.filterKits('offline')"
-        class="profile_sidebar_button" analytics-on="click"
-        analytics-event="Profile" analytics-action="kit filter">
+        class="profile_sidebar_button">
           OFFLINE
         </md-button>
       </div>

From 0c52e49ca6a6388bbe67bb807216b477c7a26cd1 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez <oscgonfer@gmail.com>
Date: Mon, 14 Aug 2023 04:03:43 +0200
Subject: [PATCH 5/5] Remove attributes in button controller and minor cleanup

---
 src/app/components/alert/alert.controller.js  | 26 +++++++++----------
 src/app/components/alert/alert.service.js     | 16 +++++-------
 src/app/components/alert/alertinfoButton.html |  3 +--
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/app/components/alert/alert.controller.js b/src/app/components/alert/alert.controller.js
index 5442623d..58427f41 100644
--- a/src/app/components/alert/alert.controller.js
+++ b/src/app/components/alert/alert.controller.js
@@ -6,22 +6,22 @@
 
     AlertController.$inject = ['$scope', '$mdToast', 'message', 'button', 'href'];
     function AlertController($scope, $mdToast, message, button, href) {
-    	var vm = this;
+      var vm = this;
 
-    	vm.close = close;
-        vm.message = message;
-        vm.button = button;
-        vm.href = href;
+      vm.close = close;
+      vm.message = message;
+      vm.button = button;
+      vm.href = href;
 
-        // hideAlert will be triggered on state change
-        $scope.$on('hideAlert', function() {
-          close();
-        });
+      // hideAlert will be triggered on state change
+      $scope.$on('hideAlert', function() {
+        close();
+      });
 
-    	///////////////////
+      ///////////////////
 
-    	function close() {
-    	  $mdToast.hide();							
-    	}
+      function close() {
+        $mdToast.hide();
+      }
     }
 })();
diff --git a/src/app/components/alert/alert.service.js b/src/app/components/alert/alert.service.js
index d31eed96..93cf3e21 100644
--- a/src/app/components/alert/alert.service.js
+++ b/src/app/components/alert/alert.service.js
@@ -35,11 +35,11 @@
     function infoNoDataVisitor() {
       info('Woah! We couldn\'t locate this kit on the map because it hasn\'t published any data. Leave a ' +
         'comment to let its owner know.',
-      10000,
-      {
-        button: 'Leave comment',
-        href: 'https://forum.smartcitizen.me/'
-      });
+        10000,
+        {
+          button: 'Leave comment',
+          href: 'https://forum.smartcitizen.me/'
+        });
     }
 
     function infoNoDataOwner() {
@@ -59,15 +59,14 @@
 
     function infoLongTime() {
       info('😅 It looks like this kit hasn\'t posted any data in a long ' +
-        'time. Why not leave a comment to let its owner know?', 10000,
+        'time. Why not leave a comment to let its owner know?', 
+        10000,
         {
           button: 'Leave comment',
           href: 'https://forum.smartcitizen.me/'
         });
     }
 
-
-
     function info(message, delay, options) {
       if(options && options.button) {
         toast('infoButton', message, options, undefined, delay);
@@ -89,7 +88,6 @@
         locals: {
           message: message,
           button: options && options.button,
-          buttonAttributes: options && options.buttonAttributes,
           href: options && options.href
         }
       });
diff --git a/src/app/components/alert/alertinfoButton.html b/src/app/components/alert/alertinfoButton.html
index 532ad016..62af1870 100644
--- a/src/app/components/alert/alertinfoButton.html
+++ b/src/app/components/alert/alertinfoButton.html
@@ -4,9 +4,8 @@
              alt="Alert icon" class="alert_typeIcon">
     </md-icon>
     <span flex>{{ vm.message }}</span>
-    <md-button ng-href="{{vm.href}}" class="alert_button">{{ vm.button }}</md-button>    
+    <md-button ng-href="{{vm.href}}" class="alert_button">{{ vm.button }}</md-button>
   </div>
-
   <div flex-nogrow>
     <md-button ng-click="vm.close()" aria-label>
       <md-icon md-svg-src="./assets/images/close_icon_black.svg"