* Add authentication dialogs for sign in and sign up
- Implemented AuthDialog component to manage sign in and sign up modals.
- Created SignInModal and SignUpModal components for handling respective authentication processes.
- Added AuthFields component for reusable form fields and error handling.
- Updated various views to utilize the new authentication dialogs instead of traditional links.
- Enhanced user experience by allowing sign in and sign up actions to occur without full page reloads.
- Added feature specs for testing the functionality of the new dialogs.
* Refactor modals and input fields for improved accessibility and styling; adjust button sizes and text formatting
* Refactor authentication forms and modals for improved usability and accessibility; integrate reCAPTCHA handling and enhance error messaging
* Refactor SignUpModal layout for improved responsiveness and accessibility; organize fields into rows and enhance styling
* Refactor session view spec to streamline field checks; remove redundant test and retain essential content expectations
The garden dialog now adds a garden as well as edits one (new.json and
create.json on GardensController), and a GardenPicker button opens it from the
home page. A plant_picker helper replaces the home page's separate plant
links and the plant_button partial. The plant dialog asks when it was
planted (Today, Yesterday, Enter date), using a WhenPicker shared with the
harvest dialog. Members with no garden still get the full-page plant link.
Part of #4933
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
One dialog for adding and editing a garden, replacing the edit-only dialog
in the next commit.
Part of #4933
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The dialog is mounted once in the layout and any link marked
data-photo-dialog opens it, naming its record in the heading. The gardens
and posts menus, the old planting card and add_photo_button now use it
instead of going to the new-photo page.
Part of #4933
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The icon drawings were duplicated between Ruby and React; they now live in
app/javascript/menuIcons.json, read by both. Deletes the button and icon helpers
nothing calls any more, and their spec lines.
Part of #4933
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
One actions_menu helper now builds the three-dot toggle and dropdown for
seeds, harvests, crops, gardens, posts, photos, activities and comments,
replacing the text "Actions" toggle. Every item carries a green line icon
(menu_icon), and delete uses a darker red ($danger-text, 5.6:1 on white)
so it stays readable; it is still last, under a divider, with its own icon.
The React menus draw the same icons. DESIGN.md now says menu items have icons.
Also fixes the posts menu delete, which confirmed but never sent DELETE.
Closes#4939Closes#4940Closes#4942Closes#4943Closes#4944Closes#4945Closes#4946
Part of #4933
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
- Introduced `@other_count` in SeedsController to track in-stock and finished seeds based on the filter applied.
- Enhanced SeedsHelper with new methods: `seed_owner_label`, `seed_stacks`, and `seed_choice_link` for better organization and readability.
- Updated views to utilize new helper methods, improving the display of seed information and filtering options.
- Adjusted the Seed model to include methods for determining if a seed's sow-by date has passed and to return the heirloom type.
- Improved tests for filters and helper methods to ensure accurate functionality and coverage.
- Implement RecentActivity service to track recent planting, harvesting, and trading events.
- Enhance TimelineService to include garden layouts in event queries.
- Update navigation menu to include a link to friends and neighbours.
- Create member card partial for displaying gardener information.
- Add follow button partial for managing follow actions.
- Refactor members index view to use the new member card partial.
- Introduce neighbours feed view with daily updates and entries.
- Implement entry partial for displaying individual neighbour activities.
- Create layout partial for visualizing garden layouts.
- Add posts section to neighbours view for displaying recent posts.
- Implement reach section to show nearby gardeners.
- Add suggestions section for recommending gardeners to follow.
- Create routes for neighbours functionality and member dismissals.
- Add migrations for member dismissals and garden layout timestamps.
- Write feature and request specs for neighbours functionality.
- Include support for creating located members in tests.
- Removed unused styles and helper methods from _garden_layout.scss, _homepage.scss, and overrides.scss.
- Updated _home_dashboard.scss to enhance button styles and added new harvest picker styles.
- Introduced HarvestPicker component for improved harvest recording functionality.
- Refactored home dashboard views to utilize new home_section helper for consistent layout.
- Simplified and optimized existing methods in application_helper.rb, activity.rb, and harvest.rb.
- Removed deprecated homepage_records methods from Activity and Harvest models.
- Updated tests to reflect changes in helper methods and removed obsolete tests.
- Introduced crop suggestions functionality allowing users to receive tailored crop recommendations based on their location and preferences.
- Implemented the ability for users to dismiss specific crop suggestions, preventing them from receiving recommendations for crops they are not interested in.
- Added a location picker for users to set their gardening location, enhancing the accuracy of crop suggestions.
- Enhanced the dashboard to display relevant statistics, including plantings and harvests, with comparisons to previous years.
- Created new views and partials for displaying statistics, crop suggestions, and user interactions on the dashboard.
- Updated routes to accommodate new features related to crop suggestions and member locations.
- Added migrations for new database tables and columns to support crop dismissal and suggestion preferences.
- Developed tests for the new features, ensuring functionality and user experience are maintained.
* Share the three-dots button style outside planting rows
The round three-dots toggle was scoped to .planting-row. Move it to a
generic .actions-toggle-dots so other menus can reuse it.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Show the garden card actions menu as three dots
Matches the planting rows, and gives the button an aria-label naming
the garden.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let garden cards update a planting as JSON
PATCH /plantings/:slug.json now returns the garden's refreshed card, as
create does, or the validation errors as 422. Annual plantings in the
card say whether the viewer can edit them.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add a PATCH helper and a shared way to swap in a garden card
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let owners edit the planted date on garden cards
The date on an annual planting row is a button with a pencil hint for
plantings the viewer can edit. It opens the browser's date picker, saves
with the tick or Enter, and swaps in the refreshed card so predictions
follow the new date.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Serve a planting's form values as JSON for the edit dialog
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add a shared isPlainClick helper
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Edit a planting in a dialog over the garden list
Three dots > Edit opens the planting's form in a modal instead of going to
the edit page. It saves as JSON and swaps in the refreshed garden card, so
the page is never left. Ctrl/cmd-click still opens the edit page.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Drop the garden choice from the planting edit dialog
Moving a planting between gardens isn't part of quick editing. The
dialog no longer asks, or sends, which garden.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Rate a planting with stars in the edit dialog
Overall rating is five clickable stars (real radio buttons underneath, so
the keyboard works) with a Clear button, in place of a select.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Only ask for a finished date once a planting is marked finished
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Show planting menu items in lowercase
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add an Add planting button to garden cards
The way to plant in a garden was an item in its actions menu. Put a green
button in the card header, next to the menu, that opens the same dialog.
It only shows for gardens you can plant in.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Take Plant something here out of the garden card menu
The Add planting button does that now. The card data carries its link as
plant_url, instead of it being borrowed from a menu item.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add a gallery page of a member's past gardens
/members/:slug/gardens/past shows their inactive gardens as photo cards:
when each was in use, how many plantings, and the crops grown in it. The
owner (or a collaborator) can mark a garden active again from its card.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Replace the include in-active tickbox with a link to past gardens
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Call them inactive gardens, and explain what that page is
Rename the past gardens page to inactive gardens throughout (label, route,
action, view, styles). Move its link on the gardens page to below the
member's card, with a line saying what it holds, and add an explanation
to the page itself.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Line the breadcrumb up with the page content
The breadcrumb bar is the same colour as the page, but its side padding
pushed the text 1rem in from the edge the heading and content sit on.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Line the sidebar text up with the text in the member card
The skip link, nav links, button, blurb and inactive gardens link sat at
the card's edge while the card's own text is inset. Give them the same
inset, left-align the blurb, and add a little space between the links.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Make the sidebar nav links look like links
Link colour and underline, with the page you are on in bold and marked
aria-current.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let garden cards record a harvest as JSON
GET /plantings/:slug/harvests/new.json gives the form's starting values
and choices; POST /harvests.json returns the garden's refreshed card, or
the validation errors as 422.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Record a harvest in a dialog over the garden list
Three dots > record harvest opens a quick entry form (how many, weight,
when, plant part, notes) in a modal, with the crop and today's date
filled in. It saves as JSON and swaps in the refreshed card, so the page
is never left. Ctrl/cmd-click still opens the full harvest page.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Pass the harvest handler to the planting row, not the perennial chip
The record harvest prop had been attached to the first matching element
in GardenCard, the perennials' CropChip, so the row's menu item fell
through to a normal link.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Share the dialog step indicator
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Record a harvest in two steps, styled like Add planting
Step 1 is what part you harvested: a big text box, with the cursor in it,
that completes from the plant parts (the crop's usual one first). Step 2
is how much: quantity, weight, when and notes, with the choice shown back
and a Change button. Same look as the Add planting dialog.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Harvest dialog: add When and Any notes steps, drop Cancel
Step 3 is when (Today, Yesterday, or Enter date), step 4 is any notes,
and that step saves. The choices so far are shown back with Change
buttons, and there is a Back button. Closing the dialog is how you cancel.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Mark the planting that has just had a harvest recorded
For a few seconds the row goes amber and gets a Harvest recorded tag, and
the notice names the garden, so it is clear which planting it was.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Only offer Yesterday when a harvest then would be after planting
The server needs a harvest to come after the planted date, so a planting
made today (or yesterday) has no Yesterday, and the date box starts the
day after it was planted.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Fix the JSON request specs, and tolerate an empty harvest param
The update helper took its hash as keywords, and the form GET sent a JSON
content type, which Rails wraps into an empty harvest param that new then
rejected. The specs are fixed, and new ignores a blank harvest param.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Put Mark as finished last in the planting menu, below a divider
It takes the planting off the list, so it goes after the everyday
actions, separated from them. The card menu and the garden page menu
match.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Show a tick on the progress bar for each harvest
Each harvest is a small tick at its date on the bar's own scale, with the
date as a tooltip and a hidden sentence for screen readers. The card data
carries the positions, worked out with the same formula as the fill.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Make the pill choice styles general, not about harvests
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let garden cards save seeds as JSON
GET /plantings/:slug/seeds/new.json gives the form's starting values and
choices; POST /seeds.json returns a link to the new seed, or the
validation errors as 422, without queueing a flash message.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Save seeds in a dialog over the garden list
Three dots > save seeds opens a dialog in the same style as record
harvest: about how many (with quick picks), whether to offer them for
trade, and any notes. It saves as JSON and shows a notice with a link to
the seeds, so the page is never left.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add feature specs for the save seeds and record harvest dialogs
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let garden cards choose and add a Flickr photo as JSON
GET /photos/new.json gives a page of the member's Flickr photos (or says
to connect or reconnect Flickr), and POST /photos.json adds one to the
planting or garden and returns the garden's refreshed card, or the
validation errors as 422.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add a small page for a Flickr connect pop-up to end on
/authentications/connected says whether Flickr got connected and closes
itself. It has no site header or footer, as it appears in a small window.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add a photo in a dialog over the garden list, connecting Flickr there too
Three dots > add photo (on a planting or a garden) opens a dialog: choose
one of your Flickr photos by album or tag, confirm it, and it is added
without leaving the page, with the garden's card refreshed. If Flickr is
not connected, or the connection has expired, the first step connects it
in a pop-up and the dialog carries on by itself once it has worked.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add feature specs for the add photo dialog, with Flickr stubbed
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Stop handled menu clicks reaching jquery_ujs, and close the menu
A menu item that carries a data-method (mark as finished) was still sent
as a request by jquery_ujs after a dialog had taken the click over, so the
page navigated and the change was made before the dialog could be used.
A click a dialog handles is now stopped in the menu, which also closes it.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Mark a planting finished in a dialog, asking when it finished
Three dots > mark as finished opens a dialog over the list: when did it
finish, today unless you enter a date. Today is not offered for a planting
made today, as the server needs a finish after the planting. It saves as
JSON and the planting leaves the list, without leaving the page. The card
data carries the server's date for today.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add specs for the mark as finished dialog
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Make the crop chip the planting's menu, for annuals and perennials
Clicking a chip opens the planting's menu under it (view, edit, add
photo, record harvest, save seeds, mark as finished), in place of the
three dots on annual rows, so perennials get the same menu. A caret shows
the chip opens something. Someone who can't change the planting still gets
a plain link chip. The menu items are lowercase for every planting menu.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Update the garden index spec for chip menus
An owner's planting chip is a menu now, with a View link to the planting.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Let garden cards edit a garden as JSON
GET /gardens/:slug/edit.json gives the form's values and choices, and
PATCH /gardens/:slug.json returns the garden's refreshed card, or the
validation errors as 422, without queueing a flash message.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Edit a garden in a dialog over the garden list
Three dots on a garden card > edit opens its form in a dialog, and saves
without leaving the page. A garden saved as inactive leaves the list, with
a note saying where it went.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add feature specs for the edit garden dialog
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Update the edit garden spec: Edit on a card opens the dialog
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Re-dump schema.rb under Rails 8.1
Rails 8.1's schema dumper sorts each table's columns alphabetically, and
schema.rb was last dumped under 8.0, so the next migration rewrites the
whole file. Doing that on its own here, with no schema changes, keeps the
garden layout commit's schema diff down to what it actually adds.
The lines are identical to before, only reordered.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Add a garden layout page for mapping where plants sit in a bed
A new page at /members/:member_slug/gardens/:slug/layout shows the bed as
a grid, and the garden cards link to it as "Garden layout".
Each planting in the sidebar is a crop chip. Dragging it onto the bed
places one plant there, and the chip stays so it can be dragged again;
dragging a plant back to the sidebar takes it off the bed. Plants can go
anywhere on the bed, not just in a cell, and are drawn as circles with
the crop's icon. The owner can change the bed's size above it, and it
redraws as they type. There is also a "Remove all" button, and a "Plant
something" button that opens the same dialog as the garden cards.
Plants are a new model, one row per individual plant in a planting, so a
planting of ten tomatoes is ten plants that are placed one at a time.
That also gives per-plant state, such as one plant failing, somewhere to
go later. A planting's quantity now follows its number of plants, and
existing plantings are backfilled with one plant each per plant they say
they have, up to 100.
The layout saves the whole arrangement in one request, in a transaction,
so a bad placement leaves the bed as it was. The owner and collaborators
can arrange plants; only the owner can resize the bed or plant into it.
The members-nested gardens routes now use :slug, like the top-level
ones. They used :id, which the controller's loader never read, so those
routes could not find a garden; nothing linked to them.
The specs are not up to date with the Plant model yet, and have not
been run: the layout request, serializer and feature specs still
describe earlier versions of the page.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Add a compost bin to the garden layout, and make the bed look like soil
Dragging a plant into the compost bin deletes it, so its planting has
one fewer; dropping it anywhere else in the sidebar still just lifts it
off the bed. The save request carries the composted plant ids, since a
plant missing from the arrangement otherwise means lifted, not gone. The
plant arcs into the bin as it's dropped, unless the viewer prefers
reduced motion.
The bin sits under "About this garden", drawn there through a portal so
it stays part of the layout island, and is sticky so it stays in reach
on a long bed. There is no compost icon in the Icons8 set, so it uses
the earth worm.
The bed is now dark soil in a timber frame, with the grid as twine. The
frame is the border, so drops are measured against the soil inside it.
The sidebar is just the crop chips now, without a status line under
each.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Let plants on the garden layout be resized, and make dragging easier
Each plant can be drawn bigger or smaller, since a tomato takes more
room than basil: drag the handle on its edge. plants.diameter holds the
size in grid cells once a plant is resized; until then it follows its
crop's new default_diameter, or the parent crop's, or one cell. There is
no form for crop defaults yet. The next plant taken off a planting's
chip is the size last given to one of its plants, so shrinking one
chive shrinks the next.
Dragging is easier to follow. The browser's own drag picture all but
vanished on the soil, so a ringed circle at the plant's size follows the
pointer instead, centred where it will land. Only a plant's circle picks
it up, not the square around it, which overlapped neighbouring plants
and could pick up the wrong one. Clicking a plant no longer opens its
planting.
A crop chip dropped in the compost bin composts one of that planting's
unplaced plants. Drag state is now cleared on any drop, since a plant
composted from the bed is gone before its own drag end would fire,
which left the bin highlighted.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Point people at the garden layout, and tidy its crop chips
The garden page has a card inviting people to the layout, with a small
bed drawn in the same soil and timber: "Try out the new garden layout
tool" for those who can arrange it, "Open the garden layout" for
everyone else. It isn't shown for inactive gardens, which have nothing
growing to place.
On the gardens list the layout link is now a small "Layout" button
beside "Add planting", rather than a line of text under the owner.
The sidebar's crop chips are all the width of the sidebar, with the icon
inside the chip (the shared chip style pulled it half outside) and the
counts lined up. Plantings are listed by crop name, then date, then id;
by date alone, plantings made the same day came back in no fixed order
and reshuffled whenever a save touched them. A crop in the bed more than
once shows each planting's date, so they can be told apart.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Make a planting's plants when its garden's layout is used, not up front
Most plantings will never go on a layout, so giving every planting a
row per plant, when it was made and by backfilling the existing ones,
filled the plants table for nothing. Now a garden's growing plantings
get their plants the first time someone who can arrange the bed opens
its layout, in one insert; someone only looking makes none. The
backfill migration is gone, so there is nothing to run on deploy.
A planting's quantity only adds or removes plants once it is on a
layout. Zero now means no plants rather than one, so a planting
composted down to nothing isn't given a fresh plant next time the
layout is opened; a blank quantity still counts as one.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Bring the garden layout specs up to date
The specs described the layout as it was several versions ago, with
positions and spans on plantings. They now cover plants: where they can
sit, their sizes and the fallback to the parent crop's, the 100-plant
cap, and being made when a layout is first used. The request specs cover
saving an arrangement, dragging off a chip, composting, resizing the
bed, and who may do each. The feature spec drives the page in a browser.
The garden page's layout card and the layout's save route have specs
too.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Tell people about the garden layout at the top of the home page
A card at the top of the home page, with the same small drawn bed as the
garden page's, invites people to the layout. A signed-in member is sent
to the layout of their active garden with the most growing in it, so
there is something to arrange, alphabetically between ones with the
same. A member with no active garden is asked to add one, and anyone
signed out to sign up.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Keep plants wholly on the garden layout's bed
A plant's position is its centre, so a big plant near the edge hung over
the timber frame, and ones along the bottom were cut off. Now a plant
always stays half its width from each edge: when it's dropped, resized,
or the arrangement is saved. Plants already hanging over are drawn
pulled in, and saved that way on the next change. A plant can't be made
wider than the bed, and shrinking the bed counts each plant's edge, not
just its centre.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Make it easier to tell plants apart on the garden layout
Every plant was a circle with its crop's icon, and many crops share an
icon or have none, so a bed could be a field of identical sprouts.
- A plant big enough on screen carries its crop's name beneath it.
- Pointing at a plant, or at a planting's chip in the sidebar, picks out
all of that planting's plants and fades the rest.
- Plantings drawn with the same icon get a coloured ring, with a
matching dot on their chip. There are five colours, which are the ones
that stay distinguishable from each other against the soil for every
pair, colour blind or not. They go to the plantings that share an icon
in the order those were made, so a planting keeps its colour. Past
five in one group, plantings go by their names.
The layout's data now says which icon each planting is drawn with, so
the page can group them.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Put stepping stones, labels and rows on the garden layout
A "Garden features" group in the layout's sidebar has three things to
drag onto the bed besides plants:
- A stepping stone: a grey pebble, moved by dragging.
- A label, such as "path" or "N": asks what it should say, sits over
the plants like a marker, and is renamed by double-clicking it.
- A row: a furrow two cells long, whose ends can be dragged to set where
it runs, moved by the handle at its middle, and optionally named.
Any of them goes in the compost bin to be removed. They're kept as a
list on the garden, gardens.layout_features, and saved in the same
request as the plants, so a bad one rolls back the whole save. They're
checked and written directly rather than by saving the garden, which
would geocode it on every drag. A save that doesn't send them leaves
them alone, and the bed can't be shrunk out from under one.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Put the garden layout's sidebar on the left, next to the bed
The bed sits at the start of its column, sized to fit the window, so a
tall, narrow bed left the sidebar stranded far off to its right. With the
plantings and garden features on the left, the bed is always right next
to them. On a phone they still stack, with the list under the bed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Call the garden layout's planting button "Add a planting"
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Add sprinklers, taps, stakes, paths, drip lines, fences, trellises and netting
More garden features to put on the layout besides plants:
- Points: an irrigation sprinkler and a tap (their Icons8 icons on a
white disc ringed in blue), and a stake (the round top of a post).
- Lines, drawn and reshaped like rows: a path (a wide gravel strip), a
drip line (a thin blue pipe with emitters), a fence (a rail with posts)
and a trellis (a strip of timber lattice).
- An area: netting, a see-through mesh over the plants it covers,
between two corners that can be dragged to resize it.
Lines and netting share their handles: the middle to move and name it,
the ends or corners to reshape it. The types are now one table in the
layout, each with a name and a shape (point, label, line or area), and
the sidebar offers them from it. The server knows them by the same
split, checks both points of every line and area, and sends the icons as
one set, feature_icon_urls.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Call the garden layout's "Remove all" button "Clear bed"
It still lifts only the plants back to their chips; the confirmation now
says that stones, lines, netting and the rest stay where they are.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Put garden features in a toolbar above the bed, and keep the sidebar in view
With eleven garden features under the plantings, the sidebar no longer
fit on the screen. The features are now a row of small tiles above the
bed, in groups (ground, water, supports, markers), each named when
pointed at, and the sidebar is just the plantings.
The sidebar also stays in view as a tall bed is scrolled, scrolling
itself if the list of plantings is long. On a phone it still sits under
the bed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Implement bed resizing functionality with drag support
* Style the garden layout bed's edges, so they can be dragged
The bed's right edge, bottom edge and corner had their drag handling but
no styles, so they had no size or position and couldn't be grabbed. Now
they sit over the timber frame, with a pale grip showing while the bed
is pointed at, and a dashed outline shows the size the bed is being
dragged to. The bed's column no longer clips, so that outline can show
past it when the bed is dragged bigger.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Bring two garden layout feature specs up to date
A chip dropped in the middle of the bed lands within a fraction of a
pixel of the middle, not exactly on it. And shrinking the bed past
something on it now says "things", as stones and fences count too, not
"plants".
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Wait for a garden to be reactivated before checking it
"Mark as active" sends the change in the background, and the spec looked
at the garden straight after clicking, so it failed whenever the request
hadn't finished yet. It now waits for the page to come back first.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
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>
* 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>
* Upgrade Font Awesome from 5.15.1 to 6.7.2
Font names have moved on twice since this was pinned: the codebase still
carried Font Awesome 4 names that render as an empty box, and FA6 icons
such as fa-ellipsis-vertical were unavailable.
The 6.x gem no longer ships _font-awesome-sprockets.scss, but its
@font-face rules still call fa-font-path(), so application.scss defines
that against Sprockets' font-path helper. Its fonts live under
assets/fonts/font-awesome, which is already in the precompile list.
Icon names:
- The bare "fa" prefix is not a style in 6. Every "fa fa-<name>" becomes
"fas fa-<name>" (38 call sites, all solid; the one brands icon already
used fab).
- fa-sun-o was a Font Awesome 4 name and had been rendering as a box;
now fa-sun.
- fa-pencil was likewise broken under 5, where it was fa-pencil-alt. It
exists again in 6, so the existing name now works.
- activity_icon asked for 'fa-truck-pickup' through a helper that already
adds the prefix, so it emitted "fa-fa-truck-pickup".
Verified that the solid, regular and brands fonts all resolve through
the asset pipeline.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* couple more places to upgrade font awesome
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
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>
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>
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>
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>
Three dots on a garden card > edit opens its form in a dialog, and saves
without leaving the page. A garden saved as inactive leaves the list, with
a note saying where it went.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Clicking a chip opens the planting's menu under it (view, edit, add
photo, record harvest, save seeds, mark as finished), in place of the
three dots on annual rows, so perennials get the same menu. A caret shows
the chip opens something. Someone who can't change the planting still gets
a plain link chip. The menu items are lowercase for every planting menu.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Three dots > mark as finished opens a dialog over the list: when did it
finish, today unless you enter a date. Today is not offered for a planting
made today, as the server needs a finish after the planting. It saves as
JSON and the planting leaves the list, without leaving the page. The card
data carries the server's date for today.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
A menu item that carries a data-method (mark as finished) was still sent
as a request by jquery_ujs after a dialog had taken the click over, so the
page navigated and the change was made before the dialog could be used.
A click a dialog handles is now stopped in the menu, which also closes it.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Three dots > add photo (on a planting or a garden) opens a dialog: choose
one of your Flickr photos by album or tag, confirm it, and it is added
without leaving the page, with the garden's card refreshed. If Flickr is
not connected, or the connection has expired, the first step connects it
in a pop-up and the dialog carries on by itself once it has worked.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Three dots > save seeds opens a dialog in the same style as record
harvest: about how many (with quick picks), whether to offer them for
trade, and any notes. It saves as JSON and shows a notice with a link to
the seeds, so the page is never left.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Each harvest is a small tick at its date on the bar's own scale, with the
date as a tooltip and a hidden sentence for screen readers. The card data
carries the positions, worked out with the same formula as the fill.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
The server needs a harvest to come after the planted date, so a planting
made today (or yesterday) has no Yesterday, and the date box starts the
day after it was planted.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Brenda Wallace