Compare commits

...

106 Commits

Author SHA1 Message Date
Daniel O'Connor
092920b5f8 Update dependabot.yml
Apparently, https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem is wrong
2024-09-29 16:37:25 +09:30
Daniel O'Connor
b3c0df3bb8 Merge pull request #3864 from Growstuff/CloCkWeRX-patch-1
Update dependabot.yml
2024-09-29 16:36:15 +09:30
Daniel O'Connor
1113fc7c97 Update dependabot.yml 2024-09-29 16:36:02 +09:30
Daniel O'Connor
5e8c1f92d1 Delete .github/workflows/brakeman-analysis.yml 2024-09-29 16:32:34 +09:30
dependabot[bot]
cd0e692c59 Merge pull request #3863 from Growstuff/dependabot/bundler/webrick-1.8.2 2024-09-29 05:30:42 +00:00
dependabot[bot]
a07c012051 Bump webrick from 1.8.1 to 1.8.2
Bumps [webrick](https://github.com/ruby/webrick) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/ruby/webrick/releases)
- [Commits](https://github.com/ruby/webrick/compare/v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: webrick
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-29 05:11:03 +00:00
dependabot[bot]
aec87270a7 Merge pull request #3859 from Growstuff/dependabot/bundler/selenium-webdriver-4.25.0 2024-09-23 22:16:12 +00:00
dependabot[bot]
e634fe76ea Bump selenium-webdriver from 4.24.0 to 4.25.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.24.0 to 4.25.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.24.0...selenium-4.25.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-23 21:59:03 +00:00
dependabot[bot]
3a5afb10af Merge pull request #3860 from Growstuff/dependabot/bundler/rubocop-rails-2.26.2 2024-09-23 21:57:49 +00:00
dependabot[bot]
d514109bd6 Bump rubocop-rails from 2.26.1 to 2.26.2
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.26.1 to 2.26.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.26.1...v2.26.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-23 09:01:36 +00:00
dependabot[bot]
953981f51c Merge pull request #3858 from Growstuff/dependabot/bundler/icalendar-2.10.3 2024-09-23 09:00:29 +00:00
dependabot[bot]
524b741933 Bump icalendar from 2.10.2 to 2.10.3
Bumps [icalendar](https://github.com/icalendar/icalendar) from 2.10.2 to 2.10.3.
- [Changelog](https://github.com/icalendar/icalendar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/icalendar/icalendar/compare/v2.10.2...v2.10.3)

---
updated-dependencies:
- dependency-name: icalendar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-23 07:35:49 +00:00
Daniel O'Connor
497cde22ee Merge branch 'mainline' into dev 2024-09-20 18:29:31 +09:30
dependabot[bot]
075b3d8eec Merge pull request #3857 from Growstuff/dependabot/bundler/sprockets-3.7.5 2024-09-20 08:56:44 +00:00
dependabot[bot]
605605c8e3 Bump sprockets from 3.7.4 to 3.7.5
Bumps [sprockets](https://github.com/rails/sprockets) from 3.7.4 to 3.7.5.
- [Release notes](https://github.com/rails/sprockets/releases)
- [Changelog](https://github.com/rails/sprockets/blob/v3.7.5/CHANGELOG.md)
- [Commits](https://github.com/rails/sprockets/compare/v3.7.4...v3.7.5)

---
updated-dependencies:
- dependency-name: sprockets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-20 07:31:42 +00:00
dependabot[bot]
8a260ca171 Merge pull request #3854 from Growstuff/dependabot/bundler/dotenv-rails-3.1.4 2024-09-19 12:45:51 +00:00
dependabot[bot]
373794214b Bump dotenv-rails from 3.1.2 to 3.1.4
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.1.2...v3.1.4)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-19 09:29:15 +00:00
dependabot[bot]
702787b484 Merge pull request #3855 from Growstuff/dependabot/bundler/faraday-2.12.0 2024-09-19 09:28:11 +00:00
dependabot[bot]
d9234e847b Bump faraday from 2.11.0 to 2.12.0
Bumps [faraday](https://github.com/lostisland/faraday) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.11.0...v2.12.0)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-19 09:08:39 +00:00
dependabot[bot]
a56645a4b6 Merge pull request #3856 from Growstuff/dependabot/bundler/puma-6.4.3 2024-09-19 09:07:20 +00:00
dependabot[bot]
79d65c15c6 Bump puma from 6.4.2 to 6.4.3
Bumps [puma](https://github.com/puma/puma) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.4.2...v6.4.3)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-19 07:18:20 +00:00
dependabot[bot]
5356185eb9 Merge pull request #3853 from Growstuff/dependabot/bundler/scout_apm-5.4.0 2024-09-11 11:43:41 +00:00
dependabot[bot]
05a89911f4 Bump scout_apm from 5.3.8 to 5.4.0
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 5.3.8 to 5.4.0.
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v5.3.8...v5.4.0)

---
updated-dependencies:
- dependency-name: scout_apm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-11 07:17:13 +00:00
dependabot[bot]
8348a8f544 Merge pull request #3851 from Growstuff/dependabot/bundler/oj-3.16.6 2024-09-10 09:24:44 +00:00
dependabot[bot]
4adcaabf57 Bump oj from 3.16.5 to 3.16.6
Bumps [oj](https://github.com/ohler55/oj) from 3.16.5 to 3.16.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.16.5...v3.16.6)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-10 08:43:47 +00:00
Daniel O'Connor
ff07054b01 Merge pull request #3852 from Growstuff/dependabot/bundler/sprockets-3.7.4
Bump sprockets from 3.7.3 to 3.7.4
2024-09-10 18:12:43 +09:30
dependabot[bot]
37aa88790c Bump sprockets from 3.7.3 to 3.7.4
Bumps [sprockets](https://github.com/rails/sprockets) from 3.7.3 to 3.7.4.
- [Release notes](https://github.com/rails/sprockets/releases)
- [Changelog](https://github.com/rails/sprockets/blob/v3.7.4/CHANGELOG.md)
- [Commits](https://github.com/rails/sprockets/compare/v3.7.3...v3.7.4)

---
updated-dependencies:
- dependency-name: sprockets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-10 08:01:37 +00:00
dependabot[bot]
1de98fa0ca Merge pull request #3850 from Growstuff/dependabot/bundler/pg-1.5.8 2024-09-09 09:41:23 +00:00
dependabot[bot]
15dc687134 Bump pg from 1.5.7 to 1.5.8
Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.7 to 1.5.8.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.7...v1.5.8)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-09 08:35:14 +00:00
dependabot[bot]
7e40eb1053 Merge pull request #3848 from Growstuff/dependabot/bundler/rubocop-rspec-3.0.5 2024-09-09 08:34:06 +00:00
dependabot[bot]
8c3f6cb7b3 Bump rubocop-rspec from 3.0.4 to 3.0.5
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-09 08:14:43 +00:00
dependabot[bot]
3914f28e8e Merge pull request #3849 from Growstuff/dependabot/bundler/rubocop-rails-2.26.1 2024-09-09 08:12:36 +00:00
dependabot[bot]
84edfd2903 Bump rubocop-rails from 2.26.0 to 2.26.1
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.26.0 to 2.26.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.26.0...v2.26.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-09 07:48:35 +00:00
Daniel O'Connor
3ad059d593 Merge pull request #3837 from Growstuff/CloCkWeRX-patch-1
Update overrides.scss
2024-09-08 11:48:48 +09:30
Daniel O'Connor
2f0e3adad9 Merge branch 'dev' into CloCkWeRX-patch-1 2024-09-08 11:48:34 +09:30
dependabot[bot]
14b282fb93 Merge pull request #3842 from Growstuff/dependabot/bundler/rubocop-1.66.1 2024-09-05 10:21:45 +00:00
dependabot[bot]
9a23b3a6bf Bump rubocop from 1.66.0 to 1.66.1
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.66.0 to 1.66.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.66.0...v1.66.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-05 10:05:02 +00:00
dependabot[bot]
8384381eea Merge pull request #3841 from Growstuff/dependabot/bundler/rspec-rails-7.0.1 2024-09-05 10:03:19 +00:00
dependabot[bot]
7c329a4427 Bump rspec-rails from 7.0.0 to 7.0.1
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 7.0.0 to 7.0.1.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v7.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-05 09:45:00 +00:00
dependabot[bot]
9d9926af5c Merge pull request #3843 from Growstuff/dependabot/bundler/sidekiq-7.3.2 2024-09-05 09:43:56 +00:00
dependabot[bot]
049dd67968 Bump sidekiq from 7.3.1 to 7.3.2
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.3.1 to 7.3.2.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.3.1...v7.3.2)

---
updated-dependencies:
- dependency-name: sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-05 08:12:31 +00:00
dependabot[bot]
2767384589 Merge pull request #3838 from Growstuff/dependabot/bundler/rubocop-1.66.0 2024-09-03 09:43:10 +00:00
dependabot[bot]
81ca9dc964 Bump rubocop from 1.65.1 to 1.66.0
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.65.1 to 1.66.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.65.1...v1.66.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-03 09:24:58 +00:00
dependabot[bot]
2f7bd378d4 Merge pull request #3840 from Growstuff/dependabot/bundler/ruby-units-4.1.0 2024-09-03 09:23:54 +00:00
dependabot[bot]
4473059cb1 Bump ruby-units from 4.0.3 to 4.1.0
Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 4.0.3 to 4.1.0.
- [Release notes](https://github.com/olbrich/ruby-units/releases)
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/olbrich/ruby-units/compare/v4.0.3...v4.1.0)

---
updated-dependencies:
- dependency-name: ruby-units
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-03 09:06:19 +00:00
dependabot[bot]
20a3153dcc Merge pull request #3835 from Growstuff/dependabot/bundler/selenium-webdriver-4.24.0 2024-09-03 09:05:17 +00:00
dependabot[bot]
2058f3d739 Bump selenium-webdriver from 4.23.0 to 4.24.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.23.0 to 4.24.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.23.0...selenium-4.24.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-03 08:47:49 +00:00
dependabot[bot]
162fb57ed6 Merge pull request #3839 from Growstuff/dependabot/bundler/rspec-rails-7.0.0 2024-09-03 08:46:45 +00:00
dependabot[bot]
3e6953093e Bump rspec-rails from 6.1.4 to 7.0.0
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.4 to 7.0.0.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.4...v7.0.0)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-09-03 07:10:05 +00:00
Daniel O'Connor
a5c5de414e Update overrides.scss 2024-08-31 19:06:45 +09:30
Daniel O'Connor
5c206896af Rails 7.2.1 (#3789)
* Rails 7.2.0.beta3

* Rails 7.2.1

* Bump
2024-08-31 17:43:35 +09:30
Daniel O'Connor
afdb9720b7 Merge pull request #3834 from Growstuff/dependabot/bundler/faraday-2.11.0
Bump faraday from 2.10.1 to 2.11.0
2024-08-27 20:33:42 +09:30
dependabot[bot]
7d203de54d Bump faraday from 2.10.1 to 2.11.0
Bumps [faraday](https://github.com/lostisland/faraday) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.10.1...v2.11.0)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-27 07:19:17 +00:00
dependabot[bot]
5f26d86267 Merge pull request #3832 from Growstuff/dependabot/npm_and_yarn/micromatch-4.0.8 2024-08-26 11:00:00 +00:00
dependabot[bot]
0046953f73 Bump micromatch from 4.0.5 to 4.0.8
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/4.0.8/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-26 10:42:18 +00:00
dependabot[bot]
db406fa6c7 Merge pull request #3831 from Growstuff/dependabot/bundler/rubocop-rails-2.26.0 2024-08-26 10:41:44 +00:00
dependabot[bot]
cc2b723cd4 Bump rubocop-rails from 2.25.1 to 2.26.0
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.25.1...v2.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-26 07:17:09 +00:00
dependabot[bot]
ed8d62110e Merge pull request #3830 from Growstuff/dependabot/bundler/rails-7.1.4 2024-08-23 09:06:09 +00:00
dependabot[bot]
1d07fd8b6e Bump rails from 7.1.3.4 to 7.1.4
Bumps [rails](https://github.com/rails/rails) from 7.1.3.4 to 7.1.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v7.1.3.4...v7.1.4)

---
updated-dependencies:
- dependency-name: rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-23 07:29:08 +00:00
dependabot[bot]
a0b73ca9d5 Merge pull request #3826 from Growstuff/dependabot/bundler/query_diet-0.7.2 2024-08-22 23:38:24 +00:00
dependabot[bot]
64efea0a8a Bump query_diet from 0.7.1 to 0.7.2
Bumps [query_diet](https://github.com/makandra/query_diet) from 0.7.1 to 0.7.2.
- [Changelog](https://github.com/makandra/query_diet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/makandra/query_diet/compare/v0.7.1...v0.7.2)

---
updated-dependencies:
- dependency-name: query_diet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 23:22:24 +00:00
dependabot[bot]
08ce307c3c Merge pull request #3824 from Growstuff/dependabot/bundler/chartkick-5.1.0 2024-08-22 23:21:10 +00:00
dependabot[bot]
b10054caeb Bump chartkick from 5.0.7 to 5.1.0
Bumps [chartkick](https://github.com/ankane/chartkick) from 5.0.7 to 5.1.0.
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v5.0.7...v5.1.0)

---
updated-dependencies:
- dependency-name: chartkick
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 22:33:09 +00:00
dependabot[bot]
e2c4facfe3 Merge pull request #3822 from Growstuff/dependabot/bundler/sidekiq-7.3.1 2024-08-22 22:31:55 +00:00
dependabot[bot]
3469ebf44e Bump sidekiq from 7.3.0 to 7.3.1
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.3.0 to 7.3.1.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.3.0...v7.3.1)

---
updated-dependencies:
- dependency-name: sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 22:16:19 +00:00
dependabot[bot]
9953921941 Merge pull request #3825 from Growstuff/dependabot/bundler/vcr-6.3.1 2024-08-22 22:15:08 +00:00
dependabot[bot]
159f4558c3 Bump vcr from 6.2.0 to 6.3.1
Bumps [vcr](https://github.com/vcr/vcr) from 6.2.0 to 6.3.1.
- [Release notes](https://github.com/vcr/vcr/releases)
- [Changelog](https://github.com/vcr/vcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vcr/vcr/compare/v6.2.0...v6.3.1)

---
updated-dependencies:
- dependency-name: vcr
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 21:56:56 +00:00
Daniel O'Connor
c6522ddc20 Merge pull request #3829 from Growstuff/dependabot/bundler/rexml-3.3.6
Bump rexml from 3.3.4 to 3.3.6
2024-08-23 07:25:41 +09:30
dependabot[bot]
9b44c649e7 Bump rexml from 3.3.4 to 3.3.6
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.4 to 3.3.6.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.4...v3.3.6)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 20:58:16 +00:00
Daniel O'Connor
00184c183d Merge pull request #3827 from Growstuff/dependabot/bundler/axe-core-rspec-4.10.0
Bump axe-core-rspec from 4.9.1 to 4.10.0
2024-08-22 17:27:10 +09:30
dependabot[bot]
f47765642b Bump axe-core-rspec from 4.9.1 to 4.10.0
Bumps [axe-core-rspec](https://github.com/dequelabs/axe-core-gems) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/v4.10.0/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.9.1...v4.10.0)

---
updated-dependencies:
- dependency-name: axe-core-rspec
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-22 07:36:43 +00:00
dependabot[bot]
a6e264eea9 Merge pull request #3821 from Growstuff/dependabot/bundler/rspec-rails-6.1.4 2024-08-16 08:35:31 +00:00
dependabot[bot]
4c8cc09fd5 Bump rspec-rails from 6.1.3 to 6.1.4
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.3 to 6.1.4.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.3...v6.1.4)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-16 07:03:39 +00:00
dependabot[bot]
fd815e843c Merge pull request #3818 from Growstuff/dependabot/bundler/rswag-api-2.14.0 2024-08-14 08:11:21 +00:00
dependabot[bot]
dae4355487 Bump rswag-api from 2.13.0 to 2.14.0
Bumps [rswag-api](https://github.com/rswag/rswag) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.13.0...2.14.0)

---
updated-dependencies:
- dependency-name: rswag-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 07:55:12 +00:00
dependabot[bot]
5ca687c298 Merge pull request #3819 from Growstuff/dependabot/bundler/rswag-ui-2.14.0 2024-08-14 07:54:06 +00:00
dependabot[bot]
6452e67cd7 Bump rswag-ui from 2.13.0 to 2.14.0
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.13.0...2.14.0)

---
updated-dependencies:
- dependency-name: rswag-ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 07:39:01 +00:00
Daniel O'Connor
6ee4f91418 Merge pull request #3820 from Growstuff/dependabot/bundler/rswag-specs-2.14.0
Bump rswag-specs from 2.13.0 to 2.14.0
2024-08-14 17:07:56 +09:30
dependabot[bot]
c24b8b3470 Bump rswag-specs from 2.13.0 to 2.14.0
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.13.0 to 2.14.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.13.0...2.14.0)

---
updated-dependencies:
- dependency-name: rswag-specs
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-14 07:18:41 +00:00
dependabot[bot]
44a56a25c7 Merge pull request #3817 from Growstuff/dependabot/bundler/oj-3.16.5 2024-08-08 08:14:02 +00:00
dependabot[bot]
ba3e3afe52 Bump oj from 3.16.4 to 3.16.5
Bumps [oj](https://github.com/ohler55/oj) from 3.16.4 to 3.16.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.16.4...v3.16.5)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-08 07:57:06 +00:00
dependabot[bot]
cf1c67f266 Merge pull request #3816 from Growstuff/dependabot/bundler/rubocop-rspec-3.0.4 2024-08-06 09:03:13 +00:00
dependabot[bot]
a92f8a358b Bump rubocop-rspec from 3.0.3 to 3.0.4
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-06 07:57:16 +00:00
Daniel O'Connor
0bb3ac952c Merge pull request #3787 from Growstuff/dev
July 2024 Release
2024-08-02 08:18:00 +09:30
dependabot[bot]
e8bc72dc90 Merge pull request #3813 from Growstuff/dependabot/bundler/rubocop-1.65.1 2024-08-01 22:22:35 +00:00
dependabot[bot]
bab87682c5 Bump rubocop from 1.65.0 to 1.65.1
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.65.0 to 1.65.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.65.0...v1.65.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 22:06:15 +00:00
dependabot[bot]
ce52dfdd87 Merge pull request #3814 from Growstuff/dependabot/bundler/faraday-2.10.1 2024-08-01 22:05:09 +00:00
dependabot[bot]
1e623f657d Bump faraday from 2.10.0 to 2.10.1
Bumps [faraday](https://github.com/lostisland/faraday) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.10.0...v2.10.1)

---
updated-dependencies:
- dependency-name: faraday
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 07:39:31 +00:00
dependabot[bot]
7fb1459740 Merge pull request #3811 from Growstuff/dependabot/bundler/pg-1.5.7 2024-07-29 09:37:03 +00:00
dependabot[bot]
4de547c243 Bump pg from 1.5.6 to 1.5.7
Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.6 to 1.5.7.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.6...v1.5.7)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-29 07:30:14 +00:00
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
Daniel O'Connor
83f2cf4a3c Require name, handle errors on crop create (#3799)
* Fix #3278 by ensuring we rebuild names on error

* Require a URL

* Require a name

* 'Only required for wrangers, and only when approving

* Re-add expectation
2024-07-23 19:44:21 +09:30
dependabot[bot]
d03f1e171d Merge pull request #3808 from Growstuff/dependabot/bundler/selenium-webdriver-4.23.0 2024-07-23 10:13:31 +00:00
dependabot[bot]
ef9fd8c82b Merge pull request #3810 from Growstuff/dependabot/bundler/rexml-3.3.2 2024-07-22 09:55:23 +00:00
dependabot[bot]
cb9afd00c6 Bump selenium-webdriver from 4.22.0 to 4.23.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.22.0 to 4.23.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.22.0...selenium-4.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-22 09:25:56 +00:00
dependabot[bot]
946b780b4e Bump rexml from 3.3.1 to 3.3.2
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.1...v3.3.2)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-22 09:25:45 +00:00
dependabot[bot]
82be16b8f8 Merge pull request #3809 from Growstuff/dependabot/bundler/icalendar-2.10.2 2024-07-22 09:24:57 +00:00
dependabot[bot]
becd846022 Bump icalendar from 2.10.1 to 2.10.2
Bumps [icalendar](https://github.com/icalendar/icalendar) from 2.10.1 to 2.10.2.
- [Changelog](https://github.com/icalendar/icalendar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/icalendar/icalendar/compare/v2.10.1...v2.10.2)

---
updated-dependencies:
- dependency-name: icalendar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-22 07:10:18 +00:00
Daniel O'Connor
e7a0d0276f Photos > Show crop link (#3803)
* Fix #3802 Show crop link

* Fix #3802 Show crop link

* Fix missing arg

* Fix missing arg

* Translations
2024-07-17 20:06:32 +09:30
dependabot[bot]
7b5d8c0236 Merge pull request #3807 from Growstuff/dependabot/bundler/faker-3.4.2 2024-07-17 10:16:18 +00:00
dependabot[bot]
d45b51f85c Bump faker from 3.4.1 to 3.4.2
Bumps [faker](https://github.com/faker-ruby/faker) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.4.1...v3.4.2)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-17 07:33:55 +00:00
dependabot[bot]
d041382195 Merge pull request #3806 from Growstuff/dependabot/bundler/leaflet-rails-1.9.5 2024-07-16 13:42:01 +00:00
dependabot[bot]
8f0dff1e96 Bump leaflet-rails from 1.9.4 to 1.9.5
Bumps [leaflet-rails](https://github.com/axyjo/leaflet-rails) from 1.9.4 to 1.9.5.
- [Commits](https://github.com/axyjo/leaflet-rails/compare/v1.9.4...v1.9.5)

---
updated-dependencies:
- dependency-name: leaflet-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-16 13:26:59 +00:00
Daniel O'Connor
5b42174baf Merge pull request #3804 from Growstuff/fix-3801
Seeds > Ebay > Simplify link
2024-07-16 22:55:40 +09:30
Daniel O'Connor
8ba7eef6be Simplify link 2024-07-13 11:56:24 +00:00
Daniel O'Connor
25e98f1d7f Merge pull request #3771 from Growstuff/dev
June 2024 release (a few days late)
2024-07-02 18:08:08 +09:30
31 changed files with 390 additions and 306 deletions

View File

@@ -13,3 +13,4 @@ updates:
interval: daily
time: "07:00"
open-pull-requests-limit: 10

View File

@@ -1,40 +0,0 @@
# This workflow integrates Brakeman with GitHub's Code Scanning feature
# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
name: Brakeman Scan
# This section configures the trigger for the workflow. Feel free to customize depending on your convention
on:
pull_request:
branches: [ dev ]
jobs:
brakeman-scan:
name: Brakeman Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout
uses: actions/checkout@v4
# Customize the ruby version depending on your needs
- name: Setup Ruby
uses: ruby/setup-ruby@v1
- name: Setup Brakeman
env:
BRAKEMAN_VERSION: '5.1.1' # SARIF support is provided in Brakeman version 4.10+
run: |
gem install brakeman --version $BRAKEMAN_VERSION
# Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
- name: Scan
continue-on-error: true
run: |
brakeman -f sarif -o output.sarif.json .
# Upload the SARIF file generated in the previous step
- name: Upload SARIF
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: output.sarif.json

View File

@@ -5,13 +5,13 @@ source 'https://rubygems.org'
# Match ruby version in .ruby-version
ruby File.read('.ruby-version')
gem 'rails', '~> 7.1.0'
gem 'rails', '~> 7.2.0'
# Keeping old sprockets
# https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
gem "sprockets", "<4"
gem 'bundler', '>= 2.3.10'
gem 'bundler', '>= 2.4.22'
gem 'coffee-rails'
gem 'haml'

View File

@@ -33,51 +33,46 @@ GEM
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.3.4)
actionpack (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.3.4)
actionview (= 7.1.3.4)
activesupport (= 7.1.3.4)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.3.4)
actionpack (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (7.2.1)
activesupport (= 7.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
@@ -92,44 +87,45 @@ GEM
active_utils (3.4.1)
activesupport (>= 4.2)
i18n
activejob (7.1.3.4)
activesupport (= 7.1.3.4)
activejob (7.2.1)
activesupport (= 7.2.1)
globalid (>= 0.3.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
timeout (>= 0.4.0)
activestorage (7.1.3.4)
actionpack (= 7.1.3.4)
activejob (= 7.1.3.4)
activerecord (= 7.1.3.4)
activesupport (= 7.1.3.4)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
marcel (~> 1.0)
activesupport (7.1.3.4)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
axe-core-api (4.9.1)
axe-core-api (4.10.0)
dumb_delegator
virtus
axe-core-capybara (4.9.1)
axe-core-api (= 4.9.1)
axe-core-capybara (4.10.0)
axe-core-api (= 4.10.0)
dumb_delegator
axe-core-rspec (4.9.1)
axe-core-api (= 4.9.1)
axe-core-rspec (4.10.0)
axe-core-api (= 4.10.0)
dumb_delegator
virtus
axiom-types (0.1.1)
@@ -183,7 +179,7 @@ GEM
image_processing (~> 1.1)
marcel (~> 1.0.0)
ssrf_filter (~> 1.0)
chartkick (5.0.7)
chartkick (5.1.0)
childprocess (5.0.0)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
@@ -199,7 +195,7 @@ GEM
coffee-script-source (1.12.2)
comfy_bootstrap_form (4.0.9)
rails (>= 5.0.0)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crass (1.0.6)
csv (3.3.0)
@@ -208,7 +204,7 @@ GEM
dalli (3.2.8)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
@@ -225,9 +221,9 @@ GEM
discard (1.3.0)
activerecord (>= 4.2, < 8)
docile (1.1.5)
dotenv (3.1.2)
dotenv-rails (3.1.2)
dotenv (= 3.1.2)
dotenv (3.1.4)
dotenv-rails (3.1.4)
dotenv (= 3.1.4)
railties (>= 6.1)
drb (2.2.1)
dumb_delegator (1.0.0)
@@ -253,12 +249,13 @@ GEM
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faker (3.4.1)
faker (3.4.2)
i18n (>= 1.8.11, < 2)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
faraday (2.12.0)
faraday-net_http (>= 2.0, < 3.4)
json
logger
faraday-net_http (3.1.0)
faraday-net_http (3.3.0)
net-http
ffi (1.16.3)
flickraw (0.9.10)
@@ -311,7 +308,7 @@ GEM
csv
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
i18n-tasks (1.0.14)
activesupport (>= 4.0.2)
@@ -323,15 +320,16 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
icalendar (2.10.1)
icalendar (2.10.3)
ice_cube (~> 0.16)
ice_cube (0.16.4)
ostruct
ice_cube (0.17.0)
ice_nine (0.11.2)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.7.2)
irb (1.13.2)
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jquery-rails (4.6.0)
@@ -339,7 +337,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.2)
json-schema (4.1.1)
json-schema (4.3.1)
addressable (>= 2.8)
jsonapi-resources (0.10.7)
activerecord (>= 4.1)
@@ -353,7 +351,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
leaflet-rails (1.9.4)
leaflet-rails (1.9.5)
actionpack (>= 4.2.0)
railties (>= 4.2.0)
letter_opener (1.10.0)
@@ -361,7 +359,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
logger (1.6.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -388,16 +386,15 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.24.1)
minitest (5.25.1)
moneta (1.0.0)
msgpack (1.7.2)
multi_json (1.15.0)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
mutex_m (0.2.0)
net-http (0.4.1)
uri
net-imap (0.4.11)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
@@ -407,14 +404,15 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nokogiri (1.16.6)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
oauth (0.5.6)
oj (3.16.4)
oj (3.16.6)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
omniauth (1.9.2)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@@ -428,13 +426,14 @@ GEM
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0)
parallel (1.25.1)
parser (3.3.4.0)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
percy-capybara (5.0.0)
capybara (>= 3)
pg (1.5.6)
pg (1.5.8)
platform-api (3.7.0)
heroics (~> 0.1.1)
moneta (~> 1.0.0)
@@ -445,11 +444,11 @@ GEM
method_source (~> 1.0)
psych (5.1.2)
stringio
public_suffix (6.0.0)
puma (6.4.2)
public_suffix (6.0.1)
puma (6.4.3)
nio4r (~> 2.0)
query_diet (0.7.1)
racc (1.8.0)
query_diet (0.7.2)
racc (1.8.1)
rack (2.2.9)
rack-cors (2.0.2)
rack (>= 2.0.0)
@@ -463,20 +462,20 @@ GEM
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3.4)
actioncable (= 7.1.3.4)
actionmailbox (= 7.1.3.4)
actionmailer (= 7.1.3.4)
actionpack (= 7.1.3.4)
actiontext (= 7.1.3.4)
actionview (= 7.1.3.4)
activejob (= 7.1.3.4)
activemodel (= 7.1.3.4)
activerecord (= 7.1.3.4)
activestorage (= 7.1.3.4)
activesupport (= 7.1.3.4)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
bundler (>= 1.15.0)
railties (= 7.1.3.4)
railties (= 7.2.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -496,10 +495,10 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (7.1.3.4)
actionpack (= 7.1.3.4)
activesupport (= 7.1.3.4)
irb
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
@@ -517,13 +516,12 @@ GEM
redis-client (0.22.2)
connection_pool
regexp_parser (2.9.2)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.3.1)
strscan
rexml (3.3.7)
rouge (4.1.2)
rspec (3.13.0)
rspec-core (~> 3.13.0)
@@ -533,18 +531,18 @@ GEM
activemodel (>= 3.0)
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
rspec-core (3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-rails (7.0.1)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
@@ -553,48 +551,47 @@ GEM
rspectre (0.1.0)
parser (>= 3.2.2.1)
rspec (~> 3.9)
rswag-api (2.13.0)
activesupport (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rswag-specs (2.13.0)
activesupport (>= 3.1, < 7.2)
rswag-api (2.14.0)
activesupport (>= 5.2, < 8.0)
railties (>= 5.2, < 8.0)
rswag-specs (2.14.0)
activesupport (>= 5.2, < 8.0)
json-schema (>= 2.2, < 5.0)
railties (>= 3.1, < 7.2)
railties (>= 5.2, < 8.0)
rspec-core (>= 2.14)
rswag-ui (2.13.0)
actionpack (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rubocop (1.65.0)
rswag-ui (2.14.0)
actionpack (>= 5.2, < 8.0)
railties (>= 5.2, < 8.0)
rubocop (1.66.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-rails (2.25.1)
rubocop-rails (2.26.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.3)
rubocop-rspec (3.0.5)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
ruby-progressbar (1.13.0)
ruby-units (4.0.3)
ruby-units (4.1.0)
ruby-vips (2.2.1)
ffi (~> 1.12)
rubyzip (2.3.2)
@@ -611,18 +608,19 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
scout_apm (5.3.8)
scout_apm (5.4.0)
parser
searchkick (5.3.1)
activemodel (>= 6.1)
hashie
selenium-webdriver (4.22.0)
securerandom (0.3.1)
selenium-webdriver (4.25.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sidekiq (7.3.0)
sidekiq (7.3.2)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
logger
@@ -633,7 +631,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sprockets (3.7.3)
sprockets (3.7.5)
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -643,14 +641,13 @@ GEM
sprockets (>= 3.0.0)
ssrf_filter (1.1.2)
stringio (3.1.1)
strscan (3.1.0)
sysexits (1.2.0)
temple (0.10.3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
terser (1.2.3)
execjs (>= 0.3.0, < 3)
thor (1.3.1)
thor (1.3.2)
thread_safe (0.3.6)
tilt (2.4.0)
timecop (0.9.10)
@@ -658,16 +655,18 @@ GEM
trollop (1.16.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
unicorn (6.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.16.0)
uri (0.13.0)
uri (0.13.1)
useragent (0.16.10)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
vcr (6.2.0)
vcr (6.3.1)
base64
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
@@ -678,7 +677,7 @@ GEM
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
webrick (1.8.1)
webrick (1.8.2)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
@@ -690,7 +689,7 @@ GEM
webrick
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.16)
zeitwerk (2.6.18)
PLATFORMS
ruby
@@ -709,7 +708,7 @@ DEPENDENCIES
bootstrap-datepicker-rails
bootstrap_form (>= 4.5.0)
bullet
bundler (>= 2.3.10)
bundler (>= 2.4.22)
byebug
cancancan
capybara
@@ -768,7 +767,7 @@ DEPENDENCIES
query_diet
rack-cors
rack-protection (>= 2.0.1)
rails (~> 7.1.0)
rails (~> 7.2.0)
rails-assets-leaflet.markercluster!
rails-controller-testing
rails_12factor

View File

@@ -1,11 +1,19 @@
$(document).ready(function() {
$('.like-btn').show();
$('.post-like').on('ajax:success', function(event, data) {
var likeButton = $('#post-' + data.id + ' .post-like');
var likeBadge = $('#post-'+ data.id + ' .like-badge');
/**
* Handles the result of an ajax call and updates UI
*
* @param {object} data JSON data from ajax response
* @param {string} type object type (ie: post, activity, etc)
*/
var likeableSuccess = function(data, type) {
var target = '.' + type + '-' + data.id;
var objectClass = type.charAt(0).toUpperCase() + type.slice(1);
var likeButton = $(target + ' .' + type + '-like');
var likeBadge = $(target + ' .like-badge');
$('#post-' + data.id + ' .like-count').text(data.like_count);
$(target + ' .like-count').text(data.like_count);
if (data.liked_by_member) {
likeBadge.addClass('liked');
likeButton.data('method', 'delete');
@@ -14,11 +22,26 @@ $(document).ready(function() {
} else {
likeBadge.removeClass('liked');
likeButton.data('method', 'post');
likeButton.attr('href', '/likes.json?type=Post&id=' + data.id);
likeButton.attr('href', '/likes.json?type=' + objectClass + '&id=' + data.id);
likeButton.text('Like');
}
};
$('.post-like').on('ajax:success', function(event, data) {
likeableSuccess(data, 'post');
});
$('.activity-like').on('ajax:success', function(event, data) {
likeableSuccess(data, 'activity');
});
$('.planting-like').on('ajax:success', function(event, data) {
likeableSuccess(data, 'planting');
});
$('.harvest-like').on('ajax:success', function(event, data) {
likeableSuccess(data, 'harvest');
});
$('.photo-like').on('ajax:success', function(event, data) {
var likeBadge = $('#photo-'+ data.id + ' .like-badge');

View File

@@ -8,6 +8,9 @@ body {
font-family: $default-font;
}
.navbar {
flex-wrap: nowrap;
}
.navbar-brand {
.site-name {
font-family: "Modak", cursive;
@@ -16,7 +19,7 @@ body {
}
img {
height: 60px;
height: 100%;
}
}

View File

@@ -113,7 +113,12 @@ class CropsController < ApplicationController
@crop.approval_status = "pending"
end
notify_wranglers if Crop.transaction { @crop.save && save_crop_names }
if Crop.transaction { @crop.save && save_crop_names }
notify_wranglers
else
@crop.alternate_names.build
@crop.scientific_names.build
end
respond_with @crop
end

View File

@@ -15,6 +15,6 @@ module CropsHelper
end
def crop_ebay_seeds_url(crop)
"https://rover.ebay.com/rover/1/705-53470-19255-0/1?icep_ff3=9&pub=5575213277&toolid=10001&campid=5337940151&customid=&icep_uq=#{CGI.escape crop.name}&icep_sellerId=&icep_ex_kw=&icep_sortBy=12&icep_catId=181003&icep_minPrice=&icep_maxPrice=&ipn=psmain&icep_vectorid=229515&kwid=902099&mtid=824&kw=lg"
"https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
end
end

View File

@@ -5,6 +5,7 @@ class Activity < ApplicationRecord
include Ownable
include Finishable
include SearchActivities
include Likeable
belongs_to :garden, optional: true
belongs_to :planting, optional: true

View File

@@ -6,6 +6,7 @@ class Harvest < ApplicationRecord
include PhotoCapable
include Ownable
include SearchHarvests
include Likeable
friendly_id :harvest_slug, use: %i(slugged finders)

View File

@@ -8,6 +8,7 @@ class Planting < ApplicationRecord
include PredictPlanting
include PredictHarvest
include SearchPlantings
include Likeable
friendly_id :planting_slug, use: %i(slugged finders)

View File

@@ -1,5 +1,5 @@
- if can?(:edit, activity)
.dropdown.activity-actions
%span.dropdown.activity-actions
%a#activity-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
= activity_edit_button(activity, classes: 'dropdown-item')

View File

@@ -22,19 +22,17 @@
%small.text-muted= @activity.category
%tt
= @activity.due_date
- if @activity.description.present?
:markdown
#{strip_tags markdownify(@activity.description)}
= render 'likes/likes', object: @activity
= render 'activities/actions', activity: @activity
.col-md-4.col-xs-12
= render 'activities/owner', planting: @activity
.col-md-8.col-xs-12
- if @activity.description.present?
= cute_icon
.card
.card-header
%h2 Description
.card-body
:markdown
#{strip_tags markdownify(@activity.description)}
- if @activity.garden
%section.gardens
@@ -48,4 +46,3 @@
.col-md-4.col-xs-12
= render 'activities/actions', activity: @activity

View File

@@ -26,7 +26,7 @@
%h2 Basic information
.form-group#new_crop
= f.text_field :name
= f.text_field :name, required: true
%span.help-block
The common name for the crop, in English (required).
- if can? :wrangle, @crop
@@ -43,7 +43,7 @@
- unless @crop.approved?
= link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
= f.text_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
= f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
%span.help-block
Link to the crop's page on the English language Wikipedia (required).

View File

@@ -1,5 +1,5 @@
- if can?(:edit, harvest)
.dropdown.harvest-actions
%span.dropdown.harvest-actions
%a#harvest-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
= harvest_edit_button(harvest, classes: 'dropdown-item')

View File

@@ -15,13 +15,26 @@
.harvest
.row
.col-md-8.col-xs-12
%h1
= harvest_icon
#{@harvest.crop} harvested by #{@harvest.owner}
.col-md-4.col-xs-12
= render 'harvests/actions', harvest: @harvest
.col-md-8.col-xs-12
.jumbotron
.d-flex.justify-content-between
%h1.display-3
= harvest_icon
%strong= @harvest.crop
%small.text-muted
harvested by
= @harvest.owner
- if @harvest.description.present?
:markdown
#{strip_tags markdownify(@harvest.description)}
= render partial: 'planting'
= render 'likes/likes', object: @harvest
= render 'harvests/actions', harvest: @harvest
.col-md-4.col-xs-12
= render 'harvests/owner', harvest: @harvest
.col-md-8.col-xs-12
.index-cards.facts
- if @harvest.plant_part
.card
@@ -53,14 +66,5 @@
Havested from
= link_to @harvest.planting, @harvest.planting
- if @harvest.description.present?
.card
.card-header
%h2 Notes
.card-body
:markdown
#{strip_tags markdownify(@harvest.description)}
.col-md-4.col-xs-12
= render 'harvests/owner', harvest: @harvest
= render @harvest.crop

View File

@@ -1,4 +1,4 @@
%span.badge.like-badge{class: liked ? 'liked' : ''}
= like_icon
&nbsp;
%span.like-count= likeable.likes_count
%span.like-count{title: t('buttons.total_likes')}= likeable.likes_count

View File

@@ -0,0 +1,18 @@
%span.likes
- if member_signed_in? && can?(:new, Like)
- if !object.liked_by?(current_member)
= link_to likes_path(type: object.class.name, id: object.id, format: :json),
title: t('buttons.like'),
method: :post,
remote: true,
class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
= render 'likes/count', likeable: object, liked: false
- else
= link_to likes_path(type: object.class.name, id: object.id, format: :json),
title: t('buttons.unlike'),
method: :delete,
remote: true,
class: "#{object.class.name.downcase}-#{object.id} #{object.class.name.downcase}-like like-btn btn" do
= render 'likes/count', likeable: object, liked: true
- else
= render 'likes/count', likeable: object, liked: member_signed_in? && object.liked_by?(current_member)

View File

@@ -1,7 +1,7 @@
- if can?(:edit, @photo) && can?(:destroy, @photo)
.dropdown.float-right.photo-actions
%a#harvest-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "harvest-actions-button"}
%a#photo-actions-button.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "photo-actions-button"}
= edit_button(edit_photo_path(@photo), classes: 'dropdown-item')
.dropdown-divider
= delete_button(@photo, classes: 'dropdown-item text-danger')

View File

@@ -30,3 +30,9 @@
= seed_icon
= link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
= render "association_delete_button", photo: @photo, type: 'seed', thing: seed
- @photo.crops.each do |crop|
%li
= crop_icon(crop)
= link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)
= render "association_delete_button", photo: @photo, type: 'crop', thing: crop

View File

@@ -28,12 +28,12 @@
= render 'crops/thumbnail', crop: crop
.col-md-3
%p
%span.btn= render 'photos/likes', photo: @photo
= render 'photos/actions', photo: @photo
= link_to @photo.link_url, class: 'btn btn-info' do
- if @photo.source == 'flickr'
= icon 'fab', 'flickr'
View on #{@photo.source.titleize}
%span.btn= render 'photos/likes', photo: @photo
- if @photo.date_taken.present?
%h3 Taken on #{I18n.l @photo.date_taken.to_date}

View File

@@ -1,5 +1,5 @@
- if can?(:edit, planting)
.dropdown.planting-actions
%span.dropdown.planting-actions
%a#planting-actions-button.btn.btn-info.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'} Actions
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
= planting_edit_button(planting, classes: 'dropdown-item')

View File

@@ -43,6 +43,8 @@
%strong #{@planting.age_in_days}/#{@planting.expected_lifespan} days
= render 'timeline', planting: @planting
= render 'likes/likes', object: @planting
= render 'plantings/actions', planting: @planting
.col-md-4.col-xs-12
= render 'plantings/owner', planting: @planting
@@ -79,8 +81,6 @@
.col-md-4.col-xs-12
= render 'plantings/actions', planting: @planting
%hr/
= render @planting.crop
- if @planting.location

View File

@@ -1,10 +0,0 @@
- if member_signed_in? && can?(:new, Like)
- if !post.liked_by?(current_member)
= link_to 'Like', likes_path(type: 'Post', id: post.id, format: :json),
method: :post, remote: true, class: 'post-like btn like-btn'
- else
= link_to 'Unlike', likes_path(type: 'Post', id: post.id, format: :json),
method: :delete, remote: true, class: 'post-like btn like-btn'
= render 'likes/count', likeable: post, liked: member_signed_in? && post.liked_by?(current_member)

View File

@@ -45,7 +45,7 @@
= render 'photos/thumbnail', photo: photo
.card-footer
= render 'posts/likes', post: @post
= render 'likes/likes', object: @post
.float-right
- if can? :create, Comment
= link_to new_comment_path(post_id: @post.id), class: 'btn' do

View File

@@ -24,4 +24,9 @@
- photo.seeds.each do |seed|
%li
= seed_icon
= link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
= link_to t('photos.show.seed', seed: seed.to_s, owner: seed.owner.to_s), seed_path(seed)
- photo.crops.each do |crop|
%li
= crop_icon(crop)
= link_to t('photos.show.crop', crop: crop.to_s), crop_path(crop)

View File

@@ -92,6 +92,9 @@ en:
save_seeds: Save seeds
timeline: Timeline
write_blog_post: Write blog post
like: Like
unlike: Remove like
total_likes: Total likes
crops:
search: Search crops
index:
@@ -267,6 +270,7 @@ en:
planting: "%{planting}"
seed: "%{seed}"
thing_by: A %{thing} by %{owner}
crop: "%{crop}"
places:
index:
title: "%{site_name} Community Map"

View File

@@ -0,0 +1,17 @@
# frozen_string_literal: true
class LikeEverything < ActiveRecord::Migration[7.1]
def change
change_table :activities do |t|
t.integer :likes_count, default: 0
end
change_table :plantings do |t|
t.integer :likes_count, default: 0
end
change_table :harvests do |t|
t.integer :likes_count, default: 0
end
end
end

View File

@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
ActiveRecord::Schema[7.1].define(version: 2024_07_14_024918) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -54,6 +54,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "slug"
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_score", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
t.integer "cached_weighted_score", default: 0
t.integer "cached_weighted_total", default: 0
t.float "cached_weighted_average", default: 0.0
t.integer "likes_count", default: 0
t.index ["garden_id"], name: "index_activities_on_garden_id"
t.index ["owner_id"], name: "index_activities_on_owner_id"
t.index ["planting_id"], name: "index_activities_on_planting_id"
@@ -206,6 +214,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.text "body", null: false
t.datetime "created_at", precision: nil
t.datetime "updated_at", precision: nil
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_score", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
t.integer "cached_weighted_score", default: 0
t.integer "cached_weighted_total", default: 0
t.float "cached_weighted_average", default: 0.0
end
create_table "crop_companions", force: :cascade do |t|
@@ -314,6 +329,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.integer "plant_part_id"
t.float "si_weight"
t.integer "planting_id"
t.integer "likes_count", default: 0
t.index ["planting_id"], name: "index_harvests_on_planting_id"
end
@@ -488,6 +504,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.datetime "date_taken", precision: nil
t.integer "likes_count", default: 0
t.string "source"
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_score", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
t.integer "cached_weighted_score", default: 0
t.integer "cached_weighted_total", default: 0
t.float "cached_weighted_average", default: 0.0
t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
end
@@ -530,6 +553,14 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.integer "days_to_last_harvest"
t.integer "parent_seed_id"
t.integer "harvests_count", default: 0
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_score", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
t.integer "cached_weighted_score", default: 0
t.integer "cached_weighted_total", default: 0
t.float "cached_weighted_average", default: 0.0
t.integer "likes_count", default: 0
t.index ["slug"], name: "index_plantings_on_slug", unique: true
end
@@ -543,6 +574,13 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.integer "forum_id"
t.integer "likes_count", default: 0
t.integer "comments_count", default: 0
t.integer "cached_votes_total", default: 0
t.integer "cached_votes_score", default: 0
t.integer "cached_votes_up", default: 0
t.integer "cached_votes_down", default: 0
t.integer "cached_weighted_score", default: 0
t.integer "cached_weighted_total", default: 0
t.float "cached_weighted_average", default: 0.0
t.index ["created_at", "author_id"], name: "index_posts_on_created_at_and_author_id"
t.index ["slug"], name: "index_posts_on_slug", unique: true
end
@@ -590,6 +628,22 @@ ActiveRecord::Schema[7.1].define(version: 2024_02_18_053122) do
t.index ["slug"], name: "index_seeds_on_slug", unique: true
end
create_table "votes", force: :cascade do |t|
t.string "votable_type"
t.bigint "votable_id"
t.string "voter_type"
t.bigint "voter_id"
t.boolean "vote_flag"
t.string "vote_scope"
t.integer "vote_weight"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["votable_id", "votable_type", "vote_scope"], name: "index_votes_on_votable_id_and_votable_type_and_vote_scope"
t.index ["votable_type", "votable_id"], name: "index_votes_on_votable"
t.index ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope"
t.index ["voter_type", "voter_id"], name: "index_votes_on_voter"
end
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "harvests", "plantings"

View File

@@ -5,7 +5,10 @@ require 'rails_helper'
describe 'Likeable', :js, :search do
let(:another_member) { FactoryBot.create(:london_member) }
let!(:post) { FactoryBot.create(:post, :reindex, author: member) }
let!(:activity) { FactoryBot.create(:activity, :reindex, owner: member) }
let!(:photo) { FactoryBot.create(:photo, :reindex, owner: member) }
let!(:harvest) { FactoryBot.create(:harvest, :reindex, owner: member) }
let!(:planting) { FactoryBot.create(:planting, :reindex, owner: member) }
before do
Photo.reindex
@@ -13,55 +16,55 @@ describe 'Likeable', :js, :search do
include_context 'signed in member'
shared_examples 'object can be liked' do
it 'can be liked' do
visit path
expect(page).to have_css(like_count_class, text: "0")
click_link '0', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
# Reload page
visit path
expect(page).to have_css(like_count_class, text: "1")
expect(page).to have_link '1'
click_link '1', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "0")
end
it 'displays correct number of likes' do
visit path
expect(page).to have_css(like_count_class, text: "0")
expect(page).to have_link '0'
click_link '0', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
logout(member)
login_as(another_member)
visit path
expect(page).to have_css(like_count_class, text: "1")
click_link '1', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "2")
logout(another_member)
end
end
describe 'photos' do
def like_count_class
"#photo-#{photo.id} .like-count"
end
shared_examples 'photo can be liked' do
it 'can be liked' do
visit path
expect(page).to have_css(like_count_class, text: "0")
click_link '0', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
# Reload page
visit path
expect(page).to have_css(like_count_class, text: "1")
expect(page).to have_link '1'
click_link '1', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "0")
end
it 'displays correct number of likes' do
visit path
expect(page).to have_css(like_count_class, text: "0")
expect(page).to have_link '0'
click_link '0', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
logout(member)
login_as(another_member)
visit path
expect(page).to have_css(like_count_class, text: "1")
click_link '1', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "2")
logout(another_member)
end
end
describe 'photos#index' do
let(:path) { photos_path }
include_examples 'photo can be liked'
include_examples 'object can be liked'
end
describe 'photos#show' do
let(:path) { photo_path(photo) }
include_examples 'photo can be liked'
include_examples 'object can be liked'
end
describe 'crops#show' do
@@ -71,43 +74,35 @@ describe 'Likeable', :js, :search do
before { planting.photos << photo }
include_examples 'photo can be liked'
include_examples 'object can be liked'
end
end
describe 'posts' do
let(:like_count_class) { "#post-#{post.id} .like-count" }
let(:like_count_class) { ".post-#{post.id} .like-count" }
let(:path) { post_path(post) }
before { visit post_path(post) }
include_examples 'object can be liked'
end
it 'can be liked' do
expect(page).to have_css(like_count_class, text: "0")
expect(page).to have_link 'Like'
click_link 'Like', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
describe 'activities' do
let(:like_count_class) { ".activity-#{activity.id} .like-count" }
let(:path) { activity_path(activity) }
# Reload page
visit post_path(post)
expect(page).to have_css(like_count_class, text: "1")
expect(page).to have_link 'Unlike'
include_examples 'object can be liked'
end
click_link 'Unlike', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "0")
end
describe 'plantings' do
let(:like_count_class) { ".planting-#{planting.id} .like-count" }
let(:path) { planting_path(planting) }
it 'displays correct number of likes' do
expect(page).to have_link 'Like'
click_link 'Like', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "1")
include_examples 'object can be liked'
end
logout(member)
login_as(another_member)
visit post_path(post)
describe 'harvests' do
let(:like_count_class) { ".harvest-#{harvest.id} .like-count" }
let(:path) { harvest_path(harvest) }
expect(page).to have_link 'Like'
click_link 'Like', class: 'like-btn'
expect(page).to have_css(like_count_class, text: "2")
logout(another_member)
end
include_examples 'object can be liked'
end
end

View File

@@ -291,7 +291,7 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
braces@^3.0.2:
braces@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -1082,11 +1082,11 @@ merge2@^1.3.0, merge2@^1.4.1:
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
micromatch@^4.0.4:
version "4.0.5"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
dependencies:
braces "^3.0.2"
braces "^3.0.3"
picomatch "^2.3.1"
mime-db@1.52.0: