Download as
Browse Code »

Commit 95e102a7715431382c926817315ce560f6bcb08f

Authored by Leonardo Merlin
2 parents 3d88fc18 f7a24038
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'fix-issues'

Showing 8 changed files with 429 additions and 123 deletions   Show diff stats
src/app/components/auth/auth.service.js
  Diff comments   View file @95e102a
... ... @@ -54,10 +54,12 @@
54 54  
55 55 $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, data.user);
56 56 return response;
  57 +
57 58 }, function(response) {
58   - $log.debug('AuthService.register [FAIL] response', response);
59 59  
  60 + $log.debug('AuthService.register [FAIL] response', response);
60 61 $rootScope.$broadcast(AUTH_EVENTS.registerFailed, response);
  62 +
61 63 return $q.reject(response);
62 64 });
63 65 }
... ... @@ -79,6 +81,35 @@
79 81 // 'Erro: O código de ativação é inválido.'
80 82 $log.debug('AuthService.activate [FAIL] response', response);
81 83 $rootScope.$broadcast(AUTH_EVENTS.activateFailed);
  84 +
  85 + return $q.reject(response);
  86 + });
  87 + }
  88 +
  89 + function resendConfirmation (data) {
  90 + var url = PATH.host + '/api/v1/resend_activation_code';
  91 + var encodedData = ([
  92 + 'value=' + data.login,
  93 + 'captcha_text=' + data.captcha_text,
  94 + 'txtToken_captcha_serpro_gov_br=' + data.txtToken_captcha_serpro_gov_br
  95 + ]).join('&');
  96 +
  97 + url += '?' + encodedData;
  98 +
  99 + return $http
  100 + .post(url)
  101 + .then(function(response) {
  102 + $log.debug('AuthService.resendConfirmation [SUCCESS] response', response);
  103 +
  104 + // 'Usuário ativado com sucesso'
  105 + $rootScope.$broadcast(AUTH_EVENTS.resendConfirmationSuccess, response);
  106 + return response;
  107 + }, function(response) {
  108 + // 'Erro: O código de ativação é inválido.'
  109 + $log.debug('AuthService.resendConfirmation [FAIL] response', response);
  110 + $rootScope.$broadcast(AUTH_EVENTS.resendConfirmationFailed);
  111 +
  112 + return $q.reject(response);
82 113 });
83 114 }
84 115  
... ... @@ -100,6 +131,8 @@
100 131 // 'Não foi possível trocar a senha com os dados informados.'
101 132 $log.debug('AuthService.changePassword [FAIL] response', response);
102 133 $rootScope.$broadcast(AUTH_EVENTS.changePasswordFailed);
  134 +
  135 + return $q.reject(response);
103 136 });
104 137 }
105 138  
... ... @@ -125,7 +158,7 @@
125 158 $log.debug('AuthService.forgotPassword [FAIL] response', response);
126 159 $rootScope.$broadcast(AUTH_EVENTS.forgotPasswordFailed);
127 160  
128   - return response;
  161 + return $q.reject(response);
129 162 });
130 163 }
131 164  
... ... @@ -190,6 +223,7 @@
190 223 var service = {
191 224 register: register,
192 225 activate: activate,
  226 + resendConfirmation: resendConfirmation,
193 227 changePassword: changePassword,
194 228 forgotPassword: forgotPassword,
195 229 login: login,
... ...
src/app/index.constants.js
  Diff comments   View file @95e102a
... ... @@ -28,6 +28,8 @@
28 28 registerFailed: 'auth-register-failed',
29 29 activateSuccess: 'auth-activate-success',
30 30 activateFailed: 'auth-activate-failed',
  31 + resendConfirmationSuccess: 'auth-resend-confirmation-success',
  32 + resendConfirmationFailed: 'auth-resend-confirmation-failed',
31 33 changePasswordSuccess: 'auth-changePassword-success',
32 34 changePasswordFailed: 'auth-changePassword-failed',
33 35 forgotPassowrdSuccess: 'auth-forgotPassowrd-success',
... ...
src/app/index.route.js
  Diff comments   View file @95e102a
... ... @@ -27,7 +27,18 @@
27 27 'main': {
28 28 templateUrl: 'app/pages/auth/signin.html',
29 29 controller: 'AuthPageController',
30   - controllerAs: 'pageSignin'
  30 + controllerAs: 'pageAuth'
  31 + }
  32 + }
  33 + })
  34 + .state('reenviar-email', {
  35 + url: '/reenviar-email',
  36 + ncyBreadcrumb: {label: 'Re-enviar e-mail de confirmação'},
  37 + views: {
  38 + 'main': {
  39 + templateUrl: 'app/pages/auth/resend-confirmation.html',
  40 + controller: 'AuthPageController',
  41 + controllerAs: 'pageAuth'
31 42 }
32 43 }
33 44 })
... ... @@ -38,7 +49,7 @@
38 49 'main': {
39 50 templateUrl: 'app/pages/auth/recover.html',
40 51 controller: 'AuthPageController',
41   - controllerAs: 'pageSignin'
  52 + controllerAs: 'pageAuth'
42 53 }
43 54 }
44 55 })
... ... @@ -49,7 +60,7 @@
49 60 'main': {
50 61 templateUrl: 'app/pages/auth/change.html',
51 62 controller: 'AuthPageController',
52   - controllerAs: 'pageSignin'
  63 + controllerAs: 'pageAuth'
53 64 }
54 65 }
55 66 })
... ...
src/app/pages/auth/auth.controller.js
  Diff comments   View file @95e102a
... ... @@ -60,6 +60,7 @@
60 60  
61 61 // handle logout
62 62 vm.$scope.$on(vm.AUTH_EVENTS.logoutSuccess, function() {
  63 + vm.clearMessages();
63 64 vm.currentUser = vm.Session.getCurrentUser();
64 65 vm._attachCaptcha();
65 66 });
... ... @@ -136,55 +137,67 @@
136 137 var $captcha = $target.find('[name="txtToken_captcha_serpro_gov_br"]');
137 138 credentials.txtToken_captcha_serpro_gov_br = $captcha.val();
138 139  
139   - // vm.signupFormStatus = 'SENDIN';
140   - vm.AuthService.register(credentials).then(function(response) {
141   - vm.$log.debug('register success.response', response);
  140 + vm.AuthService.register(credentials)
  141 + .then(function(/*response*/) {
  142 + // SUCCESS
  143 +
  144 + vm.signupSuccess = true;
  145 + // vm._startRedirect();
142 146  
143   - // TODO: mensagens de sucesso
144   - // 'Cadastro efetuado com sucesso.'
145   - // 'Verifique seu email para confirmar o cadastro.'
146   - vm.signupMessageTitle = 'Cadastro efetuado com sucesso!';
147   - vm.signupSuccessMessage = 'Verifique seu e-mail para confirmar o cadastro.';
148   - vm.redirectBack();
149 147 }, function(response) {
150   - vm.$log.debug('register error.response', response);
151   -
152   - vm.internalError = true;
153   -
154   - switch (response.data.code) {
155   - case 400: // bad request
156   - var errors = JSON.parse(response.data.message);
157   - if(errors && errors.email){
158   - vm.signupErrorMessage = 'E-mail já está em uso.';
159   - }
160   - break;
161   - case 500:
162   - vm.signupErrorMessage = response.data.message;
163   - break;
164   - default:
165   - break;
166   - }
167   -
  148 + // ERROR
168 149  
169 150 // TODO: mensagens de erro
170 151 // TODO: tratar multiplos erros
171 152  
172 153 // javascript_console_message: "Unable to reach Serpro's Captcha validation service"
173 154 // message: "Internal captcha validation error"
  155 +
  156 + vm.signupError = true;
  157 + vm.signupErrorTitle = 'Erro!';
  158 + vm.signupErrorMessage = response.data.message;
  159 +
  160 + // 4xx client error
  161 + if (response.status >= 400 && response.status < 500){
  162 + var errors = JSON.parse(response.data.message);
  163 + if(errors && errors.email){
  164 + vm.signupErrorMessage = 'E-mail já está em uso.';
  165 + }
  166 + }
  167 +
  168 + // 5xx server error
  169 + if (response.status >= 500 && response.status < 600){
  170 + vm.internalError = true;
  171 + }
174 172 });
175 173 };
176 174  
177 175 AuthPageController.prototype.submitSignin = function(credentials) {
178 176 var vm = this;
179 177  
180   - vm.AuthService.login(credentials).then(function(user) {
181   - // handle view
182   - vm.$log.debug('user', user);
  178 + vm.AuthService.login(credentials)
  179 + .then(function(/*user*/) {
183 180  
184   - vm.successMessage = 'Login efetuado com sucesso!';
185   - vm.redirectBack();
186   - }, function() {
  181 + vm.showSigninSuccessMessage();
  182 + vm._startRedirect(); //
  183 + }, function(response) {
187 184 // handle view
  185 + vm.$log.error('Error on "submitSignin"', response);
  186 +
  187 + vm.signinError = true;
  188 +
  189 + // 4xx client error
  190 + if ( response.status >= 400 && response.status < 500 ) {
  191 +
  192 + vm.signinErrorTitle = 'Erro!';
  193 + vm.signinErrorContent = response.data.message;
  194 +
  195 + if(response.status === 401){
  196 + vm.signinErrorTitle = 'Acesso não autorizado!';
  197 + vm.signinErrorContent = 'E-mail ou senha incorretos.';
  198 + }
  199 + }
  200 +
188 201 });
189 202 };
190 203  
... ... @@ -206,16 +219,24 @@
206 219 vm.AuthService.forgotPassword(data).then(function(response) {
207 220 vm.$log.debug('recover success.response', response);
208 221  
209   - vm.successRecoverMessageTitle = 'Pedido enviado sucesso!';
210   - vm.successRecoverMessage = 'Verifique seu e-mail. Em instantes você receberá um e-mail com um link para redefinir sua senha.';
211   - // vm.redirectBack();
  222 + vm.recoverSuccess = true;
  223 + // vm._startRedirect();
  224 +
212 225 }, function(response){
213 226 vm.$log.debug('recover error.response', response);
214 227  
215   - var message = response.data.message;
216   - vm.errorRecoverMessage = message;
  228 + vm.recoverError = true;
  229 + vm.recoverErrorMessage = response.data.message;
217 230  
218   - if(response.data.code === 500){
  231 + // Client Error
  232 + if (response.status >= 400 && response.status < 500){
  233 + if(response.status === 404){
  234 + vm.recoverErrorMessage = 'E-mail não cadastrado no Dialoga Brasil.';
  235 + }
  236 + }
  237 +
  238 + // Server Error
  239 + if (response.status >= 500 && response.status < 600){
219 240 vm.internalError = true;
220 241 }
221 242 }).catch(function(error){
... ... @@ -223,7 +244,76 @@
223 244 });
224 245 };
225 246  
226   - AuthPageController.prototype.redirectBack = function() {
  247 + AuthPageController.prototype.submitConfirmationForm = function($event, confirmationForm) {
  248 + var vm = this;
  249 +
  250 + // get form data
  251 + var data = {
  252 + login: confirmationForm.login.$modelValue,
  253 + captcha_text: confirmationForm.captcha_text.$modelValue
  254 + };
  255 +
  256 + // get captcha token
  257 + var target = $event.target;
  258 + var $target = angular.element(target);
  259 + var $captcha = $target.find('[name="txtToken_captcha_serpro_gov_br"]');
  260 + data.txtToken_captcha_serpro_gov_br = $captcha.val();
  261 +
  262 + vm.AuthService.resendConfirmation(data)
  263 + .then(function(response) {
  264 + vm.$log.debug('resendConfirmation success.response', response);
  265 +
  266 + vm.resendConfirmationSuccess = true;
  267 +
  268 + // Feedback para usuário já ativo na plataforma
  269 + var user = response.data[0];
  270 + if ( user && (user.active === true) ) {
  271 + vm.resendConfirmationSuccessTitle = 'Usuário já está ativo!';
  272 + vm.resendConfirmationSuccessMessage = 'O e-mail informado já foi confirmado.';
  273 + }else{
  274 + vm.resendConfirmationSuccessTitle = 'Pronto!';
  275 + vm.resendConfirmationSuccessMessage = 'Em instantes você receberá em seu e-mail um link para confirmar o seu cadastro.';
  276 + }
  277 +
  278 + }, function(response){
  279 + vm.$log.debug('resendConfirmation error.response', response);
  280 +
  281 + vm.resendConfirmationError = true;
  282 + vm.resendConfirmationErrorMessage = response.data.message;
  283 +
  284 + // Client Error
  285 + // if (response.status >= 400 && response.status < 500){}
  286 +
  287 + // Server Error
  288 + if (response.status >= 500 && response.status < 600){
  289 + vm.internalError = true;
  290 + }
  291 + }).catch(function(error){
  292 + vm.$log.debug('resendConfirmation catch.error', error);
  293 + });
  294 + };
  295 +
  296 + AuthPageController.prototype.clearMessages = function() {
  297 + var vm = this;
  298 +
  299 + // success
  300 + vm.signupSuccess = false;
  301 + vm.signinSuccess = false;
  302 + vm.confirmSuccess = false;
  303 +
  304 + // error
  305 + vm.signinError = false;
  306 + vm.signupError = false;
  307 +
  308 + };
  309 + AuthPageController.prototype.showSigninSuccessMessage = function() {
  310 + var vm = this;
  311 +
  312 + vm.signinSuccess = true;
  313 + vm.successMessage = 'Login efetuado com sucesso!';
  314 + };
  315 +
  316 + AuthPageController.prototype._startRedirect = function() {
227 317 var vm = this;
228 318  
229 319 if (!vm.hasRedirect) {
... ... @@ -233,6 +323,7 @@
233 323  
234 324 // start countdown
235 325 vm.countdown = vm.delay;
  326 +
236 327 var stop = null;
237 328 stop = vm.$interval(function() {
238 329 vm.countdown--;
... ... @@ -242,6 +333,7 @@
242 333 }
243 334 }, 1000);
244 335  
  336 + // start redirect delay
245 337 vm.$timeout(function() {
246 338 var state = vm.params.state;
247 339 switch (state){
... ... @@ -267,7 +359,7 @@
267 359  
268 360 AuthPageController.prototype.authWithFacebook = function() {
269 361 var vm = this;
270   - // var url = 'http://login.dialoga.gov.br/plugin/oauth_client/facebook?oauth_client_popup=true&id=1';
  362 +
271 363 var url = 'http://login.dialoga.gov.br/plugin/oauth_client/facebook?oauth_client_popup=true&id=' + vm.APP.facebook_app_id;
272 364 vm.$window.oauthClientAction(url);
273 365 };
... ... @@ -275,7 +367,7 @@
275 367 AuthPageController.prototype.authWithGooglePlus = function() {
276 368 var vm = this;
277 369  
278   - var url = 'http://login.dialoga.gov.br/plugin/oauth_client/google_oauth2?oauth_client_popup=true&id=' + vm.APP.goople_app_id;
  370 + var url = 'http://login.dialoga.gov.br/plugin/oauth_client/google_oauth2?oauth_client_popup=true&id=' + vm.APP.google_app_id;
279 371 vm.$window.oauthClientAction(url);
280 372 };
281 373 })();
... ...
src/app/pages/auth/change.html
  Diff comments   View file @95e102a
... ... @@ -9,18 +9,18 @@
9 9 <section role="main" class="section-gray">
10 10 <div class="container">
11 11 <div class="row">
12   - <div ng-if="pageSignin.currentUser">
  12 + <div ng-if="pageAuth.currentUser">
13 13 <div class="row">
14 14 <div class="col-sm-8 col-sm-offset-2">
15 15 <h3>Você está logado!</h3>
16 16 <button
17 17 type="button"
18   - ng-click="pageSignin.onClickLogout()"
  18 + ng-click="pageAuth.onClickLogout()"
19 19 class="btn btn-primary">Sair</button>
20 20 </div>
21 21 </div>
22 22 </div>
23   - <div ng-if="!pageSignin.currentUser">
  23 + <div ng-if="!pageAuth.currentUser">
24 24 <br>
25 25 <div class="col-sm-8 col-sm-offset-2">
26 26 <div class="row">
... ...
src/app/pages/auth/recover.html
  Diff comments   View file @95e102a
... ... @@ -12,54 +12,54 @@
12 12 <section role="main" class="section-gray vertical-padding">
13 13 <div class="container">
14 14 <div class="row">
15   - <div ng-if="pageSignin.successRecoverMessage">
  15 + <div ng-if="pageAuth.recoverSuccess">
16 16 <div class="col-sm-8 col-sm-offset-2">
17   - <div class="feedback-message">
18   - <show-message
19   - type="'success'"
20   - message="pageSignin.successRecoverMessageTitle || 'Pronto!'"
21   - description="pageSignin.successRecoverMessage"
22   - ></show-message>
23   - <div class="row">
24   - <div class="col-sm-8 col-sm-offset-4">
25   - <p><a ui-sref="inicio">Ir para página inicial</a></p>
26   - </div>
27   - </div>
28   - </div>
29   - </div>
30   - </div>
31   - <div ng-if="!pageSignin.successRecoverMessage">
  17 + <div class="feedback-message">
  18 + <show-message
  19 + type="'success'"
  20 + message="'Pronto!'"
  21 + description="'Em instantes você receberá em seu e-mail um link para criação de uma nova senha.'"
  22 + ></show-message>
  23 + <div class="row">
  24 + <div class="col-sm-8 col-sm-offset-4">
  25 + <p><a ui-sref="inicio">Ir para página inicial</a></p>
  26 + </div>
  27 + </div>
  28 + </div>
  29 + </div>
  30 + </div>
  31 + <div ng-if="!pageAuth.recoverSuccess">
32 32 <br>
33 33 <div class="col-sm-8 col-sm-offset-2">
34   - <div class="row" ng-if="pageSignin.errorRecoverMessage">
35   - <div class="col-sm-12">
36   - <div class="alert alert-danger">{{pageSignin.errorRecoverMessage}}</div>
37   - <div ng-if="vm.internalError">
38   - <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
39   - <p>Caso o problema persista, entre em contato!</p>
40   - <p><a ui-sref="duvidas">Ir para página de contato</a></p>
41   - </div>
42   - </div>
43   - </div>
  34 + <div class="row" ng-if="pageAuth.recoverError">
  35 + <div class="col-sm-12">
  36 + <div class="alert alert-danger">{{pageAuth.recoverErrorMessage}}</div>
  37 + <div ng-if="vm.internalError">
  38 + <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
  39 + <p>Caso o problema persista, entre em contato!</p>
  40 + <p><a ui-sref="duvidas">Ir para página de contato</a></p>
  41 + </div>
  42 + </div>
  43 + </div>
44 44 <div class="row">
45 45 <div class="col-md-12">
46   - <form name="recoverPassForm" ng-submit="pageSignin.submitRecover($event, recoverPassForm)">
  46 + <form name="recoverPassForm" ng-submit="pageAuth.submitRecover($event, recoverPassForm)">
47 47 <div class="form-group">
48 48 <label for="recover-login">E-mail*</label>
49   - <input type="email" id="recover-login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : recoverPassForm.login.$invalid && recoverPassForm.login.$touched }" ng-model="pageSignin.credentials.username" required />
  49 + <input type="email" id="recover-login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : recoverPassForm.login.$invalid && recoverPassForm.login.$touched }" ng-model="pageAuth.credentials.username" required />
50 50 <validation-messages field=" recoverPassForm.login"></validation-messages>
51 51 </div>
52   - <div class="form-group">
53   - <div id="serpro_captcha" class="captcha">
54   - </div>
55   - <div class="captcha">
56   - Digite os caracteres acima:
57   - </div>
58   - <div class="captcha">
59   - <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageSignin.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
60   - <validation-messages field="recoverPassForm.captcha_text"></validation-messages>
61   - </div>
62   - </div>
  52 + <div class="form-group">
  53 + <div id="serpro_captcha" class="captcha">
  54 + </div>
  55 + <div class="captcha">
  56 + Digite os caracteres acima:
  57 + </div>
  58 + <div class="captcha">
  59 + <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageAuth.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
  60 + <validation-messages field="recoverPassForm.captcha_text"></validation-messages>
  61 + </div>
  62 + </div>
63 63 <div class="form-group">
64 64 <button class="btn btn-lg btn-submit" type="submit">Solicitar alteração de senha</button>
65 65 </div>
... ...
src/app/pages/auth/resend-confirmation.html 0 → 100644
  Diff comments   View file @95e102a
... ... @@ -0,0 +1,79 @@
  1 +<div class="page--resend-confirmation">
  2 + <div class="container">
  3 + <div class="row">
  4 + <div class="col-sm-12">
  5 + <h2>Não recebeu o e-mail de confirmação?</h2>
  6 + <h5>
  7 + Calma, podemos te ajudar!
  8 + <br>
  9 + Basta informar o seu e-mail cadastrado que a gente envia um novo e-mail de confirmação.
  10 + </h5>
  11 + </div>
  12 + </div>
  13 + </div>
  14 + <section role="main" class="section-gray vertical-padding">
  15 + <div class="container">
  16 + <div class="row">
  17 + <div ng-if="pageAuth.resendConfirmationSuccess">
  18 + <div class="col-sm-8 col-sm-offset-2">
  19 + <div class="feedback-message">
  20 + <show-message
  21 + type="'success'"
  22 + message="pageAuth.resendConfirmationSuccessTitle"
  23 + description="pageAuth.resendConfirmationSuccessMessage"
  24 + ></show-message>
  25 + <div class="row">
  26 + <div class="col-sm-8 col-sm-offset-4">
  27 + <p><a ui-sref="inicio">Ir para página inicial</a></p>
  28 + </div>
  29 + </div>
  30 + </div>
  31 + </div>
  32 + </div>
  33 + <div ng-if="!pageAuth.resendConfirmationSuccess">
  34 + <br>
  35 + <div class="col-sm-8 col-sm-offset-2">
  36 + <div class="row" ng-if="pageAuth.resendConfirmationError">
  37 + <div class="col-sm-12">
  38 + <div class="alert alert-danger">
  39 + <strong>Erro!</strong>
  40 + O e-mail informado não possui cadastro no Dialoga Brasil.
  41 + </div>
  42 + <div ng-if="pageAuth.internalError">
  43 + <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
  44 + <p>Caso o problema persista, entre em contato!</p>
  45 + <p><a ui-sref="duvidas">Ir para página de contato</a></p>
  46 + </div>
  47 + </div>
  48 + </div>
  49 + <div class="row">
  50 + <div class="col-md-12">
  51 + <form name="confirmationForm" ng-submit="pageAuth.submitConfirmationForm($event, confirmationForm)">
  52 + <div class="form-group">
  53 + <label for="confirmation-login">E-mail*</label>
  54 + <input type="email" id="confirmation-login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : confirmationForm.login.$invalid && confirmationForm.login.$touched }" ng-model="pageAuth.credentials.username" required />
  55 + <validation-messages field=" confirmationForm.login"></validation-messages>
  56 + </div>
  57 + <div class="form-group">
  58 + <div id="serpro_captcha" class="captcha"></div>
  59 + <div class="captcha">
  60 + Digite os caracteres acima:
  61 + </div>
  62 + <div class="captcha">
  63 + <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageAuth.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
  64 + <validation-messages field="confirmationForm.captcha_text"></validation-messages>
  65 + </div>
  66 + </div>
  67 + <div class="form-group">
  68 + <button class="btn btn-lg btn-submit" type="submit">Solicitar novo e-mail de confirmação</button>
  69 + </div>
  70 + </form>
  71 + </div>
  72 + </div>
  73 + </div>
  74 + <br>
  75 + </div>
  76 + </div>
  77 + </div>
  78 + </section>
  79 +</div>
... ...
src/app/pages/auth/signin.html
  Diff comments   View file @95e102a
... ... @@ -5,29 +5,76 @@
5 5 </div>
6 6 </div>
7 7 </div>
  8 +
8 9 <section role="main" class="section-gray auth-content">
9 10 <div class="container">
10 11 <div class="row">
11   - <div ng-if="pageSignin.currentUser || pageSignin.signupMessageTitle">
  12 +
  13 + <!-- Feedbakc SUCESSO: cadastro, confirmação, login -->
  14 + <div ng-if="pageAuth.signupSuccess || pageAuth.confirmSuccess || pageAuth.signinSuccess">
12 15 <div class="row">
13 16 <div class="col-sm-8 col-sm-offset-2">
14 17 <div class="feedback-message">
15   - <show-message
16   - type="'success'"
17   - message="pageSignin.signupMessageTitle || 'Você está logado!'"
18   - description="pageSignin.signupSuccessMessage"
19   - ></show-message>
  18 +
  19 + <!-- case: CADASTRO -->
  20 + <div ng-if="pageAuth.signupSuccess">
  21 + <show-message type="'success'"
  22 + message="'Cadastro efetuado com sucesso :)'"
  23 + description="'Agora você faz parte do Dialoga Brasil. Em instantes você receberá um link de ativação em seu e-mail. Basta clicar e ativar.'"
  24 + ></show-message>
  25 +
  26 + <div class="row">
  27 + <div class="col-sm-4"></div>
  28 + <div class="col-sm-8 text-center-sm">
  29 + <a class="btn btn-link" ui-sref="reenviar-email" style="padding: 10px 0;" title="Re-enviar e-mail de confirmação.">
  30 + <span class="glyphicon glyphicon-chevron-right" aria-hidden></span>Não recebi o e-mail.
  31 + </a>
  32 + </div>
  33 + </div>
  34 + </div>
  35 +
  36 + <!-- case: CONFIRM -->
  37 + <div ng-if="pageAuth.confirmSuccess">
  38 + <show-message type="'success'"
  39 + message="'Pronto!'"
  40 + description="'Agora você faz parte do Dialoga Brasil.'"
  41 + ></show-message>
20 42  
21   - <div class="row">
22   - <div class="col-sm-4"></div>
23   - <div class="col-sm-8 text-center-sm">
24   - <div ng-if="pageSignin.countdown > 0">
25   - <p>
26   - Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>...
27   - </p>
  43 + <div class="row">
  44 + <div class="col-sm-4"></div>
  45 + <div class="col-sm-8 text-center-sm">
  46 + <div ng-if="pageAuth.countdown > 0">
  47 + <p>
  48 + Você será redirecionado para a página inicial em <b>{{pageAuth.countdown}} segundos</b>.
  49 + </p>
  50 + </div>
  51 + <div ng-if="!pageAuth.hasRedirect">
  52 + <a ui-sref="inicio" class="btn btn-primary">Ir para a Página Inicial</a>
  53 + </div>
28 54 </div>
29   - <div ng-if="!pageSignin.hasRedirect">
30   - <a ui-sref="inicio" class="btn btn-primary">Ir para a Página Inicial</a>
  55 + </div>
  56 + </div>
  57 +
  58 + <!-- case: LOGIN -->
  59 + <div ng-if="pageAuth.signinSuccess">
  60 + <show-message type="'success'"
  61 + message="'Login efetuado com sucesso!'"
  62 + description="''"
  63 + ></show-message>
  64 +
  65 + <div class="row">
  66 + <div class="col-sm-4"></div>
  67 + <div class="col-sm-8 text-center-sm">
  68 + <div ng-if="pageAuth.countdown > 0">
  69 + <p>
  70 + Você será redirecionado para a página anterior em <b>{{pageAuth.countdown}} segundos</b>.
  71 + </p>
  72 + </div>
  73 + <div ng-if="!pageAuth.hasRedirect">
  74 + <a ui-sref="inicio" class="btn btn-primary">Ir para a Página Inicial</a>
  75 + ou
  76 + <button type="button" class="btn btn-default" ng-click="vm.onClickLogout()">Sair</button>
  77 + </div>
31 78 </div>
32 79 </div>
33 80 </div>
... ... @@ -35,28 +82,60 @@
35 82 </div>
36 83 </div>
37 84 </div>
38   - <div ng-if="!pageSignin.currentUser && !pageSignin.signupMessageTitle">
  85 +
  86 + <!-- USUÁRIO JÁ LOGADO -->
  87 + <div ng-if="pageAuth.currentUser && !(pageAuth.signupSuccess || pageAuth.confirmSuccess || pageAuth.signinSuccess)">
  88 + <br>
  89 + <show-message type="'success'"
  90 + message="'Você já está logado!'"
  91 + description="'Mas você ainda pode:'"
  92 + ></show-message>
  93 +
  94 + <div class="row">
  95 + <div class="col-sm-4"></div>
  96 + <div class="col-sm-8 text-center-sm">
  97 + <div ng-if="!pageAuth.hasRedirect">
  98 + <a ui-sref="inicio" class="btn btn-primary">Ir para a Página Inicial</a>
  99 + ou
  100 + <button type="button" class="btn btn-default" ng-click="vm.onClickLogout()">Sair</button>
  101 + </div>
  102 + </div>
  103 + </div>
  104 + <br>
  105 + </div>
  106 +
  107 + <!-- USUÁRIO NÃO-LOGADO -->
  108 + <div ng-if="!pageAuth.currentUser && !(pageAuth.signupSuccess || pageAuth.confirmSuccess || pageAuth.signinSuccess)">
  109 + <!-- LOGIN -->
39 110 <div class="col-sm-5">
40 111 <div class="row">
41 112 <div class="col-md-12">
42 113 <h2>Já possui cadastro?</h2>
43 114 <p>Use seus dados para acessar o Dialoga Brasil</p>
44   - <form role="form" name="signinForm" ng-submit="pageSignin.submitSignin(pageSignin.signin)" novalidate>
  115 +
  116 + <!-- Feedback: ERRO no login -->
  117 + <div ng-if="pageAuth.signinError">
  118 + <div class="alert alert-danger" role="alert">
  119 + <strong>{{pageAuth.signinErrorTitle}}</strong> {{pageAuth.signinErrorContent}}
  120 + </div>
  121 + </div>
  122 +
  123 + <form role="form" name="signinForm" ng-submit="pageAuth.submitSignin(pageAuth.signin)" novalidate>
45 124 <div class="form-group">
46 125 <label for="signin-form--login">E-mail*</label>
47   - <input type="email" id="signin-form--login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.login.$invalid && signinForm.login.$touched }" ng-model="pageSignin.signin.username" required/>
  126 + <input type="email" id="signin-form--login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.login.$invalid && signinForm.login.$touched }" ng-model="pageAuth.signin.username" required/>
48 127 <validation-messages field="signinForm.login"></validation-messages>
49 128 </div>
50 129 <div class="form-group">
51 130 <label for="signin-form--password">Senha*</label>
52   - <input type="password" id="signin-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.password.$invalid && signinForm.password.$touched }" ng-model="pageSignin.signin.password" required>
  131 + <input type="password" id="signin-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.password.$invalid && signinForm.password.$touched }" ng-model="pageAuth.signin.password" required>
53 132 <validation-messages field="signinForm.password"></validation-messages>
54 133 </div>
55 134 <div class="form-group">
56 135 <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
57 136 </div>
58 137 <div class="form-group">
59   - <a ui-sref="recuperar" class="btn btn-lg btn-link">Esqueci minha senha</a>
  138 + <a ui-sref="recuperar" class="btn btn-lg btn-link" style="padding: 10px 0;">Esqueci minha senha</a>
60 139 </div>
61 140 </form>
62 141 </div>
... ... @@ -68,7 +147,7 @@
68 147 </div>
69 148 <div class="row">
70 149 <div class="col-xs-6">
71   - <button type="button" ng-click="pageSignin.authWithFacebook()" class="btn btn-lg btn-block btn-social btn-facebook">
  150 + <button type="button" ng-click="pageAuth.authWithFacebook()" class="btn btn-lg btn-block btn-social btn-facebook">
72 151 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook">
73 152 <span class="icon icon-social-facebook"></span>
74 153 </span>
... ... @@ -76,7 +155,7 @@
76 155 </button>
77 156 </div>
78 157 <div class="col-xs-6">
79   - <button type="button" ng-click="pageSignin.authWithGooglePlus()" class="btn btn-lg btn-block btn-social btn-google-plus">
  158 + <button type="button" ng-click="pageAuth.authWithGooglePlus()" class="btn btn-lg btn-block btn-social btn-google-plus">
80 159 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-googleplus">
81 160 <span class="icon icon-social-googleplus"></span>
82 161 </span>
... ... @@ -87,6 +166,8 @@
87 166 </div>
88 167 <div class="col-sm-1">
89 168 </div>
  169 +
  170 + <!-- CADASTRO -->
90 171 <div class="col-sm-6">
91 172 <div class="row">
92 173 <div class="col-sm-12">
... ... @@ -96,10 +177,13 @@
96 177 </p>
97 178 </div>
98 179 </div>
99   - <div class="row" ng-if="pageSignin.signupErrorMessage">
  180 +
  181 + <!-- Feedback: ERRO no cadastro -->
  182 + <div class="row" ng-if="pageAuth.signupError">
100 183 <div class="col-sm-12">
101 184 <div class="alert alert-danger">
102   - {{pageSignin.signupErrorMessage}}
  185 + <strong>{{pageAuth.signupErrorTitle}}</strong>
  186 + {{pageAuth.signupErrorMessage}}
103 187 </div>
104 188 <div ng-if="vm.internalError">
105 189 <p>Este erro parece ser um problema interno.<br/>Por favor, tente novamente mais tarde.</p>
... ... @@ -110,30 +194,30 @@
110 194 </div>
111 195 <div class="row">
112 196 <div class="col-sm-12">
113   - <form name="signupForm" ng-submit="pageSignin.submitSignup($event, pageSignin.signup)">
  197 + <form name="signupForm" ng-submit="pageAuth.submitSignup($event, pageAuth.signup)">
114 198 <div class="form-group">
115 199 <label for="signup-form--name">Nome*:</label>
116 200 <span class="pull-right">*Dados obrigatórios</span>
117   - <input type="text" id="signup-form--name" name="name" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.name.$invalid && signupForm.name.$touched }" ng-model="pageSignin.signup.name" ng-minlength="" ng-maxlength="" required>
  201 + <input type="text" id="signup-form--name" name="name" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.name.$invalid && signupForm.name.$touched }" ng-model="pageAuth.signup.name" ng-minlength="" ng-maxlength="" required>
118 202 <validation-messages field="signupForm.name"></validation-messages>
119 203 </div>
120 204 <div class="form-group">
121 205 <label for="signup-form--email">E-mail*:</label>
122   - <input type="email" id="signup-form--email" name="email" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.email.$invalid && signupForm.email.$touched }" ng-model="pageSignin.signup.email" ng-minlength="" ng-maxlength="" required>
  206 + <input type="email" id="signup-form--email" name="email" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.email.$invalid && signupForm.email.$touched }" ng-model="pageAuth.signup.email" ng-minlength="" ng-maxlength="" required>
123 207 <validation-messages field="signupForm.email"></validation-messages>
124 208 </div>
125 209 <div class="row">
126 210 <div class="col-sm-6">
127 211 <div class="form-group">
128 212 <label for="signup-form--password">Senha*:</label>
129   - <input type="password" id="signup-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password.$invalid && signupForm.password.$touched }" ng-model="pageSignin.signup.password" ng-minlength="" ng-maxlength="" required>
  213 + <input type="password" id="signup-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password.$invalid && signupForm.password.$touched }" ng-model="pageAuth.signup.password" ng-minlength="" ng-maxlength="" required>
130 214 <validation-messages field="signupForm.password"></validation-messages>
131 215 </div>
132 216 </div>
133 217 <div class="col-sm-6">
134 218 <div class="form-group">
135 219 <label for="signup-form--password-confirmation">Confirmar Senha*:</label>
136   - <input type="password" id="signup-form--password-confirmation" name="password_confirmation" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password_confirmation.$invalid && signupForm.password_confirmation.$touched }" ng-model="pageSignin.signup.password_confirmation" ng-minlength="" ng-maxlength="" required>
  220 + <input type="password" id="signup-form--password-confirmation" name="password_confirmation" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password_confirmation.$invalid && signupForm.password_confirmation.$touched }" ng-model="pageAuth.signup.password_confirmation" ng-minlength="" ng-maxlength="" required>
137 221 <validation-messages field="signupForm.password_confirmation"></validation-messages>
138 222 </div>
139 223 </div>
... ... @@ -155,7 +239,7 @@
155 239 <div class="form-group">
156 240 <div class="checkbox">
157 241 <label for="user_terms_accepted">
158   - <input type="checkbox" id="user_terms_accepted" name="user_terms_accepted" value="aceito" ng-model="pageSignin.signup.user_terms_accepted" required />
  242 + <input type="checkbox" id="user_terms_accepted" name="user_terms_accepted" value="aceito" ng-model="pageAuth.signup.user_terms_accepted" required />
159 243 Já li e concordo com os
160 244 <button type="button" class="btn btn-link" style="padding:0 0 4px 0;" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button>
161 245 </label>
... ... @@ -169,12 +253,15 @@
169 253 Digite os caracteres acima:
170 254 </div>
171 255 <div class="captcha">
172   - <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageSignin.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
  256 + <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageAuth.signup.captcha_text" ng-minlength="" ng-maxlength="" required>
173 257 <validation-messages field="signupForm.captcha_text"></validation-messages>
174 258 </div>
175 259 </div>
176 260 <div class="form-group">
177   - <button type="submit" class="btn btn-lg btn-block btn-submit" ng-class=" {'disabled' : !pageSignin.signup.user_terms_accepted }">Cadastrar</button>
  261 + <button type="submit" class="btn btn-lg btn-block btn-submit" ng-class=" {'disabled' : !pageAuth.signup.user_terms_accepted }">Cadastrar</button>
  262 + </div>
  263 + <div class="form-group">
  264 + <a ui-sref="reenviar-email" class="btn btn-lg btn-link" style="padding: 10px 0;">Re-enviar e-mail de confirmação</a>
178 265 </div>
179 266 </form>
180 267 </div>
... ... @@ -184,6 +271,7 @@
184 271 </div>
185 272 </div>
186 273 </section>
  274 +
187 275 <div class="modal fade" id="modalTermosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel">
188 276 <div class="modal-dialog" role="document">
189 277 <div class="modal-content">
... ... @@ -194,8 +282,8 @@
194 282 </button>
195 283 </div>
196 284 <div class="modal-body modal-termos-uso-body">
197   - <div class="modal-termos-uso-body-inner" ng-if="pageSignin.terms">
198   - <div ng-bind-html="pageSignin.terms.body"></div>
  285 + <div class="modal-termos-uso-body-inner" ng-if="pageAuth.terms">
  286 + <div ng-bind-html="pageAuth.terms.body"></div>
199 287 </div>
200 288 </div>
201 289 </div>
... ...