From 2e08f655eaa0571f3d8589b22b769fd32a6222dd Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 09:00:12 -0400
Subject: [PATCH 1/8] Registration form now remembers field values for nested
 form errors

---
 app/models/user_profile.rb                   | 13 ++++++-------
 app/views/devise/registrations/new.html.haml |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index a9a569c..7c1cf32 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -1,16 +1,15 @@
 class UserProfile < ActiveRecord::Base
-  # Setup accessible (or protected) attributes for your model
   attr_accessible :user_id, :addrStreet1, :addrStreet2, :addrCity,
     :addrState, :addrZip, :phone
-  
+
   belongs_to :user
   belongs_to :bike
 
- #validates :addrStreet1 , :presence => true
- #validates :addrCity , :presence => true
- #validates :addrState , :presence => true
- #validates :addrZip , :presence => true
-  validates :phone, :presence => true
+  #validates :addrStreet1 , :presence => true
+  #validates :addrCity , :presence => true
+  #validates :addrState , :presence => true
+  #validates :addrZip , :presence => true
+  #validates :phone, :presence => true
 
   def to_s
     [addrStreet1, addrStreet2, addrCity, addrState, addrZip, phone].join(" - ")
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index f5b9336..ac01d8b 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -18,7 +18,8 @@
     %br/
     = f.email_field :email
   %div
-    = f.fields_for :user_profiles, UserProfile.new do |builder|
+    - profile_builder = resource.user_profiles.empty? ? resource.user_profiles.build : resource.user_profiles
+    = f.fields_for :user_profiles, profile_builder do |builder|
       = render 'user_profile_fields', f: builder
   %div
     = f.label :password

From 8c5132814f0d7821c29321c7744ada91c0cc8aef Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 09:02:26 -0400
Subject: [PATCH 2/8] New User Sign up now annoys user to input contact info

---
 app/assets/javascripts/new_user.js | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 app/assets/javascripts/new_user.js

diff --git a/app/assets/javascripts/new_user.js b/app/assets/javascripts/new_user.js
new file mode 100644
index 0000000..89e7d76
--- /dev/null
+++ b/app/assets/javascripts/new_user.js
@@ -0,0 +1,51 @@
+$(document).ready(function(){
+  var MIN_LEN = 3;
+  var MAX_SUBMITS = 3;
+  var submit_count = 0;
+  $("input[name=commit]").click( function(e){
+    console.log("clicked");
+    submit_count += 1;
+    //IDs of contact info
+    var contact_info_ids = [
+      "user_email",
+      "user_user_profiles_attributes_0_addrStreet1",
+      "user_user_profiles_attributes_0_addrCity",
+      "user_user_profiles_attributes_0_addrState",
+      "user_user_profiles_attributes_0_addrZip",
+      "user_user_profiles_attributes_0_phone"
+    ];
+    var contact_vals = "";
+    var index = 0;
+    //see if any contact info exists
+    for( var index in contact_info_ids){
+      contact_vals += $("#"+contact_info_ids[index]).val();
+    }
+    if( contact_vals.length >= MIN_LEN || submit_count > MAX_SUBMITS){
+
+      if( submit_count > MAX_SUBMITS ){
+        alert("Fine.");
+      }
+      return true;
+
+    }else{
+
+      switch(submit_count){
+        case 1:
+          alert("It appears you have not entered any contact information.  " +
+            "Please do.");
+          break;
+        case 2:
+          alert("It is highly recommended that you enter at least one form of" +
+            " contact information.  It is in your best interest.");
+          break;
+        case 3:
+          alert("If something happens to your bicycle, we will not be able to" +
+            " notify you.  Please enter at least one form of contact.");
+          break;
+        default:
+          alert("Please enter at least one form of contact.");
+      }
+      return false;
+    }
+  });
+});

From 73bb35de889c8f31ff90a575162f9cd19cc10e30 Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 09:58:43 -0400
Subject: [PATCH 3/8] Moving bootstrap.js

---
 app/assets/javascripts/{ => twitter}/bootstrap.js.coffee | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/javascripts/{ => twitter}/bootstrap.js.coffee (100%)

diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/twitter/bootstrap.js.coffee
similarity index 100%
rename from app/assets/javascripts/bootstrap.js.coffee
rename to app/assets/javascripts/twitter/bootstrap.js.coffee

From 75734a075c48763128b1d3a9dcda55451d5d08b4 Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 09:59:49 -0400
Subject: [PATCH 4/8] Moving new_user.js to devise/registrations.s

---
 app/assets/javascripts/{new_user.js => devise/registrations.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/javascripts/{new_user.js => devise/registrations.js} (100%)

diff --git a/app/assets/javascripts/new_user.js b/app/assets/javascripts/devise/registrations.js
similarity index 100%
rename from app/assets/javascripts/new_user.js
rename to app/assets/javascripts/devise/registrations.js

From db6b7ff7da0230c8c580f4eaa6fcc85891e214b0 Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 10:12:03 -0400
Subject: [PATCH 5/8] Adjusting how javascript is loaded

Now js is loaded per controller
---
 app/assets/javascripts/application.js     | 3 +--
 app/assets/javascripts/devise/sessions.js | 0
 app/assets/javascripts/site.js            | 0
 app/views/layouts/application.html.haml   | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/devise/sessions.js
 create mode 100644 app/assets/javascripts/site.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 5733810..7cec09e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,5 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap
-//= require_tree .
+//= require custom_netzke_helpers
diff --git a/app/assets/javascripts/devise/sessions.js b/app/assets/javascripts/devise/sessions.js
new file mode 100644
index 0000000..e69de29
diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js
new file mode 100644
index 0000000..e69de29
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 70660f1..6323b38 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,3 +28,4 @@
         %p &copy; Velocipede 2013
 
     = javascript_include_tag "application"
+    = javascript_include_tag params[:controller] 

From a07d6345e8e2c2c921dee945deba076531ce33b5 Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 10:25:12 -0400
Subject: [PATCH 6/8] Mildly better looking signup page w/ errors.

---
 app/helpers/devise_helper.rb                 | 23 ++++++++++++++++++++
 app/views/devise/registrations/new.html.haml |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 app/helpers/devise_helper.rb

diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb
new file mode 100644
index 0000000..e672d5b
--- /dev/null
+++ b/app/helpers/devise_helper.rb
@@ -0,0 +1,23 @@
+module DeviseHelper
+  # A simple way to show error messages for the current devise resource. If you need
+  # to customize this method, you can either overwrite it in your application helpers or
+  # copy the views to your application.
+  #
+  # This method is intended to stay simple and it is unlikely that we are going to change
+  # it to add more behavior or options.
+  def devise_error_messages!
+    return "" if resource.errors.empty?
+
+    messages = resource.errors.full_messages.map { |msg| content_tag(:p, msg, :class => "alert") }.join
+    sentence = I18n.t("errors.messages.not_saved",
+                      :count => resource.errors.count,
+                      :resource => resource.class.model_name.human.downcase)
+
+    html = <<-HTML
+    <p>#{sentence}</p>
+    #{messages}
+    HTML
+
+    html.html_safe
+  end
+end
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index ac01d8b..49aeb22 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,3 +1,4 @@
+= stylesheet_link_tag "bootstrap_and_overrides", :media => "all"
 %h2 Sign up
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
   = devise_error_messages!

From 9021294c4b6b64a06bcb67222af5bfa498726cec Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 11:08:58 -0400
Subject: [PATCH 7/8] Auth by username instead of email

Added username to User table/model
---
 app/components/app_tab_panel.rb                   | 2 +-
 app/components/user_stats.rb                      | 1 +
 app/components/users.rb                           | 1 +
 app/views/devise/registrations/new.html.haml      | 4 ++++
 app/views/devise/sessions/new.html.erb            | 8 ++++----
 config/initializers/devise.rb                     | 2 +-
 db/migrate/20130525143240_add_username_to_user.rb | 6 ++++++
 db/schema.rb                                      | 4 +++-
 spec/factories/users.rb                           | 4 ++++
 9 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20130525143240_add_username_to_user.rb

diff --git a/app/components/app_tab_panel.rb b/app/components/app_tab_panel.rb
index faf4bc8..58013a3 100644
--- a/app/components/app_tab_panel.rb
+++ b/app/components/app_tab_panel.rb
@@ -3,7 +3,7 @@ class AppTabPanel < Netzke::Basepack::TabPanel
 
   action :sign_out do |c|
     c.icon = :door_out
-    c.text = "Sign out #{controller.current_user.email}" if controller.current_user
+    c.text = "Exit" if controller.current_user
   end
 
   def configure(c)
diff --git a/app/components/user_stats.rb b/app/components/user_stats.rb
index cc52fa2..beec72c 100644
--- a/app/components/user_stats.rb
+++ b/app/components/user_stats.rb
@@ -4,6 +4,7 @@ class UserStats < Netzke::Base
     bike = user.bike
     %Q(
       <div id="user_stats_page">
+        <p>Username: #{user.username}</p>
         <p>Total Hours Worked: #{user.total_hours}</p>
         <p>Hours worked in #{Time.now.strftime('%B')}: #{user.current_month_hours}</p>
         <p>Current bike Shop ID: #{bike.shop_id if bike}</p>
diff --git a/app/components/users.rb b/app/components/users.rb
index b844e4a..45ef596 100644
--- a/app/components/users.rb
+++ b/app/components/users.rb
@@ -5,6 +5,7 @@ class Users < Netzke::Basepack::Grid
     c.model = "User"
 
     c.columns = [
+      :username,
       :first_name,
       :last_name,
       :nickname,
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 49aeb22..fb3f7f3 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -2,6 +2,10 @@
 %h2 Sign up
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
   = devise_error_messages!
+  %div
+    = f.label :username
+    %br/
+    = f.text_field :username
   %div
     = f.label :first_name
     %br/
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 6acf013..34db7fc 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,8 +3,8 @@
 <h2>Sign in</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-    <%= f.email_field :email %></div>
+  <div><%= f.label :username%><br />
+    <%= f.text_field :username%></div>
 
   <div><%= f.label :password %><br />
     <%= f.password_field :password %></div>
@@ -21,9 +21,9 @@
 <% if Rails.env.development? %>
   <% User.all.each do |user| %>
     <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-      <%= f.hidden_field :email, :value => user.email %></div>
+      <%= f.hidden_field :username, :value => user.username%></div>
       <%= f.hidden_field :password, :value => 'password' %></div>
-      <div><%= f.submit "Sign in as #{user.email}" %></div>
+      <div><%= f.submit "Sign in as #{user.username}" %></div>
     <% end %>
   <% end %>
 <% end %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index e0d6120..e923b33 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -26,7 +26,7 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # You can also supply a hash where the value is a boolean determining whether
   # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
+  config.authentication_keys = [ :username ]
 
   # Configure parameters from the request object used for authentication. Each entry
   # given should be a request method and it will automatically be passed to the
diff --git a/db/migrate/20130525143240_add_username_to_user.rb b/db/migrate/20130525143240_add_username_to_user.rb
new file mode 100644
index 0000000..9911140
--- /dev/null
+++ b/db/migrate/20130525143240_add_username_to_user.rb
@@ -0,0 +1,6 @@
+class AddUsernameToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :username, :string
+    add_index :users, :username, :unique => true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fcb1f7c..c68d03e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130419010051) do
+ActiveRecord::Schema.define(:version => 20130525143240) do
 
   create_table "bike_actions", :force => true do |t|
     t.string   "action",     :limit => 128, :null => false
@@ -177,10 +177,12 @@ ActiveRecord::Schema.define(:version => 20130419010051) do
     t.string   "first_name",             :default => "", :null => false
     t.string   "last_name",              :default => "", :null => false
     t.string   "nickname"
+    t.string   "username"
   end
 
   add_index "users", ["bike_id"], :name => "index_users_on_bike_id", :unique => true
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "users", ["username"], :name => "index_users_on_username", :unique => true
 
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 53c85a8..6d01799 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,5 +1,6 @@
 FactoryGirl.define do
   factory :user do
+    sequence(:username) { |n| "user_#{n}" }
     sequence(:email) { |n| "user_#{n}@example.com" }
     password 'password'
     password_confirmation { password }
@@ -9,16 +10,19 @@ FactoryGirl.define do
     association :user_role, factory: :role_user
 
     factory :staff do
+      username "staff"
       first_name 'Staff'
       association :user_role, factory: :role_staff
     end
 
     factory :admin do
+      username "admin"
       first_name 'Admin'
       association :user_role, factory: :role_admin
     end
 
     factory :bike_admin do
+      username "bike_admin"
       first_name 'BikeAdmin'
       association :user_role, factory: :role_bike_admin
     end

From 6d2e7686d6bb51080b78a399c02973530f96642d Mon Sep 17 00:00:00 2001
From: Jason Denney <jasondenney@gmail.com>
Date: Sat, 25 May 2013 11:13:52 -0400
Subject: [PATCH 8/8] Remove unneeded if

---
 app/components/app_tab_panel.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/app_tab_panel.rb b/app/components/app_tab_panel.rb
index 58013a3..1398d2a 100644
--- a/app/components/app_tab_panel.rb
+++ b/app/components/app_tab_panel.rb
@@ -3,7 +3,7 @@ class AppTabPanel < Netzke::Basepack::TabPanel
 
   action :sign_out do |c|
     c.icon = :door_out
-    c.text = "Exit" if controller.current_user
+    c.text = "Exit"
   end
 
   def configure(c)