Commit Graph
13034 Commits
Author SHA1 Message Date
Brenda Wallace 07a01eee86 Merge remote-tracking branch 'origin/main' into feat/friends-and-neighbours 2026-10-13 17:58:22 +13:00
Brenda Wallace b4e5c959e3 Clear Rails cache before running tests and add neighbours controller specs 2026-10-13 17:58:01 +13:00
Brenda Wallace 3b06325e62 Add friends and neighbours feature with member dismissal functionality
- 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.
2026-10-13 17:08:18 +13:00
Brenda Wallace f0deef04b2 Merge pull request #4917 from Growstuff/feat/harvest-count-not-weight
Home page: harvest chart by count, and filterable growing table
2026-10-13 17:05:25 +13:00
Brenda Wallace 8ad4d1d0c5 Merge branch 'main' into feat/harvest-count-not-weight 2026-10-13 16:59:43 +13:00
dependabot[bot] 8d7b8d576e Bump selenium-webdriver from 4.50.0 to 4.51.0 (#4913)
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.50.0 to 4.51.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.50.0...selenium-4.51.0)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-version: 4.51.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-10-13 13:58:41 +10:30
Brenda Wallace 905d488227 Merge branch 'main' into feat/harvest-count-not-weight 2026-10-13 15:22:55 +13:00
Daniel O'ConnorandBrenda Wallace 6e0317efb1 Bump to ruby 4.0.7 (#4903)
Co-authored-by: Brenda Wallace <brenda@wallace.net.nz>
2026-10-13 12:42:52 +10:30
dependabot[bot] 88d862f22a Bump aws-sdk-s3 from 1.233.1 to 1.233.2 (#4910)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.233.1 to 1.233.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-version: 1.233.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-10-13 12:41:22 +10:30
Brenda Wallace b94c4c437e Add filters and update GrowingTable component for improved plant and garden selection 2026-10-13 13:46:22 +13:00
Brenda Wallace b386ddace2 Add ChipToggle component and refactor HarvestChart and GrowingTable to use it 2026-10-13 13:12:24 +13:00
Brenda Wallace 31978698c2 the growing/ready on the home page should also be react, so it changes without a page reload 2026-10-13 13:10:12 +13:00
Brenda Wallace 29c9cb2ef6 show harvests by count, not weight 2026-10-13 13:08:02 +13:00
Brenda Wallace b5d31f4bd2 Merge pull request #4912 from Growstuff/dependabot/bundler/rubocop-rspec_rails-2.33.0
Bump rubocop-rspec_rails from 2.32.0 to 2.33.0
2026-10-13 11:51:11 +13:00
Brenda Wallace 65325f3325 Merge pull request #4909 from Growstuff/fix/menu-underline-bug
Fix top menu underline sticking on the wrong item
2026-10-13 11:50:12 +13:00
dependabot[bot] 9f322707aa Bump rubocop-rspec_rails from 2.32.0 to 2.33.0
Bumps [rubocop-rspec_rails](https://github.com/rubocop/rubocop-rspec_rails) from 2.32.0 to 2.33.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec_rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec_rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rspec_rails/compare/v2.32.0...v2.33.0)

---
updated-dependencies:
- dependency-name: rubocop-rspec_rails
  dependency-version: 2.33.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-10-12 20:58:56 +00:00
Brenda Wallace 99ab3ee33b Fix menu underline bug by removing caching for menu items to ensure proper rendering. 2026-10-13 09:24:00 +13:00
Brenda Wallace a1fc68b9fc Merge pull request #4907 from Growstuff/feat/home-page-redesign
Redesign the home page for signed-out visitors, new members and experienced growers
2026-10-13 08:36:43 +13:00
Brenda Wallace eff14940ab Refactor home page recent posts display; replace old structure with new post card layout for improved aesthetics and functionality. 2026-10-12 21:59:35 +13:00
Brenda Wallace 48fa6a6eec Enhance home page layout with new post thumbnail and photo display features; update recent posts section for improved visibility and accessibility. 2026-10-12 21:59:11 +13:00
Brenda Wallace a06b281a1d overlay modal forms for the homepage 2026-10-12 21:45:53 +13:00
Brenda Wallace 4fd4c146df Merge remote-tracking branch 'origin/feat/home-page-redesign' into feat/home-page-redesign 2026-10-12 21:32:27 +13:00
Brenda Wallace 36291f12c8 Refactor search bar styling and update button structure for improved accessibility 2026-10-12 21:32:03 +13:00
Brenda Wallace 789c3e1a3b Merge branch 'main' into feat/home-page-redesign 2026-10-12 21:00:01 +13:00
Daniel O'Connorandgoogle-labs-jules[bot] f6d3b53369 Fix li tag styling and structure in activity cards (#4908)
- Remove invalid p tag wrapper around list in activities/_card
- Properly nest li elements under ul.list-unstyled.mb-0 in activities/_card
- Add mt-4 spacing class to Finished activities heading in gardens/_previously
- Add spec/views/activities/_card.html.haml_spec.rb

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
2026-10-12 17:41:44 +10:30
Brenda Wallace 04415d38c5 Merge branch 'main' into feat/home-page-redesign 2026-10-12 19:55:53 +13:00
Brenda Wallace 37cbef43c7 Fix rendering syntax for 'blurb' section in home index view 2026-10-12 19:36:12 +13:00
Brenda Wallace be38339b02 Refactor member location updates and improve error handling
- Updated MemberLocationsController to use a hash for location updates, ensuring coordinates are not geocoded again.
- Changed response status codes in member_locations_spec to use symbols for better readability.
- Modified PlacesController to use parentheses for defining MEMBER_FIELDS.
- Enhanced SuggestionsController to disable Rails/SkipsModelValidations for update_columns.
- Updated SeasonsHelper to use compact_blank for cleaner output.
- Refactored MemberDashboard service for improved readability and performance.
- Adjusted migration files to use parentheses for index definitions.
- Updated schema.rb to maintain consistency in index definitions.
- Added SampleData class to generate sample data for development.
- Cleaned up sample_data.rake task to utilize the new SampleData class.
- Updated tests in member_dashboard_spec and place_suggester_spec for consistency and readability.
2026-10-12 19:30:21 +13:00
Brenda Wallace 76e01832e3 Refactor suggestions index view to simplify month variable usage and remove redundant crop rendering logic 2026-10-12 19:25:00 +13:00
Brenda Wallace 54258de6c4 Refactor home dashboard and related components
- 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.
2026-10-12 19:24:55 +13:00
Brenda Wallace 0c2b5b95fa Remove unused plantings and seeds partials along with their associated specs 2026-10-12 19:24:47 +13:00
Brenda Wallace 76a0af7d82 Implement action bar for mobile with plant and harvest options; enhance navbar search functionality 2026-10-12 19:21:26 +13:00
Brenda Wallace d389104e4d Redesign mobile navigation and search bar for improved usability and aesthetics 2026-10-12 19:20:17 +13:00
Brenda Wallace c83d542146 Enhance navigation and dashboard features with current section highlighting and last year's planting data 2026-10-12 19:19:43 +13:00
Brenda Wallace 2d888a989d Add missing include for ActiveSupport::Testing::TimeHelpers in HomeHelper spec 2026-10-12 19:12:24 +13:00
Brenda Wallace ef06bab74f Add crop suggestions feature and dashboard enhancements
- 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.
2026-10-12 19:12:18 +13:00
Daniel O'Connorandgoogle-labs-jules[bot] 1a79cfa5e5 Fix deletion of photo associations in PhotoAssociationsController (#4906)
Fixes #4902 by updating PhotoAssociationsController#destroy to look up
photos and items directly rather than querying photo_associations table
with PhotoAssociation.item. Updates authorization rules to allow photo
association deletion if the current member owns the photo, owns or can
edit/manage the associated item, or is an admin. Updates the view partial
to render the delete link when the user can edit either the photo or item.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
2026-10-12 13:57:35 +10:30
Brenda Wallace 82e8124f9c Remove garden layout teaser and associated specs from home page 2026-10-12 15:06:48 +13:00
Brenda Wallace 0fef10e45c Refactor home page styles and add sample data task for development 2026-10-12 14:32:08 +13:00
Brenda Wallace f37fa5e0df Add "Since" section to home page and update locale for new content 2026-10-12 14:24:41 +13:00
Brenda Wallace eb86094787 Merge remote-tracking branch 'origin/main' into feat/home-page-redesign 2026-10-12 14:19:47 +13:00
Brenda Wallace 721e3fbd65 Refactor home page specs to improve clarity and remove unused setup; enhance stats view tests for gardener, planting, and crop counts 2026-10-12 14:15:11 +13:00
Brenda Wallace f302b6f77f Refactor homepage styles to exclude home-hero-photo from link color change; update home page specs to remove unused sections and ensure design compliance 2026-10-12 14:14:48 +13:00
Brenda Wallace d5ff770e4d Redesign home page layout with new sections for recent plantings and improved styling; enhance hero section and update stats rendering 2026-10-12 14:14:45 +13:00
Brenda Wallace 4b69851c36 Remove unused activity, crop, discuss, harvest, and member sections from home page 2026-10-12 14:14:38 +13:00
Brenda Wallace 0882603e78 Add releases page and update homepage layout
- Introduced a new releases page linked from the homepage.
- Updated homepage to include a signed-in greeting with member avatar and season summary.
- Enhanced mobile styles for better navigation and search box visibility.
- Added season-related helper methods and tests for improved functionality.
2026-10-12 14:11:11 +13:00
Brenda Wallace c758259b17 Refactor code structure for improved readability and maintainability 2026-10-12 14:08:38 +13:00
Brenda Wallace fcd1fe0782 Redesign home page with new hero section, update signup links, and enhance styling for better user experience 2026-10-12 14:06:51 +13:00
Brenda Wallace 65eaa405ab Merge pull request #4888 from Growstuff/tidy/seeds-show
tidy up seeds#show
2026-10-12 12:52:41 +13:00
Brenda Wallace 0e7aeac02e Merge branch 'main' into tidy/seeds-show 2026-10-12 12:31:43 +13:00