Download as
Browse Code »

Commit f9be1f4f064ecb359e06ab7bfc4d68b10884c2b3

Authored by Evandro Junior
1 parent 9c599ec5
Exists in master and in 2 other branches production, staging

Needs to add the name of the user

Showing 2 changed files with 21 additions and 20 deletions   Show diff stats
index.html
  Diff comments   View file @f9be1f4
... ... @@ -422,8 +422,8 @@
422 422 </div>
423 423 <p class="box-subtitle">Ou acesse:</p>
424 424 <div class="username">
425   - <label for="login-user_name" class="label">Nome de Usuário / E-mail:</label>
426   - <input id="login-user_name" name="login" type="text" placeholder="Nome do usuário / E-mail">
  425 + <label for="login-user_name" class="label">E-mail:</label>
  426 + <input id="login-user_name" name="login" type="text" placeholder="E-mail">
427 427 </div>
428 428 <div class="password">
429 429 <label for="login-user_password" class="label">Senha:</label>
... ... @@ -475,8 +475,8 @@
475 475 <div class="message alert-danger hide"></div>
476 476 <div class="row">
477 477 <div class="value col-sm-12">
478   - <label for="forgot-password-value" class="label">Informe o nome de usuário ou E-mail:</label>
479   - <input id="forgot-password-value" name="value" type="text" required placeholder="Nome de usuário ou E-mail">
  478 + <label for="forgot-password-value" class="label">Informe o E-mail:</label>
  479 + <input id="forgot-password-value" name="value" type="text" required placeholder="E-mail">
480 480 </div>
481 481 </div>
482 482 <div class="row">
... ... @@ -507,10 +507,6 @@
507 507 <label for="signup-user_email" class="label">E-mail:</label>
508 508 <input id="signup-user_email" name="email" type="email" required placeholder="E-mail">
509 509 </div>
510   - <div class="username">
511   - <label for="signup-user_name" class="label">Nome de Usuário</label>
512   - <input id="signup-user_name" name="login" type="text" required placeholder="Nome do usuário">
513   - </div>
514 510 <div class="row">
515 511 <div class="password col-sm-6">
516 512 <label for="signup-user_password" class="label">Senha:</label>
... ...
js/main.js
  Diff comments   View file @f9be1f4
... ... @@ -85,7 +85,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
85 85 function fillSignupForm(signupForm, user) {
86 86 signupForm.find('#signup-user_email').val(user.email);
87 87 signupForm.find('#signup-user_email').attr('disabled', true);
88   - signupForm.find('#signup-user_name').val(user.login);
  88 + //signupForm.find('#signup-user_name').val(user.login);
89 89 signupForm.find('#user_oauth_signup_token').val(user.signup_token);
90 90 signupForm.find('#user_oauth_providers').val(user.oauth_providers);
91 91 signupForm.find('div.password').hide();
... ... @@ -812,11 +812,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
812 812 if(user.person && user.person.name){
813 813 name = user.person.name + ' - ';
814 814 }else{
815   - name = user.login + ' - ';
  815 + name = user.email + ' - ';
816 816 }
817 817  
818 818 }
819   - $('#logout-button .name').text(name);
  819 + $('#logout-button .name').text(user.email + " - ");
820 820 $('#logout-button').show();
821 821 },
822 822 responseToText: function(responseJSONmessage){
... ... @@ -832,7 +832,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
832 832 }
833 833 }
834 834 }
835   - msg = msg.replace(/login incorrect format/g,"campo \"nome do usuário\" está com formato inválido. O mesmo só pode ser composto por letras minúsculas, números, '_' e '-'. Adicionalmente não é permitido usar acentuação nem começar com '_' ou '-'");
  835 + msg = msg.replace(/login incorrect format/g,"campo \"nome do usuário\" está com formato inválido. O mesmo só pode ser composto por letras minúsculas, números, '_' e '-'. Adicionalmente não é permitido usar acentuação nem começar com '_' ou '-'");
836 836 msg = msg.replace('password_confirmation', 'campo "confirmação da senha"');
837 837 msg = msg.replace(/password/g, 'campo "senha"');
838 838 msg = msg.replace(/login/g, 'campo "nome de usuário"');
... ... @@ -975,7 +975,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
975 975 },
976 976 handleLoginSuccess: function (e, data){
977 977 if(data.person){
978   - Main.setUser({person: data.person});
  978 + Main.setUser(data);
979 979 }
980 980 Main.loginCallback(data.activated, data.private_token);
981 981 },
... ... @@ -1527,7 +1527,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1527 1527  
1528 1528 signupForm.find('#signup-user_email').val('');
1529 1529 signupForm.find('#signup-user_email').attr('disabled', false);
1530   - signupForm.find('#signup-user_name').val('');
  1530 + //signupForm.find('#signup-user_name').val('');
1531 1531 signupForm.find('#user_password_confirmation').val('');
1532 1532 signupForm.find('#signup-user_password').val('');
1533 1533 signupForm.find('#captcha_text').val('');
... ... @@ -1551,7 +1551,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1551 1551 var $button = $(this);
1552 1552 var $signupForm = $(this).parents('form.signup');
1553 1553 var $inputEmail = $signupForm.find('#signup-user_email');
1554   - var $inputUsername = $signupForm.find('#signup-user_name');
  1554 + //var $inputUsername = $signupForm.find('#signup-user_name');
1555 1555 var $inputPassword = $signupForm.find('#signup-user_password');
1556 1556 var $inputPasswordConfirmation = $signupForm.find('#user_password_confirmation');
1557 1557 var $inputAcceptation = $signupForm.find('#user_terms_accepted');
... ... @@ -1564,7 +1564,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1564 1564  
1565 1565 // Validate form
1566 1566 var hasEmail = $inputEmail && $inputEmail.val().length > 0;
1567   - var hasUsername = $inputUsername && $inputUsername.val().length > 0;
  1567 + //var hasUsername = $inputUsername && $inputUsername.val().length > 0;
1568 1568  
1569 1569 var isOAUTH = $signupForm.find('#user_oauth_providers').val() !== '';
1570 1570  
... ... @@ -1580,7 +1580,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1580 1580  
1581 1581 var hasAcceptation = $inputAcceptation.prop('checked');
1582 1582 var hasCaptcha = $inputCaptcha.val().length > 0;
1583   - var hasError = (!hasEmail || !hasUsername || !hasPassword || !hasPasswordConfirmation || !hasPasswordEquals || !hasAcceptation || !hasCaptcha);
  1583 + var hasError = (!hasEmail || !hasPassword || !hasPasswordConfirmation || !hasPasswordEquals || !hasAcceptation || !hasCaptcha);
1584 1584  
1585 1585 if(hasError){
1586 1586  
... ... @@ -1596,9 +1596,9 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1596 1596 messageErrors.push('<li>O e-mail é um campo obrigatório.</li>');
1597 1597 }
1598 1598  
1599   - if (!hasUsername){
1600   - messageErrors.push('<li>O nome de usuário é um campo obrigatório.</li>');
1601   - }
  1599 + // if (!hasUsername){
  1600 + // messageErrors.push('<li>O nome de usuário é um campo obrigatório.</li>');
  1601 + // }
1602 1602  
1603 1603 if(!isOAUTH){
1604 1604 if (!hasPassword){
... ... @@ -1637,6 +1637,11 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
1637 1637 if(! new RegExp('email=').test(signup_form_data)){
1638 1638 signup_form_data += "&email=" + $inputEmail.val();
1639 1639 }
  1640 + var indexAt = $inputEmail.val().indexOf('@');
  1641 + login = $inputEmail.val().substr(0, indexAt);
  1642 + login = login.toLowerCase().replace(/\W+/g,"").substr(0,25) + "-" + Date.now();
  1643 + signup_form_data += "&login=" + login;
  1644 + signup_form_data += "&name=" + $inputEmail.val();
1640 1645 $.ajax({
1641 1646 type: 'post',
1642 1647 contentType: 'application/x-www-form-urlencoded',
... ...