Commit these

.github/dependabot.yml

@@ -13,4 +13,3 @@ updates:
     interval: daily
     time: "07:00"
   open-pull-requests-limit: 10
-

.github/workflows/brakeman-analysis.yml

@@ -0,0 +1,40 @@
+# This workflow integrates Brakeman with GitHub's Code Scanning feature
+# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
+
+name: Brakeman Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on:
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  brakeman-scan:
+    name: Brakeman Scan
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository to the GitHub Actions runner
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    # Customize the ruby version depending on your needs
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+
+    - name: Setup Brakeman
+      env:
+        BRAKEMAN_VERSION: '5.1.1' # SARIF support is provided in Brakeman version 4.10+
+      run: |
+        gem install brakeman --version $BRAKEMAN_VERSION
+
+    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+    - name: Scan
+      continue-on-error: true
+      run: |
+        brakeman -f sarif -o output.sarif.json .
+
+    # Upload the SARIF file generated in the previous step
+    - name: Upload SARIF
+      uses: github/codeql-action/upload-sarif@v3
+      with:
+        sarif_file: output.sarif.json

.github/workflows/ci.yml

@@ -72,6 +72,8 @@ jobs:
       #
       # See https://github.com/actions/cache/blob/master/examples.md#node---yarn for details
       #
+      - name: Enable Corepack
+        run: corepack enable
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -106,37 +108,15 @@ jobs:
 
       - name: Prepare database for testing
         run: bundle exec rails db:prepare
-
-
-      - name: Run rspec (lib)
-        run: bundle exec rspec spec/lib/ -fd --fail-fast
-
-      - name: Run rspec (services)
-        run: bundle exec rspec spec/services/ -fd --fail-fast
-
-      - name: Run rspec (models)
-        run: bundle exec rspec spec/models/ -fd --fail-fast
-
-      - name: Run rspec (controllers)
-        run: bundle exec rspec spec/controllers/ -fd --fail-fast
-
-      - name: Run rspec (views)
-        run: bundle exec rspec spec/views/ -fd --fail-fast
-
-      - name: Run rspec (routing)
-        run: bundle exec rspec spec/routing/ -fd --fail-fast
-
-      - name: Run rspec (request)
-        run: bundle exec rspec spec/requests/ -fd --fail-fast
-
+        
       - name: precompile assets
         run: bundle exec rails assets:precompile
-
+        
       - name: index into elastic search
         run: bundle exec rails search:reindex
 
       - name: Run rspec (report results to Percy.io and CodeClimate)
-        run: bundle exec rspec spec/features/ -fd --fail-fast
+        run: bundle exec rspec spec -fd
 
       - name: Report to code climate
         run: |

.rubocop_todo.yml

@@ -158,7 +158,7 @@ Metrics/BlockLength:
 # Offense count: 7
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 188
+  Max: 183
 
 # Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.5.0.cjs

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actioncable (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionmailbox (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      actionview (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionmailer (7.2.1)
+      actionpack (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activesupport (= 7.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1.1)
-      actionview (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionpack (7.2.1)
+      actionview (= 7.2.1)
+      activesupport (= 7.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -64,15 +64,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actiontext (7.2.1)
+      actionpack (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionview (7.2.1)
+      activesupport (= 7.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -80,29 +80,29 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    active_median (0.5.0)
-      activesupport (>= 7)
+    active_median (0.4.1)
+      activesupport (>= 6.1)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
     active_utils (3.4.1)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activejob (7.2.1)
+      activesupport (= 7.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.1.1)
-      activesupport (= 7.2.1.1)
-    activerecord (7.2.1.1)
-      activemodel (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activerecord (7.2.1)
+      activemodel (= 7.2.1)
+      activesupport (= 7.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activestorage (7.2.1)
+      actionpack (= 7.2.1)
+      activejob (= 7.2.1)
+      activerecord (= 7.2.1)
+      activesupport (= 7.2.1)
       marcel (~> 1.0)
-    activesupport (7.2.1.1)
+    activesupport (7.2.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -118,17 +118,15 @@ GEM
     ast (2.4.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.10.2)
+    axe-core-api (4.10.0)
       dumb_delegator
-      ostruct
       virtus
-    axe-core-capybara (4.10.2)
-      axe-core-api (= 4.10.2)
+    axe-core-capybara (4.10.0)
+      axe-core-api (= 4.10.0)
       dumb_delegator
-    axe-core-rspec (4.10.2)
-      axe-core-api (= 4.10.2)
+    axe-core-rspec (4.10.0)
+      axe-core-api (= 4.10.0)
       dumb_delegator
-      ostruct
       virtus
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -154,7 +152,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.0.0)
+    bullet (7.2.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
@@ -181,7 +179,7 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.2)
+    chartkick (5.1.0)
     childprocess (5.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
@@ -204,7 +202,7 @@ GEM
     csv_shaper (1.3.2)
       activesupport (>= 3.0.0)
     dalli (3.2.8)
-    database_cleaner (2.1.0)
+    database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
@@ -220,8 +218,8 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.1)
-    discard (1.4.0)
-      activerecord (>= 4.2, < 9.0)
+    discard (1.3.0)
+      activerecord (>= 4.2, < 8)
     docile (1.1.5)
     dotenv (3.1.4)
     dotenv-rails (3.1.4)
@@ -246,19 +244,19 @@ GEM
     erubis (2.7.0)
     excon (0.110.0)
     execjs (2.9.1)
-    factory_bot (6.5.0)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
-      factory_bot (~> 6.5)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.5.1)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.1)
-      faraday-net_http (>= 2.0, < 3.5)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
       json
       logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.3.0)
+      net-http
     ffi (1.16.3)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
@@ -292,7 +290,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.59.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -331,16 +329,16 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.14.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.8.2)
-    json-schema (5.1.0)
-      addressable (~> 2.8)
+    json (2.7.2)
+    json-schema (4.3.1)
+      addressable (>= 2.8)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -362,7 +360,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.1)
-    loofah (2.23.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -381,22 +379,22 @@ GEM
       railties (>= 3.2)
     matrix (0.4.2)
     memcachier (0.0.2)
-    method_source (1.1.0)
+    method_source (1.0.0)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
-    minitest (5.25.2)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     moneta (1.0.0)
-    msgpack (1.7.5)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    net-http (0.5.0)
+    net-http (0.4.1)
       uri
-    net-imap (0.4.17)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -405,14 +403,14 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.4)
+    nio4r (2.7.3)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.7)
+    oj (3.16.6)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -428,30 +426,30 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    ostruct (0.6.1)
+    ostruct (0.6.0)
     parallel (1.26.3)
-    parser (3.3.5.1)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.5.9)
+    pg (1.5.8)
     platform-api (3.7.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
     popper_js (2.11.8)
-    pry (0.15.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.0)
+    psych (5.1.2)
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.4.3)
       nio4r (~> 2.0)
     query_diet (0.7.2)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.9)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -461,23 +459,23 @@ GEM
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.1)
+    rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.2.1.1)
-      actioncable (= 7.2.1.1)
-      actionmailbox (= 7.2.1.1)
-      actionmailer (= 7.2.1.1)
-      actionpack (= 7.2.1.1)
-      actiontext (= 7.2.1.1)
-      actionview (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activemodel (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    rails (7.2.1)
+      actioncable (= 7.2.1)
+      actionmailbox (= 7.2.1)
+      actionmailer (= 7.2.1)
+      actionpack (= 7.2.1)
+      actiontext (= 7.2.1)
+      actionview (= 7.2.1)
+      activejob (= 7.2.1)
+      activemodel (= 7.2.1)
+      activerecord (= 7.2.1)
+      activestorage (= 7.2.1)
+      activesupport (= 7.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.1.1)
+      railties (= 7.2.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -497,9 +495,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    railties (7.2.1)
+      actionpack (= 7.2.1)
+      activesupport (= 7.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -512,36 +510,36 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.8.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
     recaptcha (5.17.0)
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.11)
+    reline (0.5.10)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
+    rexml (3.3.7)
     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.2.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.0)
+    rspec-rails (7.0.1)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -553,18 +551,18 @@ GEM
     rspectre (0.1.0)
       parser (>= 3.2.2.1)
       rspec (~> 3.9)
-    rswag-api (2.15.0)
+    rswag-api (2.14.0)
       activesupport (>= 5.2, < 8.0)
       railties (>= 5.2, < 8.0)
-    rswag-specs (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      json-schema (>= 2.2, < 6.0)
-      railties (>= 5.2, < 8.1)
+    rswag-specs (2.14.0)
+      activesupport (>= 5.2, < 8.0)
+      json-schema (>= 2.2, < 5.0)
+      railties (>= 5.2, < 8.0)
       rspec-core (>= 2.14)
-    rswag-ui (2.16.0)
-      actionpack (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rubocop (1.68.0)
+    rswag-ui (2.14.0)
+      actionpack (>= 5.2, < 8.0)
+      railties (>= 5.2, < 8.0)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -574,20 +572,20 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.33.0)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rails (2.27.0)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.2.0)
+    rubocop-rspec (3.0.5)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -615,14 +613,15 @@ GEM
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
-    securerandom (0.3.2)
-    selenium-webdriver (4.27.0)
+    securerandom (0.3.1)
+    selenium-webdriver (4.25.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.3.6)
+    sidekiq (7.3.2)
+      concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
@@ -641,18 +640,18 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.2)
+    stringio (3.1.1)
     sysexits (1.2.0)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.4)
+    terser (1.2.3)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     thread_safe (0.3.6)
     tilt (2.4.0)
     timecop (0.9.10)
-    timeout (0.4.2)
+    timeout (0.4.1)
     trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -661,7 +660,7 @@ GEM
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.16.0)
-    uri (1.0.2)
+    uri (0.13.1)
     useragent (0.16.10)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
@@ -678,7 +677,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.9.0)
+    webrick (1.8.2)
     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -690,7 +689,7 @@ GEM
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby

app/assets/stylesheets/_plantings.scss

@@ -47,13 +47,4 @@
       margin-left: auto;
     }
   }
-
-  .card-footer {
-    max-height: 2em;
-    -webkit-line-clamp: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-bottom: 0.5em;
-    padding-top: 0;
-  }
 }

app/controllers/activities_controller.rb

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

app/controllers/garden_collaborators_controller.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-class GardenCollaboratorsController < ApplicationController
-  before_action :authenticate_member!, except: %i(index show)
-  before_action :load_garden
-  load_and_authorize_resource id_param: :slug
-
-  respond_to :html
-  responders :flash
-
-  def index
-    @garden_collaborators = @garden.garden_collaborators.paginate(page: params[:page])
-    respond_with(@garden_collaborators)
-  end
-
-  def show
-    @garden_collaborator = GardenCollaborator.find(params[:garden_collaborator_id])
-
-    respond_with(@garden_collaborator)
-  end
-
-  def new
-    @garden_collaborator = GardenCollaborator.new(garden: @garden)
-
-    authorize! :create, @garden_collaborator
-
-    respond_with(@garden_collaborator)
-  end
-
-  def edit
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-
-    authorize! :update, @garden_collaborator
-
-    respond_with(@garden_collaborator)
-  end
-
-  def create
-    @garden_collaborator = GardenCollaborator.new(garden: @garden)
-    authorize! :create, @garden_collaborator
-
-    @member = Member.find_by(slug: params[:garden_collaborator][:member_slug])
-
-    @garden_collaborator.member = @member
-    if @garden_collaborator.save
-      redirect_to garden_garden_collaborators_path(@garden)
-    else
-      respond_with(@garden_collaborator)
-    end
-  end
-
-  def update
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-    authorize! :update, @garden_collaborator
-
-    @member = Member.find_by(slug: params[:garden_collaborator][:member_slug])
-
-    @garden_collaborator.member = @member
-    @garden_collaborator.save
-
-    respond_with(@garden_collaborator)
-  end
-
-  def destroy
-    @garden_collaborator = GardenCollaborator.find(params[:id])
-
-    authorize! :destroy, @garden_collaborator
-
-    if @garden_collaborator.destroy
-      redirect_to garden_garden_collaborators_path(@garden)
-    else
-      respond_with(@garden_collaborator)
-    end
-  end
-
-  private
-
-  def load_garden
-    @garden = Garden.find_by(slug: params[:garden_slug])
-  end
-
-  def garden_collaborator_params
-    params.require(:garden_collaborator).permit(
-      :member_slug
-    )
-  end
-end

app/controllers/gardens_controller.rb

@@ -8,10 +8,7 @@ class GardensController < DataController
 
     @gardens = @gardens.includes(:owner)
     @gardens = @gardens.active unless @show_all
-    if @owner.present?
-      @gardens = @gardens.left_joins(:garden_collaborators)
-      @gardens = @gardens.where(owner: @owner).or(@gardens.where(garden_collaborators: { member: @owner }))
-    end
+    @gardens = @gardens.where(owner: @owner) if @owner.present?
     @gardens = @gardens.where.not(members: { confirmed_at: nil })
       .order(:name).paginate(page: params[:page])
     respond_with(@gardens)

app/helpers/application_helper.rb

@@ -28,6 +28,12 @@ module ApplicationHelper
     "#{klass.name.downcase.pluralize}/#{identifier}-#{count}-#{max_updated_at}"
   end
 
+  def required_field_help_text
+    asterisk = tag.span('*', class: ['red'])
+    text = tag.em('denotes a required field')
+    tag.div(asterisk + ' '.html_safe + text, class: ['margin-bottom'])
+  end
+
   # A helper to replace the complex template compilation mess
   # of HAML, Tilt, and dynamic compilation with interpolated ruby.
   def markdownify(text)

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]}"
         type="text" value="#{default}" data-source-url="#{source_path}",
         placeholder="e.g. lettuce">
       <noscript class="text-warning">

app/models/ability.rb

@@ -108,38 +108,16 @@ class Ability
     can :create,  Planting
     can :update,  Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
     can :destroy, Planting, garden: { owner_id: member.id }, crop: { approval_status: 'approved' }
-    can :update, 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
-
-    can :create,  GardenCollaborator, garden: { owner_id: member.id }
-    can :update,  GardenCollaborator, garden: { owner_id: member.id }
-    can :destroy, GardenCollaborator, garden: { owner_id: member.id }
 
     can :create,  Activity
     can :update,  Activity, owner_id: member.id
     can :destroy, Activity, owner_id: member.id
-    can :update, Activity do |activity|
-      activity.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
-    can :destroy, Activity do |activity|
-      activity.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
 
     can :create,  Harvest
     can :update,  Harvest, owner_id: member.id
     can :destroy, Harvest, owner_id: member.id
     can :update,  Harvest, owner_id: member.id, planting: { owner_id: member.id }
     can :destroy, Harvest, owner_id: member.id, planting: { owner_id: member.id }
-    can :update, Harvest do |harvest|
-      harvest.planting&.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
-    can :destroy, Harvest do |harvest|
-      harvest.planting&.garden&.garden_collaborators&.where(member_id: member.id)&.any?
-    end
 
     can :create, Photo
     can :update, Photo, owner_id: member.id

app/models/concerns/search_plantings.rb

@@ -30,7 +30,6 @@ module SearchPlantings
         quantity:,
         sunniness:,
         garden_id:,
-        garden_slug:                garden&.garden_slug,
         garden_name:                garden&.name,
         description:,
 

app/models/garden.rb

@@ -10,7 +10,6 @@ class Garden < ApplicationRecord
   has_many :plantings, dependent: :destroy
   has_many :crops, through: :plantings
   has_many :activities, dependent: :destroy
-  has_many :garden_collaborators, dependent: :destroy
 
   belongs_to :garden_type, optional: true
 

app/models/garden_collaborator.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class GardenCollaborator < ApplicationRecord
-  belongs_to :member
-  belongs_to :garden
-
-  validates :member_id, uniqueness: { scope: :garden }
-  validate :not_garden_owner
-
-  def not_garden_owner
-    return unless member
-    return unless garden
-
-    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
-  end
-
-  def member_slug
-    @member&.slug
-  end
-
-  def member_slug=(_slug)
-    member_slug
-  end
-end

app/models/harvest.rb

@@ -153,10 +153,7 @@ class Harvest < ApplicationRecord
   def owner_must_match_planting
     return if planting.blank? # only check if we are linked to a planting
 
-    return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
-
-    errors.add(:owner,
-               "of harvest must be the same as planting, or a collaborator on that garden")
+    errors.add(:owner, "of harvest must be the same as planting") unless owner == planting.owner
   end
 
   def harvest_must_be_after_planting

app/models/planting.rb

@@ -61,7 +61,6 @@ class Planting < ApplicationRecord
            to: :crop, prefix: true
   delegate :login_name, :slug, :location, to: :owner, prefix: true
   delegate :slug, to: :planting, prefix: true
-  delegate :slug, :name, to: :garden, prefix: true
 
   delegate :annual?, :perennial?, :svg_icon, to: :crop
   delegate :location, :longitude, :latitude, to: :garden
@@ -128,9 +127,6 @@ class Planting < ApplicationRecord
   end
 
   def owner_must_match_garden_owner
-    return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
-
-    errors.add(:owner,
-               "must be the same as garden, or a collaborator on that garden")
+    errors.add(:owner, "must be the same as garden") unless owner == garden.owner
   end
 end

app/views/activities/_form.html.haml

@@ -6,6 +6,7 @@
         %strong=yield :title
   = bootstrap_form_for(@activity) do |f|
     .card-body
+      = required_field_help_text
       - if @activity.errors.any?
         #error_explanation
           %h2
@@ -39,9 +40,9 @@
           = link_to "Add a planting.", new_planting_path
 
         .col-md-4
-          = f.date_field :due_date,
+          = f.text_field :due_date,
                      value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
-                     label: 'When?'
+                     class: 'add-datepicker', label: 'When?'
 
       %hr
 

app/views/garden_collaborators/_form.html.haml

@@ -1,18 +0,0 @@
-.card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
-  = bootstrap_form_for(@garden_collaborator.new_record? ? [@garden, @garden_collaborator] : garden_garden_collaborator_path(@garden, @garden_collaborator)) do |f|
-    .card-body
-      - if @garden_collaborator.errors.any?
-        #error_explanation.alert.alert-warning{:role => "alert"}
-          %h4.alert-heading
-            = pluralize(@garden_collaborator.errors.size, "error")
-            prohibited this garden collaborator from being saved
-          %ul
-            - @garden_collaborator.errors.full_messages.each do |msg|
-              %li= msg
-
-      .alert.alert-info
-        Ask your friend, family member or community garden member for their growstuff username to add them as a collaborator on your garden.
-      = f.text_field :member_slug, maxlength: 255, required: true
-      .row
-    .card-footer
-      .text-right= f.submit 'Save Collaboator'

app/views/garden_collaborators/edit.html.haml

@@ -1,3 +0,0 @@
-- content_for :title, "Edit garden collaborator"
-
-= render 'form'

app/views/garden_collaborators/index.html.haml

@@ -1,72 +0,0 @@
-- content_for :title, "#{@garden} collaborators"
-
-%h1=  "#{@garden} collaborators"
-
-- content_for :breadcrumbs do
-  %li.breadcrumb-item= link_to 'Gardens', gardens_path
-  %li.breadcrumb-item.active= link_to @garden, gardens_path(@garden)
-
-.row
-  .col-md-2
-    - if current_member.present?
-      .flex-column.nav-pills.layout-nav{"role" => "tablist", "aria-orientation"=>"vertical"}
-        - if can?(:create, GardenCollaborator.new(garden: @garden))
-          = link_to url_for([@garden, GardenCollaborator.new(garden: @garden), action: :new]), class: 'btn' do
-            Add a #{GardenCollaborator.new(garden: @garden).model_name.human}
-    - else
-      = render 'shared/signin_signup', to: "record your #{model.to_s.pluralize.downcase}"
-
-    %hr/
-    %p.text-center
-      #{ENV['GROWSTUFF_SITE_NAME']} helps you track what you're
-      harvesting from your home garden and see how productive it is.
-
-
-  .col-md-10
-    - if @garden_collaborators.empty?
-      %p There are no collaborators to display.
-      - if can?(:create, GardenCollaborator) && @owner == current_member
-        = link_to 'Add a garden collaborator', new_garden_garden_collaborator_path, class: 'btn btn-primary'
-
-    - else
-      %section
-        %h2= page_entries_info @garden_collaborators
-        = will_paginate @garden_collaborators
-
-        - @garden_collaborators.each do |garden_collaborator|
-          - member = garden_collaborator.member
-          - cache member do
-            .card
-              .card-body
-                - if can?(:destroy, garden_collaborator)
-                  %div{"style": "float: right"}
-                    = link_to garden_garden_collaborator_path(@garden, garden_collaborator), method: :delete, class: "btn btn-danger" do
-                      Remove access
-
-                %h4.login-name= link_to member, member
-                %div
-                  = render "members/avatar", member: member
-                %div
-                  = link_to "view all #{member}'s gardens", member_gardens_path(member)
-                  %p
-                    %small
-                      Joined
-                      = distance_of_time_in_words(member.created_at, Time.zone.now)
-                      ago.
-                  - if member.location.present?
-                    = link_to member.location, place_path(member.location)
-              .card-footer
-                %ul.nav.nav-justified.small
-                  %li.nav-item.border-right
-                    = link_to member_plantings_path(member) do
-                      = localize_plural(member.plantings.active, Planting)
-                  %li.nav-item.border-right
-                    = link_to member_harvests_path(member) do
-                      = localize_plural(member.harvests, Harvest)
-                  %li.nav-item
-                    = link_to member_seeds_path(member) do
-                      = localize_plural(member.seeds.active, Seed)
-
-      .row
-        .col-12= page_entries_info @garden_collaborators
-        .col-12= will_paginate @garden_collaborators

app/views/garden_collaborators/new.html.haml

@@ -1,3 +0,0 @@
-- content_for :title, "New garden collaborator"
-
-= render 'form'

app/views/gardens/_form.html.haml

@@ -5,6 +5,7 @@
         %h1.h2-responsive.text-center
           %strong=yield :title
     .card-body
+      = required_field_help_text
       - if @garden.errors.any?
         #error_explanation.alert.alert-warning{:role => "alert"}
           %h4.alert-heading
@@ -15,7 +16,7 @@
               %li= msg
 
       = f.text_field :name, maxlength: 255, required: true
-      = f.text_area :description, rows: 6, placeholder: "Tell us about this garden - where is it located? What does it look like? Do you have a link to a photo? Do you have irrigation? What are your plans?"
+      = f.text_area :description, rows: 6
       = f.text_field :location,
                       value: @garden.location || current_member.location,
                       class: 'form-control', maxlength: 255
@@ -26,7 +27,7 @@
         - else
           = link_to "Change your location.", edit_member_registration_path
       .row
-        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any", min: 0
+        .col-md-5.col-12= f.number_field :area, class: 'input-small', step: "any"
         .col-md-7.col-12= f.select(:area_unit, Garden::AREA_UNITS_VALUES, { include_blank: false })
         .col-12= f.select(:garden_type_id, GardenType.all.order(:name).pluck(:name, :id),
                           selected: @garden.garden_type_id, include_blank: true)

app/views/gardens/show.html.haml

@@ -31,7 +31,7 @@
       %p
         :markdown
           #{strip_tags markdownify(@garden.description)}
-        - unless @garden.description.present?
+        - unless @garden.description
           .row-fluid
             %p No description available yet.
 
@@ -39,13 +39,8 @@
               %p
                 Why not
                 = link_to 'tell us more.', edit_garden_path(@garden)
-        - else
-          - if can? :edit, @garden
-            %p
-              Did you want to
-              = link_to 'update this description.', edit_garden_path(@garden)
 
-    - if @garden.plantings.active.any?
+    - if @garden.plantings.where.not(planted_at: nil).any?
       %section.card
         %h2 Garden progress
         .card-body
@@ -60,14 +55,6 @@
         - else
           .col-md-12
             %p Nothing is currently planted here.
-        - if can?(:edit, @garden)
-          .col-md-12
-            = garden_plant_something_button(@garden)
-  
-      - if can?(:destroy, @garden)
-        .dropdown-divider
-        = delete_button(@garden, classes: 'dropdown-item text-danger',
-          message: 'All plantings associated with this garden will also be deleted. Are you sure?')
 
     %section
       %h2 Current activities in garden
@@ -78,9 +65,6 @@
         - else
           .col-md-12
             %p Nothing is currently planned here.
-        - if can?(:edit, @garden)
-          .col-md-12
-            = garden_plan_something_button(@garden)
 
     - if @suggested_companions.any?
       %section.companions
@@ -99,17 +83,6 @@
         %p
           %strong Owner:
           = link_to @garden.owner, @garden.owner
-        %p
-          %strong Collaborators:
-          - if can?(:create, GardenCollaborator.new(garden: @garden))
-            = link_to "Manage", garden_garden_collaborators_path(@garden)
-          - if @garden.garden_collaborators.any?
-            %ul
-              - @garden.garden_collaborators.each do |collabator|
-                %li= link_to collabator.member, collabator.member
-          - else
-            None
-
         - if @garden.location.present?
           %p
             %strong Location:

app/views/harvests/_form.html.haml

@@ -7,6 +7,7 @@
           = harvest_icon
           %strong=yield :title
     .card-body
+      = required_field_help_text
       - if @harvest.errors.any?
         #error_explanation
           %h2 #{pluralize(@harvest.errors.size, "error")} prohibited this harvest from being saved:"
@@ -30,7 +31,8 @@
                 = link_to "Request new crops.", new_crop_path
 
         .col-md-4
-          = f.date_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '', label: 'When?'
+          = f.text_field :harvested_at, value: @harvest.harvested_at ? @harvest.harvested_at.to_fs(:ymd) : '',
+                         class: 'add-datepicker', label: 'When?'
         .col-12
           = f.form_group :plant_part_id, label: { text: "Harvested Plant Part" } do
             .row
@@ -42,7 +44,7 @@
       -# http://blog.isotoma.com/2012/03/html5-input-typenumber-and-decimalsfloats-in-chrome/
       .row
         .col-md-4
-          = f.number_field :quantity, class: 'input-small form-control', step: 'any', label: 'How many?', min: 1
+          = f.number_field :quantity, class: 'input-small form-control', step: 'any', label: 'How many?'
         .col-md-8
           = f.select(:unit, Harvest::UNITS_VALUES, { include_blank: false }, class: 'input-medium form-control')
       .row

app/views/plantings/_card.html.haml

@@ -31,10 +31,7 @@
         .text-center= render 'plantings/badges', planting: planting
         = render 'plantings/progress', planting: planting
     .card-footer
-      %small
-        Planted by
-        = link_to member_path(slug: planting.owner_slug), class: "owner-link" do
-          = planting.owner_login_name
-        in
-        = link_to garden_path(slug: planting.garden_slug), class: "garden-link" do
-          = planting.garden_name
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: planting.owner_slug) do
+            = planting.owner_login_name

app/views/plantings/_form.html.haml

@@ -6,6 +6,7 @@
         %strong=yield :title
   = bootstrap_form_for(@planting) do |f|
     .card-body
+      = required_field_help_text
       - if @planting.errors.any?
         #error_explanation
           %h2
@@ -44,7 +45,7 @@
         .col-md-4
           = f.select(:sunniness, Planting::SUNNINESS_VALUES, { include_blank: '', label: 'Sun or shade?' } )
         .col-md-4
-          = f.number_field :quantity, label: 'How many?', min: 1
+          = f.number_field :quantity, label: 'How many?'
       = f.text_area :description, rows: 6, label: 'Tell us more about it'
 
       .row

app/views/seeds/_form.html.haml

@@ -14,6 +14,7 @@
           %ul
             - @seed.errors.full_messages.each do |msg|
               %li= msg
+      = required_field_help_text
 
       .form-group.required
         = f.label :crop, 'Crop'
@@ -22,7 +23,7 @@
           = f.hidden_field :parent_planting_id, value: @planting.id
         - else
 
-          = auto_suggest @seed, :crop, class: 'form-control', default: @crop, required: true
+          = auto_suggest @seed, :crop, class: 'form-control', default: @crop
           %span.help-inline
             Can't find what you're looking for?
             = link_to "Request new crops.", new_crop_path
@@ -31,7 +32,7 @@
           = f.text_field :saved_at,
                      value: @seed.saved_at ? @seed.saved_at.to_fs(:ymd) : '',
                      class: 'add-datepicker', label: 'When were the seeds harvested/saved?'
-        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity', min: 1
+        .col-12.col-md-4= f.number_field :quantity, label: 'Quantity'
         .col-12.col-md-4
           = f.text_field :plant_before, class: 'add-datepicker',
           value: @seed.plant_before ? @seed.plant_before.to_fs(:ymd) : ''
@@ -45,21 +46,21 @@
           %span.help-inline= t('.finish_helper')
 
       .row
-        .col-md-6= f.number_field :days_until_maturity_min, label_as_placeholder: true, label: 'min', prepend: 'Days until maturity', min: 1
-        .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days", min: 1
+        .col-md-6= f.number_field :days_until_maturity_min, label_as_placeholder: true, label: 'min', prepend: 'Days until maturity'
+        .col-md-6= f.number_field :days_until_maturity_max, label_as_placeholder: true, label: 'max', prepend: 'to', append: "days"
 
       .row
         .col-md-4
-          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:organic, Seed::ORGANIC_VALUES, {label: 'Organic?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
         .col-md-4
-          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:gmo, Seed::GMO_VALUES, {label: 'GMO?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
         .col-md-4
-          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}, required: true}, default: 'unknown')
+          = f.select(:heirloom, Seed::HEIRLOOM_VALUES, {label: 'Heirloom?', wrapper: { class: 'required'}}, default: 'unknown', required: true)
       = 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'}})
       %span.help_inline
         - if current_member.location.blank?
           Don't forget to

app/views/shared/editable/_date.html.haml

@@ -5,6 +5,7 @@
       = edit_icon
   .hide{id: "date--#{model.id}-#{field.to_s}"}
     = bootstrap_form_for(model) do |f|
-      = f.date_field field,
-               value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
+      = f.text_field field,
+               value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
+               class: 'add-datepicker', label: 'When?'
       = f.submit :save

app/views/shared/editable/_form.html.haml

@@ -12,6 +12,7 @@
       - elsif field_type == :select
         = f.select field, collection
       - elsif field_type == :date
-        = f.date_field field,
-                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '', label: 'When?'
+        = f.text_field field,
+                 value: model.send(field) ? model.send(field).to_fs(:ymd) : '',
+                 class: 'add-datepicker', label: 'When?'
       = f.submit :save

config/routes.rb

@@ -30,8 +30,6 @@ Rails.application.routes.draw do
 
   resources :gardens, concerns: :has_photos, param: :slug do
     get 'timeline' => 'charts/gardens#timeline', constraints: { format: 'json' }
-
-    resources :garden_collaborators
   end
 
   resources :plantings, concerns: :has_photos, param: :slug do

db/migrate/20240929041435_create_garden_collaborators.rb

@@ -1,10 +0,0 @@
-class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
-  def change
-    create_table :garden_collaborators do |t|
-      t.references :member
-      t.references :garden
-      t.timestamps
-      t.index [:member_id, :garden_id], unique: true
-    end
-  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: 2024_09_29_041435) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -54,6 +54,13 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "slug"
+    t.integer "cached_votes_total", default: 0
+    t.integer "cached_votes_score", default: 0
+    t.integer "cached_votes_up", default: 0
+    t.integer "cached_votes_down", default: 0
+    t.integer "cached_weighted_score", default: 0
+    t.integer "cached_weighted_total", default: 0
+    t.float "cached_weighted_average", default: 0.0
     t.integer "likes_count", default: 0
     t.index ["garden_id"], name: "index_activities_on_garden_id"
     t.index ["owner_id"], name: "index_activities_on_owner_id"
@@ -207,6 +214,13 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.text "body", null: false
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
+    t.integer "cached_votes_total", default: 0
+    t.integer "cached_votes_score", default: 0
+    t.integer "cached_votes_up", default: 0
+    t.integer "cached_votes_down", default: 0
+    t.integer "cached_weighted_score", default: 0
+    t.integer "cached_weighted_total", default: 0
+    t.float "cached_weighted_average", default: 0.0
   end
 
   create_table "crop_companions", force: :cascade do |t|
@@ -266,16 +280,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.index ["slug"], name: "index_forums_on_slug", unique: true
   end
 
-  create_table "garden_collaborators", force: :cascade do |t|
-    t.bigint "member_id"
-    t.bigint "garden_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["garden_id"], name: "index_garden_collaborators_on_garden_id"
-    t.index ["member_id", "garden_id"], name: "index_garden_collaborators_on_member_id_and_garden_id", unique: true
-    t.index ["member_id"], name: "index_garden_collaborators_on_member_id"
-  end
-
   create_table "garden_types", force: :cascade do |t|
     t.text "name", null: false
     t.text "slug", null: false
@@ -500,6 +504,13 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.datetime "date_taken", precision: nil
     t.integer "likes_count", default: 0
     t.string "source"
+    t.integer "cached_votes_total", default: 0
+    t.integer "cached_votes_score", default: 0
+    t.integer "cached_votes_up", default: 0
+    t.integer "cached_votes_down", default: 0
+    t.integer "cached_weighted_score", default: 0
+    t.integer "cached_weighted_total", default: 0
+    t.float "cached_weighted_average", default: 0.0
     t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
     t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
   end
@@ -542,6 +553,13 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.integer "days_to_last_harvest"
     t.integer "parent_seed_id"
     t.integer "harvests_count", default: 0
+    t.integer "cached_votes_total", default: 0
+    t.integer "cached_votes_score", default: 0
+    t.integer "cached_votes_up", default: 0
+    t.integer "cached_votes_down", default: 0
+    t.integer "cached_weighted_score", default: 0
+    t.integer "cached_weighted_total", default: 0
+    t.float "cached_weighted_average", default: 0.0
     t.integer "likes_count", default: 0
     t.index ["slug"], name: "index_plantings_on_slug", unique: true
   end
@@ -556,6 +574,13 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.integer "forum_id"
     t.integer "likes_count", default: 0
     t.integer "comments_count", default: 0
+    t.integer "cached_votes_total", default: 0
+    t.integer "cached_votes_score", default: 0
+    t.integer "cached_votes_up", default: 0
+    t.integer "cached_votes_down", default: 0
+    t.integer "cached_weighted_score", default: 0
+    t.integer "cached_weighted_total", default: 0
+    t.float "cached_weighted_average", default: 0.0
     t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id"
     t.index ["slug"], name: "index_posts_on_slug", unique: true
   end
@@ -603,6 +628,22 @@ ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
     t.index ["slug"], name: "index_seeds_on_slug", unique: true
   end
 
+  create_table "votes", force: :cascade do |t|
+    t.string "votable_type"
+    t.bigint "votable_id"
+    t.string "voter_type"
+    t.bigint "voter_id"
+    t.boolean "vote_flag"
+    t.string "vote_scope"
+    t.integer "vote_weight"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["votable_id", "votable_type", "vote_scope"], name: "index_votes_on_votable_id_and_votable_type_and_vote_scope"
+    t.index ["votable_type", "votable_id"], name: "index_votes_on_votable"
+    t.index ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope"
+    t.index ["voter_type", "voter_id"], name: "index_votes_on_voter"
+  end
+
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "harvests", "plantings"

package.json

@@ -27,5 +27,6 @@
   "bugs": {
     "url": "https://github.com/growstuff/growstuff/issues"
   },
-  "homepage": "https://github.com/growstuff/growstuff#readme"
+  "homepage": "https://github.com/growstuff/growstuff#readme",
+  "packageManager": "yarn@4.5.0"
 }

spec/factories/garden_collaborators.rb

@@ -1,6 +0,0 @@
-FactoryBot.define do
-  factory :garden_collaborator do
-    garden
-    member
-  end
-end

spec/features/gardens/adding_gardens_spec.rb

@@ -10,6 +10,10 @@ describe "Gardens", :js do
 
     include_examples 'is accessible'
 
+    it "has the required fields help text" do
+      expect(page).to have_content "* denotes a required field"
+    end
+
     it "displays required and optional fields properly" do
       expect(page).to have_selector ".required", text: "Name"
       expect(page).to have_selector 'textarea#garden_description'
@@ -23,5 +27,14 @@ describe "Gardens", :js do
       expect(page).to have_content "Garden was successfully created"
       expect(page).to have_content "New garden"
     end
+
+    it "Refuse to create new garden with negative area" do
+      visit new_garden_path
+      fill_in "Name", with: "Negative Garden"
+      fill_in "Area", with: -5
+      click_button "Save"
+      expect(page).to have_no_content "Garden was successfully created"
+      expect(page).to have_content "Area must be greater than or equal to 0"
+    end
   end
 end

spec/features/gardens/gardens_spec.rb

@@ -52,6 +52,15 @@ describe "Planting a crop", :js do
       expect(page).to have_content "New garden"
     end
 
+    it "Refuse to create new garden with negative area" do
+      visit new_garden_path
+      fill_in "Name", with: "Negative Garden"
+      fill_in "Area", with: -5
+      click_button "Save"
+      expect(page).to have_no_content "Garden was successfully created"
+      expect(page).to have_content "Area must be greater than or equal to 0"
+    end
+
     context "Clicking edit from the index page" do
       before do
         visit gardens_path

spec/features/harvests/harvesting_a_crop_spec.rb

@@ -13,6 +13,10 @@ describe "Harvesting a crop", :js, :search do
 
     it_behaves_like "crop suggest", "harvest", "crop"
 
+    it "has the required fields help text" do
+      expect(page).to have_content "* denotes a required field"
+    end
+
     describe "displays required and optional fields properly" do
       it { expect(page).to have_selector ".required", text: "What did you harvest?" }
       it { expect(page).to have_selector 'input#harvest_quantity' }
@@ -26,7 +30,7 @@ describe "Harvesting a crop", :js, :search do
 
       within "form#new_harvest" do
         choose plant_part.name
-        fill_in "When?", with: Time.new(2014, 06, 15)
+        fill_in "When?", with: "2014-06-15"
         fill_in "How many?", with: 42
         fill_in "Weighing (in total)", with: 42
         fill_in "Notes", with: "It's killer."

spec/features/plantings/planting_a_crop_spec.rb

@@ -18,6 +18,10 @@ describe "Planting a crop", :js, :search do
 
     it_behaves_like "crop suggest", "planting"
 
+    it "has the required fields help text" do
+      expect(page).to have_content "* denotes a required field"
+    end
+
     describe "displays required and optional fields properly" do
       it { expect(page).to have_selector ".required", text: "What did you plant?" }
       it { expect(page).to have_selector ".required", text: "Where did you plant it?" }

spec/features/seeds/adding_seeds_spec.rb

@@ -12,6 +12,10 @@ describe "Seeds", :js, :search do
 
     it_behaves_like "crop suggest", "seed", "crop"
 
+    it "has the required fields help text" do
+      expect(page).to have_content "* denotes a required field"
+    end
+
     describe "displays required and optional fields properly" do
       # NOTE: The required behaviour is pushed down to the control itself, not the form-group as of rails 7.1.
       # Modern browsers enforce the required behaviour better than us doing it ourselves.

spec/helpers/application_helper_spec.rb

@@ -10,6 +10,13 @@ describe ApplicationHelper do
     parse_date('may 12th 2012').should eq Date.new(2012, 5, 12)
   end
 
+  it "shows required field marker help text with proper formatting" do
+    output = required_field_help_text
+    expect(output).to have_selector '.margin-bottom'
+    expect(output).to have_selector '.red', text: '*'
+    expect(output).to have_selector 'em', text: 'denotes a required field'
+  end
+
   describe '#avatar_uri' do
     context 'with a normal user' do
       before do

spec/rails_helper.rb

@@ -7,6 +7,9 @@ require 'simplecov'
 # output coverage locally AND send it to coveralls
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::HTMLFormatter])
 
+# fail if there's a significant test coverage drop
+SimpleCov.maximum_coverage_drop 1
+
 require 'spec_helper'
 require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'