progress to refresh

src/assets/scripts/dashboard/dashboard.html

@@ -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">

src/assets/scripts/logout/controller.js

@@ -6,6 +6,7 @@ const LogoutController = ($scope, $location, LogoutService, $cookies, UserServic
         $cookies.remove('access_token');
 		UserService.loadUser();
 		$location.path('/');
+		window.location.reload(false);
 	}
 };
 

src/assets/scripts/nwLogin/controller.js

@@ -2,7 +2,7 @@ const LoginController = ($scope, $cookies, $location, LoginService, UserService)
 
 	// load the user if already logged in, for all controllers
 	UserService.loadUser();
-	
+
 	$scope.userLogin = async (isValid) => {
 		if(isValid){
 			let result = await LoginService.loginUserService($scope.user); 
@@ -12,7 +12,10 @@ const LoginController = ($scope, $cookies, $location, LoginService, UserService)
 				$cookies.put('access_token', result.token);
 				UserService.loadUser();
 				$location.path('/');
-				$scope.$apply();
+				// temporary solution
+				//window.location.reload(false);
+				$scope.$emit('needReload');
+				
 			} else {
 				alert(result);
 			}

src/assets/scripts/nwLogin/index.js

@@ -12,6 +12,6 @@ angular.module('NomitWisp-Login', [ngCookies])
 function nwLogin(){
     return {
         restrict: 'E',
-        templateUrl: 'assets/scripts/nwLogin/nwLogin.html'
+        templateUrl: 'assets/scripts/nwLogin/nwLogin.html',
     };
 }

src/assets/scripts/nwSidebar/nwSidebar.html

@@ -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'">
+      <li class="nav-item" ng-show="'{{user.role}}'==='nomit' || '{{user.role}}'==='referee' || '{{user.role}}'==='company'">
         <a class='sidebar-link' href="#!profile">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-user-circle-o 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>

src/assets/scripts/nwTopbar/nwTopbar.html

@@ -8,22 +8,22 @@
           <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'">
         <button type="button" class="btn btn-gradient ">
           <i class="fa fa-plus pdd-right-5 text-white"></i>
           ADD NEW USER
         </button>
       </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'">
         <button type="button" class="btn btn-gradient">
           <i class="fa fa-plus pdd-right-5 text-white"></i>
           CREATE NEW AD
@@ -38,10 +38,10 @@
       <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 class="peer mR-10 visible-referee visible-user visible-company" ng-show="'{{user.role}}'!='nomit'">

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

@@ -4,6 +4,11 @@ const TopbarController = ($scope, UserService) => {
         $scope.user = user;
     });
 
+    $scope.$on('needReload', function(event){
+        console.log("NEED RELOAD!");
+        // Refresh topbar...
+    })
+
     UserService.loadUser();
 }
 

src/index.html

@@ -83,11 +83,12 @@
       <nw-topbar></nw-topbar>
       <!-- ### $App Screen Content ### -->
         <div ng-view></div>
+        <nw-footer></nw-footer>
     </div>
 
 
     <!-- ### $App Screen Footer ### -->
-    <nw-footer></nw-footer>
+    
   
   </div>