Creating and About pages

22iz · Apr 10, 2014 · 8b9ec14 · 8b9ec14
1 parent 3c22eb2
commit 8b9ec14
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 1 deletion.
diff --git a/app/assets/javascripts/pages.js.coffee b/app/assets/javascripts/pages.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/pages.css.scss b/app/assets/stylesheets/pages.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the pages controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -0,0 +1,7 @@
+class PagesController < ApplicationController
+  def home
+  end
+
+  def about
+  end
+end
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
@@ -0,0 +1,2 @@
+module PagesHelper
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,7 +8,9 @@
 </head>
 <body>
 
-<%= yield %>
+	<%= link_to "Home", root_path%>
+	<%= link_to "About Us", about_path%>
+	<%= yield %>
 
 </body>
 </html>
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -0,0 +1,2 @@
+<h1>About us</h1>
+<p>We are working on our One Month Rails Pinteresting app</p>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -0,0 +1,2 @@
+<h1>Welcome to my app!</h1>
+<p>Sign up <%= link_to "here", "#"%>.</p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,6 @@
 Pinteresting::Application.routes.draw do
+  root "pages#home"
+  get "about" => "pages#about" # create about_path
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class PagesControllerTest < ActionController::TestCase
+  test "should get home" do
+    get :home
+    assert_response :success
+  end
+
+end
diff --git a/test/helpers/pages_helper_test.rb b/test/helpers/pages_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PagesHelperTest < ActionView::TestCase
+end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h1>About us</h1>
		<p>We are working on our One Month Rails Pinteresting app</p>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h1>Welcome to my app!</h1>
		<p>Sign up <%= link_to "here", "#"%>.</p>