diff --git a/src/assets/scripts/ads/ads.controller.js b/src/assets/scripts/ads/ads.controller.js index 7acf3bf..28f7e8c 100644 --- a/src/assets/scripts/ads/ads.controller.js +++ b/src/assets/scripts/ads/ads.controller.js @@ -1,8 +1,8 @@ /** @ngInject */ const AdsController = ($scope, AdsService, UserService) => { - $scope.$on('loadUserSuccess', function (event, user) { + $scope.$on('loadUserSuccess', async (event, user) => { $scope.user = user; - AdsService.fetchAdsService() + await AdsService.fetchAdsService() .then( (result) => { $scope.ads = result; }) .catch( (error) => { console.log(error); }) }); diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index ff83d64..9f3c876 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -18,8 +18,9 @@ angular.module('NomitWisp', 'nwHistory', 'nwUserAdd', 'nwUsers', + 'nwCompanies', + 'nwReferees', ngRoute - ]) .factory(UserService.name, UserService) .config(function ($routeProvider, $httpProvider) { @@ -65,14 +66,14 @@ angular.module('NomitWisp', controller: 'UserDetailsController', templateUrl: 'assets/scripts/user-details/user-details.html' }) - // .when('/companies', { - // controller: 'CompaniesController', - // templateUrl: '' - // }) - // .when('/referees', { - // controller: 'RefereesController', - // templateUrl: '' - // }) + .when('/companies', { + controller: 'CompaniesController', + templateUrl: 'assets/scripts/companies/companies.html' + }) + .when('/referees', { + controller: 'RefereesController', + templateUrl: 'assets/scripts/referees/referees.html' + }) // .when('/reports', { // controller: 'ReportsController', // templateUrl: '' diff --git a/src/assets/scripts/companies/companies.controller.js b/src/assets/scripts/companies/companies.controller.js new file mode 100644 index 0000000..be3e99b --- /dev/null +++ b/src/assets/scripts/companies/companies.controller.js @@ -0,0 +1,12 @@ +/** @ngInject */ +const CompaniesController = ($scope, CompaniesService, UserService) => { + $scope.$on('loadUserSuccess', async (event, user) => { + $scope.user = user; + await CompaniesService.fetchCompaniesService() + .then( (result) => { $scope.companies = result; }) + .catch( (error) => { console.log(error); }) + }); + UserService.loadUser(); +} + +export default CompaniesController; \ No newline at end of file diff --git a/src/assets/scripts/companies/companies.html b/src/assets/scripts/companies/companies.html new file mode 100644 index 0000000..475ab92 --- /dev/null +++ b/src/assets/scripts/companies/companies.html @@ -0,0 +1,60 @@ +
+
+
+

Companies

+
+ +
+ +
+ +
+ +
+
+ +
+
{{company.name}}
+
Victoria
+
{{companies.email}}
+ view company profile + ban + company +
+
+
+
+
+
+ + + + + +
+
+
+
+
+ + +
+ + + + + +
+ + +
diff --git a/src/assets/scripts/companies/companies.service.js b/src/assets/scripts/companies/companies.service.js new file mode 100644 index 0000000..2d245e3 --- /dev/null +++ b/src/assets/scripts/companies/companies.service.js @@ -0,0 +1,13 @@ +/** @ngInject */ +const CompaniesService = ($http) => { + let serv = {}; + + serv.fetchCompaniesService = () =>{ + return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/company', { withCredentials: true }) + .then( (result) => { console.log(result.data); return result.data; }) + .catch( (error) => { return error; }); + } + return serv; +} + +export default CompaniesService; \ No newline at end of file diff --git a/src/assets/scripts/companies/index.js b/src/assets/scripts/companies/index.js new file mode 100644 index 0000000..ca694d9 --- /dev/null +++ b/src/assets/scripts/companies/index.js @@ -0,0 +1,10 @@ +import * as angular from 'angular'; +import CompaniesController from './companies.controller'; +import CompaniesService from './companies.service'; + +angular.module('nwCompanies', []) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(CompaniesController.name, CompaniesController) + .factory(CompaniesService.name, CompaniesService); \ No newline at end of file diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 97be6d3..230cfc4 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -31,5 +31,7 @@ import './history'; import './trumbowyg'; import './user-add'; import './users'; +import './companies'; +import './referees'; import './app'; \ No newline at end of file diff --git a/src/assets/scripts/referees/index.js b/src/assets/scripts/referees/index.js new file mode 100644 index 0000000..5477f50 --- /dev/null +++ b/src/assets/scripts/referees/index.js @@ -0,0 +1,10 @@ +import * as angular from 'angular'; +import RefereesController from './referees.controller'; +import RefereesService from './referees.service'; + +angular.module('nwReferees', []) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(RefereesController.name, RefereesController) + .factory(RefereesService.name, RefereesService); \ No newline at end of file diff --git a/src/assets/scripts/referees/referees.controller.js b/src/assets/scripts/referees/referees.controller.js new file mode 100644 index 0000000..ef5f21e --- /dev/null +++ b/src/assets/scripts/referees/referees.controller.js @@ -0,0 +1,12 @@ +/** @ngInject */ +const RefereesController = ($scope, RefereesService, UserService) => { + $scope.$on('loadUserSuccess', async (event, user) => { + $scope.user = user; + await RefereesService.fetchRefereesService() + .then( (result) => { $scope.referees = result; }) + .catch( (error) => { console.log(error); }) + }); + UserService.loadUser(); +} + +export default RefereesController; \ No newline at end of file diff --git a/src/assets/scripts/referees/referees.html b/src/assets/scripts/referees/referees.html new file mode 100644 index 0000000..150aed7 --- /dev/null +++ b/src/assets/scripts/referees/referees.html @@ -0,0 +1,59 @@ +
+
+
+

Referees

+
+ +
+ +
+ +
+ +
+
+ +
+
{{referee.name}}
+
Victoria
+
{{referee.email}}
+ {{referee.bio}} + ban + referee +
+
+
+
+
+
+ + + + + +
+
+
+
+
+ +
+ + + + + +
+ + +
diff --git a/src/assets/scripts/referees/referees.service.js b/src/assets/scripts/referees/referees.service.js new file mode 100644 index 0000000..7ebcf11 --- /dev/null +++ b/src/assets/scripts/referees/referees.service.js @@ -0,0 +1,13 @@ +/** @ngInject */ +const RefereesService = ($http) => { + let serv = {}; + + serv.fetchRefereesService = () => { + return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/referee', { withCredentials: true }) + .then( (result) => { console.log(result.data); return result.data; }) + .catch( (error) => { return error; }); + } + return serv; +} + +export default RefereesService; \ No newline at end of file diff --git a/src/assets/scripts/users/users.controller.js b/src/assets/scripts/users/users.controller.js index 9a764a4..7e9bad2 100644 --- a/src/assets/scripts/users/users.controller.js +++ b/src/assets/scripts/users/users.controller.js @@ -1,8 +1,8 @@ /** @ngInject */ const UsersController = ($scope, UsersService, UserService) => { - $scope.$on('loadUserSuccess', function (event, user) { + $scope.$on('loadUserSuccess', async (event, user) => { $scope.user = user; - UsersService.fetchUsersService() + await UsersService.fetchUsersService() .then( (result) => { $scope.users = result; }) .catch( (error) => { console.log(error); }) }); diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html index 5f5178b..4664902 100644 --- a/src/assets/scripts/users/users.html +++ b/src/assets/scripts/users/users.html @@ -8,11 +8,11 @@
-
+
-
{{user.fullname}}
diff --git a/src/assets/scripts/users/users.service.js b/src/assets/scripts/users/users.service.js index ba011a7..c38e51e 100644 --- a/src/assets/scripts/users/users.service.js +++ b/src/assets/scripts/users/users.service.js @@ -2,7 +2,7 @@ const UsersService = ($http) => { let serv = {}; - serv.fetchUsersService = () =>{ + 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; });