Merge branch 'mainline' into dev

Crops > Show detail from parent

.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

.devcontainer/docker-compose.yml

@@ -27,7 +27,7 @@ services:
     command: sleep infinity
 
   db:
-    image: postgres:latest
+    image: postgres:17
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (admin/)
         run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (comments/)
         run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -101,3 +101,9 @@ jobs:
       - name: Run rspec (conversations/)
         run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky
 
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (crops/)
         run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (gardens/)
         run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -99,4 +99,11 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (harvests/)
-        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
+        run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -99,4 +99,11 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (home/)
-        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
+        run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -99,4 +99,11 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (members/)
-        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
+        run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -0,0 +1,109 @@
+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@v6
+
+      - 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@v6
+        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
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (plantings/)
         run: bundle exec rspec spec/features/plantings/ -fd
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -0,0 +1,109 @@
+name: CI Features - Posts
+
+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@v6
+
+      - 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@v6
+        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
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -100,3 +100,10 @@ jobs:
 
       - name: Run rspec (seeds/)
         run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

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

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -99,4 +99,11 @@ jobs:
         run: bundle exec rails search:reindex
 
       - name: Run rspec (timeline/)
-        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
+        run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -107,19 +107,12 @@ 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
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots
+          path: tmp/screenshots

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - 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@v6
 
       - name: Configure sysctl limits
         run: |
@@ -89,7 +89,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -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

.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from: .rubocop_todo.yml
-require:
+plugins:
  - rubocop-factory_bot
  - rubocop-capybara
  - rubocop-rails

.rubocop_todo.yml

@@ -314,7 +314,7 @@ RSpec/MultipleExpectations:
 # Offense count: 138
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 14
+  Max: 20
 
 # Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

.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,8 +187,9 @@ end
 group :test do
   gem 'axe-core-capybara'
   gem 'axe-core-rspec'
-  gem 'codeclimate-test-reporter', require: false
+  gem "percy-capybara", "~> 5.0.0"
   gem 'rails-controller-testing'
+  gem "rspec-rebound"
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'vcr'
@@ -199,4 +199,4 @@ group :travis do
   gem 'platform-api'
 end
 
-gem "percy-capybara", "~> 5.0.0"
+gem "i18n_data", "~> 1.1"

Gemfile.lock

@@ -33,47 +33,49 @@ 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.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       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.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       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.3)
+      actionpack (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activesupport (= 7.2.3)
       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.3)
+      actionview (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       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.3)
+      actionpack (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.3)
+      activesupport (= 7.2.3)
       builder (~> 3.1)
+      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
@@ -82,27 +84,27 @@ GEM
       addressable
     active_median (0.6.0)
       activesupport (>= 7.1)
-    active_record_union (1.3.0)
-      activerecord (>= 4.0)
-    active_utils (3.5.0)
+    active_record_union (1.4.0)
+      activerecord (>= 6.0)
+    active_utils (3.6.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.3)
+      activesupport (= 7.2.3)
       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.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
       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.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activesupport (= 7.2.3)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -119,15 +121,15 @@ GEM
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.10.3)
+    axe-core-api (4.11.0)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-capybara (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
-    axe-core-rspec (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-rspec (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
       ostruct
       virtus
@@ -135,14 +137,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.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.3.1)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -156,7 +158,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.0.7)
+    bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (12.0.0)
@@ -183,10 +185,9 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.5)
+    cgi (0.5.0)
+    chartkick (5.2.1)
     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)
@@ -200,9 +201,17 @@ GEM
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.5)
     crass (1.0.6)
-    csv (3.3.1)
+    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.5)
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
@@ -213,7 +222,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.4)
@@ -222,15 +231,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 +254,24 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
+    erb (6.0.0)
     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.5)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.1)
       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.14.0)
       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)
@@ -270,33 +280,29 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
-    geocoder (1.8.5)
+    geocoder (1.8.6)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
-    globalid (1.2.1)
+    gli (2.22.2)
+      ostruct
+    globalid (1.3.0)
       activesupport (>= 6.1)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (6.3.0)
+    haml (7.0.2)
       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)
+    haml-rails (3.0.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.62.0)
+    haml_lint (0.67.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -312,24 +318,30 @@ 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)
       multi_xml (>= 0.5.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.15)
+    i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
-      highline (>= 2.0.0)
+      highline (>= 3.0.0)
       i18n
       parser (>= 3.2.2.1)
+      prism
       rails-i18n
       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.12.1)
       base64
       ice_cube (~> 0.16)
       logger
@@ -339,18 +351,19 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.0)
-    irb (1.15.2)
+    io-console (0.8.1)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.12.0)
-    json-schema (5.1.0)
+    json (2.16.0)
+    json-schema (6.0.0)
       addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -376,7 +389,8 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -393,13 +407,17 @@ 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
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.25.5)
+    minitest (5.26.2)
     moneta (1.0.0)
     msgpack (1.8.0)
     multi_json (1.15.0)
@@ -407,23 +425,24 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.4.20)
+    net-imap (0.5.12)
       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
-    nio4r (2.7.4)
-    nokogiri (1.18.8)
+    netrc (0.11.0)
+    nio4r (2.7.5)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.10)
+    oj (3.16.12)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -435,39 +454,38 @@ 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.10.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.5.9)
+    pg (1.6.2)
+    pg (1.6.2-x86_64-linux)
     platform-api (3.8.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
     popper_js (2.11.8)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.6.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
-    puma (6.6.0)
+    public_suffix (6.0.2)
+    puma (7.1.0)
       nio4r (~> 2.0)
-    query_diet (0.7.2)
+    query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.15)
+    rack (2.2.21)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -480,25 +498,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.3)
+      actioncable (= 7.2.3)
+      actionmailbox (= 7.2.3)
+      actionmailer (= 7.2.3)
+      actionpack (= 7.2.3)
+      actiontext (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activemodel (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.3)
     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,51 +531,60 @@ 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.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.2.1)
+    rake (13.3.1)
     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.16.1)
+      erb
       psych (>= 4.0.0)
-    recaptcha (5.19.0)
+      tsort
+    recaptcha (5.21.1)
     redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
       io-console (~> 0.5)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.4.1)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
+    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.4)
     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.6)
       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,23 +592,25 @@ 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.6)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
       rspec (~> 3.10)
-    rswag-api (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rswag-specs (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      json-schema (>= 2.2, < 6.0)
-      railties (>= 5.2, < 8.1)
+    rswag-api (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
+    rswag-specs (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      json-schema (>= 2.2, < 7.0)
+      railties (>= 5.2, < 8.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.16.0)
-      actionpack (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rubocop (1.75.5)
+    rswag-ui (2.17.0)
+      actionpack (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -589,19 +618,19 @@ 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.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.27.1)
+    rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.32.0)
+    rubocop-rails (2.34.1)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -610,10 +639,10 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
@@ -621,7 +650,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (2.4.1)
+    rubyzip (3.2.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -635,17 +664,17 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.6.4)
+    scout_apm (5.8.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.32.0)
+    selenium-webdriver (4.38.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 +682,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)
@@ -667,28 +692,28 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.7)
+    stringio (3.1.8)
     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)
+    timeout (0.4.4)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.17.0)
+    uniform_notifier (1.18.0)
     uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
@@ -706,9 +731,10 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.9.1)
+    webrick (1.9.2)
     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 +744,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -744,9 +770,9 @@ DEPENDENCIES
   capybara-email
   capybara-screenshot
   chartkick
-  codeclimate-test-reporter
   coffee-rails
   comfortable_mexican_sofa!
+  crowdin-cli
   csv_shaper
   dalli
   database_cleaner
@@ -765,11 +791,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 +813,6 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
-  omniauth-twitter
   percy-capybara (~> 5.0.0)
   pg
   platform-api
@@ -805,6 +830,7 @@ DEPENDENCIES
   responders
   rspec-activemodel-mocks
   rspec-rails
+  rspec-rebound
   rspectre
   rswag-api
   rswag-specs
@@ -834,7 +860,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,
@@ -14,3 +16,27 @@
 .homepage--list-item {
   height: 100px;
 }
+.releases {
+  .card { 
+    .card-header {
+      
+    }
+    .card-body { 
+      h2 {
+        background-color: transparent;
+        color: black;
+        box-shadow: none;
+      }
+      img {
+        border: 0.5em solid #111;
+        margin-left: 5%;
+        margin-right: 5%;
+        width: 90%;
+      }
+      ul {
+        margin-bottom: 1em;
+        margin-top: 1em;
+      }
+    }
+  }
+}

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 {
@@ -131,6 +132,8 @@ section {
     border-radius: 5%;
     margin: 0.5em 0.5em 0.5em 0;
     width: 200px;
+    align-items: stretch;
+    justify-content: space-between;
 
     .img-card {
       border-top-left-radius: 5%;
@@ -367,9 +370,6 @@ ul.thumbnail-buttons {
   h1 {
     font-size: 400%;
   }
-  .stats a {
-    color: $black;
-  }
 
   // signup widget on homepage
   .signup {

app/controllers/activities_controller.rb

@@ -24,17 +24,29 @@ 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])
+    if @activity.finished? && @activity.owner == current_member && (@activity.updated_at + 2.weeks) > Time.now
+      @repeat_link = new_activity_path(
+        name:        @activity.name,
+        garden_id:   @activity.garden_id,
+        planting_id: @activity.planting_id,
+        category:    @activity.category,
+        description: @activity.description,
+        due_date:    2.weeks.from_now.to_date
+      )
+    end
+
     respond_with @activity
   end
 
   def new
     @activity = Activity.new(
-      owner: current_member,
+      owner:    current_member,
       due_date: Date.today
     )
+    @activity.name = params[:name] if params[:name]
+    @activity.description = params[:description] if params[:description]
+    @activity.category = params[:category] if params[:category]
+    @activity.due_date = params[:due_date] if params[:due_date]
     if params[:garden_id]
       @activity.garden = Garden.find_by(
         owner: current_member,
@@ -61,7 +73,21 @@ class ActivitiesController < DataController
   def create
     @activity = Activity.new(activity_params)
     @activity.owner = current_member
-    @activity.save
+    @activity.due_date ||= Date.today
+
+    if @activity.save
+      if params[:repeat_times].to_i > 0
+        repeat_times = params[:repeat_times].to_i
+        repeat_weeks = params[:repeat_weeks].to_i
+
+        repeat_times.times do |i|
+          new_activity = @activity.dup
+          new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
+          new_activity.save
+        end
+      end
+    end
+
     respond_with @activity
   end
 
@@ -80,7 +106,8 @@ class ActivitiesController < DataController
   def activity_params
     params.require(:activity).permit(
       :name, :description, :category, :finished,
-      :garden_id, :planting_id, :due_date
+      :garden_id, :planting_id, :due_date,
+      :repeat_times, :repeat_weeks
     )
   end
 

app/controllers/admin/crop_companions_controller.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Admin
+  class CropCompanionsController < AdminController
+    before_action :set_crop
+
+    def index
+      @crop_companions = @crop.crop_companions
+    end
+
+    def new
+      @crop_companion = @crop.crop_companions.new
+    end
+
+    def create
+      @crop_companion = @crop.crop_companions.new(crop_companion_params)
+      if @crop_companion.save
+        redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
+      else
+        render :new
+      end
+    end
+
+    def destroy
+      @crop_companion = @crop.crop_companions.find(params[:id])
+      @crop_companion.destroy
+      redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
+    end
+
+    private
+
+    def set_crop
+      @crop = Crop.find_by!(slug: params[:crop_slug])
+    end
+
+    def crop_companion_params
+      params.require(:crop_companion).permit(:crop_b_id, :source_url)
+    end
+  end
+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/api/v1/activities_controller.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Api
+  module V1
+    class ActivitiesController < BaseController
+    end
+  end
+end

app/controllers/api/v1/base_controller.rb

@@ -4,6 +4,40 @@ module Api
   module V1
     class BaseController < JSONAPI::ResourceController
       abstract
+      protect_from_forgery with: :null_session
+      before_action :authenticate_member_from_token!
+      before_action :enforce_member_for_write_operations!, only: %i(create update destroy)
+      rescue_from CanCan::AccessDenied do
+        head :forbidden
+      end
+
+      def context
+        {
+          current_user:    current_user,
+          current_ability: current_ability,
+          controller:      self,
+          action:          params[:action]
+        }
+      end
+
+      private
+
+      attr_reader :current_user
+
+      def enforce_member_for_write_operations!
+        head :unauthorized unless current_user
+      end
+
+      def authenticate_member_from_token!
+        authenticate_with_http_token do |token, _options|
+          auth = Authentication.find_by(token: token, provider: 'api')
+          if auth.present?
+            @current_user = auth.member
+
+            return true
+          end
+        end
+      end
     end
   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,26 +174,27 @@ 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
     params.require(:crop).permit(
-      :name, :en_wikipedia_url,
+      :name, :en_wikipedia_url, :en_youtube_url,
       :parent_id, :perennial,
       :request_notes, :reason_for_rejection,
       :rejection_notes,
+      :description,
+      :row_spacing, :spread, :height,
+      :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)
     )
   end
@@ -216,12 +210,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,8 +18,9 @@ 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_activities = @garden.activities.finished.includes(:owner).order(created_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
     @suggested_companions = Crop.approved.where(
       id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
@@ -38,7 +39,10 @@ class GardensController < DataController
 
   def create
     @garden.owner_id = current_member.id
-    flash[:notice] = I18n.t('gardens.created') if @garden.save
+    if @garden.save
+      link = new_activity_path(name: 'Weed the garden bed', garden_id: @garden.id, due_date: 2.weeks.from_now.to_date)
+      flash[:notice] = t('gardens.created_prompt_html', link: link).html_safe
+    end
     respond_with(@garden)
   end
 

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,12 +34,10 @@ 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)
+    @finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
     @matching_seeds = matching_seeds
     @crop = @planting.crop
 
@@ -48,6 +46,12 @@ class PlantingsController < DataController
       .where.not(id: @planting.id)
       .includes(:owner, :crop, :garden)
       .limit(6)
+
+    if @planting.finished? && @planting.garden.plantings.current.none? && (@planting.updated_at + 2.weeks) > Time.zone.now
+      @cultivate_soil_link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id, category: "Soil Cultivation",
+                                               description: "Recently finished #{@planting.crop.name} planting. Prepare for next planting.")
+    end
+
     respond_with @planting
   end
 
@@ -94,6 +98,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 +140,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,8 +6,7 @@ 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')
+    @flickr_auth = current_member.auth('flickr')
     render "edit"
   end
 
@@ -39,6 +38,12 @@ class RegistrationsController < Devise::RegistrationsController
     end
   end
 
+  def regenerate_api_token
+    current_member.regenerate_api_token
+    set_flash_message :notice, :api_token_regenerated
+    redirect_to edit_member_registration_path + '#apps'
+  end
+
   def destroy
     if @member.valid_password?(params.require(:member)[:current_password])
       @member.discard

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'nokogiri'
 module ApplicationHelper
   def parse_date(str)
     str ||= '' # Date.parse barfs on nil
@@ -21,6 +22,32 @@ module ApplicationHelper
     classes
   end
 
+  # Similar to Rails' time_ago_in_words, but gives a more standard
+  # output like "in 3 days" or "5 months ago".
+  # Also handles the case where from_time is a Date and to_time is a Date
+  # (in which case it just says "today" if they're the same date).
+  #
+  # NOTE: This is similar to distance_of_time_in_words but different enough
+  # that I think it's worth having a separate helper for it.
+  #
+  # from_time - the starting time (Time or Date)
+  # to_time - the ending time (Time or Date). Default: now (Time.zone.now)
+  # include_seconds - whether to include seconds in the calculation
+  #
+  # Returns a string like "in 3 days" or "5 months ago"
+  def standard_time_distance(from_time, to_time = 0, include_seconds = false)
+    return 'today' if from_time.is_a?(Date) && (from_time == to_time)
+
+    return 'now' if from_time == to_time
+    return "#{distance_of_time_in_words(from_time, to_time, include_seconds:)} ago" if from_time < to_time
+
+    "in #{distance_of_time_in_words(from_time, to_time, include_seconds:)}"
+  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 +77,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
@@ -94,4 +120,22 @@ module ApplicationHelper
   def og_description(description)
     strip_tags(description).split(' ')[0..20].join(' ')
   end
+
+  def github_releases
+    return [] if Rails.env.test?
+
+    feed_url = 'https://github.com/Growstuff/growstuff/releases.atom'
+    Rails.cache.fetch(feed_url, expires_in: 1.day) do
+      response = Faraday.get(feed_url)
+      doc = Nokogiri::XML(response.body)
+      doc.xpath('//xmlns:entry').first(2).map do |entry|
+        {
+          title: entry.xpath('xmlns:title').text,
+          content: entry.xpath('xmlns:content').text,
+          link: entry.xpath('xmlns:link/@href').text,
+          updated: entry.xpath('xmlns:updated').text
+        }
+      end
+    end
+  end
 end

app/helpers/auto_suggest_helper.rb

@@ -13,7 +13,7 @@ module AutoSuggestHelper
     resource = resource.class.name.downcase
     source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
     %(
-      <input id="#{source}" class="auto-suggest #{options[:class]}" #{options[:required] ? 'required="required"' : ''}
+      <input id="#{source}" class="auto-suggest #{options[:class]}" #{'required="required"' if options[:required]}
         type="text" value="#{default}" data-source-url="#{source_path}",
         placeholder="e.g. lettuce">
       <noscript class="text-warning">

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)
@@ -84,7 +85,20 @@ module ButtonsHelper
   end
 
   def activity_edit_button(activity, classes: "btn btn-raised btn-info")
-    edit_button(edit_activity_path(activity), classes:)
+    edit_button(edit_activity_path(slug: activity.slug), classes:)
+  end
+
+  def activity_copy_button(activity, classes: 'btn')
+    link_to new_activity_path(
+      name:        activity.name,
+      description: activity.description,
+      category:    activity.category,
+      garden_id:   activity.garden_id,
+      planting_id: activity.planting_id,
+      due_date:    activity.due_date
+    ), class: classes do
+      copy_icon + ' ' + t('buttons.copy')
+    end
   end
 
   def activity_finish_button(activity, classes: 'btn btn-default btn-secondary')
@@ -97,7 +111,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 +119,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 +145,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/crops_helper.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
 module CropsHelper
+
+  def crop_or_parent(crop, attribute)
+    default = crop.send(attribute)
+    return default if default.present?
+    return crop.parent.send(attribute) if crop.parent&.send(attribute).present?
+
+    # For scopes, arrays, etc return the empty value
+    default
+  end
+
   def display_seed_availability(member, crop)
     seeds = member.seeds.where(crop:)
     total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
@@ -17,4 +27,12 @@ module CropsHelper
   def crop_ebay_seeds_url(crop)
     "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
   end
+
+  def youtube_video_id(url)
+    return unless url
+
+    regex = %r{(?:youtube(?:-nocookie)?\.com/(?:[^/\n\s]+/\S+/|(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)([a-zA-Z0-9_-]{11})}
+    match = url.match(regex)
+    match[1] if match
+  end
 end

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/icons_helper.rb

@@ -59,6 +59,10 @@ module IconsHelper
     image_icon 'delete'
   end
 
+  def copy_icon
+    icon('far', 'copy')
+  end
+
   def add_photo_icon
     image_icon 'add-photo'
   end

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

@@ -76,6 +76,7 @@ class Ability
     if member.role? :crop_wrangler
       can :wrangle, Crop
       can :manage, Crop
+      can :manage, CropCompanion
       can :manage, ScientificName
       can :manage, AlternateName
       can :openfarm, Crop
@@ -98,19 +99,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 +112,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/activity.rb

@@ -30,4 +30,20 @@ class Activity < ApplicationRecord
   def to_s
     name
   end
+
+  def garden_name
+    garden&.name
+  end
+
+  def garden_slug
+    garden&.slug
+  end
+
+  def planting_name
+    planting&.crop&.name
+  end
+
+  def planting_slug
+    planting&.crop&.slug
+  end
 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,22 +4,10 @@ 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
 
-    def height
-      fetch_attr('height')
-    end
-
-    def spread
-      fetch_attr('spread')
-    end
-
     def svg_icon
       icon = fetch_attr('svg_icon')
       return icon if icon.present?
@@ -31,42 +19,18 @@ module OpenFarmData
       fetch_attr('tags_array')
     end
 
-    def description
-      fetch_attr('description')
-    end
-
-    def row_spacing
-      fetch_attr('row_spacing')
-    end
-
     def common_names
       fetch_attr('common_names')
     end
 
-    def guides_count
-      fetch_attr('guides_count')
-    end
-
     def binomial_name
       fetch_attr('binomial_name')
     end
 
-    def sowing_method
-      fetch_attr('sowing_method')
-    end
-
     def main_image_path
       fetch_attr('main_image_path')
     end
 
-    def sun_requirements
-      fetch_attr('sun_requirements')
-    end
-
-    def growing_degree_days
-      fetch_attr('growing_degree_days')
-    end
-
     def processing_pictures
       fetch_attr('processing_pictures')
     end
@@ -75,6 +39,6 @@ module OpenFarmData
   def fetch_attr(key)
     return if openfarm_data.blank?
 
-    openfarm_data.fetch('attributes', {}).fetch(key, nil)
+    openfarm_data.dig('attributes', key)
   end
 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_activities.rb

@@ -9,7 +9,9 @@ module SearchActivities
                mappings:       {
                  properties: {
                    active:     { type: :boolean },
-                   created_at: { type: :integer }
+                   created_at: { type: :integer },
+                   updated_at: { type: :integer },
+                   due_date:   { type: :date }
                  }
                }
 
@@ -23,8 +25,10 @@ module SearchActivities
         category:,
         garden_id:,
         garden_name:      garden&.name,
+        garden_slug:      garden&.garden_slug,
         planting_id:,
         planting_name:    planting&.crop&.name,
+        planting_slug:    planting&.slug,
         description:,
 
         # owner

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/crop.rb

@@ -55,6 +55,12 @@ class Crop < ApplicationRecord
               message: 'is not a valid English Wikipedia URL'
             },
             if:     :approved?
+  validates :en_youtube_url,
+            format: {
+              with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
+              message: 'is not a valid YouTube URL'
+            },
+            allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
 
   def to_s
@@ -90,7 +96,7 @@ class Crop < ApplicationRecord
   def popular_plant_parts
     PlantPart.joins(:harvests)
       .where("crop_id = ?", id)
-      .order("count_harvests_id DESC")
+      .order(count_harvests_id: :desc)
       .group("plant_parts.id", "plant_parts.name")
       .count("harvests.id")
   end
@@ -153,8 +159,20 @@ class Crop < ApplicationRecord
     where(["lower(crops.name) = :value", { value: name.downcase }])
   end
 
+  def all_companions
+    return companions unless parent
+
+    (companions + parent.companions).uniq
+  end
+
+  before_destroy :destroy_reverse_companionships
+
   private
 
+  def destroy_reverse_companionships
+    CropCompanion.where(crop_b: self).destroy_all
+  end
+
   def count_uses_of_property(col_name)
     plantings.unscoped
       .where(crop_id: id)

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/forum.rb

@@ -3,6 +3,7 @@
 class Forum < ApplicationRecord
   extend FriendlyId
   include Ownable
+
   validates :name, presence: true
   validates :description, presence: true
   friendly_id :name, use: %i(slugged finders)

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/garden_type.rb

@@ -2,6 +2,7 @@
 
 class GardenType < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
 
   has_many :gardens, dependent: :nullify

app/models/member.rb

@@ -2,12 +2,14 @@
 
 class Member < ApplicationRecord
   include Discard::Model
+
   acts_as_messageable # messages can be sent to this model
   include Geocodable
   include MemberFlickr
   include MemberNewsletter
 
   extend FriendlyId
+
   friendly_id :login_name, use: %i(slugged finders)
 
   #
@@ -24,6 +26,20 @@ class Member < ApplicationRecord
   has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
   has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"
   has_many :authentications, dependent: :destroy
+  has_one :api_token, -> { where(provider: 'api') }, class_name: 'Authentication', dependent: :destroy
+
+  def api_token?
+    api_token.present?
+  end
+
+  def regenerate_api_token
+    api_token.destroy if api_token?
+    create_api_token(
+      provider: 'api',
+      uid:      id,
+      token:    SecureRandom.hex(16)
+    )
+  end
   has_many :photos, inverse_of: :owner
   has_many :likes, dependent: :destroy
 
@@ -91,6 +107,10 @@ class Member < ApplicationRecord
             uniqueness: {
               case_sensitive: false
             }
+  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: %r{\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

@@ -2,6 +2,7 @@
 
 class PlantPart < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
 
   has_many :harvests, dependent: :destroy

app/models/planting.rb

@@ -25,6 +25,8 @@ class Planting < ApplicationRecord
   has_many :harvests, dependent: :destroy
   has_many :activities, dependent: :destroy
 
+  scope :current, -> { where.not(finished: true).where.not(failed: true) }
+
   #
   # Ancestry of food
   belongs_to :parent_seed, class_name: 'Seed', # parent,
@@ -43,7 +45,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 +75,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 +85,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 +103,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 +131,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/role.rb

@@ -2,6 +2,7 @@
 
 class Role < ApplicationRecord
   extend FriendlyId
+
   friendly_id :name, use: %i(slugged finders)
   validates :name, uniqueness: true, presence: true
 

app/models/seed.rb

@@ -6,12 +6,15 @@ class Seed < ApplicationRecord
   include Finishable
   include Ownable
   include SearchSeeds
+
   friendly_id :seed_slug, use: %i(slugged finders)
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
   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 +47,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 +65,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/activity_resource.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Api
+  module V1
+    class ActivityResource < BaseResource
+      before_create do
+        @model.owner = context[:current_user]
+      end
+
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :garden, always_include_linkage_data: true
+      has_one :planting, always_include_linkage_data: true
+
+      attribute :name
+      attribute :description
+      attribute :category
+      attribute :finished
+      attribute :due_date
+
+      filter :owner
+      filter :owner_id
+      filter :garden
+      filter :garden_id
+      filter :planting
+      filter :planting_id
+      filter :category
+    end
+  end
+end

app/resources/api/v1/crop_resource.rb

@@ -3,8 +3,7 @@
 module Api
   module V1
     class CropResource < BaseResource
-      immutable
-
+      immutable # TODO: Re-evaluate this later
       filter :approval_status, default: 'approved'
 
       has_many :plantings
@@ -13,7 +12,7 @@ module Api
 
       has_many :photos
 
-      has_one :parent, class_name: 'Crop'
+      has_one :parent, class_name: 'Crop', always_include_linkage_data: true
 
       attribute :name
       attribute :en_wikipedia_url

app/resources/api/v1/garden_resource.rb

@@ -3,13 +3,22 @@
 module Api
   module V1
     class GardenResource < BaseResource
-      immutable
+      before_create do
+        @model.owner = context[:current_user]
+      end
 
-      has_one :owner, class_name: 'Member'
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
       has_many :plantings
       has_many :photos
 
       attribute :name
+
+      filter :owner
+      filter :owner_id
+      filter :active
+      filter :garden_type
+      filter :location
+      filter :slug
     end
   end
 end

app/resources/api/v1/harvest_resource.rb

@@ -3,11 +3,17 @@
 module Api
   module V1
     class HarvestResource < BaseResource
-      immutable
+      before_save do
+        @model.owner = context[:current_user]
+        @model.crop_id = @model.planting.crop_id if @model.planting_id
+        @model.harvested_at = Time.zone.now if @model.harvested_at.blank?
+        @model.plant_part = PlantPart.first
+      end
 
-      has_one :crop
-      has_one :planting
-      has_one :owner, class_name: 'Member'
+      has_one :crop, always_include_linkage_data: true
+      has_one :planting, always_include_linkage_data: true
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      # has_one :plant_part
       has_many :photos
 
       attribute :harvested_at
@@ -16,6 +22,15 @@ module Api
       attribute :weight_quantity
       attribute :weight_unit
       attribute :si_weight
+
+      filter :owner
+      filter :owner_id
+      filter :crop
+      filter :crop_id
+      filter :planting
+      filter :planting_id
+      filter :plant_part
+      filter :harvested_at
     end
   end
 end

app/resources/api/v1/member_resource.rb

@@ -9,6 +9,7 @@ module Api
       has_many :plantings, foreign_key: 'owner_id'
       has_many :harvests, foreign_key: 'owner_id'
       has_many :seeds, foreign_key: 'owner_id'
+      has_many :activities, foreign_key: 'owner_id'
 
       has_many :photos
 

app/resources/api/v1/photo_resource.rb

@@ -3,9 +3,12 @@
 module Api
   module V1
     class PhotoResource < BaseResource
-      immutable
+      immutable # TODO: Re-evaluate this.
+      before_create do
+        @model.owner = context[:current_user]
+      end
 
-      has_one :owner, class_name: 'Member'
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
       has_many :plantings
       has_many :gardens
       has_many :harvests

app/resources/api/v1/planting_resource.rb

@@ -3,16 +3,19 @@
 module Api
   module V1
     class PlantingResource < BaseResource
-      immutable
+      before_create do
+        @model.owner = context[:current_user]
+      end
 
-      has_one :garden
-      has_one :crop
-      has_one :owner, class_name: 'Member'
+      has_one :garden, always_include_linkage_data: true
+      has_one :crop, always_include_linkage_data: true
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
       has_many :photos
       has_many :harvests
 
       attribute :slug
       attribute :planted_at
+      attribute :failed
       attribute :finished
       attribute :finished_at
       attribute :quantity
@@ -35,11 +38,13 @@ module Api
       filter :owner
       filter :owner_id
       filter :finished
+      filter :active, apply: ->(records, _value, _options) { records.active }
+      filter :failed, apply: ->(records, _value, _options) { records.failed }
+      filter :sunniness
+      filter :perennial, apply: ->(records, _value, _options) { records.perennial }
 
       attribute :percentage_grown
-      def percentage_grown
-        @model.percentage_grown
-      end
+      delegate :percentage_grown, to: :@model
 
       attribute :crop_name
       attribute :crop_slug

app/resources/api/v1/seed_resource.rb

@@ -3,10 +3,12 @@
 module Api
   module V1
     class SeedResource < BaseResource
-      immutable
+      before_create do
+        @model.owner = context[:current_user]
+      end
 
-      has_one :owner, class_name: 'Member'
-      has_one :crop
+      has_one :owner, class_name: 'Member', always_include_linkage_data: true
+      has_one :crop, always_include_linkage_data: true
 
       attribute :description
       attribute :quantity
@@ -17,6 +19,15 @@ module Api
       attribute :organic
       attribute :gmo
       attribute :heirloom
+
+      filter :owner
+      filter :owner_id
+      filter :crop
+      filter :crop_id
+      filter :tradable_to
+      filter :organic
+      filter :gmo
+      filter :heirloom
     end
   end
 end

app/resources/base_resource.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
 class BaseResource < JSONAPI::Resource
-  immutable
   abstract
+
+  %i(create update remove).each do |action|
+    set_callback action, :before, :authorize
+  end
+
+  # Check authorisation for write operations.
+  # NOTE: At a later time, we may require API tokens for READ operations.
+  def authorize
+    # context[:action] is simply context[:controller].params[:action]
+    context[:current_ability].authorize! context[:action].to_sym, @model
+  end
 end

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/_actions.haml

@@ -3,6 +3,7 @@
     %a#activity-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = activity_edit_button(activity, classes: 'dropdown-item')
+      = activity_copy_button(activity, classes: 'dropdown-item')
       - if activity.active
         = activity_finish_button(activity, classes: 'dropdown-item')
       .dropdown-divider

app/views/activities/_card.html.haml

@@ -10,9 +10,8 @@
             %a.activity-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
 
             .dropdown-menu{"aria-labelledby" => "activity-menu"}
-              = link_to edit_activity_path(slug: activity.slug), class: 'dropdown-item' do
-                = edit_icon
-                = t('buttons.edit')
+              = activity_edit_button(activity, classes: 'dropdown-item')
+              = activity_copy_button(activity, classes: 'dropdown-item')
 
               - if activity.active
                 = activity_finish_button(activity, classes: 'dropdown-item')
@@ -20,16 +19,24 @@
               - if can? :destroy, activity
                 .dropdown-divider
                 = delete_button(activity, classes: 'dropdown-item text-danger')
-    = link_to activity_path(slug: activity.slug) do
-      .card-body.text-center
+    .card-body
+      = link_to activity_path(slug: activity.slug) do
         %h4= activity.name
-        .text-center= activity.description
-        - if activity.garden
-          .text-center= activity.garden
-        - if activity.planting
-          .text-center= activity.planting
+        - if activity.due_date
+          %small.due-date{title: activity.due_date}
+            = standard_time_distance(activity.due_date.to_date, Time.zone.now.to_date)
+        %div
+          %small.text-justify{title: activity.description}= activity.description.truncate(150)
+      %p
+        %ul.list-unstyled
+        - if activity.garden_name && activity.garden_slug
+          %li
+            %small= link_to activity.garden_name, garden_path(slug: activity.garden_slug)
+        - if activity.planting_name && activity.planting_slug
+          %li
+            %small= link_to activity.planting_name, planting_path(slug: activity.planting_slug)
+
     .card-footer
-      .float-right
-        %span.chip.member-chip
-          = link_to member_path(slug: activity.owner_slug) do
-            = activity.owner_login_name
+      %small.chip.member-chip
+        = link_to member_path(slug: activity.owner_slug) do
+          = activity.owner_login_name

app/views/activities/_form.html.haml

@@ -17,7 +17,7 @@
 
       .row
         .col-md-12
-          = f.text_field :name, required: true, label: 'What needs to be done?'
+          = f.text_field :name, required: true, label: 'What needs to be done?', autofocus: true
       .row
         .col-md-4
           = f.select(:category, Activity::CATEGORIES, include_blank: true)
@@ -27,13 +27,13 @@
 
       .row
         .col-md-4
-          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
+          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
             :id, :name,
             label: 'Is this for a specific garden?')
           = link_to "Add a garden.", new_garden_path
 
         .col-md-4
-          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
+          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active.recent,
             :id, :crop_name,
             label: 'Is this for a specific planting?')
           = link_to "Add a planting.", new_planting_path
@@ -43,11 +43,19 @@
                      value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
                      label: 'When?'
 
+      .row
+        .col-md-6
+          = label_tag :repeat_times, 'Repeat how many times?'
+          = number_field_tag :repeat_times, nil, class: 'form-control'
+        .col-md-6
+          = label_tag :repeat_weeks, 'Every how many weeks?'
+          = number_field_tag :repeat_weeks, nil, class: 'form-control'
+
       %hr
 
       .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

@@ -12,6 +12,7 @@
   %li.breadcrumb-item= link_to @activity.owner, member_activities_path(@activity.owner)
   %li.breadcrumb-item.active= link_to @activity.name, @activity
 
+
 .activity
   .row
     .col-md-8.col-xs-12
@@ -22,9 +23,14 @@
             %small.text-muted= @activity.category
           %tt
             = @activity.due_date
+        - if @repeat_link
+          .alert.alert-info
+            Activity marked as finished recently. Would you like to repeat in the near future?
+            = link_to 'Repeat this activity', @repeat_link, class: 'btn btn-secondary btn-sm ml-2'
         - if @activity.description.present?
           :markdown
             #{strip_tags markdownify(@activity.description)}
+
       = render 'likes/likes', object: @activity
       = render 'activities/actions', activity: @activity
 
@@ -44,8 +50,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/admin/crop_companions/index.html.haml

@@ -0,0 +1,16 @@
+%h1= "Companions for #{@crop.name}"
+
+= link_to 'New Companion', new_admin_crop_crop_companion_path(@crop), class: 'btn btn-primary'
+
+%table.table
+  %thead
+    %tr
+      %th Name
+      %th Source URL
+      %th Actions
+  %tbody
+    - @crop_companions.each do |companion|
+      %tr
+        %td= companion.crop_b.name
+        %td= companion.source_url
+        %td= link_to 'Delete', admin_crop_crop_companion_path(@crop, companion), method: :delete, data: { confirm: 'Are you sure?' }

app/views/admin/crop_companions/new.html.haml

@@ -0,0 +1,6 @@
+%h1= "New Companion for #{@crop.name}"
+
+= bootstrap_form_for [:admin, @crop, @crop_companion] do |f|
+  = f.collection_select :crop_b_id, Crop.order(:name), :id, :name, { label: 'Companion' }
+  = f.text_field :source_url, label: 'Source URL'
+  = f.submit 'Create'

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