diff --git a/config.xml b/config.xml index 93add9b..553e761 100644 --- a/config.xml +++ b/config.xml @@ -20,4 +20,5 @@ + diff --git a/plugins/android.json b/plugins/android.json index c0645ba..7046885 100644 --- a/plugins/android.json +++ b/plugins/android.json @@ -19,14 +19,14 @@ "cordova-plugin-statusbar": { "PACKAGE_NAME": "com.ionicframework.openeventsplatformapp652778" }, - "cordova-plugin-whitelist": { - "PACKAGE_NAME": "com.ionicframework.openeventsplatformapp652778" - }, "cordova-plugin-x-socialsharing": { "PACKAGE_NAME": "com.ionicframework.openeventsplatformapp652778" }, "ionic-plugin-keyboard": { "PACKAGE_NAME": "com.ionicframework.openeventsplatformapp652778" + }, + "cordova-plugin-whitelist": { + "PACKAGE_NAME": "com.ionicframework.openeventsplatformapp652778" } }, "dependent_plugins": {} diff --git a/plugins/fetch.json b/plugins/fetch.json index 7bbbded..9ff3921 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -1,12 +1,4 @@ { - "cordova-plugin-whitelist": { - "source": { - "type": "registry", - "id": "cordova-plugin-whitelist@1.3.1" - }, - "is_top_level": true, - "variables": {} - }, "cordova-plugin-statusbar": { "source": { "type": "registry", @@ -54,5 +46,13 @@ }, "is_top_level": true, "variables": {} + }, + "cordova-plugin-whitelist": { + "source": { + "type": "registry", + "id": "cordova-plugin-whitelist@1.3.1" + }, + "is_top_level": true, + "variables": {} } } \ No newline at end of file diff --git a/www/js/app.js b/www/js/app.js index c03b4cc..50ad71b 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -137,8 +137,8 @@ angular.module('app', [ .factory('api', function($http) { return { init: function() { - $http.defaults.headers.common['X-Access-Token'] = localStorage.getItem("cim_app_token"); - $http.defaults.headers.post['X-Access-Token'] = localStorage.getItem("cim_app_token"); + $http.defaults.headers.common['X-Access-Token'] = localStorage.getItem("events_app_token"); + $http.defaults.headers.post['X-Access-Token'] = localStorage.getItem("events_app_token"); } }; }) diff --git a/www/js/event.js b/www/js/event.js index 4115d79..e007460 100644 --- a/www/js/event.js +++ b/www/js/event.js @@ -56,12 +56,12 @@ angular.module('app.event', ['pascalprecht.translate', 'ui-leaflet']) $scope.share = function(event){ - var message = event.description; - var subject = event.title; - var file= ['','']; + var message = "[" + event.title + "]" + event.description; + /*var subject = event.title; + var file= ['',''];*/ var link = "http://duckduckgo.com"; $cordovaSocialSharing - .share(message, subject, file, link) // Share via native share sheet + .share(message, link) // Share via native share sheet .then(function(result) { // Success! }, function(err) { diff --git a/www/js/events.js b/www/js/events.js index 75cc385..ba20016 100644 --- a/www/js/events.js +++ b/www/js/events.js @@ -1,13 +1,15 @@ angular.module('app.events', ['pascalprecht.translate']) -.controller('EventsCtrl', function($scope, $http, $ionicModal, $timeout, $ionicLoading, $filter) { +.controller('EventsCtrl', function($scope, $http, $ionicModal, + $timeout, $ionicLoading, $filter) { $scope.events=[]; $scope.page=0; $scope.doRefresh = function() { /* events refresh: */ - $http.get(urlapi + 'events?page=' + $scope.page) + //$http.get(urlapi + 'events?page=' + $scope.page) + $http.get(urlapi + 'events') .then(function(data){ console.log('data success events'); console.log(data); // for browser console @@ -25,12 +27,12 @@ angular.module('app.events', ['pascalprecht.translate']) $scope.doRefresh(); $scope.share = function(event){ - var message = event.description; - var subject = event.title; - var file= ['','']; + var message = "[" + event.title + "]" + event.description; + /*var subject = event.title; + var file= ['',''];*/ var link = "http://duckduckgo.com"; $cordovaSocialSharing - .share(message, subject, file, link) // Share via native share sheet + .share(message, link) // Share via native share sheet .then(function(result) { // Success! }, function(err) {