From f70d728c570f279a300877d95c7363d93e85cd87 Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Wed, 2 Sep 2015 17:43:49 -0700 Subject: [PATCH] install react-rails gem --- Gemfile | 6 ++++++ Gemfile.lock | 13 +++++++++++++ app/assets/javascripts/application.js | 3 +++ app/assets/javascripts/components.js | 1 + app/assets/javascripts/components/.gitkeep | 0 5 files changed, 23 insertions(+) create mode 100644 app/assets/javascripts/components.js create mode 100644 app/assets/javascripts/components/.gitkeep diff --git a/Gemfile b/Gemfile index ce616e3c..7e1a4765 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem 'pundit' gem 'simple_form' gem 'upmin-admin' gem 'dotenv-rails' +gem 'react-rails' group :development do gem 'better_errors' gem 'rubocop', require: false @@ -59,3 +60,8 @@ group :test do gem 'launchy' gem 'selenium-webdriver' end + +#TODO: is rails-assets better than react-rails ? +#source 'https://rails-assets.org' do + #gem 'rails-assets-react' +#end diff --git a/Gemfile.lock b/Gemfile.lock index 6356a09c..533d73b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,10 @@ GEM ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) + babel-source (5.8.23) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) @@ -84,6 +88,7 @@ GEM execjs coffee-script-source (1.9.1.1) colorize (0.7.7) + connection_pool (2.2.0) database_cleaner (1.4.1) debug_inspector (0.0.2) devise (3.5.2) @@ -245,6 +250,13 @@ GEM ffi (>= 0.5.0) rdoc (4.2.0) json (~> 1.4) + react-rails (1.2.0) + babel-transpiler (>= 0.7.0) + coffee-script-source (~> 1.8) + connection_pool + execjs + rails (>= 3.2) + tilt responders (1.1.2) railties (>= 3.2, < 4.2) rspec (3.3.0) @@ -383,6 +395,7 @@ DEPENDENCIES rb-fchange rb-fsevent rb-inotify + react-rails rspec-rails rubocop sass-rails (~> 4.0.3) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa4..3b552708 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,7 @@ //= require jquery //= require jquery_ujs //= require turbolinks +//= require react +//= require react_ujs +//= require components //= require_tree . diff --git a/app/assets/javascripts/components.js b/app/assets/javascripts/components.js new file mode 100644 index 00000000..9ce7a4f3 --- /dev/null +++ b/app/assets/javascripts/components.js @@ -0,0 +1 @@ +//= require_tree ./components diff --git a/app/assets/javascripts/components/.gitkeep b/app/assets/javascripts/components/.gitkeep new file mode 100644 index 00000000..e69de29b