app/controllers/user_sessions_controller.rb app/controllers/users_controller.rb app/helpers/user_sessions_helper.rb app/helpers/users_helper.rb app/models/user.rb app/models/user_session.rb app/views/user_sessions/new.html.erb app/views/users/_user.html.erb app/views/users/edit.html.erb app/views/users/new.html.erb db/migrate/20091111183038_create_users.rb test/fixtures/users.yml test/functional/user_sessions_controller_test.rb test/functional/users_controller_test.rb test/unit/helpers/user_sessions_helper_test.rb test/unit/helpers/users_helper_test.rb test/unit/user_test.rb @@ -6,5 +6,16 @@ class ApplicationController < ActionController::Base protect_from_forgery # See ActionController::RequestForgeryProtection for details # Scrub sensitive parameters from your log - # filter_parameter_logging :password + filter_parameter_logging :password + + helper_method :current_user + + private + def current_user_session + @current_user_session ||= UserSession.find + end + + def current_user + @current_user ||= current_user_session && current_user_session.record + end end app/controllers/application_controller.rb @@ -16,8 +16,16 @@ </head> <body class="<%= controller.action_name -%>"> <div id="header"> - Main title etc go here + <div id="user_nav"> + <% if current_user %> + <%= link_to "Edit profile", edit_user_path(:current) %> | + <%= link_to "Logout", logout_path %> + <% else %> + <%= link_to "Register", new_user_path %> | + <%= link_to "Log in", login_path %> + <% end %> </div> + </div> <p style="color: green"><%= flash[:notice] %></p> <%= yield %> app/views/layouts/application.html.erb @@ -1,5 +1,12 @@ ActionController::Routing::Routes.draw do |map| + map.root :controller => "plans", :action => "index" + + map.resources :users + + map.login 'login', :controller => 'user_sessions', :action => 'new' + map.logout 'logout', :controller => 'user_sessions', :action => 'destroy' + map.resources :user_sessions map.resources :plans, :member => { :daily => :get, :weekly => :get } do |plan| plan.resources :events config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20091107114732) do +ActiveRecord::Schema.define(:version => 20091111183038) do create_table "events", :force => true do |t| t.string "kind" @@ -38,4 +38,21 @@ ActiveRecord::Schema.define(:version => 20091107114732) do t.datetime "updated_at" end + create_table "users", :force => true do |t| + t.string "username" + t.string "email" + t.string "crypted_password" + t.string "password_salt" + t.string "persistence_token" + t.integer "login_count", :default => 0, :null => false + t.integer "failed_login_count", :default => 0, :null => false + t.datetime "last_request_at" + t.datetime "current_login_at" + t.datetime "last_login_at" + t.string "current_login_ip" + t.string "last_login_ip" + t.datetime "created_at" + t.datetime "updated_at" + end + end db/schema.rb @@ -2,6 +2,9 @@ #header {color: #FFFFFF; background: #654b24 url(images/ui-bg_fine-grain_65_654b24_60x60.png) 50% 50% repeat;} #header {height: 100px;} +div#user_nav { float: right; font-size: 0.9em; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427;} + + /*Primary and secondary event colourings*/ .secondary{border: 1px solid #b2a266; background: #f7f3de url(images/ui-bg_fine-grain_15_f7f3de_60x60.png) 50% 50% repeat; color: #3a3427; } .primary{border: 1px solid #681818; background: #b83400 url(images/ui-bg_fine-grain_68_b83400_60x60.png) 50% 50% repeat; color: #ffffff; } public/stylesheets/shared.css public/index.html 57683d1b4f9d114968bf4123af0b12d58daa6746 Wildfalcon laurie@wildfalcon.com http://github.com/wildfalcon/masterplan/commit/8ffb32253065784842e3bac97d06355e28ab60c6 8ffb32253065784842e3bac97d06355e28ab60c6

2009-11-11T10:54:49-08:00

Added authentication following authlogic tutorial on asciicasts ec9ba225703c8c9270fb0bb5422e31df8822716e Wildfalcon laurie@wildfalcon.com