diff --git a/src/assets/scripts/ads-details/ads-details.controller.js b/src/assets/scripts/ads-details/ads-details.controller.js
index 64a40bc..258da11 100644
--- a/src/assets/scripts/ads-details/ads-details.controller.js
+++ b/src/assets/scripts/ads-details/ads-details.controller.js
@@ -2,23 +2,23 @@ import moment from 'moment';
import Avatar from 'avatar-initials';
const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => {
- // $scope.$on('loadUserSuccess', function (event, user) {
- // $scope.user = user;
- // });
- // UserService.loadUser();
- AdsDetailsService.fetchAdDetails($routeParams)
- .then((result) => {
- $scope.ad = result;
- console.log(result);
+ $scope.$on('loadUserSuccess', function (event, user) {
+ $scope.user = user;
- $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(); }
+ AdsDetailsService.fetchAdDetails($routeParams)
+ .then((result) => {
+ $scope.ad = result;
+ console.log(result);
+ $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();
}
export default AdsDetailsController;
\ No newline at end of file
diff --git a/src/assets/scripts/dashboard/dashboard.controller.js b/src/assets/scripts/dashboard/dashboard.controller.js
index 4b5b97c..a6e87f8 100644
--- a/src/assets/scripts/dashboard/dashboard.controller.js
+++ b/src/assets/scripts/dashboard/dashboard.controller.js
@@ -9,6 +9,7 @@ const DashboardController = ($scope, UserService) => {
});
// tutte le funzioni del controller
+ UserService.loadUser();
masonry();
chart();
pieChart();
diff --git a/src/assets/scripts/logout/index.js b/src/assets/scripts/logout/index.js
index 6fc9ff8..50c3e56 100644
--- a/src/assets/scripts/logout/index.js
+++ b/src/assets/scripts/logout/index.js
@@ -1,8 +1,8 @@
import angular from 'angular';
import ngCookies from 'angular-cookies';
-import LogoutController from './controller';
-import LogoutService from './service';
+import LogoutController from './logout.controller';
+import LogoutService from './logout.service';
angular.module('nwLogout', [ngCookies])
- .controller(LogoutController.name, LogoutController)
- .factory(LogoutService.name, LogoutService);
\ No newline at end of file
+ .controller('LogoutController', LogoutController)
+ .factory('LogoutService', LogoutService);
\ No newline at end of file
diff --git a/src/assets/scripts/logout/controller.js b/src/assets/scripts/logout/logout.controller.js
similarity index 58%
rename from src/assets/scripts/logout/controller.js
rename to src/assets/scripts/logout/logout.controller.js
index 519f559..db309a7 100644
--- a/src/assets/scripts/logout/controller.js
+++ b/src/assets/scripts/logout/logout.controller.js
@@ -1,8 +1,9 @@
import masonry from "../masonry";
-const LogoutController = ($scope, $location, LogoutService, $cookies, UserService) => {
+/** @ngInject */
+const LogoutController = ['$scope', '$location', '$cookies', 'LogoutService', 'UserService',
+ ($scope, $location, $cookies, LogoutService, UserService) => {
$scope.userLogged = false;
- UserService.loadUser();
$scope.userLogout = async () => {
await LogoutService.logoutUserService($scope.user)
.then((result)=>{
@@ -10,9 +11,10 @@ const LogoutController = ($scope, $location, LogoutService, $cookies, UserServic
$location.path('/');
$scope.$emit('needReload');
masonry();
+ UserService.loadUser();
})
.catch((err)=>{ console.log(err); })
}
-};
+}];
export default LogoutController;
\ No newline at end of file
diff --git a/src/assets/scripts/logout/service.js b/src/assets/scripts/logout/logout.service.js
similarity index 83%
rename from src/assets/scripts/logout/service.js
rename to src/assets/scripts/logout/logout.service.js
index 85c7d4f..b025cdb 100644
--- a/src/assets/scripts/logout/service.js
+++ b/src/assets/scripts/logout/logout.service.js
@@ -1,4 +1,5 @@
-const LogoutService = ($http) => {
+/** @ngInject */
+const LogoutService = ['$http', ($http) => {
let serv = {};
serv.logoutUserService = (user) =>{
@@ -17,6 +18,6 @@ const LogoutService = ($http) => {
});
}
return serv;
-}
+}];
export default LogoutService;
\ No newline at end of file
diff --git a/src/assets/scripts/nwLogin/controller.js b/src/assets/scripts/nwLogin/controller.js
deleted file mode 100644
index 3d33ff7..0000000
--- a/src/assets/scripts/nwLogin/controller.js
+++ /dev/null
@@ -1,27 +0,0 @@
-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);
- if( typeof result.token !== "undefined"){
-
- // save the cookie and reload the user for all controllers
- $cookies.put('access_token', result.token);
- UserService.loadUser();
- $location.path('/');
- // temporary solution
- //window.location.reload(false);
- $scope.$emit('needReload');
-
- } else {
- alert(result);
- }
- }
- }
-
-};
-
-export default LoginController;
\ No newline at end of file
diff --git a/src/assets/scripts/nwLogin/index.js b/src/assets/scripts/nwLogin/index.js
index 03a5264..68693df 100644
--- a/src/assets/scripts/nwLogin/index.js
+++ b/src/assets/scripts/nwLogin/index.js
@@ -1,12 +1,12 @@
import * as angular from 'angular';
import ngCookies from 'angular-cookies';
-import LoginController from './controller';
-import LoginService from './service';
+import LoginController from './login.controller';
+import LoginService from './login.service';
angular.module('NomitWisp-Login', [ngCookies])
.directive('nwLogin', nwLogin)
- .controller(LoginController.name, LoginController)
- .factory(LoginService.name, LoginService);
+ .controller('LoginController', LoginController)
+ .factory('LoginService', LoginService);
/** @ngInject */
function nwLogin(){
diff --git a/src/assets/scripts/nwLogin/login.controller.js b/src/assets/scripts/nwLogin/login.controller.js
new file mode 100644
index 0000000..a87d2f6
--- /dev/null
+++ b/src/assets/scripts/nwLogin/login.controller.js
@@ -0,0 +1,28 @@
+/** @ngInject */
+const LoginController = ['$scope', '$cookies', '$location', 'LoginService', 'UserService' ,
+ function ($scope, $cookies, $location, LoginService, UserService) {
+
+ // load the user if already logged in, for all controllers
+ UserService.loadUser();
+
+ $scope.userLogin = async (isValid) => {
+ $scope.dataLoading = true;
+ if(isValid){
+ await LoginService.loginUserService($scope.user)
+ .then((result) => {
+ // save the cookie and reload the user for all controllers
+ $cookies.put('access_token', result.token);
+ UserService.loadUser();
+ $location.path('/');
+ $scope.$emit('needReload');
+ $scope.dataLoading = false;
+ })
+ .catch((err) => {
+ $scope.dataLoading = false;
+ alert(err);
+ })
+ }
+ }
+}];
+
+export default LoginController;
\ No newline at end of file
diff --git a/src/assets/scripts/nwLogin/service.js b/src/assets/scripts/nwLogin/login.service.js
similarity index 82%
rename from src/assets/scripts/nwLogin/service.js
rename to src/assets/scripts/nwLogin/login.service.js
index 574e842..cf24438 100644
--- a/src/assets/scripts/nwLogin/service.js
+++ b/src/assets/scripts/nwLogin/login.service.js
@@ -1,4 +1,5 @@
-const LoginService = ($http) => {
+/** @ngInject */
+const LoginService = (['$http', ($http) => {
let serv = {};
serv.loginUserService = (user) => {
@@ -17,6 +18,6 @@ const LoginService = ($http) => {
});
}
return serv;
-}
+}]);
export default LoginService;
\ No newline at end of file
diff --git a/src/assets/scripts/nwLogin/nwLogin.html b/src/assets/scripts/nwLogin/nwLogin.html
index 24990d8..a4f5198 100644
--- a/src/assets/scripts/nwLogin/nwLogin.html
+++ b/src/assets/scripts/nwLogin/nwLogin.html
@@ -139,12 +139,16 @@
Sign In
diff --git a/src/assets/static/images/loading.gif b/src/assets/static/images/loading.gif
new file mode 100644
index 0000000..fe8e0fc
Binary files /dev/null and b/src/assets/static/images/loading.gif differ