diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js
index d0465e3..a99f733 100755
--- a/src/assets/scripts/index.js
+++ b/src/assets/scripts/index.js
@@ -29,5 +29,6 @@ import './profile';
import './signup';
import './history';
import './trumbowyg';
+import './users';
import './app';
\ No newline at end of file
diff --git a/src/assets/scripts/nwTopbar/topbar.controller.js b/src/assets/scripts/nwTopbar/topbar.controller.js
index dbe0fb8..e9394fe 100644
--- a/src/assets/scripts/nwTopbar/topbar.controller.js
+++ b/src/assets/scripts/nwTopbar/topbar.controller.js
@@ -1,7 +1,7 @@
import functionSearch from '../search';
+import Avatar from 'avatar-initials';
/** @ngInject */
-import Avatar from 'avatar-initials';
const TopbarController = ($scope, UserService) => {
$scope.$on('loadUserSuccess', function (event, user) {
diff --git a/src/assets/scripts/user-details/index.js b/src/assets/scripts/user-details/index.js
new file mode 100644
index 0000000..cb35324
--- /dev/null
+++ b/src/assets/scripts/user-details/index.js
@@ -0,0 +1,10 @@
+import * as angular from 'angular';
+import UserDetailsController from './user-details.controller';
+import UserDetailsService from './user-details.service';
+
+angular.module('nwUsers', [])
+ .config(['$httpProvider', function($httpProvider) {
+ $httpProvider.defaults.withCredentials = true;
+ }])
+ .controller(UserDetailsController.name, UserDetailsController)
+ .factory(UserDetailsService.name, UserDetailsService);
\ No newline at end of file
diff --git a/src/assets/scripts/user-details/user-details.controller.js b/src/assets/scripts/user-details/user-details.controller.js
new file mode 100644
index 0000000..ed14728
--- /dev/null
+++ b/src/assets/scripts/user-details/user-details.controller.js
@@ -0,0 +1,12 @@
+/** @ngInject */
+const UsersController = ($scope, UsersService, UserService) => {
+ $scope.$on('loadUserSuccess', function (event, user) {
+ $scope.user = user;
+ UsersService.fetchUsersService()
+ .then( (result) => { $scope.userDetails = result; })
+ .catch( (error) => { console.log(error); })
+ });
+ UserService.loadUser();
+}
+
+export default UsersController;
\ No newline at end of file
diff --git a/src/assets/scripts/user-details/user-details.service.js b/src/assets/scripts/user-details/user-details.service.js
new file mode 100644
index 0000000..00d4886
--- /dev/null
+++ b/src/assets/scripts/user-details/user-details.service.js
@@ -0,0 +1,12 @@
+const UserDetailsService = ($http) => {
+ let serv = {};
+
+ serv.fetchUserDetails = (route) =>{
+ return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/'+route.id)
+ .then( (result) => { return result.data; })
+ .catch( (error) => { return error; })
+ }
+ return serv;
+}
+
+export default UserDetailsService;
\ No newline at end of file
diff --git a/src/assets/scripts/users/index.js b/src/assets/scripts/users/index.js
new file mode 100644
index 0000000..248c2d2
--- /dev/null
+++ b/src/assets/scripts/users/index.js
@@ -0,0 +1,10 @@
+import * as angular from 'angular';
+import UsersController from './users.controller';
+import UsersService from './users.service';
+
+angular.module('nwUsers', [])
+ .config(['$httpProvider', function($httpProvider) {
+ $httpProvider.defaults.withCredentials = true;
+ }])
+ .controller(UsersController.name, UsersController)
+ .factory(UsersService.name, UsersService);
\ No newline at end of file
diff --git a/src/assets/scripts/users/users.controller.js b/src/assets/scripts/users/users.controller.js
new file mode 100644
index 0000000..9a764a4
--- /dev/null
+++ b/src/assets/scripts/users/users.controller.js
@@ -0,0 +1,12 @@
+/** @ngInject */
+const UsersController = ($scope, UsersService, UserService) => {
+ $scope.$on('loadUserSuccess', function (event, user) {
+ $scope.user = user;
+ UsersService.fetchUsersService()
+ .then( (result) => { $scope.users = result; })
+ .catch( (error) => { console.log(error); })
+ });
+ UserService.loadUser();
+}
+
+export default UsersController;
\ No newline at end of file
diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html
index 6492d77..ee8c21d 100644
--- a/src/assets/scripts/users/users.html
+++ b/src/assets/scripts/users/users.html
@@ -1,4 +1,4 @@
-
+
Users
@@ -8,32 +8,25 @@
-
+
-
-
-
-
-
-
Victoria
-
Mobile: 0414987654
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
Victoria
-
Mobile: 0414987654
-
-
-
-
-
+
+
+
+
+
diff --git a/src/assets/scripts/users/users.service.js b/src/assets/scripts/users/users.service.js
new file mode 100644
index 0000000..ba011a7
--- /dev/null
+++ b/src/assets/scripts/users/users.service.js
@@ -0,0 +1,13 @@
+/** @ngInject */
+const UsersService = ($http) => {
+ let serv = {};
+
+ serv.fetchUsersService = () =>{
+ return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/user', { withCredentials: true })
+ .then( (result) => { console.log(result.data); return result.data; })
+ .catch( (error) => { return error; });
+ }
+ return serv;
+}
+
+export default UsersService;
\ No newline at end of file