From 2484bd39ed6e12d698e2fce2ed10b5b51e9631dc Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 13 Oct 2024 14:25:46 +1030 Subject: [PATCH] Render where a planting is in card view (#3882) * Render where a planting is in card view * Update app/assets/stylesheets/_plantings.scss --- app/assets/stylesheets/_plantings.scss | 9 +++++++++ app/models/concerns/search_plantings.rb | 1 + app/models/planting.rb | 1 + app/views/plantings/_card.html.haml | 11 +++++++---- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_plantings.scss b/app/assets/stylesheets/_plantings.scss index a65aeb75c..0b3d37874 100755 --- a/app/assets/stylesheets/_plantings.scss +++ b/app/assets/stylesheets/_plantings.scss @@ -47,4 +47,13 @@ margin-left: auto; } } + + .card-footer { + max-height: 2em; + -webkit-line-clamp: 1; + overflow: hidden; + text-overflow: ellipsis; + margin-bottom: 0.5em; + padding-top: 0; + } } diff --git a/app/models/concerns/search_plantings.rb b/app/models/concerns/search_plantings.rb index d8a0c135a..0900f7e9b 100644 --- a/app/models/concerns/search_plantings.rb +++ b/app/models/concerns/search_plantings.rb @@ -30,6 +30,7 @@ module SearchPlantings quantity:, sunniness:, garden_id:, + garden_slug: garden&.garden_slug, garden_name: garden&.name, description:, diff --git a/app/models/planting.rb b/app/models/planting.rb index 134908ad8..a1c469d69 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -61,6 +61,7 @@ class Planting < ApplicationRecord to: :crop, prefix: true delegate :login_name, :slug, :location, to: :owner, prefix: true delegate :slug, to: :planting, prefix: true + delegate :slug, :name, to: :garden, prefix: true delegate :annual?, :perennial?, :svg_icon, to: :crop delegate :location, :longitude, :latitude, to: :garden diff --git a/app/views/plantings/_card.html.haml b/app/views/plantings/_card.html.haml index ded3b6773..7555cb75a 100644 --- a/app/views/plantings/_card.html.haml +++ b/app/views/plantings/_card.html.haml @@ -31,7 +31,10 @@ .text-center= render 'plantings/badges', planting: planting = render 'plantings/progress', planting: planting .card-footer - .float-right - %span.chip.member-chip - = link_to member_path(slug: planting.owner_slug) do - = planting.owner_login_name \ No newline at end of file + %small + Planted by + = link_to member_path(slug: planting.owner_slug), class: "owner-link" do + = planting.owner_login_name + in + = link_to garden_path(slug: planting.garden_slug), class: "garden-link" do + = planting.garden_name \ No newline at end of file