Merge pull request #40 from ExtProjNomit/masonry-fixes

Added fix for Masonry

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

@@ -1,10 +1,14 @@
+import masonry from '../masonry';
 /** @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); })
+            .then( (result) => { 
+              $scope.companies = result;
+              masonry(); 
+            })
+            .catch( (error) => { console.log(error); })
       });
       UserService.loadUser();
 }

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

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

src/assets/scripts/dashboard/dashboard.html

@@ -1,4 +1,4 @@
-<main class='main-content bgc-grey-300' ng-controller="DashboardController">
+<main class='main-content bgc-grey-300' ng-controller="DashboardController" id="dashboard">
   <div id='mainContent row'>
     <div class="row content-title mT-60">
       <div class="col-8 ml-1 mb-4">

src/assets/scripts/logout/controller.js

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

src/assets/scripts/masonry/index.js

@@ -1,14 +1,16 @@
 import * as $ from 'jquery';
 import Masonry from 'masonry-layout';
 
-export default (function () {
-  window.addEventListener('load', () => {
+const masonry = function () {
+  $(document).ready( () => {
     if ($('.masonry').length > 0) {
-      window.msnry = new Masonry('.masonry', {
+      new Masonry('.masonry', {
         itemSelector: '.masonry-item',
         columnWidth: '.masonry-sizer',
         percentPosition: true,
       });
     }
   });
-}());
+}
+
+export default masonry;

src/assets/scripts/nwTopbar/nwTopbar.html

@@ -1,5 +1,5 @@
 <!-- ### $Topbar ### -->
-<div class="header navbar topbar">
+<div class="header navbar topbar" id="topbar">
   <div class="header-container">
     <!-- #LEFT ============================ -->
     <ul class="nav-left">
@@ -8,23 +8,23 @@
           <i class="ti-menu"></i>
         </a>
       </li>
-      <li class="search-box visible-nomit visible-referee" ng-show="'{{user.role}}'==='admin' || '{{user.role}}'==='nomit' || '{{user.role}}' == 'referee'">
+      <li class="search-box visible-nomit visible-referee" ng-show="user.role == 'admin' || user.role == 'nomit' || user.role == 'referee'">
         <a class="search-toggle no-pdd-right" href="javascript:void(0);">
           <i class="search-icon ti-search pdd-right-10"></i>
           <i class="search-icon-close ti-close pdd-right-10"></i>
         </a>
       </li>
-      <li class="search-input visible-referee visible-nomit" ng-show="'{{user.role}}'==='nomit' || '{{user.role}}' == 'referee'">
+      <li class="search-input visible-referee visible-nomit" ng-show="user.role == 'nomit' || user.role == 'referee'">
         <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'">
+      <li class="visible-nomit ml-2" ng-show="user.role=='nomit' || user.role=='admin'">
         <a href="#!user_add" role="button" class="btn btn-gradient ">
 
           <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'">
+      <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">
           <i class="fa fa-plus pdd-right-5 text-white"></i>
           CREATE NEW AD
@@ -39,13 +39,16 @@
       <li class="dropdown">
         <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 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>
           </div>
-          <div class="peer mR-10 visible-nomit" ng-show="'{{user.role}}'==='nomit'">
+          <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="">
           </div>
-          <div id="avatar" class="peer mR-10 visible-referee visible-user visible-company" ng-show="'{{user.role}}'!='nomit'">
+          <div class="peer mR-10 visible-nomit" ng-show="user.role == 'admin'">
+            <img class="w-2r bdrs-50p mL-10 nomit-logo-top" src="assets/static/images/icon_admin.png" alt="">
+          </div>
+          <div id="avatar" class="peer mR-10 visible-referee visible-user visible-company" ng-show="user.role != 'nomit' && user.role != 'admin'">
             <img ng-src="{{avatar.element.src}}" class="w-3r bdrs-50p mL-10"/>
           </div>
 

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

@@ -1,5 +1,7 @@
+import * as $ from 'jquery';
 import functionSearch from '../search';
 import Avatar from 'avatar-initials';
+import masonry from '../masonry';
 
 /** @ngInject */
 
@@ -7,20 +9,22 @@ 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.$on('needReload', function(event){
         console.log("NEED RELOAD!");
-        // Refresh topbar...
-    })
-
+        functionSearch();
+        masonry();
+    });
+    
     UserService.loadUser();
-    functionSearch();
+    
+
 }
 
 export default TopbarController;

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

@@ -1,4 +1,5 @@
 import Avatar from 'avatar-initials';
+import masonry from '../masonry';
 
 /** @ngInject */
 const UsersController = ($scope, UsersService, UserService) => {
@@ -15,8 +16,9 @@ const UsersController = ($scope, UsersService, UserService) => {
                         'useGravatar': false,
                         'initials': first_name + last_name,
                         'initial_weight': 300,
-                    }); 
-                }                
+                    });
+                }
+                masonry();
             })
           .catch( (error) => { console.log(error); })
       });

src/assets/scripts/users/users.html

@@ -1,4 +1,4 @@
-<main class='main-content' ng-controller="UsersController">
+<main class='main-content' ng-controller="UsersController" id="users">
   <div id='mainContent row'>
     <div class="row content-title mT-60">
       <h1 class="col-8 ml-1 mb-4">Users</h1>