Commit Graph

228 Commits

Author SHA1 Message Date
Daniel O'Connor
c28b2c0c38 Likes: Add capability to Activities, Plantings, Harvests (#3805)
* Ability to like activities

* Ability to like activities

* Add likeable everywhere

* Refactor

* Remove extra newline

* Typo

* Use classes, not IDs

* Explicitly wait for ajax

* Fix tests

* Move likes under owner

* Add separation

* Move harvest likes near actions

* Rearrange harvests

* Render likes under owner

* Make harvest consistent with other views

* Move planting detail into header

* Move detail into header

* Move detail into header

* Revert

* Fix header

* Move likes into jumotrons

* Fix name

* Change all actions to be after likes and a span

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* i18n and accessibility

* Fix name

* Temporarily make ack into a div

* Update app/views/photos/_actions.html.haml
2024-07-24 17:07:56 +09:30
domthor
88ad6d8de9 fix space in "function ()" 2024-04-26 18:08:03 -04:00
domthor
c5df760ce4 change double quotes to single quotes 2024-04-26 18:04:13 -04:00
domthor
d9500eff16 fix let in js 2024-04-26 17:59:34 -04:00
domthor
31fafe6a74 fix unexpected function() token 2024-04-26 17:57:37 -04:00
domthor
f87b83bdd1 fix const error 2024-04-26 17:56:06 -04:00
domthor
88e458077b fix unexpected token linting error 2024-04-26 17:54:12 -04:00
domthor
a713d2936c fix linting errors 2024-04-26 17:48:09 -04:00
domthor
9fd7e145b5 Added javascript to fix edit profile tab issue. Fixes #497 2024-04-26 21:35:34 +00:00
Awesome Code
4d25de4663 Auto corrected by following Lint Javascript unicorn/prefer-prototype-methods 2024-03-10 01:19:43 +00:00
Daniel O'Connor
7d63234841 Upgrade to bootstrap 5 (#3605)
* Upgrade boostrap

* Remove deprecated bootstrap toggles

* Migrate other details

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Fix spec

* Fix spec, where the size of the screen has gone to a partial breakpoint/you can't click on your own name in tablet view

* Fix spec

* Cleanup

* Cleanup
2024-03-10 11:49:22 +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
8a2f47ac75 Remove 2023-08-16 10:01:47 +01: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
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
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +13:00
Brenda Wallace
7ea14bccfe Fix alt on img tag 2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982 Remove console debug statement 2019-11-16 20:38:43 +13:00
Brenda Wallace
24f970f4f4 Added alt tag 2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29 add photo to the map, if we have one 2019-11-16 13:20:38 +13:00
Brenda Wallace
535ddcdcff Added plantings to places map 2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961 Fix markers on crops#show map 2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9 Rename crops js file so it gets included correctly
this crops.js.erb file was being ignored because a crops.coffee exists
2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e Fix marker on member map too 2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6 Added link to icon documentation 2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8 Add marker for leaflet maps, and use asset pipeline to serve file 2019-11-16 10:42:22 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200)
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
Brenda Wallace
2c75f62caf Avoid using id selectors 2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace
1b87026df4 Use camel case in js 2019-07-12 11:59:48 +12:00
Brenda Wallace
9686305857 The like icons are now the buttons 2019-07-12 10:13:24 +12:00
Brenda Wallace
b36e80bbad Use our own class to indicate liked 2019-07-12 09:37:44 +12:00
Brenda Wallace
af0d84d9f1 Updating likes js code 2019-07-12 09:28:45 +12:00
Brenda Wallace
7d1f9c5a3a Most post like into a wrapper in the html 2019-07-12 08:47:22 +12:00
Brenda Wallace
170c7d99ac Merge branch 'dev' into likeable-photos 2019-07-11 08:42:07 +12:00
Brenda Wallace
f8c643d13a Updating links to use https to mapbox 2019-07-10 09:03:05 +00:00
codefactor-io
5d07a30d17 [CodeFactor] Apply fixes 2019-07-08 08:16:24 +00:00
Brenda Wallace
e40a2c3176 remove debugger 2019-07-08 20:12:42 +12:00
Brenda Wallace
f1df90f189 Remove debugger 2019-07-08 20:05:48 +12:00
Brenda Wallace
bff31ddb5c Removed extra blank lines 2019-07-08 20:04:27 +12:00
Brenda Wallace
cbed8cc259 likes for photos 2019-07-08 20:00:55 +12:00
Brenda Wallace
0715646688 Change crop autosuggest styles 2019-06-05 23:12:12 +12:00
codefactor-io
4af8282a44 [CodeFactor] Apply fixes 2019-05-18 19:36:26 +00:00
Brenda Wallace
d55af1b77d Fix droppdown/dropup menus 2019-05-17 11:53:32 +12:00
Brenda Wallace
4c0bca4b86 Removing isotope
we don't need it anymore
2019-05-17 09:49:57 +12:00
Brenda Wallace
126769bfad Remove jquery roadmap 2019-04-30 13:14:24 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
2019-04-21 11:27:27 +12:00
Brenda Wallace
9ee3f514cd Adding trailing comma
because codeclimate likes them
2019-04-20 20:01:34 +12:00
Brenda Wallace
7ea13c40ed Isotope not needed for photo thumbnails 2019-04-20 09:54:02 +12:00
Brenda Wallace
54146a3a9f javascript lint 2019-04-20 09:47:19 +12:00