Browse Source

fixes users ads takes from different endpoint

pull/146/head
Davide Bragagnolo 7 years ago
parent
commit
8f058bbe9c
4 changed files with 63 additions and 21 deletions
  1. +1
    -1
      src/assets/scripts/ads/ads.controller.js
  2. +40
    -1
      src/assets/scripts/ads/ads.html
  3. +10
    -4
      src/assets/scripts/ads/ads.service.js
  4. +12
    -15
      src/assets/scripts/dashboard/dashboard.controller.js

+ 1
- 1
src/assets/scripts/ads/ads.controller.js View File

@ -2,7 +2,7 @@
const AdsController = ($scope, AdsService, UserService) => {
$scope.$on('loadUserSuccess', async (event, user) => {
$scope.user = user;
await AdsService.fetchAdsService()
await AdsService.fetchAdsService(user)
.then( (result) => { $scope.ads = result; })
.catch( (error) => { console.log(error); })
});


+ 40
- 1
src/assets/scripts/ads/ads.html View File

@ -14,7 +14,45 @@
<!-- #content container ===== -->
<div class="masonry-sizer col-md-6"></div>
<div class="masonry-item w-100">
<!-- ============== ADS USERS ============== -->
<div class="masonry-item w-100" ng-show="user.role =='user'">
<!-- #First line ========= -->
<div class="row gap-30">
<!-- ============== Job Ad ============== -->
<div class='col-md-4 col-sm-12' ng-repeat="ad in ads | orderBy:'-matches'">
<div class="card item-box">
<img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
<div class="card-body">
<div class="card-title d-flex mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;">
<h4> {{ ad.content.title }} </h4>
<!-- ============== favourites ==============
<div>
<a class='' href="" ng-show="user.role =='user'">
<span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span>
</a>
</div>
-->
</div>
<p class="card-text mx-2"><small class="text-muted">{{ ad.content.description }}</small></p>
<!-- ============== star rating ==============
<div class="star-rating-display ml-2 mb-2" data-rating="2"><span class="is-vishidden">TBD</span></div>
-->
<p class="card-text mx-2 mb-2"> {{ ad.content.companyintro }} </p>
</div>
<a href="/#!/ads/{{ad.content._id}}">
<div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4; font-weight: bolder; text-align: center; margin: 0px">
VIEW MORE <i class=" fa fa-chevron-right ml-1" style="color:#fff; font-size: 11px; font-weight: bolder;"></i>
</div>
</a>
</div>
</div>
</div>
</div>
<!-- ============== ADS EVERYBODY ELSE ============== -->
<div class="masonry-item w-100" ng-show="user.role !='user'">
<!-- #First line ========= -->
<div class="row gap-30">
@ -46,6 +84,7 @@
</a>
</div>
</div>
</div>
</div>


+ 10
- 4
src/assets/scripts/ads/ads.service.js View File

@ -2,10 +2,16 @@
const AdsService = ($http) => {
let serv = {};
serv.fetchAdsService = () =>{
return $http.get(`${process.env.RESTAPI_URL}/api/ads`, { withCredentials: true })
.then( (result) => { return result.data; })
.catch( (error) => { return error; });
serv.fetchAdsService = (user) =>{
if (user.role === 'user'){
return $http.get(`${process.env.RESTAPI_URL}/api/user/${user.id}/ads`, { withCredentials: true })
.then( (result) => { return result.data; })
.catch( (error) => { return error; });
} else {
return $http.get(`${process.env.RESTAPI_URL}/api/ads`, { withCredentials: true })
.then( (result) => { return result.data; })
.catch( (error) => { return error; });
}
}
return serv;
}


+ 12
- 15
src/assets/scripts/dashboard/dashboard.controller.js View File

@ -4,25 +4,22 @@ import pieChart from "../charts/easyPieChart";
/** @ngInject */
const DashboardController = ($scope, AdsService, UserService) => {
$scope.$on('loadUserSuccess', function(event, user) {
$scope.$on('loadUserSuccess', async function(event, user) {
$scope.user = user;
});
//link al ad-detail
$scope.$on('loadUserSuccess', async (event, user) => {
await AdsService.fetchAdsService()
.then( (result) => { $scope.ads = result; })
.catch( (error) => { console.log(error); })
});
// load ads
await AdsService.fetchAdsService(user)
.then( (result) => { $scope.ads = result; })
.catch( (error) => { console.log(error); })
// tutte le funzioni del controller
// tutte le funzioni del controller
masonry();
chart();
pieChart();
});
UserService.loadUser();
masonry();
chart();
pieChart();
}
export default DashboardController;


Loading…
Cancel
Save