diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index 8a68b57..32a9fb5 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -18,6 +18,7 @@ angular.module('NomitWisp', 'nwHistory', 'nwUserAdd', 'nwUsers', + 'nwUserDetails', 'nwCompanies', 'nwReferees', 'nwReports', diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 6c40505..31c9a1f 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -34,5 +34,6 @@ import './users'; import './companies'; import './referees'; import './reports'; +import './user-details'; import './app'; \ No newline at end of file diff --git a/src/assets/scripts/user-details/index.js b/src/assets/scripts/user-details/index.js index cb35324..0e6dd48 100644 --- a/src/assets/scripts/user-details/index.js +++ b/src/assets/scripts/user-details/index.js @@ -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; }]) diff --git a/src/assets/scripts/user-details/user-details.controller.js b/src/assets/scripts/user-details/user-details.controller.js index ed14728..47e4711 100644 --- a/src/assets/scripts/user-details/user-details.controller.js +++ b/src/assets/scripts/user-details/user-details.controller.js @@ -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; \ No newline at end of file +export default UserDetailsController; \ No newline at end of file diff --git a/src/assets/scripts/user-details/user-details.html b/src/assets/scripts/user-details/user-details.html index d9c1680..e8aaa15 100644 --- a/src/assets/scripts/user-details/user-details.html +++ b/src/assets/scripts/user-details/user-details.html @@ -12,13 +12,13 @@ -
+
-
{{ profile.fullname }}
Bla Bla, this is your bio or whatever! +
{{userDetails.personal.first_name}}
{{userDetails.personal.bio}}
@@ -28,26 +28,26 @@
First Name - +
Middle Name - +
Last Name - +
Email Address - +
Phone Number - +
State diff --git a/src/assets/scripts/user-details/user-details.service.js b/src/assets/scripts/user-details/user-details.service.js index c83f1bf..47d6455 100644 --- a/src/assets/scripts/user-details/user-details.service.js +++ b/src/assets/scripts/user-details/user-details.service.js @@ -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; diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html index d188248..d78df99 100644 --- a/src/assets/scripts/users/users.html +++ b/src/assets/scripts/users/users.html @@ -17,7 +17,7 @@
{{u.personal.first_name}} {{u.personal.last_name}}
{{u.personal.city}}
{{u.personal.phone}}
- view user profile + view user profile ban user