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/edit.html.erb app/views/users/index.html.erb app/views/users/new.html.erb app/views/users/show.html.erb db/migrate/20091017152052_create_users.rb db/seeds.rb test/fixtures/users.yml test/functional/user_sessions_controller_test.rb test/functional/users_controller_test.rb test/performance/browsing_test.rb test/unit/helpers/users_helper_test.rb test/unit/user_test.rb @@ -1,2 +1,3 @@ httparty twitter +authlogic \ No newline at end of file .gems @@ -6,10 +6,10 @@ Features: * Browser and iPhone interface for viewing the schedule. * Commenting system for in-presentation discussion or notes. * Admin interface for quick entry and adjustment of schedule. Now with drag and drop. +* Supports multi-day events * Some twitter integration available. TO-DO: -* Extend for a multi-day event * Improve security around the admin pages * Add an all-comments page * migrate the whole thing to jquery @@ -18,6 +18,7 @@ TO-DO: ** Add subdomain-fu ** Add Event model to be loaded based on subdomain. ** Add Event config: icon, url, owner, contact info, color pallet +* Add an event idea and voting system that can roll idea into the schedule the day of the event Twitter integration ideas: * Add links to display text. Link @user words to twitter.com/user and #tags to search.twitter.com/search?q=tags README @@ -6,13 +6,12 @@ class ApplicationController < ActionController::Base protect_from_forgery # See ActionController::RequestForgeryProtection for details\ filter_parameter_logging :password before_filter :set_current_event - helper_method :current_event, :admin? + helper_method :current_event, :admin?, :current_user def current_event set_current_event end - protected def authorize @@ -41,5 +40,15 @@ class ApplicationController < ActionController::Base def set_current_event @current_event ||= Event.find_by_short_name!(request.subdomains.last) end - + + def current_user_session + return @current_user_session if defined?(@current_user_session) + @current_user_session = UserSession.find + end + + def current_user + return @current_user if defined?(@current_user) + @current_user = current_user_session && current_user_session.record + end + end app/controllers/application_controller.rb @@ -16,11 +16,12 @@ </head> <body> <div style="float:left;"> - <a href="<%=current_event.link_url%>"> - <img width="350px" src="<%=current_event.image_url%>" alt="<%=current_event.name%>" border="0"/> + <a href="<%=current_event.link_url||'#'%>"> + <%=image_tag(current_event.image_url, :width=>"350", :alt=>current_event.name, :border=>0)%> </a> </div> - <div style="float:right;"> + <div id="nav_box"> + <div id="date_select_form"> <% form_tag do |f| %> <%=select_tag 'selected_day', options_for_select( @@ -29,14 +30,24 @@ {:onchange => 'this.form.submit();' } %> <% end %> + </div> + <div id="user_links"> + <% if current_user %> + <%=link_to "profile", edit_user_path(:current) %> | + <%=link_to "logout", logout_path %> + <% else %> + <%=link_to "register", new_user_path %> | + <%=link_to "login", login_path %> + <% end %> + </div> </div> <h3 style="padding-top: 20px; margin-bottom:0px; padding-bottom:0px;">Schedule Grid</h3> <ul> <a href="/iphone"><li>iPhone edition</li></a> <a href="/mobile"><li>Mobile edition (no table)</li></a> </ul> - <br clear="all"/> - <p style="color: <%=current_event.secondary_color%>"><%= flash[:notice] %></p> + <br clear="all"/> + <p><%= flash[:notice] %></p> <%= yield %> </body> </html> app/views/layouts/application.html.erb @@ -29,8 +29,12 @@ Rails::Initializer.run do |config| # config.gem "bj" # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # config.gem "aws-s3", :lib => "aws/s3" + config.gem 'authlogic' + config.gem 'httparty' + config.gem 'twitter' - # Only load the plugins named here, in the order given. By default, all plugins + + # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] @@ -69,6 +73,3 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector end - -require 'httparty' -require 'twitter' config/environment.rb @@ -1,57 +1,16 @@ ActionController::Routing::Routes.draw do |map| + map.resources :user_sessions + map.resources :users map.resources :comments - - # The priority is based upon order of creation: first created -> highest priority. - map.resources :presentations - map.resources :timeslots - map.resources :rooms - map.home '', :controller => 'schedule', :action => 'index' - map.login 'login', :controller => 'sessions', :action => 'new' - map.logout 'logout', :controller => 'sessions', :action => 'destroy' + map.login 'login', :controller => 'user_sessions', :action => 'new' + map.logout 'logout', :controller => 'user_sessions', :action => 'destroy' map.iphone 'iphone', :controller=>'schedule', :action=>'iphone' map.mobile 'mobile', :controller=>'schedule', :action=>'mobile' - - # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products - - # Sample resource route with options: - # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } - - # Sample resource route with sub-resources: - # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller - - # Sample resource route with more complex sub-resources - # map.resources :products do |products| - # products.resources :comments - # products.resources :sales, :collection => { :recent => :get } - # end - - # Sample resource route within a namespace: - # map.namespace :admin do |admin| - # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) - # admin.resources :products - # end - - # You can have the root of your site routed with map.root -- just remember to delete public/index.html. map.root :controller => "schedule" - - # See how all your routes lay out with "rake routes" - - # Install the default routes as the lowest priority. - # Note: These default routes make all actions in every controller accessible via GET requests. You should - # consider removing the them or commenting them out if you're using named routes and resources. map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' end config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090416010630) do +ActiveRecord::Schema.define(:version => 20091017152052) do create_table "comments", :force => true do |t| t.integer "presentation_id" @@ -30,6 +30,7 @@ ActiveRecord::Schema.define(:version => 20090416010630) do t.string "tertiary_color" t.datetime "created_at" t.datetime "updated_at" + t.string "rotation", :default => "TIME_ACROSS", :null => false end create_table "presentations", :force => true do |t| @@ -74,4 +75,21 @@ ActiveRecord::Schema.define(:version => 20090416010630) do t.date "slot_date" end + create_table "users", :force => true do |t| + t.string "login" + 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 @@ -89,3 +89,7 @@ span.field { border: 2px ridge #316853; padding: 2px; } + +div#nav_box { + float:right; +} \ No newline at end of file public/stylesheets/application.css d215c9f1a25c5d656dfee6717dc18c5bb278de46 Carl Leiby carl.leiby@gmail.com http://github.com/carlism/barcamp_schedule/commit/80500be8fa7eb77390c5ff2fdcb29dfa537984d1 80500be8fa7eb77390c5ff2fdcb29dfa537984d1

2009-10-17T11:14:14-07:00

Added authlogic gem and implemented a simple login capability. 1ad6739726b25c29cefde6215fa4eac434ca3e94 Carl Leiby carl.leiby@gmail.com