Merge branch 'mainline' into dev

Update garden.rb

CONTRIBUTORS.md

@@ -93,6 +93,8 @@ submit the change with your pull request.
 - Martina Simicic / [simicic](https://github.com/simicic)
 - Rowan Crawford / [wombleton](https://github.com/wombleton)
 - Ítalo Pires / [italopires](https://github.com/italopires)
+- Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
+- Dominick Thornton / [domthor](https://github.com/domthor)
 
 ## Bots
 

Gemfile

@@ -24,7 +24,7 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 # CSS framework
-gem "bootstrap", ">= 4.6.2"
+gem "bootstrap", ">= 5.0.0"
 gem 'material-sass', '4.1.1'
 
 # Icons used by bootstrap/material-sass

Gemfile.lock

@@ -33,35 +33,35 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3)
-      actionpack (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -69,15 +69,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3)
-      actionpack (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -92,22 +92,22 @@ GEM
     active_utils (3.4.1)
       activesupport (>= 4.2)
       i18n
-    activejob (7.1.3)
-      activesupport (= 7.1.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3)
-      actionpack (= 7.1.3)
-      activejob (= 7.1.3)
-      activerecord (= 7.1.3)
-      activesupport (= 7.1.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -120,16 +120,16 @@ GEM
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    autoprefixer-rails (10.4.7.0)
+    autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.8.1)
+    axe-core-api (4.9.1)
       dumb_delegator
       virtus
-    axe-core-capybara (4.8.1)
-      axe-core-api
+    axe-core-capybara (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
-    axe-core-rspec (4.8.1)
-      axe-core-api
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
       virtus
     axiom-types (0.1.1)
@@ -137,38 +137,30 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
       elasticsearch-rails (< 8)
-    bootstrap (4.6.2)
+    bootstrap (5.3.2)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.16.1, < 2)
-      sassc-rails (>= 2.0.0)
+      popper_js (>= 2.11.8, < 3)
     bootstrap-datepicker-rails (1.9.0.1)
       railties (>= 3.0)
-    bootstrap_form (4.5.0)
-      actionpack (>= 5.2)
-      activemodel (>= 5.2)
-    builder (3.2.4)
+    bootstrap_form (5.4.0)
+      actionpack (>= 6.1)
+      activemodel (>= 6.1)
+    builder (3.3.0)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    cancancan (3.5.0)
+    cancancan (3.6.1)
     capybara (3.40.0)
       addressable
       matrix
@@ -184,14 +176,15 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (3.0.5)
+    carrierwave (3.0.7)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.0.5)
+    chartkick (5.0.7)
+    childprocess (5.0.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.3)
@@ -206,13 +199,13 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
+    csv (3.3.0)
     csv_shaper (1.3.2)
       activesupport (>= 3.0.0)
-    dalli (3.2.7)
-      base64
+    dalli (3.2.8)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -222,22 +215,21 @@ GEM
     date (3.3.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     discard (1.3.0)
       activerecord (>= 4.2, < 8)
     docile (1.1.5)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
-    drb (2.2.0)
-      ruby2_keywords
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
+      railties (>= 6.1)
+    drb (2.2.1)
     dumb_delegator (1.0.0)
     elasticsearch (7.0.0)
       elasticsearch-api (= 7.0.0)
@@ -252,18 +244,18 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erubi (1.12.0)
+    erubi (1.13.0)
     erubis (2.7.0)
-    excon (0.109.0)
-    execjs (2.8.1)
+    excon (0.110.0)
+    execjs (2.9.1)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.2.3)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
+    faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
@@ -274,7 +266,9 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
@@ -298,7 +292,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.55.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -311,16 +305,15 @@ GEM
       moneta
       multi_json (>= 1.9.2)
       webrick
-    highline (2.1.0)
+    highline (3.0.1)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -336,14 +329,14 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    irb (1.11.1)
-      rdoc
+    irb (1.13.2)
+      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.7.1)
+    json (2.7.2)
     json-schema (4.1.1)
       addressable (>= 2.8)
     jsonapi-resources (0.10.7)
@@ -355,16 +348,18 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (3.0.0)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
     leaflet-rails (1.9.4)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
-    letter_opener (1.8.1)
-      launchy (>= 2.2, < 3)
-    listen (3.8.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -376,7 +371,7 @@ GEM
     mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
-    marcel (1.0.2)
+    marcel (1.0.4)
     material-sass (4.1.1)
       autoprefixer-rails (>= 6.0.3)
       sass (>= 3.5.2)
@@ -390,8 +385,8 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
     moneta (1.0.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -399,23 +394,23 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.9.1)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nio4r (2.7.3)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.0-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
@@ -430,30 +425,30 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.5.4)
-    platform-api (3.6.0)
+    pg (1.5.6)
+    platform-api (3.7.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
-    popper_js (1.16.1)
+    popper_js (2.11.8)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     query_diet (0.7.1)
-    racc (1.7.3)
-    rack (2.2.8)
-    rack-cors (2.0.1)
+    racc (1.8.0)
+    rack (2.2.9)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
@@ -465,20 +460,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3)
-      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.3)
-      actionpack (= 7.1.3)
-      actiontext (= 7.1.3)
-      actionview (= 7.1.3)
-      activejob (= 7.1.3)
-      activemodel (= 7.1.3)
-      activerecord (= 7.1.3)
-      activestorage (= 7.1.3)
-      activesupport (= 7.1.3)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -490,7 +485,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_12factor (0.0.3)
@@ -498,9 +493,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -508,49 +503,50 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.0)
-    rake (13.1.0)
+    rake (13.2.1)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.6.2)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    recaptcha (5.16.0)
-    redis-client (0.19.1)
+    recaptcha (5.17.0)
+    redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.9.0)
-    reline (0.4.2)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.3.1)
+      strscan
     rouge (4.1.2)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-activemodel-mocks (1.2.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-support (3.12.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.1)
     rspectre (0.1.0)
       parser (>= 3.2.2.1)
       rspec (~> 3.9)
@@ -565,7 +561,7 @@ GEM
     rswag-ui (2.13.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
-    rubocop (1.60.2)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -573,29 +569,22 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rails (2.23.1)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby-units (4.0.1)
-    ruby-vips (2.2.0)
+    ruby-units (4.0.3)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -610,28 +599,30 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.3.5)
+    scout_apm (5.3.8)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
-    selenium-webdriver (4.17.0)
+    selenium-webdriver (4.22.0)
       base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.2.1)
+    sidekiq (7.3.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
+      logger
       rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+      redis-client (>= 0.22.2)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    smart_properties (1.17.0)
-    sprockets (3.7.2)
+    sprockets (3.7.3)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -639,17 +630,18 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
     sysexits (1.2.0)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.0)
+    terser (1.2.3)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.0)
+    thor (1.3.1)
     thread_safe (0.3.6)
     tilt (2.3.0)
-    timecop (0.9.8)
+    timecop (0.9.10)
     timeout (0.4.1)
     trollop (1.16.2)
     tzinfo (2.0.6)
@@ -679,14 +671,14 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
     xmlrpc (0.3.3)
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
@@ -701,7 +693,7 @@ DEPENDENCIES
   better_errors
   bluecloth
   bonsai-elasticsearch-rails
-  bootstrap (>= 4.6.2)
+  bootstrap (>= 5.0.0)
   bootstrap-datepicker-rails
   bootstrap_form (>= 4.5.0)
   bullet

README.md

@@ -15,6 +15,11 @@ Growstuff was founded in 2012 and has been built by dozens of
 [contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and
 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.
+
 ## Important links
 
 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're

app/assets/images/icons/activity-add.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<!-- MIT Licenced, https://www.svgrepo.com/svg/336823/plan -->
+<svg width="800px" height="800px" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" fill="white" fill-opacity="0.01"/>
+<path d="M5 19H43V41C43 42.1046 42.1046 43 41 43H7C5.89543 43 5 42.1046 5 41V19Z" fill="#2F88FF" stroke="#000000" stroke-width="4" stroke-linejoin="round"/>
+<path d="M5 10C5 8.89543 5.89543 8 7 8H41C42.1046 8 43 8.89543 43 10V19H5V10Z" stroke="#000000" stroke-width="4" stroke-linejoin="round"/>
+<path d="M16 31L22 37L34 25" stroke="white" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 5V13" stroke="#000000" stroke-width="4" stroke-linecap="round"/>
+<path d="M32 5V13" stroke="#000000" stroke-width="4" stroke-linecap="round"/>
+</svg>

app/assets/javascripts/application.js

@@ -18,6 +18,17 @@
 // = require jquery-ui/widgets/autocomplete
 // = require bootstrap-sprockets
 // = require bootstrap-datepicker
-// = require bootstrap
 // = require material
 // = require_tree .
+
+document.addEventListener('DOMContentLoaded', function(event) {
+    var popoverTrigger = Array.prototype.slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
+    popoverTrigger.map(function(popoverTrigger2) {
+        return new bootstrap.Popover(popoverTrigger2);
+    });
+
+    var tooltipTrigger = Array.prototype.slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+    tooltipTrigger.map(function(tooltipTrigger2) {
+        return new bootstrap.Tooltip(tooltipTrigger2);
+    });
+  });

app/assets/javascripts/bootstrap.js.coffee

@@ -1,4 +0,0 @@
-jQuery ->
-  $("a[rel=popover]").popover()
-  $(".tooltip").tooltip()
-  $("a[rel=tooltip]").tooltip()

app/assets/javascripts/nav.js

@@ -1 +0,0 @@
-$('.dropdown-toggle').dropdown();

app/assets/javascripts/tab_navigation.js

@@ -0,0 +1,22 @@
+$(document).ready(function() {
+    var url = location.href.replace(/\/$/, '');
+
+    if (location.hash) {
+        var hash = url.split('#');
+        var triggerEl = document.querySelector('#myTab a[href="#' + hash[1] + '"]');
+        var tab = new bootstrap.Tab(triggerEl);
+        tab.show();
+        url = location.href.replace(/\/#/, '#');
+        history.replaceState(null, null, url);
+        setTimeout(function() {
+            $(window).scrollTop(0);
+        }, 20);
+    }
+
+    $('a[data-bs-toggle="tab"]').on('click', function() {
+        var newUrl;
+        var hash = $(this).attr('href');
+        newUrl = url.split('#')[0] + hash;
+        history.replaceState(null, null, newUrl);
+    });
+});

app/assets/javascripts/tooltips.js

@@ -1,3 +0,0 @@
-$(function() {
-  $('[data-toggle="tooltip"]').tooltip();
-});

app/assets/stylesheets/_members.scss

@@ -40,9 +40,22 @@
   height: 250px;
   width: 100%;
 }
+.card {
+  .badge-location {
+    background-color: darken($blue, 10%);
+    border-radius: 5%;
+    color: $white;
 
-.badge-location {
-  background-color: darken($blue, 10%);
-  border-radius: 5%;
-  color: $white;
-}
+    .fa-map-marker {
+      padding-right: 0.5em;
+    }
+  }
+
+  .badge {
+    text-overflow: ellipsis;
+    white-space: normal;
+    align-items: end;
+    max-height: 1rlh;
+    -webkit-line-clamp: 1;
+  }
+}

app/assets/stylesheets/_seeds.scss

@@ -1,6 +1,6 @@
 .seed-card {
   .text {
-    opacity: 0.8;
+    opacity: 0.95;
     margin: 0;
     padding: 0;
     position: absolute;

app/assets/stylesheets/overrides.scss

@@ -102,16 +102,14 @@ section {
     box-shadow: 1px 3px 3px 1px darken($beige, 20%);
     cursor: pointer;
     transition:
-      0.3s transform cubic-bezier(0.155, 1.105, 0.295, 1.12),
-      0.3s box-shadow,
-      0.3s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
+      0.1s transform cubic-bezier(0.155, 1.105, 0.295, 1.12),
+      0.1s box-shadow,
+      0.1s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
   }
 
   .card:hover {
     box-shadow:
-      0 10px 20px darken($beige, 30%),
-      0 4px 8px darken($beige, 40%);
-    transform: scale(1.1);
+      1px 3px 3px 1px darken($beige, 30%);
   }
 }
 
@@ -148,10 +146,6 @@ section {
       color: $brown;
     }
   }
-
-  .card:hover {
-    background-color: $beige;
-  }
 }
 
 .img-cover,

app/controllers/activities_controller.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+class ActivitiesController < DataController
+  def index
+    @show_all = params[:all] == '1'
+
+    where = {}
+    where['active'] = true unless @show_all
+
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
+      where['owner_id'] = @owner.id unless @owner.nil?
+    end
+
+    @activities = Activity.search(
+      where:,
+      page:     params[:page],
+      limit:    30,
+      boost_by: [:created_at],
+      load:     false
+    )
+    @filename = "Growstuff-#{specifics}Activities-#{Time.zone.now.to_fs(:number)}.csv"
+    respond_with(@activities)
+  end
+
+  def show
+    respond_with @activity
+  end
+
+  def new
+    @activity = Activity.new(
+      owner: current_member
+    )
+    if params[:garden_id]
+      @activity.garden = Garden.find_by(
+        owner: current_member,
+        id:    params[:garden_id]
+      )
+    end
+
+    if params[:planting_id]
+      @activity.planting = Planting.find_by(
+        owner: current_member,
+        id:    params[:planting_id]
+      )
+    end
+
+    respond_with @activity
+  end
+
+  def edit
+    # the following are needed to display the form but aren't used
+    @gardens = @activity.owner.gardens.active.order_by_name
+    @plantings = @activity.owner.plantings.active
+  end
+
+  def create
+    @activity = Activity.new(activity_params)
+    @activity.owner = current_member
+    @activity.save
+    respond_with @activity
+  end
+
+  def update
+    @activity.update(activity_params)
+    respond_with @activity
+  end
+
+  def destroy
+    @activity.destroy
+    respond_with @activity, location: @activity.garden
+  end
+
+  private
+
+  def activity_params
+    params.require(:activity).permit(
+      :name, :description, :category, :finished,
+      :garden_id, :planting_id, :due_date
+    )
+  end
+
+  def specifics
+    if @owner.present?
+      "#{@owner.to_param}-"
+    end
+  end
+end

app/controllers/application_controller.rb

@@ -2,6 +2,10 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  # Working from codespaces, we want to turn off validation
+  if Rails.env.development? && ENV['CODESPACE_NAME']
+    skip_before_action :verify_authenticity_token
+  end
 
   include ApplicationHelper
 

app/controllers/crops_controller.rb

@@ -10,7 +10,6 @@ class CropsController < ApplicationController
   responders :flash
 
   def index
-    @sort = params[:sort]
     @crops = Crop.search('*', boost_by: %i(plantings_count harvests_count),
                               limit:    100,
                               page:     params[:page],

app/controllers/gardens_controller.rb

@@ -16,6 +16,7 @@ class GardensController < DataController
 
   def show
     @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
+    @current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
     @finished_plantings = @garden.plantings.finished.includes(:crop)
     @suggested_companions = Crop.approved.where(
       id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)

app/controllers/plantings_controller.rb

@@ -36,6 +36,7 @@ class PlantingsController < DataController
   def show
     @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)
     @matching_seeds = matching_seeds
     @crop = @planting.crop
 

app/helpers/buttons_helper.rb

@@ -18,6 +18,30 @@ module ButtonsHelper
     end
   end
 
+  def garden_plan_something_button(garden, classes: "btn btn-default")
+    return unless can? :edit, garden
+
+    link_to new_activity_path(garden_id: garden.id), class: classes do
+      activity_icon + ' ' + t('buttons.new_activity')
+    end
+  end
+
+  def plan_something_button
+    return unless can? :create, Activity
+
+    link_to new_activity_path, class: "btn btn-default" do
+      activity_icon + ' ' + t('buttons.new_activity')
+    end
+  end
+
+  def planting_plan_something_button(planting, classes: "btn btn-default")
+    return unless can? :edit, planting
+
+    link_to new_activity_path(planting_id: planting.id), class: classes do
+      activity_icon + ' ' + t('buttons.new_activity')
+    end
+  end
+
   def garden_mark_active_button(garden, classes: 'btn')
     link_to t('buttons.mark_as_active'),
             garden_path(garden, garden: { active: 1 }),
@@ -59,6 +83,19 @@ module ButtonsHelper
     edit_button(edit_planting_path(planting), classes:)
   end
 
+  def activity_edit_button(activity, classes: "btn btn-raised btn-info")
+    edit_button(edit_activity_path(activity), classes:)
+  end
+
+  def activity_finish_button(activity, classes: 'btn btn-default btn-secondary')
+    return unless can?(:edit, activity) || activity.finished
+
+    link_to activity_path(slug: activity.slug, activity: { finished: 1 }),
+            method: :put, class: "#{classes} append-date" do
+      finished_icon + ' ' + t('buttons.mark_as_finished')
+    end
+  end
+
   def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')
     return unless can?(:edit, planting) || planting.finished
 

app/helpers/gardens_helper.rb

@@ -11,10 +11,12 @@ module GardensHelper
     end
   end
 
+  # TODO: Not used?
   def display_garden_name(garden)
     truncate(garden.name, length: 50, separator: ' ', omission: '... ')
   end
 
+  # TODO: Only used by specs?
   def display_garden_plantings(plantings)
     if plantings.blank?
       "None"

app/helpers/icons_helper.rb

@@ -71,6 +71,10 @@ module IconsHelper
     icon('fas', 'seedling')
   end
 
+  def activity_icon
+    icon('fas', 'fa-truck-pickup')
+  end
+
   def post_icon
     image_icon 'post'
   end

app/models/ability.rb

@@ -109,6 +109,10 @@ class Ability
     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 :create,  Activity
+    can :update,  Activity, owner_id: member.id
+    can :destroy, Activity, owner_id: member.id
+
     can :create,  Harvest
     can :update,  Harvest, owner_id: member.id
     can :destroy, Harvest, owner_id: member.id
@@ -149,5 +153,10 @@ class Ability
     can :destroy, PlantPart do |pp|
       pp.harvests.empty?
     end
+    # Admins can't delete themselves
+    cannot :destroy, Member
+    can :destroy, Member do |other_member|
+      other_member&.id != member.id
+    end
   end
 end

app/models/activity.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class Activity < ApplicationRecord
+  extend FriendlyId
+  include Ownable
+  include Finishable
+  include SearchActivities
+
+  belongs_to :garden, optional: true
+  belongs_to :planting, optional: true
+
+  friendly_id :activity_slug, use: %i(slugged finders)
+
+  CATEGORIES = ["General", "Weeding", "Soil Cultivation", "Fertilizing", "Pruning", "Topical Application/Treating", "Watering"]
+
+  validates :name, presence: true
+  validates :category, inclusion: { in: CATEGORIES }, presence: true
+  validates :owner, presence: true
+
+  validates :slug, uniqueness: true
+
+  delegate :location, :latitude, :longitude, to: :owner
+  delegate :login_name, :slug, :location, to: :owner, prefix: true
+
+  def activity_slug
+    "#{owner.login_name}-#{name}-#{id}".downcase.tr(' ', '-')
+  end
+
+  def to_s
+    name
+  end
+end

app/models/concerns/predict_planting.rb

@@ -77,9 +77,22 @@ module PredictPlanting
         finish_predicted_at <= Time.zone.today
     end
 
+    # Deactivate any plantings over time_limit that are super late in small batches.
+    def self.archive!(time_limit: 3.years.ago, limit: 100)
+      active_plantings = Planting.annual.active.where("planted_at < ?", time_limit).order(planted_at: :asc).limit(limit)
+      active_plantings.each do |planting|
+        if planting.finish_is_predicatable? && planting.super_late?
+          planting.finished = true
+          planting.save
+        end
+      end
+    end
+
     private
 
     def calculate_percentage_grown
+      return 0 if age_in_days < 0
+
       percent = (age_in_days / expected_lifespan.to_f) * 100
       (percent > 100 ? 100 : percent)
     end

app/models/concerns/search_activities.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module SearchActivities
+  extend ActiveSupport::Concern
+
+  included do
+    searchkick merge_mappings: true,
+               settings:       { number_of_shards: 1, number_of_replicas: 0 },
+               mappings:       {
+                 properties: {
+                   active:     { type: :boolean },
+                   created_at: { type: :integer }
+                 }
+               }
+
+    def search_data
+      {
+        slug:,
+        active:,
+        finished:         finished?,
+        name:,
+        due_date:,
+        category:,
+        garden_id:,
+        garden_name:      garden&.name,
+        planting_id:,
+        planting_name:    planting&.crop&.name,
+        description:,
+
+        # owner
+        owner_id:,
+        owner_login_name:,
+        owner_slug:,
+
+        # timestamps
+        created_at:       created_at.to_i,
+        updated_at:       updated_at.to_i
+      }
+    end
+
+    def self.homepage_records(limit)
+      records = []
+      owners = []
+      1..limit.times do
+        where = {
+          # photos_count: { gt: 0 },
+          owner_id:     { not: owners }
+        }
+        one_record = search('*',
+                            limit:    1,
+                            where:,
+                            boost_by: [:created_at],
+                            load:     false).first
+        return records if one_record.nil?
+
+        owners << one_record.owner_id
+        records << one_record
+      end
+      records
+    end
+  end
+end

app/models/garden.rb

@@ -9,6 +9,7 @@ class Garden < ApplicationRecord
 
   has_many :plantings, dependent: :destroy
   has_many :crops, through: :plantings
+  has_many :activities, dependent: :destroy
 
   belongs_to :garden_type, optional: true
 
@@ -78,6 +79,16 @@ class Garden < ApplicationRecord
 
   def reindex(refresh: false); end
 
+  # Deactivate any gardens with no active plantings
+  def self.archive!(time_limit: 3.years.ago, limit: 100)
+    Garden.active.where("gardens.updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
+      unless active_garden.plantings.active.any?
+        garden.active = false
+        garden.save
+      end
+    end
+  end
+
   protected
 
   def strip_blanks

app/models/member.rb

@@ -19,6 +19,7 @@ class Member < ApplicationRecord
   has_many :plantings, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_many :seeds, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_many :harvests, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
+  has_many :activities, foreign_key: 'owner_id', dependent: :destroy, inverse_of: :owner
   has_and_belongs_to_many :roles
   has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
   has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"

app/models/photo.rb

@@ -9,7 +9,7 @@ class Photo < ApplicationRecord
 
   has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
 
-  # This doesn't work, ActiveRecord tries to use the polymoriphinc photographable
+  # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
   # relationship instead.
   # has_many :crops, through: :photo_associations, counter_cache: true
   def crops

app/models/planting.rb

@@ -22,6 +22,7 @@ class Planting < ApplicationRecord
   belongs_to :garden
   belongs_to :crop, counter_cache: true
   has_many :harvests, dependent: :destroy
+  has_many :activities, dependent: :destroy
 
   #
   # Ancestry of food

app/services/timeline_service.rb

@@ -17,10 +17,21 @@ class TimelineService
       .union_all(comments_query)
       .union_all(photos_query)
       .union_all(seeds_query)
+      .union_all(activities_query)
       .where.not(event_at: nil)
       .order(event_at: :desc)
   end
 
+  def self.activities_query
+    Activity.select(
+      :id,
+      "'activity' as event_type",
+      'COALESCE(activities.due_date, activities.created_at) as event_at',
+      :owner_id,
+      'null as crop_id'
+    )
+  end
+
   def self.plantings_query
     Planting.select(
       :id,

app/views/activities/_actions.haml

@@ -0,0 +1,9 @@
+- if can?(:edit, activity)
+  .dropdown.activity-actions
+    %a#activity-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
+    .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
+      = activity_edit_button(activity, classes: 'dropdown-item')
+      - if activity.active
+        = activity_finish_button(activity, classes: 'dropdown-item')
+      .dropdown-divider
+      = delete_button(activity, classes: 'dropdown-item text-danger')

app/views/activities/_card.html.haml

@@ -0,0 +1,35 @@
+- cache activity do
+  .card.activity{class: activity.active ? '' : 'card-finished'}
+    = link_to activity_path(slug: activity.slug) do
+      -# = image_tag activity.thumbnail_url ? activity.thumbnail_url : placeholder_image, class: 'img-card', alt: planting.crop_name
+
+    - if member_signed_in? && current_member.id == activity.owner_id
+      = link_to activity_path(slug: activity.slug) do
+        .activity-quick-actions
+          .dropdown
+            %a.activity-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
+
+            .dropdown-menu{"aria-labelledby" => "activity-menu"}
+              = link_to edit_activity_path(slug: activity.slug), class: 'dropdown-item' do
+                = edit_icon
+                = t('buttons.edit')
+
+              - if activity.active
+                = activity_finish_button(activity, classes: 'dropdown-item')
+
+              - if can? :destroy, activity
+                .dropdown-divider
+                = delete_button(activity, classes: 'dropdown-item text-danger')
+    = link_to activity_path(slug: activity.slug) do
+      .card-body.text-center
+        %h4= activity.name
+        .text-center= activity.description
+        - if activity.garden
+          .text-center= activity.garden
+        - if activity.planting
+          .text-center= activity.planting
+    .card-footer
+      .float-right
+        %span.chip.member-chip
+          = link_to member_path(slug: activity.owner_slug) do
+            = activity.owner_login_name

app/views/activities/_description.haml

@@ -0,0 +1,7 @@
+#{link_to event_model.category, event_model} - #{event_model.name}
+
+- if event_model.planting
+  %span on #{link_to event_model.planting, event_model.planting}
+
+- if event_model.garden
+  %span in #{link_to event_model.garden, event_model.garden}

app/views/activities/_form.html.haml

@@ -0,0 +1,55 @@
+.card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
+  .card-header
+    - if content_for? :title
+      %h1.h2-responsive.text-center
+        = planting_icon
+        %strong=yield :title
+  = bootstrap_form_for(@activity) do |f|
+    .card-body
+      = required_field_help_text
+      - if @activity.errors.any?
+        #error_explanation
+          %h2
+            = pluralize(@activity.errors.size, "error")
+            prohibited this activity from being saved:
+          %ul
+            - @activity.errors.full_messages.each do |msg|
+              %li= msg
+
+      .row
+        .col-md-12
+          = f.text_field :name, required: true, label: 'What needs to be done?'
+      .row
+        .col-md-4
+          = f.select(:category, Activity::CATEGORIES, include_blank: true)
+      .row
+        .col-md-12
+          = f.text_area :description, rows: 6, label: 'Tell us more about it'
+
+      .row
+        .col-md-4
+          = 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,
+            :id, :crop_name,
+            label: 'Is this for a specific planting?')
+          = link_to "Add a planting.", new_planting_path
+
+        .col-md-4
+          = f.text_field :due_date,
+                     value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
+                     class: 'add-datepicker', label: 'When?'
+
+      %hr
+
+      .row
+        .col-md-6
+          = f.check_box :finished, label: 'Mark as finished'
+          %span.help-block= t('.finish_helper')
+
+    .card-footer
+      .text-right= f.submit 'Save'

app/views/activities/_owner.haml

@@ -0,0 +1,20 @@
+.card
+  .card-body
+    .row
+      .col
+        %h4
+          Planned by
+          = link_to @activity.owner, @activity.owner
+        = link_to "view all #{@activity.owner}'s activities", member_activities_path(@activity.owner)
+
+        - if @activity.garden
+          %p
+            Planned in
+            = link_to @activity.garden, @activity.garden
+
+        - if @activity.planting
+          %p
+            Planned for
+            = link_to @activity.planting, @activity.planting
+
+      .col= render "members/avatar", member: @activity.owner

app/views/activities/edit.html.haml

@@ -0,0 +1,3 @@
+= content_for :title, "Editing activity"
+
+= render 'form'

app/views/activities/index.csv.shaper

@@ -0,0 +1,47 @@
+csv.headers :id,
+  :growstuff_url,
+  :name,
+  :category,
+  :description,
+  :owner_id,
+  :owner_name,
+  :garden_id,
+  :garden_name,
+  :planting_id,
+  :planting_name,
+  :due_date,
+  :finished,
+  :date_added,
+  :last_modified,
+  :license
+
+@activities.each do |a|
+  csv.row a do |csv, activity|
+
+    csv.cell :id
+    csv.cell :growstuff_url, activity_url(a.slug)
+
+    csv.cell :name, a.description
+    csv.cell :category, a.description
+    csv.cell :description, a.description
+
+    csv.cell :owner_id, a.owner_id
+    csv.cell :owner_name, a.owner_login_name
+
+    csv.cell :garden_id, a.garden_id
+    csv.cell :garden_name, a.garden_name
+
+    csv.cell :planting_id, a.planting_id
+    csv.cell :planting_name, a.planting_name
+
+    csv.cell :due_date, a.due_date ? a.due_date : ''
+
+    csv.cell :finished
+
+    csv.cell :date_added, Time.at(a.created_at).to_fs(:db)
+    csv.cell :last_modified, Time.at(a.updated_at).to_fs(:db)
+
+    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
+
+  end
+end

app/views/activities/index.html.haml

@@ -0,0 +1,43 @@
+- content_for :title, title('activities', @owner, nil, @planting)
+
+- content_for :breadcrumbs do
+  - if @owner
+    %li.breadcrumb-item= link_to 'Activities', activities_path
+    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", activities_path(owner: @owner)
+  - else
+    %li.breadcrumb-item.active= link_to 'Activities', activities_path
+
+.row
+  .col-md-2
+    %h1
+      = activity_icon
+      = title('activities', @owner, nil, @planting)
+    = render 'layouts/nav', model: Activity
+    = link_to show_inactive_tickbox_path('activities', owner: @owner, crop: nil, show_all: @show_all) do
+      = check_box_tag 'active', 'all', @show_all
+      include finished activities
+    %hr
+    - if @owner.present?
+      = render @owner, cached: true
+
+    %section.open-data
+      %h2 Open Data
+      %p= t('label.data')
+      - ['csv', 'json', 'rss'].each do |format|
+        .badge.badge-info
+          = link_to (@owner ? member_activities_path(@owner, format: format) : activities_path(format: format)) do
+            = icon 'fas', format.to_s
+            = format.upcase
+      - if @owner
+        .badge.badge-info= link_to "iCal", member_activities_path(@owner, format: 'ics', protocol: 'webcal', only_path: false)
+      .badge.badge-success= link_to 'API Methods', '/api-docs'
+
+  .col-md-10
+
+    %section
+      %h2= title('activities', @owner, nil, @planting)
+      = will_paginate @activities
+      .index-cards
+        - @activities.each do |a|
+          = render 'activities/card', activity: a
+      = will_paginate @activities

app/views/activities/index.ics.erb

@@ -0,0 +1,37 @@
+<%
+# TODO Refactor to a Activity <-> Ical view class?
+cal = Icalendar::Calendar.new
+cal.description = "Activities by #{@owner.login_name}"
+@activities.each do |activity|
+
+  event = Icalendar::Event.new
+
+  lines = []
+  lines << "Garden: #{activity['garden_name'] ? activity['garden_name'] : 'N/A' }"
+  lines << "Planting: #{activity['planting_name'] ? activity['planting_name'] : 'N/A' }"
+
+  lines << activity.description
+  finish_date = Date.parse(activity['due_date']) rescue nil
+
+  event.dtstart     = Time.at(activity['created_at'])
+  event.dtend       = finish_date || 1.day.from_now
+  event.summary     = "#{activity['name']} - #{activity['category']}"
+  event.description = lines.join("\n")
+  event.ip_class    = "PUBLIC"
+  event.url = activity_url(slug: activity['slug'])
+
+  cal.add_event(event)
+
+  if finish_date && finish_date > Date.today
+    todo = Icalendar::Todo.new
+    todo.dtstart = finish_date || Date.today
+    todo.due = finish_date
+    todo.summary     = "#{activity['name']} - #{activity['category']}"
+    todo.description = lines.join("\n")
+
+    cal.add_todo(todo)
+  end
+end
+cal.publish
+%>
+<%= cal.to_ical %>

app/views/activities/index.rss.haml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{ version: 2.0 }
+  %channel
+    %title
+      Recent activities from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
+    %link= activities_url
+    - @activities.each do |activity|
+      %item
+        %title #{activity['name']}
+        %pubdate= activity['created_at'].to_fs(:rfc822)
+        %description
+          :escaped
+            <p>Category: #{activity['category']}</p>
+            <p>Due Date: #{activity['due_date'] ? activity['due_date'] : 'unknown' }</p>
+            <p>Garden: #{activity['garden_name'] ? activity['garden_name'] : 'N/A' }</p>
+            <p>Planting: #{activity['planting_name'] ? activity['planting_name'] : 'N/A' }</p>
+          :escaped_markdown
+            #{ strip_tags markdownify(activity['description']) }
+        %link= activity_url(slug: activity['slug'])
+        %guid= activity_url(slug: activity['slug'])

app/views/activities/new.html.haml

@@ -0,0 +1,3 @@
+= content_for :title, t('activities.plan_something')
+
+= render 'form'

app/views/activities/show.html.haml

@@ -0,0 +1,51 @@
+= content_for :title, @activity.name
+- content_for :opengraph do
+  = tag("meta", property: "og:title", content: @activity.name)
+  - if @activity.description
+    = tag("meta", property: "og:description", content: og_description(@activity.description))
+  = 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'])
+
+- content_for :breadcrumbs do
+  %li.breadcrumb-item= link_to 'Activities', activities_path
+  %li.breadcrumb-item= link_to @activity.owner, member_activities_path(@activity.owner)
+  %li.breadcrumb-item.active= link_to @activity.name, @activity
+
+.activity
+  .row
+    .col-md-8.col-xs-12
+      .jumbotron
+        .d-flex.justify-content-between
+          %h1.display-3
+            %strong= @activity.name.titleize
+            %small.text-muted= @activity.category
+          %tt
+            = @activity.due_date
+
+    .col-md-4.col-xs-12
+      = render 'activities/owner', planting: @activity
+
+    .col-md-8.col-xs-12
+      - if @activity.description.present?
+        = cute_icon
+        .card
+          .card-header
+            %h2 Description
+          .card-body
+            :markdown
+              #{strip_tags markdownify(@activity.description)}
+
+      - if @activity.garden
+        %section.gardens
+          %a{name: 'gardens'}
+          = render 'gardens/card', garden: @activity.garden
+
+      - if @activity.planting
+        %section.plantings
+          %a{name: 'plantings'}
+          = render 'plantings/card', planting: @activity.planting
+
+
+    .col-md-4.col-xs-12
+      = render 'activities/actions', activity: @activity

app/views/comments/_single.html.haml

@@ -6,7 +6,7 @@
         - if can?(:edit, comment) || can?(:destroy, comment)
           %hr/
           .dropdown
-            %button#comment-edit-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button"} Actions
+            %button#comment-edit-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button"} Actions
             .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "comment-edit-button"}
               - if can? :edit, comment
                 = link_to edit_comment_path(comment), class: 'dropdown-item' do

app/views/conversations/index.haml

@@ -8,33 +8,27 @@
     .col-2.offset-md-2
       %h1= @box
     .col-8
-      = button_tag(type: 'submit', class: 'btn btn-default') do
-        = icon 'fas', 'trash-alt'
-        = 'Delete Selected'
 
   .row
     .col-md-2.py-4
       - @boxes.each do |box_name, counts|
         = link_to conversations_path(box: box_name), class: "nav-link list-group-item d-flex justify-content-between #{box_name == @box ? 'active' : ''} #{box_name}" do
+          %span
+            = box_name
           - if counts['unread'].positive?
             %span.badge.badge-info=counts['unread']
-          - else
-            %span
-          %span
-            = icon 'fas', box_name
-            = box_name
 
     .col-md-10
       .list-group
         - @conversations.each do |conversation|
           .list-group-item
             .row
-              .col-md-1
+              .col-1
                 - if conversation.receipts_for(current_member).last.is_unread?
                   %h1= icon 'far', 'envelope'
                 - else
                   %h1.text-muted= icon 'far', 'envelope-open'
-              .col-md-10
+              .col-9
                 .text-right.float-right
                   - conversation.recipients.each do |member|
                     - if member != current_member
@@ -50,11 +44,15 @@
                         #{time_ago_in_words conversation.messages.last.created_at} ago
                         %span.text-muted= conversation.messages.last.created_at
                     = truncate(strip_tags(conversation.messages.last.body), length: 150, separator: ' ', omission: '... ')
-              .col-md-1
+              .col-1
                 - if @box == 'trash'
                   = link_to conversation_path(conversation, box: @box), method: :put, class: 'restore', title: "Restore" do
                     = icon 'fas', 'trash-restore'
                 - else
                   = check_box_tag 'conversation_ids[]', conversation.id, false, class: 'selectable', "aria-label": "Select for deletion"
+      .offset-9.col-3
+        = button_tag(type: 'submit', class: 'btn btn-default') do
+          = icon 'fas', 'trash-alt'
+          = 'Delete'
       - unless @conversations.empty?
         = will_paginate @conversations

app/views/crops/_alternate_names.html.haml

@@ -4,7 +4,7 @@
     - crop.alternate_names.each do |an|
       - if can? :edit, an
         .dropdown.planting-actions
-          %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}
+          %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}
             = an.name
           .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-altnames"}
             - if can? :edit, an

app/views/crops/_image_with_popover.html.haml

@@ -3,7 +3,8 @@
                       alt: "Image of #{crop.name}", class: 'image-responsive crop-image'),
             crop.name,
             rel: "popover",
-            'data-trigger': 'hover',
-            'data-title': crop.name,
-            'data-content': render(partial: 'crops/popover', locals: { crop: crop }),
-            'data-html': true
+            'data-bs-toggle': 'popover',
+            'data-bs-trigger': 'hover',
+            'data-bs-title': crop.name,
+            'data-bs-content': render(partial: 'crops/popover', locals: { crop: crop }),
+            'data-bs-html': true

app/views/crops/_scientific_names.html.haml

@@ -6,7 +6,7 @@
     - crop.scientific_names.each do |sn|
       - if can? :edit, sn
         .dropdown.planting-actions
-          %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
+          %a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
           .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
             = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
               = edit_icon

app/views/crops/_wrangle.html.haml

@@ -4,7 +4,7 @@
       You are a
       %strong CROP WRANGLER
     .dropdown.crop-actions
-      %a#crop-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button", href: '#'} Actions
+      %a#crop-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", href: '#'} Actions
       .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-button"}
         = link_to edit_crop_path(crop), class: 'dropdown-item' do
           = edit_icon

app/views/crops/index.html.haml

@@ -9,15 +9,6 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item.active= link_to 'Crops', crops_path
 
-= bootstrap_form_tag(url: crops_path, method: :get, layout: :inline) do |f|
-  .input-group
-    = f.select "sort",
-                 options_for_select({ "popularity": 'popular',
-                                      "alphabetically": 'alpha' },
-                                      @sort || 'popular'),
-                 label: 'Sort by'
-    = f.submit "Show"
-
 %section.crops
   %h2= t('.title')
   = will_paginate @crops

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

@@ -1,4 +1,6 @@
-= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :delete, class: 'form-horizontal' }) do |f|
+= form_for(resource, as: resource_name,
+    url: registration_path(resource_name) + '#delete',
+    html: { method: :delete, class: 'form-horizontal' }) do |f|
   %br/
   = render 'devise/shared/error_messages', resource: resource
 

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

@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#apps',
     html: { method: :put, class: 'form-horizontal' }) do |_f|
   %br/
   = render 'devise/shared/error_messages', resource: resource

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

@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#email',
     html: { method: :put, class: 'form-horizontal' }) do |f|
   %br/
   = render 'devise/shared/error_messages', resource: resource

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

@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#password',
     html: { method: :put, class: 'form-horizontal' }) do |f|
   %br/
   = render 'devise/shared/error_messages', resource: resource

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

@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#profile',
     html: { method: :put, class: 'form-horizontal' }) do |f|
   %br/
   = render 'devise/shared/error_messages', resource: resource

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

@@ -10,15 +10,15 @@
 .card
   %ul#myTab.nav.nav-tabs{role: "tablist"}
     %li.nav-item
-      %a#profile-tab.nav-link.active{"aria-controls" => "profile", "aria-selected" => "true", "data-toggle" => "tab", href: "#profile", role: "tab"} Profile
+      %a#profile-tab.nav-link.active{"aria-controls" => "profile", "aria-selected" => "true", "data-bs-toggle" => "tab", href: "#profile", role: "tab"} Profile
     %li.nav-item
-      %a#email-tab.nav-link{"aria-controls" => "email", "aria-selected" => "false", "data-toggle" => "tab", href: "#email", role: "tab"} Email
+      %a#email-tab.nav-link{"aria-controls" => "email", "aria-selected" => "false", "data-bs-toggle" => "tab", href: "#email", role: "tab"} Email
     %li.nav-item
-      %a#apps-tab.nav-link{"aria-controls" => "apps", "aria-selected" => "false", "data-toggle" => "tab", href: "#apps", role: "tab"} Apps
+      %a#apps-tab.nav-link{"aria-controls" => "apps", "aria-selected" => "false", "data-bs-toggle" => "tab", href: "#apps", role: "tab"} Apps
     %li.nav-item
-      %a#password-tab.nav-link{"aria-controls" => "password", "aria-selected" => "false", "data-toggle" => "tab", href: "#password", role: "tab"} Password
+      %a#password-tab.nav-link{"aria-controls" => "password", "aria-selected" => "false", "data-bs-toggle" => "tab", href: "#password", role: "tab"} Password
     %li.nav-item
-      %a#delete-tab.nav-link.text-danger{"aria-controls" => "delete", "aria-selected" => "false", "data-toggle" => "tab", href: "#delete", role: "tab"} Delete Account
+      %a#delete-tab.nav-link.text-danger{"aria-controls" => "delete", "aria-selected" => "false", "data-bs-toggle" => "tab", href: "#delete", role: "tab"} Delete Account
   .card-body
     #myTabContent.tab-content
       #profile.tab-pane.fade.show.active{"aria-labelledby" => "profile-tab", role: "tabpanel"}

app/views/forums/_form.html.haml

@@ -14,8 +14,8 @@
             - @forum.errors.full_messages.each do |msg|
               %li= msg
 
-      = f.text_field :name
-      = f.text_area :description, rows: 6
-      = f.select(:owner_id, Member.all.order(:login_name).pluck(:login_name, :id))
+      = f.text_field :name, required: true
+      = f.text_area :description, rows: 6, required: true
+      = f.select(:owner_id, Member.all.order(:login_name).pluck(:login_name, :id), required: true)
     .card-footer
       .text-right= f.submit 'Save'

app/views/gardens/_actions.html.haml

@@ -1,10 +1,11 @@
 - if can?(:edit, garden)
   .dropdown.garden-actions
-    %a#garden-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+    %a#garden-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "garden-actions-button"}
       - if can?(:edit, garden)
-        = garden_plant_something_button(garden, classes: 'dropdown-item') if garden.active
         - if garden.active
+          = garden_plant_something_button(garden, classes: 'dropdown-item')
+          = garden_plan_something_button(garden, classes: 'dropdown-item')
           = garden_mark_inactive_button(garden, classes: 'dropdown-item')
         - else
           = garden_mark_active_button(garden, classes: 'dropdown-item')

app/views/gardens/_card.html.haml

@@ -0,0 +1,37 @@
+.card
+  .card-header
+    .row
+      .col-12.col-md-3
+        %h2= link_to garden.name, garden, name: "garden-#{garden.id}"
+    .row
+      .col-md-3
+        - if @owner.blank?
+          owner:
+          = render 'members/tiny', member: garden.owner
+
+
+        = image_tag garden_image_path(garden), alt: garden.name, class: 'img-card'
+
+      .col-md-9
+        %section
+          = render 'gardens/actions', garden: garden
+
+        - active_plantings = garden.plantings.active
+
+        %section
+          - if active_plantings.perennial.any?
+            %strong Perennials:
+            - active_plantings.perennial.each do |planting|
+              = link_to planting do
+                = crop_icon planting.crop
+                = planting.crop
+          - else
+            %p No perennial plantings
+
+        %hr
+
+        %section
+          - if active_plantings.annual.any?
+            = render 'plantings/progress_list', plantings: garden.plantings.active.annual
+          - else
+            %p No annual plantings

app/views/gardens/_overview.html.haml

@@ -17,4 +17,4 @@
               .col-lg-2.col-sm-4.col-xs-6
                 = render "plantings/thumbnail", planting: planting
         - else
-          no plantings
+          no plantings

app/views/gardens/index.html.haml

@@ -42,43 +42,7 @@
                 - else
                   = link_to garden.name, gardens_path(anchor: "garden-#{garden.id}")
       - @gardens.each do |garden|
-        .card
-          .card-header
-            .row
-              .col-12.col-md-3
-                %h2= link_to garden.name, garden, name: "garden-#{garden.id}"
-            .row
-              .col-md-3
-                - if @owner.blank?
-                  owner:
-                  = render 'members/tiny', member: garden.owner
-
-
-                = image_tag garden_image_path(garden), alt: garden.name, class: 'img-card'
-
-              .col-md-9
-                %section
-                  = render 'gardens/actions', garden: garden
-
-                - active_plantings = garden.plantings.active
-
-                %section
-                  - if active_plantings.perennial.any?
-                    %strong Perennials:
-                    - active_plantings.perennial.each do |planting|
-                      = link_to planting do
-                        = crop_icon planting.crop
-                        = planting.crop
-                  - else
-                    %p No perennial plantings
-
-                %hr
-
-                %section
-                  - if active_plantings.annual.any?
-                    = render 'plantings/progress_list', plantings: garden.plantings.active.annual
-                  - else
-                    %p No annual plantings
+        = render 'gardens/card', garden: garden
 
       .row
         .col-12= page_entries_info @gardens

app/views/gardens/show.html.haml

@@ -56,10 +56,21 @@
           .col-md-12
             %p Nothing is currently planted here.
 
-    %section.companions
-      %h2 Suggestioned companions
-      - @suggested_companions.each do |companion|
-        = render 'crops/tiny', crop: companion
+    %section
+      %h2 Current activities in garden
+      .index-cards
+        - if @current_activities&.size&.positive?
+          - @current_activities.each do |activity|
+            = render "activities/card", activity: activity
+        - else
+          .col-md-12
+            %p Nothing is currently planned here.
+
+    - if @suggested_companions.any?
+      %section.companions
+        %h2 Suggestioned companions
+        - @suggested_companions.each do |companion|
+          = render 'crops/tiny', crop: companion
 
     %section= render 'previously'
 

app/views/harvests/_actions.html.haml

@@ -1,6 +1,6 @@
 - if can?(:edit, harvest)
   .dropdown.harvest-actions
-    %a#harvest-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+    %a#harvest-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = harvest_edit_button(harvest, classes: 'dropdown-item')
       = add_photo_button(harvest, classes: 'dropdown-item')

app/views/harvests/_image_with_popover.haml

@@ -3,7 +3,8 @@
                     class: 'image-responsive crop-image'),
           harvest,
           rel: "popover",
-          'data-trigger': 'hover',
-          'data-title': harvest.to_s,
-          'data-content': render('harvests/popover', harvest: harvest),
-          'data-html': true
+          'data-bs-toggle': 'popover',
+          'data-bs-trigger': 'hover',
+          'data-bs-title': harvest.to_s,
+          'data-bs-content': render('harvests/popover', harvest: harvest),
+          'data-bs-html': true

app/views/harvests/_modal.html.haml

@@ -3,7 +3,7 @@
     .modal-content
       .modal-header.text-center
         %h4.modal-title.w-100.font-weight-bold Record #{harvest.crop.name} harvest
-        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", type: "button"}
+        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
           %span{"aria-hidden" => "true"} ×
       .modal-body
         %p Select which plant part you have havested
@@ -26,6 +26,6 @@
               = plant_part_icon(plant_part.name)
               = plant_part
 
-%a.btn#modalHarvestButton{"data-target" => "#modelHarvestForm", "data-toggle" => "modal", href: ""}
+%a.btn#modalHarvestButton{"data-bs-target" => "#modelHarvestForm", "data-bs-toggle" => "modal", href: ""}
   = harvest_icon
   Record harvest

app/views/harvests/index.html.haml

@@ -28,6 +28,8 @@
     %section
       %h2= title('harvests', @owner, @crop, @planting)
       = will_paginate @harvests
+      - if @harvests.blank?
+        %p No harvests recorded yet
       .index-cards
         - @harvests.each do |h|
           = render 'harvests/card', harvest: h

app/views/home/_activities.html.haml

@@ -0,0 +1,10 @@
+%h2= t('.recent_activities')
+- Activity.homepage_records(6).each do |activity|
+  - cache activity do
+    = link_to activity_path(slug: activity.slug), class: 'list-group-item list-group-item-action flex-column align-items-start' do
+      .d-flex.w-100.justify-content-between.homepage--list-item
+        %div
+          %h4= activity.name
+          %span.badge.badge-success= activity.category
+          %small.text-muted
+            by #{activity.owner_login_name}

app/views/home/index.html.haml

@@ -8,9 +8,14 @@
 
       %p= render 'stats', cached: true
     .col
+      %p
+        - if current_member.plantings.active.any?
+          = 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), class: 'btn btn-dark' do
-          = image_icon 'gardens'
+          = garden_icon
           Show me my garden
 - else
   .hidden-xs
@@ -27,16 +32,21 @@
         %h2= t('.recently_added')
         %p.card-body
           != CropSearchService.recent(30).map { |c| link_to(c['name'], crop_path(slug: c['slug'])) }.join(", ")
-  .col-xl-3.col
+  .col-xl-4.col
     %section.plantings
       = cute_icon
       =render 'plantings'
       %p.text-right= link_to "#{t('home.plantings.view_all')} »", plantings_path, class: 'btn btn-block'
-  .col-xl-3.col
+  .col-xl-4.col
     %section.harvests
       = cute_icon
       = render 'harvests'
       %p.text-right= link_to "#{t('home.harvests.view_all')} »", harvests_path, class: 'btn btn-block'
+  .col-xl-4.col
+    %section.activities
+      = cute_icon
+      = render 'activities'
+      %p.text-right= link_to "#{t('home.activities.view_all')} »", activities_path, class: 'btn btn-block'
   .col-12.col-md-6
     %section.seeds
       = cute_icon

app/views/layouts/_header.html.haml

@@ -1,4 +1,4 @@
-%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between
+%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between.sticky-top
   .nav
     %a.navbar-brand{ href: root_path }
       = image_tag("pear.png", class: 'logo', alt: 'Growstuff brand logo (drawing of a pear)')
@@ -6,6 +6,6 @@
         %span.site-name Growstuff
   .nav= render 'crops/search_bar'
   .nav
-    %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarSupportedContent", "data-toggle" => "collapse", type: "button" }
+    %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", type: "button" }
       %i.fas.fa-ellipsis-v.navbar-toggler-icon
     = render 'layouts/menu'

app/views/layouts/_menu.haml

@@ -8,7 +8,7 @@
         = 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-toggle" => "dropdown", href: "#", role: "button"}
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
           = image_tag "icons/gardener.svg", class: 'img img-icon', alt: t('.record'), aria: { hidden: "true" }
           = t('.record')
         .dropdown-menu
@@ -18,6 +18,9 @@
           = link_to new_harvest_path, class: 'dropdown-item' do
             = image_icon('harvest-add')
             = t('buttons.new_harvest')
+          = link_to new_activity_path, class: 'dropdown-item' do
+            = image_icon('activity-add')
+            = t('buttons.new_activity')
           = link_to new_seed_path, class: 'dropdown-item' do
             = image_icon('seed-add')
             = t('buttons.new_seeds')
@@ -27,7 +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-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
         .dropdown-menu
           = link_to crops_path, class: 'dropdown-item' do
             = t('.browse_crops')
@@ -41,7 +44,7 @@
             = harvest_icon
             = t('.harvests')
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= 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'
@@ -51,7 +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-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
           .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
             - if current_member.role?(:crop_wrangler)
               = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
@@ -59,7 +62,7 @@
               = link_to t('.admin'), admin_path, class: 'dropdown-item'
 
       %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
           = image_tag(avatar_uri(current_member, 50), alt: 'Avatar of current member', height: 25, width: 25, aria: { hidden: "true" })
           = current_member.login_name
           - if current_member.unread_count.positive?
@@ -67,6 +70,8 @@
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
           = link_to member_path(current_member), class: 'dropdown-item' do
             = t('.profile')
+          = link_to member_activities_path(current_member), class: 'dropdown-item' do
+            = t('.activities')
           = link_to member_gardens_path(current_member), class: 'dropdown-item' do
             = t('.gardens')
           = link_to member_plantings_path(current_member), class: 'dropdown-item' do

app/views/layouts/application.html.haml

@@ -2,7 +2,7 @@
 %html{ lang: "en", prefix: "og: https://ogp.me/ns#" }
   = yield :scripts
   = render "layouts/head"
-  %body
+  %body.d-flex.flex-column.vh-100
     = query_diet_widget if Rails.env.development?
     .sr-only= link_to t(".skip"), "#skipnav"
     = render "layouts/header"
@@ -25,7 +25,7 @@
         = render "shared/flash_messages", flash: flash
         %main= yield
 
-    %footer.page-footer.font-small.bg-dark.pt-4= render "layouts/footer"
+    %footer.page-footer.font-small.bg-dark.pt-4.mt-auto= render "layouts/footer"
     /
       Javascripts
       \==================================================

app/views/layouts/modal.html.haml

@@ -2,7 +2,7 @@
   .modal-dialog
     .modal-content
       .modal-header
-        %button.close{"data-dismiss" => "modal", type: "button"}
+        %button.close{"data-bs-dismiss" => "modal", type: "button"}
           %span{"aria-hidden" => "true"} ×
           %span.sr-only Close
         %h4#mainModalLabel.modal-title

app/views/members/_bio.html.haml

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

app/views/members/_full_summary.html.haml

@@ -1,47 +0,0 @@
-- if @harvesting.size.positive?
-  %section.harvests
-    %h2 Ready to harvest
-    .index-cards
-      - @harvesting.each do |planting|
-        = render 'plantings/thumbnail', planting: planting
-
-- if @harvests.any?
-  %section.havests
-    %h2 Recent Harvests
-    .index-cards
-      - @harvests.each do |harvest|
-        = render 'harvests/thumbnail', harvest: harvest
-
-- if @others.size.positive?
-  %section.planting-progress
-    %h2 Progress report
-    %p Still growing and not ready for harvesting.
-    .list-group
-      - @others.each do |planting|
-        .list-group-item
-          %span= render 'plantings/tiny', planting: planting
-          %span= render 'plantings/progress', planting: planting
-- if @late.size.positive?
-  %section.late
-    %h2 Late
-    %p
-      These plantings are at the end of their lifecycle.
-      - if member_signed_in? && @member == current_member
-        %strong When you have removed the planting from your garden, mark the planting as finished in Growstuff.
-    .index-cards
-      - @late.each do |planting|
-        = render 'plantings/thumbnail', planting: planting
-- if @super_late.any?
-  %section.superlate
-    %h2 Super late
-    %p
-      We suspect the following plantings finished long ago and no longer need tracking.
-      - if member_signed_in? && current_member == @member
-        %strong You can mark these plantings as finished to stop tracking.
-    %ul
-      - @super_late.each do |planting|
-        %li
-          = link_to planting.crop_name, planting_url(slug: planting.slug)
-          planted on #{planting.planted_at.to_date}
-
-

app/views/members/_location.html.haml

@@ -1,6 +1,6 @@
 - if member.location.present?
   = link_to place_path(member.location) do
-    %span.badge.badge-location
+    %span.badge.badge-location{ title: member.location }
       = icon 'fas', 'map-marker'
       = truncate(member.location, length: 15, separator: ' ', omission: '... ')
 - else

app/views/members/_stats.html.haml

@@ -1,40 +1,33 @@
 .card-body
-  %h3 Activity
-%ul.list-group.list-group-flush
-  %li.list-group-item
+  %h3 
+    Stats
+  .label.d-md-none{type: "button", :data => { :bs_toggle => "collapse", :bs_target => "#stats-collapse"}}
+    %a
+      Show/Hide
+
+.collapse.d-md-block#stats-collapse
+  %ul.list-group.list-group-flush
     - if member.gardens.present?
-      = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
-    - else
-      0 gardens
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
     - if member.plantings.present?
-      = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
-    - else
-      0 plantings
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
     - if member.harvests.present?
-      = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
-    - else
-      0 harvests
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
     - if member.seeds.present?
-      = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
-    - else
-      0 seeds
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
     - if member.posts.present?
-      = link_to localize_plural(member.posts, Post), member_posts_path(member)
-    - else
-      0 posts
-
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.posts, Post), member_posts_path(member)
+    - if member.activities.present?
+      %li.list-group-item
+        = link_to localize_plural(member.plantings, Activity), member_activities_path(member)
     - if member.followed.present?
-      = link_to localize_plural(member.followed, Follow), member_follows_path(member)
-    - else
-      0 following
-
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.followed, Follow), member_follows_path(member)
     - if member.followers.present?
-      = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)
-    - else
-      0 followers
+      %li.list-group-item
+        = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)

app/views/members/show.html.haml

@@ -21,19 +21,21 @@
         .row
           .col= render "bio", member: @member
           .col= render "avatar", member: @member
-        %p
-          - @member.roles.each do |role|
-            %span.badge.badge-info= role.name.titleize
+        - if @member.roles.any?
+          %p
+            - @member.roles.each do |role|
+              %span.badge.badge-info= role.name.titleize
         - if @member.location.present?
-          %p.badge.badge-location
+          %p.badge.badge-location{ title: @member.location }
             = icon 'fas', 'map-marker'
-            = truncate(@member.location, length: 25, separator: ' ', omission: '... ')
+            = truncate(@member.location, length: 15, separator: ' ', omission: '... ')
         %p
           %strong Member since
           = @member.created_at.to_fs(:date)
-        %p
-          %strong Last Login
-          = @member.last_sign_in_at
+        - if @member.last_sign_in_at
+          %p
+            %strong Last Login
+            = @member.last_sign_in_at
 
         - if can? :update, @member
           = link_to edit_member_registration_path, class: 'btn btn-block' do
@@ -59,24 +61,71 @@
         = render "contact", member: @member, twitter_auth: @twitter_auth,
                                               flickr_auth: @flickr_auth
 
-  .col-md-10
-    %section= render "map", member: @member
-    = render 'members/full_summary', member: @member
-    %section.activity
-      %h2 Activity
-      .list-group
-        - @activity.each do |event|
-          .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
-            .d-flex.w-100.justify-content-between
-              %h5
-                = icon_for_model(event.event_type)
-                = event_description(event)
-                = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
-              %small
-              - if event.event_at.present?
-                - if event.event_at.kind_of?(Date)
-                  #{distance_of_time_in_words(event.event_at, Time.zone.now.to_date)} ago
-                - else
-                  #{time_ago_in_words(event.event_at)} ago
-              - else
-                unknown date
+  .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
+          %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
+          %h2 Progress report
+          %p Still growing and not ready for harvesting.
+          .list-group
+            - @others.each do |planting|
+              .list-group-item
+                %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
+          %h2 Late
+          %p
+            These plantings are at the end of their lifecycle.
+            - if member_signed_in? && @member == current_member
+              %strong When you have removed the planting from your garden, mark the planting as finished in Growstuff.
+          .index-cards
+            - @late.each do |planting|
+              = render 'plantings/thumbnail', planting: planting
+      - if @super_late.any?
+        %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.
+            - if member_signed_in? && current_member == @member
+              %strong You can mark these plantings as finished to stop tracking.
+          %ul
+            - @super_late.each do |planting|
+              %li
+                = link_to planting.crop_name, planting_url(slug: planting.slug)
+                planted on #{planting.planted_at.to_date}
+
+      - if @harvests.any?
+        %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
+          %h2 Activity
+          .list-group
+            - @activity.each do |event|
+              .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
+                .d-flex.w-100.justify-content-between
+                  %h5.col-md-11.col-xs-10.text-truncate
+                    = icon_for_model(event.event_type)
+                    = event_description(event)
+                    = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
+                  %small.col-md-1.col-xs-2.text-right
+                    - if event.event_at.present?
+                      - if event.event_at.kind_of?(Date)
+                        #{distance_of_time_in_words(event.event_at, Time.zone.now.to_date)} ago
+                      - else
+                        #{time_ago_in_words(event.event_at)} ago
+                    - else
+                      unknown date

app/views/photos/_actions.html.haml

@@ -1,6 +1,6 @@
 - if can?(:edit, @photo) && can?(:destroy, @photo)
   .dropdown.float-right.photo-actions
-    %a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+    %a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
       = edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
       .dropdown-divider

app/views/plantings/_actions.html.haml

@@ -1,10 +1,11 @@
 - if can?(:edit, planting)
   .dropdown.planting-actions
-    %a#planting-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'} Actions
+    %a#planting-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
       = planting_edit_button(planting, classes: 'dropdown-item')
       = add_photo_button(planting, classes: 'dropdown-item')
       - if planting.active
+        = planting_plan_something_button(planting, classes: 'dropdown-item')
         = planting_finish_button(planting, classes: 'dropdown-item')
         = planting_harvest_button(planting, classes: 'dropdown-item')
         = planting_save_seeds_button(planting, classes: 'dropdown-item')

app/views/plantings/_badges.html.haml

@@ -10,8 +10,8 @@
     // Harvest times
     - unless planting.super_late?
       - if planting.harvest_time?
-        %span.badge.badge-info.badge-harvest{'data-toggle': "tooltip", 'data-placement': "top", title: 'Planting is ready for harvesting now'}
+        %span.badge.badge-info.badge-harvest{'data-bs-toggle': "tooltip", 'data-bs-placement': "top", title: 'Planting is ready for harvesting now'}
           = t('label.harvesting_now')
       - elsif planting.before_harvest_time?
-        %span.badge.badge-info{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted weeks until harvest'}
+        %span.badge.badge-info{'data-bs-toggle': "tooltip", 'data-bs-placement': "top", title: 'Predicted weeks until harvest'}
           = t('label.weeks_until_harvest', number: in_weeks(days_from_now_to_first_harvest(planting)))

app/views/plantings/_card.html.haml

@@ -7,7 +7,7 @@
       = link_to planting_path(slug: planting.slug) do
         .planting-quick-actions
           .dropdown
-            %a.planting-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'}
+            %a.planting-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
 
             .dropdown-menu{"aria-labelledby" => "planting-menu"}
               = link_to edit_planting_path(slug: planting.slug), class: 'dropdown-item' do

app/views/plantings/_descendants.html.haml

@@ -1,6 +1,6 @@
 %h2 Seeds saved
 
-%a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button"}
+%a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", role: "button"}
   = seed_icon
   = t('buttons.save_seeds')
 .dropdown-menu.dropdown-secondary

app/views/plantings/_facts.haml

@@ -21,8 +21,11 @@
   - if planting.finish_is_predicatable?
     .card.fact-card
       %h3 Progress
-      %strong #{planting.age_in_days}/#{planting.expected_lifespan}
-      %span days
+      - if planting.age_in_days < 0
+        %strong Planned
+      - else
+        %strong #{planting.age_in_days}/#{planting.expected_lifespan}
+        %span days
 
   .card.fact-card{class: planting.quantity.present? ? '' : 'text-muted'}
     %h3
@@ -42,6 +45,9 @@
       %h3 Growing
       %strong= seedling_icon
       %span
+      - if planting.age_in_days < 0
+        Planting planned
+      - else
         Planting is still growing today
 
   .card.fact-card{class: planting.planted_from.present? ? '' : 'text-muted'}

app/views/plantings/_form.html.haml

@@ -36,6 +36,8 @@
           = f.text_field :planted_at,
                      value: @planting.planted_at ? @planting.planted_at.to_fs(:ymd) : '',
                      class: 'add-datepicker', label: 'When?'
+          %span.help-inline
+            Tip: Plan our your future plantings by forward dating, and subscribe to your iCalendar feed for reminders to plant
 
       .row
         .col-md-4

app/views/plantings/_image_with_popover.html.haml

@@ -4,7 +4,8 @@
                       class: 'image-responsive'),
             planting,
             rel: "popover",
-            'data-trigger': 'hover',
-            'data-title': planting.crop.name,
-            'data-content': render('plantings/popover', planting: planting),
-            'data-html': true
+            'data-bs-toggle': 'popover',
+            'data-bs-trigger': 'hover',
+            'data-bs-title': planting.crop.name,
+            'data-bs-content': render('plantings/popover', planting: planting),
+            'data-bs-html': true

app/views/plantings/_modal.html.haml

@@ -3,7 +3,7 @@
     .modal-content
       .modal-header.text-center
         %h4.modal-title.w-100.font-weight-bold Record #{planting.crop.name} planting
-        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", type: "button"}
+        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
           %span{"aria-hidden" => "true"} ×
       .modal-body
         %p Which garden is the planting in?
@@ -23,6 +23,6 @@
         = link_to 'add new garden', new_garden_path
 
 
-%a.btn{"data-target" => "#modelPlantingForm", "data-toggle" => "modal", href: "", id: 'planting-button'}
+%a.btn{"data-bs-target" => "#modelPlantingForm", "data-bs-toggle" => "modal", href: "", id: 'planting-button'}
   = planting_icon
   Add to my garden

app/views/plantings/_quick_actions.haml

@@ -1,5 +1,5 @@
 - if can?(:edit, planting)
-  %a#planting-actions-menu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#"}
+  %a#planting-actions-menu.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#"}
     /=icon('fas', 'ellipsis-v')
   %ul.dropdown-menu.dropdown-menu-left{"aria-labelledby" => "planting-actions-menu"}
     %li= link_to t('view'), planting, class: 'dropdown-item'

app/views/plantings/_timeline.html.haml

@@ -15,7 +15,7 @@
       .progress-bar{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, role: "progressbar", style: "width: #{planting.percentage_grown}%"}
     %ul.list-unstyled.d-flex.justify-content-between
       - in_weeks(planting.expected_lifespan).times do |week_number|
-        %li{class: planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-toggle': "tooltip", 'data-placement': "top", title: I18n.l(planting.planted_at + week_number.weeks)}
+        %li{class: planting.planted_at + week_number.weeks > Time.zone.today ? 'text-muted progress-fade' : '', 'data-bs-toggle': "tooltip", 'data-bs-placement': "top", title: I18n.l(planting.planted_at + week_number.weeks)}
           = render 'timeline_icon',
             planting: planting,
             week_number: week_number,

app/views/plantings/index.csv.shaper

@@ -18,7 +18,6 @@ csv.headers :id,
   :license
 
 @plantings.each do |p|
-  puts p.inspect
   csv.row p do |csv, planting|
 
     csv.cell :id

app/views/plantings/index.html.haml

@@ -39,6 +39,8 @@
     %section
       %h2= title('plantings', @owner, @crop, @planting)
       = will_paginate @plantings
+      - if @plantings.blank?
+        %p No plantings recorded yet
       .index-cards
         - @plantings.each do |p|
           = render 'plantings/card', planting: p

app/views/plantings/index.ics.erb

@@ -37,6 +37,16 @@ cal.description = "Plantings by #{@owner.login_name}"
     todo.summary = "Harvest #{planting['crop_name']}"
 
     cal.add_todo(todo)
+
+    # To work around google calendar not supporting VTODO, mirror the above as a specific event
+    event = Icalendar::Event.new
+    event.dtstart = predicted_date || finish_date || Date.today
+    event.dtend = finish_date
+    event.summary = "Harvest #{planting['crop_name']}"
+    event.ip_class    = "PUBLIC"
+    event.url = planting_url(slug: planting['slug'])
+
+    cal.add_event(event)
   end
 end
 cal.publish

app/views/plantings/show.html.haml

@@ -37,7 +37,10 @@
             - elsif @planting.percentage_grown.present?
               #{@planting.percentage_grown.to_i}%
               - if @planting.finish_is_predicatable?
-                %strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
+                - if @planting.age_in_days < 0
+                  %strong Planned
+                - else
+                  %strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
 
         = render 'timeline', planting: @planting
 
@@ -64,6 +67,17 @@
         %a{name: 'seeds'}
         = render 'plantings/descendants', planting: @planting
 
+      %section
+        %h2 Current activities for planting
+        .index-cards
+          - if @current_activities&.size&.positive?
+            - @current_activities.each do |activity|
+              = render "activities/card", activity: activity
+          - else
+            .col-md-12
+              %p Nothing is currently planned here.
+
+
     .col-md-4.col-xs-12
       = render 'plantings/actions', planting: @planting
       %hr/

app/views/posts/_actions.html.haml

@@ -1,6 +1,6 @@
 - if can? :edit, post
   .dropdown.float-right
-    %button#post-edit-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button"} Actions
+    %button#post-edit-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button"} Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "post-edit-button"}
       - if can? :edit, post
         = link_to edit_post_path(post), class: 'dropdown-item' do

app/views/seeds/_actions.html.haml

@@ -1,6 +1,6 @@
 - if can?(:edit, seed)
   .dropdown.seed-actions
-    %a#seed-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button", href: '#'}
+    %a#seed-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
       Actions
     .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "seed-actions-button"}
       - if can?(:create, Planting) && can?(:update, seed) && seed.active

app/views/seeds/_card.html.haml

@@ -10,9 +10,9 @@
         = seed.owner_login_name
     .card-body
       - if seed.owner_location
-        %h6.small.badge.badge-pill.badge-location
+        %h6.small.badge.badge-pill.badge-location{ title: seed.owner_location }
           = icon 'fas', 'map-marker'
-          = truncate(seed.owner_location, length: 40, separator: ' ', omission: '... ')
+          = truncate(seed.owner_location, length: 15, separator: ' ', omission: '... ')
       %p
         - if seed.quantity
           .badge.badge-info #{seed.quantity} seeds

app/views/seeds/_modal.html.haml

@@ -5,7 +5,7 @@
         %h4.modal-title.w-100.font-weight-bold
           = seed_icon
           Save #{seed.crop.name} seeds
-        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", type: "button"}
+        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
           %span{"aria-hidden" => "true"} ×
 
       .modal-body
@@ -16,11 +16,11 @@
         %hr/
         %p Yes, I would be willing trade these from #{current_member.location}
 
-        .btn-group{"aria-label" => "trade to", role: "group"}
-          - Seed::TRADABLE_TO_VALUES.each do |t|
+        .btn-group.d-grid.flex-column{"aria-label" => "trade to", role: "group"}
+          - Seed::TRADABLE_TO_VALUES.reverse.each do |t|
             - unless t == 'nowhere'
-              = button_to seeds_path(seed: {crop_id: seed.crop_id, tradable_to: t}), method: :post, class: 'btn' do
-                %h3= t
+              = button_to seeds_path(seed: {crop_id: seed.crop_id, tradable_to: t}), method: :post, class: 'btn col-12' do
+                = t
 
         %hr/
         %p
@@ -30,6 +30,6 @@
           Save #{seed.crop_name} seeds.
 
 
-%a.btn{"data-target" => "#modelSeedForm", "data-toggle" => "modal", href: ""}
+%a.btn{"data-bs-target" => "#modelSeedForm", "data-bs-toggle" => "modal", href: ""}
   = seed_icon
   Save seeds

app/views/seeds/index.html.haml

@@ -35,7 +35,8 @@
     %section
       %h2= title('seeds', @owner, @crop, @planting)
       = will_paginate @seeds
-
+      - if @seeds.blank?
+        %p No seeds recorded yet
       .index-cards
         - @seeds.each do |s|
           = render 'seeds/card', seed: s

app/views/shared/_flash_messages.html.haml

@@ -1,6 +1,6 @@
 - flash.each do |type, content|
   %div{ class: build_alert_classes(type), role: "alert" }
-    %button.close{ type: "button", "data-dismiss" => "alert" }
+    %button.close{ type: "button", "data-bs-dismiss" => "alert" }
       %span{ "aria-hidden" => true } ×
       %span.sr-only Close
     = content

config/environments/development.rb

@@ -67,7 +67,11 @@ Rails.application.configure do
   config.action_mailer.delivery_method = :letter_opener
 
   config.host = 'localhost:3000'
-  config.hosts << ".preview.app.github.dev"
+  if ENV['CODESPACE_NAME']
+    config.host = "#{ENV['CODESPACE_NAME']}-3000.app.github.dev:443"
+    config.hosts << ".preview.app.github.dev"
+    config.hosts << ".app.github.dev"
+  end
   config.analytics_code = ''
 
   config.action_controller.action_on_unpermitted_parameters = :raise

config/locales/en.yml

@@ -84,6 +84,7 @@ en:
     new_planting: New planting
     new_post: Write new post
     new_harvest: New harvest
+    new_activity: Plan activity
     plant: Plant
     plant_crop: Plant %{crop_name}
     plant_something_here: Plant something here
@@ -137,6 +138,8 @@ en:
       perks: Join now for your free garden journal, harvest predictions, forums, and more.
       sign_in_linktext: sign in
       sign_up: Sign up
+    activities:
+      view_all: View all activities
     crops:
       our_crops: Some of our crops
       recently_added: Recently added crops
@@ -213,6 +216,7 @@ en:
     data: 'The data on this page is available in the following formats:'
   layouts:
     header:
+      activities: Activities
       account: Account
       admin: Admin
       browse_crops: Browse Crops
@@ -233,7 +237,7 @@ en:
       inbox_unread: Inbox (%{unread_count})
       plantings: Plantings
       posts: Posts
-      profile: Profile
+      profile: Profile/Timeline
       seeds: Seeds
       skip: Skip navigation menu
       support_growstuff: Support Growstuff
@@ -276,6 +280,16 @@ en:
       not_enough_data: Not enough data
       perennial: Perennial
       unknown: Unknown
+  activities:
+    plan_something: Plan something
+    index:
+      title:
+        default: Everyone's activities
+        owner_activities: "%{owner}'s activities"
+    form:
+      finish_helper: >
+        An activity is finished when you've completed it, or it's otherwise
+        no longer possible.
   plantings:
     badges:
       days_until_finished: days until finished