Browse Source

Merge pull request #50 from ExtProjNomit/comp-avatar

company avatar
pull/146/head
Mohammed Tantawy 7 years ago
committed by GitHub
parent
commit
4559e9edc8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 15 deletions
  1. +5
    -6
      src/assets/scripts/ads-details/ads-details.controller.js
  2. +1
    -2
      src/assets/scripts/ads-details/ads-details.html
  3. +9
    -0
      src/assets/scripts/companies/companies.controller.js
  4. +1
    -2
      src/assets/scripts/companies/companies.html
  5. +4
    -1
      src/assets/scripts/companies/companies.service.js
  6. +12
    -1
      src/assets/scripts/company-details/company-details.controller.js
  7. +2
    -2
      src/assets/scripts/company-details/company-details.html
  8. +2
    -1
      src/assets/scripts/nwSidebar/sidebar.controller.js

+ 5
- 6
src/assets/scripts/ads-details/ads-details.controller.js View File

@ -7,13 +7,12 @@ const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserServi
AdsDetailsService.fetchAdDetails($routeParams)
.then((result) => {
$scope.ad = result;
window.msnry.layout();
$scope.avatar = new Avatar(document.getElementById('avatar_company_details'), {
'useGravatar': false,
'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}`
'initial_weight': 300,
});
// $scope.avatar = new Avatar(document.getElementById('avatar_company_details'), {
// 'useGravatar': false,
// 'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}`
// 'initial_weight': 300,
// });
})
.catch((error) => { console.log(error); });
$scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); }


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

@ -16,8 +16,7 @@
<div class="card">
<div class="row">
<div class="col-3 mt-4 ">
<img class="img-fluid ml-4 mb-4 companies-update-img" ng-src="{{avatar_company_details.element.src}}" alt="company"
class="avatar">
<img class="img-fluid ml-4 mb-4 companies-update-img avatar" alt="company">
</div>
<div class="col-9 card-body">
<h2 class="card-title mt-4 mr-4">{{ ad.title }}</h2>


+ 9
- 0
src/assets/scripts/companies/companies.controller.js View File

@ -1,4 +1,5 @@
import masonry from '../masonry';
import Avatar from 'avatar-initials';
/** @ngInject */
const CompaniesController = ($scope, CompaniesService, UserService) => {
$scope.$on('loadUserSuccess', async (event, user) => {
@ -6,6 +7,14 @@ const CompaniesController = ($scope, CompaniesService, UserService) => {
await CompaniesService.fetchCompaniesService()
.then( (result) => {
$scope.companies = result;
$scope.avatar = function(index) {
new Avatar(document.getElementById('company'+index), {
'useGravatar': false,
'initials': result[index].name[0],
'initial_weight': 300,
});
}
masonry();
})
.catch( (error) => { console.log(error); })


+ 1
- 2
src/assets/scripts/companies/companies.html View File

@ -12,8 +12,7 @@
<!-- #first user ========= -->
<div class="card item-box">
<div class="user-data-title container">
<img class="user-card-img rounded-circle" src="https://www.monmouth.edu/university-advancement/wp-content/uploads/sites/237/2018/08/person-placeholder.jpg"
alt="">
<img class="user-card-img rounded-circle" id="company{{$index}}" ng-src="{{avatar($index)}}" alt="">
<div class="user-card-col">
<div class="user-card-title">{{company.name}}</div>
<div class=" text-size-11">Victoria</div>


+ 4
- 1
src/assets/scripts/companies/companies.service.js View File

@ -4,7 +4,10 @@ const CompaniesService = ($http) => {
serv.fetchCompaniesService = () =>{
return $http.get(`${process.env.RESTAPI_URL}/api/users/company`, { withCredentials: true })
.then( (result) => { console.log(result.data); return result.data; })
.then( (result) => {
console.log(result.data);
return result.data;
})
.catch( (error) => { return error; });
}
return serv;


+ 12
- 1
src/assets/scripts/company-details/company-details.controller.js View File

@ -1,9 +1,20 @@
import Avatar from 'avatar-initials';
/** @ngInject */
const CompanyDetailsController = ($scope, $routeParams, CompanyDetailsService, UserService) => {
$scope.$on('loadUserSuccess', function (event, user) {
$scope.user = user;
CompanyDetailsService.fetchCompanyDetails($routeParams)
.then( (result) => { console.log(result); $scope.company = result; })
.then( (result) => {
console.log(result);
$scope.company = result;
$scope.avatar = new Avatar(document.getElementById('avatar_company_details'), {
'useGravatar': false,
'initials': $scope.company.name[0],
'initial_weight': 300,
});
})
.catch( (error) => { console.log(error); })
});
UserService.loadUser();


+ 2
- 2
src/assets/scripts/company-details/company-details.html View File

@ -14,7 +14,7 @@
<div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-user" ng-show="user.role !='company'">
<div class="card item-box">
<div class="user-data-title">
<img class="user-update-img" ng-src="{{avatar.element.src}}" alt="">
<img class="user-update-img" id="avatar_company_details" ng-src="{{avatar.element.src}}" alt="">
<div class="testo">
<h5>{{ company.company.name }}</h5> {{ company.company.description }}
</div>
@ -40,7 +40,7 @@
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Email Address</h9>
<input type="text" class="form-control" placeholder="{{ company.company.email }}" value="" disabled>
<input type="text" class="form-control" placeholder="{{ company.email }}" value="" disabled>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Phone Number</h9>


+ 2
- 1
src/assets/scripts/nwSidebar/sidebar.controller.js View File

@ -1,5 +1,5 @@
import functionSearch from '../search';
import functionSidebar from '../sidebar';
import masonry from '../masonry';
/** @ngInject */
const SidebarController = ($scope, UserService) => {
@ -10,6 +10,7 @@ const SidebarController = ($scope, UserService) => {
$scope.user = user;
functionSidebar();
}
masonry();
});
UserService.loadUser();
}


Loading…
Cancel
Save