Merge pull request #36 from ExtProjNomit/added-routes

Added routes

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); })
   });

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: '' 

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;

src/assets/scripts/companies/companies.html

@@ -0,0 +1,60 @@
+<main class='main-content'>
+  <div id='mainContent row'>
+    <div class="row content-title mT-60">
+      <h1 class="col-8 ml-1 mb-4">Companies</h1>
+    </div>
+
+    <div class=" gap-30 masonry pos-r">
+      <!-- #content container ===== -->
+      <div class="masonry-sizer col-md-6"></div>
+
+      <div class="masonry-item w-50" ng-repeat="company in companies">
+        <!-- #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="">
+            <div class="user-card-col">
+              <div class="user-card-title">{{company.name}}</div>
+              <div class=" text-size-11">Victoria</div>
+              <div class=" text-size-11">{{companies.email}}</div>
+              <a href="#" id="user-action-fill">view company profile</a>
+              <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="Company will be unable to log in to WISP">ban
+                company</a>
+            </div>
+          </div>
+          <div class="card-body p-0">
+            <div class="card-body-users row">
+              <div class="col-4"></div>
+              <div class="users-icons col-8">
+                <a href=""><i class="fa fa-envelope-o"></i></a>
+                <a href=""><i class="fa fa-linkedin"></i></a>
+                <a href=""><i class="fa fa-facebook"></i></a>
+                <a href=""><i class="fa fa-instagram"></i></a>
+                <a href=""><i class="fa fa-github"></i></a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      
+    </div>
+
+    <!-- PAGINATION-->
+    <div class="pagination">
+      <a href="#">&laquo;</a>
+      <a href="#">1</a>
+      <a class="active" href="#">2</a>
+      <a href="#">3</a>
+      <a href="#">4</a>
+      <a href="#">5</a>
+      <a href="#">6</a>
+      <a href="#">&raquo;</a>
+    </div>
+
+
+  </div>
+  <!--content container-->
+
+</main>

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;

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);

src/assets/scripts/index.js

@@ -31,5 +31,7 @@ import './history';
 import './trumbowyg';
 import './user-add';
 import './users';
+import './companies';
+import './referees';
 
 import './app';

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);

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;

src/assets/scripts/referees/referees.html

@@ -0,0 +1,59 @@
+<main class='main-content'>
+  <div id='mainContent row'>
+    <div class="row content-title mT-60">
+      <h1 class="col-8 ml-1 mb-4">Referees</h1>
+    </div>
+
+    <div class=" gap-30 masonry pos-r">
+      <!-- #content container ===== -->
+      <div class="masonry-sizer col-md-6"></div>
+
+      <div class="masonry-item  w-50" ng-repeat="referee in referees">
+        <!-- #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="">
+            <div class="user-card-col">
+              <div class="user-card-title">{{referee.name}}</div>
+              <div class=" text-size-11">Victoria</div>
+              <div class=" text-size-11">{{referee.email}}</div>
+              <a href="#" id="user-action-fill">{{referee.bio}}</a>
+              <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="Referee will be unable to log in to WISP">ban
+                referee</a>
+            </div>
+          </div>
+          <div class="card-body p-0">
+            <div class="card-body-users row">
+              <div class="col-4"></div>
+              <div class="users-icons col-8">
+                <a href=""><i class="fa fa-envelope-o"></i></a>
+                <a href=""><i class="fa fa-linkedin"></i></a>
+                <a href=""><i class="fa fa-facebook"></i></a>
+                <a href=""><i class="fa fa-instagram"></i></a>
+                <a href=""><i class="fa fa-github"></i></a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+    <!-- PAGINATION-->
+    <div class="pagination">
+      <a href="#">&laquo;</a>
+      <a href="#">1</a>
+      <a class="active" href="#">2</a>
+      <a href="#">3</a>
+      <a href="#">4</a>
+      <a href="#">5</a>
+      <a href="#">6</a>
+      <a href="#">&raquo;</a>
+    </div>
+
+
+  </div>
+  <!--content container-->
+
+</main>

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;

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); })
       });

src/assets/scripts/users/users.html

@@ -8,11 +8,11 @@
       <!-- #content container ===== -->
       <div class="masonry-sizer col-md-6"></div>
 
-      <div class="masonry-item  w-50" ng-repeat="user in users">
+      <div class="masonry-item w-50" ng-repeat="user in users">
         <!-- #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"
+            <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="">
             <div class="user-card-col">
               <div class="user-card-title">{{user.fullname}}</div>

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; });