Refactor all areas in app/views/ that reference an ENV variable, to read from a helper or similar central area.

A new helper method `site_name` was created in `app/helpers/application_helper.rb` to provide the value of `ENV['GROWSTUFF_SITE_NAME']`.

All occurrences of `ENV['GROWSTUFF_SITE_NAME']` in the `app/views` directory have been replaced with a call to the new `site_name` helper method.

The `ApplicationHelper` has been included in the `ApplicationMailer` to make the `site_name` helper available to mailer views.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

.github/workflows/ci-features.yml

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

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install ruby version specified in .ruby-version
         uses: ruby/setup-ruby@v1
         with:
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Configure sysctl limits
         run: |

CONTRIBUTORS.md

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

Gemfile

@@ -91,10 +91,9 @@ gem 'bootstrap-datepicker-rails'
 # DRY-er easier bootstrap 4 forms
 gem "bootstrap_form", ">= 4.5.0"
 
-# For connecting to other services (eg Twitter)
+# For connecting to other services (eg Flickr)
 gem 'omniauth', '~> 1.3'
 gem 'omniauth-flickr', '>= 0.0.15'
-gem 'omniauth-twitter'
 
 # Pretty charts
 gem "chartkick"
@@ -202,3 +201,5 @@ group :travis do
 end
 
 
+
+gem "i18n_data", "~> 1.1"

Gemfile.lock

@@ -33,29 +33,29 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -64,15 +64,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -87,22 +87,22 @@ GEM
     active_utils (3.5.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -183,7 +183,7 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.1.5)
+    chartkick (5.2.0)
     childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
@@ -251,7 +251,7 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (5.0.1)
+    erb (5.0.2)
     erubi (1.13.1)
     erubis (2.7.0)
     excon (1.2.5)
@@ -341,6 +341,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
+    i18n_data (1.1.0)
+      simple_po_parser (~> 1.1)
     icalendar (2.11.2)
       base64
       ice_cube (~> 0.16)
@@ -351,7 +353,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -423,14 +425,14 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.4.20)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
@@ -440,7 +442,7 @@ GEM
     nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.10)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -452,12 +454,9 @@ GEM
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
     open-uri (0.1.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.9.0)
       ast (~> 2.4.1)
@@ -499,20 +498,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -532,9 +531,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -553,8 +552,8 @@ GEM
     recaptcha (5.20.1)
     redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.11.1)
-    reline (0.6.1)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -582,7 +581,7 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.1)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
@@ -608,7 +607,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.79.2)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -628,7 +627,7 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.32.0)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -648,7 +647,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (2.4.1)
+    rubyzip (3.0.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -662,17 +661,17 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.7.0)
+    scout_apm (5.7.1)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.34.0)
+    selenium-webdriver (4.35.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
     sidekiq (7.3.9)
       base64
@@ -680,6 +679,7 @@ GEM
       logger
       rack (>= 2.2.4)
       redis-client (>= 0.22.2)
+    simple_po_parser (1.1.6)
     sprockets (3.7.5)
       base64
       concurrent-ruby (~> 1.0)
@@ -704,7 +704,7 @@ GEM
     trollop (1.16.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     unicorn (6.1.0)
@@ -730,7 +730,8 @@ GEM
       rack-test (>= 0.5.3)
     webrick (1.9.1)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
@@ -792,6 +793,7 @@ DEPENDENCIES
   haml_lint (>= 0.25.1)
   hashie (>= 3.5.3)
   i18n-tasks
+  i18n_data (~> 1.1)
   icalendar
   jquery-rails
   jquery-ui-rails!
@@ -809,7 +811,6 @@ DEPENDENCIES
   oj
   omniauth (~> 1.3)
   omniauth-flickr (>= 0.0.15)
-  omniauth-twitter
   percy-capybara (~> 5.0.0)
   pg
   platform-api

README.md

@@ -62,5 +62,3 @@ For more information about this project, contact [info@growstuff.org](mailto:inf
 
 Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).
 
-You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
-[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..

app/assets/stylesheets/_homepage.scss

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

app/assets/stylesheets/_members.scss

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

app/assets/stylesheets/mobile.scss

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

app/assets/stylesheets/overrides.scss

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

app/controllers/alternate_names_controller.rb

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

app/controllers/application_controller.rb

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

app/controllers/comments_controller.rb

@@ -13,43 +13,55 @@ class CommentsController < ApplicationController
   end
 
   def new
+    @commentable = find_commentable
     @comment = Comment.new
-    @post = Post.find_by(id: params[:post_id])
-
-    if @post
-      @comments = @post.comments
+    if @commentable
+      @comments = @commentable.comments
       respond_with(@comments)
     else
       redirect_to(request.referer || root_url,
-                  alert: "Can't post a comment on a non-existent post")
+                  alert: "Can't post a comment on a non-existent commentable")
     end
   end
 
   def edit
-    @comments = @comment.post.comments
+    # TODO: Why does this need a collection of comments?
+    @comments = @comment.commentable.comments
+    @commentable = @comment.commentable
   end
 
   def create
     @comment = Comment.new(comment_params)
+    @commentable = @comment.commentable
     @comment.author = current_member
     @comment.save
-    respond_with @comment, location: @comment.post
+    respond_with @comment, location: @commentable
   end
 
   def update
     @comment.update(body: comment_params['body'])
-    respond_with @comment, location: @comment.post
+    respond_with @comment, location: @comment.commentable
   end
 
   def destroy
-    @post = @comment.post
+    @commentable = @comment.commentable
     @comment.destroy
-    respond_with(@post)
+    respond_with(@commentable)
   end
 
   private
 
+  def find_commentable
+    return unless params[:comment]
+
+    if params[:comment][:commentable_type] == 'Photo'
+      Photo.find(params[:comment][:commentable_id])
+    elsif params[:comment][:commentable_type] == 'Post'
+      Post.find(params[:comment][:commentable_id])
+    end
+  end
+
   def comment_params
-    params.require(:comment).permit(:body, :post_id)
+    params.require(:comment).permit(:body, :commentable_id, :commentable_type)
   end
 end

app/controllers/crops_controller.rb

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

app/controllers/gardens_controller.rb

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

app/controllers/members_controller.rb

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

app/controllers/omniauth_callbacks_controller.rb

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

app/controllers/photos_controller.rb

@@ -21,6 +21,7 @@ class PhotosController < ApplicationController
 
   def show
     @crops = Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: @photo })
+    @comment = Comment.new(commentable: @photo)
     respond_with(@photo)
   end
 

app/controllers/plantings_controller.rb

@@ -91,6 +91,32 @@ class PlantingsController < DataController
     respond_with @planting, location: @planting.garden
   end
 
+  def transplant
+    # The `load_and_authorize_resource` in DataController will handle finding the
+    # planting and authorizing the action.
+    # We still need to authorize the new garden
+    new_garden = Garden.find(params[:garden_id])
+    authorize! :update, new_garden
+
+    # Mark original planting as finished
+    @planting.update(finished: true, finished_at: Time.zone.now)
+
+    # Create a new planting
+    new_planting = @planting.dup
+    new_planting.garden = new_garden
+    new_planting.slug = nil # let friendly_id generate a new slug
+    new_planting.finished = false
+    new_planting.finished_at = nil
+
+    if new_planting.save
+      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
+    else
+      # if the save fails, we should probably roll back the finishing of the original planting
+      @planting.update(finished: false, finished_at: nil)
+      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
+    end
+  end
+
   private
 
   def update_crop_medians
@@ -107,7 +133,7 @@ class PlantingsController < DataController
       :crop_id, :description, :garden_id, :planted_at,
       :parent_seed_id,
       :quantity, :sunniness, :planted_from, :finished,
-      :finished_at, :failed, problem_ids: []
+      :finished_at, :failed
     )
   end
 

app/controllers/problems_controller.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-class ProblemsController < ApplicationController
-  before_action :authenticate_member!, except: %i(index show)
-  load_and_authorize_resource id_param: :slug, class: Problem
-  respond_to :html, :json
-
-  def index
-    @problems = Problem.approved.popular.paginate(page: params[:page])
-    @num_requested_problems = requested_problems.size if current_member
-    respond_with @problems
-  end
-
-  def requested
-    @requested = requested_problems.paginate(page: params[:page])
-    respond_with @requested
-  end
-
-  def show
-    @problem = Problem.friendly.find(params[:id])
-    @plantings = @problem.plantings.paginate(page: params[:page])
-    respond_with @problem
-  end
-
-  def new
-    @problem = Problem.new
-    respond_with @problem
-  end
-
-  def edit; end
-
-  def create
-    @problem = Problem.new(problem_params)
-    if current_member.role? :problem_wrangler
-      @problem.creator = current_member
-    else
-      @problem.requester = current_member
-      @problem.approval_status = "pending"
-    end
-    @problem.save
-    respond_with @problem
-  end
-
-  def update
-    if can?(:wrangle, @problem)
-      @problem.approval_status = 'rejected' if params.fetch("reject", false)
-      @problem.approval_status = 'approved' if params.fetch("approve", false)
-    end
-    @problem.update(problem_params)
-    respond_with @problem
-  end
-
-  def wrangle
-    @approval_status = params[:approval_status]
-    @problems = case @approval_status
-                when "pending"
-                  Problem.pending_approval
-                when "rejected"
-                  Problem.rejected
-                else
-                  Problem.recent
-                end.paginate(page: params[:page])
-    @problem_wranglers = Role.problem_wranglers
-    respond_with @problems
-  end
-
-  private
-
-  def problem_params
-    params.require(:problem).permit(:name, :reason_for_rejection, :rejection_notes)
-  end
-
-  def requested_problems
-    current_member.requested_problems.pending_approval
-  end
-end

app/controllers/registrations_controller.rb

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

app/helpers/application_helper.rb

@@ -21,6 +21,10 @@ module ApplicationHelper
     classes
   end
 
+  def count_github_contibutors
+    File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
+  end
+
   # Produces a cache key for uniquely identifying cached fragments.
   def cache_key_for(klass, identifier = "all")
     count          = klass.count
@@ -32,7 +36,7 @@ module ApplicationHelper
   # of HAML, Tilt, and dynamic compilation with interpolated ruby.
   def markdownify(text)
     translator = Haml::Filters::GrowstuffMarkdown.new
-    translator.expand_members!(translator.expand_problems!(translator.expand_crops!(text.to_s)))
+    translator.expand_members!(translator.expand_crops!(text.to_s))
   end
 
   #
@@ -50,7 +54,6 @@ module ApplicationHelper
 
       uri.query = "&width=#{size}&height=#{size}" if uri.host == 'graph.facebook.com'
 
-      # TODO: Assess twitter - https://dev.twitter.com/overview/general/user-profile-images-and-banners
       # TODO: Assess flickr  - https://www.flickr.com/services/api/misc.buddyicons.html
 
       return uri.to_s
@@ -94,4 +97,8 @@ module ApplicationHelper
   def og_description(description)
     strip_tags(description).split(' ')[0..20].join(' ')
   end
+
+  def site_name
+    ENV.fetch('GROWSTUFF_SITE_NAME', 'Growstuff')
+  end
 end

app/helpers/buttons_helper.rb

@@ -2,6 +2,7 @@
 
 module ButtonsHelper
   include IconsHelper
+
   def garden_plant_something_button(garden, classes: "btn btn-default")
     return unless can? :edit, garden
 
@@ -97,7 +98,7 @@ module ButtonsHelper
   end
 
   def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')
-    return unless can?(:edit, planting) || planting.finished
+    return unless can?(:edit, planting) || planting.finished || planting.failed
 
     link_to planting_path(slug: planting.slug, planting: { finished: 1 }),
             method: :put, class: "#{classes} append-date" do
@@ -105,6 +106,15 @@ module ButtonsHelper
     end
   end
 
+  def planting_failed_button(planting, classes: 'btn btn-default btn-secondary')
+    return unless can?(:edit, planting) || planting.finished || planting.failed
+
+    link_to planting_path(slug: planting.slug, planting: { failed: 1 }),
+            method: :put, class: "#{classes}" do
+      finished_icon + ' ' + t('buttons.mark_as_failed')
+    end
+  end
+
   def seed_finish_button(seed, classes: 'btn btn-default')
     return unless can?(:create, Planting) && seed.active
 
@@ -122,7 +132,7 @@ module ButtonsHelper
   end
 
   def planting_save_seeds_button(planting, classes: 'btn btn-default')
-    return unless can?(:edit, planting)
+    return unless can?(:edit, planting) && !planting.failed?
 
     link_to new_planting_seed_path(planting_slug: planting.slug), class: classes do
       seed_icon + ' ' + t('buttons.save_seeds')

app/helpers/plantings_helper.rb

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

app/mailers/application_mailer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
+  helper :application
   default from: 'from@example.com'
   layout 'mailer'
 end

app/models/ability.rb

@@ -34,8 +34,6 @@ class Ability
     # are wranglers or admins
     cannot :read, Crop
     can :read, Crop, approval_status: "approved"
-    cannot :read, Problem
-    can :read, Problem, approval_status: "approved"
     # scientific names should only be viewable if associated crop is approved
     cannot :read, ScientificName
     can :read, ScientificName do |sn|
@@ -58,8 +56,6 @@ class Ability
     # members can see even rejected or pending crops if they requested it
     can :read, Crop, requester_id: member.id
     can :requested, Crop # see list of crops they've requested
-    can :read, Problem, requester_id: member.id
-    can :requested, Problem
 
     # managing your own user settings
     can :update, Member, id: member.id
@@ -86,14 +82,8 @@ class Ability
       can :gbif, Crop
     end
 
-    if member.role? :problem_wrangler
-      can :wrangle, Problem
-      can :manage, Problem
-    end
-
     # any member can create a crop provisionally
     can :create, Crop
-    can :create, Problem
 
     # can create & destroy their own authentications against other sites.
     can :create, Authentication
@@ -121,6 +111,10 @@ class Ability
     can :update, Planting do |planting|
       planting.garden.garden_collaborators.where(member_id: member.id).any?
     end
+    can :transplant, Planting, garden: { owner_id: member.id }
+    can :transplant, Planting do |planting|
+      planting.garden.garden_collaborators.where(member_id: member.id).any?
+    end
     can :destroy, Planting do |planting|
       planting.garden.garden_collaborators.where(member_id: member.id).any?
     end

app/models/alternate_name.rb

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

app/models/comment.rb

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

app/models/concerns/finishable.rb

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

app/models/concerns/open_farm_data.rb

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

app/models/concerns/predict_harvest.rb

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

app/models/concerns/predict_planting.rb

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

app/models/crop.rb

@@ -17,7 +17,6 @@ class Crop < ApplicationRecord
   has_many :scientific_names, dependent: :delete_all
   has_many :alternate_names, dependent: :delete_all
   has_many :plantings, dependent: :destroy
-  has_many :problems, through: :plantings
   has_many :seeds, dependent: :destroy
   has_many :harvests, dependent: :destroy
   has_many :photo_associations, dependent: :delete_all, inverse_of: :crop

app/models/csv_importer.rb

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

app/models/follow.rb

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

app/models/garden.rb

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

app/models/member.rb

@@ -42,10 +42,6 @@ class Member < ApplicationRecord
                              inverse_of: :requester
   has_many :created_crops, class_name: 'Crop', foreign_key: 'creator_id', dependent: :nullify,
                            inverse_of: :creator
-  has_many :requested_problems, class_name: 'Problem', foreign_key: 'requester_id', dependent: :nullify,
-                                inverse_of: :requester
-  has_many :created_problems, class_name: 'Problem', foreign_key: 'creator_id', dependent: :nullify,
-                              inverse_of: :creator
   has_many :created_alternate_names, class_name: 'AlternateName', foreign_key: 'creator_id', inverse_of: :creator
   has_many :created_scientific_names, class_name: 'ScientificName', foreign_key: 'creator_id', inverse_of: :creator
 
@@ -95,6 +91,9 @@ class Member < ApplicationRecord
             uniqueness: {
               case_sensitive: false
             }
+  validates :website_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
+  validates :instagram_handle, :facebook_handle, :bluesky_handle, format: { without: %r{\Ahttps?:\/\/|\/}, message: "should be a handle, not a URL" }, allow_blank: true
 
   #
   # Triggers

app/models/notification.rb

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

app/models/photo.rb

@@ -8,6 +8,7 @@ class Photo < ApplicationRecord
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze
 
   has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
+  has_many :comments, as: :commentable, dependent: :destroy
 
   # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
   # relationship instead.
@@ -83,6 +84,14 @@ class Photo < ApplicationRecord
     "#{title} by #{owner.login_name}"
   end
 
+  def subject
+    title
+  end
+
+  def author
+    owner
+  end
+
   def flickr_photo_id
     source_id if source == 'flickr'
   end

app/models/planting.rb

@@ -24,8 +24,6 @@ class Planting < ApplicationRecord
   belongs_to :crop, counter_cache: true
   has_many :harvests, dependent: :destroy
   has_many :activities, dependent: :destroy
-  has_many :planting_problems, dependent: :destroy
-  has_many :problems, through: :planting_problems
 
   #
   # Ancestry of food
@@ -45,7 +43,8 @@ class Planting < ApplicationRecord
       .where.not(gardens: { latitude: nil })
       .where.not(gardens: { longitude: nil })
   }
-  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :active, -> { where(finished: false, failed: false).where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :failed, -> { where(failed: true) }
   scope :annual, -> { joins(:crop).where(crops: { perennial: false }) }
   scope :perennial, -> { joins(:crop).where(crops: { perennial: true }) }
   scope :interesting, -> { has_photos.one_per_owner.order(planted_at: :desc) }
@@ -74,6 +73,7 @@ class Planting < ApplicationRecord
   validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
+  validate :cannot_be_finished_and_failed
   validates :quantity, allow_nil: true, numericality: {
     only_integer: true, greater_than_or_equal_to: 0
   }
@@ -98,7 +98,11 @@ class Planting < ApplicationRecord
   end
 
   def finished?
-    finished || (finished_at.present? && finished_at <= Time.zone.today)
+    (finished || (finished_at.present? && finished_at <= Time.zone.today)) && !failed?
+  end
+
+  def failed?
+    failed
   end
 
   def planted?
@@ -122,6 +126,10 @@ class Planting < ApplicationRecord
 
   private
 
+  def cannot_be_finished_and_failed
+    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
+  end
+
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both

app/models/planting_problem.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class PlantingProblem < ApplicationRecord
-  include PhotoCapable
-
-  belongs_to :planting
-  belongs_to :problem
-end

app/models/post.rb

@@ -3,6 +3,7 @@
 class Post < ApplicationRecord
   extend FriendlyId
   include Likeable
+
   friendly_id :author_date_subject, use: %i(slugged finders)
   include PhotoCapable
 
@@ -10,17 +11,15 @@ class Post < ApplicationRecord
   # Relationships
   belongs_to :author, class_name: 'Member', inverse_of: :posts
   belongs_to :forum, optional: true
-  has_many :comments, dependent: :destroy
+  has_many :comments, as: :commentable, dependent: :destroy
   has_many :crop_posts, dependent: :delete_all
   has_many :crops, through: :crop_posts
-  has_many :problem_posts, dependent: :delete_all
-  has_many :problems, through: :problem_posts
+  has_many :notifications, as: :notifiable, dependent: :destroy
 
   after_create :send_notification
   #
   # Triggers
   after_save :update_crop_posts_association
-  after_save :update_problem_posts_association
 
   default_scope { joins(:author).merge(Member.kept) } # Ensures the owner still exists
 
@@ -78,17 +77,6 @@ class Post < ApplicationRecord
     end
   end
 
-  def update_problem_posts_association
-    problems.clear
-    # look for problems mentioned in the post. eg. [aphids](problem)
-    body.scan(Haml::Filters::GrowstuffMarkdown::PROBLEM_REGEX) do |_m|
-      problem_name = Regexp.last_match(1)
-      problem = Problem.case_insensitive_name(problem_name).first
-      # create association
-      problems << problem if problem && problems.exclude?(problem)
-    end
-  end
-
   def send_notification
     recipients = []
     sender = author.id
@@ -109,6 +97,7 @@ class Post < ApplicationRecord
       Notification.create(
         recipient_id:,
         sender_id:    sender,
+        notifiable:   self,
         subject:      "#{author} mentioned you in their post #{subject}",
         body:
       )

app/models/problem.rb

@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-class Problem < ApplicationRecord
-  extend FriendlyId
-  include PhotoCapable
-  include SearchCrops # Note: This might need to be adapted to SearchProblems
-
-  friendly_id :name, use: %i(slugged finders)
-
-  ##
-  ## Relationships
-  belongs_to :creator, class_name: 'Member', optional: true, inverse_of: :created_problems
-  belongs_to :requester, class_name: 'Member', optional: true, inverse_of: :requested_problems
-  has_many :planting_problems, dependent: :delete_all
-  has_many :plantings, through: :planting_problems
-  has_many :problem_posts, dependent: :delete_all
-  has_many :posts, through: :problem_posts, dependent: :delete_all
-
-  ##
-  ## Scopes
-  scope :recent, -> { approved.order(created_at: :desc) }
-  scope :popular, -> { approved.order(Arel.sql("plantings_count desc, lower(name) asc")) }
-  scope :pending_approval, -> { where(approval_status: "pending") }
-  scope :approved, -> { where(approval_status: "approved") }
-  scope :rejected, -> { where(approval_status: "rejected") }
-  scope :interesting, -> { approved.has_photos }
-  scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
-
-  ##
-  ## Validations
-  validates :reason_for_rejection, presence: true, if: :rejected?
-  validate :must_be_rejected_if_rejected_reasons_present
-  validate :must_have_meaningful_reason_for_rejection
-  validates :name, uniqueness: { scope: :approval_status }, if: :pending?
-
-  def to_s
-    name
-  end
-
-  def to_param
-    slug
-  end
-
-  def pending?
-    approval_status == "pending"
-  end
-
-  def approved?
-    approval_status == "approved"
-  end
-
-  def rejected?
-    approval_status == "rejected"
-  end
-
-  def approval_statuses
-    %w(rejected pending approved)
-  end
-
-  def reasons_for_rejection
-    ["already in database", "not a pest or disease", "not enough information", "other"]
-  end
-
-  def rejection_explanation
-    return rejection_notes if reason_for_rejection == "other"
-
-    reason_for_rejection
-  end
-
-  def self.case_insensitive_name(name)
-    where(["lower(problems.name) = :value", { value: name.downcase }])
-  end
-
-  private
-
-  def must_be_rejected_if_rejected_reasons_present
-    return if rejected?
-    return unless reason_for_rejection.present? || rejection_notes.present?
-
-    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
-  end
-
-  def must_have_meaningful_reason_for_rejection
-    return unless reason_for_rejection == "other" && rejection_notes.blank?
-
-    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
-  end
-end

app/models/problem_post.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class ProblemPost < ApplicationRecord
-  belongs_to :problem
-  belongs_to :post
-end

app/models/role.rb

@@ -8,7 +8,7 @@ class Role < ApplicationRecord
   has_and_belongs_to_many :members
 
   class << self
-    %i(crop_wranglers admins problem_wranglers).each do |method|
+    %i(crop_wranglers admins).each do |method|
       define_method method do
         slug = method.to_s.singularize.dasherize
         Role.where(slug:).try(:first).try(:members)

app/models/seed.rb

@@ -59,6 +59,7 @@ class Seed < ApplicationRecord
   scope :has_location, -> { joins(:owner).where.not('members.location': nil) }
   scope :recent, -> { order(created_at: :desc) }
   scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
+  scope :expired, -> { active.where('plant_before < ?', Time.zone.today) }
 
   def tradable
     tradable_to != 'nowhere'

app/resources/api/v1/planting_resource.rb

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

app/views/activities/_form.html.haml

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

app/views/activities/index.rss.haml

@@ -2,7 +2,7 @@
 %rss{ version: 2.0 }
   %channel
     %title
-      Recent activities from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
+      Recent activities from #{@owner ? @owner : 'all members'} (#{site_name})
     %link= activities_url
     - @activities.each do |activity|
       %item

app/views/activities/show.html.haml

@@ -5,7 +5,7 @@
     = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Activities', activities_path

app/views/admin/index.html.haml

@@ -3,7 +3,7 @@
 - content_for :breadcrumbs do
   %li.breadcrumb-item.active= link_to 'Admin', admin_path
 
-%h1 Manage #{ENV['GROWSTUFF_SITE_NAME']}
+%h1 Manage #{site_name}
 
 .row
   .col-md-4

app/views/alternate_names/_form.html.haml

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

app/views/alternate_names/show.html.haml

@@ -3,7 +3,7 @@
   = tag("meta", property: "og:title", content: @alternate_name.name)
   = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 %p#notice= notice
 

app/views/comments/_comments.html.haml

@@ -1,10 +1,10 @@
 %a{ name: "comments" }
-- if post.comments
+- if commentable.comments
   %hr/
   %h2
     = comment_icon
-    = localize_plural(post.comments, Comment)
-  - post.comments.post_order.each do |comment|
+    = localize_plural(commentable.comments, Comment)
+  - commentable.comments.post_order.each do |comment|
     = render "comments/single", comment: comment
 
 - else

app/views/comments/_description.haml

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

app/views/comments/_form.html.haml

@@ -1,3 +1,4 @@
+- @comment ||= Comment.new(commentable: @commentable)
 .card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
   .card-body
     - if content_for? :title
@@ -14,13 +15,13 @@
               %li= msg
 
       .md-form
-        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus'
+        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus', required: true, pattern: '\w+'
         = f.label :body, "Your comment:"
 
       %span.help-block
         = render partial: "shared/markdown_help"
       .actions.text-right
         = f.submit 'Post comment', class: 'btn btn-primary'
-      - if defined?(@post)
-        .field
-          = f.hidden_field :post_id, value: @post.id
+      .field
+        = f.hidden_field :commentable_id, value: @commentable.id
+        = f.hidden_field :commentable_type, value: @commentable.class.name

app/views/comments/edit.html.haml

@@ -2,6 +2,6 @@
 
 %p
   Editing comment on
-  = link_to @comment.post.subject, @comment.post
+  = link_to @comment.commentable.subject, @comment.commentable
 
-= render 'form'
+= render 'form', locals: { comment: @comment, commentable: @comment.commentable }

app/views/comments/index.rss.haml

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 %rss{ version: 2.0 }
   %channel
-    %title Recent comments on all posts (#{ENV['GROWSTUFF_SITE_NAME']})
+    %title Recent comments on all posts (#{site_name})
     %link= comments_url
     - @comments.each do |comment|
       %item
-        %title Comment by #{comment.author.login_name} on #{comment.post.subject}
+        %title Comment by #{comment.author.login_name} on #{comment.commentable.subject}
         %description
           :escaped_markdown
             <p>
             Comment on
-            #{ link_to comment.post.subject, post_url(comment.post) }
+            #{ link_to comment.commentable.subject, polymorphic_url(comment.commentable) }
             </p>
 
           :escaped_markdown
             #{ strip_tags markdownify(comment.body) }
 
         %pubdate= comment.created_at.to_fs(:rfc822)
-        %link= post_url(comment.post)
+        %link= polymorphic_url(comment.commentable)
         %guid= comment_url(comment)
+

app/views/comments/new.html.haml

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

app/views/crops/_actions.html.haml

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

app/views/crops/_alternate_names.html.haml

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

app/views/crops/_info.haml

@@ -18,7 +18,7 @@
       - if !@crop.plantings.empty?
         #{@crop.name.titleize} has been planted
         = pluralize(@crop.plantings.size, "time")
-        by #{ENV['GROWSTUFF_SITE_NAME']} members.
+        by #{site_name} members.
       - else
         Nobody is growing this yet. You could be the first!
     - if @crop.description.present?

app/views/crops/_planting_advice.html.haml

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

app/views/crops/_wrangle.html.haml

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

app/views/crops/index.rss.haml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 %rss{ version: 2.0 }
   %channel
-    %title Recently added crops (#{ENV['GROWSTUFF_SITE_NAME']})
+    %title Recently added crops (#{site_name})
     %link= crops_url
     - @crops.each do |crop|
       %item

app/views/crops/show.html.haml

@@ -4,7 +4,7 @@
   = tag("meta", property: "og:title", content: @crop.name)
   = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 - content_for :scripts do
   = javascript_include_tag "charts"
@@ -30,15 +30,6 @@
         - @crop.companions.each do |companion|
           = render 'crops/tiny', crop: companion
 
-    - if @problems.any?
-      %section.problems
-        %h2 Problems
-        - @problems.group_by(&:name).each do |problem_name, problems|
-          - problem = problems.first
-          = link_to problem_path(problem) do
-            = problem_name
-            %span.badge.badge-secondary= problems.size
-
     %section.photos
       = cute_icon
       = render 'crops/photos', crop: @crop
@@ -83,7 +74,6 @@
       .card-body
         %h4 How to grow #{@crop.name.pluralize}
         = render 'grown_for', crop: @crop
-        = render 'planting_advice', crop: @crop
         - if @crop.parent
           %hr/
           %p.parent-crop
@@ -125,7 +115,7 @@
     .card
       .card-body
         %h3 Learn more about #{@crop.name.pluralize}
-        %h4.text-muted resources outside #{ENV['GROWSTUFF_SITE_NAME']}
+        %h4.text-muted resources outside #{site_name}
 
       %ul.list-group.list-group-flush
         %li.list-group-item
@@ -133,13 +123,6 @@
             = icon 'fas', 'external-link-alt'
             Wikipedia (English)
 
-        %li.list-group-item
-          = link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}",
-                    class: 'card-link',
-                    target: "_blank",
-                    rel: "noopener noreferrer" do
-            = icon 'fas', 'external-link-alt'
-            OpenFarm - Growing guide
         %li.list-group-item
           = link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
                     target: "_blank",
@@ -156,6 +139,14 @@
               = icon 'fas', 'external-link-alt'
               Google
 
+        %li.list-group-item
+          = link_to 'https://chat.openai.com/?model=gpt-4o&prompt=' + CGI.escape(['How do I grow', @crop.name, "and what grows well with it? What should I plant the next season if practicing crop rotation? Explain why and add links to your sources"].join(' ')),
+                  target: "_blank",
+                  class: 'card-link',
+                  rel: "noopener noreferrer" do
+            = icon 'fas', 'external-link-alt'
+            ChatGPT
+
         %li.list-group-item
           = link_to "https://wikihow.com/wikiHowTo?search=#{CGI.escape "grow #{@crop.name}" }",
                     target: "_blank",

app/views/devise/mailer/confirmation_instructions.html.haml

@@ -1,4 +1,3 @@
-- site_name = ENV['GROWSTUFF_SITE_NAME']
 %p Hello #{@resource.login_name},
 
 %p

app/views/devise/mailer/reset_password_instructions.html.haml

@@ -1,4 +1,3 @@
-- site_name = ENV['GROWSTUFF_SITE_NAME']
 %p Hello #{@resource.login_name},
 
 %p

app/views/devise/mailer/unlock_instructions.html.haml

@@ -1,4 +1,3 @@
-- site_name = ENV['GROWSTUFF_SITE_NAME']
 %p Hello #{@resource.login_name},
 
 %p

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

@@ -4,7 +4,7 @@
   %br/
   = render 'devise/shared/error_messages', resource: resource
 
-  %p Delete your account from #{ENV['GROWSTUFF_SITE_NAME']}.
+  %p Delete your account from #{site_name}.
   .form-group
     = f.label :current_password, "Password required to delete", class: 'control-label col-md-2'
     .col-md-4

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

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

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

@@ -32,7 +32,7 @@
     .col-md-offset-2.col-md-8.checkbox
       %label
         = f.check_box :newsletter
-        Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter
+        Subscribe to the #{site_name} newsletter
       .help-block
         = render partial: 'newsletter_blurb'
 

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

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

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

@@ -1,4 +1,4 @@
-The #{ENV['GROWSTUFF_SITE_NAME']} newsletter is sent out
+The #{site_name} newsletter is sent out
 every few weeks. Check out our
 = link_to 'past newsletters', 'http://blog.growstuff.org/category/newsletter/'
 if you want to see the sort of thing we'll send you.  Of course, we'll never spam you

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

@@ -1,8 +1,8 @@
 .form-page
   .card.form-card
-    %h1 Join #{ENV['GROWSTUFF_SITE_NAME']}
+    %h1 Join #{site_name}
     .card-body
-      %p Sign up for a #{ENV['GROWSTUFF_SITE_NAME']} account to track your vegetable garden and connect with other local growers.
+      %p Sign up for a #{site_name} account to track your vegetable garden and connect with other local growers.
       %p If you have accessibility issues with the captcha, please contact us via the links in the footer and we will help.
 
     = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name),
@@ -24,7 +24,7 @@
         to the #{link_to 'Terms of Service', "/policy/tos"}
 
       %p
-        = f.check_box :newsletter, checked: true, label: "Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter"
+        = f.check_box :newsletter, checked: true, label: "Subscribe to the #{site_name} newsletter"
       %p= render partial: 'newsletter_blurb'
 
       = f.submit "Sign up", class: 'btn btn-block btn-success'

app/views/forums/show.html.haml

@@ -5,7 +5,7 @@
   = tag("meta", property: "og:title", content: @forum.name)
   = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 %h1= @forum.name
 

app/views/garden_collaborators/index.html.haml

@@ -18,7 +18,7 @@
 
     %hr/
     %p.text-center
-      #{ENV['GROWSTUFF_SITE_NAME']} helps you track what you're
+      #{site_name} helps you track what you're
       harvesting from your home garden and see how productive it is.
 
 

app/views/garden_types/index.html.haml

@@ -1,7 +1,7 @@
 - content_for :title, 'GardenTypes'
 
 %p
-  #{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
+  #{site_name} tracks who's growing what, where.
   View any garden_type page to see which of our members have used it.
 
 .index-cards

app/views/gardens/show.html.haml

@@ -7,7 +7,7 @@
   = tag("meta", property: "og:title", content: "#{@garden.owner}'s #{@garden}")
   = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Gardens', gardens_path

app/views/harvests/index.rss.haml

@@ -2,7 +2,7 @@
 %rss{ version: 2.0 }
   %channel
     %title
-      Recent harvests from #{@owner ||= 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
+      Recent harvests from #{@owner ||= 'all members'} (#{site_name})
     %link= harvests_url
     - @harvests.each do |harvest|
       %item

app/views/harvests/show.html.haml

@@ -5,7 +5,7 @@
   = tag("meta", property: "og:title", content: "#{@harvest.crop} harvested by #{@harvest.owner}")
   = 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'])
+  = tag("meta", property: "og:site_name", content: site_name)
 
 - content_for :breadcrumbs do
   %li.breadcrumb-item= link_to 'Harvests', harvests_path

app/views/home/_blurb.html.haml

@@ -1,7 +1,7 @@
 .row.homepage-blurb
   .col-md-8.info
     %h1 Growstuff - An open gardening platform
-    %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
+    %p= t('.intro', site_name: site_name)
     = render 'stats'
   .col-md-4
     .signup

app/views/home/_stats.html.haml

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

app/views/home/index.html.haml

@@ -1,13 +1,14 @@
 - content_for :title do
-  = ENV['GROWSTUFF_SITE_NAME']
+  = site_name
 
 - if member_signed_in?
   .row
     .col-lg-8.col-md-12
-      %h1.display-4= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
+      %h1.display-4= t('.welcome', site_name: site_name, member_name: current_member)
 
       %p= render 'stats', cached: true
     .col
+      %br
       %p
         - if current_member.plantings.active.any?
           = link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
@@ -61,3 +62,16 @@
     %section.members
       = cute_icon
       = render 'members', cached: true
+  .col-12.col-lg-6
+    %section.pwa-install
+      = cute_icon
+      %h2.text-center= t('home.pwa_title')
+      .index-cards
+        .card
+          .card-body
+            %h3= t('home.pwa_ios_title')
+            %p= t('home.pwa_ios_steps_html')
+        .card
+          .card-body
+            %h3= t('home.pwa_android_title')
+            %p= t('home.pwa_android_steps_html')

app/views/layouts/_head.html.haml

@@ -6,27 +6,27 @@
   - else
     = tag("meta", property: "og:image", content: image_url('facebook-thumbnail.png'))
     = tag("meta", property: "og:title",
-          content: (content_for?(:title) ? yield(:title) + " - " : "") + ENV['GROWSTUFF_SITE_NAME'])
+          content: (content_for?(:title) ? yield(:title) + " - " : "") + site_name)
     = tag("meta", property: "og:type", content: "website")
     = tag("meta", property: "og:url", content: root_url)
-    = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
+    = tag("meta", property: "og:site_name", content: site_name)
 
   - if content_for?(:member_rss_login_name) && content_for(:member_rss_slug)
     = auto_discovery_link_tag(:rss,
       { controller: "/members", action: 'show', format: "rss", id: yield(:member_rss_slug) },
-      title: "#{ENV['GROWSTUFF_SITE_NAME']}- #{yield(:member_rss_login_name)}'s posts")
+      title: "#{site_name}- #{yield(:member_rss_login_name)}'s posts")
   = auto_discovery_link_tag(:rss,
                             { controller: "/posts", format: "rss" },
-                            title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recent posts from all members")
+                            title: "#{site_name} - Recent posts from all members")
   = auto_discovery_link_tag(:rss,
                             { controller: "/crops", format: "rss" },
-                            title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recently added crops")
+                            title: "#{site_name} - Recently added crops")
   = auto_discovery_link_tag(:rss,
                             { controller: "/plantings", format: "rss" },
-                            title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recent plantings from all members")
+                            title: "#{site_name} - Recent plantings from all members")
 
   %title
-    = content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
+    = content_for?(:title) ? yield(:title) + " - #{site_name} " : site_name
   = csrf_meta_tags
   = stylesheet_link_tag "application", media: "all"