Attempt to restyle

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-name: CI Features - Posts
+name: CI Features - Admin
 
 on: [pull_request]
 
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: '12'
 
@@ -100,10 +100,3 @@ jobs:
 
       - name: Run rspec (posts/)
         run: bundle exec rspec spec/features/posts/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots

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

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

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

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

.github/workflows/ci-features.yml

@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: '12'
 
@@ -108,11 +108,4 @@ jobs:
         run: bundle exec rspec spec/features/photos/ -fd
 
       - name: Run rspec (rss/)
-        run: bundle exec rspec spec/features/rss/ -fd
-
-      - name: Upload screenshots
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshots
-          path: tmp/screenshots
+        run: bundle exec rspec spec/features/rss/ -fd

.github/workflows/ci.yml

@@ -89,7 +89,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
         with:
           node-version: '12'
 

.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from: .rubocop_todo.yml
-plugins:
+require:
  - 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: 20
+  Max: 14
 
 # Offense count: 133
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

Gemfile

@@ -178,6 +178,7 @@ group :development, :test do
   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

Gemfile.lock

@@ -142,7 +142,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.2.3)
+    bigdecimal (3.2.2)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -198,7 +198,7 @@ GEM
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.3)
     crass (1.0.6)
     crowdin-api (1.12.0)
       open-uri (>= 0.1.0, < 0.2.0)
@@ -257,9 +257,9 @@ GEM
     excon (1.2.5)
       logger
     execjs (2.10.0)
-    factory_bot (6.5.5)
+    factory_bot (6.5.4)
       activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.1)
+    factory_bot_rails (6.5.0)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
     faker (3.5.2)
@@ -294,6 +294,12 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
+    haml-i18n-extractor (0.5.9)
+      activesupport
+      haml
+      highline
+      tilt
+      trollop (= 1.16.2)
     haml-rails (2.1.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
@@ -457,8 +463,8 @@ GEM
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.2)
-    pg (1.6.2-x86_64-linux)
+    pg (1.6.1)
+    pg (1.6.1-x86_64-linux)
     platform-api (3.8.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
@@ -475,7 +481,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (7.0.2)
+    puma (6.6.1)
       nio4r (~> 2.0)
     query_diet (0.7.2)
     racc (1.8.1)
@@ -601,7 +607,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.80.2)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -630,7 +636,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.6.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -688,13 +694,14 @@ GEM
     temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.6)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.4.0)
     thread_safe (0.3.6)
     tilt (2.6.1)
     timecop (0.9.10)
     timeout (0.4.3)
+    trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.5)
@@ -781,6 +788,7 @@ DEPENDENCIES
   gibbon (~> 1.2.0)
   gravatar-ultimate
   haml
+  haml-i18n-extractor
   haml-rails
   haml_lint (>= 0.25.1)
   hashie (>= 3.5.3)

README.md

@@ -17,9 +17,7 @@ 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!
-
-Vibe Coding is more than okay, just make sure you indicate if you have done so and ensure there are tests.
+Dive on in and submit your PRs.
 
 ## Important links
 
@@ -37,10 +35,6 @@ 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

app/assets/stylesheets/_crops.scss

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

app/assets/stylesheets/_homepage.scss

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

app/assets/stylesheets/mobile.scss

@@ -10,33 +10,9 @@
     width: 100%;
   }
 
-#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;
+  .navbar .nav > li {
     display: block;
   }
-}
 
   .navbar .navbar-form {
     padding-left: 0;

app/assets/stylesheets/overrides.scss

@@ -10,7 +10,6 @@ body {
 
 .navbar {
   flex-wrap: nowrap;
-  align-items: flex-start
 }
 .navbar-brand {
   .site-name {
@@ -132,8 +131,6 @@ 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%;
@@ -370,6 +367,9 @@ ul.thumbnail-buttons {
   h1 {
     font-size: 400%;
   }
+  .stats a {
+    color: $black;
+  }
 
   // signup widget on homepage
   .signup {

app/controllers/activities_controller.rb

@@ -29,7 +29,7 @@ class ActivitiesController < DataController
 
   def new
     @activity = Activity.new(
-      owner:    current_member,
+      owner: current_member,
       due_date: Date.today
     )
     if params[:garden_id]

app/controllers/api/v1/activities_controller.rb

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

app/controllers/api/v1/base_controller.rb

@@ -4,40 +4,6 @@ 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/crops_controller.rb

@@ -192,8 +192,6 @@ class CropsController < ApplicationController
       :parent_id, :perennial,
       :request_notes, :reason_for_rejection,
       :rejection_notes,
-      :row_spacing, :spread, :height,
-      :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)
     )
   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? || false
+    @show_jump_to = params[:member_slug].present? ? true : false
 
     @gardens = @gardens.includes(:owner)
     @gardens = @gardens.active unless @show_all
@@ -18,9 +18,8 @@ class GardensController < DataController
   end
 
   def show
-    @current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
+    @current_plantings = @garden.plantings.current.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)

app/controllers/plantings_controller.rb

@@ -37,7 +37,6 @@ class PlantingsController < DataController
     @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
 
@@ -134,7 +133,7 @@ class PlantingsController < DataController
       :crop_id, :description, :garden_id, :planted_at,
       :parent_seed_id,
       :quantity, :sunniness, :planted_from, :finished,
-      :finished_at, :failed, :overall_rating
+      :finished_at, :failed
     )
   end
 

app/controllers/registrations_controller.rb

@@ -6,7 +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
-    @flickr_auth = current_member.auth('flickr')
+    @flickr_auth   = current_member.auth('flickr')
     render "edit"
   end
 
@@ -38,12 +38,6 @@ 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,7 +19,9 @@ class SeedsController < DataController
       where['parent_planting'] = @planting.id
     end
 
-    where['tradeable_to'] = params[:tradeable_to] if params[:tradeable_to].present?
+    if params[:tradeable_to].present?
+      where['tradeable_to'] = params[:tradeable_to]
+    end
 
     @show_all = (params[:all] == '1')
     where['finished'] = false unless @show_all
@@ -43,7 +45,6 @@ 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])
@@ -57,8 +58,6 @@ 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
@@ -86,7 +85,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, :source,
+      :organic, :gmo,
       :heirloom, :tradable_to, :slug,
       :finished, :finished_at
     )

app/helpers/application_helper.rb

@@ -21,32 +21,6 @@ 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

app/helpers/buttons_helper.rb

@@ -53,7 +53,7 @@ module ButtonsHelper
     link_to t('buttons.mark_as_inactive'),
             garden_path(garden, garden: { active: 0 }),
             method: :put, class: classes,
-            data: { confirm: I18n.t('gardens.confirm_deactivate') }
+            data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
   end
 
   def create_button(model_to_create, path, icon, label)

app/helpers/event_helper.rb

@@ -7,8 +7,6 @@ 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/models/activity.rb

@@ -30,20 +30,4 @@ 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/concerns/open_farm_data.rb

@@ -8,6 +8,14 @@ module OpenFarmData
       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?
@@ -23,18 +31,38 @@ module OpenFarmData
       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

app/models/concerns/predict_planting.rb

@@ -94,9 +94,9 @@ module PredictPlanting
     private
 
     def calculate_percentage_grown
-      return 0 if age_in_days.to_i < 0
+      return 0 if age_in_days < 0
 
-      percent = (age_in_days.to_f / expected_lifespan.to_f) * 100
+      percent = (age_in_days / expected_lifespan.to_f) * 100
       (percent > 100 ? 100 : percent)
     end
   end

app/models/concerns/search_activities.rb

@@ -9,9 +9,7 @@ module SearchActivities
                mappings:       {
                  properties: {
                    active:     { type: :boolean },
-                   created_at: { type: :integer },
-                   updated_at: { type: :integer },
-                   due_date:   { type: :date }
+                   created_at: { type: :integer }
                  }
                }
 
@@ -25,10 +23,8 @@ 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,8 +59,7 @@ module SearchSeeds
       search('*', limit:,
                   where:    {
                     finished: false,
-                    tradable: true,
-                    _or:      [{ plant_before: nil }, { plant_before: { lt: Date.today } }]
+                    tradable: true
                   },
                   boost_by: [:created_at],
                   load:     false)

app/models/member.rb

@@ -24,20 +24,6 @@ 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
 

app/models/photo.rb

@@ -46,8 +46,7 @@ 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.to_i == info.license.to_i }
-    Rails.logger.error("Cannot find license: " + [info.license, licenses].inspect) unless license
+    license = licenses.find { |l| l.id == info.license }
     {
       title:         calculate_title(info),
       license_name:  license.name,

app/models/planting.rb

@@ -83,9 +83,6 @@ 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
     [

app/models/seed.rb

@@ -12,8 +12,6 @@ class Seed < ApplicationRecord
   ORGANIC_VALUES = ['certified organic', 'non-certified organic', 'conventional/non-organic', 'unknown'].freeze
   GMO_VALUES = ['certified GMO-free', 'non-certified GMO-free', 'GMO', 'unknown'].freeze
   HEIRLOOM_VALUES = %w(heirloom hybrid unknown).freeze
-  SOURCE_VALUES = ['seed catalogue', 'retail outlet', 'seed bank or similar institution',
-                   'traded from another person', 'my own seed saving', 'other/unknown'].freeze
 
   #
   # Relationships
@@ -46,9 +44,6 @@ 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

app/resources/api/v1/activity_resource.rb

@@ -1,29 +0,0 @@
-# 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'
-      has_one :garden
-      has_one :planting
-
-      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,7 +3,8 @@
 module Api
   module V1
     class CropResource < BaseResource
-      immutable # TODO: Re-evaluate this later
+      immutable
+
       filter :approval_status, default: 'approved'
 
       has_many :plantings

app/resources/api/v1/garden_resource.rb

@@ -3,22 +3,13 @@
 module Api
   module V1
     class GardenResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable
 
       has_one :owner, class_name: 'Member'
       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,17 +3,11 @@
 module Api
   module V1
     class HarvestResource < BaseResource
-      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
+      immutable
 
       has_one :crop
       has_one :planting
       has_one :owner, class_name: 'Member'
-      # has_one :plant_part
       has_many :photos
 
       attribute :harvested_at
@@ -22,15 +16,6 @@ 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/photo_resource.rb

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

app/resources/api/v1/planting_resource.rb

@@ -3,9 +3,7 @@
 module Api
   module V1
     class PlantingResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable
 
       has_one :garden
       has_one :crop
@@ -38,10 +36,6 @@ 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
       delegate :percentage_grown, to: :@model

app/resources/api/v1/seed_resource.rb

@@ -3,9 +3,7 @@
 module Api
   module V1
     class SeedResource < BaseResource
-      before_create do
-        @model.owner = context[:current_user]
-      end
+      immutable
 
       has_one :owner, class_name: 'Member'
       has_one :crop
@@ -19,15 +17,6 @@ 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,16 +1,6 @@
 # frozen_string_literal: true
 
 class BaseResource < JSONAPI::Resource
+  immutable
   abstract
-
-  [: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

@@ -0,0 +1,108 @@
+# 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,20 +18,10 @@ 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/_card.html.haml

@@ -20,24 +20,16 @@
               - if can? :destroy, activity
                 .dropdown-divider
                 = delete_button(activity, classes: 'dropdown-item text-danger')
-    .card-body
-      = link_to activity_path(slug: activity.slug) do
+    = link_to activity_path(slug: activity.slug) do
+      .card-body.text-center
         %h4= activity.name
-        - 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)
-
+        .text-center= activity.description
+        - if activity.garden
+          .text-center= activity.garden
+        - if activity.planting
+          .text-center= activity.planting
     .card-footer
-      %small.chip.member-chip
-        = link_to member_path(slug: activity.owner_slug) do
-          = activity.owner_login_name
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: activity.owner_slug) do
+            = activity.owner_login_name

app/views/activities/_form.html.haml

@@ -27,13 +27,13 @@
 
       .row
         .col-md-4
-          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
+          = f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
             :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.recent,
+          = f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
             :id, :crop_name,
             label: 'Is this for a specific planting?')
           = link_to "Add a planting.", new_planting_path

app/views/crops/_actions.html.haml

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

app/views/crops/_crop.html.haml

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

app/views/crops/_form.html.haml

@@ -41,14 +41,6 @@
         = f.radio_button(:perennial, true, label: "Perennial")
         %span.help-block Living more than two years
 
-      %h2 OpenFarm Data
-      = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
-      = f.number_field :spread, label: 'Spread (cm)', min: 0
-      = f.number_field :height, label: 'Height (cm)', min: 0
-      = f.text_field :sowing_method
-      = f.text_field :sun_requirements
-      = f.number_field :growing_degree_days, min: 0
-
       - unless @crop.approved?
         = link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
       = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'

app/views/crops/_harvests.html.haml

@@ -12,7 +12,7 @@
             #{harvest.owner} harvested #{display_quantity(harvest)}.
           .float-right= render 'members/location', member: harvest.owner
           .harvest-timeago
-            %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
+            %small #{distance_of_time_in_words(harvest.harvested_at, Time.zone.now)} ago.
       %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
       - if crop.approved?
         - if current_member

app/views/crops/_openfarm_data.html.haml

@@ -1,33 +0,0 @@
-- if crop.row_spacing || crop.spread || crop.height || crop.sowing_method || crop.sun_requirements || crop.growing_degree_days
-  = cute_icon
-  .card
-    .card-body
-      %h4 OpenFarm Data
-    %ul.list-group.list-group-flush
-      - if crop.row_spacing
-        %li.list-group-item
-          %strong Row Spacing:
-          = crop.row_spacing
-          cm
-      - if crop.spread
-        %li.list-group-item
-          %strong Spread:
-          = crop.spread
-          cm
-      - if crop.height
-        %li.list-group-item
-          %strong Height:
-          = crop.height
-          cm
-      - if crop.sowing_method
-        %li.list-group-item
-          %strong Sowing Method:
-          = crop.sowing_method
-      - if crop.sun_requirements
-        %li.list-group-item
-          %strong Sun Requirements:
-          = crop.sun_requirements
-      - if crop.growing_degree_days
-        %li.list-group-item
-          %strong Growing Degree Days:
-          = crop.growing_degree_days

app/views/crops/_planting_advice.html.haml

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

app/views/crops/show.html.haml

@@ -74,6 +74,7 @@
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
         = render 'grown_for', crop: @crop
+        = render 'planting_advice', crop: @crop
         - if @crop.parent
           %hr/
           %p.parent-crop
@@ -111,8 +112,6 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
-    = render 'openfarm_data', crop: @crop
-
     = cute_icon
     .card
       .card-body
@@ -125,6 +124,13 @@
             = icon 'fas', 'external-link-alt'
             Wikipedia (English)
 
+        %li.list-group-item
+          = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}",
+                    class: 'card-link',
+                    target: "_blank",
+                    rel: "noopener noreferrer" do
+            = icon 'fas', 'external-link-alt'
+            OpenFarm - Growing guide
         %li.list-group-item
           = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
                     target: "_blank",

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

@@ -15,16 +15,3 @@
                     method: :delete, class: "remove btn btn-danger"
         - else
           = link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
-  %hr
-  .row
-    .col-md-12
-      %p
-        = image_tag "icons/post.svg", size: "32x32", alt: 'API logo'
-        - if current_member.api_token?
-          Your API token is
-          %code= current_member.api_token.token
-          = link_to "Regenerate", regenerate_api_token_path,
-                    data: { confirm: "Are you sure? Your old token will stop working immediately." },
-                    method: :post, class: "remove btn btn-danger"
-        - else
-          = link_to 'Generate API Token', regenerate_api_token_path, method: :post, class: 'btn btn-primary'

app/views/gardens/_actions.html.haml

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

app/views/gardens/_previously.haml

@@ -16,8 +16,3 @@
   .col-md-12
     %p Nothing has been planted here.
 
-- if @finished_activities&.size&.positive?
-  %h2 Finished activities in garden
-  .index-cards
-    - @finished_activities.each do |activity|
-      = render "activities/card", activity: activity

app/views/gardens/index.html.haml

@@ -11,9 +11,6 @@
 
 .row
   .col-md-2
-    %small
-      %a{href: "#content"}
-        Skip to main content
     = render 'layouts/nav', model: Garden
     %label
       = link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all) do
@@ -23,7 +20,7 @@
       %hr/
       = render @owner
 
-  .col-md-10#content
+  .col-md-10
     - if @gardens.empty?
       %p There are no gardens to display.
       - if can?(:create, Garden) && @owner == current_member

app/views/gardens/show.html.haml

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

app/views/harvests/_planting.haml

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

app/views/harvests/show.html.haml

@@ -46,7 +46,7 @@
           %h3
             Harvested
             = editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
-          %strong.harvested_at #{standard_time_distance @harvest.harvested_at, Time.zone.now.to_date}
+          %strong.harvested_at #{distance_of_time_in_words @harvest.harvested_at, Time.zone.now.to_date} ago
           %span.harvested_at= I18n.l @harvest.harvested_at
 
         .card{class: @harvest.quantity.present? ? '' : 'text-muted'}

app/views/home/_stats.html.haml

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

app/views/home/index.html.haml

@@ -8,14 +8,13 @@
 
       %p= render 'stats', cached: true
     .col
-      %br
       %p
         - if current_member.plantings.active.any?
-          = link_to member_path(current_member, anchor: "content"), class: 'btn btn-dark' do
+          = link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
             = planting_icon
             Track my plantings
       %p
-        = link_to member_gardens_path(current_member, anchor: "content"), class: 'btn btn-dark' do
+        = link_to member_gardens_path(current_member), class: 'btn btn-dark' do
           = garden_icon
           Show me my garden
 - else
@@ -62,16 +61,3 @@
     %section.members
       = cute_icon
       = render 'members', cached: true
-  .col-12.col-lg-6
-    %section.pwa-install
-      = cute_icon
-      %h2.text-center= t('home.pwa_title')
-      .index-cards
-        .card
-          .card-body
-            %h3= t('home.pwa_ios_title')
-            %p= t('home.pwa_ios_steps_html')
-        .card
-          .card-body
-            %h3= t('home.pwa_android_title')
-            %p= t('home.pwa_android_steps_html')

app/views/layouts/_header.html.haml

@@ -4,8 +4,8 @@
       = image_tag("pear.png", class: 'logo', alt: 'Growstuff brand logo (drawing of a pear)')
       .d-none.d-md-block
         %span.site-name Growstuff
+    %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "offcanvas", type: "button" }
+      %i.fas.fa-ellipsis-v.navbar-toggler-icon
   .nav= render 'crops/search_bar'
   .nav
-    %button.navbar-toggler.ml-auto{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", type: "button" }
-      %span.navbar-toggler-icon
     = render 'layouts/menu'

app/views/layouts/_menu.haml

@@ -1,11 +1,11 @@
-#navbarSupportedContent.collapse.navbar-collapse
-  %ul.navbar-nav.mr-auto.bg-dark
+#navbarSupportedContent.offcanvas.offcanvas-top
+  %ul.navbar-nav.mr-auto
     - if signed_in?
       %li.nav-item
-        = link_to timeline_index_path, method: :get, class: 'nav-link text-white', title: "Timeline" do
+        = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
           = image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
       %li.nav-item
-        = link_to member_gardens_path(current_member, anchor: "content"), class: 'nav-link text-white', title: "My gardens" do
+        = link_to member_gardens_path(current_member), class: 'nav-link text-white', title: "My gardens" do
           = image_icon 'gardens'
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
@@ -30,9 +30,7 @@
 
     - cache("everyone-menu", expires_in: 1.week) do
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-          %span
-          = t('.crops')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
         .dropdown-menu
           = link_to crops_path, class: 'dropdown-item' do
             = t('.browse_crops')
@@ -46,9 +44,7 @@
             = harvest_icon
             = t('.harvests')
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-          %span
-          = t('.community')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
           = link_to t('.community_map'), places_path, class: 'dropdown-item'
           = link_to t('.browse_members'), members_path, class: 'dropdown-item'
@@ -58,9 +54,7 @@
     - if member_signed_in?
       - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
         %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-            %span
-            = t('.admin')
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
           .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
             - if current_member.role?(:crop_wrangler)
               = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'

app/views/likes/_description.html.haml

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

app/views/members/_member.haml

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

app/views/members/show.html.haml

@@ -28,7 +28,7 @@
                 %a{href: "#content"}
                   Skip to main content
             - if @member.bio.blank?
-              - if member_signed_in? && current_member == @member
+              - if can? :edit, @member
                 = link_to "Add a bio to complete your profile.", edit_member_registration_path
               - else
                 #{@member.login_name} hasn't written a bio yet.
@@ -82,15 +82,15 @@
   .col-md-10#content
     .row
       %section.order-3.order-md-1.col-12= render "map", member: @member
-      - if @harvesting.size.positive? 
-        %section.harvests.order-2.order-md-1.col-12#harvests
+      - if @harvesting.size.positive?
+        %section.harvests.order-2.order-md-1
           %h2 Ready to harvest
           .index-cards
             - @harvesting.each do |planting|
               = render 'plantings/thumbnail', planting: planting
 
       - if @others.size.positive?
-        %section.planting-progress.order-2.order-md-1.col-12#planting-progress
+        %section.planting-progress.order-2.order-md-1.col-12
           %h2 Progress report
           %p Still growing and not ready for harvesting.
           .list-group
@@ -99,7 +99,7 @@
                 %span= render 'plantings/tiny', planting: planting
                 %span= render 'plantings/progress', planting: planting
       - if @late.size.positive?
-        %section.late.order-2.order-md-1.col-12#late
+        %section.late.order-2.order-md-1.col-12
           %h2 Late
           %p
             These plantings are at the end of their lifecycle.
@@ -109,7 +109,7 @@
             - @late.each do |planting|
               = render 'plantings/thumbnail', planting: planting
       - if @super_late.any?
-        %section.superlate.order-2.order-md-1.col-12#superlate
+        %section.superlate.order-2.order-md-1.col-12
           %h2 Super late
           %p
             We suspect the following plantings finished long ago and no longer need tracking.
@@ -122,14 +122,14 @@
                 planted on #{planting.planted_at.to_date}
 
       - if @harvests.any?
-        %section.havests.order-2.order-md-1.col-12#recent-harvests
+        %section.havests.order-2.order-md-1.col-12
           %h2 Recent Harvests
           .index-cards
             - @harvests.each do |harvest|
               = render 'harvests/thumbnail', harvest: harvest
 
       - if @activity.any?
-        %section.activity.order-2.order-md-1.col-12#activity
+        %section.activity.order-2.order-md-1.col-12
           %h2 Activity
           .list-group
             - @activity.each do |event|

app/views/plantings/_facts.haml

@@ -21,7 +21,7 @@
   - if planting.finish_is_predicatable?
     .card.fact-card
       %h3 Progress
-      - if planting.age_in_days.to_i < 0
+      - if planting.age_in_days < 0
         %strong Planned
       - else
         %strong #{planting.age_in_days}/#{planting.expected_lifespan}
@@ -45,7 +45,7 @@
       %h3 Growing
       %strong= seedling_icon
       %span
-      - if planting.age_in_days.to_i < 0
+      - if planting.age_in_days < 0
         Planting planned
       - else
         Planting is still growing today
@@ -89,9 +89,3 @@
       - if planting.finished_at.present?
         %span.plantingfact--finish
           = planting.finished_at.year
-  - if planting.overall_rating.present?
-    .card.fact-card
-      .card-body
-        %h3 Overall Rating
-        %p.card-text
-          %strong= "#{planting.overall_rating}/5"

app/views/plantings/_form.html.haml

@@ -27,7 +27,7 @@
 
       .row
         .col-md-8
-          = f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active.order_by_name,
+          = f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active,
             :id, :name, required: true,
             label: 'Where did you plant it?')
           = link_to "Add a garden.", new_garden_path
@@ -43,15 +43,6 @@
           = f.select(:sunniness, Planting::SUNNINESS_VALUES, { include_blank: '', label: 'Sun or shade?' } )
         .col-md-4
           = f.number_field :quantity, label: 'How many?', min: 1
-        .col-md-12
-          = f.range_field :overall_rating, min: 1, max: 5, include_blank: 'Leave blank', label: 'Overall Rating', list: "rating-list", title: "How well is the planting going?"
-          %datalist{"id": "rating-list"}
-            %option{"value": "1"} Poor
-            %option{"value": "2"}
-            %option{"value": "3"}
-            %option{"value": "4"}
-            %option{"value": "5"} Great
-
       = f.text_area :description, rows: 6, label: 'Tell us more about it'
 
       .row

app/views/plantings/_modal.html.haml

@@ -9,7 +9,7 @@
         %p Which garden is the planting in?
 
         %ul.list-group
-          - planting.owner.gardens.active.order_by_name.each do |garden|
+          - planting.owner.gardens.active.order(:name).each do |garden|
             %li.list-group-item
               = link_to plantings_path(planting: {crop_id: planting.crop_id, garden_id: garden.id}), method: :post do
                 .md-v-line

app/views/plantings/show.html.haml

@@ -7,15 +7,6 @@
   = tag("meta", property: "og:type", content: "website")
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
-  - if @planting.overall_rating.present?
-    %script{type: "application/ld+json"}
-      :plain
-        {
-          "@context": "http://schema.org",
-          "@type": "Rating",
-          "ratingValue": "#{@planting.overall_rating}",
-          "bestRating": "5"
-        }
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Plantings', plantings_path
@@ -48,10 +39,10 @@
             - elsif @planting.percentage_grown.present?
               #{@planting.percentage_grown.to_i}%
               - if @planting.finish_is_predicatable?
-                - if @planting.age_in_days.to_i < 0
+                - if @planting.age_in_days < 0
                   %strong Planned
                 - else
-                  %strong #{@planting.age_in_days.to_i}/#{@planting.expected_lifespan} days
+                  %strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
 
         = render 'timeline', planting: @planting
       = render 'likes/likes', object: @planting
@@ -89,11 +80,7 @@
           - else
             .col-md-12
               %p Nothing is currently planned here.
-        - if @finished_activities&.size&.positive?
-          %h2 Finished activities for planting
-          .index-cards
-            - @finished_activities.each do |activity|
-              = render "activities/card", activity: activity
+
 
     .col-md-4.col-xs-12
       = render @planting.crop

app/views/seeds/_card.html.haml

@@ -16,20 +16,14 @@
       %p
         - if seed.quantity
           .badge.badge-info #{seed.quantity} seeds
-        %ul
-          - if seed.organic != 'unknown'
-            %li
-              %small.seedtitle--organic= seed.organic
-          - if seed.gmo != 'unknown'
-            %li
-              %small.seedtitle--gmo= seed.gmo
-          - if seed.heirloom != 'unknown'
-            %li
-              %small.seedtitle--heirloom= seed.heirloom
-
-    .card-footer
-      .d-flex.w-100.justify-content-between
-        - if seed.tradable
+        - if seed.organic != 'unknown'
+          .badge.badge-success.seedtitle--organic= seed.organic
+        - if seed.gmo != 'unknown'
+          .badge.badge-success.seedtitle--gmo= seed.gmo
+        - if seed.heirloom != 'unknown'
+          .badge.badge-success.seedtitle--heirloom= seed.heirloom
+    - if seed.tradable
+      .card-footer
+        .d-flex.w-100.justify-content-between
           %small Will trade #{seed.tradable_to}
-        - if seed.plant_before
-          %small Plant before #{seed.plant_before}
+          / %a.btn.btn-sm{href: "#"} Request

app/views/seeds/_form.html.haml

@@ -49,19 +49,17 @@
         .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days", min: 1
 
       .row
-        .col-md-3
-          = f.select(:organic, Seed::ORGANIC_VALUES, { label: 'Organic?', wrapper: { class: 'required' }, required: true }, default: 'unknown')
-        .col-md-3
-          = f.select(:gmo, Seed::GMO_VALUES, { label: 'GMO?', wrapper: { class: 'required' }, required: true }, default: 'unknown')
-        .col-md-3
-          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, { label: 'Heirloom?', wrapper: { class: 'required' }, required: true }, default: 'unknown')
-        .col-md-3
-          = f.select(:source, Seed::SOURCE_VALUES, { label: 'Source?', wrapper: { class: 'required' }, required: true }, default: 'unknown')
+        .col-md-4
+          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+        .col-md-4
+          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+        .col-md-4
+          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
       = f.text_area :description, rows: 6
 
       %hr/
       =  t('.trade_help', site_name: ENV['GROWSTUFF_SITE_NAME'])
-      = f.select(:tradable_to, Seed::TRADABLE_TO_VALUES, { label: 'Will trade', wrapper: { class: 'required' }, required: true })
+      = f.select(:tradable_to, Seed::TRADABLE_TO_VALUES, {label: 'Will trade', wrapper: { class: 'required'}, required: true})
       %span.help_inline
         - if current_member.location.blank?
           Don't forget to

app/views/timeline/_like.html.haml

@@ -1,2 +0,0 @@
-- likeable = like.likeable
-= render "timeline/likeables/#{likeable.class.name.downcase}", likeable: likeable

app/views/timeline/index.html.haml

@@ -14,7 +14,6 @@
               = link_to owner, owner
               = event_description(event)
               = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
-              = render 'timeline/like', like: resolve_model(event) if event.event_type == 'like'
             %small
             - if event.event_at.present?
               - if event.event_at.kind_of?(Date)

app/views/timeline/likeables/_photo.html.haml

@@ -1 +0,0 @@
-= render 'timeline/photos', photo: likeable

app/views/timeline/likeables/_post.html.haml

@@ -1,6 +0,0 @@
-.card.my-2
-  .card-body
-    %blockquote.blockquote.mb-0
-      %p= truncate(likeable.body, length: 140)
-      %footer.blockquote-footer
-        = link_to "view post", likeable

config/initializers/jsonapi_resources.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-class UnauthorisedError < JSONAPI::Error
-end
+
 JSONAPI.configure do |config|
   # built in paginators are :none, :offset, :paged
   config.default_paginator = :offset
   config.default_page_size = 10
   config.maximum_page_size = 100
-  config.exception_class_whitelist = [CanCan::AccessDenied, UnauthorisedError]
 end

config/locales/devise.en.yml

@@ -54,7 +54,6 @@ en:
         You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm
         link to finalize confirming your new email address.
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
-      api_token_regenerated: 'Your API token has been regenerated.'
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'

config/locales/en.yml

@@ -123,8 +123,6 @@ en:
       no_plantings: no plantings
       plantingsthumbnail: plantings/thumbnail
     updated: Garden was successfully updated.
-    confirm_delete: All plantings associated with this garden will also be deleted. Are you sure?
-    confirm_deactivate: All plantings associated with this garden will be marked as finished. Are you sure?
   harvests:
     created: Harvest was successfully created.
     harvest_something: Harvest something
@@ -177,6 +175,7 @@ en:
         Our team includes volunteers from all walks of life and all skill levels. To get involved,
         visit %{talk_link} or find more information on the %{wiki_link}.
       get_involved_title: Get Involved
+      github_linktext: Github
       open_data_body_html: >
         We're building a database of crops, planting advice, seed sources, and other information that anyone
         can use for free, under a %{creative_commons_link}. You can use this data for research, to build apps,
@@ -208,15 +207,10 @@ en:
       view_all: View all seeds
     stats:
       member_linktext: "%{count} members"
-      message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
+      message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}.
       number_crops_linktext: "%{count} crops"
       number_gardens_linktext: "%{count} gardens"
       number_plantings_linktext: "%{count} times"
-    pwa_android_steps_html: 1. Tap the three dots in the top right corner of Chrome.<br>2. Tap <strong>Install app</strong> or <strong>Add to Home screen</strong>.
-    pwa_android_title: For Android
-    pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
-    pwa_ios_title: For iOS (iPhone/iPad)
-    pwa_title: Want to install Growstuff on your phone?
   label:
     days_until_harvest: "%{number} days"
     weeks_until_harvest: "%{number} weeks until harvest"

config/routes.rb

@@ -16,7 +16,6 @@ Rails.application.routes.draw do
   }
   devise_scope :member do
     get '/members/unsubscribe/:message' => 'members#unsubscribe', as: 'unsubscribe_member'
-    post '/members/regenerate_api_token' => 'registrations#regenerate_api_token', as: 'regenerate_api_token'
   end
   match '/members/:id/finish_signup' => 'members#finish_signup', via: %i(get patch), as: :finish_signup
 
@@ -142,7 +141,6 @@ Rails.application.routes.draw do
 
   namespace :api do
     namespace :v1 do
-      jsonapi_resources :activities
       jsonapi_resources :crops
       jsonapi_resources :gardens
       jsonapi_resources :harvests

db/migrate/20240101010101_add_fields_to_crops.rb

@@ -1,10 +0,0 @@
-class AddFieldsToCrops < ActiveRecord::Migration[5.2]
-  def change
-    add_column :crops, :row_spacing, :integer
-    add_column :crops, :spread, :integer
-    add_column :crops, :height, :integer
-    add_column :crops, :sowing_method, :string
-    add_column :crops, :sun_requirements, :string
-    add_column :crops, :growing_degree_days, :integer
-  end
-end

db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb

@@ -1,21 +0,0 @@
-class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
-  def up
-    Crop.find_each do |crop|
-      if crop.openfarm_data.present?
-        attributes = crop.openfarm_data.fetch('attributes', {})
-        crop.update_columns(
-          row_spacing: attributes['row_spacing'],
-          spread: attributes['spread'],
-          height: attributes['height'],
-          sowing_method: attributes['sowing_method'],
-          sun_requirements: attributes['sun_requirements'],
-          growing_degree_days: attributes['growing_degree_days']
-        )
-      end
-    end
-  end
-
-  def down
-    # This migration is not reversible.
-  end
-end

db/migrate/20250901105232_add_source_to_seeds.rb

@@ -1,6 +0,0 @@
-class AddSourceToSeeds < ActiveRecord::Migration[7.2]
-  def change
-    add_column :seeds, :source, :string
-    add_index :seeds, :source
-  end
-end

db/migrate/20250901110545_add_indexes_crops.rb

@@ -1,52 +0,0 @@
-class AddIndexesCrops < ActiveRecord::Migration[7.2]
-  def change
-    add_index :alternate_names, :crop_id
-    add_index :alternate_names, :creator_id
-    add_index :alternate_names, :language
-
-    add_index :comments, :author_id
-
-    add_index :crop_companions, %i(crop_a_id crop_b_id)
-
-    add_index :crops, :creator_id
-    add_index :crops, :parent_id
-
-    add_index :follows, %i(follower_id followed_id)
-
-    add_index :forums, :owner_id
-
-    add_index :harvests, :crop_id
-    add_index :harvests, :owner_id
-    add_index :harvests, :plant_part_id
-
-    add_index :members_roles, %i(member_id role_id)
-
-    add_index :notifications, :sender_id
-    add_index :notifications, :recipient_id
-
-    add_index :orders_products, %i(order_id product_id)
-
-    add_index :photo_associations, :crop_id # TODO: Is this still in use?
-
-    add_index :photos, :owner_id
-    add_index :photos, :source_id
-
-    add_index :photos_plantings, %i(photo_id planting_id)
-
-    add_index :plant_parts, :slug, unique: true
-
-    add_index :plantings, :crop_id
-    add_index :plantings, :garden_id
-    add_index :plantings, :owner_id
-    add_index :plantings, :parent_seed_id
-
-    add_index :posts, :forum_id
-
-    add_index :scientific_names, :crop_id
-    add_index :scientific_names, :creator_id
-
-    add_index :seeds, :owner_id
-    add_index :seeds, :crop_id
-    add_index :seeds, :parent_planting_id
-  end
-end

db/migrate/20250901130830_add_overall_rating_plantings.rb

@@ -1,5 +0,0 @@
-class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
-  def change
-    add_column :plantings, :overall_rating, :integer
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
+ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -68,9 +68,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.string "language"
-    t.index ["creator_id"], name: "index_alternate_names_on_creator_id"
-    t.index ["crop_id"], name: "index_alternate_names_on_crop_id"
-    t.index ["language"], name: "index_alternate_names_on_language"
   end
 
   create_table "authentications", id: :serial, force: :cascade do |t|
@@ -212,8 +209,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.string "commentable_type"
-    t.index ["author_id"], name: "index_comments_on_author_id"
-    t.index ["commentable_type", "commentable_id"], name: "index_comments_on_commentable_type_and_commentable_id"
   end
 
   create_table "crop_companions", force: :cascade do |t|
@@ -221,7 +216,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.integer "crop_b_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.index ["crop_a_id", "crop_b_id"], name: "index_crop_companions_on_crop_a_id_and_crop_b_id"
   end
 
   create_table "crop_posts", id: false, force: :cascade do |t|
@@ -252,15 +246,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.jsonb "openfarm_data"
     t.integer "harvests_count", default: 0
     t.integer "photo_associations_count", default: 0
-    t.integer "row_spacing"
-    t.integer "spread"
-    t.integer "height"
-    t.string "sowing_method"
-    t.string "sun_requirements"
-    t.integer "growing_degree_days"
-    t.index ["creator_id"], name: "index_crops_on_creator_id"
     t.index ["name"], name: "index_crops_on_name"
-    t.index ["parent_id"], name: "index_crops_on_parent_id"
     t.index ["requester_id"], name: "index_crops_on_requester_id"
     t.index ["slug"], name: "index_crops_on_slug", unique: true
   end
@@ -270,7 +256,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.integer "followed_id"
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.index ["follower_id", "followed_id"], name: "index_follows_on_follower_id_and_followed_id"
   end
 
   create_table "forums", id: :serial, force: :cascade do |t|
@@ -280,7 +265,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.string "slug"
-    t.index ["owner_id"], name: "index_forums_on_owner_id"
     t.index ["slug"], name: "index_forums_on_slug", unique: true
   end
 
@@ -344,9 +328,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.float "si_weight"
     t.integer "planting_id"
     t.integer "likes_count", default: 0
-    t.index ["crop_id"], name: "index_harvests_on_crop_id"
-    t.index ["owner_id"], name: "index_harvests_on_owner_id"
-    t.index ["plant_part_id"], name: "index_harvests_on_plant_part_id"
     t.index ["planting_id"], name: "index_harvests_on_planting_id"
   end
 
@@ -483,7 +464,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
   create_table "members_roles", id: false, force: :cascade do |t|
     t.integer "member_id"
     t.integer "role_id"
-    t.index ["member_id", "role_id"], name: "index_members_roles_on_member_id_and_role_id"
   end
 
   create_table "notifications", id: :serial, force: :cascade do |t|
@@ -497,14 +477,11 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "updated_at", precision: nil
     t.string "notifiable_type"
     t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
-    t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
-    t.index ["sender_id"], name: "index_notifications_on_sender_id"
   end
 
   create_table "orders_products", id: false, force: :cascade do |t|
     t.integer "order_id"
     t.integer "product_id"
-    t.index ["order_id", "product_id"], name: "index_orders_products_on_order_id_and_product_id"
   end
 
   create_table "photo_associations", id: :serial, force: :cascade do |t|
@@ -514,7 +491,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.integer "crop_id"
-    t.index ["crop_id"], name: "index_photo_associations_on_crop_id"
     t.index ["photographable_id", "photographable_type", "photo_id"], name: "items_to_photos_idx", unique: true
     t.index ["photographable_id", "photographable_type"], name: "photographable_idx"
   end
@@ -535,15 +511,12 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.string "source"
     t.integer "comments_count", default: 0
     t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
-    t.index ["owner_id"], name: "index_photos_on_owner_id"
-    t.index ["source_id"], name: "index_photos_on_source_id"
     t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
   end
 
   create_table "photos_plantings", id: false, force: :cascade do |t|
     t.integer "photo_id"
     t.integer "planting_id"
-    t.index ["photo_id", "planting_id"], name: "index_photos_plantings_on_photo_id_and_planting_id"
   end
 
   create_table "photos_seeds", id: false, force: :cascade do |t|
@@ -558,7 +531,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.datetime "updated_at", precision: nil
     t.string "slug"
     t.integer "harvests_count", default: 0
-    t.index ["slug"], name: "index_plant_parts_on_slug", unique: true
   end
 
   create_table "plantings", id: :serial, force: :cascade do |t|
@@ -582,11 +554,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.integer "harvests_count", default: 0
     t.integer "likes_count", default: 0
     t.boolean "failed", default: false, null: false
-    t.integer "overall_rating"
-    t.index ["crop_id"], name: "index_plantings_on_crop_id"
-    t.index ["garden_id"], name: "index_plantings_on_garden_id"
-    t.index ["owner_id"], name: "index_plantings_on_owner_id"
-    t.index ["parent_seed_id"], name: "index_plantings_on_parent_seed_id"
     t.index ["slug"], name: "index_plantings_on_slug", unique: true
   end
 
@@ -601,7 +568,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.integer "likes_count", default: 0
     t.integer "comments_count", default: 0
     t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id"
-    t.index ["forum_id"], name: "index_posts_on_forum_id"
     t.index ["slug"], name: "index_posts_on_slug", unique: true
   end
 
@@ -624,8 +590,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.string "gbif_rank"
     t.string "gbif_status"
     t.string "wikidata_id"
-    t.index ["creator_id"], name: "index_scientific_names_on_creator_id"
-    t.index ["crop_id"], name: "index_scientific_names_on_crop_id"
   end
 
   create_table "seeds", id: :serial, force: :cascade do |t|
@@ -647,12 +611,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_130830) do
     t.date "finished_at"
     t.integer "parent_planting_id"
     t.date "saved_at"
-    t.string "source"
-    t.index ["crop_id"], name: "index_seeds_on_crop_id"
-    t.index ["owner_id"], name: "index_seeds_on_owner_id"
-    t.index ["parent_planting_id"], name: "index_seeds_on_parent_planting_id"
     t.index ["slug"], name: "index_seeds_on_slug", unique: true
-    t.index ["source"], name: "index_seeds_on_source"
   end
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"

db/seeds.rb

@@ -173,8 +173,7 @@ def load_test_users
         organic:         select_random_item(Seed::ORGANIC_VALUES),
         gmo:             select_random_item(['certified GMO-free', 'non-certified GMO-free', 'GMO', 'unknown']), # Strangely, this doesn't want to work as Seed:GMO_VALUES
         heirloom:        select_random_item(Seed::HEIRLOOM_VALUES),
-        parent_planting: @user.plantings.first,
-        finished:        false
+        parent_planting: @user.plantings.first
       )
 
       photo = Photo.create!(

lib/tasks/wikidata.rake

@@ -36,21 +36,21 @@ namespace :wikidata do
           aliases = wikidata_data['entities'][wikidata_id]['aliases']
           aliases.each do |lang, values|
             values.each do |value|
-              next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
-
-              AlternateName.create!(
-                name:     value['value'],
-                language: lang,
-                crop:     crop,
-                creator:  creator
-              )
-              puts "    Added alternate name: #{value['value']} (#{lang})"
+              unless AlternateName.exists?(name: value['value'], language: lang, crop: crop)
+                AlternateName.create!(
+                  name: value['value'],
+                  language: lang,
+                  crop: crop,
+                  creator: creator
+                )
+                puts "    Added alternate name: #{value['value']} (#{lang})"
+              end
             end
           end
         else
           puts "  Could not find Wikidata ID for #{crop.name}"
         end
-      rescue StandardError => e
+      rescue => e
         puts "  Error processing crop #{crop.name}: #{e.message}"
       end
     end

spec/controllers/crops_controller_spec.rb

@@ -100,36 +100,6 @@ describe CropsController do
       it { expect { subject }.to change(Crop, :count).by(1) }
       it { expect { subject }.to change(AlternateName, :count).by(2) }
       it { expect { subject }.to change(ScientificName, :count).by(1) }
-
-      context 'with openfarm data' do
-        let(:crop_params) do
-          {
-            crop:     {
-              name:                'aubergine',
-              en_wikipedia_url:    "https://en.wikipedia.org/wiki/Eggplant",
-              row_spacing:         10,
-              spread:              20,
-              height:              30,
-              sowing_method:       'direct',
-              sun_requirements:    'full sun',
-              growing_degree_days: 100
-            },
-            alt_name: { '1': "egg plant", '2': "purple apple" },
-            sci_name: { '1': "fancy sci name", '2': "" }
-          }
-        end
-
-        it 'saves openfarm data' do
-          subject
-          crop = Crop.last
-          expect(crop.row_spacing).to eq(10)
-          expect(crop.spread).to eq(20)
-          expect(crop.height).to eq(30)
-          expect(crop.sowing_method).to eq('direct')
-          expect(crop.sun_requirements).to eq('full sun')
-          expect(crop.growing_degree_days).to eq(100)
-        end
-      end
     end
   end