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 }} - {{ vm.button }} + {{ vm.button }} -
- + Chart - + Kit Detail - + User info - @@ -132,9 +124,7 @@

- + {{ sensor.name }} @@ -151,9 +141,7 @@
{{ vm.sensorNames[vm.selectedSensor] }}
Compare with - + {{ sensor.name }} 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 @@ GO TO THE PLATFORM
@@ -12,8 +10,6 @@

ORDER YOUR SMART CITIZEN KIT FROM SEEED STUDIO

ORDER NOW
@@ -28,8 +24,6 @@

WE EMPOWER COMMUNITIES TO BETTER UNDERSTAND THEIR ENVIRONMENT

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 DOCUMENTARY
@@ -44,8 +38,6 @@

INTRODUCING A NEW AND IMPROVED KIT

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.

ORDER NOW
@@ -103,8 +95,6 @@

CIVIC PARTICIPATION ACROSS THE GLOBE

GO TO THE PLATFORM
@@ -123,8 +113,6 @@

AN OPEN PLATFORM TO LEARN, BUILD AND CONTRIBUTE

GO TO THE DOCS
@@ -145,9 +133,6 @@

SUBSCRIBE TO GET THE LATEST NEWS

name="subscribe" id="mc-embedded-subscribe" value="GO!" - analytics-on="click" - analytics-category="Landing" - analytics-event="Subscribe to newsletter" />
@@ -169,8 +154,6 @@

DEVELOPER
READY

Use our powerful API to build amazing things using data.

USE THE API
@@ -179,8 +162,6 @@

WE’RE
OPEN SOURCE

Fork and contribute to the project in GitHub.

VISIT OUR REPOS
@@ -189,8 +170,6 @@

JOIN THE
FORUM

A place to share ideas with the community or find support.

GET INVOLVED

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 @@
+ class="profile_sidebar_button"> ALL + class="profile_sidebar_button"> ONLINE + class="profile_sidebar_button"> OFFLINE
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 @@

{{ vm.user.username || 'No data' }}

- + KITS @@ -31,7 +31,7 @@

{{ vm.user.username || 'No data' }}

- + USER @@ -42,7 +42,7 @@

{{ vm.user.username || 'No data' }}

-