From fad47a8aa26264f510ca909b738fb4957685a185 Mon Sep 17 00:00:00 2001
From: Jeremy Guiselin <jeremy.guiselin@student.ecp.fr>
Date: Thu, 9 Feb 2017 08:15:19 -0500
Subject: [PATCH] Last fix
---
config.xml | 2 +-
scss/unlock.scss | 4 ----
www/js/app.js | 1 -
www/js/modules/config/config.js | 2 +-
www/js/modules/facebook-analytics/service.js | 25 ++++++++++++++++++++
www/js/modules/notification/service.js | 4 ++++
www/js/pages/football/controller.js | 3 +++
7 files changed, 34 insertions(+), 7 deletions(-)
create mode 100644 www/js/modules/facebook-analytics/service.js
diff --git a/config.xml b/config.xml
index 1db9620..30ff00f 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dimago.betskills" version="2.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.Dimago.Betskills" version="2.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Betskills</name>
<description>
Betskills app to see predictions of football and tennis games.
diff --git a/scss/unlock.scss b/scss/unlock.scss
index bbb3fab..f1b3cd9 100644
--- a/scss/unlock.scss
+++ b/scss/unlock.scss
@@ -28,9 +28,5 @@
font-family: "OspDin";
font-size: 20px;
box-shadow: 0px 2px 1px black;
-
- span {
- padding-left: 25px;
- }
}
}
diff --git a/www/js/app.js b/www/js/app.js
index 8f82816..29001af 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -93,7 +93,6 @@
if (ionic.Platform.isIOS()) {
window.FirebasePlugin.grantPermission();
}
- NotificationService.registerDevice();
ionic.Platform.ready(function () {
constantConfig.uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
});
diff --git a/www/js/modules/config/config.js b/www/js/modules/config/config.js
index 0b33459..c7b191e 100644
--- a/www/js/modules/config/config.js
+++ b/www/js/modules/config/config.js
@@ -25,7 +25,7 @@
'sound': true
},
'android': {
- 'iconColor': '#343434'
+ 'iconColor': '#000000'
}
}
}
diff --git a/www/js/modules/facebook-analytics/service.js b/www/js/modules/facebook-analytics/service.js
new file mode 100644
index 0000000..2e28223
--- /dev/null
+++ b/www/js/modules/facebook-analytics/service.js
@@ -0,0 +1,25 @@
+(function (angular) {
+ "use strict";
+ /**
+ * @ngdoc service
+ * @name starter.FacebookAnalyticsService
+ *
+ * @description
+ *
+ * A service for log events on Facebook Analytics.
+ *
+ * @ngInject
+ */
+ function FacebookAnalyticsService($http, constantConfig) {
+ var service = {
+
+ };
+
+ return service;
+
+ }
+
+ angular.module('starter')
+ .service('FacebookAnalyticsService', FacebookAnalyticsService)
+ ;
+})(angular);
diff --git a/www/js/modules/notification/service.js b/www/js/modules/notification/service.js
index b590f85..4f05b91 100644
--- a/www/js/modules/notification/service.js
+++ b/www/js/modules/notification/service.js
@@ -30,6 +30,8 @@
deviceData = Object.assign(device, {'locale': locale, 'token': token});
tokenAlreadyCreated = true;
}, function (error) {
+ console.log(error);
+ debugger;
deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
});
@@ -37,6 +39,8 @@
window.FirebasePlugin.onTokenRefresh(function (token) {
deviceData = Object.assign(device, {'locale': locale, 'token': token});
}, function (error) {
+ console.log(error);
+ debugger;
deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
});
}
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index bcaf531..ad90608 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -21,6 +21,7 @@
$q,
$ionicLoading,
PurchaseService,
+ NotificationService,
constantConfig,
purchaseConfig,
ToastService
@@ -249,6 +250,8 @@
showBackdrop: true
});
+ NotificationService.registerDevice();
+
self.uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
var freePredictionsPromise = $http.get(constantConfig.apiUrl + 'predictions/football/free');
--
GitLab