add article#index

igaiga · Aug 25, 2012 · 8fb6db5 · 8fb6db5
1 parent 4830bab
commit 8fb6db5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 247 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,3 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  helper_method :current_user
+
+  private
+  def current_user
+    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  end
 end
diff --git a/app/controllers/article_controller.rb b/app/controllers/article_controller.rb
@@ -1,2 +1,4 @@
 class ArticleController < ApplicationController
+  def index
+  end
 end
diff --git a/app/views/article/index.html.erb b/app/views/article/index.html.erb
@@ -0,0 +1 @@
+Main page.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,11 +8,6 @@
 </head>
 <body>
 
-<div id="user_nav">
-  <%#= link_to "Sign in with Twitter", "/auth/twitter" %>
-  <%= link_to "Sign in with Facebook", "/auth/facebook" %>
-</div>
-
 <div id="user_nav">
   <% if current_user %>
     Welcome, <%= current_user.name %>! <%= link_to "Sign Out", signout_path %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,5 @@
 OmniauthSample::Application.routes.draw do
-#root :to => "articles#index"
+  root :to => "article#index"
   match "/auth/:provider/callback" => "sessions#create"
   match "/signout" => "sessions#destroy", :as => :signout
 end
diff --git a/public/index.html b/public/index.html