* Restore the Ruby 4.0.6 upgrade
PR #4831 committed a stale Gemfile.lock over the newer one, taking
.ruby-version back to 3.2.3 and rolling back active_median, dalli,
parallel, rbs and selenium-webdriver. Dockerfile and
.devcontainer/Dockerfile still build on Ruby 4, so the Gemfile's version
check fails against the image.
Restores both files to what they were before that merge.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Tidy plantings#show, and make cards and menus consistent
This page read as a page about the crop rather than about one member's
planting, and its sections each did things their own way. Changes follow
the conventions written up in the UI consistency guide.
Identity
- Title, meta description and OpenGraph all read "<crop> planting by
<owner>"; the hero carries a muted "planting by X in Y" subtitle and
the scientific name moves to the crop card.
- Breadcrumb's last item is plain text, not a link to the current page.
Actions
- One actions menu per page: a quiet three-dot button in the top right of
the hero, rendered by the new PlantingActions island, opening the
EditPlanting, RecordHarvest, SaveSeeds, MarkFinished and AddPhoto
dialogs that already existed for the garden list.
- Menu items are lower case, so a menu reads as a list of things you can
do rather than a row of headings.
- Transplanting moves out of the sidebar into a dialog off that menu: it
is done once in a planting's life and should not hold real estate.
- The second seed-saving dropdown and the loose photo buttons are gone;
each section keeps one quiet "add" on its heading bar as the non-JS
path.
- The plant-part icons from the server-rendered harvest form now reach
the dialog, via icon_url on HarvestFormSerializer.
Fact cards
- Every card fills the same four slots, and the core cards always render
so one planting's page has the same shape as the next.
- Progress reads as a percentage with "day 43 of 90" beneath; quantity
and "grown from" merge into one card rather than both saying
"seedling"; rating is stars and renders even when unrated.
- Dates go through I18n.l and standard_time_distance instead of
assembling abbr_month_names by hand.
- Adds Planting#planned?, replacing three copies of age_in_days < 0.
- Perennial no longer claims the plant "grows back each year".
Cards by type
- Harvest cards get square corners, a warm accent and the harvest icon,
and say "<crop> harvest", so they are not mistaken for plantings.
- Seed cards are drawn as seed packets: portrait, papery, torn top edge,
printed band, small print along the foot and the year saved stamped on
them.
Layout
- The page wrapper is .planting-show, not .planting: that is the planting
*card's* class, and its absolutely positioned badges and quick actions
were leaking onto this page.
- Sections are bordered blocks with their heading bar as the lid, so a
heading and its content read as one thing.
- One spacing scale, and the hero aligns to the same left edge as
everything below it.
Copy
- Section headings and empty states go through en.yml, in one voice.
- "Add a photo to visually track growth of this planting, to Flickr,
iNaturalist or Pl@ntNet" was nonsense: photos come from Flickr only.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Use the harvest and seed cards site-wide, and rate a planting in place
The new harvest cards and seed packets only appeared on plantings#show.
Everywhere else either used the old thumbnails or hand-rolled its own
markup, which is what made harvests and plantings look alike in the first
place.
- members#show and members/_harvests render harvests/card. The latter also
wrapped each card in another .card, which nested a card in a card.
- The homepage harvest list was hand-rolled markup beside a seeds section
that already used seeds/card; both now use the shared partials.
- Homepage seed packets go in an .index-cards grid. Outside one they have
no width, and the packet's 3:4 ratio made each half the page wide.
- harvests/_harvest and seeds/_seed chose between card and thumbnail on a
`full:` local that nothing passes. Both render the card.
The crop pages' harvest and seed panels are lists of links in a sidebar,
not card grids, so they are left alone.
Section "add" buttons now open the same dialogs as the actions menu, via a
data-planting-dialog attribute the island listens for. Their href stays as
the fallback without JavaScript.
The rating card is now clickable: for someone who may edit the planting it
renders StarRating, which saves the new rating and puts it back if the
save fails. The card's own heading is the label, so the fieldset legend is
hidden rather than saying "Rating" twice.
"More photos" is a plain link again, and only shows when there are more
photos than the page is displaying — the photos are now paginated to 12,
where before the whole set was loaded and the link always showed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Put the like button beside the planting's name
It sat on its own below the hero, with a section's worth of space above
and below it, reading as an orphan rather than as something belonging to
the planting.
It now sits on the title line, right after the name, at its own size
rather than the title's.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Draw a border around the planting's own data
The title, facts, photos, harvests, seeds and planned activities now sit
inside one subtle border, so they read as one body of data rather than
running into the sidebar beside them.
Also drops the raised shadow from the like button. The global .btn shadow
made the heart look like a call to action it isn't.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Tidy the planting page sidebar, and the add-photo dialog
The sidebar was three blocks with three different treatments: a bare
owner card, the shared crop card, and a bordered neighbours section. They
now all use the same sections as the main column, with a heading bar each.
- The owner block leads with the avatar and who grows this where, rather
than a heading repeating "Planted by".
- The crop card renders without its footer here. "Add to my garden" and
"Save seeds" made no sense beside a planting you are already growing,
and the page offers both already. crops/_crop takes actions: false;
everywhere else keeps them.
- Partials shared with other pages bring their own .card, which inside a
section is a box in a box, so those are flattened.
Add-photo dialog:
- It now says what it is adding to: "Add photo to chives planting",
rather than "Add a photo to chives". Garden cards say which garden.
- While Flickr is being read the body holds roughly the height the picker
will take and centres the spinner, instead of a short dialog with a
spinner in the corner that jumps open when the photos arrive.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Say what kind of record a page is about in its title
"Chives" is a crop. A page about one member's chives should say "Chives
planting" in its heading, not leave the reader to work it out from the
furniture around it. The same for harvests and saved seeds.
- plantings#show: "Chives planting", subtitle "by <owner> in <garden>".
- harvests#show: "Basil harvest", subtitle "by <owner> · <date>". The
owner was in a %small inside the h1 before.
- seeds#show: already said "seeds"; it now names who saved them.
Gardens are left as they are: a garden's name is the member's own, so the
noun belongs in the subtitle rather than appended to a name that may
already contain it.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* One corner radius for all data cards, and harvest months by season
Cards used three different shapes: plantings rounded at 5%, harvests and
seed packets square. A percentage radius also draws an ellipse that
changes with the card's size, so a tall packet and a square planting card
curved differently. There is now one $card-radius, used by every data
card and by the section boxes.
Harvest months are grouped into the grower's own seasons, three months
each, named and kept together, starting at their spring — so a Wellington
gardener sees spring begin in September. Where we have no latitude we
show the plain January-to-December row rather than guessing at a
hemisphere.
The grower's location now appears in the page subtitle. It decides the
seasons and the harvest times, so it belongs with the rest of the
planting's identity rather than only as a "nearby" link in the sidebar.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Tidy the harvest months block
It was loose text at the end of the timeline partial: a bare "Harvest
months:" label, twelve badges, and a trailing "in <place>" that now
repeats the location in the page subtitle.
- Moved into its own partial with a proper label, rather than trailing
off the timeline.
- Dropped the repeated location.
- A legend says what a highlighted month means. Nothing said so before.
- The empty state is its own muted line instead of a sentence running on
from the label, and no longer says "we need more data" at the reader.
- Each badge carries its full month name for screen readers, and
highlighted ones say they are harvest months. The quiet months were
aria-hidden, so a screen reader heard the harvest months with no
calendar around them.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Give the sidebar crop block its own partial
Reusing crops/_crop inside a section meant a card inside a box: a white
strip between the green heading and the photo, the card's own shadow
sitting proud of the section, a photo that overshot the right edge, and
two corner radii disagreeing. Flattening it with negative margins was
fighting the card rather than fixing it.
plantings/_crop is written for this spot instead: the photo runs edge to
edge under the heading bar, the crop's name is title-cased with its
scientific name beneath, and the growing times are a short list rather
than three stats laid out side by side.
crops/_crop goes back to how it was, including its footer buttons, since
nothing needs to suppress them now.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Update the specs for the tidied planting page
Mostly copy and flow changes from the tidy-up, but two real bugs came out
of running them.
Bugs fixed:
- planting_actions_props didn't pass planted_at or today, which
MarkFinishedModal needs to decide whether "today" may be offered and
where the date box starts. Without them the dialog threw while
rendering, and with no error boundary React tore down the whole island,
so the actions menu vanished entirely.
- The dialogs reloaded the page from inside the save callback, tearing
the page down while the dialog was still finishing its own update. They
now close first and reload on the next tick.
Menu items are lower-cased in CSS, as the garden cards already do it,
rather than by calling downcase on the shared button translations. That
was mangling labels other pages show in sentence case.
Specs:
- Menu, dialog and section-heading flows updated: the actions menu opens
dialogs rather than navigating, so recording a harvest, marking a
planting finished, editing and transplanting all drive the dialog.
- Copy: "grows this in", "day 14 of 50", "Planned" for a future planting,
"4 of 5", the new harvest-months wording, and the add-photo dialog
naming what it adds to.
- The parent-seed example asserted a link to the planting, which came
from the breadcrumb; the last crumb is the page you are on, so it is
plain text now and the example checks the seed link instead.
- Removed spec/features/shared_examples/append_date.rb. It drove the old
datepicker finish flow and had one caller.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Stop avatars shifting the page during feature specs
spec/features/places/searching_a_place_spec.rb intermittently failed on
"goes to members' index page": the click on "View all members >>" landed
on nothing and the browser stayed put.
Member avatars come from gravatar.com over the network and were rendered
with img-fluid and no dimensions, so they reserved no space until they
arrived. The link sits directly under that grid. Capybara found the link,
an avatar landed, the link moved, and the click missed.
rails_helper meant to prevent this, but its guard tested for Poltergeist's
url_blacklist. Poltergeist is long gone and Selenium's browser has no such
method, so the condition was always false and the block never ran.
- Give the two avatar image tags explicit width and height, so the box is
reserved before the image loads. This fixes real layout shift for
members too, not only the specs.
- Replace the dead guard with config.x.blank_avatars, which browser specs
set, making avatar_uri return a blank inline GIF. Helper specs still
assert the real Gravatar URLs.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Fix avatar URI logic to prevent layout shift in all environments
* Add waiting assertions to prevent premature content checks after saving harvest
* Refactor PlantingActions to improve dialog handling and state management
Enhance PlantingRating to prevent multiple saves and improve error messaging
* Fix date input handling in planting edit dialog
* Add neighbour planting sidebar with improved styling and layout
* Tidy crops#show, and share the record page layout
The planting page's layout was planting-specific CSS. It is now a shared
.record-page / .record-panel in _record_page.scss, and crops#show uses it:
the crop's own data inside one border, the sidebar outside, sections as
bordered blocks with a heading bar as the lid.
Along the way a duplicate section rule and two copies of the kebab button
styling collapsed into one each.
Crop page:
- Scientific and alternate names sit under the crop's name, where they
belong, instead of having a sidebar card of their own. Wranglers add and
edit them from the actions menu, in a dialog; the loose "Add" buttons in
the page body are gone.
- The actions menu is the same three-dot kebab as plantings, in the top
right of the hero. The "you are a CROP WRANGLER" banner is gone: seeing
the menu already tells you that. Menu items have no icons now, except
delete, which keeps its icon and its red.
- Growing facts were split three ways — prose in the hero, prediction
cards in the main column, an OpenFarm list in the sidebar — and the
hero prose was the same fields as the OpenFarm ones. One "Growing X"
section of fact cards now holds all of it.
- The sidebar listed planting, harvest and seed counts directly above
three sections with those same names. The counts are headline numbers
in the hero instead, which also fills the space the hero was wasting.
- Main column reads top to bottom: how to grow it, how members grow it,
varieties, companions, photos, video, where it grows, posts, history.
Headings say something rather than naming a partial.
- Crop actions are just "Add to my garden". Recording a harvest, saving
seeds, posting and marking a planting failed all belong to a planting
you already have.
- The charts section rendered as an empty white strip whenever a crop had
any plantings or harvests but no chart to draw.
- The hero photo moved to the sidebar, where it has room.
Also: the whimsical icons perch on the heading bar below them rather than
sitting inside the box, the garden picker dialog gives every row the same
shape so the names line up, and crops/_grown_for.html.haml is deleted —
nothing rendered it once its content moved into the growing cards.
Specs are not updated yet: crop_detail_page_spec clicks "Record harvest"
on this page, which no longer exists.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Refactor crop-related views and styles for improved layout and functionality
- Update styles in _crops.scss for better alignment and spacing.
- Enhance _record_page.scss with a new section footer for actions.
- Modify _alternate_names.html.haml to improve dropdown functionality for editing and deleting names.
- Change _history.html.haml header to "Edit history" for clarity.
- Adjust _info.haml to display sowing method and sun requirements prominently.
- Revise _openfarm_data.html.haml to remove unnecessary comments and clarify content.
- Update _photos.html.haml to include a section footer for the "More photos" link.
- Refine _posts.html.haml to streamline the display of posts and actions.
- Improve _scientific_names.html.haml to enhance dropdown functionality for scientific names.
- Update tests in alternate_name_spec.rb and scientific_name_spec.rb to reflect UI changes.
- Remove unused _grown_for.html.haml_spec.rb file.
* Replace language text field with a dropdown select for improved user experience
* Enhance editable forms and fact cards for improved user interaction and layout
* Refactor styles and improve layout for planting details, including muted text color updates and enhanced card displays
* Refactor crop detail page for improved SEO and user experience, including updated links and content for planting and growing information.
* Adjust section add button width for better layout on heading bar
* Update link text for consistency and clarity in crop detail page
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
form-inline -> flex utilities, embed-responsive -> ratio ratio-16x9,
input-group-prepend wrapper removed (Bootstrap 5 puts the addon directly in
the group), and media/media-body -> d-flex/flex-grow-1.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
badge-info/success/... -> text-bg-info/success/..., which set the background
and a readable text colour together, and badge-pill -> rounded-pill. The site's
own badge-late, badge-harvest and similar hooks are unchanged.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Improve read performance with caching and memoization
- Memoize `Crop#all_companions` and `Member#unread_count` in models
- Implement instance-level memoization in `CropsHelper#crop_or_parent`
- Add Rails caching for expensive aggregate queries in `Charts::CropsController`
- Add fragment caching for high-impact sections on the crop show page
Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>
* Fix header spec failure due to memoized unread_count
- Reset `@unread_count` in `spec/views/layouts/_header_spec.rb` to ensure the updated notification count is rendered correctly.
Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
- Include the correct English title case
- Include the scientific name if available
- Clearly indicate the crop page is a growing guide and open data repository.
This commit improves the meta descriptions for several pages by making them dynamic and object-specific.
- The default meta description in `app/views/layouts/_head.html.haml` has been updated to include a mention of open data.
- The `show.html.haml` views for crops, seeds, plantings, harvests, and members now have a `content_for :meta_description` block. This block uses the object's description or bio if available, and falls back to a generated string if not.
This commit introduces a new partial to display nutritional data from the Australian Food Composition Database.
Key changes:
- Adds a database index to the `public_food_key` on the `crops` table.
- Establishes a `has_one` relationship between `Crop` and `AustralianFoodClassificationData`.
- Creates a `_nutritional_data.html.haml` partial to display a summary of key nutritional information.
- Renders the partial on the `show` pages for both crops and harvests.
* feat: Add version tracking to Crop model
This commit introduces version tracking for the Crop model using the PaperTrail gem.
Key changes include:
- Integrating `has_paper_trail` into the `Crop` model.
- Adding a "History" section to the crop show page to display a timeline of changes for that specific crop.
- Creating a new admin page for users with the "crop_wrangler" role to view a log of all recent crop edits, creations, and deletions.
- Fixing several N+1 query performance issues by eager-loading associated `Member` records in both the `CropsController` and the new `Admin::CropsController`.
- Refactoring view logic into a shared partial to reduce code duplication.
* Add papertrail
* Admin UI
* Add papertrail DB
* Add papertrail DB
* Rearrange
* Fix permissions
* Fix permissions
* Fix UI
* Fix UI
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
Adds schema.org markup to the crop pages using the BioChemEntity type. The taxonomicRange attribute is used to list the scientific names of the crop, which will improve SEO.
This commit introduces a series of changes to encourage user contributions for missing crop data.
On the crop show page, it adds links for logged-in users to:
- Add a description if one is not present.
- Add a YouTube video if one is not present.
- Add more attributes in the predictions section if any are missing.
On the crop edit page, the form now conditionally displays fields. For standard users, it only shows fields for attributes that are currently empty. For privileged users (wranglers), it displays all fields, allowing them to edit existing data.
This commit introduces the following changes:
- Adds an `en_youtube_url` attribute to the `Crop` model to store a URL for an English language YouTube video.
- If a `en_youtube_url` is present for a crop, the video is embedded on the crop's show page.
- A link is added to the "Learn more" section of the crop's show page to search YouTube for "growing [crop name]".
- A helper method is added to extract the video ID from various YouTube URL formats.
- A validation is added to the `Crop` model to ensure that the `en_youtube_url` is a valid YouTube URL.
This change adds the ability for crop wranglers to create and manage companion plantings for crops.
- Adds a `source_url` to the `CropCompanion` model to store an optional reference URL.
- Restricts the management of companion plantings to users with the `crop_wrangler` role.
- Creates a new admin interface for managing companion plantings for a specific crop.
- Updates the crop show page to display companions from both the crop and its parent crop.
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
