Browse Source

Added user-details page

Added route to user-detail after click on the user page
pull/146/head
Mohammed Tantawy 7 years ago
parent
commit
9d909c951f
7 changed files with 21 additions and 16 deletions
  1. +1
    -0
      src/assets/scripts/app/index.js
  2. +1
    -0
      src/assets/scripts/index.js
  3. +2
    -1
      src/assets/scripts/user-details/index.js
  4. +5
    -4
      src/assets/scripts/user-details/user-details.controller.js
  5. +7
    -7
      src/assets/scripts/user-details/user-details.html
  6. +4
    -3
      src/assets/scripts/user-details/user-details.service.js
  7. +1
    -1
      src/assets/scripts/users/users.html

+ 1
- 0
src/assets/scripts/app/index.js View File

@ -18,6 +18,7 @@ angular.module('NomitWisp',
'nwHistory',
'nwUserAdd',
'nwUsers',
'nwUserDetails',
'nwCompanies',
'nwReferees',
'nwReports',


+ 1
- 0
src/assets/scripts/index.js View File

@ -34,5 +34,6 @@ import './users';
import './companies';
import './referees';
import './reports';
import './user-details';
import './app';

+ 2
- 1
src/assets/scripts/user-details/index.js View File

@ -1,8 +1,9 @@
import * as angular from 'angular';
import ngRoute from 'angular-route';
import UserDetailsController from './user-details.controller';
import UserDetailsService from './user-details.service';
angular.module('nwUsers', [])
angular.module('nwUserDetails', [ngRoute])
.config(['$httpProvider', function($httpProvider) {
$httpProvider.defaults.withCredentials = true;
}])


+ 5
- 4
src/assets/scripts/user-details/user-details.controller.js View File

@ -1,12 +1,13 @@
/** @ngInject */
const UsersController = ($scope, UsersService, UserService) => {
const UserDetailsController = ($scope, $routeParams, UserDetailsService, UserService) => {
$scope.$on('loadUserSuccess', function (event, user) {
$scope.user = user;
UsersService.fetchUsersService()
.then( (result) => { $scope.userDetails = result; })
UserDetailsService.fetchUserDetails($routeParams)
.then( (result) => { console.log(result);
$scope.userDetails = result; })
.catch( (error) => { console.log(error); })
});
UserService.loadUser();
}
export default UsersController;
export default UserDetailsController;

+ 7
- 7
src/assets/scripts/user-details/user-details.html View File

@ -12,13 +12,13 @@
<!-- #user profile ========= -->
<div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="profile.role =='admin' || profile.role =='nomit' || profile.role =='referee' || profile.role =='company' ">
<div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="user.role != 'user'">
<div class="card item-box">
<div class="user-data-title">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<div class="testo">
<h5>{{ profile.fullname }}</h5> Bla Bla, this is your bio or whatever!
<h5>{{userDetails.personal.first_name}}</h5> {{userDetails.personal.bio}}
</div>
</div>
<div class="card-body-profile">
@ -28,26 +28,26 @@
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">First Name</h9>
<input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="Francesca" disabled>
<input type="text" class="form-control" placeholder="{{userDetails.personal.first_name}}" disabled>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Middle Name</h9>
<input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="" disabled>
<input type="text" class="form-control" placeholder="{{userDetails.personal.middle_name}}" value="" disabled>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Last Name</h9>
<input type="text" class="form-control" placeholder="{{ profile.fullname }}" value="Sperati" disabled>
<input type="text" class="form-control" placeholder="{{userDetails.personal.last_name}}" disabled>
</div>
</div>
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Email Address</h9>
<input type="text" class="form-control" placeholder="Email" value="{{ profile.email }}" disabled>
<input type="text" class="form-control" placeholder="Email" value="{{userDetails.email}}" disabled>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Phone Number</h9>
<input type="text" class="form-control" placeholder="Phone" value="{{ profile.fullname }}" disabled>
<input type="text" class="form-control" placeholder="Phone" value="{{userDetails.personal.phone}}" disabled>
</div>
<div class="col-4 profile-form-row">
<h9 class="">State</h9>


+ 4
- 3
src/assets/scripts/user-details/user-details.service.js View File

@ -1,9 +1,10 @@
/** @ngInject */
const UserDetailsService = ($http) => {
let serv = {};
serv.fetchUserDetails = (route) =>{
return $http.get(`${process.env.RESTAPI_URL}/api/users/${route.id}`)
.then( (result) => { return result.data; })
serv.fetchUserDetails = (route) => {
return $http.get(`${process.env.RESTAPI_URL}/api/user/${route.id}`)
.then( (result) => { console.log(result); return result.data; })
.catch( (error) => { return error; })
}
return serv;


+ 1
- 1
src/assets/scripts/users/users.html View File

@ -17,7 +17,7 @@
<div class="user-card-title">{{u.personal.first_name}} {{u.personal.last_name}}</div>
<div class=" text-size-11">{{u.personal.city}}</div>
<div class=" text-size-11">{{u.personal.phone}}</div>
<a href="#!user-details" id="user-action-fill">view user profile</a>
<a href="#!users/{{u._id}}" id="user-action-fill">view user profile</a>
<a href="#" class="visible-nomit visible-referee visible-admin" ng-show="user.role =='nomit' || user.role =='referee' || user.role =='admin'" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">
ban user</a>
</div>


Loading…
Cancel
Save