diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ba386acc..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:
@@ -19,6 +17,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
@@ -27,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'
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',
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 884ec22a..93cf3e21 100644
--- a/src/app/components/alert/alert.service.js
+++ b/src/app/components/alert/alert.service.js
@@ -35,13 +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',
- buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
- 'analytics-category="Offline Kit Comment Link"',
- href: 'https://forum.smartcitizen.me/'
- });
+ 10000,
+ {
+ button: 'Leave comment',
+ href: 'https://forum.smartcitizen.me/'
+ });
}
function infoNoDataOwner() {
@@ -55,25 +53,20 @@
10000,
{
button: 'Leave comment',
- buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
- 'analytics-category="Private Kit Comment Link"',
href: 'https://forum.smartcitizen.me/'
});
}
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',
- buttonAttributes: 'analytics-on="click" analytics-event="click" ' +
- 'analytics-category="Long time No published Kit Comment Link"',
href: 'https://forum.smartcitizen.me/'
});
}
-
-
function info(message, delay, options) {
if(options && options.button) {
toast('infoButton', message, options, undefined, delay);
@@ -95,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">
{{ vm.message }}
-
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.
WATCH DOCUMENTARYFor 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.
ORDER NOWUse our powerful API to build amazing things using data.
USE THE APIFork and contribute to the project in GitHub.
VISIT OUR REPOSA place to share ideas with the community or find support.