Download as
Browse Code »

Commit a10745b37f5dbf2c576b7d59b976f2968a5df27b

Authored by Leonardo Merlin
1 parent a68755ce
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Improv username label at header

Showing 5 changed files with 65 additions and 45 deletions   Show diff stats
src/app/components/auth-user/auth-user.html
  Diff comments   View file @a10745b
1 1 <div class="auth-user">
2 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 5 <span>|</span>
5 6 <button type="button" class="btn btn-link" ng-click="vm.onClickLogout()">Sair</button>
6 7 </div>
7 8  
8 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 11 </div>
15 12 </div>
... ...
src/app/index.constants.js
  Diff comments   View file @a10745b
... ... @@ -5,8 +5,8 @@
5 5 angular
6 6 .module('dialoga')
7 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 11 .constant('API', {
12 12 token: null,
... ...
src/app/pages/auth/auth.controller.js
  Diff comments   View file @a10745b
... ... @@ -36,7 +36,7 @@
36 36  
37 37 // init variables
38 38 vm.signin = {};
39   - vm.singup = {};
  39 + vm.signup = {};
40 40 vm.terms = null;
41 41 vm.loadingTerms = null;
42 42 vm.delay = 3; // segundos
... ... @@ -121,16 +121,26 @@
121 121 vm.AuthService.logout();
122 122 };
123 123  
124   - AuthPageController.prototype.submitSingup = function(credentials) {
  124 + AuthPageController.prototype.submitSignup = function($event, credentials) {
125 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 136 vm.AuthService.register(credentials).then(function(response) {
128 137 vm.$log.debug('register success.response', response);
129 138  
130 139 // TODO: mensagens de sucesso
131 140 // 'Cadastro efetuado com sucesso.'
132 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 144 vm.redirectBack();
135 145 }, function(response) {
136 146 vm.$log.debug('register error.response', response);
... ...
src/app/pages/auth/auth.scss
  Diff comments   View file @a10745b
... ... @@ -92,6 +92,10 @@
92 92 }
93 93 }
94 94 }
  95 +
  96 + .feedback-message {
  97 + padding: 20px 0;
  98 + }
95 99 }
96 100  
97 101 .modal-dialog {
... ...
src/app/pages/auth/signin.html
  Diff comments   View file @a10745b
... ... @@ -11,15 +11,24 @@
11 11 <div ng-if="pageSignin.currentUser">
12 12 <div class="row">
13 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 31 </div>
22   - <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
23 32 </div>
24 33 </div>
25 34 </div>
... ... @@ -28,18 +37,18 @@
28 37 <div class="col-sm-5">
29 38 <div class="row">
30 39 <div class="col-md-12">
31   - <h2>Já possui cadastro</h2>
  40 + <h2>Já possui cadastro?</h2>
32 41 <p>Use seus dados para acessar o Dialoga Brasil</p>
33 42 <form role="form" name="signinForm" ng-submit="pageSignin.submitSignin(pageSignin.signin)" novalidate>
34 43 <div class="form-group">
35 44 <label for="signin-form--login">E-mail*</label>
36 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 47 </div>
39 48 <div class="form-group">
40 49 <label for="signin-form--password">Senha*</label>
41 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 52 </div>
44 53 <div class="form-group">
45 54 <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
... ... @@ -96,31 +105,31 @@
96 105 </div>
97 106 <div class="row">
98 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 109 <div class="form-group">
101 110 <label for="signup-form--name">Nome*:</label>
102 111 <span class="pull-right">*Dados obrigatórios</span>
103 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 114 </div>
106 115 <div class="form-group">
107 116 <label for="signup-form--email">E-mail*:</label>
108 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 119 </div>
111 120 <div class="row">
112 121 <div class="col-sm-6">
113 122 <div class="form-group">
114 123 <label for="signup-form--password">Senha*:</label>
115 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 126 </div>
118 127 </div>
119 128 <div class="col-sm-6">
120 129 <div class="form-group">
121 130 <label for="signup-form--password-confirmation">Confirmar Senha*:</label>
122 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 133 </div>
125 134 </div>
126 135 </div>
... ... @@ -141,35 +150,35 @@
141 150 <div class="form-group">
142 151 <div class="checkbox">
143 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 154 Já li e concordo com os
146 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 156 </label>
148 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 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 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 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 176 </div>
167 177 </div>
168 178 </div>
169 179 </div>
170   - </section>
171   -
172   -
  180 + </div>
  181 +</section>
173 182 <div class="modal fade" id="modalTermosDeUso" tabindex="-1" role="dialog" aria-labelledby="termosDeUsoLabel">
174 183 <div class="modal-dialog" role="document">
175 184 <div class="modal-content">
... ...