anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

bannerService fixes + some space for the loader

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-04 11:05:31 +02:00
commit de32460fd7
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/tab-home.js
View file

@ -25,11 +25,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
startupService.ready();
bannerService.getBanner(function (banner) {
$scope.$apply(function () {
$scope.bannerImageUrl = banner.imageURL;
$scope.bannerUrl = banner.url;
$scope.bannerIsLoading = false;
});
$scope.bannerImageUrl = banner.imageURL;
$scope.bannerUrl = banner.url;
$scope.bannerIsLoading = false;
});
});

12
src/js/services/bannerService.js
View file

@ -20,7 +20,7 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
var fetchSettings = function (cb) {
var req = {
method: 'GET',
url: marketingApiService+'/settings',
url: API_URL+'/settings',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
@ -28,10 +28,10 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
};
$http(req).then(function (response) {
$log.info('Get banner settings: SUCCESS');
banners = response.data
banners = response.data;
return cb(true);
}, function (error) {
$log.error('Get banner settings: ERROR ' + data.statusText);
$log.error('Get banner settings: ERROR ' + response.statusText);
return cb(false);
});
};
@ -44,7 +44,7 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
// If never fetch, lets fetch
fetchSettings(function (isSuccess) {
root.getBannerImage(cb);
root.getBanner(cb);
});
// If fetch, and got banners, lets have a look
@ -55,14 +55,14 @@ angular.module('copayApp.services').factory('bannerService', function ($http, $l
// Generate the URL for the banner
var fileName = banner.image.substring(0, banner.image.lastIndexOf('.'));
var extension = banner.image.substring(banner.image.lastIndexOf('.'));
var extension = banner.image.substring(banner.image.lastIndexOf('.')+1);
banner.imageURL = API_URL +'/banners/'+fileName+"/"+extension;
// Add the banner
selectedBanners.push(banners[i]);
}
// If no banner activated, I return the default one
// If no banner activated, return the default one
if (selectedBanners.length == 0) {
return cb(defaultBanner);
} else {

3
src/sass/views/tab-home.scss
View file

@ -59,6 +59,9 @@
}
}
&-banner {
svg {
margin: 40px auto 40px;
}
padding: 0;
&__img {
width: 100%;