Commit 7cde9843
Changed files (5)
app
assets
javascripts
views
sessions
views
sessions
spec
javascripts
views
app/assets/javascripts/views/sessions/login_form.js.coffee
@@ -2,14 +2,37 @@
class CakeSide.Views.LoginForm extends CakeSide.AutoView
@viewName 'login-form'
+ modelKey: "session"
events:
- 'change #session_username': 'render'
- 'change #session_password': 'render'
+ 'keyup #session_username': 'onKeyUp'
+ 'keyup #session_password': 'onKeyUp'
+ 'submit form': 'onSubmit'
render: ->
- @$('input[type=submit]').prop('disabled', !@valid())
+ @hideErrors()
+ @$('input[type=submit]').prop('disabled', !@isValid())
+ _.each _.keys(@errors), (key) =>
+ @showError(@field(key), @errors[key])
- valid: ->
- !_.isEmpty(@field("username").val()) && !_.isEmpty(@field("password").val())
+ isValid: ->
+ _.keys(@errors).length == 0
- modelKey: -> "session"
+ validate: ->
+ @errors = {}
+ if _.isEmpty(@field("username").val())
+ @errors['username'] = "Email is required"
+
+ if _.isEmpty(@field("password").val())
+ @errors['password'] = "Password is required"
+
+ onKeyUp: (event) ->
+ @validate()
+ @render()
+
+ onSubmit: (event) ->
+ console.log("SUBMITTED")
+ @validate()
+ if !@isValid()
+ event.preventDefault()
+ event.stopPropagation()
+ @render()
app/assets/javascripts/views/auto_view.js.coffee
@@ -24,6 +24,13 @@ class CakeSide.AutoView extends Backbone.View
@views[key] ?= []
@views[key].push(view)
- field: (name) -> $("##{@fieldName(name)}")
- fieldName: (name) -> "#{@modelKey()}_#{name}"
+ hideErrors: () ->
+ @$(':input').removeClass('is-invalid')
+ @$('.invalid-feedback').html('')
+
+ showError: (field, message) ->
+ @$(field).addClass('is-invalid').siblings('.invalid-feedback').html(message)
+
+ field: (name) -> @$("##{@fieldName(name)}")
+ fieldName: (name) -> "#{@modelKey}_#{name}"
render: -> @
app/views/sessions/new.html.erb
@@ -23,17 +23,21 @@
</div>
</div>
<div class="col">
- <%= form_for(@session, url: sessions_path(@session), html: { class: "form-horizontal", data: { autoview: 'login-form' } }) do |f| %>
- <legend>Got an account? Login!</legend>
- <div class="form-group">
- <%= email_field_tag 'session[username]', '', placeholder: 'Email', class: "form-control", required: :required %>
- </div>
- <div class="form-group">
- <%= password_field_tag 'session[password]', '', placeholder: 'Password', class: "form-control", required: :required %>
- </div>
- <p><%= link_to "Forgot your password?", new_password_path %></p>
- <%= f.submit t(".sign_in"), class: "btn btn-primary" %>
- <% end %>
+ <div data-autoview="login-form">
+ <%= form_for(@session, url: sessions_path(@session), html: { class: "form-horizontal needs-validation" }) do |f| %>
+ <legend>Got an account? Login!</legend>
+ <div class="form-group">
+ <%= email_field_tag 'session[username]', '', placeholder: 'Email', class: "form-control", required: :required %>
+ <div class="invalid-feedback"></div>
+ </div>
+ <div class="form-group">
+ <%= password_field_tag 'session[password]', '', placeholder: 'Password', class: "form-control", required: :required %>
+ <div class="invalid-feedback"></div>
+ </div>
+ <p><%= link_to "Forgot your password?", new_password_path %></p>
+ <%= f.submit t(".sign_in"), class: "btn btn-primary" %>
+ <% end %>
+ </div>
<%= form_for(User.new, as: :user, url: registration_path, html: { class: 'form-horizontal' }) do |f| %>
<fieldset>
spec/javascripts/views/sessions/login_form_spec.js.coffee
@@ -0,0 +1,46 @@
+describe "CakeSide.Views.LoginForm", ->
+ subject = null
+
+ beforeEach ->
+ fixture.set '''
+<div data-autoview="login-form">
+ <form class="form-horizontal" data-autoview="login-form" id="new_user_session" action="/sessions" accept-charset="UTF-8" method="post">
+ <input name="utf8" type="hidden" value="✓">
+ <input type="hidden" name="authenticity_token" value="NUk9vz3sVMzi09PgQrzOTDcJIki2RgCzHgtpFw0ooSha4lgMt/bUsuAk//Wvi7wb/K6qh+pVrDkKr5a5e66QTw==">
+ <div class="form-group">
+ <input type="email" name="session[username]" id="session_username" value="" placeholder="Email" class="form-control" required="required">
+ <div class="invalid-feedback"></div>
+ </div>
+ <div class="form-group">
+ <input type="password" name="session[password]" id="session_password" value="" placeholder="Password" class="form-control" required="required">
+ <div class="invalid-feedback"></div>
+ </div>
+ <p><a href="/passwords/new">Forgot your password?</a></p>
+ <input type="submit" name="commit" value="Sign In" class="btn btn-primary">
+ </form>
+</div>
+'''
+
+ subject = new CakeSide.Views.LoginForm
+ el: $('[data-autoview=login-form]')
+
+ it "disables the submit button when the email is missing", ->
+ subject.$('form').submit()
+
+ expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
+ expect(subject.field('username').siblings('.invalid-feedback').html()).toEqual("Email is required")
+
+ it "disables the submit button when the password is missing", ->
+ subject.field('username').val('user@email.com')
+ subject.$('form').submit()
+
+ expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
+ expect(subject.field("password").siblings('.invalid-feedback').html()).toEqual("Password is required")
+
+ it "enables the submit button when all required fields are specified", ->
+ subject.field('username').val('user@email.com').change()
+ subject.field('password').val('password').change()
+
+ expect(subject.$('input[type=submit]').prop('disabled')).toEqual(false)
+ expect(subject.field('username').siblings('.invalid-feedback').html()).toEqual('')
+ expect(subject.field('password').siblings('.invalid-feedback').html()).toEqual('')
spec/javascripts/views/sessions/login_page_spec.js.coffee
@@ -1,32 +0,0 @@
-describe "CakeSide.Views.LoginForm", ->
- subject = null
-
- beforeEach ->
- fixture.set '''
-<form class="form-horizontal" data-autoview="login-form" id="new_user_session" action="/sessions" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓"><input type="hidden" name="authenticity_token" value="NUk9vz3sVMzi09PgQrzOTDcJIki2RgCzHgtpFw0ooSha4lgMt/bUsuAk//Wvi7wb/K6qh+pVrDkKr5a5e66QTw==">
- <div class="form-group">
- <input type="email" name="session[username]" id="session_username" value="" placeholder="Email" class="form-control" required="required">
- </div>
- <div class="form-group">
- <input type="password" name="session[password]" id="session_password" value="" placeholder="Password" class="form-control" required="required">
- </div>
- <p><a href="/passwords/new">Forgot your password?</a></p>
- <input type="submit" name="commit" value="Sign In" class="btn btn-primary">
-</form>
- '''
-
- subject = new CakeSide.Views.LoginForm
- el: $('#new_user_session')
-
- it "disables the submit button when the email is missing", ->
- subject.field('password').val('password').change()
- expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
-
- it "disables the submit button when the password is missing", ->
- subject.field('username').val('user@email.com').change()
- expect(subject.$('input[type=submit]').prop('disabled')).toEqual(true)
-
- it "enables the submit button when all required fields are specified", ->
- subject.field('username').val('user@email.com').change()
- subject.field('password').val('password').change()
- expect(subject.$('input[type=submit]').prop('disabled')).toEqual(false)