Merge branch 'dev' into no-js

Update Crop Page Titles

Gemfile

@@ -136,6 +136,11 @@ gem "gbifrb"
 
 gem "msgpack"
 
+# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
+# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
+gem "connection_pool", "< 3" 
+
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
   gem 'dalli'

Gemfile.lock

@@ -254,9 +254,9 @@ GEM
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     domain_name (0.6.20240107)
-    dotenv (3.1.8)
-    dotenv-rails (3.1.8)
-      dotenv (= 3.1.8)
+    dotenv (3.2.0)
+    dotenv-rails (3.2.0)
+      dotenv (= 3.2.0)
       railties (>= 6.1)
     drb (2.2.3)
     dumb_delegator (1.1.0)
@@ -284,7 +284,7 @@ GEM
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.5.2)
+    faker (3.5.3)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
@@ -296,7 +296,7 @@ GEM
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.5.1)
+    friendly_id (5.6.0)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -312,7 +312,7 @@ GEM
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (7.0.2)
+    haml (7.1.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -462,7 +462,7 @@ GEM
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.12)
+    oj (3.16.13)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -571,7 +571,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.16.1)
+    rdoc (6.17.0)
       erb
       psych (>= 4.0.0)
       tsort
@@ -675,7 +675,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.2.1)
+    rubyzip (3.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -689,13 +689,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.8.0)
+    scout_apm (6.0.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.38.0)
+    selenium-webdriver (4.39.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -719,7 +719,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.8)
+    stringio (3.1.9)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
@@ -730,7 +730,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.6.1)
     timecop (0.9.10)
-    timeout (0.4.4)
+    timeout (0.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -800,6 +800,7 @@ DEPENDENCIES
   chartkick
   coffee-rails
   comfortable_mexican_sofa!
+  connection_pool (< 3)
   crowdin-cli
   csv_shaper
   dalli

app/assets/stylesheets/application.scss

@@ -33,4 +33,4 @@
 
 @view-transition {
   navigation: auto;
-}
+}

app/controllers/home_controller.rb

@@ -10,4 +10,6 @@ class HomeController < ApplicationController
     # the relevant class methods directly in the view, so that fragment
     # caching will be effective.
   end
+
+  def community_gardens; end
 end

app/models/concerns/search_harvests.rb

@@ -53,7 +53,9 @@ module SearchHarvests
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # Disabled for now so that more relevant harvests are
+          # surfaced; even if we're falling back to crop photos.
+          # photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/models/concerns/search_plantings.rb

@@ -66,7 +66,9 @@ module SearchPlantings
       owners = []
       1..limit.times do
         where = {
-          photos_count: { gt: 0 },
+          # Disabled for now so that more relevant plantings are
+          # surfaced; even if we're falling back to crop photos.
+          # photos_count: { gt: 0 },
           owner_id:     { not: owners }
         }
         one_record = search('*',

app/views/crops/show.html.haml

@@ -1,5 +1,8 @@
 = render 'schema_org', crop: @crop
-- content_for :title, @crop.name
+- content_for :title do
+  = @crop.name.titleize
+  - if @crop.default_scientific_name.present?
+    = " (#{@crop.default_scientific_name})"
 - content_for :meta_description do
   - if @crop.description.present?
     = @crop.description

app/views/home/community_gardens.html.haml

@@ -0,0 +1,37 @@
+- content_for :title do
+  = t('community_gardens.title')
+- content_for :meta_description do
+  = t('community_gardens.meta_description')
+
+
+
+.container.mt-5
+
+  .row
+    .col-lg-6.col-sm-12
+      .row
+        %h1.display-4= t('community_gardens.header')
+        %p.lead= t('community_gardens.lead')
+      .row
+        %h2= t('community_gardens.features_title')
+        %ul
+          %li Track all your plantings and harvests
+          %li Keep notes your community's progress
+          %li Add collaborators to your garden plots
+          %li See what other community gardens are growing
+          %li Get advice and support from our community of gardeners
+
+      .row
+        %h2= t('community_gardens.get_started')
+        %p= t('community_gardens.get_started_text')
+        %p
+          = link_to t('.sign_up'), new_member_registration_path, class: 'btn btn-success btn-lg'
+      .row
+        %h2= t('community_gardens.collaborate')
+        %p= t('community_gardens.collaborate_text')
+        %p
+          = link_to t('community_gardens.learn_more'), gardens_path, class: 'btn btn-info btn-lg'
+
+    .col-lg-6.d-lg-block.d-xs-none
+      .container
+        =image_tag("girlwithvegetables-0038331hotifw.svg", width: "100%")

app/views/layouts/_menu.haml

@@ -52,6 +52,7 @@
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
           = link_to t('.community_map'), places_path, class: 'dropdown-item'
           = link_to t('.browse_members'), members_path, class: 'dropdown-item'
+          = link_to t('.community_gardens'), community_gardens_path, class: 'dropdown-item'
           = link_to t('.posts'), posts_path, class: 'dropdown-item'
           = link_to t('.forums'), forums_path, class: 'dropdown-item'
 

config/locales/en.yml

@@ -219,6 +219,18 @@ en:
     pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
     pwa_ios_title: For iOS (iPhone/iPad)
     pwa_title: Want to install Growstuff on your phone?
+  community_gardens:
+    title: Community Gardens on Growstuff
+    meta_description: Manage your community garden, track your plantings, and collaborate with other gardeners.
+    header: Community Gardens
+    lead: Growstuff is open source and the perfect place to manage your community garden. Track your plantings, celebrate your harvests, and collaborate with your fellow gardeners, all in one place.
+    get_started: Get Started Today
+    get_started_text: Signing up for Growstuff is free and easy. Create an account to start tracking your garden today.
+    sign_up: Sign up for free
+    collaborate: Collaborate with Your Team
+    collaborate_text: Invite other gardeners to collaborate on your garden plots. Share the work, share the harvest, and grow together as a community.
+    learn_more: Learn more about gardens
+    features_title: Features for Community Gardens
   label:
     days_until_harvest: "%{number} days"
     weeks_until_harvest: "%{number} weeks until harvest"
@@ -235,6 +247,7 @@ en:
       browse_members: Browse Members
       community: Community
       community_map: Community Map
+      community_gardens: Community Gardens
       garden_type: Garden Type
       garden_types: Garden Types
       crop_wrangling: Crop Wrangling

config/routes.rb

@@ -23,6 +23,7 @@ Rails.application.routes.draw do
   resources :authentications, only: %i(create destroy)
 
   get "home/index"
+  get '/community-gardens', to: 'home#community_gardens'
   root to: 'home#index'
 
   concern :has_photos do

spec/features/conversations/index_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "Conversations", :js do
+describe "Conversations" do
   let(:sender)    { create(:member)                        }
   let(:recipient) { create(:member, login_name: 'beyonce') }
 
@@ -18,7 +18,7 @@ describe "Conversations", :js do
       click_link 'Inbox'
     end
 
-    include_examples 'is accessible'
+    it_behaves_like 'is accessible'
 
     it { expect(page).to have_content 'something i want to say' }
     it { page.percy_snapshot(page, name: 'conversations#index') }

spec/features/conversations/show_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "Conversations", :js do
+describe "Conversations" do
   let(:sender)    { create(:member)                        }
   let(:recipient) { create(:member, login_name: 'beyonce') }
 

spec/features/gardens/adding_gardens_spec.rb

@@ -3,12 +3,12 @@
 require 'rails_helper'
 require 'custom_matchers'
 
-describe "Gardens", :js do
+describe "Gardens" do
   context 'signed in' do
     include_context 'signed in member'
     before { visit new_garden_path }
 
-    include_examples 'is accessible'
+    it_behaves_like 'is accessible'
 
     it "displays required and optional fields properly" do
       expect(page).to have_selector ".required", text: "Name"

spec/features/gardens/index_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'custom_matchers'
 
-describe "Gardens#index", :js do
+describe "Gardens#index" do
   context "Logged in as member" do
     include_context 'signed in member'
     let(:member) { FactoryBot.create(:member, login_name: 'shadow') }
@@ -14,7 +14,7 @@ describe "Gardens#index", :js do
         visit member_gardens_path(member_slug: member.slug)
       end
 
-      include_examples 'is accessible'
+      it_behaves_like 'is accessible'
 
       it "displays each of the gardens" do
         member.gardens.each do |garden|

spec/features/locale_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "Changing locales", :js do
+describe "Changing locales" do
   after { I18n.locale = :en }
 
   let(:member) { FactoryBot.create(:member) }

spec/features/members/following_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "follows", :js do
+describe "follows" do
   context "when signed out" do
     let(:member) { create(:member) }
 

spec/features/members/profile_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "member profile", :js do
+describe "member profile" do
   let(:member) { create(:member) }
   let(:other_member)  { create(:member)                }
   let(:admin_member)  { create(:admin_member)          }

spec/features/planting_reminder_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'capybara/email/rspec'
 
-describe "Planting reminder email", :js do
+describe "Planting reminder email" do
   let(:member) { create(:member) }
   let(:mail)   { NotifierMailer.planting_reminder(member) }
 

spec/features/plantings/prediction_spec.rb

@@ -2,7 +2,7 @@
 
 require "rails_helper"
 require 'custom_matchers'
-describe "Display a planting", :js do
+describe "Display a planting" do
   describe 'planting perennial' do
     let(:garden) { FactoryBot.create(:garden, location: 'Edinburgh') }
     let(:crop) { FactoryBot.create(:crop, name: 'feijoa', perennial: true) }

spec/features/timeline/index_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe "timeline", :js do
+describe "timeline" do
   let(:member) { FactoryBot.create(:member) }
   let(:friend1) { FactoryBot.create(:member) }
   let(:friend2) { FactoryBot.create(:member) }

spec/models/planting_spec.rb

@@ -605,7 +605,7 @@ describe Planting do
 
     before { described_class.reindex }
 
-    it { expect(subject.count).to eq 2 }
-    it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s]) }
+    it { expect(subject.count).to eq 3 }
+    it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s, planting.id.to_s]) }
   end
 end

spec/rails_helper.rb

@@ -33,7 +33,7 @@ if ENV["CAPYBARA_DRIVER"]
   Capybara.default_driver = ENV["CAPYBARA_DRIVER"].to_sym
   Capybara.javascript_driver = ENV["CAPYBARA_DRIVER"].to_sym
 else
-  Capybara.default_driver = :selenium_chrome_customised_headless
+  # Capybara.default_driver = :selenium_chrome_customised_headless
   Capybara.javascript_driver = :selenium_chrome_customised_headless
 end
 Capybara.enable_aria_label = true
@@ -50,7 +50,7 @@ Capybara.server_port = 8081
 
 # TODO: Find a better home.
 shared_examples 'is accessible' do
-  it "is accessible" do
+  it "is accessible", :js do
     expect(page).to be_axe_clean.skipping('color-contrast', 'heading-order', 'aria-required-children').according_to :wcag2a
   end
 end