diff --git a/src/assets/scripts/ads-details/ads-details.controller.js b/src/assets/scripts/ads-details/ads-details.controller.js index 16fb0e9..02364fd 100644 --- a/src/assets/scripts/ads-details/ads-details.controller.js +++ b/src/assets/scripts/ads-details/ads-details.controller.js @@ -1,18 +1,23 @@ import moment from 'moment'; +import UserService from '../app/shared.service'; -const AdsDetailsController = ($scope, AdsDetailsService, $routeParams) => { - AdsDetailsService.fetchAdDetails($routeParams) - .then(function(result){ - $scope.ad = result; - window.msnry.layout(); - console.log(result); - }) - .catch(function(error){ - console.log(error); - }); - $scope.daysAgo = (timestamp) => { - return moment(timestamp).fromNow(); - } +const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + AdsDetailsService.fetchAdDetails($routeParams) + .then(function(result){ + $scope.ad = result; + window.msnry.layout(); + console.log(result); + }) + .catch(function(error){ + console.log(error); + }); + $scope.daysAgo = (timestamp) => { + return moment(timestamp).fromNow(); + } + }); + UserService.loadUser(); } export default AdsDetailsController; \ No newline at end of file diff --git a/src/assets/scripts/ads/ads.controller.js b/src/assets/scripts/ads/ads.controller.js index b0f5973..3aa7f57 100644 --- a/src/assets/scripts/ads/ads.controller.js +++ b/src/assets/scripts/ads/ads.controller.js @@ -1,15 +1,18 @@ /** @ngInject */ -const AdsController = ($scope, AdsService) => { - AdsService.fetchAdsService() - .then(function(result){ - $scope.ads = result; - console.log(result); - }) - .catch(function(error){ - console.log(error); - }) - - +const AdsController = ($scope, AdsService, UserService) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + AdsService.fetchAdsService() + .then(function (result) { + $scope.ads = result; + console.log(result); + }) + .catch(function (error) { + console.log(error); + }) + + }); + UserService.loadUser(); } -export default AdsController; \ No newline at end of file +export default AdsController; diff --git a/src/assets/scripts/app/shared.service.js b/src/assets/scripts/app/shared.service.js index c9c9c1b..610f384 100644 --- a/src/assets/scripts/app/shared.service.js +++ b/src/assets/scripts/app/shared.service.js @@ -11,12 +11,12 @@ const UserService = ($cookies, $rootScope) => { let serv = {}; //load user has been called (is called on page load in menu controller and after login on modal controller) - serv.loadUser = function () { + serv.loadUser = () => { if(typeof $cookies.get('access_token') !== 'undefined' ){ $rootScope.$broadcast('loadUserSuccess', parseJwt( $cookies.get('access_token') )); $('#modalLoginForm').modal('hide'); } else { - $('#modalLoginForm').modal('show'); + $('#modalLoginForm').modal({backdrop: 'static', keyboard: false}); } } diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 4467feb..2925ace 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -1,11 +1,12 @@ /** @ngInject */ -const DashboardController = ($scope) => { - $scope.$on('loadUserSuccess', function(user) { +const DashboardController = ($scope, UserService) => { + $scope.$on('loadUserSuccess', function(event, user) { $scope.user = user; - + console.log($scope.user); // tutte le funzioni del controller }); + UserService.loadUser(); } export default DashboardController; \ No newline at end of file diff --git a/src/assets/scripts/nwLogin/nwLogin.html b/src/assets/scripts/nwLogin/nwLogin.html index f61b041..ed5aa0b 100644 --- a/src/assets/scripts/nwLogin/nwLogin.html +++ b/src/assets/scripts/nwLogin/nwLogin.html @@ -1,4 +1,5 @@ - +
+ \ No newline at end of file diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index 60c2ffb..e376a67 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -503,3 +503,11 @@ textarea { background-color: #FFFFFF; } +/* Modal */ +body.modal-open .blurra{ + -webkit-filter: blur(6px); + -moz-filter: blur(6px); + -o-filter: blur(6px); + -ms-filter: blur(6px); + filter: blur(6px); +} \ No newline at end of file diff --git a/src/index.html b/src/index.html index bbfef74..55bb2da 100755 --- a/src/index.html +++ b/src/index.html @@ -73,7 +73,7 @@ -
+