Skip to content

Commit

Permalink
[#1] Add TBS, Cleanup, Add Home
Browse files Browse the repository at this point in the history
* add bourne
* gitignore .eyrc
* convert layout and application.css to haml/scss
* add home controller and #show view
  • Loading branch information
highwaybobbery committed May 25, 2012
1 parent 9646fda commit 65b8cf0
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 312 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.rbc
*.sassc
.eyrc
.sass-cache
capybara-*.html
.rspec
Expand All @@ -13,4 +14,4 @@ capybara-*.html
/spec/tmp/*
**.orig
rerun.txt
pickle-email-*.html
pickle-email-*.html
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ gem 'mysql2'
gem 'rails', '3.2.3'

group :assets do
gem 'bootstrap-sass'
gem 'coffee-rails', '~> 3.2.1'
gem 'haml'
gem 'sass-rails', '~> 3.2.3'
Expand All @@ -18,6 +19,7 @@ group :development, :test do
end

group :test do
gem 'bourne', '1.0'
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'shoulda-matchers'
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ GEM
multi_json (~> 1.0)
addressable (2.2.8)
arel (3.0.2)
bootstrap-sass (2.0.3.1)
bourne (1.0)
mocha (= 0.9.8)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
Expand Down Expand Up @@ -86,6 +89,8 @@ GEM
treetop (~> 1.4.8)
method_source (0.7.1)
mime-types (1.18)
mocha (0.9.8)
rake
multi_json (1.3.5)
mysql2 (0.3.11)
nokogiri (1.5.2)
Expand Down Expand Up @@ -167,6 +172,8 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
bourne (= 1.0)
coffee-rails (~> 3.2.1)
cucumber-rails
database_cleaner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
*= require_self
*= require_tree .
*/

@import 'bootstrap';
4 changes: 4 additions & 0 deletions app/controllers/home_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class HomeController < ApplicationController
def show
end
end
3 changes: 3 additions & 0 deletions app/views/home/show.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
%h1 Welcome!
%nav
= link_to 'Home', root_path
14 changes: 0 additions & 14 deletions app/views/layouts/application.html.erb

This file was deleted.

10 changes: 10 additions & 0 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
!!! 5
%html
%head
%title Striper
= stylesheet_link_tag 'application', media: 'all'
= javascript_include_tag 'application'
= csrf_meta_tags
%body
%div.container
= yield
57 changes: 2 additions & 55 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,58 +1,5 @@
Striper::Application.routes.draw do
# The priority is based upon order of creation:
# first created -> highest priority.
root to: 'home#show'

# Sample of regular route:
# match 'products/:id' => 'catalog#view'
# Keep in mind you can assign values other than :controller and :action

# Sample of named route:
# match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
# This route can be invoked with purchase_url(:id => product.id)

# Sample resource route (maps HTTP verbs to controller actions automatically):
# resources :products

# Sample resource route with options:
# resources :products do
# member do
# get 'short'
# post 'toggle'
# end
#
# collection do
# get 'sold'
# end
# end

# Sample resource route with sub-resources:
# resources :products do
# resources :comments, :sales
# resource :seller
# end

# Sample resource route with more complex sub-resources
# resources :products do
# resources :comments
# resources :sales do
# get 'recent', :on => :collection
# end
# end

# Sample resource route within a namespace:
# namespace :admin do
# # Directs /admin/products/* to Admin::ProductsController
# # (app/controllers/admin/products_controller.rb)
# resources :products
# end

# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
# root :to => 'welcome#index'

# See how all your routes lay out with "rake routes"

# This is a legacy wild controller route that's not recommended for RESTful applications.
# Note: This route will make all actions in every controller accessible via GET requests.
# match ':controller(/:action(/:id))(.:format)'
resource :home, only: [:show]
end
Loading

0 comments on commit 65b8cf0

Please sign in to comment.