app/controllers/category_controller.rb app/controllers/images_controller.rb app/controllers/member_controller.rb app/helpers/category_helper.rb app/helpers/images_helper.rb app/helpers/login_helper.rb app/helpers/member_helper.rb app/views/category/category.html.erb app/views/category/index.html.erb app/views/home/_footer.html.erb app/views/home/_header.html.erb app/views/home/_menu.html.erb app/views/home/about.html.erb app/views/images/new.html.erb app/views/images/search.html.erb app/views/images/top.html.erb app/views/login/logout.html.erb app/views/member/add_image.html.erb app/views/member/images.html.erb app/views/member/signup.html.erb public/images/arrows-ffffff.png public/images/shadow.png public/javascripts/hoverIntent.js public/javascripts/superfish.js public/stylesheets/rated-on-rails.css public/stylesheets/superfish-navbar.css public/stylesheets/superfish.css test/functional/category_controller_test.rb test/functional/images_controller_test.rb test/functional/login_controller_test.rb test/functional/member_controller_test.rb test/unit/helpers/category_helper_test.rb test/unit/helpers/images_helper_test.rb test/unit/helpers/login_helper_test.rb test/unit/helpers/member_helper_test.rb @@ -2,4 +2,5 @@ db/development.sqlite3 config/database.yml log/development.log log/test.log +public/system .gitignore @@ -1,10 +1,19 @@ -# Filters added to this controller apply to all controllers in the application. -# Likewise, all the methods added will be available for all controllers. - class ApplicationController < ActionController::Base - helper :all # include all helpers, all the time - protect_from_forgery # See ActionController::RequestForgeryProtection for details - # Scrub sensitive parameters from your log - # filter_parameter_logging :password + helper :all + + protect_from_forgery + + filter_parameter_logging :password + + before_filter :get_current_user + + def get_current_user + unless session[:user_id] + @current_user = nil + return + end + @current_user = User.find( session[:user_id] ) + end + end app/controllers/application_controller.rb @@ -3,4 +3,8 @@ class Category < ActiveRecord::Base has_many :image_categories, :dependent => :destroy has_many :images, :through => :image_categories + def self.for_menu + Category.find( :all, :order => 'name' ) + end + end app/models/category.rb @@ -4,8 +4,9 @@ class Image < ActiveRecord::Base has_many :image_categories, :dependent => :destroy - has_attached_file :img, - :styles => { :medium => "300x300>", - :thumb => "100x100>" } + has_attached_file :i, :styles => { :t => '80x80>', + :s => '120x120>', + :m => "360x240>", + :l => "640x480>" } end app/models/image.rb @@ -1,2 +1,3 @@ -<h1>Home#index</h1> -<p>Find me in app/views/home/index.html.erb</p> +<p></p> + +<%= debug @current_user %> app/views/home/index.html.erb @@ -1,17 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>Rated-on-Rails</title> - <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> - <link href="/stylesheets/rated-on-rails.css" media="screen" rel="stylesheet" type="text/css" /> - <script type="text/javascript" src="/javascripts/jquery.js"></script> - <script type="text/javascript" src="/javascripts/jquery-ui.js"></script> - <script type="text/javascript" src="/javascripts/jrails.js"></script> - <script type="text/javascript" src="/javascripts/application.js"></script> -</head> -<body> +<%= render :partial => 'home/header' %> <%= yield :layout %> -</body> -</html> +<%= render :partial => 'home/footer' %> app/views/layouts/application.html.erb @@ -1,43 +1,13 @@ ActionController::Routing::Routes.draw do |map| - # The priority is based upon order of creation: first created -> highest priority. - # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' - # Keep in mind you can assign values other than :controller and :action + map.connect 'member/add-image', :controller => 'member', :action => 'add_image' - # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' - # This route can be invoked with purchase_url(:id => product.id) + map.connect 'about', :controller => 'home', :action => 'about' + map.connect 'logout', :controller => 'login', :action => 'logout' + map.connect 'login', :controller => 'login', :action => 'login' - # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products + map.root :controller => 'home' - # 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 => "welcome" - - # 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 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 @@ -3,10 +3,11 @@ class CreateImages < ActiveRecord::Migration def self.up create_table :images do |t| t.integer :user_id, :null => false - t.string :img_file_name - t.string :img_content_type - t.string :img_file_size - t.string :img_updated_at + t.string :name, :null => false + t.string :i_file_name + t.string :i_content_type + t.string :i_file_size + t.string :i_updated_at t.datetime :created_at end end db/migrate/002_create_images.rb @@ -28,11 +28,12 @@ ActiveRecord::Schema.define(:version => 4) do add_index "image_categories", ["image_id", "category_id"], :name => "index_image_categories_on_image_id_and_category_id", :unique => true create_table "images", :force => true do |t| - t.integer "user_id", :null => false - t.string "img_file_name" - t.string "img_content_type" - t.string "img_file_size" - t.string "img_updated_at" + t.integer "user_id", :null => false + t.string "name", :null => false + t.string "i_file_name" + t.string "i_content_type" + t.string "i_file_size" + t.string "i_updated_at" t.datetime "created_at" end db/schema.rb @@ -1,7 +1,9 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }]) -# Major.create(:name => 'Daley', :city => cities.first) +User.create!( :username => 'gdonald', + :fname => 'Greg', + :lname => 'Donald', + :email => 'gdonald@gmail.com', + :password => 'changeme', + :email_valid => true ) +Category.create( :name => 'Blondes' ) +Category.create( :name => 'Brunettes' ) +Category.create( :name => 'Redheads' ) db/seeds.rb @@ -1,2 +1,5 @@ -// Place your application-specific JavaScript functions and classes here -// This file is automatically included by javascript_include_tag :defaults +$(document).ready(function(){ + $('ul.sf-menu').superfish({ + pathClass: 'current' + }); +}); public/javascripts/application.js public/index.html f088df7647ec2b1523068fba58b625ea28b4e0da Greg Donald destiney@bajor.(none) http://github.com/gdonald/Rated-on-Rails/commit/29d0d8a0b166df27426fe09cef74a5a8c4714b5b 29d0d8a0b166df27426fe09cef74a5a8c4714b5b

2009-10-21T21:54:32-07:00

updates 68723d693c2fafc955181a0e95ac99ed49064e67 Greg Donald destiney@bajor.(none)