Merge pull request #51 from ExtProjNomit/avatar-company-details

General fixes

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

@@ -2,23 +2,22 @@ import moment from 'moment';
 import Avatar from 'avatar-initials';
 
 const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => {
-    $scope.$on('loadUserSuccess', function (event, user) {
-        $scope.user = user;
-        AdsDetailsService.fetchAdDetails($routeParams)
+    // $scope.$on('loadUserSuccess', function (event, user) {
+    //     $scope.user = user;
+    // });
+    // UserService.loadUser();
+    AdsDetailsService.fetchAdDetails($routeParams)
             .then((result) => {
                 $scope.ad = result;
+                console.log(result);
 
-                // $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,
-                // });
+                $scope.avatar = new Avatar(document.getElementById('ad-details-avatar'), {
+                    'useGravatar': false,
+                    'initials': result.companyname[0].toUpperCase()+result.companyname[1].toUpperCase(),
+                });
             })
             .catch((error) => { console.log(error); });
         $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); }
-    });
-    UserService.loadUser();
-
 
 }
 

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 avatar" alt="company">
+              <img class="img-fluid ml-4 mb-4 companies-update-img avatar rounded-circle" id="ad-details-avatar" alt="company" ng-src={{avatar.element.src}} />
             </div>
             <div class="col-9 card-body">
               <h2 class="card-title mt-4 mr-4">{{ ad.title }}</h2>

src/assets/scripts/app/shared.service.js

@@ -15,11 +15,9 @@ const UserService = ($cookies, $rootScope, $location) => {
         if(typeof $cookies.get('access_token') !== 'undefined' ){
 			$rootScope.$broadcast('loadUserSuccess', parseJwt( $cookies.get('access_token') ));
 			$('#modalLoginForm').modal('hide');
-		} else {
-			if($location.path() === '/signup') { $('#modalLoginForm').modal('hide'); }
+		} else if($location.path() === '/signup') { $('#modalLoginForm').modal('hide'); }
 			else { $('#modalLoginForm').modal({backdrop: 'static', keyboard: false}); }
 		}
-	}
 	
 	return serv;
 

src/assets/scripts/charts/chartJS/index.js

@@ -1,7 +1,7 @@
 import Chart from 'chart.js';
 import { COLORS } from '../../constants/colors';
 
-export default (function () {
+const chart = function () {
   // ------------------------------------------------------
   // @Line Charts
   // ------------------------------------------------------
@@ -144,4 +144,6 @@ export default (function () {
       },
     });
   }
-}())
+};
+
+export default chart;

src/assets/scripts/charts/easyPieChart/index.js

@@ -1,7 +1,7 @@
 import * as $ from 'jquery';
 import 'easy-pie-chart/dist/jquery.easypiechart.min.js';
 
-export default (function () {
+const pieChart = function () {
   if ($('.easy-pie-chart').length > 0) {
     $('.easy-pie-chart').easyPieChart({
       lineWidth:7,
@@ -13,5 +13,7 @@ export default (function () {
       },
     });
   }
-}())
+};
+
+export default pieChart;
 

src/assets/scripts/companies/companies.controller.js

@@ -9,13 +9,15 @@ const CompaniesController = ($scope, CompaniesService, UserService) => {
               $scope.companies = result;
 
                 $scope.avatar = function(index) {
-                new Avatar(document.getElementById('company'+index), {
-                    'useGravatar': false,
-                    'initials': result[index].name[0],
-                    'initial_weight': 300,
-                });
-            }
-              masonry(); 
+                    new Avatar(document.getElementById('company'+index), {
+                        'useGravatar': false,
+                        'initials': result[index].name[0],
+                        'initial_weight': 300,
+                    });
+                }
+                masonry();
+                
+                 
             })
             .catch( (error) => { console.log(error); })
       });

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

@@ -1,15 +1,17 @@
 import masonry from "../masonry";
+import chart from "../charts/chartJS";
+import pieChart from "../charts/easyPieChart";
 
 /** @ngInject */
 const DashboardController = ($scope, UserService) => {
     $scope.$on('loadUserSuccess', function(event, user) {
         $scope.user = user;
-        window.dispatchEvent(window.EVENT);
     }); 
         
     // tutte le funzioni del controller
     masonry();
-    UserService.loadUser();
+    chart();
+    pieChart();
 }
 
 export default DashboardController;

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-admin visible-referee"  ng-show="'{{user.role}}'=='nomit' || '{{user.role}}'=='referee' || '{{user.role}}'=='admin'">
+      <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' || '{{user.role}}'=='admin'">
+      <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">
@@ -82,7 +82,7 @@
               <h6 class="lh-1">New Registered Users</h6>
             </div>
             <div class="layer w-100 p-20">
-              <canvas id="line-chart" height="220" ng-show="'{{user.role}}' == 'admin'"></canvas>
+              <canvas id="line-chart" height="220" ng-show="user.role == 'admin'"></canvas>
             </div>
             <div class="layer bdT p-20 w-100">
               <div class="peers ai-c jc-c gapX-20">
@@ -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' || '{{user.role}}'=='admin'">
+      <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">
 
@@ -261,7 +261,7 @@
 
 
       <!-- #USERS ===== -->
-      <div class="masonry-item col-12 visible-user" ng-show="'{{user.role}}'=='user'">
+      <div class="masonry-item col-12 visible-user" ng-show="user.role == 'user'">
         <!-- #suggested ads ==================== -->
         <div class="row gap-30">
 

src/assets/scripts/logout/controller.js

@@ -2,13 +2,13 @@ import masonry from "../masonry";
 
 const LogoutController = ($scope, $location, LogoutService, $cookies, UserService) => {
 	$scope.userLogged = false;		
-	
+	UserService.loadUser();
 	$scope.userLogout = async () => {
 		await LogoutService.logoutUserService($scope.user)
 			.then((result)=>{ 
 				$cookies.remove('access_token');
-				UserService.loadUser();
 				$location.path('/');
+				$scope.$emit('needReload');
 				masonry();
 			})
 			.catch((err)=>{ console.log(err); }) 

src/assets/scripts/nwSidebar/nwSidebar.html

@@ -211,7 +211,7 @@
     <!-- ### $Sidebar Menu ### -->
     <ul class="sidebar-menu scrollable pos-r">
       <!-- Dashboard - show to all users -->
-      <li class="nav-item mT-30 active"  ng-show="'{{user.role}}'==='nomit' || '{{user.role}}'==='referee'">
+      <li class="nav-item mT-30 active"  ng-show="user.role == 'nomit' || user.role == 'referee'">
         <a class="sidebar-link" href="/">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-bar-chart text-white"></i>
@@ -229,7 +229,7 @@
         </a>
       </li>
       <!-- Admin no, everyone sees their own -->
-      <li class="nav-item" ng-show="'{{user.role}}'==='nomit' || '{{user.role}}'==='referee' || '{{user.role}}'==='company'  || '{{user.role}}'==='user'">
+      <li class="nav-item" ng-show="user.role == 'nomit' || user.role == 'referee' || user.role == 'company'  || user.role == 'user'">
         <a class='sidebar-link' href="#!profile">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-user-circle-o text-white"></i>
@@ -238,7 +238,7 @@
         </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'">
         <a class='sidebar-link' href="#!users">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-users text-white"></i>
@@ -247,7 +247,7 @@
         </a>
       </li>
       <!-- Admin, Nomit & referee see all companies  -->
-      <li class="nav-item" ng-show="'{{user.role}}'==='admin' || '{{user.role}}'==='nomit' || '{{user.role}}'==='referee'">
+      <li class="nav-item" ng-show="user.role == 'admin' || user.role == 'nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="#!companies">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-building text-white"></i>
@@ -265,7 +265,7 @@
         </a>
       </li>
       <!-- Admin, Nomit and Referee have access -->
-      <li class="nav-item" ng-show="'{{user.role}}'==='admin' || '{{user.role}}'==='nomit' || '{{user.role}}'==='referee'">
+      <li class="nav-item" ng-show="user.role == 'admin' || user.role == 'nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="#!reports">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-calendar-check-o text-white"></i>
@@ -274,7 +274,7 @@
         </a>
       </li>
       <!-- Everybody besides Admin have access -->
-      <li class="nav-item" ng-show="'{{user.role}}'!=='admin'">
+      <li class="nav-item" ng-show="user.role != 'admin'">
         <a class='sidebar-link' href="#!history">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-history text-white"></i>

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

@@ -3,6 +3,7 @@ import masonry from '../masonry';
 
 /** @ngInject */
 const SidebarController = ($scope, UserService) => {
+    UserService.loadUser();
     var executed = false;
     $scope.$on('loadUserSuccess', function (event, user) {
         if(!executed){
@@ -10,9 +11,11 @@ const SidebarController = ($scope, UserService) => {
             $scope.user = user;
             functionSidebar();
         }
+    });
+
+    $scope.$on('needReload', function(event){
         masonry();
     });
-    UserService.loadUser();
 }
 
 export default SidebarController;

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

@@ -4,8 +4,8 @@ import Avatar from 'avatar-initials';
 import masonry from '../masonry';
 
 /** @ngInject */
-
 const TopbarController = ($scope, UserService) => {
+    UserService.loadUser();
     $scope.$on('loadUserSuccess', function (event, user) {
         $scope.user = user;
 
@@ -14,16 +14,13 @@ const TopbarController = ($scope, UserService) => {
             'initials': user.name[0],
             'initial_weight': 300,
         });
-
-        $scope.$on('needReload', function(event){
-            console.log("NEED RELOAD!");
-            functionSearch();
-            masonry();
-        });
     });
-    UserService.loadUser();
-    
 
+    $scope.$on('needReload', function(event){
+        console.log("NEED RELOAD!");
+        functionSearch();
+        masonry();
+    });
 }
 
 export default TopbarController;

src/assets/scripts/users/users.controller.js

@@ -1,28 +1,27 @@
 import Avatar from 'avatar-initials';
 import masonry from '../masonry';
+import * as $ from 'jquery';
 
 /** @ngInject */
 const UsersController = ($scope, UsersService, UserService) => {
-    $scope.$on('loadUserSuccess', async (event, user) => {
-        $scope.user = user;
+    $(document).ready( async() =>{
         await UsersService.fetchUsersService()
-            .then( (result) => { 
-                $scope.users = result;
-                
-                $scope.avatar = function(index) {
-                    const first_name = result[index].personal.first_name[0];
-                    const last_name = result[index].personal.last_name[0];
-                    new Avatar(document.getElementById('user'+index), {
-                        'useGravatar': false,
-                        'initials': first_name + last_name,
-                        'initial_weight': 300,
-                    });
-                }
-                masonry();
-            })
-          .catch( (error) => { console.log(error); })
-      });
-      UserService.loadUser();
+        .then( (result) => { 
+            $scope.users = result;
+            
+            $scope.avatar = function(index) {
+                const first_name = result[index].personal.first_name[0];
+                const last_name = result[index].personal.last_name[0];
+                new Avatar(document.getElementById('user'+index), {
+                    'useGravatar': false,
+                    'initials': first_name + last_name,
+                    'initial_weight': 300,
+                });
+            }
+            masonry();
+        })
+      .catch( (error) => { console.log(error); })
+    });
 }
 
 export default UsersController;