Finish layout and routes

Gemfile

@@ -14,6 +14,7 @@ gem 'coffee-rails', '~> 4.1.0'
 
 
 # Use jquery as the JavaScript library
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-rails'
+gem 'bootstrap-sass', '2.3.2.0'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

Gemfile.lock

@@ -38,6 +38,8 @@ GEM
     arel (6.0.4)
     arel (6.0.4)
     binding_of_caller (0.8.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (2.3.2.0)
+      sass (~> 3.2)
     builder (3.2.4)
     builder (3.2.4)
     byebug (11.1.3)
     byebug (11.1.3)
     capybara (2.1.0)
     capybara (2.1.0)
@@ -194,6 +196,7 @@ PLATFORMS
   ruby
   ruby
 
 
 DEPENDENCIES
 DEPENDENCIES
+  bootstrap-sass (= 2.3.2.0)
   byebug
   byebug
   capybara (= 2.1.0)
   capybara (= 2.1.0)
   coffee-rails (~> 4.1.0)
   coffee-rails (~> 4.1.0)

Rakefile

@@ -2,5 +2,10 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 
 require File.expand_path('../config/application', __FILE__)
 require File.expand_path('../config/application', __FILE__)
-
+module TempFixForRakeLastComment
+  def last_comment
+    last_description
+  end 
+end
+Rake::Application.send :include, TempFixForRakeLastComment
 Rails.application.load_tasks
 Rails.application.load_tasks

app/assets/javascripts/users.coffee

+# 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/

app/assets/stylesheets/custom.css.scss

+@import "bootstrap";
+
+/* mixins, variables, etc. */
+$grayLight: #999;
+$grayMediumLight: #eaeaea;
+$gray: #555;
+$grayDarker: #222;
+
+/* universal */
+html {
+  overflow-y: scroll;
+}
+
+body {
+  padding-top: 60px;
+}
+
+section {
+  overflow: auto;
+}
+
+textarea {
+  resize: vertical;
+}
+
+.center {
+  text-align: center;
+  h1 {
+    margin-bottom: 10px;
+  }
+}
+
+/* typography */
+h1, h2, h3, h4, h5, h6 {
+  line-height: 1;
+}
+
+h1 {
+  font-size: 3em;
+  letter-spacing: -2px;
+  margin-bottom: 30px;
+  text-align: center;
+}
+
+h2 {
+  font-size: 1.2em;
+  letter-spacing: -1px;
+  margin-bottom: 30px;
+  text-align: center;
+  font-weight: normal;
+  color: $grayLight;
+}
+
+p {
+  font-size: 1.1em;
+  line-height: 1.7em;
+}
+
+/* header */
+
+#logo {
+  float: left;
+  margin-right: 10px;
+  font-size: 1.7em;
+  color: #fff;
+  text-transform: uppercase;
+  letter-spacing: -1px;
+  padding-top: 9px;
+  font-weight: bold;
+  line-height: 1;
+
+  &:hover {
+    color: #fff;
+    text-decoration: none;
+  }
+}
+
+/* footer */
+
+footer {
+  margin-top: 45px;
+  padding-top: 5px;
+  border-top: 1px solid $grayMediumLight;
+  color: $grayLight;
+
+  a {
+    color: $gray;
+    &:hover {
+      color: $grayDarker;
+    }
+  }
+
+  small {
+    float: left;
+  }
+
+  ul {
+    float: right;
+    list-style: none;
+
+    li {
+      float: left;
+      margin-left: 10px;
+    }
+  }
+}

app/assets/stylesheets/users.scss

+// Place all the styles related to the Users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/static_pages_controller.rb

@@ -7,4 +7,7 @@ class StaticPagesController < ApplicationController
 
 
   def about
   def about
   end
   end
+
+  def contact
+  end
 end
 end

app/controllers/users_controller.rb

+class UsersController < ApplicationController
+  def new
+  end
+end

app/helpers/users_helper.rb

+module UsersHelper
+end

app/views/layouts/_footer.html.erb

+<footer class="footer">
+  <small>
+    <a href="http://railstutorial.org/">Rails Tutorial</a>
+    by Michael Hartl
+  </small>
+  <nav>
+    <ul>
+      <li><%= link_to "About", about_path %></li>
+      <li><%= link_to "Contact", contact_path %></li>
+      <li><a href="http://news.railstutorial.org/">News</a></li>
+    </ul>
+  </nav>
+</footer>
\ No newline at end of file

app/views/layouts/_header.html.erb

+<header class="navbar navbar-fixed-top navbar-inverse">
+  <div class="navbar-inner">
+    <div class="container">
+      <%= link_to "sample app", root_path, id: "logo" %>
+      <nav>
+        <ul class="nav pull-right">
+          <li><%= link_to "Home", home_path %></li>
+          <li><%= link_to "Help", help_path %></li>
+          <li><%= link_to "Sign in", '#' %></li>
+        </ul>
+      </nav>
+    </div>
+  </div>
+</header>
\ No newline at end of file

app/views/layouts/_shim.html.erb

+<!--[if lt IE 9]>
+<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
\ No newline at end of file

app/views/layouts/application.html.erb

@@ -7,9 +7,14 @@
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <%= csrf_meta_tags %>
     <%= csrf_meta_tags %>
+    <%= render 'layouts/shim' %>
   </head>
   </head>
 
 
   <body>
   <body>
+    <%= render 'layouts/header' %>
+    <div class="container">
       <%= yield %>
       <%= yield %>
+      <%= render 'layouts/footer' %>
+    </div>
   </body>
   </body>
 </html>
 </html>
\ No newline at end of file

app/views/static_pages/contact.html.erb

+<% provide(:title, 'Contact') %>
+<h1>Contact</h1>
+<p>
+  Contact Ruby on Rails Tutorial about the sample app at the
+  <a href="http://railstutorial.org/contact">contact page</a>.
+</p>
\ No newline at end of file

app/views/static_pages/home.html.erb

-<h1>Sample App</h1>
-<p>
+<div class="center hero-unit">
+  <h1>Welcome to the Sample App</h1>
+  <h2>
     This is the home page for the
     This is the home page for the
     <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
     <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
     sample application.
     sample application.
-</p>
+  </h2>
\ No newline at end of file
+  <%= link_to "Sign up now!", signup_path, class: "btn btn-large btn-primary" %>
+</div>
+
+<%= link_to image_tag("rails.png", alt: "Rails"), 'http://rubyonrails.org/' %>

app/views/users/new.html.erb

+<% provide(:title, 'Sign up') %>
+<h1>Sign up</h1>
+<p>Find me in app/views/users/new.html.erb</p>
\ No newline at end of file

config/application.rb

@@ -31,5 +31,6 @@ module SampleApp
 
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true
     config.active_record.raise_in_transactional_callbacks = true
+    config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
   end
   end
 end
 end

config/routes.rb

 Rails.application.routes.draw do
 Rails.application.routes.draw do
   root to: 'static_pages#home'
   root to: 'static_pages#home'
-  get 'static_pages/home'
-
-  get 'static_pages/help'
-
-  get 'static_pages/about'
-
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  get '/home', to: 'static_pages#home'
+  get '/help', to: 'static_pages#help'
+  get '/about', to: 'static_pages#about'
+  get '/contact', to: 'static_pages#contact'
+  get '/signup', to: 'users#new'
 end
 end

spec/requests/static_pages_spec.rb

 require 'spec_helper'
 require 'spec_helper'
 
 
 describe "StaticPages" do
 describe "StaticPages" do
-  let(:base_title) { "Ruby on Rails Tutorial Sample App" }
+  subject { page }
 
 
   describe "Home page" do
   describe "Home page" do
-    it "should have the content 'Sample App'" do
-      visit '/static_pages/home'
-      expect(page).to have_content('Sample App')
-    end
+    before { visit root_path}
     
     
-    it "should have the right title" do
-      visit '/static_pages/home'
-      expect(page).to have_title("#{base_title}")
-    end
-
-    it "should not have a custom page title" do
-      visit '/static_pages/home'
-      expect(page).not_to have_title('| Home')
-    end
+    it { should have_content('Sample App') }
+    it { should have_title(full_title('')) }
+    it { should_not have_title('| Home') }
   end
   end
 
 
   describe "Help page" do
   describe "Help page" do
-    it "should have the content 'Help'" do
-      visit '/static_pages/help'
-      expect(page).to have_content('Help')
-    end
+    before { visit help_path }
     
     
-    it "should have the title 'Help'" do
-      visit '/static_pages/help'
-      expect(page).to have_title("#{base_title} | Help")
-    end
+    it { should have_content('Help') }
+    it { should have_title(full_title('Help'))}
   end
   end
 
 
   describe "About page" do
   describe "About page" do
-    it "should have the content 'About Us'" do
-      visit '/static_pages/about'
-      expect(page).to have_content('About Us')
-    end
+    before { visit about_path }
     
     
-    it "should have the title 'About Us'" do
-      visit '/static_pages/about'
-      expect(page).to have_title("#{base_title} | About Us")
+    it { should have_content('About') }
+    it { should have_title(full_title('About Us'))}
   end
   end
+
+  describe "Contact page" do
+    before { visit contact_path }
+
+    it { should have_content('Contact') }
+    it { should have_title(full_title('Contact'))}
   end
   end
 end
 end

spec/requests/user_pages_spec.rb

+require 'spec_helper'
+
+describe "User pages" do
+
+  subject { page }
+
+  describe "signup page" do
+    before { visit signup_path }
+
+    it { should have_content('Sign up') }
+    it { should have_title(full_title('Sign up')) }
+  end
+end

spec/support/utilities.rb

+def full_title(page_title)
+  base_title = "Ruby on Rails Tutorial Sample App"
+  if page_title.empty?
+    base_title
+  else
+    "#{base_title} | #{page_title}"
+  end
+end
\ No newline at end of file