Commit a10745b37f5dbf2c576b7d59b976f2968a5df27b

Authored by Leonardo Merlin
1 parent a68755ce

Improv username label at header

src/app/components/auth-user/auth-user.html
1 <div class="auth-user"> 1 <div class="auth-user">
2 <div ng-if="vm.currentUser" class="pull-right"> 2 <div ng-if="vm.currentUser" class="pull-right">
3 - <span>{{::vm.currentUser.login}}</span> 3 + <span ng-if="vm.currentUser.person">{{::vm.currentUser.person.name}}</span>
  4 + <span ng-if="!vm.currentUser.person">{{::vm.currentUser.login}}</span>
4 <span>|</span> 5 <span>|</span>
5 <button type="button" class="btn btn-link" ng-click="vm.onClickLogout()">Sair</button> 6 <button type="button" class="btn btn-link" ng-click="vm.onClickLogout()">Sair</button>
6 </div> 7 </div>
7 8
8 <div ng-if="!vm.currentUser"> 9 <div ng-if="!vm.currentUser">
9 - <button type="button" class="btn btn-link pull-right" ui-sref="entrar">  
10 - <!-- <span class="icon icon-user" aria-hidden="true"></span> -->  
11 - <!-- <span class="glyphicon glyphicon-user"></span> -->  
12 - Entrar  
13 - </button> 10 + <button type="button" class="btn btn-link pull-right" ui-sref="entrar">Entrar</button>
14 </div> 11 </div>
15 </div> 12 </div>
src/app/index.constants.js
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 angular 5 angular
6 .module('dialoga') 6 .module('dialoga')
7 .constant('PATH', { 7 .constant('PATH', {
8 - host: 'http://dialoga.gov.br',  
9 - image: 'http://login.dialoga.gov.br' 8 + host: 'http://hom.dialoga.gov.br',
  9 + image: 'http://hom.login.dialoga.gov.br'
10 }) 10 })
11 .constant('API', { 11 .constant('API', {
12 token: null, 12 token: null,
src/app/pages/auth/auth.controller.js
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 36
37 // init variables 37 // init variables
38 vm.signin = {}; 38 vm.signin = {};
39 - vm.singup = {}; 39 + vm.signup = {};
40 vm.terms = null; 40 vm.terms = null;
41 vm.loadingTerms = null; 41 vm.loadingTerms = null;
42 vm.delay = 3; // segundos 42 vm.delay = 3; // segundos
@@ -121,16 +121,26 @@ @@ -121,16 +121,26 @@
121 vm.AuthService.logout(); 121 vm.AuthService.logout();
122 }; 122 };
123 123
124 - AuthPageController.prototype.submitSingup = function(credentials) { 124 + AuthPageController.prototype.submitSignup = function($event, credentials) {
125 var vm = this; 125 var vm = this;
126 126
  127 + vm.$log.debug('submiting form $event', $event);
  128 + vm.$log.debug('submiting form credentials', credentials);
  129 +
  130 + var target = $event.target;
  131 + var $target = angular.element(target);
  132 + var $captcha = $target.find('[name="txtToken_captcha_serpro_gov_br"]');
  133 + credentials.txtToken_captcha_serpro_gov_br = $captcha.val();
  134 +
  135 + // vm.signupFormStatus = 'SENDIN';
127 vm.AuthService.register(credentials).then(function(response) { 136 vm.AuthService.register(credentials).then(function(response) {
128 vm.$log.debug('register success.response', response); 137 vm.$log.debug('register success.response', response);
129 138
130 // TODO: mensagens de sucesso 139 // TODO: mensagens de sucesso
131 // 'Cadastro efetuado com sucesso.' 140 // 'Cadastro efetuado com sucesso.'
132 // 'Verifique seu email para confirmar o cadastro.' 141 // 'Verifique seu email para confirmar o cadastro.'
133 - vm.successMessage = '<h3>Cadastro efetuado com sucesso.</h3>' + '<p>Verifique seu <b>email</b> para confirmar o cadastro.</p>'; 142 + vm.messageTitle = 'Cadastro efetuado com sucesso!';
  143 + vm.successMessage = 'Verifique seu e-mail para confirmar o cadastro.';
134 vm.redirectBack(); 144 vm.redirectBack();
135 }, function(response) { 145 }, function(response) {
136 vm.$log.debug('register error.response', response); 146 vm.$log.debug('register error.response', response);
src/app/pages/auth/auth.scss
@@ -92,6 +92,10 @@ @@ -92,6 +92,10 @@
92 } 92 }
93 } 93 }
94 } 94 }
  95 +
  96 + .feedback-message {
  97 + padding: 20px 0;
  98 + }
95 } 99 }
96 100
97 .modal-dialog { 101 .modal-dialog {
src/app/pages/auth/signin.html
@@ -11,15 +11,24 @@ @@ -11,15 +11,24 @@
11 <div ng-if="pageSignin.currentUser"> 11 <div ng-if="pageSignin.currentUser">
12 <div class="row"> 12 <div class="row">
13 <div class="col-sm-8 col-sm-offset-2"> 13 <div class="col-sm-8 col-sm-offset-2">
14 - <div>  
15 - <h3 ng-if="!pageSignin.successMessage">Você está logado!</h3>  
16 - <h3 ng-if="pageSignin.successMessage" ng-bind-html="pageSignin.successMessage"></h3>  
17 - <div ng-if="pageSignin.countdown > 0">  
18 - <p>  
19 - Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>...  
20 - </p> 14 + <div class="feedback-message">
  15 + <show-message
  16 + type="'success'"
  17 + title="pageSignin.messageTitle || 'Você está logado!'"
  18 + message="pageSignin.successMessage"
  19 + ></show-message>
  20 +
  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>
  28 + </div>
  29 + <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
  30 + </div>
21 </div> 31 </div>
22 - <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>  
23 </div> 32 </div>
24 </div> 33 </div>
25 </div> 34 </div>
@@ -28,18 +37,18 @@ @@ -28,18 +37,18 @@
28 <div class="col-sm-5"> 37 <div class="col-sm-5">
29 <div class="row"> 38 <div class="row">
30 <div class="col-md-12"> 39 <div class="col-md-12">
31 - <h2>Já possui cadastro</h2> 40 + <h2>Já possui cadastro?</h2>
32 <p>Use seus dados para acessar o Dialoga Brasil</p> 41 <p>Use seus dados para acessar o Dialoga Brasil</p>
33 <form role="form" name="signinForm" ng-submit="pageSignin.submitSignin(pageSignin.signin)" novalidate> 42 <form role="form" name="signinForm" ng-submit="pageSignin.submitSignin(pageSignin.signin)" novalidate>
34 <div class="form-group"> 43 <div class="form-group">
35 <label for="signin-form--login">E-mail*</label> 44 <label for="signin-form--login">E-mail*</label>
36 <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/> 45 <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/>
37 - <validation-messages field="signinForm.login"/> 46 + <validation-messages field="signinForm.login"></validation-messages>
38 </div> 47 </div>
39 <div class="form-group"> 48 <div class="form-group">
40 <label for="signin-form--password">Senha*</label> 49 <label for="signin-form--password">Senha*</label>
41 <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> 50 <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>
42 - <validation-messages field="signinForm.password"/> 51 + <validation-messages field="signinForm.password"></validation-messages>
43 </div> 52 </div>
44 <div class="form-group"> 53 <div class="form-group">
45 <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button> 54 <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
@@ -96,31 +105,31 @@ @@ -96,31 +105,31 @@
96 </div> 105 </div>
97 <div class="row"> 106 <div class="row">
98 <div class="col-sm-12"> 107 <div class="col-sm-12">
99 - <form name="signupForm" ng-submit="pageSignin.submitSigup(pageSignin.signup)"> 108 + <form name="signupForm" ng-submit="pageSignin.submitSignup($event, pageSignin.signup)">
100 <div class="form-group"> 109 <div class="form-group">
101 <label for="signup-form--name">Nome*:</label> 110 <label for="signup-form--name">Nome*:</label>
102 <span class="pull-right">*Dados obrigatórios</span> 111 <span class="pull-right">*Dados obrigatórios</span>
103 <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> 112 <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>
104 - <validation-messages field="signupForm.name"/> 113 + <validation-messages field="signupForm.name"></validation-messages>
105 </div> 114 </div>
106 <div class="form-group"> 115 <div class="form-group">
107 <label for="signup-form--email">E-mail*:</label> 116 <label for="signup-form--email">E-mail*:</label>
108 <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> 117 <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>
109 - <validation-messages field="signupForm.email"/> 118 + <validation-messages field="signupForm.email"></validation-messages>
110 </div> 119 </div>
111 <div class="row"> 120 <div class="row">
112 <div class="col-sm-6"> 121 <div class="col-sm-6">
113 <div class="form-group"> 122 <div class="form-group">
114 <label for="signup-form--password">Senha*:</label> 123 <label for="signup-form--password">Senha*:</label>
115 <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> 124 <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>
116 - <validation-messages field="signupForm.password"/> 125 + <validation-messages field="signupForm.password"></validation-messages>
117 </div> 126 </div>
118 </div> 127 </div>
119 <div class="col-sm-6"> 128 <div class="col-sm-6">
120 <div class="form-group"> 129 <div class="form-group">
121 <label for="signup-form--password-confirmation">Confirmar Senha*:</label> 130 <label for="signup-form--password-confirmation">Confirmar Senha*:</label>
122 <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> 131 <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>
123 - <validation-messages field="signupForm.password_confirmation"/> 132 + <validation-messages field="signupForm.password_confirmation"></validation-messages>
124 </div> 133 </div>
125 </div> 134 </div>
126 </div> 135 </div>
@@ -141,35 +150,35 @@ @@ -141,35 +150,35 @@
141 <div class="form-group"> 150 <div class="form-group">
142 <div class="checkbox"> 151 <div class="checkbox">
143 <label for="user_terms_accepted"> 152 <label for="user_terms_accepted">
144 - <input type="checkbox" id="user_terms_accepted" name="user_terms_accepted" value="aceito" ng-model="pageSignin.signup.user_terms_accepted" required> 153 + <input type="checkbox" id="user_terms_accepted" name="user_terms_accepted" value="aceito" ng-model="pageSignin.signup.user_terms_accepted" required />
145 Já li e concordo com os 154 Já li e concordo com os
146 <button type="button" class="btn btn-link" style="padding:0 0 4px 0;" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button> 155 <button type="button" class="btn btn-link" style="padding:0 0 4px 0;" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button>
147 </label> 156 </label>
148 </div> 157 </div>
149 - </input>  
150 - <validation-messages field="signupForm.user_terms_accepted"/>  
151 - </div>  
152 - <div class="form-group">  
153 - <div id="serpro_captcha" class="captcha"> 158 + <validation-messages field="signupForm.user_terms_accepted"></validation-messages>
154 </div> 159 </div>
155 - <div class="captcha">  
156 - Digite os caracteres acima: 160 + <div class="form-group">
  161 + <div id="serpro_captcha" class="captcha">
  162 + </div>
  163 + <div class="captcha">
  164 + Digite os caracteres acima:
  165 + </div>
  166 + <div class="captcha">
  167 + <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>
  168 + <validation-messages field="signupForm.captcha_text"></validation-messages>
  169 + </div>
157 </div> 170 </div>
158 - <div class="captcha">  
159 - <input type="text" name="captcha_text" id="captcha_text" aria-label="Escreva os caracteres do captcha aqui" ng-model="pageSignin.signup.captcha_text"> 171 + <div class="form-group">
  172 + <button type="submit" class="btn btn-lg btn-block btn-submit" ng-class=" {'disabled' : !pageSignin.signup.user_terms_accepted }">Cadastrar</button>
160 </div> 173 </div>
161 - </div>  
162 - <div class="form-group">  
163 - <button class="btn btn-lg btn-block btn-submit" ng-class=" {'disabled' : !pageSignin.signup.user_terms_accepted }" type="submit">Cadastrar</button>  
164 - </div>  
165 - </form> 174 + </form>
  175 + </div>
166 </div> 176 </div>
167 </div> 177 </div>
168 </div> 178 </div>
169 </div> 179 </div>
170 - </section>  
171 -  
172 - 180 + </div>
  181 +</section>
173 <div class="modal fade" id="modalTermosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel"> 182 <div class="modal fade" id="modalTermosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel">
174 <div class="modal-dialog" role="document"> 183 <div class="modal-dialog" role="document">
175 <div class="modal-content"> 184 <div class="modal-content">