From f13d1c5f444489f485cc423ee1670587d2b86414 Mon Sep 17 00:00:00 2001
From: Francesca Sperati <6431@ait.nsw.edu.au>
Date: Wed, 13 Feb 2019 11:24:44 +1100
Subject: [PATCH] minor fixes

---
 .../scripts/dashboard/dashboard.controller.js |  15 +-
 src/assets/scripts/dashboard/dashboard.html   | 164 +++++-------------
 src/assets/scripts/nwSidebar/nwSidebar.html   |   4 +-
 src/assets/styles/nomit.scss                  |   2 +-
 .../styles/spec/components/pageContainer.scss |   2 +-
 5 files changed, 65 insertions(+), 122 deletions(-)

diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js
index a6e87f8..14d06ce 100644
--- a/src/assets/scripts/dashboard/dashboard.controller.js
+++ b/src/assets/scripts/dashboard/dashboard.controller.js
@@ -3,10 +3,20 @@ import chart from "../charts/chartJS";
 import pieChart from "../charts/easyPieChart";
 
 /** @ngInject */
-const DashboardController = ($scope, UserService) => {
+const DashboardController = ($scope, AdsService, UserService) => {
     $scope.$on('loadUserSuccess', function(event, user) {
         $scope.user = user;
     }); 
+
+    //link al ad-detail
+    $scope.$on('loadUserSuccess', async (event, user) => {
+        await AdsService.fetchAdsService()
+          .then( (result) => { $scope.ads = result; })
+          .catch( (error) => { console.log(error); })
+    });
+
+
+
         
     // tutte le funzioni del controller
     UserService.loadUser();
@@ -15,4 +25,5 @@ const DashboardController = ($scope, UserService) => {
     pieChart();
 }
 
-export default DashboardController;
\ No newline at end of file
+export default DashboardController;
+
diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html
index a6c280e..e1d52d0 100644
--- a/src/assets/scripts/dashboard/dashboard.html
+++ b/src/assets/scripts/dashboard/dashboard.html
@@ -202,65 +202,34 @@
           <!-- #syour ads ==================== -->
           <div class="row gap-30">
 
-            <!-- # ad n 1 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
-                </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
-                  </div>
-                </a>
-              </div>
-            </div>
-
-            <!-- # ad n 2 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
-                </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
+            <!-- # ads ==================== -->
+            <div class='col-md-4  col-sm-12' ng-repeat="ad in ads">
+                <div class="card item-box">
+                  <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
+                  <div class="card-body">
+                    <div class="card-title d-flex  mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;">
+                      <h4> {{ ad.title }} </h4>
+                      <div>
+                        <a class='' href="" ng-show="user.role =='user'">
+                          <span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span>
+                        </a>
+                      </div>
+                    </div>
+                    <p class="card-text mx-2"><small class="text-muted">{{ ad.description }}</small></p>
+                    <div class="star-rating-display ml-2 mb-2" data-rating="2"><span class="is-vishidden">TBD</span></div>
+                    <p class="card-text mx-2 mb-2"> {{ ad.companyintro }} </p>
                   </div>
-                </a>
-              </div>
-            </div>
-            <!-- # ad n 3 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
+                  <a href="/#!/ads/{{ad._id}}">
+                    <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
+                      VIEW MORE <i class=" fa fa-chevron-right ml-1" style="color:#fff; font-size: 11px; font-weight: bolder;"></i>
+                    </div>
+                  </a>
                 </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
-                  </div>
-                </a>
               </div>
-            </div>
+
           </div>
+
+
         </div>
 
 
@@ -269,74 +238,35 @@
           <!-- #suggested ads ==================== -->
           <div class="row gap-30">
 
-            <!-- # ad n 1 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                    <div>
-                      <a class='' href=""> <span class="icon-holder" style="color:#EE38A4"><i class="fa fa-heart"></i></span></a>
-                    </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
-                </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
-                  </div>
-                </a>
-              </div>
-            </div>
-
-            <!-- # ad n 2 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                    <div>
-                      <a class='' href=""> <span class="icon-holder" style="color:#EE38A4"><i class="fa fa-heart"></i></span></a>
+            <!-- # ads ==================== -->
+            <div class='col-md-4  col-sm-12' ng-repeat="ad in ads">
+                <div class="card item-box">
+                  <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
+                  <div class="card-body">
+                    <div class="card-title d-flex  mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;">
+                      <h4> {{ ad.title }} </h4>
+                      <div>
+                        <a class='' href="" ng-show="user.role =='user'">
+                          <span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span>
+                        </a>
+                      </div>
                     </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
-                </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
+                    <p class="card-text mx-2"><small class="text-muted">{{ ad.description }}</small></p>
+                    <div class="star-rating-display ml-2 mb-2" data-rating="2"><span class="is-vishidden">TBD</span></div>
+                    <p class="card-text mx-2 mb-2"> {{ ad.companyintro }} </p>
                   </div>
-                </a>
-              </div>
-            </div>
-            <!-- # ad n 3 ==================== -->
-            <div class='col-md-4'>
-              <div class="card item-box">
-                <img class="card-img-top" src="assets/static/images/bg.jpg" alt="Card image cap">
-                <div class="card-body">
-                  <h5 class="card-title d-flex" style="justify-content:space-between; margin-bottom:1px; font-weight: bolder; text-align: left;">
-                    <div>Adv title </div>
-                    <div>
-                      <a class='' href=""> <span class="icon-holder" style="color:#EE38A4"><i class="fa fa-heart"></i></span></a>
+                  <a href="/#!/ads/{{ad._id}}">
+                    <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
+                      VIEW MORE <i class=" fa fa-chevron-right ml-1" style="color:#fff; font-size: 11px; font-weight: bolder;"></i>
                     </div>
-                  </h5>
-                  <h5 class="card-title" style="font-size:11px; margin-top: 1px;">Adv title</h5>
-                  <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
-                    card's content.</p>
+                  </a>
                 </div>
-                <a href="ads_1.html">
-                  <div class="card-body view-more-btn" style="color:#fff; background-color:#EE38A4;  font-weight: bolder; text-align: center; margin: 0px">
-                    VIEW MORE <i class=" ti-angle-right" style="color:#fff;  font-weight: bolder;"></i>
-                  </div>
-                </a>
               </div>
-            </div>
+
           </div>
+
+
+
         </div>
       </div>
     </div>
diff --git a/src/assets/scripts/nwSidebar/nwSidebar.html b/src/assets/scripts/nwSidebar/nwSidebar.html
index aead209..04c6f16 100644
--- a/src/assets/scripts/nwSidebar/nwSidebar.html
+++ b/src/assets/scripts/nwSidebar/nwSidebar.html
@@ -238,7 +238,9 @@
         </a>
       </li>
       <!-- Admin, Referee and Nomit see everything -->
-      <li class="nav-item" ng-show="user.role != 'user'">
+      <!-- <li class="nav-item" ng-show="user.role != 'user'">-->
+      <!-- company can't see users, only the users who applied for its ads-->  
+      <li class="nav-item" ng-show="user.role == 'nomi' || user.role == 'referee' || user.role == 'admin'">
         <a class='sidebar-link' href="#!users">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-users text-white"></i>
diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss
index 6f3087d..d12c113 100644
--- a/src/assets/styles/nomit.scss
+++ b/src/assets/styles/nomit.scss
@@ -17,7 +17,7 @@
 .main-content{
     padding-left: 80px; 
     padding-right: 80px;
-    padding-bottom: 100px;
+    padding-bottom: 20px;
 }
 
 .mx-auto {
diff --git a/src/assets/styles/spec/components/pageContainer.scss b/src/assets/styles/spec/components/pageContainer.scss
index 705f7b9..a3910dc 100755
--- a/src/assets/styles/spec/components/pageContainer.scss
+++ b/src/assets/styles/spec/components/pageContainer.scss
@@ -38,7 +38,7 @@
 
 .main-content {
   padding: 85px 20px 20px;
-  min-height: calc(100vh - 61px);
+  min-height: calc(100vh - 150px );
 
   @include to($breakpoint-md) {
     padding: 85px 5px 5px;