topbarfix and siddebarbuttons

src/assets/scripts/app/index.js

@@ -20,6 +20,7 @@ angular.module('NomitWisp',
         'nwUsers',
         'nwUserDetails',
         'nwCompanies',
+        'nwCompanyDetails',
         'nwReferees',
         'nwReports',
         ngRoute
@@ -72,6 +73,10 @@ angular.module('NomitWisp',
             controller: 'CompaniesController', 
             templateUrl: 'assets/scripts/companies/companies.html' 
         })
+        .when('/company/:id', { 
+            controller: 'CompanyDetailsController', 
+            templateUrl: 'assets/scripts/company-details/company-details.html' 
+        })
         .when('/referees', { 
             controller: 'RefereesController', 
             templateUrl: 'assets/scripts/referees/referees.html' 

src/assets/scripts/companies/companies.html

@@ -18,7 +18,8 @@
               <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-detail" id="user-action-fill">view company profile</a>
+
+              <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>
             </div>

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

@@ -0,0 +1,12 @@
+/** @ngInject */
+const CompanyDetailsController = ($scope, $routeParams, CompanyDetailsService, UserService) => {
+    $scope.$on('loadUserSuccess', function (event, user) {
+        $scope.user = user;
+        CompanyDetailsService.fetchCompanyDetails($routeParams)
+          .then( (result) => { console.log(result); $scope.company = result; })
+          .catch( (error) => { console.log(error); })
+      });
+      UserService.loadUser();
+}
+
+export default CompanyDetailsController;

src/assets/scripts/company-details/company-details.service.js

@@ -0,0 +1,13 @@
+/** @ngInject */
+const CompanyDetailsService = ($http) => {
+    let serv = {};
+
+    serv.fetchCompanyDetails = (route) => {
+        return $http.get(`${process.env.RESTAPI_URL}/api/user/${route.id}`)
+            .then( (result) => { console.log(result); return result.data; })
+            .catch( (error) => { return error; })
+    }
+    return serv;
+}
+
+export default CompanyDetailsService;

src/assets/scripts/company-details/index.js

@@ -0,0 +1,11 @@
+import * as angular from 'angular';
+import ngRoute from 'angular-route';
+import CompanyDetailsController from './company-details.controller';
+import CompanyDetailsService from './company-details.service';
+
+angular.module('nwCompanyDetails', [ngRoute])
+    .config(['$httpProvider', function($httpProvider) {
+        $httpProvider.defaults.withCredentials = true;
+    }])
+    .controller(CompanyDetailsController.name, CompanyDetailsController)
+    .factory(CompanyDetailsService.name, CompanyDetailsService);

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

@@ -34,5 +34,6 @@ import './companies';
 import './referees';
 import './reports';
 import './user-details';
+import './company-details';
 
 import './app';

src/assets/scripts/nwTopbar/nwTopbar.html

@@ -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();