Fixed login

User data injected in controllers
Blurred Login modal
Modal now staying until login or signup
Now access to api restricted to users with access_token

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

@@ -1,18 +1,23 @@
 import moment from 'moment';
+import UserService from '../app/shared.service';
 
-const AdsDetailsController = ($scope, AdsDetailsService, $routeParams) => {
-    AdsDetailsService.fetchAdDetails($routeParams)
-        .then(function(result){
-            $scope.ad = result;
-            window.msnry.layout();
-            console.log(result);
-        })
-        .catch(function(error){
-            console.log(error);
-        });
-    $scope.daysAgo = (timestamp) => {
-        return moment(timestamp).fromNow();
-    }
+const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => {
+    $scope.$on('loadUserSuccess', function (event, user) {
+        $scope.user = user;
+        AdsDetailsService.fetchAdDetails($routeParams)
+            .then(function(result){
+                $scope.ad = result;
+                window.msnry.layout();
+                console.log(result);
+            })
+            .catch(function(error){
+                console.log(error);
+            });
+        $scope.daysAgo = (timestamp) => {
+            return moment(timestamp).fromNow();
+        }
+    });
+    UserService.loadUser();
 }
 
 export default AdsDetailsController;

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

@@ -1,15 +1,18 @@
 /** @ngInject */
-const AdsController = ($scope, AdsService) => {
-        AdsService.fetchAdsService()
-            .then(function(result){
-                $scope.ads = result;
-                console.log(result);
-            })
-            .catch(function(error){
-                console.log(error);
-            })
-        
-        
+const AdsController = ($scope, AdsService, UserService) => {
+  $scope.$on('loadUserSuccess', function (event, user) {
+    $scope.user = user;
+    AdsService.fetchAdsService()
+      .then(function (result) {
+        $scope.ads = result;
+        console.log(result);
+      })
+      .catch(function (error) {
+        console.log(error);
+      })
+
+  });
+  UserService.loadUser();
 }
 
-export default AdsController;
+export default AdsController;

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

@@ -11,12 +11,12 @@ const UserService = ($cookies, $rootScope) => {
 	let serv = {};
 
     //load user has been called (is called on page load in menu controller and after login on modal controller)
-    serv.loadUser = function () {
+    serv.loadUser =  () => {
         if(typeof $cookies.get('access_token') !== 'undefined' ){
 			$rootScope.$broadcast('loadUserSuccess', parseJwt( $cookies.get('access_token') ));
 			$('#modalLoginForm').modal('hide');
 		} else {
-			$('#modalLoginForm').modal('show');
+			$('#modalLoginForm').modal({backdrop: 'static', keyboard: false});
 		}
 	}
 	

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

@@ -1,11 +1,12 @@
 /** @ngInject */
-const DashboardController = ($scope) => {
-    $scope.$on('loadUserSuccess', function(user) {
+const DashboardController = ($scope, UserService) => {
+    $scope.$on('loadUserSuccess', function(event, user) {
         $scope.user = user;
-
+        console.log($scope.user);
         // tutte le funzioni del controller
         
     }); 
+    UserService.loadUser();
 }
 
 export default DashboardController;

src/assets/scripts/nwLogin/nwLogin.html

@@ -1,4 +1,5 @@
-     <!-- Modal -->
+<div ng-controller="LoginController">
+    <!-- Modal -->
      <div class="modal fade" id="modalLoginForm" tabindex="-1" role="dialog" aria-labelledby="modalLoginFormLabel" aria-hidden="true">
         <div class="modal-dialog" role="document">
           <div class="modal-content">
@@ -132,7 +133,7 @@
                    </svg>
 
                 </div> <!--logo-->
-                <div ng-controller="LoginController">
+                <div>
                   <h4 class=""><strong>Sign In </strong>
                   <form ng-submit="userLogin()" name="LoginForm">
                     <input class="modal-username" ng-model="user.email" type="text" placeholder="Email" required>
@@ -153,4 +154,5 @@
             
           </div>
         </div>
+</div>
 </div>

src/assets/styles/nomit.scss

@@ -503,3 +503,11 @@ textarea {
     background-color: #FFFFFF;
     }
 
+/* Modal */
+body.modal-open .blurra{
+  -webkit-filter: blur(6px);
+  -moz-filter: blur(6px);
+  -o-filter: blur(6px);
+  -ms-filter: blur(6px);
+  filter: blur(6px);
+}

src/index.html

@@ -73,7 +73,7 @@
 
   <!-- @App Content -->
   <!-- =================================================== -->
-  <div>
+  <div class="blurra">
 
     <!-- #sidebar ============================ -->
     <nw-sidebar></nw-sidebar>