Merge pull request #4144 from Growstuff/grid-layout

Improve profile page display slightly

.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)

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/views/layouts/_header.html.haml

@@ -6,6 +6,6 @@
         %span.site-name Growstuff
   .nav= render 'crops/search_bar'
   .nav
-    %button.navbar-toggler{ "aria-controls" => "offcanvasNavbar", "aria-label" => "Toggle navigation", "data-bs-target" => "#offcanvasNavbar", "data-bs-toggle" => "offcanvas", 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

@@ -1,102 +1,98 @@
-.offcanvas.offcanvas-start#offcanvasNavbar{ 'aria-labelledby' => 'offcanvasNavbarLabel', 'tabindex' => '-1' }
-  .offcanvas-header
-    %h5.offcanvas-title#offcanvasNavbarLabel Menu
-    %button.btn-close.text-reset{ 'data-bs-dismiss' => 'offcanvas', 'aria-label' => 'Close' }
-  .offcanvas-body
-    %ul.navbar-nav.mr-auto
-      - if signed_in?
-        %li.nav-item
-          = link_to timeline_index_path, method: :get, class: 'nav-link' do
-            = image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
-        %li.nav-item
-          = link_to member_gardens_path(current_member), class: 'nav-link', title: "My gardens" do
-            = image_icon 'gardens'
-        %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-            = image_tag "icons/gardener.svg", class: 'img img-icon', alt: t('.record'), aria: { hidden: "true" }
-            = t('.record')
-          .dropdown-menu
-            = link_to new_planting_path, class: 'dropdown-item' do
-              = image_icon('planting-add')
-              = t('buttons.new_planting')
-            = 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')
-            = link_to new_post_path, class: 'dropdown-item' do
-              = post_icon
-              = t('buttons.new_post')
+#navbarSupportedContent.collapse.navbar-collapse
+  %ul.navbar-nav.mr-auto
+    - if signed_in?
+      %li.nav-item
+        = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
+          = image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
+      %li.nav-item
+        = link_to member_gardens_path(current_member), class: 'nav-link text-white', title: "My gardens" do
+          = image_icon 'gardens'
+      %li.nav-item.dropdown
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+          = image_tag "icons/gardener.svg", class: 'img img-icon', alt: t('.record'), aria: { hidden: "true" }
+          = t('.record')
+        .dropdown-menu
+          = link_to new_planting_path, class: 'dropdown-item' do
+            = image_icon('planting-add')
+            = t('buttons.new_planting')
+          = 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')
+          = link_to new_post_path, class: 'dropdown-item' do
+            = post_icon
+            = t('buttons.new_post')
 
-      - cache("everyone-menu", expires_in: 1.week) do
+    - cache("everyone-menu", expires_in: 1.week) do
+      %li.nav-item.dropdown
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
+        .dropdown-menu
+          = link_to crops_path, class: 'dropdown-item' do
+            = t('.browse_crops')
+          = link_to seeds_path, class: 'dropdown-item' do
+            = seed_icon
+            = t('.seeds')
+          = link_to plantings_path, class: 'dropdown-item' do
+            = planting_icon
+            = t('.plantings')
+          = link_to harvests_path, class: 'dropdown-item' do
+            = harvest_icon
+            = t('.harvests')
+      %li.nav-item.dropdown
+        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= 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'
+          = link_to t('.posts'), posts_path, class: 'dropdown-item'
+          = link_to t('.forums'), forums_path, class: 'dropdown-item'
+
+    - if member_signed_in?
+      - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
         %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
-          .dropdown-menu
-            = link_to crops_path, class: 'dropdown-item' do
-              = t('.browse_crops')
-            = link_to seeds_path, class: 'dropdown-item' do
-              = seed_icon
-              = t('.seeds')
-            = link_to plantings_path, class: 'dropdown-item' do
-              = planting_icon
-              = t('.plantings')
-            = link_to harvests_path, class: 'dropdown-item' do
-              = harvest_icon
-              = t('.harvests')
-        %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
+          %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"}
-            = link_to t('.community_map'), places_path, class: 'dropdown-item'
-            = link_to t('.browse_members'), members_path, class: 'dropdown-item'
-            = link_to t('.posts'), posts_path, class: 'dropdown-item'
-            = link_to t('.forums'), forums_path, class: 'dropdown-item'
+            - if current_member.role?(:crop_wrangler)
+              = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
+            - if current_member.role?(:admin)
+              = link_to t('.admin'), admin_path, class: 'dropdown-item'
 
-      - if member_signed_in?
-        - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
-          %li.nav-item.dropdown
-            %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
-            .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
-              - if current_member.role?(:crop_wrangler)
-                = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
-              - if current_member.role?(:admin)
-                = 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-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?
+            %span.badge.badge-info= current_member.unread_count
+        .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
+            = t('.plantings')
+          = link_to member_harvests_path(current_member), class: 'dropdown-item' do
+            = t('.harvest')
+          = link_to member_seeds_path(current_member), class: 'dropdown-item' do
+            = t('.seeds')
+          = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
 
-        %li.nav-item.dropdown
-          %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?
-              %span.badge.badge-info= current_member.unread_count
-          .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
-              = t('.plantings')
-            = link_to member_harvests_path(current_member), class: 'dropdown-item' do
-              = t('.harvest')
-            = link_to member_seeds_path(current_member), class: 'dropdown-item' do
-              = t('.seeds')
-            = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
-
-            - if current_member.unread_count.positive?
-              .dropdown-divider
-              %strong
-                = link_to(conversations_path, class: 'dropdown-item') do
-                  = t('.inbox')
-                  %span.badge.badge-info= current_member.unread_count
-            - else
-              = link_to t('.inbox'), conversations_path, class: 'dropdown-item'
+          - if current_member.unread_count.positive?
             .dropdown-divider
-            = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'
+            %strong
+              = link_to(conversations_path, class: 'dropdown-item') do
+                = t('.inbox')
+                %span.badge.badge-info= current_member.unread_count
+          - else
+            = link_to t('.inbox'), conversations_path, class: 'dropdown-item'
+          .dropdown-divider
+          = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'
 
-      - else
-        %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn btn-signin'
-        %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn btn-signup'
+    - else
+      %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn btn-signin'
+      %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn btn-signup'

app/views/members/_bio.html.haml

@@ -1,13 +1 @@
 %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_registration_path
-  - else
-    #{member.login_name} hasn't written a bio yet.
-- else
-  :markdown
-    #{ strip_tags markdownify(member.bio) }

app/views/members/_map.html.haml

@@ -5,5 +5,5 @@
     = link_to member.location, place_path(member.location, anchor: "members")
 - else
   .location-not-set
-    .sr-only Location not known
-    .sr-only We can't show you what's nearby
+    %h1 Location not known or geocodable
+    %p We can't show you what's nearby

app/views/members/show.html.haml

@@ -21,6 +21,21 @@
         .row
           .col= render "bio", member: @member
           .col= render "avatar", member: @member
+        .row
+          .col
+            %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_registration_path
+              - else
+                #{@member.login_name} hasn't written a bio yet.
+            - else
+              :markdown
+                #{ strip_tags markdownify(@member.bio) }
+
         - if @member.roles.any?
           %p
             - @member.roles.each do |role|
@@ -30,12 +45,16 @@
             = icon 'fas', 'map-marker'
             = truncate(@member.location, length: 15, separator: ' ', omission: '... ')
         %p
-          %strong Member since
-          = @member.created_at.to_fs(:date)
+          %small
+            %strong Member since
+            %br
+            = @member.created_at.to_fs(:date)
         - if @member.last_sign_in_at
           %p
-            %strong Last Login
-            = @member.last_sign_in_at&.to_fs(:default)
+            %small
+              %strong Last Login
+              %br
+              = @member.last_sign_in_at&.to_fs(:default)
 
         - if can? :update, @member
           = link_to edit_member_registration_path, class: 'btn btn-block' do

lib/tasks/openfarm.rake

@@ -9,10 +9,12 @@ namespace :openfarm do
     OpenfarmService.new.import!
   end
 
-  desc "Delete all pictures with source OpenFarm"
+  desc "Delete all pictures with source OpenFarm or from legacy S3 URL"
   task delete_pictures: :environment do
-    puts "Deleting pictures with source OpenFarm..."
+    puts "Deleting pictures with source OpenFarm or from legacy S3 URL..."
+    s3_legacy_url = 'https://s3.amazonaws.com/openfarm-project/%'
     photos_to_delete = Photo.where(source: 'openfarm')
+                            .or(Photo.where('fullsize_url LIKE ?', s3_legacy_url))
     count = photos_to_delete.count
     photos_to_delete.each do |photo|
       photo.associations.each do |photo_association|