second commit

lsecrease · lsecrease · commit 47802d4bebb0 · 2014-06-15T22:34:02.000Z
diff --git a/SoundMagic b/SoundMagic
@@ -0,0 +1 @@
+Subproject commit 588c68be6e2ba249670774e3e57be53ec45710bb
diff --git a/app/assets/javascripts/welcome.js.coffee b/app/assets/javascripts/welcome.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/welcome.css.scss b/app/assets/stylesheets/welcome.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the welcome 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/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -0,0 +1,2 @@
+class WelcomeController < ApplicationController
+end
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
@@ -0,0 +1,2 @@
+module WelcomeHelper
+end
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -0,0 +1,4 @@
+<h2>Hello World</h2>
+<p>
+  The time is: <%= Time.now %>
+</p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,7 +3,7 @@
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
-  # root 'welcome#index'
+  root 'welcome#index'
 
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'
diff --git a/test/controllers/welcome_controller_test.rb b/test/controllers/welcome_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class WelcomeControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/helpers/welcome_helper_test.rb b/test/helpers/welcome_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class WelcomeHelperTest < ActionView::TestCase
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 588c68be6e2ba249670774e3e57be53ec45710bb`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://coffeescript.org/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Place all the styles related to the welcome controller here.`
	`2`	`+// They will automatically be included in application.css.`
	`3`	`+// You can use Sass (SCSS) here: http://sass-lang.com/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class WelcomeController < ApplicationController`
	`2`	`+end`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<h2>Hello World</h2>
 +<p>
 +  The time is: <%= Time.now %>
 +</p>