diff --git a/Gemfile b/Gemfile index 00cf4892b..309eed3c2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '2.3.1' -gem 'rails', '~> 4.2.0' +gem 'rails', '~> 4.2.1' gem 'bundler', '>=1.1.5' diff --git a/Gemfile.lock b/Gemfile.lock index 69f50bf22..936d1d4fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM debug_inspector (>= 0.0.1) bluecloth (2.2.0) bonsai-elasticsearch-rails (0.0.4) - bootstrap-datepicker-rails (1.6.1.1) + bootstrap-datepicker-rails (1.6.4.1) railties (>= 3.0) bootstrap-kaminari-views (0.0.5) kaminari (>= 0.13) @@ -74,7 +74,7 @@ GEM builder (3.2.2) byebug (9.0.5) cancancan (1.15.0) - capybara (2.7.1) + capybara (2.8.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -128,7 +128,7 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (>= 1.6.0, < 2) - csv_shaper (1.2.0) + csv_shaper (1.3.0) activesupport (>= 3.0.0) dalli (2.7.6) database_cleaner (1.5.3) @@ -145,17 +145,17 @@ GEM json thread thread_safe - elasticsearch (1.0.18) - elasticsearch-api (= 1.0.18) - elasticsearch-transport (= 1.0.18) - elasticsearch-api (1.0.18) + elasticsearch (2.0.0) + elasticsearch-api (= 2.0.0) + elasticsearch-transport (= 2.0.0) + elasticsearch-api (2.0.0) multi_json elasticsearch-model (0.1.9) activesupport (> 3) elasticsearch (> 0.4) hashie elasticsearch-rails (0.1.9) - elasticsearch-transport (1.0.18) + elasticsearch-transport (2.0.0) faraday multi_json erubis (2.7.0) @@ -196,7 +196,7 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-rspec (4.7.2) + guard-rspec (4.7.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -231,13 +231,13 @@ GEM parser (>= 2.2.3.0) term-ansicolor (>= 1.3.2) terminal-table (>= 1.5.1) - jquery-rails (4.1.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.2.9) + js-routes (1.3.0) railties (>= 3.2) sprockets-rails json (1.8.3) @@ -268,14 +268,14 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.1) + mimemagic (0.3.2) mini_portile2 (2.1.0) minitest (5.9.0) multi_json (1.11.3) multi_xml (0.5.5) multipart-post (2.0.0) nenv (0.3.0) - newrelic_rpm (3.16.0.318) + newrelic_rpm (3.16.1.320) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -307,7 +307,7 @@ GEM json (~> 1.3) omniauth-oauth (~> 1.1) orm_adapter (0.5.0) - paperclip (5.0.0) + paperclip (5.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) cocaine (~> 0.5.5) @@ -364,12 +364,12 @@ GEM activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.16.0) + raindrops (0.17.0) rake (11.2.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) - responders (2.2.0) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec (3.5.0) rspec-core (~> 3.5.0) @@ -379,7 +379,7 @@ GEM activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.5.0) + rspec-core (3.5.2) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -387,7 +387,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.0) + rspec-rails (3.5.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -396,8 +396,8 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - ruby-units (2.0.0) - ruby_dep (1.3.1) + ruby-units (2.0.1) + ruby_dep (1.4.0) ruby_parser (3.8.2) sexp_processor (~> 4.1) rubyzip (1.2.0) @@ -518,7 +518,7 @@ DEPENDENCIES poltergeist (~> 1.6) pry quiet_assets - rails (~> 4.2.0) + rails (~> 4.2.1) rails_12factor rake (>= 10.0.0) rspec-activemodel-mocks diff --git a/app/assets/javascripts/append_date.js.coffee b/app/assets/javascripts/append_date.js.coffee index c1be9ce47..470ae7923 100644 --- a/app/assets/javascripts/append_date.js.coffee +++ b/app/assets/javascripts/append_date.js.coffee @@ -8,13 +8,12 @@ jQuery -> el.datepicker({'format': 'yyyy-mm-dd'}) - href = el.attr('href') - el.click (e) -> e.stopPropagation() e.preventDefault() originalText = $(this).text() + href = $(this).attr('href') $(this).text('Confirm without date') $(this).bind('click.confirm', (e) -> @@ -30,6 +29,8 @@ jQuery -> el.one 'changeDate', -> date = $(this).datepicker('getDate') + href = $(this).attr('href') + url = "#{href}&planting[finished_at]=#{date}" link = $("") diff --git a/app/assets/javascripts/crops.js.erb b/app/assets/javascripts/crops.js.erb index c31666d23..9a60dd60c 100644 --- a/app/assets/javascripts/crops.js.erb +++ b/app/assets/javascripts/crops.js.erb @@ -1,6 +1,7 @@ if (document.getElementById("cropmap") !== null) { mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>"; - mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png"; + mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>"; + mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token; L.Icon.Default.imagePath = '/assets' diff --git a/app/assets/javascripts/members.js.erb b/app/assets/javascripts/members.js.erb index f55f35732..500e79b25 100644 --- a/app/assets/javascripts/members.js.erb +++ b/app/assets/javascripts/members.js.erb @@ -1,6 +1,7 @@ if (document.getElementById("membermap") !== null) { mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>"; - mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png"; + mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>"; + mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token; L.Icon.Default.imagePath = '/assets' diff --git a/app/assets/javascripts/places.js.erb b/app/assets/javascripts/places.js.erb index 2dba78340..48cb960d7 100644 --- a/app/assets/javascripts/places.js.erb +++ b/app/assets/javascripts/places.js.erb @@ -1,7 +1,8 @@ if (document.getElementById("placesmap") !== null) { places_base_path = "/places"; mapbox_map_id = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_map_id %>"; - mapbox_base_url = "https://c.tiles.mapbox.com/v3/" + mapbox_map_id + "/{z}/{x}/{y}.png"; + mapbox_access_token = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.mapbox_access_token %>"; + mapbox_base_url = "http://a.tiles.mapbox.com/v4/" + mapbox_map_id + "/{z}/{x}/{y}.png?access_token=" + mapbox_access_token; nominatim_base_url = 'http://nominatim.openstreetmap.org/search/'; nominatim_user_agent_email = "<%= Rails.env == 'test' ? 0 : Growstuff::Application.config.user_agent_email %>"; diff --git a/app/views/crops/_find_seeds.html.haml b/app/views/crops/_find_seeds.html.haml index 0e31f6916..e005c9d00 100644 --- a/app/views/crops/_find_seeds.html.haml +++ b/app/views/crops/_find_seeds.html.haml @@ -1,7 +1,7 @@ %h4 Find #{ crop.name } seeds - if crop.seeds.empty? %p - There are no seeds available to trade. + There are no seeds available to trade on Growstuff right now. - else %ul - crop.seeds.tradable.each do |seed| @@ -10,6 +10,8 @@ = render :partial => 'members/location', :locals => { :member => seed.owner } %p = link_to "View all #{crop.name} seeds", seeds_by_crop_path(crop) +%p + = link_to "Purchase seeds via Ebay", "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg", target: "_blank", rel: "noopener noreferrer" - if crop.approved? - if current_member %p= link_to "List #{crop.name} seeds to trade", new_seed_path(:crop_id => crop.id) diff --git a/app/views/crops/show.html.haml b/app/views/crops/show.html.haml index 79b503cf1..e0408d991 100644 --- a/app/views/crops/show.html.haml +++ b/app/views/crops/show.html.haml @@ -94,6 +94,6 @@ %li= link_to 'Wikipedia (English)', @crop.en_wikipedia_url, target: "_blank", rel: "noopener noreferrer" %li = link_to "Gardenate - Planting reminders", "http://www.gardenate.com/plant/#{URI.escape @crop.name}", target: "_blank", rel: "noopener noreferrer" - %li - - if current_member && current_member.location + - if current_member && current_member.location + %li = link_to "Google", "http://www.google.com/search?q=#{URI.escape ["Growing", @crop.name, current_member.location].join(" ")}", target: "_blank", rel: "noopener noreferrer" diff --git a/app/views/seeds/show.html.haml b/app/views/seeds/show.html.haml index e4e55f68e..751a3dc17 100644 --- a/app/views/seeds/show.html.haml +++ b/app/views/seeds/show.html.haml @@ -69,5 +69,9 @@ - if @seed.owner.location %p %small - View other seeds, members and more near - = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds") \ No newline at end of file + View other seeds, members to trade with and more near + = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds") + %p + %small + Or + = link_to "purchase seeds via Ebay", "http://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{URI.escape @seed.crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg", target: "_blank", rel: "noopener noreferrer" \ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index 700771c10..9df3fd924 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -61,6 +61,7 @@ Growstuff::Application.configure do # this config variable cannot be put in application.yml as it is needed # by the assets pipeline, which doesn't have access to ENV. config.mapbox_map_id = 'growstuff.i3n2il6a' + config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA' config.after_initialize do ActiveMerchant::Billing::Base.mode = :test diff --git a/config/environments/production.rb b/config/environments/production.rb index 618eb8344..1be89c157 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -89,6 +89,7 @@ Growstuff::Application.configure do # this config variable cannot be put in application.yml as it is needed # by the assets pipeline, which doesn't have access to ENV. config.mapbox_map_id = 'growstuff.i3n2c4ie' + config.mapbox_access_token = ' pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA' config.after_initialize do ActiveMerchant::Billing::Base.mode = :production diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 8f2352ff4..004d35167 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -87,6 +87,7 @@ Growstuff::Application.configure do # this config variable cannot be put in application.yml as it is needed # by the assets pipeline, which doesn't have access to ENV. config.mapbox_map_id = 'growstuff.i3n2hao7' + config.mapbox_access_token = 'pk.eyJ1IjoiZ3Jvd3N0dWZmIiwiYSI6IkdxMkx4alUifQ.n0igaBsw97s14zMa0lwKCA' config.after_initialize do ActiveMerchant::Billing::Base.mode = :test