Merge branch 'dev' into fix-naming

* Update photo.rb

* Update photo.rb

* Update app/models/photo.rb

* Update app/models/photo.rb

.codeclimate.yml

@@ -1,47 +0,0 @@
-plugins:
-  brakeman:
-    enabled: false # codeclimate's brakeman is stuck in rails 5 rules
-  bundler-audit:
-    enabled: true
-  coffeelint:
-    enabled: true
-  duplication:
-    enabled: true
-    config:
-      languages:
-      - ruby
-      - javascript
-  editorconfig:
-    enabled: true
-  eslint:
-    enabled: true
-  fixme:
-    enabled: true
-  haml-lint:
-    enabled: true
-  nodesecurity:
-    enabled: true
-  rubocop:
-    enabled: true
-    channel: "rubocop-1-11"
-  scss-lint:
-    enabled: true
-  shellcheck:
-    enabled: true
-ratings:
-  paths:
-  - "**.rb"
-  - "**.ru"
-  - "**.js"
-  - "**.coffee"
-  - "**.scss"
-  - "**.haml"
-  - Gemfile.lock
-exclude_paths:
-- config/
-- db/
-- spec/
-- public/
-- app/assets/stylesheets/bootstrap-accessibility.css
-- app/assets/javascripts/bootstrap*
-- app/assets/stylesheets/leaflet_overrides.scss

.github/workflows/ci-features-admin.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-comments.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-conversations.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-crops.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-gardens.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-harvests.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-home.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-members.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-places.yml

@@ -0,0 +1,102 @@
+name: CI Features - Admin
+
+on: [pull_request]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      db:
+        image: postgres
+        env:
+          ##
+          # The Postgres service fails its docker health check unless you
+          # specify these environment variables
+          #
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: growstuff_test
+        ports: ['5432:5432']
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      APP_DOMAIN_NAME: localhost:3000
+      APP_PROTOCOL: http
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
+      DEVISE_SECRET_KEY: secret
+      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
+      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
+      GROWSTUFF_FLICKR_KEY: secretkey"
+      GROWSTUFF_FLICKR_SECRET: secretsecret
+      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
+      RAILS_ENV: test
+      RAILS_SECRET_TOKEN: supersecret
+
+    steps:
+      - name: Checkout this repo
+        uses: actions/checkout@v5
+
+      - name: Configure sysctl limits
+        run: |
+          sudo swapoff -a
+          sudo sysctl -w vm.swappiness=1
+          sudo sysctl -w fs.file-max=262144
+          sudo sysctl -w vm.max_map_count=262144
+
+      - name: Start Elasticsearch
+        uses: elastic/elastic-github-actions/elasticsearch@master
+        with:
+          stack-version: 7.5.1
+
+      ##
+      # Cache Yarn modules
+      #
+      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
+      #
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Setup yarn cache
+        uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install required OS packages
+        run: |
+          sudo apt-get -y install libpq-dev google-chrome-stable
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '12'
+
+      - name: Install Ruby (version given by .ruby-version) and Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Install required JS packages
+        run: yarn install
+
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
+
+      - name: Prepare database for testing
+        run: bundle exec rails db:prepare
+
+      - name: precompile assets
+        run: bundle exec rails assets:precompile
+
+      - name: index into elastic search
+        run: bundle exec rails search:reindex
+
+      - name: Run rspec (places/)
+        run: bundle exec rspec spec/features/places/ -fd

.github/workflows/ci-features-plantings.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-posts.yml

@@ -0,0 +1,102 @@
+name: CI Features - Admin
+
+on: [pull_request]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      db:
+        image: postgres
+        env:
+          ##
+          # The Postgres service fails its docker health check unless you
+          # specify these environment variables
+          #
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: growstuff_test
+        ports: ['5432:5432']
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      APP_DOMAIN_NAME: localhost:3000
+      APP_PROTOCOL: http
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/growstuff_test
+      DEVISE_SECRET_KEY: secret
+      ELASTIC_SEARCH_VERSION: "7.5.1-amd64"
+      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
+      GROWSTUFF_FLICKR_KEY: secretkey"
+      GROWSTUFF_FLICKR_SECRET: secretsecret
+      GROWSTUFF_SITE_NAME: "Growstuff (travis)"
+      RAILS_ENV: test
+      RAILS_SECRET_TOKEN: supersecret
+
+    steps:
+      - name: Checkout this repo
+        uses: actions/checkout@v5
+
+      - name: Configure sysctl limits
+        run: |
+          sudo swapoff -a
+          sudo sysctl -w vm.swappiness=1
+          sudo sysctl -w fs.file-max=262144
+          sudo sysctl -w vm.max_map_count=262144
+
+      - name: Start Elasticsearch
+        uses: elastic/elastic-github-actions/elasticsearch@master
+        with:
+          stack-version: 7.5.1
+
+      ##
+      # Cache Yarn modules
+      #
+      # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
+      #
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Setup yarn cache
+        uses: actions/cache@v4
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install required OS packages
+        run: |
+          sudo apt-get -y install libpq-dev google-chrome-stable
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '12'
+
+      - name: Install Ruby (version given by .ruby-version) and Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Install required JS packages
+        run: yarn install
+
+      - name: install chrome
+        run: sudo apt-get install google-chrome-stable
+
+      - name: Prepare database for testing
+        run: bundle exec rails db:prepare
+
+      - name: precompile assets
+        run: bundle exec rails assets:precompile
+
+      - name: index into elastic search
+        run: bundle exec rails search:reindex
+
+      - name: Run rspec (posts/)
+        run: bundle exec rspec spec/features/posts/ -fd

.github/workflows/ci-features-seeds.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features-timeline.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

.github/workflows/ci-features.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -107,19 +107,5 @@ jobs:
       - name: Run rspec (photos/)
         run: bundle exec rspec spec/features/photos/ -fd
 
-      - name: Run rspec (places/)
-        run: bundle exec rspec spec/features/places/ -fd
-
-      - name: Run rspec (plantings/)
-        run: bundle exec rspec spec/features/plantings/ -fd
-
-      - name: Run rspec (posts/)
-        run: bundle exec rspec spec/features/posts/ -fd
-
       - name: Run rspec (rss/)
-        run: bundle exec rspec spec/features/rss/ -fd
-
-      - name: Report to code climate
-        run: |
-          gem install codeclimate-test-reporter
-          codeclimate-test-reporter
+        run: bundle exec rspec spec/features/rss/ -fd

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install ruby version specified in .ruby-version
         uses: ruby/setup-ruby@v1
         with:
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |
@@ -127,9 +127,4 @@ jobs:
         run: bundle exec rspec spec/routing/ -fd --fail-fast
 
       - name: Run rspec (request)
-        run: bundle exec rspec spec/requests/ -fd --fail-fast
-
-      - name: Report to code climate
-        run: |
-          gem install codeclimate-test-reporter
-          codeclimate-test-reporter
+        run: bundle exec rspec spec/requests/ -fd --fail-fast

.ruby-version

@@ -1 +1 @@
-3.3.7
+3.3.8

CONTRIBUTORS.md

@@ -12,6 +12,7 @@ submit the change with your pull request.
 - Miles Gould / [pozorvlak](https://github.com/pozorvlak)
 - Mackenzie Morgan / [maco](https://github.com/maco)
 - Brenda Wallace / [br3nda](https://github.com/br3nda)
+- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 
 ## Contributors
 
@@ -68,7 +69,6 @@ submit the change with your pull request.
 - Jym Paul Carandang / [jacarandang](https://github.com/jacarandang)
 - Anthony Atkinson / [sha1sum](https://github.com/sha1sum)
 - Terence Conquest / [twconquest](https://github.com/twconquest)
-- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 - DV Dasari / [dv2](https://github.com/dv2)
 - Eric Tillberg / [Thrillberg](https://github.com/Thrillberg)
 - Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
@@ -95,10 +95,11 @@ submit the change with your pull request.
 - Ítalo Pires / [italopires](https://github.com/italopires)
 - Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
 - Dominick Thornton / [domthor](https://github.com/domthor)
-
+ 
 ## Bots
 
 ### Security and Dependency Updates
 - `codefactor-io[bot]`
 - DeppBot / [deppbot](https://github.com/deppbot)
 - `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)
+- [google-labs-jules[bot]](https://github.com/apps/google-labs-jules)

Gemfile

@@ -91,10 +91,9 @@ gem 'bootstrap-datepicker-rails'
 # DRY-er easier bootstrap 4 forms
 gem "bootstrap_form", ">= 4.5.0"
 
-# For connecting to other services (eg Twitter)
+# For connecting to other services (eg Flickr)
 gem 'omniauth', '~> 1.3'
 gem 'omniauth-flickr', '>= 0.0.15'
-gem 'omniauth-twitter'
 
 # Pretty charts
 gem "chartkick"
@@ -175,10 +174,10 @@ group :development, :test do
   gem 'rubocop-rspec_rails'
   gem 'webrat'                  # provides HTML matchers for view tests
 
+  gem 'crowdin-cli'             # for translations
   gem 'dotenv-rails'
 
   # cli utils
-  gem 'haml-i18n-extractor', require: false
   gem 'haml_lint', '>= 0.25.1', require: false # Checks haml files for goodness
   gem 'i18n-tasks', require: false # adds tests for finding missing and unused translations
   gem 'rspectre', require: false # finds unused code in specs
@@ -188,15 +187,18 @@ end
 group :test do
   gem 'axe-core-capybara'
   gem 'axe-core-rspec'
-  gem 'codeclimate-test-reporter', require: false
   gem 'rails-controller-testing'
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'vcr'
+  gem "rspec-rebound"
+  gem "percy-capybara", "~> 5.0.0"
 end
 
 group :travis do
   gem 'platform-api'
 end
 
-gem "percy-capybara", "~> 5.0.0"
+
+
+gem "i18n_data", "~> 1.1"

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -64,15 +64,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -87,22 +87,22 @@ GEM
     active_utils (3.5.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -135,14 +135,14 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -156,7 +156,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.0.7)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (12.0.0)
@@ -183,10 +183,8 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.5)
+    chartkick (5.2.0)
     childprocess (5.0.0)
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -202,6 +200,14 @@ GEM
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     crass (1.0.6)
+    crowdin-api (1.12.0)
+      open-uri (>= 0.1.0, < 0.2.0)
+      rest-client (>= 2.0.0, < 2.2.0)
+    crowdin-cli (0.2.2)
+      crowdin-api (>= 0.2.0)
+      gli (>= 2.7.0)
+      i18n (>= 0.6.4)
+      rubyzip (>= 1.0.0)
     csv (3.3.1)
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
@@ -222,15 +228,15 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.6.1)
+    diff-lcs (1.6.2)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
-    docile (1.1.5)
+    domain_name (0.6.20240107)
     dotenv (3.1.8)
     dotenv-rails (3.1.8)
       dotenv (= 3.1.8)
       railties (>= 6.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dumb_delegator (1.1.0)
     elasticsearch (7.0.0)
       elasticsearch-api (= 7.0.0)
@@ -245,23 +251,24 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
+    erb (5.0.2)
     erubi (1.13.1)
     erubis (2.7.0)
     excon (1.2.5)
       logger
     execjs (2.10.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
+    factory_bot (6.5.4)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
-    faker (3.5.1)
+      railties (>= 6.1.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     ffi (1.16.3)
     flickraw (0.9.10)
@@ -276,6 +283,8 @@ GEM
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
+    gli (2.22.2)
+      ostruct
     globalid (1.2.1)
       activesupport (>= 6.1)
     gravatar-ultimate (2.0.0)
@@ -285,18 +294,12 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml-i18n-extractor (0.5.9)
-      activesupport
-      haml
-      highline
-      tilt
-      trollop (= 1.16.2)
     haml-rails (2.1.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.62.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -312,6 +315,9 @@ GEM
       webrick
     highline (3.1.2)
       reline
+    http-accept (1.7.0)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
     httparty (0.22.0)
       csv
       mini_mime (>= 1.0.0)
@@ -329,7 +335,9 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    icalendar (2.11.0)
+    i18n_data (1.1.0)
+      simple_po_parser (~> 1.1)
+    icalendar (2.11.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -339,7 +347,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -348,7 +356,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.12.0)
+    json (2.13.2)
     json-schema (5.1.0)
       addressable (~> 2.8)
     jsonapi-resources (0.10.7)
@@ -393,6 +401,10 @@ GEM
     matrix (0.4.2)
     memcachier (0.0.2)
     method_source (1.1.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0805)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
@@ -407,23 +419,24 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.4.20)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
+    netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.10)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -435,18 +448,17 @@ GEM
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
+    open-uri (0.1.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.5.9)
+    pg (1.6.1)
+    pg (1.6.1-x86_64-linux)
     platform-api (3.8.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
@@ -463,11 +475,11 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     query_diet (0.7.2)
     racc (1.8.1)
-    rack (2.2.15)
+    rack (2.2.17)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -480,25 +492,25 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -513,9 +525,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -523,41 +535,47 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.13.1)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    recaptcha (5.19.0)
+    recaptcha (5.20.1)
     redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rexml (3.4.1)
     rouge (4.1.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-activemodel-mocks (1.2.1)
+    rspec-activemodel-mocks (1.3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.4)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.4)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.0)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
@@ -565,7 +583,9 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.3)
+    rspec-rebound (0.2.1)
+      rspec-core (~> 3.3)
+    rspec-support (3.13.4)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
@@ -581,7 +601,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.75.5)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -589,10 +609,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -601,7 +621,7 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.32.0)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -621,7 +641,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (2.4.1)
+    rubyzip (3.0.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -635,17 +655,17 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.6.4)
+    scout_apm (5.7.1)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.32.0)
+    selenium-webdriver (4.35.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     sidekiq (7.3.9)
       base64
@@ -653,11 +673,7 @@ GEM
       logger
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    simple_po_parser (1.1.6)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -669,20 +685,19 @@ GEM
     ssrf_filter (1.1.2)
     stringio (3.1.7)
     sysexits (1.2.0)
-    temple (0.10.3)
+    temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.5)
+    terser (1.2.6)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
+    thor (1.4.0)
     thread_safe (0.3.6)
-    tilt (2.6.0)
+    tilt (2.6.1)
     timecop (0.9.10)
     timeout (0.4.3)
-    trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     unicorn (6.1.0)
@@ -708,7 +723,8 @@ GEM
       rack-test (>= 0.5.3)
     webrick (1.9.1)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
@@ -718,7 +734,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -744,9 +760,9 @@ DEPENDENCIES
   capybara-email
   capybara-screenshot
   chartkick
-  codeclimate-test-reporter
   coffee-rails
   comfortable_mexican_sofa!
+  crowdin-cli
   csv_shaper
   dalli
   database_cleaner
@@ -765,11 +781,11 @@ DEPENDENCIES
   gibbon (~> 1.2.0)
   gravatar-ultimate
   haml
-  haml-i18n-extractor
   haml-rails
   haml_lint (>= 0.25.1)
   hashie (>= 3.5.3)
   i18n-tasks
+  i18n_data (~> 1.1)
   icalendar
   jquery-rails
   jquery-ui-rails!
@@ -787,7 +803,6 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
-  omniauth-twitter
   percy-capybara (~> 5.0.0)
   pg
   platform-api
@@ -805,6 +820,7 @@ DEPENDENCIES
   responders
   rspec-activemodel-mocks
   rspec-rails
+  rspec-rebound
   rspectre
   rswag-api
   rswag-specs
@@ -834,7 +850,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.7p123
+   ruby 3.3.8p144
 
 BUNDLED WITH
    2.4.22

README.md

@@ -1,7 +1,6 @@
 # 🌱 Growstuff
 
 ![Build status](https://github.com/Growstuff/growstuff/workflows/CI/badge.svg)
-[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
 
@@ -18,7 +17,9 @@ encourage participation from people of all backgrounds and skill levels.
 ## Want to contribute?
 
 Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
-Dive on in and submit your PRs.
+Dive on in and submit your PRs!
+
+Vibe Coding is more than okay, just make sure you indicate if you have done so and ensure there are tests.
 
 ## Important links
 
@@ -36,6 +37,10 @@ frontend features. We welcome contributions -- see
 * To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
 * You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).
 
+### For Home Automation enthusiasts
+
+https://github.com/Growstuff/homeassistant-growstuff/
+
 ## For designers, writers, researchers, data wranglers, and other contributors
 
 There are heaps of ways to get involved and contribute no matter what
@@ -63,5 +68,3 @@ For more information about this project, contact [info@growstuff.org](mailto:inf
 
 Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).
 
-You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
-[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..

app/assets/stylesheets/_crops.scss

@@ -1,7 +1,13 @@
 .crop-icon {
   height: 1em;
 }
-
+.card-footer {
+  .btn-group-vertical {
+    .btn {
+      text-wrap: initial
+    }
+  }
+}
 .crop-thumbnail {
   .text {
     bottom: 0;

app/assets/stylesheets/_homepage.scss

@@ -1,6 +1,8 @@
 // stats shown on homepage. eg. "999 members..."
 .stats {
-  font-weight: bold;
+  a {
+    font-weight: bold;
+  }
 }
 
 .crops,

app/assets/stylesheets/_members.scss

@@ -33,13 +33,6 @@
   }
 }
 
-.location-not-set {
-  background-image: image-url("location-not-set.en.png");
-  background-position: center;
-  background-repeat: no-repeat;
-  height: 250px;
-  width: 100%;
-}
 .card {
   .badge-location {
     background-color: darken($blue, 10%);

app/assets/stylesheets/application.scss

@@ -30,3 +30,7 @@
 @import "predictions";
 @import "homepage";
 @import "maps";
+
+@view-transition {
+  navigation: auto;
+}

app/assets/stylesheets/mobile.scss

@@ -10,9 +10,33 @@
     width: 100%;
   }
 
-  .navbar .nav > li {
+#navbarSupportedContent {
+  ul {
+    flex-direction: column-reverse;
+    flex-wrap: nowrap;
+
+    li.nav-item {
+      display: block;
+      a { 
+        display: grid;
+        grid-template-columns: 2em 1fr 2em;
+      }
+      a.dropdown-toggle::after {
+        width: 100%;
+        text-align: right;
+      }
+    }
+  }
+}
+
+.crop-actions {
+  flex-direction: column;
+  width: 100%;
+  a {
+    margin: auto;
     display: block;
   }
+}
 
   .navbar .navbar-form {
     padding-left: 0;

app/assets/stylesheets/overrides.scss

@@ -10,6 +10,7 @@ body {
 
 .navbar {
   flex-wrap: nowrap;
+  align-items: flex-start
 }
 .navbar-brand {
   .site-name {
@@ -367,9 +368,6 @@ ul.thumbnail-buttons {
   h1 {
     font-size: 400%;
   }
-  .stats a {
-    color: $black;
-  }
 
   // signup widget on homepage
   .signup {

app/controllers/activities_controller.rb

@@ -24,9 +24,6 @@ class ActivitiesController < DataController
   end
 
   def show
-    # @activity is loaded by load_and_authorize_resource.
-    # We need to ensure comments are eager-loaded.
-    @activity = Activity.includes(comments: :author).find(params[:id])
     respond_with @activity
   end
 

app/controllers/alternate_names_controller.rb

@@ -57,6 +57,6 @@ class AlternateNamesController < ApplicationController
   private
 
   def alternate_name_params
-    params.require(:alternate_name).permit(:crop_id, :name, :creator_id)
+    params.require(:alternate_name).permit(:crop_id, :name, :creator_id, :language)
   end
 end

app/controllers/application_controller.rb

@@ -78,6 +78,7 @@ class ApplicationController < ActionController::Base
                     :tos_agreement,
                     # profile stuff
                     :bio, :location, :latitude, :longitude,
+                    :website_url, :instagram_handle, :facebook_handle, :bluesky_handle, :other_url,
                     # email settings
                     :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
                     # update password

app/controllers/comments_controller.rb

@@ -14,65 +14,54 @@ class CommentsController < ApplicationController
 
   def new
     @commentable = find_commentable
+    @comment = Comment.new
     if @commentable
-      @comment = @commentable.comments.new
-      @comments = @commentable.comments.post_order # Assuming post_order is generic enough or will be adapted
-      respond_with(@comment) # Changed from @comments to @comment, or @commentable
+      @comments = @commentable.comments
+      respond_with(@comments)
     else
       redirect_to(request.referer || root_url,
-                  alert: "Cannot add a comment to a non-existent or unspecified item.")
+                  alert: "Can't post a comment on a non-existent commentable")
     end
   end
 
   def edit
-    # @comment is loaded by load_and_authorize_resource
-    @comments = @comment.commentable.comments.post_order # Assuming post_order is generic
+    # TODO: Why does this need a collection of comments?
+    @comments = @comment.commentable.comments
+    @commentable = @comment.commentable
   end
 
   def create
-    @commentable = find_commentable
-    if @commentable
-      @comment = @commentable.comments.new(comment_params)
-      @comment.author = current_member
-      @comment.save
-      respond_with @comment, location: @comment.commentable # Redirect to the commentable parent
-    else
-      redirect_to(request.referer || root_url,
-                  alert: "Cannot create comment for a non-existent or unspecified item.")
-    end
+    @comment = Comment.new(comment_params)
+    @commentable = @comment.commentable
+    @comment.author = current_member
+    @comment.save
+    respond_with @comment, location: @commentable
   end
 
   def update
-    # @comment is loaded by load_and_authorize_resource
-    @comment.update(comment_params) # body is permitted by comment_params
-    respond_with @comment, location: @comment.commentable # Redirect to the commentable parent
+    @comment.update(body: comment_params['body'])
+    respond_with @comment, location: @comment.commentable
   end
 
   def destroy
-    # @comment is loaded by load_and_authorize_resource
-    @commentable = @comment.commentable # Store before destroying
+    @commentable = @comment.commentable
     @comment.destroy
-    respond_with @comment, location: @commentable # Redirect to the commentable parent
+    respond_with(@commentable)
   end
 
   private
 
   def find_commentable
-    params.each do |name, value|
-      if name =~ /(.+)_id$/
-        model_name = $1.classify
-        # Ensure model_name is one of the expected commentable types
-        # to prevent arbitrary model lookups.
-        allowed_commentables = %w[Post Photo Planting Harvest Activity]
-        if allowed_commentables.include?(model_name)
-          return model_name.constantize.find_by(id: value)
-        end
-      end
+    return unless params[:comment]
+
+    if params[:comment][:commentable_type] == 'Photo'
+      Photo.find(params[:comment][:commentable_id])
+    elsif params[:comment][:commentable_type] == 'Post'
+      Post.find(params[:comment][:commentable_id])
     end
-    nil
   end
 
   def comment_params
-    params.require(:comment).permit(:body) # Removed post_id
+    params.require(:comment).permit(:body, :commentable_id, :commentable_type)
   end
 end

app/controllers/crops_controller.rb

@@ -39,12 +39,6 @@ class CropsController < ApplicationController
     respond_with @crops
   end
 
-  def openfarm
-    @crop = Crop.find(params[:crop_slug])
-    @crop.update_openfarm_data!
-    respond_with @crop, location: @crop
-  end
-
   def gbif
     @crop = Crop.find(params[:crop_slug])
     @crop.update_gbif_data!
@@ -137,7 +131,6 @@ class CropsController < ApplicationController
 
       if @crop.approval_status_changed?(from: "pending", to: "approved")
         notifier.deliver_now!
-        @crop.update_openfarm_data!
         @crop.update_gbif_data!
       end
     else
@@ -166,7 +159,7 @@ class CropsController < ApplicationController
   end
 
   def save_crop_names
-    AlternateName.create!(names_params(:alt_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
+    AlternateName.create!(names_params(:alt_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id, language: "EN" } })
     ScientificName.create!(names_params(:sci_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
   end
 
@@ -181,18 +174,16 @@ class CropsController < ApplicationController
   def recreate_names(param_name, name_type)
     return if params[param_name].blank?
 
-    destroy_names(name_type)
-    params[param_name].each_value do |value|
-      create_name!(name_type, value) unless value.empty?
-    end
-  end
-
-  def destroy_names(name_type)
     @crop.send("#{name_type}_names").each(&:destroy)
-  end
+    params[param_name].each_value do |value|
+      next if value.empty?
 
-  def create_name!(name_type, value)
-    @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
+      if name_type == 'alternate'
+        @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id, language: "EN")
+      else
+        @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
+      end
+    end
   end
 
   def crop_params
@@ -216,12 +207,12 @@ class CropsController < ApplicationController
   def crop_json_fields
     {
       include: {
-        plantings:        {
+        plantings: {
           include: {
             owner: { only: %i(id login_name location latitude longitude) }
           }
         },
-        scientific_names: { only: [:name] }, alternate_names:  { only: [:name] }
+        scientific_names: { only: [:name] }, alternate_names:  { only: %i(name language) }
       }
     }
   end

app/controllers/gardens_controller.rb

@@ -4,7 +4,7 @@ class GardensController < DataController
   def index
     @owner = Member.find_by(slug: params[:member_slug])
     @show_all = params[:all] == '1'
-    @show_jump_to = params[:member_slug].present? ? true : false
+    @show_jump_to = params[:member_slug].present? || false
 
     @gardens = @gardens.includes(:owner)
     @gardens = @gardens.active unless @show_all
@@ -18,7 +18,7 @@ class GardensController < DataController
   end
 
   def show
-    @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
+    @current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
     @current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
     @suggested_companions = Crop.approved.where(

app/controllers/harvests_controller.rb

@@ -32,9 +32,6 @@ class HarvestsController < DataController
   end
 
   def show
-    # @harvest is loaded by load_and_authorize_resource.
-    # We need to ensure comments are eager-loaded.
-    @harvest = Harvest.includes(comments: :author).find(params[:id])
     @matching_plantings = matching_plantings if @harvest.owner == current_member
     @photos = @harvest.photos.order(created_at: :desc).paginate(page: params[:page])
     respond_with(@harvest)

app/controllers/members_controller.rb

@@ -16,7 +16,6 @@ class MembersController < ApplicationController
 
   def show
     @member        = Member.confirmed.kept.find_by!(slug: params[:slug])
-    @twitter_auth  = @member.auth('twitter')
     @flickr_auth   = @member.auth('flickr')
     @posts         = @member.posts
 

app/controllers/omniauth_callbacks_controller.rb

@@ -28,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     @authentication = action.establish_authentication(auth, member)
 
     if action.member_created?
-      raise "Invalid provider" unless %w(twitter flickr).index(auth['provider'].to_s)
+      raise "Invalid provider" unless %w(flickr).index(auth['provider'].to_s)
 
       session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
       sign_in member

app/controllers/photos_controller.rb

@@ -20,10 +20,8 @@ class PhotosController < ApplicationController
   end
 
   def show
-    # @photo is loaded by load_and_authorize_resource.
-    # We need to ensure comments are eager-loaded.
-    @photo = Photo.includes(comments: :author).find(params[:id])
     @crops = Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: @photo })
+    @comment = Comment.new(commentable: @photo)
     respond_with(@photo)
   end
 

app/controllers/plantings_controller.rb

@@ -34,9 +34,6 @@ class PlantingsController < DataController
   end
 
   def show
-    # @planting is loaded by load_and_authorize_resource.
-    # We need to ensure comments are eager-loaded.
-    @planting = Planting.includes(comments: :author).find(params[:id])
     @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
     @harvests = Harvest.search(where: { planting_id: @planting.id })
     @current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
@@ -94,6 +91,32 @@ class PlantingsController < DataController
     respond_with @planting, location: @planting.garden
   end
 
+  def transplant
+    # The `load_and_authorize_resource` in DataController will handle finding the
+    # planting and authorizing the action.
+    # We still need to authorize the new garden
+    new_garden = Garden.find(params[:garden_id])
+    authorize! :update, new_garden
+
+    # Mark original planting as finished
+    @planting.update(finished: true, finished_at: Time.zone.now)
+
+    # Create a new planting
+    new_planting = @planting.dup
+    new_planting.garden = new_garden
+    new_planting.slug = nil # let friendly_id generate a new slug
+    new_planting.finished = false
+    new_planting.finished_at = nil
+
+    if new_planting.save
+      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
+    else
+      # if the save fails, we should probably roll back the finishing of the original planting
+      @planting.update(finished: false, finished_at: nil)
+      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
+    end
+  end
+
   private
 
   def update_crop_medians
@@ -110,7 +133,7 @@ class PlantingsController < DataController
       :crop_id, :description, :garden_id, :planted_at,
       :parent_seed_id,
       :quantity, :sunniness, :planted_from, :finished,
-      :finished_at
+      :finished_at, :failed, :overall_rating
     )
   end
 

app/controllers/registrations_controller.rb

@@ -6,7 +6,6 @@ class RegistrationsController < Devise::RegistrationsController
   prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.
 
   def edit
-    @twitter_auth  = current_member.auth('twitter')
     @flickr_auth   = current_member.auth('flickr')
     render "edit"
   end

app/controllers/seeds_controller.rb

@@ -19,6 +19,8 @@ class SeedsController < DataController
       where['parent_planting'] = @planting.id
     end
 
+    where['tradeable_to'] = params[:tradeable_to] if params[:tradeable_to].present?
+
     @show_all = (params[:all] == '1')
     where['finished'] = false unless @show_all
 
@@ -41,6 +43,7 @@ class SeedsController < DataController
 
   def new
     @seed = Seed.new
+    @seed.source = 'my own seed saving'
 
     if params[:planting_slug]
       @planting = Planting.find_by(slug: params[:planting_slug])
@@ -54,6 +57,8 @@ class SeedsController < DataController
 
   def create
     @seed = Seed.new(seed_params)
+    @seed.source ||= 'my own seed saving'
+    @seed.finished ||= false
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
     flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
@@ -81,7 +86,7 @@ class SeedsController < DataController
       :crop_id, :description, :quantity, :plant_before,
       :parent_planting_id, :saved_at,
       :days_until_maturity_min, :days_until_maturity_max,
-      :organic, :gmo,
+      :organic, :gmo, :source,
       :heirloom, :tradable_to, :slug,
       :finished, :finished_at
     )

app/helpers/application_helper.rb

@@ -21,6 +21,10 @@ module ApplicationHelper
     classes
   end
 
+  def count_github_contibutors
+    File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
+  end
+
   # Produces a cache key for uniquely identifying cached fragments.
   def cache_key_for(klass, identifier = "all")
     count          = klass.count
@@ -50,7 +54,6 @@ module ApplicationHelper
 
       uri.query = "&width=#{size}&height=#{size}" if uri.host == 'graph.facebook.com'
 
-      # TODO: Assess twitter - https://dev.twitter.com/overview/general/user-profile-images-and-banners
       # TODO: Assess flickr  - https://www.flickr.com/services/api/misc.buddyicons.html
 
       return uri.to_s

app/helpers/buttons_helper.rb

@@ -2,6 +2,7 @@
 
 module ButtonsHelper
   include IconsHelper
+
   def garden_plant_something_button(garden, classes: "btn btn-default")
     return unless can? :edit, garden
 
@@ -52,7 +53,7 @@ module ButtonsHelper
     link_to t('buttons.mark_as_inactive'),
             garden_path(garden, garden: { active: 0 }),
             method: :put, class: classes,
-            data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
+            data: { confirm: I18n.t('gardens.confirm_deactivate') }
   end
 
   def create_button(model_to_create, path, icon, label)
@@ -97,7 +98,7 @@ module ButtonsHelper
   end
 
   def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')
-    return unless can?(:edit, planting) || planting.finished
+    return unless can?(:edit, planting) || planting.finished || planting.failed
 
     link_to planting_path(slug: planting.slug, planting: { finished: 1 }),
             method: :put, class: "#{classes} append-date" do
@@ -105,6 +106,15 @@ module ButtonsHelper
     end
   end
 
+  def planting_failed_button(planting, classes: 'btn btn-default btn-secondary')
+    return unless can?(:edit, planting) || planting.finished || planting.failed
+
+    link_to planting_path(slug: planting.slug, planting: { failed: 1 }),
+            method: :put, class: "#{classes}" do
+      finished_icon + ' ' + t('buttons.mark_as_failed')
+    end
+  end
+
   def seed_finish_button(seed, classes: 'btn btn-default')
     return unless can?(:create, Planting) && seed.active
 
@@ -122,7 +132,7 @@ module ButtonsHelper
   end
 
   def planting_save_seeds_button(planting, classes: 'btn btn-default')
-    return unless can?(:edit, planting)
+    return unless can?(:edit, planting) && !planting.failed?
 
     link_to new_planting_seed_path(planting_slug: planting.slug), class: classes do
       seed_icon + ' ' + t('buttons.save_seeds')

app/helpers/event_helper.rb

@@ -7,6 +7,8 @@ module EventHelper
 
   def event_description(event)
     render "#{event.event_type.pluralize}/description", event_model: resolve_model(event)
+rescue ActionView::MissingTemplate
+  "#{event.event_type.humanize.downcase}d"
   end
 
   def resolve_model(event)

app/helpers/plantings_helper.rb

@@ -43,6 +43,14 @@ module PlantingsHelper
     (planting.first_harvest_predicted_at - Time.zone.today).to_i
   end
 
+  # Returns a list of gardens the planting can be transplanted to
+  # based on the planting's owner.
+  def transplantable_gardens_by_owner(planting)
+    garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a
+
+    Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
+  end
+
   def days_from_now_to_last_harvest(planting)
     return unless planting.planted_at.present? && planting.last_harvest_predicted_at.present?
 

app/models/ability.rb

@@ -98,19 +98,7 @@ class Ability
     can :destroy, Like, member_id: member.id
     can :create,  Comment
     can :update,  Comment, author_id: member.id
-    can :destroy, Comment do |comment|
-      is_author = comment.author_id == member.id
-      is_commentable_owner = false
-      if comment.commentable.present?
-        if comment.commentable.respond_to?(:owner_id) && comment.commentable.owner_id == member.id
-          is_commentable_owner = true
-        # Posts use author_id for their "owner"
-        elsif comment.commentable.respond_to?(:author_id) && comment.commentable.author_id == member.id
-          is_commentable_owner = true
-        end
-      end
-      is_author || is_commentable_owner
-    end
+    can :destroy, Comment, author_id: member.id
 
     # same deal for gardens and plantings
     can :create,  Garden
@@ -123,6 +111,10 @@ class Ability
     can :update, Planting do |planting|
       planting.garden.garden_collaborators.where(member_id: member.id).any?
     end
+    can :transplant, Planting, garden: { owner_id: member.id }
+    can :transplant, Planting do |planting|
+      planting.garden.garden_collaborators.where(member_id: member.id).any?
+    end
     can :destroy, Planting do |planting|
       planting.garden.garden_collaborators.where(member_id: member.id).any?
     end

app/models/alternate_name.rb

@@ -5,6 +5,7 @@ class AlternateName < ApplicationRecord
   belongs_to :creator, class_name: 'Member', inverse_of: :created_alternate_names
   validates :name, presence: true
   validates :crop, presence: true
+  validates :language, presence: true
 
   after_commit :reindex
 

app/models/comment.rb

@@ -3,30 +3,26 @@
 class Comment < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :comments
   belongs_to :commentable, polymorphic: true, counter_cache: true
+  # validates :body, presence: true
 
   scope :post_order, -> { order(created_at: :asc) } # for display on post page
 
   after_create do
-    recipient = if commentable.respond_to?(:author)
-                  commentable.author.id
-                elsif commentable.respond_to?(:owner)
-                  commentable.owner.id
-                end
+    recipient = commentable.author.id
     sender    = author.id
     # don't send notifications to yourself
-    if recipient && recipient != sender
+    if recipient != sender
       Notification.create(
         recipient_id: recipient,
         sender_id:    sender,
-        subject:      "#{author} commented on your #{commentable.class.name.downcase}",
+        subject:      "#{author} commented on #{commentable.subject}",
         body:,
-        commentable_id: commentable.id,
-        commentable_type: commentable.class.name
+        notifiable:   commentable
       )
     end
   end
 
   def to_s
-    "#{author.login_name} commented on #{commentable.class.name.downcase} ##{commentable.id}"
+    "#{author.login_name} commented on #{commentable.subject}"
   end
 end

app/models/concerns/finishable.rb

@@ -8,7 +8,12 @@ module Finishable
     scope :current, -> { where.not(finished: true) }
 
     def active
-      !finished
+      # Plantings can fail. At the moment, activities and seeds cannot.
+      if respond_to?(:failed)
+        !finished && !failed
+      else
+        !finished
+      end
     end
   end
 end

app/models/concerns/open_farm_data.rb

@@ -4,10 +4,6 @@ module OpenFarmData
   extend ActiveSupport::Concern
 
   included do
-    def update_openfarm_data!
-      OpenfarmService.new.update_crop(self)
-    end
-
     def of_photo
       fetch_attr('main_image_path')
     end
@@ -43,10 +39,6 @@ module OpenFarmData
       fetch_attr('common_names')
     end
 
-    def guides_count
-      fetch_attr('guides_count')
-    end
-
     def binomial_name
       fetch_attr('binomial_name')
     end

app/models/concerns/predict_harvest.rb

@@ -38,7 +38,7 @@ module PredictHarvest
 
     # status
     def harvest_time?
-      return false if crop.perennial || finished
+      return false if crop.perennial || finished || failed
 
       # We have harvests but haven't finished
       harvests.size.positive? ||

app/models/concerns/predict_planting.rb

@@ -8,12 +8,12 @@ module PredictPlanting
     before_save :calculate_lifespan
 
     def calculate_lifespan
-      self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
+      self.lifespan = (planted_at.present? && finished_at.present? && !failed? ? finished_at - planted_at : nil)
     end
 
     # dates
     def finish_predicted_at
-      if planted_at.blank?
+      if planted_at.blank? || failed?
         nil
       elsif crop.median_lifespan.present?
         planted_at + crop.median_lifespan.days
@@ -34,15 +34,18 @@ module PredictPlanting
     end
 
     def actual_lifespan
-      return unless planted_at.present? && finished_at.present?
+      return unless planted_at.present? && finished_at.present? && !failed?
 
       (finished_at - planted_at).to_i
     end
 
     def age_in_days
       return if planted_at.blank?
+      return if failed?
 
       known_last_day ||= finished_at || Time.zone.today
+      known_last_day = Time.zone.today if known_last_day > Time.zone.today
+
       (known_last_day - planted_at).to_i
     end
 
@@ -50,9 +53,9 @@ module PredictPlanting
       Rails.cache.fetch("#{cache_key_with_version}/percentage_grown", expires_in: 8.hours) do
         if finished?
           100
-        elsif !planted?
+        elsif !planted? || failed?
           0
-        elsif crop.perennial || finish_predicted_at.nil?
+        elsif crop.perennial || (finish_predicted_at.nil? && finished_at.nil?) # This covers future dated finished_at that hasn't occurrred yet.
           nil
         else
           calculate_percentage_grown
@@ -71,7 +74,7 @@ module PredictPlanting
     end
 
     def late?
-      crop.annual? && !finished &&
+      crop.annual? && !finished && !failed &&
         planted_at.present? &&
         finish_predicted_at.present? &&
         finish_predicted_at <= Time.zone.today
@@ -91,9 +94,9 @@ module PredictPlanting
     private
 
     def calculate_percentage_grown
-      return 0 if age_in_days < 0
+      return 0 if age_in_days.to_i < 0
 
-      percent = (age_in_days / expected_lifespan.to_f) * 100
+      percent = (age_in_days.to_f / expected_lifespan.to_f) * 100
       (percent > 100 ? 100 : percent)
     end
   end

app/models/concerns/search_seeds.rb

@@ -59,7 +59,8 @@ module SearchSeeds
       search('*', limit:,
                   where:    {
                     finished: false,
-                    tradable: true
+                    tradable: true,
+                    _or:      [{ plant_before: nil }, { plant_before: { lt: Date.today } }]
                   },
                   boost_by: [:created_at],
                   load:     false)

app/models/csv_importer.rb

@@ -59,7 +59,7 @@ class CsvImporter
 
     alternate_names.split(/,\s*/).each do |name|
       altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
+      altname ||= AlternateName.create! name:, crop: @crop, language: "EN", creator: cropbot
       @crop.alternate_names << altname
     end
   end

app/models/follow.rb

@@ -10,7 +10,8 @@ class Follow < ApplicationRecord
       recipient_id: followed_id,
       sender_id:    follower_id,
       subject:      "#{follower.login_name} is now following you",
-      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
+      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. ",
+      notifiable:   self
     )
   end
 end

app/models/garden.rb

@@ -5,6 +5,7 @@ class Garden < ApplicationRecord
   include Geocodable
   include PhotoCapable
   include Ownable
+
   friendly_id :garden_slug, use: %i(slugged finders)
 
   has_many :plantings, dependent: :destroy
@@ -44,6 +45,7 @@ class Garden < ApplicationRecord
       .where.not(gardens: { latitude: nil })
       .where.not(gardens: { longitude: nil })
   }
+
   AREA_UNITS_VALUES = {
     "square metres" => "square metre",
     "square feet"   => "square foot",

app/models/harvest.rb

@@ -53,7 +53,6 @@ class Harvest < ApplicationRecord
 
   delegate :name, :slug, to: :crop, prefix: true
   delegate :login_name, :slug, to: :owner, prefix: true
-  delegate :name, to: :plant_part, prefix: true
 
   ##
   ## Validations
@@ -109,7 +108,7 @@ class Harvest < ApplicationRecord
   def to_s
     # 50 individual apples, weighing 3lb
     # 2 buckets of apricots, weighing 10kg
-    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    "#{quantity_to_human} #{unit_to_human} #{plant_part_name_to_human} of #{crop_name} #{weight_to_human}".strip
   end
 
   def quantity_to_human
@@ -132,13 +131,13 @@ class Harvest < ApplicationRecord
     "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
   end
 
-  def crop_name_to_human
+  def plant_part_name_to_human
     if unit != 'individual' # buckets of apricot*s*
-      crop.name.pluralize
+       plant_part.name.pluralize
     elsif quantity == 1
-      crop.name
+      plant_part.name
     else
-      crop.name.pluralize
+      plant_part.name.pluralize
     end.to_s
   end
 

app/models/member.rb

@@ -91,6 +91,9 @@ class Member < ApplicationRecord
             uniqueness: {
               case_sensitive: false
             }
+  validates :website_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
+  validates :instagram_handle, :facebook_handle, :bluesky_handle, format: { without: %r{\Ahttps?:\/\/|\/}, message: "should be a handle, not a URL" }, allow_blank: true
 
   #
   # Triggers

app/models/notification.rb

@@ -3,7 +3,7 @@
 class Notification < ApplicationRecord
   belongs_to :sender, class_name: 'Member', inverse_of: :sent_notifications
   belongs_to :recipient, class_name: 'Member', inverse_of: :notifications
-  belongs_to :commentable, polymorphic: true, optional: true
+  belongs_to :notifiable, polymorphic: true
 
   validates :subject, length: { maximum: 255 }
 

app/models/photo.rb

@@ -8,6 +8,7 @@ class Photo < ApplicationRecord
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze
 
   has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
+  has_many :comments, as: :commentable, dependent: :destroy
 
   # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
   # relationship instead.
@@ -45,7 +46,8 @@ class Photo < ApplicationRecord
     flickr = owner.flickr
     info = flickr.photos.getInfo(photo_id: source_id)
     licenses = flickr.photos.licenses.getInfo
-    license = licenses.find { |l| l.id == info.license }
+    license = licenses.find { |l| l.id.to_i == info.license.to_i }
+    Rails.logger.error("Cannot find license: " + [info.license, licenses].inspect) unless license
     {
       title:         calculate_title(info),
       license_name:  license.name,
@@ -83,6 +85,14 @@ class Photo < ApplicationRecord
     "#{title} by #{owner.login_name}"
   end
 
+  def subject
+    title
+  end
+
+  def author
+    owner
+  end
+
   def flickr_photo_id
     source_id if source == 'flickr'
   end

app/models/plant_part.rb

@@ -11,6 +11,10 @@ class PlantPart < ApplicationRecord
 
   scope :joins_members, -> { joins("INNER JOIN members ON members.id = harvests.owner_id") }
 
+  def whole_plant?
+    name == 'whole plant'
+  end
+
   def to_s
     name
   end

app/models/planting.rb

@@ -43,7 +43,8 @@ class Planting < ApplicationRecord
       .where.not(gardens: { latitude: nil })
       .where.not(gardens: { longitude: nil })
   }
-  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :active, -> { where(finished: false, failed: false).where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :failed, -> { where(failed: true) }
   scope :annual, -> { joins(:crop).where(crops: { perennial: false }) }
   scope :perennial, -> { joins(:crop).where(crops: { perennial: true }) }
   scope :interesting, -> { has_photos.one_per_owner.order(planted_at: :desc) }
@@ -72,6 +73,7 @@ class Planting < ApplicationRecord
   validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
+  validate :cannot_be_finished_and_failed
   validates :quantity, allow_nil: true, numericality: {
     only_integer: true, greater_than_or_equal_to: 0
   }
@@ -81,6 +83,9 @@ class Planting < ApplicationRecord
   validates :planted_from, allow_blank: true, inclusion: {
     in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
   }
+  validates :overall_rating, allow_blank: true, numericality: {
+    only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
+  }
 
   def planting_slug
     [
@@ -96,7 +101,11 @@ class Planting < ApplicationRecord
   end
 
   def finished?
-    finished || (finished_at.present? && finished_at <= Time.zone.today)
+    (finished || (finished_at.present? && finished_at <= Time.zone.today)) && !failed?
+  end
+
+  def failed?
+    failed
   end
 
   def planted?
@@ -120,6 +129,10 @@ class Planting < ApplicationRecord
 
   private
 
+  def cannot_be_finished_and_failed
+    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
+  end
+
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both

app/models/post.rb

@@ -3,6 +3,7 @@
 class Post < ApplicationRecord
   extend FriendlyId
   include Likeable
+
   friendly_id :author_date_subject, use: %i(slugged finders)
   include PhotoCapable
 
@@ -10,9 +11,10 @@ class Post < ApplicationRecord
   # Relationships
   belongs_to :author, class_name: 'Member', inverse_of: :posts
   belongs_to :forum, optional: true
-  has_many :comments, dependent: :destroy
+  has_many :comments, as: :commentable, dependent: :destroy
   has_many :crop_posts, dependent: :delete_all
   has_many :crops, through: :crop_posts
+  has_many :notifications, as: :notifiable, dependent: :destroy
 
   after_create :send_notification
   #
@@ -95,6 +97,7 @@ class Post < ApplicationRecord
       Notification.create(
         recipient_id:,
         sender_id:    sender,
+        notifiable:   self,
         subject:      "#{author} mentioned you in their post #{subject}",
         body:
       )

app/models/seed.rb

@@ -12,6 +12,8 @@ class Seed < ApplicationRecord
   ORGANIC_VALUES = ['certified organic', 'non-certified organic', 'conventional/non-organic', 'unknown'].freeze
   GMO_VALUES = ['certified GMO-free', 'non-certified GMO-free', 'GMO', 'unknown'].freeze
   HEIRLOOM_VALUES = %w(heirloom hybrid unknown).freeze
+  SOURCE_VALUES = ['seed catalogue', 'retail outlet', 'seed bank or similar institution',
+                   'traded from another person', 'my own seed saving', 'other/unknown'].freeze
 
   #
   # Relationships
@@ -44,6 +46,9 @@ class Seed < ApplicationRecord
   validates :heirloom, allow_blank: false,
                        inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
                                                                     "are heirloom, hybrid, or unknown" }
+  validates :source, allow_blank: true,
+                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
+                                                                 "or that you don't know" }
 
   #
   # Delegations
@@ -59,6 +64,7 @@ class Seed < ApplicationRecord
   scope :has_location, -> { joins(:owner).where.not('members.location': nil) }
   scope :recent, -> { order(created_at: :desc) }
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :expired, -> { active.where('plant_before < ?', Time.zone.today) }
 
   def tradable
     tradable_to != 'nowhere'

app/resources/api/v1/planting_resource.rb

@@ -13,6 +13,7 @@ module Api
 
       attribute :slug
       attribute :planted_at
+      attribute :failed
       attribute :finished
       attribute :finished_at
       attribute :quantity
@@ -37,9 +38,7 @@ module Api
       filter :finished
 
       attribute :percentage_grown
-      def percentage_grown
-        @model.percentage_grown
-      end
+      delegate :percentage_grown, to: :@model
 
       attribute :crop_name
       attribute :crop_slug

app/services/openfarm_service.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-BASE = 'https://openfarm.cc/api/v1/'
-# BASE = 'http://127.0.0.1:3000/api/v1/'
-
-class OpenfarmService
-  def initialize
-    @cropbot = Member.find_by(login_name: 'cropbot')
-  end
-
-  def import!
-    Crop.all.order(updated_at: :desc).each do |crop|
-      Rails.logger.debug { "#{crop.id}, #{crop.name}" }
-      update_crop(crop) if crop.valid?
-    end
-  end
-
-  def update_crop(crop)
-    openfarm_record = fetch(crop.name)
-    if openfarm_record.present? && openfarm_record.is_a?(String)
-      Rails.logger.info(openfarm_record)
-    elsif openfarm_record.present? && openfarm_record.fetch('data', false)
-      crop.update! openfarm_data: openfarm_record.fetch('data', false)
-      save_companions(crop, openfarm_record)
-      save_photos(crop)
-    else
-      Rails.logger.debug "\tcrop not found on Open Farm"
-      crop.update!(openfarm_data: false)
-    end
-  end
-
-  def save_companions(crop, openfarm_record)
-    companions = openfarm_record.fetch('data').fetch('relationships').fetch('companions').fetch('data')
-    crops = openfarm_record.fetch('included', []).select { |rec| rec["type"] == 'crops' }
-    CropCompanion.transaction do
-      companions.each do |com|
-        companion_crop_hash = crops.detect { |c| c.fetch('id') == com.fetch('id') }
-        companion_crop_name = companion_crop_hash.fetch('attributes').fetch('name').downcase
-        companion_crop = Crop.where('lower(name) = ?', companion_crop_name).first
-        companion_crop = Crop.create!(name: companion_crop_name, requester: @cropbot, approval_status: "pending") if companion_crop.nil?
-        crop.companions << companion_crop unless crop.companions.where(id: companion_crop.id).any?
-      end
-    end
-  end
-
-  def save_photos(crop)
-    pictures = fetch_pictures(crop.name)
-    pictures.each do |picture|
-      data = picture.fetch('attributes')
-      Rails.logger.debug(data)
-      next unless data.fetch('image_url').start_with? 'http'
-      next if Photo.find_by(source_id: picture.fetch('id'), source: 'openfarm')
-
-      photo = Photo.new(
-        source_id:     picture.fetch('id'),
-        source:        'openfarm',
-        owner:         @cropbot,
-        thumbnail_url: data.fetch('thumbnail_url'),
-        fullsize_url:  data.fetch('image_url'),
-        title:         'Open Farm photo',
-        license_name:  'No rights reserved',
-        link_url:      "https://openfarm.cc/en/crops/#{name_to_slug(crop.name)}"
-      )
-      if photo.valid?
-        Photo.transaction do
-          photo.save
-          PhotoAssociation.find_or_create_by! photo:, photographable: crop
-        end
-        Rails.logger.debug { "\t saved photo #{photo.id} #{photo.source_id}" }
-      else
-        Rails.logger.warn "Photo not valid"
-      end
-    end
-  end
-
-  def fetch(name)
-    conn.get("crops/#{name_to_slug(name)}.json").body
-  rescue NoMethodError
-    Rails.logger.debug "error fetching crop"
-    Rails.logger.debug "BODY: "
-    Rails.logger.debug body
-  end
-
-  def name_to_slug(name)
-    CGI.escape(name.gsub(' ', '-').downcase)
-  end
-
-  def fetch_all(page)
-    conn.get("crops.json?page=#{page}").body.fetch('data', {})
-  end
-
-  def fetch_pictures(name)
-    body = conn.get("crops/#{name_to_slug(name)}/pictures.json").body
-    body.fetch('data', false)
-  rescue StandardError
-    Rails.logger.debug "Error fetching photos"
-    Rails.logger.debug []
-  end
-
-  private
-
-  def conn
-    Faraday.new BASE do |conn|
-      conn.response :json, content_type: /\bjson$/
-      conn.adapter Faraday.default_adapter
-    end
-  end
-end

app/services/timeline_service.rb

@@ -18,10 +18,20 @@ class TimelineService
       .union_all(photos_query)
       .union_all(seeds_query)
       .union_all(activities_query)
+      .union_all(likes_query)
       .where.not(event_at: nil)
       .order(event_at: :desc)
   end
 
+  def self.likes_query
+    Like
+      .select("likes.id",
+              "'like' as event_type",
+              "likes.created_at as event_at",
+              "likes.member_id as owner_id",
+              "null as crop_id")
+  end
+
   def self.activities_query
     Activity.select(
       :id,

app/views/activities/_form.html.haml

@@ -47,7 +47,7 @@
 
       .row
         .col-md-6
-          = f.check_box :finished, label: 'Mark as finished'
+          = f.check_box :finished, label: t('buttons.mark_as_finished')
           %span.help-block= t('.finish_helper')
 
     .card-footer

app/views/activities/show.html.haml

@@ -44,8 +44,5 @@
           %a{name: 'plantings'}
           = render 'plantings/card', planting: @activity.planting
 
-      %section.comments.mt-4
-        = render 'comments/comments', commentable: @activity
-
 
     .col-md-4.col-xs-12

app/views/alternate_names/_form.html.haml

@@ -31,7 +31,8 @@
         = f.label :name, class: 'control-label col-md-2'
         .col-md-8
           = f.text_field :name, class: 'form-control'
-
+        .col-md-8
+          = f.select :language, I18nData.languages.map {|code, name| [name.split(";").first, code] }, class: 'form-control'
       .form-group
         .form-actions.col-md-offset-2.col-md-8
           = f.submit 'Save', class: 'btn btn-primary'

app/views/comments/_comments.html.haml

@@ -1,21 +1,11 @@
-.comments-section.mt-4
-  %h4.mb-3 Comments
-  - if commentable.comments.any?
-    .list-group
-      - commentable.comments.post_order.each do |comment|
-        .list-group-item.p-0.mb-2.border-0
-          = render 'comments/comment', comment: comment
-  - else
-    %p No comments yet.
+%a{ name: "comments" }
+- if commentable.comments
+  %hr/
+  %h2
+    = comment_icon
+    = localize_plural(commentable.comments, Comment)
+  - commentable.comments.post_order.each do |comment|
+    = render "comments/single", comment: comment
 
-  - if can? :create, Comment # Assuming a general ability to create comments
-    .mt-3
-      = link_to "Add Comment", new_polymorphic_path([commentable, Comment.new]), class: 'btn btn-primary'
-
-%hr/
--# This section is for rendering the new/edit form directly on the page if needed,
--# but the primary "Add Comment" link above goes to the comments/new page.
--# If @new_comment is passed, it means we want to show the form.
-- if defined?(@new_comment) && @new_comment && can?(:create, Comment) # Check @new_comment specifically
-  %h5.mt-3 Leave a comment
-  = render 'comments/form', commentable: commentable, comment: @new_comment
+- else
+  %h2 There are no comments yet

app/views/comments/_description.haml

@@ -1 +1 @@
-#{link_to 'commented', event_model} on #{link_to event_model.post, event_model.post}
+#{link_to 'commented', event_model} on #{link_to event_model.commentable, event_model.commentable}

app/views/comments/_form.html.haml

@@ -1,23 +1,27 @@
+- @comment ||= Comment.new(commentable: @commentable)
 .card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
   .card-body
     - if content_for? :title
       %h1.h2-responsive.text-center
         %strong=yield :title
-    = form_for(commentable ? [commentable, comment] : comment, html: { class: "form-horizontal" }) do |f|
-      - if comment.errors.any?
+    = form_for(@comment, html: { class: "form-horizontal" }) do |f|
+      - if @comment.errors.any?
         #error_explanation
           %h2
-            = pluralize(comment.errors.size, "error")
+            = pluralize(@comment.errors.size, "error")
             prohibited this comment from being saved:
           %ul
-            - comment.errors.full_messages.each do |msg|
+            - @comment.errors.full_messages.each do |msg|
               %li= msg
 
       .md-form
-        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus'
+        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus', required: true, pattern: '\w+'
         = f.label :body, "Your comment:"
 
       %span.help-block
         = render partial: "shared/markdown_help"
       .actions.text-right
         = f.submit 'Post comment', class: 'btn btn-primary'
+      .field
+        = f.hidden_field :commentable_id, value: @commentable.id
+        = f.hidden_field :commentable_type, value: @commentable.class.name

app/views/comments/edit.html.haml

@@ -1,2 +1,7 @@
-%h2 Edit Comment
-= render 'comments/form', commentable: @comment.commentable, comment: @comment
+= content_for :title, "Editing comment"
+
+%p
+  Editing comment on
+  = link_to @comment.commentable.subject, @comment.commentable
+
+= render 'form', locals: { comment: @comment, commentable: @comment.commentable }

app/views/comments/index.rss.haml

@@ -5,17 +5,18 @@
     %link= comments_url
     - @comments.each do |comment|
       %item
-        %title Comment by #{comment.author.login_name} on #{comment.post.subject}
+        %title Comment by #{comment.author.login_name} on #{comment.commentable.subject}
         %description
           :escaped_markdown
             <p>
             Comment on
-            #{ link_to comment.post.subject, post_url(comment.post) }
+            #{ link_to comment.commentable.subject, polymorphic_url(comment.commentable) }
             </p>
 
           :escaped_markdown
             #{ strip_tags markdownify(comment.body) }
 
         %pubdate= comment.created_at.to_fs(:rfc822)
-        %link= post_url(comment.post)
+        %link= polymorphic_url(comment.commentable)
         %guid= comment_url(comment)
+

app/views/comments/new.html.haml

@@ -1,5 +1,17 @@
-%h2
-  Add comment to
-  = @commentable.class.name.downcase
+= content_for :title, "New comment"
+- if @commentable.is_a?(Post)
+  %section.blog-post
+    .card.post{ id: "post-#{@commentable.id}" }
+      .card-header
+        %h2.display-3= @commentable.subject
+      .card-body= render "posts/single", post: @commentable || @comment.commentable, subject: true
+- elsif @commentable.is_a?(Photo)
+  %section.blog-post
+    .card.photo{ id: "photo-#{@commentable.id}" }
+      .card-header
+        %h2.display-3= @commentable.subject
+      .card-body= render "photos/card", photo: @commentable || @comment.commentable, subject: true
 
-= render 'comments/form', commentable: @commentable, comment: @comment
+= render partial: "comments/comments", locals: { commentable: @commentable || @comment.commentable }
+
+= render 'form', locals: { comment: @comment, commentable: @commentable || @comment.commentable }

app/views/crops/_actions.html.haml

@@ -1,6 +1,6 @@
 - if crop.approved? && signed_in?
 
-  .btn-group{"aria-label" => "Crop Actions", role: "group"}
+  .btn-group.crop-actions{"aria-label" => "Crop Actions", role: "group"}
     = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
     = render 'harvests/modal', harvest: Harvest.new(crop: @crop,  owner: current_member)
     = render 'seeds/modal', seed: Seed.new(crop: @crop,  owner: current_member)

app/views/crops/_alternate_names.html.haml

@@ -5,7 +5,7 @@
       - if can? :edit, an
         .dropdown.planting-actions
           %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}
-            = an.name
+            = "#{an.name} (#{an.language})"
           .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-altnames"}
             - if can? :edit, an
               = link_to edit_alternate_name_path(an), class: 'dropdown-item' do
@@ -16,7 +16,7 @@
                 = delete_icon
                 = t('.delete')
       - else
-        .badge= an.name
+        .badge= "#{an.name} (#{an.language})"
 
 
   %p.text-right

app/views/crops/_crop.html.haml

@@ -25,9 +25,9 @@
           Last harvest expected
           %strong= crop.median_days_to_last_harvest
           days after planting
-    - if member_signed_in?
-      .card-footer
-        .d-flex.justify-content-between
-          = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
-          - #= render 'harvests/modal', harvest: Harvest.new(crop: crop, owner: current_member)
-          = render 'seeds/modal', seed: Seed.new(crop: crop, owner: current_member)
+  - if member_signed_in?
+    .card-footer
+      .d-flex.btn-group-vertical
+        = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
+        - #= render 'harvests/modal', harvest: Harvest.new(crop: crop, owner: current_member)
+        = render 'seeds/modal', seed: Seed.new(crop: crop, owner: current_member)

app/views/crops/_planting_advice.html.haml

@@ -1,6 +0,0 @@
-- if crop.guides_count.present? && crop.guides_count.positive?
-  %p
-    There are
-    = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-').downcase}" do
-      #{crop.guides_count} growing guides on Open Farm
-

app/views/crops/_wrangle.html.haml

@@ -10,10 +10,6 @@
           = edit_icon
           = t('.edit')
 
-        = link_to crop_openfarm_path(crop), method: :post, class: 'dropdown-item' do
-          = icon 'far', 'update'
-          Fetch data from OpenFarm
-
         = link_to crop_gbif_path(crop), method: :post, class: 'dropdown-item' do
           = icon 'far', 'update'
           Fetch data from GBIF

app/views/crops/show.html.haml

@@ -74,7 +74,6 @@
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
         = render 'grown_for', crop: @crop
-        = render 'planting_advice', crop: @crop
         - if @crop.parent
           %hr/
           %p.parent-crop
@@ -124,13 +123,6 @@
             = icon 'fas', 'external-link-alt'
             Wikipedia (English)
 
-        %li.list-group-item
-          = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}",
-                    class: 'card-link',
-                    target: "_blank",
-                    rel: "noopener noreferrer" do
-            = icon 'fas', 'external-link-alt'
-            OpenFarm - Growing guide
         %li.list-group-item
           = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
                     target: "_blank",
@@ -147,6 +139,14 @@
               = icon 'fas', 'external-link-alt'
               Google
 
+        %li.list-group-item
+          = link_to 'https://chat.openai.com/?model=gpt-4o&prompt=' + CGI.escape(['How do I grow', @crop.name, "and what grows well with it? What should I plant the next season if practicing crop rotation? Explain why and add links to your sources"].join(' ')),
+                  target: "_blank",
+                  class: 'card-link',
+                  rel: "noopener noreferrer" do
+            = icon 'fas', 'external-link-alt'
+            ChatGPT
+
         %li.list-group-item
           = link_to "https://wikihow.com/wikiHowTo?search=#{CGI.escape "grow #{@crop.name}" }",
                     target: "_blank",

app/views/devise/registrations/_edit_apps.html.haml

@@ -3,19 +3,6 @@
     html: { method: :put, class: 'form-horizontal' }) do |_f|
   %br/
   = render 'devise/shared/error_messages', resource: resource
-  .row
-    .col-md-12
-      %p
-        = image_tag "twitter_32.png", size: "32x32", alt: 'Twitter logo'
-        - if @twitter_auth
-          You are connected to Twitter as
-          = link_to @twitter_auth.name, "https://twitter.com/#{@twitter_auth.name}"
-          = link_to "Disconnect", @twitter_auth,
-                    confirm: "Are you sure you want to remove this connection?",
-                    method: :delete, class: "remove btn btn-danger"
-        - else
-          = link_to 'Connect to Twitter', '/members/auth/twitter', class: 'btn'
-
   .row
     .col-md-12
       %p

app/views/devise/registrations/_edit_profile.html.haml

@@ -13,7 +13,32 @@
   .form-group
     = f.label :bio, class: 'control-label col-md-2'
     .col-md-8
-      = f.text_area :bio, rows: 6, class: 'form-control'
+      = f.text_area :bio, rows: 6, class: 'form-control', placeholder: "I'm am XYZ gardener interested in A, B, C"
+
+  .form-group
+    = f.label :website_url, 'Website', class: 'control-label col-md-2'
+    .col-md-8
+      = f.url_field :website_url, class: 'form-control', placeholder: "https://you.example.com/"
+
+  .form-group
+    = f.label :instagram_handle, 'Instagram', class: 'control-label col-md-2'
+    .col-md-8
+      = f.text_field :instagram_handle, class: 'form-control', placeholder: 'your_handle'
+
+  .form-group
+    = f.label :facebook_handle, 'Facebook', class: 'control-label col-md-2'
+    .col-md-8
+      = f.text_field :facebook_handle, class: 'form-control', placeholder: 'your_handle'
+
+  .form-group
+    = f.label :bluesky_handle, 'Bluesky', class: 'control-label col-md-2'
+    .col-md-8
+      = f.text_field :bluesky_handle, class: 'form-control', placeholder: 'your_handle'
+
+  .form-group
+    = f.label :other_url, 'Other URL', class: 'control-label col-md-2'
+    .col-md-8
+      = f.url_field :other_url, class: 'form-control', placeholder: "https://you.example.com/"
 
   .form-group
     %label.control-label.col-md-2

app/views/gardens/_actions.html.haml

@@ -15,5 +15,4 @@
 
       - if can?(:destroy, garden)
         .dropdown-divider
-        = delete_button(garden, classes: 'dropdown-item text-danger',
-          message: 'All plantings associated with this garden will also be deleted. Are you sure?')
+        = delete_button(garden, classes: 'dropdown-item text-danger', message: 'gardens.confirm_delete')

app/views/gardens/show.html.haml

@@ -66,8 +66,7 @@
   
       - if can?(:destroy, @garden)
         .dropdown-divider
-        = delete_button(@garden, classes: 'dropdown-item text-danger',
-          message: 'All plantings associated with this garden will also be deleted. Are you sure?')
+        = delete_button(@garden, classes: 'dropdown-item text-danger', message: 'gardens.confirm_delete')
 
     %section
       %h2 Current activities in garden

app/views/harvests/_planting.haml

@@ -5,3 +5,8 @@
       - @matching_plantings.each do |planting|
         = f.radio_button :planting_id, planting.id, label: planting
       = f.submit "save", class: 'btn btn-sm'
+
+- if @harvest.planting.present? && @harvest.planting.overall_rating.blank?
+  .alert.alert-info{role: "alert"}
+    This harvest is from a planting that hasn't been rated yet.
+    = link_to "Rate this planting", edit_planting_path(@harvest.planting), class: 'alert-link'

app/views/harvests/show.html.haml

@@ -66,8 +66,5 @@
           Havested from
           = link_to @harvest.planting, @harvest.planting
 
-      %section.comments.mt-4
-        = render 'comments/comments', commentable: @harvest
-
     .col-md-4.col-xs-12
       = render @harvest.crop

app/views/home/_stats.html.haml

@@ -4,6 +4,6 @@
      member: link_to(t('.member_linktext', count: Member.confirmed.size.to_i), members_path),
      number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
      number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
-     number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path))
-
-
+     number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path),
+     contributors: link_to(count_github_contibutors, 'https://github.com/Growstuff/growstuff/blob/dev/CONTRIBUTORS.md', target: '_blank', rel: 'noopener'), 
+     github: link_to('GitHub', 'http://github.com/Growstuff/growstuff', target: '_blank', rel: 'noopener'))

app/views/home/index.html.haml

@@ -8,6 +8,7 @@
 
       %p= render 'stats', cached: true
     .col
+      %br
       %p
         - if current_member.plantings.active.any?
           = link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
@@ -51,7 +52,8 @@
     %section.seeds
       = cute_icon
       = render 'seeds'
-      %p.text-right= link_to "#{t('home.seeds.view_all')} »", seeds_path, class: 'btn btn-block'
+      %p.text-right
+        = link_to "#{t('home.seeds.view_all')} »", seeds_path(tradeable_to: ['locally', 'nationally', 'internationally']), class: 'btn btn-block'
   .col-12.col-lg-6
     %section.discussion.text-center
       = cute_icon
@@ -60,3 +62,16 @@
     %section.members
       = cute_icon
       = render 'members', cached: true
+  .col-12.col-lg-6
+    %section.pwa-install
+      = cute_icon
+      %h2.text-center= t('home.pwa_title')
+      .index-cards
+        .card
+          .card-body
+            %h3= t('home.pwa_ios_title')
+            %p= t('home.pwa_ios_steps_html')
+        .card
+          .card-body
+            %h3= t('home.pwa_android_title')
+            %p= t('home.pwa_android_steps_html')

app/views/layouts/_header.html.haml

@@ -6,6 +6,6 @@
         %span.site-name Growstuff
   .nav= render 'crops/search_bar'
   .nav
-    %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", type: "button" }
-      %i.fas.fa-ellipsis-v.navbar-toggler-icon
+    %button.navbar-toggler.ml-auto{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", type: "button" }
+      %span.navbar-toggler-icon
     = render 'layouts/menu'

app/views/layouts/_menu.haml

@@ -1,5 +1,5 @@
 #navbarSupportedContent.collapse.navbar-collapse
-  %ul.navbar-nav.mr-auto
+  %ul.navbar-nav.mr-auto.bg-dark
     - if signed_in?
       %li.nav-item
         = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
@@ -30,7 +30,9 @@
 
     - cache("everyone-menu", expires_in: 1.week) do
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+          %span
+          = t('.crops')
         .dropdown-menu
           = link_to crops_path, class: 'dropdown-item' do
             = t('.browse_crops')
@@ -44,7 +46,9 @@
             = harvest_icon
             = t('.harvests')
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+          %span
+          = t('.community')
         .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'
@@ -54,7 +58,9 @@
     - if member_signed_in?
       - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
         %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+            %span
+            = t('.admin')
           .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
             - if current_member.role?(:crop_wrangler)
               = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'

app/views/likes/_description.html.haml

@@ -0,0 +1 @@
+#{link_to event_model.member, event_model.member} liked #{link_to event_model.likeable.class.name.downcase, event_model.likeable}

app/views/members/_bio.html.haml

@@ -1,13 +1 @@
 %h2 All about #{member.login_name}
-%p
-  %small
-    %a{href: "#content"}
-      Skip to main content
-- if member.bio.blank?
-  - if can? :edit, member
-    = link_to "Add a bio to complete your profile.", edit_member_registration_path
-  - else
-    #{member.login_name} hasn't written a bio yet.
-- else
-  :markdown
-    #{ strip_tags markdownify(member.bio) }

app/views/members/_contact.html.haml

@@ -1,17 +1,37 @@
-- if twitter_auth || flickr_auth || member.show_email
+- if member.website_url.present? || member.instagram_handle.present? || member.facebook_handle.present? || member.bluesky_handle.present? || member.other_url.present? || flickr_auth || member.show_email
   %h4 Contact
 
-  - if twitter_auth
+  - if member.website_url.present?
     %p
-      = image_tag "twitter_32.png", size: "32x32", alt: 'Twitter logo'
-      = link_to twitter_auth.name, "https://twitter.com/#{twitter_auth.name}"
+      = icon 'fas', 'globe', class: 'fa-fw'
+      = link_to "Website", member.website_url, target: '_blank', rel: 'noopener noreferrer'
+
+  - if member.instagram_handle.present?
+    %p
+      = icon 'fab', 'instagram', class: 'fa-fw'
+      = link_to member.instagram_handle, "https://instagram.com/#{member.instagram_handle}", target: '_blank', rel: 'noopener noreferrer'
+
+  - if member.facebook_handle.present?
+    %p
+      = icon 'fab', 'facebook', class: 'fa-fw'
+      = link_to member.facebook_handle, "https://facebook.com/#{member.facebook_handle}", target: '_blank', rel: 'noopener noreferrer'
+
+  - if member.bluesky_handle.present?
+    %p
+      = icon 'fas', 'comment-dots', class: 'fa-fw'
+      = link_to member.bluesky_handle, "https://bsky.app/profile/#{member.bluesky_handle}", target: '_blank', rel: 'noopener noreferrer'
+
+  - if member.other_url.present?
+    %p
+      = icon 'fas', 'link', class: 'fa-fw'
+      = link_to "More...", member.other_url, target: '_blank', rel: 'noopener noreferrer'
 
   - if flickr_auth
     %p
       = image_tag "flickr_32.png", size: "32x32", alt: 'Flickr logo'
-      = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}"
+      = link_to flickr_auth.name, "https://flickr.com/photos/#{flickr_auth.uid}", target: '_blank', rel: 'noopener noreferrer'
 
   - if member.show_email
     %p
-      Email:
+      = icon 'fas', 'envelope', class: 'fa-fw'
       = mail_to member.email

app/views/members/_map.html.haml

@@ -5,5 +5,5 @@
     = link_to member.location, place_path(member.location, anchor: "members")
 - else
   .location-not-set
-    .sr-only Location not known
-    .sr-only We can't show you what's nearby
+    %h1 Location not known or geocodable
+    %p We can't show you what's nearby

app/views/members/_member.haml

@@ -1,5 +1,5 @@
 - cache member do
-  .card.card-double
+  .card
     .card-body
       %h4.login-name= link_to member, member
       %div

app/views/members/show.html.haml

@@ -21,6 +21,21 @@
         .row
           .col= render "bio", member: @member
           .col= render "avatar", member: @member
+        .row
+          .col
+            %p
+              %small
+                %a{href: "#content"}
+                  Skip to main content
+            - if @member.bio.blank?
+              - if member_signed_in? && current_member == @member
+                = link_to "Add a bio to complete your profile.", edit_member_registration_path
+              - else
+                #{@member.login_name} hasn't written a bio yet.
+            - else
+              :markdown
+                #{ strip_tags markdownify(@member.bio) }
+
         - if @member.roles.any?
           %p
             - @member.roles.each do |role|
@@ -30,12 +45,16 @@
             = icon 'fas', 'map-marker'
             = truncate(@member.location, length: 15, separator: ' ', omission: '... ')
         %p
-          %strong Member since
-          = @member.created_at.to_fs(:date)
+          %small
+            %strong Member since
+            %br
+            = @member.created_at.to_fs(:date)
         - if @member.last_sign_in_at
           %p
-            %strong Last Login
-            = @member.last_sign_in_at&.to_fs(:default)
+            %small
+              %strong Last Login
+              %br
+              = @member.last_sign_in_at&.to_fs(:default)
 
         - if can? :update, @member
           = link_to edit_member_registration_path, class: 'btn btn-block' do
@@ -58,14 +77,13 @@
 
       = render "stats", member: @member
       .card-footer
-        = render "contact", member: @member, twitter_auth: @twitter_auth,
-                                              flickr_auth: @flickr_auth
+        = render "contact", member: @member, flickr_auth: @flickr_auth
 
   .col-md-10#content
     .row
       %section.order-3.order-md-1.col-12= render "map", member: @member
-      - if @harvesting.size.positive?
-        %section.harvests.order-2.order-md-1
+      - if @harvesting.size.positive? 
+        %section.harvests.order-2.order-md-1.col-12
           %h2 Ready to harvest
           .index-cards
             - @harvesting.each do |planting|