diff --git a/Gemfile b/Gemfile
index 54c4b38f..c7e56eaa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,8 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
+# TODO remove git dependency after development
+gem 'ember-rails', :git => "https://github.com/emberjs/ember-rails.git"
gem 'jquery-rails'
gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test]
diff --git a/Gemfile.lock b/Gemfile.lock
index d8170a08..61d37dda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+ remote: https://github.com/emberjs/ember-rails.git
+ revision: 1614e7dac6dcd83a68b4f5ea479d2fec7094d781
+ specs:
+ ember-rails (0.2.4)
+ execjs (>= 1.2)
+ railties (>= 3.0)
+
GIT
remote: https://github.com/pivotal/jasmine-gem.git
revision: 5a7524ae9eaea4fe106a7aaa90ccfb1bc137abe7
@@ -183,6 +191,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
devise
devise_bushido_authenticatable
+ ember-rails!
factory_girl_rails
jasmine!
jquery-rails
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9097d830..ffc35b4a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,4 +12,7 @@
//
//= require jquery
//= require jquery_ujs
+//= require ember-dev
+//= require ember
+//= require ember/kandan
//= require_tree .
diff --git a/config/routes.rb b/config/routes.rb
index a573c90b..b51a71fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
Kandan::Application.routes.draw do
+ get "main/index"
+
#devise_for :users
# The priority is based upon order of creation:
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index a1d50995..00000000
--- a/public/index.html
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
- Ruby on Rails: Welcome aboard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Getting started
-
Here’s how to get rolling:
-
-
- -
-
Use rails generate
to create your models and controllers
- To see all available options, run it without parameters.
-
-
- -
-
Set up a default route and remove public/index.html
- Routes are set up in config/routes.rb.
-
-
- -
-
Create your database
- Run rake db:create
to create your database. If you're not using SQLite (the default), edit config/database.yml with your username and password.
-
-
-
-
-
-
-
-
-