Commit Graph

4263 Commits

Author SHA1 Message Date
Daniel O'Connor
6102f0629b Revert 140fe7a (#3612)
* Revert 140fe7a

* Split rendering behaviour
2024-02-04 10:25:41 +10:30
Daniel O'Connor
fb86448061 HAML 6 (#3607)
* HAML

* rewrite

* Fix specs - but likely still wrong

* Return temple

* Trailing line

* Fix specs

* This was rearranged, apparently.

* Fix tests

* Retain escaping

* Fix specs

* Rubocop

* Apparently the escaped filter doesn't work with interpolation. Swap to our implementation
2024-02-03 17:33:39 +10:30
Daniel O'Connor
ad4a6e17e2 iCalendar feed of plantings (#3588)
* Register mime type

* Add rough first pass

* Index predictions, and add links

* Trailing space

* Fix implementation

* Fix names, make public

* Fix names, make public

* Fix

* Fix tyyos

* Add date

* If there are no predictions, keep growing

* Add a todo

* Fix factories

* Specs
2024-01-27 00:38:33 +10:30
Brenda Wallace
30626859c3 Auto corrected by following Format Css Code (#3594)
Co-authored-by: Awesome Code <team@xinminlabs.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
2024-01-26 23:01:55 +10:30
Daniel O'Connor
140fe7a087 Bump searchkick, elasticsearch (#3602)
* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search
2024-01-26 23:01:39 +10:30
Daniel O'Connor
12ff09ad51 Add Accessibility assertions to rspec, replacing accessbility-lint + fixes (#3573)
* Add dep

* Add tests around accessibility

* Add examples in a few places

* Try to fix screenshots

* Remove redundant role

* Adjust rules, colors, etc so tests pass

* Update app/assets/stylesheets/overrides.scss

* Wrap in label

* Omit rule, which is failing with a false positive

* Update index.haml

* Update _blurb.html.haml
2024-01-22 22:09:27 +10:30
Daniel O'Connor
196b8078e6 Posts - Ensure responsive (#3584)
* Fix model validations and responsiveness

* Fix model validations and responsiveness

* Update app/models/post.rb
2024-01-21 16:05:14 +10:30
Daniel O'Connor
91f8c2e0b3 Harvests - Compare dates to dates when determing how long ago something was (#3585)
* Compare dates to dates

* Adjust timeline display to check if Date or Time
2024-01-21 15:20:32 +10:30
Daniel O'Connor
8546794311 Recaptcha (#3586)
* add recaptcha on register view

Update new.html.haml to add it

* Update Gemfile to add recaptcha

* Update env-example to show recaptcha

* More view corrections for recaptcha

* Update registrations_controller.rb to add recaptcha

* Update env-example with test config

* Recaptcha help text

* Fix trailing spaces

* Fix trailing space

* Add Recaptcha to gemfile.lock

* Fixing Gemfile.lock space

* Typo on comments in view

* Update app/views/devise/registrations/new.html.haml

* Fix signup

---------

Co-authored-by: Cesy <cesy.avon@gmail.com>
2024-01-21 15:20:03 +10:30
Daniel O'Connor
b77df88df9 Issues/1475: Ensure we have pagination (#3193)
* Paginate, 100 at a time

* Limited i18n

* Paginate roles

* Pagination

* Pagination

* i18n and pagination

* Paginate alternate names

* Silence code climate

* Rewrite coverage as a feature

* Remove coverage in favour of crops/scientific_name_spec

* Add missing admin link

* Rewrite coverage as feature

* Rewrite coverage

---------

Co-authored-by: Brenda Wallace <brenda@wallace.net.nz>
2024-01-21 14:19:36 +10:30
Daniel O'Connor
1f0cfa9b6c Add GBIF to our scientific names, so that our crops can associate creative commons photos (#3559)
* Add GBIF cient

* Add lookup

* Add autocomplete for GBIF lookup

* Add extra detail to scientific names

* Autocomplete

* Add routes

* Rmeove mapping

* Add autocomplete

* Update GBIF data on save

* db/schema

* Style

* Extract service

* Add concern

* Add concern

* Save photos

* Initial coverage

* Coverage

* Add coverage

* Shut up, codeclimate

* Shut up, codeclimate

* Unused

* Shut up, codeclimate

* Apply suggestions from code review

* Remove localhost

* Fix rubocop

* Fix rubocop

* Add UI links

* Add rake

* Indent

* Update Gemfile.lock

* Update lib/tasks/gbif.rake

* Update app/views/crops/_scientific_names.html.haml

* Rubocop

* Expand edit photo form

* Fix error

* Add model validations

* Skip photos without backlinks

* Fix tests

* Add photo words

* Allow blank

* Rubocop and handle invalid legacy data

* Apply suggestions from code review

* Update lib/tasks/gbif.rake
2024-01-21 13:22:25 +10:30
Daniel O'Connor
c114f080a9 Active only as the following page is active 2024-01-21 01:58:53 +00:00
Daniel O'Connor
09a7ce6483 Wrap in label 2024-01-21 01:21:09 +00:00
Daniel O'Connor
d663d0ffa3 Drop use of h5 2024-01-20 04:28:10 +00:00
Daniel O'Connor
8ee4b5f1aa Update _menu.haml
Fix accessibility issue
2024-01-19 19:22:37 +10:30
Daniel O'Connor
58a5b6ce5c Merge pull request #3568 from Growstuff/CloCkWeRX-patch-1
Darken green buttons, headings etc for Accessbility contrast ratios
2024-01-18 13:05:06 +10:30
Daniel O'Connor
4a45acf79b Update _avatar.html.haml
Fix naming
2024-01-18 08:32:49 +10:30
Daniel O'Connor
5cc6135b2d Mark breadcrumbs as a nav 2024-01-17 21:13:41 +00:00
Daniel O'Connor
6e23aff347 Add main landmark to document 2024-01-17 21:11:43 +00:00
Daniel O'Connor
9171892d0b Darken green buttons, headings etc for Accessbility contrast ratios
#2067
2024-01-17 22:17:40 +10:30
Daniel O'Connor
78eaf0b4c9 Address minor accessibility issues: Image elements do not have [alt] attributes (#3561)
* Add alt tags

* Update app/views/members/_tiny.haml

* Update app/views/home/_plantings.html.haml

* Use crop_name as this is a searchkick record
2024-01-17 22:02:09 +10:30
Daniel O'Connor
fa6aa1a9fb Update app/views/layouts/_menu.haml 2024-01-17 20:16:49 +10:30
Daniel O'Connor
9276ade62f Update _menu.haml 2024-01-17 19:58:40 +10:30
Daniel O'Connor
64d06c67ad Merge pull request #3565 from Growstuff/CloCkWeRX-patch-1
Update icons_helper.rb to render alt tag
2024-01-17 19:40:48 +10:30
Daniel O'Connor
afb07d2cb5 Remove counts from Photos#index
Fix #3560
2024-01-17 18:19:29 +10:30
Daniel O'Connor
a118a95b54 Update icons_helper.rb 2024-01-17 18:12:58 +10:30
Daniel O'Connor
33af3bae65 Update icons_helper.rb to render alt tag 2024-01-17 18:10:48 +10:30
Daniel O'Connor
ee45b518ce Rubocop fixes (Stacked PR) (#3454)
* Fix todo

* Rubcop

* Rubocop

* Rubocop

* Rename harvests_routing_spec.rb to harvests_controller_routing_spec.rb

Making codeclimate happier

* Rename for CodeFactor: updates_routing_spec.rb to posts_controller_updates_routing_spec.rb

For codefactor

* Rename for CodeFactor: follows_routing_spec.rb to follows_controller_routing_spec.rb

* Rename for CodeFactor: forums_routing_spec.rb to forums_controller_routing_spec.rb

* Rename spec/routing/roles_routing_spec.rb to spec/routing/admin/roles_controller_routing_spec.rb

* Rename authentications_routing_spec.rb to authentications_controller_routing_spec.rb

* Rename for CodeFactor: plantings_routing_spec.rb to plantings_controller_routing_spec.rb

* Rename for CodeFactor: scientific_names_routing_spec.rb to scientific_names_controller_routing_spec.rb

* Rename for CodeFactor: seeds_routing_spec.rb to seeds_controller_routing_spec.rb

* Rename for CodeFactor: comments_routing_spec.rb to comments_controller_routing_spec.rb

* Rename for CodeFactor: garden_types_routing_spec.rb to garden_types_controller_routing_spec.rb

* Rename for CodeFactor: admin_routing_spec.rb to admin_controller_routing_spec.rb

* Rename for CodeFactor: gardens_routing_spec.rb to gardens_controller_routing_spec.rb

* Rename for CodeFactor: photos_routing_spec.rb to photos_controller_routing_spec.rb

* Rename for CodeFactor: plant_parts_routing_spec.rb to plant_parts_controller_routing_spec.rb

* Rename for CodeFactor: crops_routing_spec.rb to crops_controller_routing_spec.rb

* [CodeFactor] Apply fixes

* Rename

* Code factor bot

---------

Co-authored-by: Cesy <cesy.avon@gmail.com>
Co-authored-by: codefactor-io <support@codefactor.io>
2024-01-07 21:05:59 +10:30
Cesy
cc59d244ec Merge branch 'dev' into CloCkWeRX-patch-1 2023-11-28 17:09:07 +00:00
Daniel O'Connor
8a2f47ac75 Remove 2023-08-16 10:01:47 +01:00
Daniel O'Connor
2a14ec64c2 Add presence validation 2023-08-15 17:27:18 +01:00
Daniel O'Connor
67857f23d6 Update _summary.html.haml 2023-08-09 23:55:55 +09:30
Daniel O'Connor
e557695b37 Update _summary.html.haml
Fix issue #3410
2023-08-09 23:52:24 +09:30
Daniel O'Connor
b4fda63bcc Merge pull request #3282 from Growstuff/issues/3269
Crop Requests: Validate uniquness of name in the pending queue
2023-03-13 20:00:16 +10:30
Daniel O'Connor
bb4857de72 Merge pull request #3281 from Growstuff/issues/3270
Fix frontend validation for Garden areas
2023-03-13 20:00:01 +10:30
Daniel O'Connor
5b89aff98a Fix #3049 2023-03-13 08:05:31 +00:00
Daniel O'Connor
5722bfec59 Validate uniquness of name in the pending queue 2023-03-13 07:58:11 +00:00
Daniel O'Connor
a112d8e126 Don't restrict format 2023-03-13 07:49:48 +00:00
Daniel O'Connor
1b3485733d Fix frontend validation 2023-03-13 07:47:42 +00:00
Daniel O'Connor
e1fb08707a Issue/2419: Limit map to the most recent plantings only (#3191)
* For now, drop mapbox for OSM tiles

* For now, drop mapbox for OSM tiles

* Use OSM tiles

* Remove mapbox secrets for now. If we bring back mapbox; we should re-enstate

* Only show up to 200 plantings

* Update app/assets/javascripts/members.js.erb

* [CodeFactor] Apply fixes

* Update production.rb

---------

Co-authored-by: codefactor-io <support@codefactor.io>
2023-03-13 15:13:28 +10:30
Daniel O'Connor
d209b0f68c Merge branch 'dev' into issues/3247-links 2023-03-13 13:49:45 +10:30
Daniel O'Connor
da45aae52f Adjust layout (#3187)
Co-authored-by: Cesy <cesy.avon@gmail.com>
2023-03-13 13:18:00 +10:30
Daniel O'Connor
449c6c4487 Issue/3189: Fix map displays by dropping mapbox (#3190)
* For now, drop mapbox for OSM tiles

* For now, drop mapbox for OSM tiles

* Use OSM tiles

* Remove mapbox secrets for now. If we bring back mapbox; we should re-enstate

* Update members.js.erb

* Change placeholder
2023-03-13 13:04:16 +10:30
Daniel O'Connor
955dbcba08 Fix the layout of the tables (#3194) 2023-03-13 13:00:50 +10:30
Daniel O'Connor
9f6fe4d7d8 Fix #3247 broken links 2023-03-13 02:00:46 +00:00
Daniel O'Connor
c1e511d099 Merge branch 'dev' into bundleupdate3 2022-12-18 11:45:10 +10:30
Cesy Avon
f677500d2e Empty fails on nil, better to use present instead 2022-12-14 20:18:49 +00:00
Cesy
e101978107 Merge branch 'dev' into issue/1642 2022-12-10 08:23:36 +00:00
Daniel O'Connor
dd7c51ea88 Update _edit_apps.html.haml 2022-12-10 16:13:11 +10:30
Daniel O'Connor
d3063f844d Remove facebook auth. They wanted to dictate the behaviour of an application they didn't own, so I told them to get stuffed a few years ago 2022-12-10 15:52:12 +10:30