diff --git a/Gemfile b/Gemfile index dd1e8e80..a1383501 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,7 @@ gem 'font-kit-rails' gem 'nprogress-rails' gem 'font-awesome-rails', '~> 4.2.0.0' gem 'rails-assets-growl' +gem 'jcrop-rails-v2' gem 'ruby-progressbar' diff --git a/Gemfile.lock b/Gemfile.lock index 73345c77..d098d572 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,6 +123,7 @@ GEM jbuilder (2.2.5) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) + jcrop-rails-v2 (0.9.12.3) jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -348,6 +349,7 @@ DEPENDENCIES haml http_accept_language jbuilder (~> 2.2.4) + jcrop-rails-v2 jquery-rails jquery-turbolinks mysql2 diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index f37ea0b7..fda6f467 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -7,6 +7,7 @@ #= require nprogress-turbolinks #= require growl #= require cheet +#= require jquery.Jcrop #= require_tree . NProgress.configure diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index f929ab0d..5c522e6b 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,6 +1,7 @@ /* *= require rails_bootstrap_forms *= require growl + *= require jquery.Jcrop *= require_self */