fixed issue #59 - merge home controller into pages controller

sdruby · Feb 26, 2012 · 01a39e9 · 01a39e9
1 parent 0e9a798
commit 01a39e9
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -1,7 +1,19 @@
 class PagesController < ApplicationController
 
+  def about
+  end
+
+  def index
+    @podcast = Podcast.published.first
+  end
+
   def sponsors
-    return "sponsors"
+  end
+
+  def thanks
+  end
+
+  def tshirts
   end
 
 end
diff --git a/app/views/home/_sponsors.haml → app/views/pages/_sponsors.haml b/app/views/home/_sponsors.haml → app/views/pages/_sponsors.haml
diff --git a/app/views/pages/about.haml b/app/views/pages/about.haml
@@ -0,0 +1 @@
+%h1=t "About SD Ruby"
diff --git a/app/views/home/index.haml → app/views/pages/index.haml b/app/views/home/index.haml → app/views/pages/index.haml
diff --git a/app/views/pages/sponsors.haml b/app/views/pages/sponsors.haml
@@ -0,0 +1 @@
+%h1=t "Sponsors"
diff --git a/app/views/home/thanks.haml → app/views/pages/thanks.haml b/app/views/home/thanks.haml → app/views/pages/thanks.haml
diff --git a/app/views/home/tshirts.haml → app/views/pages/tshirts.haml b/app/views/home/tshirts.haml → app/views/pages/tshirts.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,13 +1,18 @@
 SDRuby::Application.routes.draw do
-  match "/tshirts" => "home#tshirts", as: :tshirts
-  match "/thanks" => "home#thanks", as: :thanks
+
+  # Homepage
+  root to: 'pages#index'
+
+  # Custom routes
+  match "/tshirts" => "pages#tshirts", as: :tshirts
+  match "/thanks" => "pages#thanks", as: :thanks
   match "/logout" => "user_sessions#destroy", as: :logout
   match "/login" => "user_sessions#new", as: :login
   match "/register" => "users#new", as: :register
-  match "/forgot" => "users#forgot_password", as: :password_reset
-
   match "/sponsors" => "pages#sponsors", as: :sponsors
+  match "/forgot" => "users#forgot_password", as: :password_reset
 
+  # Resources
   resources :podcasts do
     get :search, on: :collection    
   end
@@ -19,5 +24,4 @@
   resources :users
   resource :user_session
 
-  root to: 'home#index'
 end