diff --git a/src/assets/scripts/ads-details/ads-details.html b/src/assets/scripts/ads-details/ads-details.html index c93e19a..0057854 100644 --- a/src/assets/scripts/ads-details/ads-details.html +++ b/src/assets/scripts/ads-details/ads-details.html @@ -58,7 +58,7 @@ -
+
@@ -66,7 +66,7 @@
-
+
diff --git a/src/assets/scripts/ads/ads.html b/src/assets/scripts/ads/ads.html index b6e3033..41270ad 100644 --- a/src/assets/scripts/ads/ads.html +++ b/src/assets/scripts/ads/ads.html @@ -15,14 +15,14 @@
-
+
- Card image cap + Card image cap

{{ ad.content.title }}

diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js index 1476af2..0e00cdc 100644 --- a/src/assets/scripts/dashboard/dashboard.controller.js +++ b/src/assets/scripts/dashboard/dashboard.controller.js @@ -3,15 +3,17 @@ import chart from "../charts/chartJS"; import pieChart from "../charts/easyPieChart"; /** @ngInject */ -const DashboardController = ($scope, AdsService, UserService) => { +const DashboardController = ($scope, AdsService, UserService, $location) => { $scope.$on('loadUserSuccess', async function(event, user) { $scope.user = user; // load ads - await AdsService.fetchAdsService(user) - .then( (result) => { $scope.ads = result; }) - .catch( (error) => { console.log(error); }) - + //await AdsService.fetchAdsService(user) + //.then( (result) => { $scope.ads = result; }) + //.catch( (error) => { console.log(error); }) + if ( user.role === 'user' || user.role === 'company' ){ + $location.path( "/ads" ); + } // tutte le funzioni del controller masonry();