From 83464dc1c5daa1662a1d4483e241e438626c553d Mon Sep 17 00:00:00 2001 From: Caio SBA Date: Fri, 22 May 2015 18:17:33 -0300 Subject: [PATCH] After successful login, hide login button and show button to user profile whose label is the user name --- ConfJuvApp/www/html/_header.html | 3 ++- ConfJuvApp/www/js/controllers.js | 5 +++-- ConfJuvApp/www/js/utils.js | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ConfJuvApp/www/html/_header.html b/ConfJuvApp/www/html/_header.html index 0172653..b78bab9 100644 --- a/ConfJuvApp/www/html/_header.html +++ b/ConfJuvApp/www/html/_header.html @@ -2,7 +2,8 @@

ConfJuv

- + +
Loading diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index 6420dad..ca8e864 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -50,14 +50,15 @@ angular.module('confjuvapp.controllers', []) .then(function(resp) { $scope.closeModal(); var popup = $ionicPopup.alert({ title: 'Login', template: 'Login efetuado com sucesso!' }); - ConfJuvAppUtils.loggedIn = true; + $scope.loggedIn = true; + $scope.user = resp.data.person; popup.then(function() { $scope.loadDiscussions(resp.data.private_token); }); }, function(err) { $scope.closeModal(); var popup = $ionicPopup.alert({ title: 'Login', template: 'Erro ao efetuar login. Verifique usuário e senha e conexão com a internet.' }); - ConfJuvAppUtils.loggedIn = false; + $scope.loggedIn = false; $scope.loading = false; popup.then(function() { $scope.openModal(); diff --git a/ConfJuvApp/www/js/utils.js b/ConfJuvApp/www/js/utils.js index 1c3c4fe..058d455 100644 --- a/ConfJuvApp/www/js/utils.js +++ b/ConfJuvApp/www/js/utils.js @@ -1,7 +1,5 @@ var ConfJuvAppUtils = { pathTo: function(endpoint) { return ConfJuvAppConfig.noosferoApiHost + '/api/' + ConfJuvAppConfig.noosferoApiVersion + '/' + endpoint; - }, - - loggedIn: false + } }; -- libgit2 0.21.2