Merge pull request #47 from ExtProjNomit/sidebar-buttons

Sidebar buttons

src/assets/scripts/ads-details/ads-details.controller.js

@@ -1,4 +1,5 @@
 import moment from 'moment';
+import Avatar from 'avatar-initials';
 
 const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => {
     $scope.$on('loadUserSuccess', function (event, user) {
@@ -7,11 +8,19 @@ const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserServi
             .then((result) => {
                 $scope.ad = result;
                 window.msnry.layout();
+
+                $scope.avatar = new Avatar(document.getElementById('avatar_company_details'), {
+                    'useGravatar': false,
+                    'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}`
+                    'initial_weight': 300,
+                });
             })
             .catch((error) => { console.log(error); });
         $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); }
     });
     UserService.loadUser();
+
+
 }
 
 export default AdsDetailsController;

src/assets/scripts/ads-details/ads-details.html

@@ -16,7 +16,7 @@
         <div class="card">
           <div class="row">
             <div class="col-3 mt-4 ">
-              <img class="img-fluid ml-4 mb-4 companies-update-img" src="assets/static/images/nomit-logo.png" alt="company"
+              <img class="img-fluid ml-4 mb-4 companies-update-img" ng-src="{{avatar_company_details.element.src}}" alt="company"
                 class="avatar">
             </div>
             <div class="col-9 card-body">

src/assets/scripts/companies/companies.html

@@ -18,6 +18,7 @@
               <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="#!company/{{company._id}}" 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>

src/assets/scripts/company-details/company-details.html

@@ -14,7 +14,7 @@
             <div class="masonry-item  w-100  visible-admin visible-nomit visible-referee visible-user" ng-show="user.role !='company'">
               <div class="card item-box">
                 <div class="user-data-title">
-                  <img class="user-update-img" src="assets/static/images/user-update.png" alt="">
+                  <img class="user-update-img" ng-src="{{avatar.element.src}}" alt="">
                   <div class="testo">
                     <h5>{{ company.company.name }}</h5> {{ company.company.description }}
                   </div>

src/assets/scripts/dashboard/dashboard.controller.js

@@ -1,14 +1,14 @@
-import * as $ from 'jquery';
-import masonry from '../masonry';
+import masonry from "../masonry";
 
 /** @ngInject */
 const DashboardController = ($scope, UserService) => {
     $scope.$on('loadUserSuccess', function(event, user) {
         $scope.user = user;
+        window.dispatchEvent(window.EVENT);
     }); 
-        // tutte le funzioni del controller
-        masonry();
-
+        
+    // tutte le funzioni del controller
+    masonry();
     UserService.loadUser();
 }
 

src/assets/scripts/index.js

@@ -5,7 +5,6 @@ import './masonry';
 import './charts';
 import './popover';
 import './scrollbar';
-import './sidebar';
 import './skycons';
 import './vectorMaps';
 import './chat';

src/assets/scripts/nwSidebar/sidebar.controller.js

@@ -1,8 +1,15 @@
+import functionSearch from '../search';
+import functionSidebar from '../sidebar';
+
 /** @ngInject */
 const SidebarController = ($scope, UserService) => {
-    UserService.loadUser();
+    var executed = false;
     $scope.$on('loadUserSuccess', function (event, user) {
-        $scope.user = user;
+        if(!executed){
+            executed = true;
+            $scope.user = user;
+            functionSidebar();
+        }
     });
     UserService.loadUser();
 }

src/assets/scripts/nwTopbar/nwTopbar.html

@@ -18,14 +18,14 @@
         <input class="form-control" type="text" placeholder="Search users, companies, or anything..">
       </li>
       <li class="visible-nomit ml-2" ng-show="user.role=='nomit' || user.role=='admin'">
-        <a href="#!user_add" role="button" class="btn btn-gradient ">
+        <a href="#!user_add" role="button" class="btn btn-gradient classe-bottone">
 
           <i class="fa fa-plus pdd-right-5 text-white"></i>
           ADD NEW USER
         </a>
       </li>
       <li class="visible-referee visible-nomit visible-company ml-2" ng-show="user.role=='nomit' || user.role == 'referee' || user.role == 'company' || user.role=='admin'">
-        <a href="#!ads_add" role="button" class="btn btn-gradient">
+        <a href="#!ads_add" role="button" class="btn btn-gradient classe-bottone">
           <i class="fa fa-plus pdd-right-5 text-white"></i>
           CREATE NEW AD
         </a>
@@ -40,7 +40,7 @@
         <a href="" class="dropdown-toggle no-after peers fxw-nw ai-c lh-1" data-toggle="dropdown">
           <div class="peer">
               <span class="fsz-sm c-grey-900  visible-user.role text-capitalize" ng-show="user.role == 'admin' || user.role == 'nomit'">{{user.role}}</span>
-              <span class="fsz-sm c-grey-900  visible-user.role" ng-show="user.role == 'company' || user.role == 'user'">{{user.fullname}}</span>
+              <span class="fsz-sm c-grey-900  visible-user.role" ng-show="user.role == 'company' || user.role == 'user'">{{user.name}}</span>
           </div>
           <div class="peer mR-10 visible-nomit" ng-show="user.role == 'nomit'">
             <img class="w-2r bdrs-50p mL-10 nomit-logo-top" src="assets/static/images/nomit-logo.png" alt="">

src/assets/scripts/nwTopbar/topbar.controller.js

@@ -8,20 +8,19 @@ import masonry from '../masonry';
 const TopbarController = ($scope, UserService) => {
     $scope.$on('loadUserSuccess', function (event, user) {
         $scope.user = user;
-    });
 
-    $scope.avatar = new Avatar(document.getElementById('avatar'), {
-        'useGravatar': false,
-        'initials': 'AD', // it will be`${$scope.user.first_name[0]}${$scope.user.last_name[1]}`
-        'initial_weight': 300,
-    });
+        $scope.avatar = new Avatar(document.getElementById('avatar'), {
+            'useGravatar': false,
+            'initials': user.name[0],
+            'initial_weight': 300,
+        });
 
-    $scope.$on('needReload', function(event){
-        console.log("NEED RELOAD!");
-        functionSearch();
-        masonry();
+        $scope.$on('needReload', function(event){
+            console.log("NEED RELOAD!");
+            functionSearch();
+            masonry();
+        });
     });
-    
     UserService.loadUser();
     
 

src/assets/scripts/sidebar/index.js

@@ -1,6 +1,9 @@
 import * as $ from 'jquery';
 
-export default (function () {
+const functionSidebar = () => {
+
+
+
   // Sidebar links
   $('.sidebar .sidebar-menu li a').on('click', function () {
     const $this = $(this);
@@ -42,20 +45,6 @@ export default (function () {
     }
   });
 
-  // Sidebar Activity Class
-  const sidebarLinks = $('.sidebar').find('.sidebar-link');
-
-  sidebarLinks
-    .each((index, el) => {
-      $(el).removeClass('active');
-    })
-    .filter(function () {
-      const href = $(this).attr('href');
-      const pattern = href[0] === '/' ? href.substr(1) : href;
-      return pattern === (window.location.pathname).substr(1);
-    })
-    .addClass('active');
-
   // ٍSidebar Toggle
   $('.sidebar-toggle').on('click', e => {
     $('.app').toggleClass('is-collapsed');
@@ -73,4 +62,6 @@ export default (function () {
       window.dispatchEvent(window.EVENT);
     }, 300);
   });
-}());
+};
+
+export default functionSidebar;

src/assets/styles/nomit.scss

@@ -141,6 +141,18 @@ h1{
     color: #fff;
 }
 
+.btn-gradient.classe-bottone{
+  height: auto !important;
+  line-height: 1 !important;
+  min-height: 0 !important;
+  padding: 15px !important;
+
+  i{
+      float: left;
+      margin: -3px 0 0 14px;
+  }
+
+}
 .btn-skills{
     cursor: default !important;
     color: #501db9;