From 40efa03db556e7c37d2e4852ce8e77a33e1e90e6 Mon Sep 17 00:00:00 2001
From: Francesca Sperati <6431@ait.nsw.edu.au>
Date: Fri, 8 Feb 2019 19:47:54 +1100
Subject: [PATCH] referee user-add

---
 src/assets/scripts/dashboard/dashboard.html   |  10 +-
 src/assets/scripts/nwSidebar/nwSidebar.html   |   2 +-
 .../scripts/user-add/user-add.controller.js   |  12 +-
 src/assets/scripts/user-add/user-add.html     |  65 +++--
 src/assets/scripts/users/users.html           |   6 +-
 src/users.html                                | 240 +++++++++---------
 6 files changed, 178 insertions(+), 157 deletions(-)

diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html
index 902f7dd..0f3c7cd 100644
--- a/src/assets/scripts/dashboard/dashboard.html
+++ b/src/assets/scripts/dashboard/dashboard.html
@@ -9,7 +9,7 @@
       <!-- #content container ===== -->
       <div class="masonry-sizer col-md-6"></div>
       <!-- #NOMIT & REFEREE ===== -->
-      <div class="masonry-item  w-100  visible-nomit visible-referee"  ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee'">
+      <div class="masonry-item  w-100  visible-nomit visible-admin visible-referee"  ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='admin'">
         <!-- #First line ========= -->
 
         <div class="row gap-20">
@@ -74,7 +74,7 @@
           </div>
         </div>
       </div>
-      <div class="masonry-item col-12 visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee'">
+      <div class="masonry-item col-12 visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='admin'">
         <!-- #New Registered Users ==================== -->
         <div class="bd bgc-white item-box">
           <div class="layers">
@@ -97,7 +97,7 @@
           </div>
         </div>
       </div>
-      <div class="masonry-item w-100 visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee'">
+      <div class="masonry-item w-100 visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='admin'">
         <!-- #Successful Mathches & #Nationality ==================== -->
         <div class="row gap-20">
           <div class="col-3 ">
@@ -189,12 +189,12 @@
       </div>
 
       <!-- #COMPANY / REFEREE / NOMIT ===== -->
-      <div class="masonry-item content-title w-100 visible-company visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='company'">
+      <div class="masonry-item content-title w-100 visible-company visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='company' ">
         <div class="col-8 ml-1 mb-3">
           Your Ads
         </div>
       </div>
-      <div class="masonry-item col-12 visible-company visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='company'">
+      <div class="masonry-item col-12 visible-company visible-nomit visible-referee" ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='company' ">
         <!-- #suggested ads ==================== -->
         <div class="row gap-30">
 
diff --git a/src/assets/scripts/nwSidebar/nwSidebar.html b/src/assets/scripts/nwSidebar/nwSidebar.html
index 9c8bfda..5720e5d 100644
--- a/src/assets/scripts/nwSidebar/nwSidebar.html
+++ b/src/assets/scripts/nwSidebar/nwSidebar.html
@@ -225,7 +225,7 @@
           <span class="icon-holder">
             <i class="c-white-500 fa fa-briefcase text-white"></i>
           </span>
-          <span class="title text-white font-weight-bold">My Ads</span>
+          <span class="title text-white font-weight-bold">Ads</span>
         </a>
       </li>
       <!-- Admin no, everyone sees their own -->
diff --git a/src/assets/scripts/user-add/user-add.controller.js b/src/assets/scripts/user-add/user-add.controller.js
index c0175fd..b67e3e3 100644
--- a/src/assets/scripts/user-add/user-add.controller.js
+++ b/src/assets/scripts/user-add/user-add.controller.js
@@ -1,11 +1,21 @@
 /** @ngInject */
-const UserAddController = ($scope) => {
+const UserAddController = ($scope,UserService) => {
     $scope.$on('loadUserSuccess', function (event, user) {
         $scope.user = user;
 
         $scope.classifications = ['class1', 'class2'];
         $scope.skills = ['s1', 's2'];
 
+        $scope.tab = 1;
+
+        $scope.setTab = (newTab) => {
+            $scope.tab = newTab;
+        }
+
+        $scope.isSet = (tabNum) => {
+            return $scope.tab === tabNum;
+        }
+
     });
     UserService.loadUser();
   }
diff --git a/src/assets/scripts/user-add/user-add.html b/src/assets/scripts/user-add/user-add.html
index 6113a38..e6895eb 100644
--- a/src/assets/scripts/user-add/user-add.html
+++ b/src/assets/scripts/user-add/user-add.html
@@ -2,7 +2,7 @@
         <div id='mainContent row'>
           <div class="content-title mT-60">
             <div class="ml-1 mb-3">
-              Add a new User / Company
+              Add a new User / Referee
             </div> 
           </div>  
 
@@ -13,17 +13,17 @@
 
               <!-- Nav tabs -->
               <ul class="nav nav-tabs">
-                  <li class="nav-item">
-                    <a class="nav-link active ciao" data-toggle="tab" href="#newuser">Regular User</a>
+                  <li ng-class="{active: isSet(1)} ">
+                    <a href class="nav-link active" role="button" ng-click="setTab(1)" data-toggle="tab">Regular User</a>
                   </li>
-                  <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#newreferee">Company</a>
+                  <li ng-class="{active: isSet(2)} ">
+                    <a href class="nav-link"  role="button" ng-click="setTab(2)" data-toggle="tab">Referee</a>
                   </li>
                 </ul>
                 
                 <!-- Tab panes -->
-                <div class="tab-content create-new-user-tab">
-                  <div class="tab-pane tab-new-user container active" id="newuser">
+                <div class="tab-content create-new-user-tab" >
+                  <div class="tab tab-pane tab-new-user container active" ng-show="isSet(1)">
                     <div class="create-new-user-tab">
                       <!--Regular user-->
                       <div class="card card-new-user">
@@ -108,38 +108,40 @@
                                 </div>
                               </div>  
 
-                              <div class="row ">
+                              <div class="row mT-6">
                                 
                                 <div class="col-4 profile-form-row">
-                                    <h5 class="card-title mt-4 ml-4 mr-4">Main Classification:</h5>
+                                    <h9 class="card-title mt-6 mr-4">Main Classification:</h9>
                                     <input type="text" class="form-control" placeholder="Industry" required>
                                 </div>
                                 <div class="col-4 profile-form-row">
-                                    <h5 class="card-title mt-4 ml-4 mr-4">Skills:</h5>
+                                    <h9 class="card-title mt-6 mr-4">Skills:</h9>
                                     <input type="text" class="form-control" placeholder="Preofessions" value="" >
                                 </div>
                               </div>
-                              <div class="row profile-form-row">
-                                  <div class="mt-4">
-                                    <div class=" ml-4 mb-4 btn btn-industry mt-4">Graphic Design</div>
-                                    <div class="ml-1 mb-4 btn btn-skills">Adobe Creaetive CC</div>
-                                    <div class="ml-1 mb-4 btn btn-skills">Illustration</div>
+                              <div class="row profile-form-row mt-0 ">
+                                  <div class="mt-3 mb-4">
+                                    <div class="ml-4  btn btn-industry mt-4">Graphic Design</div>
+                                    <div class="ml-1 btn btn-skills">Adobe Creaetive CC</div>
+                                    <div class="ml-1btn btn-skills">Illustration</div>
                                   </div>
-                                </div>
+                              </div>
+                              <div class="row mT-6">
+                                  <div class="col-4  profile-form-row">
+                                      <h9 class="card-title mt-6 mr-4">Password:</h9>
+                                      <input type="password" class="form-control" placeholder="****" value="" >
+                                  </div>
+                                  <div class="col-4  profile-form-row">
+                                      <h9 class="card-title mt-6 mr-4">Confirm Password</h9>
+                                      <input type="password" class="form-control" placeholder="Repete password" value="" >
+                                  </div>
+                              </div>
 
                               <div class="row ">
-                                <div class="col-5 profile-form-row">
+                                <div class=" profile-form-row">
                                   <button type="button" class="btn btn-gradient ">UPDATE</button>
                                   <button type="button" class="btn btn-border ">CANCEL</button>
                                 </div>
-                                <div class="col-7 profile-form-row">
-
-                                  <form action="upload.asp" method="post" enctype="multipart/form-data">
-                                    <h9 class="cv">Curriculum </h9>
-                                    <input class="cv" type="file" name="file1" multiple>
-                                    <input type="submit" class="btn btn-cv" value="Upload">
-                                  </form>
-                                </div>
 
                               </div>
 
@@ -150,7 +152,7 @@
                         </div>
                     </div>
                   </div>
-                  <div class="tab-pane container fade" id="newreferee">
+                  <div class="tab tab-pane container active" ng-show="isSet(2)">
                       <div class="create-new-user-tab">
                           <!--Referee-->
                           <div class="card card-new-user">
@@ -243,6 +245,17 @@
                                           <input type="text" class="form-control" placeholder="Linkedin" value="https://www.linkedin.com/company/drs-defense-solutions-llc/life/">
                                         </div>
                                       </div>
+
+                                      <div class="row mT-6">
+                                          <div class="col-4  profile-form-row">
+                                              <h9 class="card-title mt-6 mr-4">Password:</h9>
+                                              <input type="password" class="form-control" placeholder="****" value="" >
+                                          </div>
+                                          <div class="col-4  profile-form-row">
+                                              <h9 class="card-title mt-6 mr-4">Confirm Password</h9>
+                                              <input type="password" class="form-control" placeholder="Repete password" value="" >
+                                          </div>
+                                      </div>
                   
                                       <button type="button" class="btn btn-gradient ">UPDATE</button>
                                       <button type="button" class="btn btn-border ">CANCEL</button>
diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html
index ee8c21d..5f5178b 100644
--- a/src/assets/scripts/users/users.html
+++ b/src/assets/scripts/users/users.html
@@ -38,8 +38,10 @@
         </div>
       </div>
 
+
+    </div>
     <!-- PAGINATION-->
-    <div class="pagination">
+    <div class="pagination masonry-item  w-50">
       <a href="#">&laquo;</a>
       <a href="#">1</a>
       <a class="active" href="#">2</a>
@@ -50,8 +52,6 @@
       <a href="#">&raquo;</a>
     </div>
 
-
-  </div>
   <!--content container-->
 
 </main>
diff --git a/src/users.html b/src/users.html
index 0512618..1ea954e 100644
--- a/src/users.html
+++ b/src/users.html
@@ -106,138 +106,136 @@
           <div id='mainContent row'>
               <div class="row content-title mT-60">
                   <h1 class="col-8 ml-1 mb-4">Users</h1>            
-                </div>
+              </div>
 
-            <div class=" gap-30 masonry pos-r"> <!-- #content container ===== -->
-              <div class="masonry-sizer col-md-6"></div>
+              <div class=" gap-30 masonry pos-r"> <!-- #content container ===== -->
+                <div class="masonry-sizer col-md-6"></div>
 
                 <div class="masonry-item  w-50"> <!-- #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">David James</div>
-                                <div class=" text-size-11">Victoria</div> 
-                                <div class=" text-size-11">Mobile: 0414987654</div>
-                                <a href="#" id="user-action-fill">view user  profile</a>
-                                <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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 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">David James</div>
+                                  <div class=" text-size-11">Victoria</div> 
+                                  <div class=" text-size-11">Mobile: 0414987654</div>
+                                  <a href="#" id="user-action-fill">view user  profile</a>
+                                  <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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 class="masonry-item  w-50"> <!-- #second user ========= -->
+                <div class="card item-box" >
+                  <div class="user-data-title container">
+                          <img class="user-card-img  rounded-circle"  src="https://content.invisioncic.com/Mseclife/monthly_2017_08/C.png.2537be5c760ba5232ee4716f77d13c51.png" alt="">
+                          <div class="user-card-col">
+                              <div class="user-card-title">Christina Jenna</div>
+                              <div class=" text-size-11">Victoria</div> 
+                              <div class=" text-size-11">Mobile: 0414987654</div>
+                              <a href="#" id="user-action-fill">view user profile</a>
+                                  <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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 class="masonry-item  w-50"> <!-- #second user ========= -->
-              <div class="card item-box" >
-                <div class="user-data-title container">
-                        <img class="user-card-img  rounded-circle"  src="https://content.invisioncic.com/Mseclife/monthly_2017_08/C.png.2537be5c760ba5232ee4716f77d13c51.png" alt="">
-                        <div class="user-card-col">
-                            <div class="user-card-title">Christina Jenna</div>
-                            <div class=" text-size-11">Victoria</div> 
-                            <div class=" text-size-11">Mobile: 0414987654</div>
-                            <a href="#" id="user-action-fill">view user profile</a>
-                                <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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 class="masonry-item  w-50"> <!-- #third user ========= -->
-      <div class="card item-box" >
-        <div class="user-data-title container">
-                <img class="user-card-img  rounded-circle"  src="https://content.invisioncic.com/Mseclife/monthly_2017_08/C.png.2537be5c760ba5232ee4716f77d13c51.png" alt="">
-                <div class="user-card-col">
-                    <div class="user-card-title">Christina Jenna</div>
-                    <div class=" text-size-11">Victoria</div> 
-                    <div class=" text-size-11">Mobile: 0414987654</div>
-                    <a href="#" id="user-action-fill">view user profile</a>
-                                <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</a>
-                </div>  
+                <div class="masonry-item  w-50"> <!-- #third user ========= -->
+        <div class="card item-box" >
+          <div class="user-data-title container">
+                  <img class="user-card-img  rounded-circle"  src="https://content.invisioncic.com/Mseclife/monthly_2017_08/C.png.2537be5c760ba5232ee4716f77d13c51.png" alt="">
+                  <div class="user-card-col">
+                      <div class="user-card-title">Christina Jenna</div>
+                      <div class=" text-size-11">Victoria</div> 
+                      <div class=" text-size-11">Mobile: 0414987654</div>
+                      <a href="#" id="user-action-fill">view user profile</a>
+                                  <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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 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 class="masonry-item  w-50"> <!-- #fourth 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">David James</div>
-                <div class=" text-size-11">Victoria</div> 
-                <div class=" text-size-11">Mobile: 0414987654</div>
-                <a href="#" id="user-action-fill">view user profile</a>
-                <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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>
+                <div class="masonry-item  w-50"> <!-- #fourth 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">David James</div>
+                              <div class=" text-size-11">Victoria</div> 
+                              <div class=" text-size-11">Mobile: 0414987654</div>
+                              <a href="#" id="user-action-fill">view user profile</a>
+                              <a href="#" id="user-action-border" data-toggle="tooltip" data-placement="bottom" title="User will be unable to log in to WISP">ban user</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>
 
         <!-- ### $App Screen Footer ### -->
         </div><!-- page-container -->