diff --git a/ConfJuvApp/builds/confjuv-dev.apk b/ConfJuvApp/builds/confjuv-dev.apk index c8a4e04..4f841a0 100644 Binary files a/ConfJuvApp/builds/confjuv-dev.apk and b/ConfJuvApp/builds/confjuv-dev.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-live.apk b/ConfJuvApp/builds/confjuvapp-live.apk index 869baa4..36a46f6 100644 Binary files a/ConfJuvApp/builds/confjuvapp-live.apk and b/ConfJuvApp/builds/confjuvapp-live.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-web.zip b/ConfJuvApp/builds/confjuvapp-web.zip index 4e54daf..0cc28fb 100644 Binary files a/ConfJuvApp/builds/confjuvapp-web.zip and b/ConfJuvApp/builds/confjuvapp-web.zip differ diff --git a/ConfJuvApp/config.xml b/ConfJuvApp/config.xml index d3163d4..fb74108 100644 --- a/ConfJuvApp/config.xml +++ b/ConfJuvApp/config.xml @@ -1,5 +1,5 @@ - + #3ConfJuv Aplicativo móvel para 3ª Conferência Nacional de Juventude diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index 0ad4a98..c0962b3 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -21,12 +21,7 @@ angular.module('confjuvapp.controllers', []) // Function to open the modal $scope.openModal = function() { if (ConfJuvAppUtils.getPrivateToken()) { - $scope.token = ConfJuvAppUtils.getPrivateToken(); - $scope.loggedIn = true; $scope.loadMe(); - $scope.loadTopics($scope.token); - $scope.loadStages(); - $scope.parseURLParams(); } else if ($scope.modal) { $scope.modal.show(); } else { @@ -83,7 +78,6 @@ angular.module('confjuvapp.controllers', []) $scope.openModal(); }; - // Function to close the modal $scope.closeModal = function() { $scope.modal.hide(); @@ -109,19 +103,13 @@ angular.module('confjuvapp.controllers', []) timeout: 10000 } - $http.post(ConfJuvAppUtils.pathTo('login'), jQuery.param(data), config) .then(function(resp) { $scope.closeModal(); var popup = $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' }); - $scope.loggedIn = true; $scope.user = resp.data.person; popup.then(function() { - $scope.token = resp.data.private_token; - ConfJuvAppUtils.setPrivateToken($scope.token); - $scope.loadTopics(resp.data.private_token); - $scope.loadStages(); - $scope.parseURLParams(); + $scope.loginCallback(resp.data.private_token); }); }, function(err) { $scope.closeModal(); @@ -134,6 +122,15 @@ angular.module('confjuvapp.controllers', []) }); }; + $scope.loginCallback = function(token) { + $scope.loggedIn = true; + $scope.token = token; + ConfJuvAppUtils.setPrivateToken(token); + $scope.loadTopics(token); + $scope.loadStages(); + $scope.parseURLParams(); + }; + // Function to retrieve password $scope.forgotPassword = function(email) { @@ -261,15 +258,17 @@ angular.module('confjuvapp.controllers', []) $scope.loadMe = function() { $scope.loading = true; - var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(); - var path = 'people/me/' +params; + var params = '?private_token=' + ConfJuvAppUtils.getPrivateToken(), + path = 'people/me/' + params; $http.get(ConfJuvAppUtils.pathTo(path)) .then(function(resp) { $scope.user = resp.data.person; + $scope.loginCallback(ConfJuvAppUtils.getPrivateToken()); $scope.loading = false; }, function(err) { $scope.token = ConfJuvAppUtils.setPrivateToken(null); + $scope.loggedIn = false; var popup = $ionicPopup.alert({ title: 'Usuário', template: 'Sessão expirada. Por favor faça login novamente.' }); popup.then(function() { $scope.openModal(); @@ -278,8 +277,6 @@ angular.module('confjuvapp.controllers', []) }); }; - - $scope.backToLoginHome = function() { $scope.registerFormDisplayed = false; $scope.loginFormDisplayed = false; -- libgit2 0.21.2