No need for users controller anymore.

nbudin · Feb 8, 2010 · 18245d9 · 18245d9
1 parent 172d69c
commit 18245d9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 67 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -1,8 +1,12 @@
 <h1>Hello!</h1>
+
 <% unless admin_signed_in? -%>
+  <p><%= link_to 'Sign up as Admin', new_admin_registration_path %></p>
   <p><%= link_to 'Sign in as Admin', new_admin_session_path %></p>
 <% end -%>
+
 <% unless user_signed_in? -%>
+  <p><%= link_to 'Sign up as User', new_user_registration_path %></p>
   <p><%= link_to 'Sign in as User', new_user_session_path %></p>
 <% end -%>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,7 +17,7 @@
       <% if user_signed_in? -%>
         <div id="user_login_box" style="float:right">
           <%= current_user.email %> |
-          <%= link_to 'My info', edit_user_path %> |
+          <%= link_to 'My info', edit_user_registration_path %> |
           <%= link_to 'Sign out', destroy_user_session_path %>
         </div>
       <% end -%>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,7 +2,6 @@
   map.devise_for :users, :admin
 
   map.resources :home, :only => :index
-  map.resource :user
   map.resources :admins, :only => [:index]
 
   map.root :controller => :home

diff --git a/db/schema.rb b/db/schema.rb
@@ -12,17 +12,17 @@
 ActiveRecord::Schema.define(:version => 20091009223419) do
 
   create_table "admins", :force => true do |t|
-    t.string   "email",              :limit => 100, :null => false
+    t.string   "email",                            :null => false
-    t.string   "encrypted_password", :limit => 40,  :null => false
+    t.string   "encrypted_password", :limit => 40, :null => false
-    t.string   "password_salt",      :limit => 20,  :null => false
+    t.string   "password_salt",                    :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "users", :force => true do |t|
-    t.string   "email",                :limit => 100,                :null => false
+    t.string   "email",                                             :null => false
-    t.string   "encrypted_password",   :limit => 40,                 :null => false
+    t.string   "encrypted_password",   :limit => 40,                :null => false
-    t.string   "password_salt",        :limit => 20,                 :null => false
+    t.string   "password_salt",                                     :null => false
     t.string   "confirmation_token",   :limit => 20
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
@@ -34,7 +34,7 @@
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",                     :default => 0
+    t.integer  "failed_attempts",                    :default => 0
     t.string   "unlock_token",         :limit => 20
     t.datetime "locked_at"
     t.datetime "created_at"