mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-25 09:19:15 -04:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
219867099a |
@@ -27,7 +27,7 @@ services:
|
||||
command: sleep infinity
|
||||
|
||||
db:
|
||||
image: postgres:17
|
||||
image: postgres:latest
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
|
||||
11
.github/workflows/ci-features-admin.yml
vendored
11
.github/workflows/ci-features-admin.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (admin/)
|
||||
run: bundle exec rspec spec/features/admin/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-comments.yml
vendored
11
.github/workflows/ci-features-comments.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (comments/)
|
||||
run: bundle exec rspec spec/features/comments/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
10
.github/workflows/ci-features-conversations.yml
vendored
10
.github/workflows/ci-features-conversations.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -101,9 +101,3 @@ jobs:
|
||||
- name: Run rspec (conversations/)
|
||||
run: bundle exec rspec spec/features/conversations/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-crops.yml
vendored
11
.github/workflows/ci-features-crops.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (crops/)
|
||||
run: bundle exec rspec spec/features/crops/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-gardens.yml
vendored
11
.github/workflows/ci-features-gardens.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (gardens/)
|
||||
run: bundle exec rspec spec/features/gardens/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
13
.github/workflows/ci-features-harvests.yml
vendored
13
.github/workflows/ci-features-harvests.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -99,11 +99,4 @@ jobs:
|
||||
run: bundle exec rails search:reindex
|
||||
|
||||
- name: Run rspec (harvests/)
|
||||
run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
|
||||
13
.github/workflows/ci-features-home.yml
vendored
13
.github/workflows/ci-features-home.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -99,11 +99,4 @@ jobs:
|
||||
run: bundle exec rails search:reindex
|
||||
|
||||
- name: Run rspec (home/)
|
||||
run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
|
||||
13
.github/workflows/ci-features-members.yml
vendored
13
.github/workflows/ci-features-members.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -99,11 +99,4 @@ jobs:
|
||||
run: bundle exec rails search:reindex
|
||||
|
||||
- name: Run rspec (members/)
|
||||
run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
|
||||
11
.github/workflows/ci-features-places.yml
vendored
11
.github/workflows/ci-features-places.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (places/)
|
||||
run: bundle exec rspec spec/features/places/ -fd
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-plantings.yml
vendored
11
.github/workflows/ci-features-plantings.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (plantings/)
|
||||
run: bundle exec rspec spec/features/plantings/ -fd
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
13
.github/workflows/ci-features-posts.yml
vendored
13
.github/workflows/ci-features-posts.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: CI Features - Posts
|
||||
name: CI Features - Admin
|
||||
|
||||
on: [pull_request]
|
||||
|
||||
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (posts/)
|
||||
run: bundle exec rspec spec/features/posts/ -fd
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-seeds.yml
vendored
11
.github/workflows/ci-features-seeds.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -100,10 +100,3 @@ jobs:
|
||||
|
||||
- name: Run rspec (seeds/)
|
||||
run: bundle exec rspec spec/features/seeds/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
13
.github/workflows/ci-features-timeline.yml
vendored
13
.github/workflows/ci-features-timeline.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -99,11 +99,4 @@ jobs:
|
||||
run: bundle exec rails search:reindex
|
||||
|
||||
- name: Run rspec (timeline/)
|
||||
run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
|
||||
13
.github/workflows/ci-features.yml
vendored
13
.github/workflows/ci-features.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
@@ -108,11 +108,4 @@ jobs:
|
||||
run: bundle exec rspec spec/features/photos/ -fd
|
||||
|
||||
- name: Run rspec (rss/)
|
||||
run: bundle exec rspec spec/features/rss/ -fd
|
||||
|
||||
- name: Upload screenshots
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/rss/ -fd
|
||||
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@@ -6,7 +6,7 @@ jobs:
|
||||
contributors:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v5
|
||||
- name: Install ruby version specified in .ruby-version
|
||||
uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
@@ -53,7 +53,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout this repo
|
||||
uses: actions/checkout@v6
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Configure sysctl limits
|
||||
run: |
|
||||
@@ -89,7 +89,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v6
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '12'
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inherit_from: .rubocop_todo.yml
|
||||
plugins:
|
||||
require:
|
||||
- rubocop-factory_bot
|
||||
- rubocop-capybara
|
||||
- rubocop-rails
|
||||
|
||||
@@ -314,7 +314,7 @@ RSpec/MultipleExpectations:
|
||||
# Offense count: 138
|
||||
# Configuration parameters: AllowSubject.
|
||||
RSpec/MultipleMemoizedHelpers:
|
||||
Max: 20
|
||||
Max: 14
|
||||
|
||||
# Offense count: 133
|
||||
# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
|
||||
|
||||
9
Gemfile
9
Gemfile
@@ -178,6 +178,7 @@ group :development, :test do
|
||||
gem 'dotenv-rails'
|
||||
|
||||
# cli utils
|
||||
gem 'haml-i18n-extractor', require: false
|
||||
gem 'haml_lint', '>= 0.25.1', require: false # Checks haml files for goodness
|
||||
gem 'i18n-tasks', require: false # adds tests for finding missing and unused translations
|
||||
gem 'rspectre', require: false # finds unused code in specs
|
||||
@@ -187,18 +188,18 @@ end
|
||||
group :test do
|
||||
gem 'axe-core-capybara'
|
||||
gem 'axe-core-rspec'
|
||||
gem "percy-capybara", "~> 5.0.0"
|
||||
gem 'rails-controller-testing'
|
||||
gem "rspec-rebound"
|
||||
gem 'selenium-webdriver'
|
||||
gem 'timecop'
|
||||
gem 'vcr'
|
||||
gem "rspec-rebound"
|
||||
gem "percy-capybara", "~> 5.0.0"
|
||||
end
|
||||
|
||||
group :travis do
|
||||
gem 'platform-api'
|
||||
end
|
||||
|
||||
gem "i18n_data", "~> 1.1"
|
||||
|
||||
gem "paper_trail", "~> 17.0"
|
||||
|
||||
gem "i18n_data", "~> 1.1"
|
||||
|
||||
306
Gemfile.lock
306
Gemfile.lock
@@ -33,49 +33,47 @@ GEM
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
actioncable (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
zeitwerk (~> 2.6)
|
||||
actionmailbox (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
actionmailbox (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
activejob (= 7.2.2.2)
|
||||
activerecord (= 7.2.2.2)
|
||||
activestorage (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
mail (>= 2.8.0)
|
||||
actionmailer (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
actionmailer (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
actionview (= 7.2.2.2)
|
||||
activejob (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
mail (>= 2.8.0)
|
||||
rails-dom-testing (~> 2.2)
|
||||
actionpack (7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
cgi
|
||||
actionpack (7.2.2.2)
|
||||
actionview (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
nokogiri (>= 1.8.5)
|
||||
racc
|
||||
rack (>= 2.2.4, < 3.3)
|
||||
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)
|
||||
useragent (~> 0.16)
|
||||
actiontext (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
actiontext (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
activerecord (= 7.2.2.2)
|
||||
activestorage (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
actionview (7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
builder (~> 3.1)
|
||||
cgi
|
||||
erubi (~> 1.11)
|
||||
rails-dom-testing (~> 2.2)
|
||||
rails-html-sanitizer (~> 1.6)
|
||||
@@ -84,27 +82,27 @@ GEM
|
||||
addressable
|
||||
active_median (0.6.0)
|
||||
activesupport (>= 7.1)
|
||||
active_record_union (1.4.0)
|
||||
activerecord (>= 6.0)
|
||||
active_utils (3.6.0)
|
||||
active_record_union (1.3.0)
|
||||
activerecord (>= 4.0)
|
||||
active_utils (3.5.0)
|
||||
activesupport (>= 4.2)
|
||||
i18n
|
||||
activejob (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
activejob (7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
activerecord (7.2.3)
|
||||
activemodel (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
activemodel (7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
activerecord (7.2.2.2)
|
||||
activemodel (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
timeout (>= 0.4.0)
|
||||
activestorage (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
activestorage (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
activejob (= 7.2.2.2)
|
||||
activerecord (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
marcel (~> 1.0)
|
||||
activesupport (7.2.3)
|
||||
activesupport (7.2.2.2)
|
||||
base64
|
||||
benchmark (>= 0.3)
|
||||
bigdecimal
|
||||
@@ -121,15 +119,15 @@ GEM
|
||||
ast (2.4.3)
|
||||
autoprefixer-rails (10.4.16.0)
|
||||
execjs (~> 2)
|
||||
axe-core-api (4.11.0)
|
||||
axe-core-api (4.10.3)
|
||||
dumb_delegator
|
||||
ostruct
|
||||
virtus
|
||||
axe-core-capybara (4.11.0)
|
||||
axe-core-api (= 4.11.0)
|
||||
axe-core-capybara (4.10.3)
|
||||
axe-core-api (= 4.10.3)
|
||||
dumb_delegator
|
||||
axe-core-rspec (4.11.0)
|
||||
axe-core-api (= 4.11.0)
|
||||
axe-core-rspec (4.10.3)
|
||||
axe-core-api (= 4.10.3)
|
||||
dumb_delegator
|
||||
ostruct
|
||||
virtus
|
||||
@@ -139,12 +137,12 @@ GEM
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
base64 (0.3.0)
|
||||
bcrypt (3.1.20)
|
||||
benchmark (0.5.0)
|
||||
benchmark (0.4.1)
|
||||
better_errors (2.10.1)
|
||||
erubi (>= 1.0.0)
|
||||
rack (>= 0.9.0)
|
||||
rouge (>= 1.0.0)
|
||||
bigdecimal (3.3.1)
|
||||
bigdecimal (3.2.2)
|
||||
bluecloth (2.2.0)
|
||||
bonsai-elasticsearch-rails (7.0.1)
|
||||
elasticsearch-model (< 8)
|
||||
@@ -158,7 +156,7 @@ GEM
|
||||
actionpack (>= 6.1)
|
||||
activemodel (>= 6.1)
|
||||
builder (3.3.0)
|
||||
bullet (8.1.0)
|
||||
bullet (8.0.8)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.11)
|
||||
byebug (12.0.0)
|
||||
@@ -185,8 +183,7 @@ GEM
|
||||
image_processing (~> 1.1)
|
||||
marcel (~> 1.0.0)
|
||||
ssrf_filter (~> 1.0)
|
||||
cgi (0.5.0)
|
||||
chartkick (5.2.1)
|
||||
chartkick (5.2.0)
|
||||
childprocess (5.0.0)
|
||||
coderay (1.1.3)
|
||||
coercible (1.0.0)
|
||||
@@ -201,7 +198,7 @@ GEM
|
||||
comfy_bootstrap_form (4.0.9)
|
||||
rails (>= 5.0.0)
|
||||
concurrent-ruby (1.3.5)
|
||||
connection_pool (2.5.5)
|
||||
connection_pool (2.5.3)
|
||||
crass (1.0.6)
|
||||
crowdin-api (1.12.0)
|
||||
open-uri (>= 0.1.0, < 0.2.0)
|
||||
@@ -211,7 +208,7 @@ GEM
|
||||
gli (>= 2.7.0)
|
||||
i18n (>= 0.6.4)
|
||||
rubyzip (>= 1.0.0)
|
||||
csv (3.3.5)
|
||||
csv (3.3.1)
|
||||
csv_shaper (1.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
csv
|
||||
@@ -222,7 +219,7 @@ GEM
|
||||
activerecord (>= 5.a)
|
||||
database_cleaner-core (~> 2.0.0)
|
||||
database_cleaner-core (2.0.1)
|
||||
date (3.5.0)
|
||||
date (3.4.1)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
devise (4.9.4)
|
||||
@@ -254,20 +251,20 @@ GEM
|
||||
elasticsearch-transport (7.0.0)
|
||||
faraday
|
||||
multi_json
|
||||
erb (6.0.0)
|
||||
erb (5.0.2)
|
||||
erubi (1.13.1)
|
||||
erubis (2.7.0)
|
||||
excon (1.2.5)
|
||||
logger
|
||||
execjs (2.10.0)
|
||||
factory_bot (6.5.5)
|
||||
factory_bot (6.5.4)
|
||||
activesupport (>= 6.1.0)
|
||||
factory_bot_rails (6.5.1)
|
||||
factory_bot_rails (6.5.0)
|
||||
factory_bot (~> 6.5)
|
||||
railties (>= 6.1.0)
|
||||
faker (3.5.2)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
faraday (2.14.0)
|
||||
faraday (2.13.4)
|
||||
faraday-net_http (>= 2.0, < 3.5)
|
||||
json
|
||||
logger
|
||||
@@ -280,7 +277,7 @@ GEM
|
||||
friendly_id (5.5.1)
|
||||
activerecord (>= 4.0.0)
|
||||
gbifrb (0.2.0)
|
||||
geocoder (1.8.6)
|
||||
geocoder (1.8.5)
|
||||
base64 (>= 0.1.0)
|
||||
csv (>= 3.0.0)
|
||||
gibbon (1.2.1)
|
||||
@@ -288,21 +285,27 @@ GEM
|
||||
multi_json (>= 1.9.0)
|
||||
gli (2.22.2)
|
||||
ostruct
|
||||
globalid (1.3.0)
|
||||
globalid (1.2.1)
|
||||
activesupport (>= 6.1)
|
||||
gravatar-ultimate (2.0.0)
|
||||
activesupport (>= 2.3.14)
|
||||
rack
|
||||
haml (7.0.2)
|
||||
haml (6.3.0)
|
||||
temple (>= 0.8.2)
|
||||
thor
|
||||
tilt
|
||||
haml-rails (3.0.0)
|
||||
haml-i18n-extractor (0.5.9)
|
||||
activesupport
|
||||
haml
|
||||
highline
|
||||
tilt
|
||||
trollop (= 1.16.2)
|
||||
haml-rails (2.1.0)
|
||||
actionpack (>= 5.1)
|
||||
activesupport (>= 5.1)
|
||||
haml (>= 4.0.6)
|
||||
railties (>= 5.1)
|
||||
haml_lint (0.67.0)
|
||||
haml_lint (0.66.0)
|
||||
haml (>= 5.0)
|
||||
parallel (~> 1.10)
|
||||
rainbow
|
||||
@@ -327,21 +330,20 @@ GEM
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (1.14.7)
|
||||
concurrent-ruby (~> 1.0)
|
||||
i18n-tasks (1.1.2)
|
||||
i18n-tasks (1.0.15)
|
||||
activesupport (>= 4.0.2)
|
||||
ast (>= 2.1.0)
|
||||
erubi
|
||||
highline (>= 3.0.0)
|
||||
highline (>= 2.0.0)
|
||||
i18n
|
||||
parser (>= 3.2.2.1)
|
||||
prism
|
||||
rails-i18n
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
ruby-progressbar (~> 1.8, >= 1.8.1)
|
||||
terminal-table (>= 1.5.1)
|
||||
i18n_data (1.1.0)
|
||||
simple_po_parser (~> 1.1)
|
||||
icalendar (2.12.1)
|
||||
icalendar (2.11.2)
|
||||
base64
|
||||
ice_cube (~> 0.16)
|
||||
logger
|
||||
@@ -352,18 +354,17 @@ GEM
|
||||
mini_magick (>= 4.9.5, < 5)
|
||||
ruby-vips (>= 2.0.17, < 3)
|
||||
io-console (0.8.1)
|
||||
irb (1.15.3)
|
||||
irb (1.15.2)
|
||||
pp (>= 0.6.0)
|
||||
rdoc (>= 4.0.0)
|
||||
reline (>= 0.4.2)
|
||||
jquery-rails (4.6.1)
|
||||
jquery-rails (4.6.0)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (2.16.0)
|
||||
json-schema (6.0.0)
|
||||
json (2.13.2)
|
||||
json-schema (5.1.0)
|
||||
addressable (~> 2.8)
|
||||
bigdecimal (~> 3.1)
|
||||
jsonapi-resources (0.10.7)
|
||||
activerecord (>= 4.1)
|
||||
concurrent-ruby
|
||||
@@ -389,8 +390,7 @@ GEM
|
||||
loofah (2.24.1)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
mail (2.9.0)
|
||||
logger
|
||||
mail (2.8.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
net-imap
|
||||
net-pop
|
||||
@@ -417,7 +417,7 @@ GEM
|
||||
mini_magick (4.12.0)
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.9)
|
||||
minitest (5.26.2)
|
||||
minitest (5.25.5)
|
||||
moneta (1.0.0)
|
||||
msgpack (1.8.0)
|
||||
multi_json (1.15.0)
|
||||
@@ -425,7 +425,7 @@ GEM
|
||||
bigdecimal (~> 3.1)
|
||||
net-http (0.6.0)
|
||||
uri
|
||||
net-imap (0.5.12)
|
||||
net-imap (0.5.9)
|
||||
date
|
||||
net-protocol
|
||||
net-pop (0.1.2)
|
||||
@@ -435,14 +435,14 @@ GEM
|
||||
net-smtp (0.5.1)
|
||||
net-protocol
|
||||
netrc (0.11.0)
|
||||
nio4r (2.7.5)
|
||||
nokogiri (1.18.10)
|
||||
nio4r (2.7.4)
|
||||
nokogiri (1.18.9)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
nokogiri (1.18.10-x86_64-linux-gnu)
|
||||
nokogiri (1.18.9-x86_64-linux-gnu)
|
||||
racc (~> 1.4)
|
||||
oauth (0.5.6)
|
||||
oj (3.16.12)
|
||||
oj (3.16.11)
|
||||
bigdecimal (>= 3.0)
|
||||
ostruct (>= 0.2)
|
||||
omniauth (1.9.2)
|
||||
@@ -457,38 +457,35 @@ GEM
|
||||
open-uri (0.1.0)
|
||||
orm_adapter (0.5.0)
|
||||
ostruct (0.6.3)
|
||||
paper_trail (17.0.0)
|
||||
activerecord (>= 7.1)
|
||||
request_store (~> 1.4)
|
||||
parallel (1.27.0)
|
||||
parser (3.3.10.0)
|
||||
parser (3.3.9.0)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
percy-capybara (5.0.0)
|
||||
capybara (>= 3)
|
||||
pg (1.6.2)
|
||||
pg (1.6.2-x86_64-linux)
|
||||
pg (1.6.1)
|
||||
pg (1.6.1-x86_64-linux)
|
||||
platform-api (3.8.0)
|
||||
heroics (~> 0.1.1)
|
||||
moneta (~> 1.0.0)
|
||||
rate_throttle_client (~> 0.1.0)
|
||||
popper_js (2.11.8)
|
||||
pp (0.6.3)
|
||||
pp (0.6.2)
|
||||
prettyprint
|
||||
prettyprint (0.2.0)
|
||||
prism (1.6.0)
|
||||
prism (1.4.0)
|
||||
pry (0.15.2)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
psych (5.2.6)
|
||||
date
|
||||
stringio
|
||||
public_suffix (6.0.2)
|
||||
puma (7.1.0)
|
||||
public_suffix (6.0.1)
|
||||
puma (6.6.1)
|
||||
nio4r (~> 2.0)
|
||||
query_diet (0.7.3)
|
||||
query_diet (0.7.2)
|
||||
racc (1.8.1)
|
||||
rack (2.2.21)
|
||||
rack (2.2.17)
|
||||
rack-cors (2.0.2)
|
||||
rack (>= 2.0.0)
|
||||
rack-protection (3.2.0)
|
||||
@@ -501,20 +498,20 @@ GEM
|
||||
rackup (1.0.1)
|
||||
rack (< 3)
|
||||
webrick
|
||||
rails (7.2.3)
|
||||
actioncable (= 7.2.3)
|
||||
actionmailbox (= 7.2.3)
|
||||
actionmailer (= 7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
actiontext (= 7.2.3)
|
||||
actionview (= 7.2.3)
|
||||
activejob (= 7.2.3)
|
||||
activemodel (= 7.2.3)
|
||||
activerecord (= 7.2.3)
|
||||
activestorage (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
rails (7.2.2.2)
|
||||
actioncable (= 7.2.2.2)
|
||||
actionmailbox (= 7.2.2.2)
|
||||
actionmailer (= 7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
actiontext (= 7.2.2.2)
|
||||
actionview (= 7.2.2.2)
|
||||
activejob (= 7.2.2.2)
|
||||
activemodel (= 7.2.2.2)
|
||||
activerecord (= 7.2.2.2)
|
||||
activestorage (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 7.2.3)
|
||||
railties (= 7.2.2.2)
|
||||
rails-controller-testing (1.0.5)
|
||||
actionpack (>= 5.0.1.rc1)
|
||||
actionview (>= 5.0.1.rc1)
|
||||
@@ -534,44 +531,39 @@ GEM
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.5)
|
||||
rails_stdout_logging (0.0.5)
|
||||
railties (7.2.3)
|
||||
actionpack (= 7.2.3)
|
||||
activesupport (= 7.2.3)
|
||||
cgi
|
||||
railties (7.2.2.2)
|
||||
actionpack (= 7.2.2.2)
|
||||
activesupport (= 7.2.2.2)
|
||||
irb (~> 1.13)
|
||||
rackup (>= 1.0.0)
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0, >= 1.2.2)
|
||||
tsort (>= 0.2)
|
||||
zeitwerk (~> 2.6)
|
||||
rainbow (3.1.1)
|
||||
raindrops (0.20.1)
|
||||
rake (13.3.1)
|
||||
rake (13.3.0)
|
||||
rate_throttle_client (0.1.2)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rdoc (6.16.1)
|
||||
rdoc (6.14.2)
|
||||
erb
|
||||
psych (>= 4.0.0)
|
||||
tsort
|
||||
recaptcha (5.21.1)
|
||||
recaptcha (5.20.1)
|
||||
redis-client (0.23.2)
|
||||
connection_pool
|
||||
regexp_parser (2.11.3)
|
||||
reline (0.6.3)
|
||||
regexp_parser (2.11.2)
|
||||
reline (0.6.2)
|
||||
io-console (~> 0.5)
|
||||
request_store (1.7.0)
|
||||
rack (>= 1.4)
|
||||
responders (3.2.0)
|
||||
actionpack (>= 7.0)
|
||||
railties (>= 7.0)
|
||||
responders (3.1.1)
|
||||
actionpack (>= 5.2)
|
||||
railties (>= 5.2)
|
||||
rest-client (2.1.0)
|
||||
http-accept (>= 1.7.0, < 2.0)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rexml (3.4.4)
|
||||
rexml (3.4.1)
|
||||
rouge (4.1.2)
|
||||
rspec (3.13.0)
|
||||
rspec-core (~> 3.13.0)
|
||||
@@ -581,7 +573,7 @@ GEM
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
rspec-mocks (>= 2.99, < 4.0)
|
||||
rspec-core (3.13.6)
|
||||
rspec-core (3.13.5)
|
||||
rspec-support (~> 3.13.0)
|
||||
rspec-expectations (3.13.5)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
@@ -599,23 +591,23 @@ GEM
|
||||
rspec-support (~> 3.13)
|
||||
rspec-rebound (0.2.1)
|
||||
rspec-core (~> 3.3)
|
||||
rspec-support (3.13.6)
|
||||
rspec-support (3.13.4)
|
||||
rspectre (0.2.0)
|
||||
parser (>= 3.3.7.1)
|
||||
prism (~> 1.3)
|
||||
rspec (~> 3.10)
|
||||
rswag-api (2.17.0)
|
||||
activesupport (>= 5.2, < 8.2)
|
||||
railties (>= 5.2, < 8.2)
|
||||
rswag-specs (2.17.0)
|
||||
activesupport (>= 5.2, < 8.2)
|
||||
json-schema (>= 2.2, < 7.0)
|
||||
railties (>= 5.2, < 8.2)
|
||||
rswag-api (2.16.0)
|
||||
activesupport (>= 5.2, < 8.1)
|
||||
railties (>= 5.2, < 8.1)
|
||||
rswag-specs (2.16.0)
|
||||
activesupport (>= 5.2, < 8.1)
|
||||
json-schema (>= 2.2, < 6.0)
|
||||
railties (>= 5.2, < 8.1)
|
||||
rspec-core (>= 2.14)
|
||||
rswag-ui (2.17.0)
|
||||
actionpack (>= 5.2, < 8.2)
|
||||
railties (>= 5.2, < 8.2)
|
||||
rubocop (1.81.7)
|
||||
rswag-ui (2.16.0)
|
||||
actionpack (>= 5.2, < 8.1)
|
||||
railties (>= 5.2, < 8.1)
|
||||
rubocop (1.80.1)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
@@ -623,19 +615,19 @@ GEM
|
||||
parser (>= 3.3.0.2)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 2.9.3, < 3.0)
|
||||
rubocop-ast (>= 1.47.1, < 2.0)
|
||||
rubocop-ast (>= 1.46.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.48.0)
|
||||
rubocop-ast (1.46.0)
|
||||
parser (>= 3.3.7.2)
|
||||
prism (~> 1.4)
|
||||
rubocop-capybara (2.22.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.72, >= 1.72.1)
|
||||
rubocop-factory_bot (2.28.0)
|
||||
rubocop-factory_bot (2.27.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.72, >= 1.72.1)
|
||||
rubocop-rails (2.34.2)
|
||||
rubocop-rails (2.33.3)
|
||||
activesupport (>= 4.2.0)
|
||||
lint_roller (~> 1.1)
|
||||
rack (>= 1.1)
|
||||
@@ -644,10 +636,10 @@ GEM
|
||||
rubocop-rake (0.7.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.72.1)
|
||||
rubocop-rspec (3.8.0)
|
||||
rubocop-rspec (3.6.0)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.81)
|
||||
rubocop-rspec_rails (2.32.0)
|
||||
rubocop (~> 1.72, >= 1.72.1)
|
||||
rubocop-rspec_rails (2.31.0)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.72, >= 1.72.1)
|
||||
rubocop-rspec (~> 3.5)
|
||||
@@ -655,7 +647,7 @@ GEM
|
||||
ruby-units (4.1.0)
|
||||
ruby-vips (2.2.1)
|
||||
ffi (~> 1.12)
|
||||
rubyzip (3.2.1)
|
||||
rubyzip (3.0.1)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
@@ -669,13 +661,13 @@ GEM
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
scout_apm (5.8.0)
|
||||
scout_apm (5.7.1)
|
||||
parser
|
||||
searchkick (5.3.1)
|
||||
activemodel (>= 6.1)
|
||||
hashie
|
||||
securerandom (0.4.1)
|
||||
selenium-webdriver (4.38.0)
|
||||
selenium-webdriver (4.35.0)
|
||||
base64 (~> 0.2)
|
||||
logger (~> 1.4)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
@@ -697,28 +689,28 @@ GEM
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
ssrf_filter (1.1.2)
|
||||
stringio (3.1.8)
|
||||
stringio (3.1.7)
|
||||
sysexits (1.2.0)
|
||||
temple (0.10.4)
|
||||
terminal-table (4.0.0)
|
||||
unicode-display_width (>= 1.1.1, < 4)
|
||||
terser (1.2.6)
|
||||
terser (1.2.5)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
thor (1.4.0)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.6.1)
|
||||
timecop (0.9.10)
|
||||
timeout (0.4.4)
|
||||
tsort (0.2.0)
|
||||
timeout (0.4.3)
|
||||
trollop (1.16.2)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (3.2.0)
|
||||
unicode-emoji (~> 4.1)
|
||||
unicode-emoji (4.1.0)
|
||||
unicode-display_width (3.1.5)
|
||||
unicode-emoji (~> 4.0, >= 4.0.4)
|
||||
unicode-emoji (4.0.4)
|
||||
unicorn (6.1.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
uniform_notifier (1.18.0)
|
||||
uniform_notifier (1.17.0)
|
||||
uri (1.0.3)
|
||||
useragent (0.16.11)
|
||||
validate_url (1.0.15)
|
||||
@@ -736,7 +728,7 @@ GEM
|
||||
nokogiri (>= 1.2.0)
|
||||
rack (>= 1.0)
|
||||
rack-test (>= 0.5.3)
|
||||
webrick (1.9.2)
|
||||
webrick (1.9.1)
|
||||
websocket (1.2.11)
|
||||
websocket-driver (0.8.0)
|
||||
base64
|
||||
@@ -796,6 +788,7 @@ DEPENDENCIES
|
||||
gibbon (~> 1.2.0)
|
||||
gravatar-ultimate
|
||||
haml
|
||||
haml-i18n-extractor
|
||||
haml-rails
|
||||
haml_lint (>= 0.25.1)
|
||||
hashie (>= 3.5.3)
|
||||
@@ -818,7 +811,6 @@ DEPENDENCIES
|
||||
oj
|
||||
omniauth (~> 1.3)
|
||||
omniauth-flickr (>= 0.0.15)
|
||||
paper_trail (~> 17.0)
|
||||
percy-capybara (~> 5.0.0)
|
||||
pg
|
||||
platform-api
|
||||
|
||||
@@ -17,14 +17,13 @@ encourage participation from people of all backgrounds and skill levels.
|
||||
## Want to contribute?
|
||||
|
||||
Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
|
||||
Dive on in and submit your PRs!
|
||||
|
||||
Vibe Coding is more than okay, just make sure you indicate if you have done so and ensure there are tests.
|
||||
Dive on in and submit your PRs.
|
||||
|
||||
## Important links
|
||||
|
||||
* [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
|
||||
working on, known bugs, etc)
|
||||
* [](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||
* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
|
||||
|
||||
## For coders
|
||||
@@ -36,10 +35,6 @@ frontend features. We welcome contributions -- see
|
||||
* To set up your development environment, see [Getting started](https://github.com/Growstuff/growstuff/wiki/New-contributor-guide).
|
||||
* You may also be interested in our [API](https://github.com/Growstuff/growstuff/wiki/API).
|
||||
|
||||
### For Home Automation enthusiasts
|
||||
|
||||
https://github.com/Growstuff/homeassistant-growstuff/
|
||||
|
||||
## For designers, writers, researchers, data wranglers, and other contributors
|
||||
|
||||
There are heaps of ways to get involved and contribute no matter what
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
.crop-icon {
|
||||
height: 1em;
|
||||
}
|
||||
.card-footer {
|
||||
.btn-group-vertical {
|
||||
.btn {
|
||||
text-wrap: initial
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.crop-thumbnail {
|
||||
.text {
|
||||
bottom: 0;
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
// stats shown on homepage. eg. "999 members..."
|
||||
.stats {
|
||||
a {
|
||||
font-weight: bold;
|
||||
}
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.crops,
|
||||
@@ -16,27 +14,3 @@
|
||||
.homepage--list-item {
|
||||
height: 100px;
|
||||
}
|
||||
.releases {
|
||||
.card {
|
||||
.card-header {
|
||||
|
||||
}
|
||||
.card-body {
|
||||
h2 {
|
||||
background-color: transparent;
|
||||
color: black;
|
||||
box-shadow: none;
|
||||
}
|
||||
img {
|
||||
border: 0.5em solid #111;
|
||||
margin-left: 5%;
|
||||
margin-right: 5%;
|
||||
width: 90%;
|
||||
}
|
||||
ul {
|
||||
margin-bottom: 1em;
|
||||
margin-top: 1em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,33 +10,9 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#navbarSupportedContent {
|
||||
ul {
|
||||
flex-direction: column-reverse;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
li.nav-item {
|
||||
display: block;
|
||||
a {
|
||||
display: grid;
|
||||
grid-template-columns: 2em 1fr 2em;
|
||||
}
|
||||
a.dropdown-toggle::after {
|
||||
width: 100%;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.crop-actions {
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
a {
|
||||
margin: auto;
|
||||
.navbar .nav > li {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar .navbar-form {
|
||||
padding-left: 0;
|
||||
|
||||
@@ -10,7 +10,6 @@ body {
|
||||
|
||||
.navbar {
|
||||
flex-wrap: nowrap;
|
||||
align-items: flex-start
|
||||
}
|
||||
.navbar-brand {
|
||||
.site-name {
|
||||
@@ -132,8 +131,6 @@ section {
|
||||
border-radius: 5%;
|
||||
margin: 0.5em 0.5em 0.5em 0;
|
||||
width: 200px;
|
||||
align-items: stretch;
|
||||
justify-content: space-between;
|
||||
|
||||
.img-card {
|
||||
border-top-left-radius: 5%;
|
||||
@@ -370,6 +367,9 @@ ul.thumbnail-buttons {
|
||||
h1 {
|
||||
font-size: 400%;
|
||||
}
|
||||
.stats a {
|
||||
color: $black;
|
||||
}
|
||||
|
||||
// signup widget on homepage
|
||||
.signup {
|
||||
|
||||
@@ -24,29 +24,14 @@ class ActivitiesController < DataController
|
||||
end
|
||||
|
||||
def show
|
||||
if @activity.finished? && @activity.owner == current_member && (@activity.updated_at + 2.weeks) > Time.now
|
||||
@repeat_link = new_activity_path(
|
||||
name: @activity.name,
|
||||
garden_id: @activity.garden_id,
|
||||
planting_id: @activity.planting_id,
|
||||
category: @activity.category,
|
||||
description: @activity.description,
|
||||
due_date: 2.weeks.from_now.to_date
|
||||
)
|
||||
end
|
||||
|
||||
respond_with @activity
|
||||
end
|
||||
|
||||
def new
|
||||
@activity = Activity.new(
|
||||
owner: current_member,
|
||||
owner: current_member,
|
||||
due_date: Date.today
|
||||
)
|
||||
@activity.name = params[:name] if params[:name]
|
||||
@activity.description = params[:description] if params[:description]
|
||||
@activity.category = params[:category] if params[:category]
|
||||
@activity.due_date = params[:due_date] if params[:due_date]
|
||||
if params[:garden_id]
|
||||
@activity.garden = Garden.find_by(
|
||||
owner: current_member,
|
||||
@@ -73,21 +58,7 @@ class ActivitiesController < DataController
|
||||
def create
|
||||
@activity = Activity.new(activity_params)
|
||||
@activity.owner = current_member
|
||||
@activity.due_date ||= Date.today
|
||||
|
||||
if @activity.save
|
||||
if params[:repeat_times].to_i > 0
|
||||
repeat_times = params[:repeat_times].to_i
|
||||
repeat_weeks = params[:repeat_weeks].to_i
|
||||
|
||||
repeat_times.times do |i|
|
||||
new_activity = @activity.dup
|
||||
new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
|
||||
new_activity.save
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@activity.save
|
||||
respond_with @activity
|
||||
end
|
||||
|
||||
@@ -106,8 +77,7 @@ class ActivitiesController < DataController
|
||||
def activity_params
|
||||
params.require(:activity).permit(
|
||||
:name, :description, :category, :finished,
|
||||
:garden_id, :planting_id, :due_date,
|
||||
:repeat_times, :repeat_weeks
|
||||
:garden_id, :planting_id, :due_date
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Admin
|
||||
class CropCompanionsController < AdminController
|
||||
before_action :set_crop
|
||||
|
||||
def index
|
||||
@crop_companions = @crop.crop_companions
|
||||
end
|
||||
|
||||
def new
|
||||
@crop_companion = @crop.crop_companions.new
|
||||
end
|
||||
|
||||
def create
|
||||
@crop_companion = @crop.crop_companions.new(crop_companion_params)
|
||||
if @crop_companion.save
|
||||
redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
|
||||
else
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@crop_companion = @crop.crop_companions.find(params[:id])
|
||||
@crop_companion.destroy
|
||||
redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_crop
|
||||
@crop = Crop.find_by!(slug: params[:crop_slug])
|
||||
end
|
||||
|
||||
def crop_companion_params
|
||||
params.require(:crop_companion).permit(:crop_b_id, :source_url)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,19 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Admin::CropsController < ApplicationController
|
||||
before_action :authenticate_member!
|
||||
before_action :authorize_admin!
|
||||
|
||||
def index
|
||||
@versions = PaperTrail::Version.where(item_type: 'Crop').order(created_at: :desc).limit(100)
|
||||
member_ids = @versions.map(&:whodunnit).compact.map(&:to_i)
|
||||
@members = Member.where(id: member_ids).index_by(&:id)
|
||||
@crop_wranglers = Role.crop_wranglers
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def authorize_admin!
|
||||
authorize! :wrangle, Crop
|
||||
end
|
||||
end
|
||||
@@ -1,24 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Admin
|
||||
class VersionsController < ApplicationController
|
||||
before_action :authenticate_member!
|
||||
before_action :authorize_admin!
|
||||
|
||||
def revert
|
||||
@version = PaperTrail::Version.find(params[:id])
|
||||
@object = @version.reify
|
||||
if @object.save
|
||||
redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
|
||||
else
|
||||
redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def authorize_admin!
|
||||
authorize! :wrangle, Crop
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,8 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class ActivitiesController < BaseController
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -4,40 +4,6 @@ module Api
|
||||
module V1
|
||||
class BaseController < JSONAPI::ResourceController
|
||||
abstract
|
||||
protect_from_forgery with: :null_session
|
||||
before_action :authenticate_member_from_token!
|
||||
before_action :enforce_member_for_write_operations!, only: %i(create update destroy)
|
||||
rescue_from CanCan::AccessDenied do
|
||||
head :forbidden
|
||||
end
|
||||
|
||||
def context
|
||||
{
|
||||
current_user: current_user,
|
||||
current_ability: current_ability,
|
||||
controller: self,
|
||||
action: params[:action]
|
||||
}
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
attr_reader :current_user
|
||||
|
||||
def enforce_member_for_write_operations!
|
||||
head :unauthorized unless current_user
|
||||
end
|
||||
|
||||
def authenticate_member_from_token!
|
||||
authenticate_with_http_token do |token, _options|
|
||||
auth = Authentication.find_by(token: token, provider: 'api')
|
||||
if auth.present?
|
||||
@current_user = auth.member
|
||||
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -73,8 +73,6 @@ class CropsController < ApplicationController
|
||||
format.html do
|
||||
@posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
|
||||
@companions = @crop.companions.approved
|
||||
member_ids = @crop.versions.map(&:whodunnit).compact.map(&:to_i)
|
||||
@version_members = Member.where(id: member_ids).index_by(&:id)
|
||||
end
|
||||
format.svg do
|
||||
icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
|
||||
@@ -149,32 +147,6 @@ class CropsController < ApplicationController
|
||||
respond_with @crop
|
||||
end
|
||||
|
||||
def data_improvement
|
||||
@active_tab = params[:tab] || 'photos'
|
||||
|
||||
@crops = case @active_tab
|
||||
when 'photos'
|
||||
Crop.approved.where(photo_associations_count: 0).order(plantings_count: :desc)
|
||||
when 'descriptions'
|
||||
Crop.approved.where(description: [nil, '']).order(plantings_count: :desc)
|
||||
when 'youtube'
|
||||
Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
|
||||
when 'alternate_names'
|
||||
Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
|
||||
when 'wikidata'
|
||||
crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
|
||||
Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
|
||||
when 'row_spacing'
|
||||
Crop.approved.where(row_spacing: nil).order(plantings_count: :desc)
|
||||
when 'sun_requirements'
|
||||
Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
|
||||
when 'height'
|
||||
Crop.approved.where(height: nil).order(plantings_count: :desc)
|
||||
else
|
||||
Crop.none
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def notifier
|
||||
@@ -216,14 +188,10 @@ class CropsController < ApplicationController
|
||||
|
||||
def crop_params
|
||||
params.require(:crop).permit(
|
||||
:name, :en_wikipedia_url, :en_youtube_url,
|
||||
:name, :en_wikipedia_url,
|
||||
:parent_id, :perennial,
|
||||
:request_notes, :reason_for_rejection,
|
||||
:rejection_notes,
|
||||
:description,
|
||||
:public_food_key,
|
||||
:row_spacing, :spread, :height,
|
||||
:sowing_method, :sun_requirements, :growing_degree_days,
|
||||
scientific_names_attributes: %i(scientific_name _destroy id)
|
||||
)
|
||||
end
|
||||
|
||||
@@ -4,7 +4,7 @@ class GardensController < DataController
|
||||
def index
|
||||
@owner = Member.find_by(slug: params[:member_slug])
|
||||
@show_all = params[:all] == '1'
|
||||
@show_jump_to = params[:member_slug].present? || false
|
||||
@show_jump_to = params[:member_slug].present? ? true : false
|
||||
|
||||
@gardens = @gardens.includes(:owner)
|
||||
@gardens = @gardens.active unless @show_all
|
||||
@@ -18,9 +18,8 @@ class GardensController < DataController
|
||||
end
|
||||
|
||||
def show
|
||||
@current_plantings = @garden.plantings.current.where.not(failed: true).includes(:crop, :owner).order(planted_at: :desc)
|
||||
@current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc)
|
||||
@current_activities = @garden.activities.current.includes(:owner).order(created_at: :desc)
|
||||
@finished_activities = @garden.activities.finished.includes(:owner).order(created_at: :desc)
|
||||
@finished_plantings = @garden.plantings.finished.includes(:crop)
|
||||
@suggested_companions = Crop.approved.where(
|
||||
id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id)
|
||||
@@ -39,10 +38,7 @@ class GardensController < DataController
|
||||
|
||||
def create
|
||||
@garden.owner_id = current_member.id
|
||||
if @garden.save
|
||||
link = new_activity_path(name: 'Weed the garden bed', garden_id: @garden.id, due_date: 2.weeks.from_now.to_date)
|
||||
flash[:notice] = t('gardens.created_prompt_html', link: link).html_safe
|
||||
end
|
||||
flash[:notice] = I18n.t('gardens.created') if @garden.save
|
||||
respond_with(@garden)
|
||||
end
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@ class PlantingsController < DataController
|
||||
@photos = @planting.photos.includes(:owner).order(date_taken: :desc)
|
||||
@harvests = Harvest.search(where: { planting_id: @planting.id })
|
||||
@current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
|
||||
@finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
|
||||
@matching_seeds = matching_seeds
|
||||
@crop = @planting.crop
|
||||
|
||||
@@ -46,12 +45,6 @@ class PlantingsController < DataController
|
||||
.where.not(id: @planting.id)
|
||||
.includes(:owner, :crop, :garden)
|
||||
.limit(6)
|
||||
|
||||
if @planting.finished? && @planting.garden.plantings.current.none? && (@planting.updated_at + 2.weeks) > Time.zone.now
|
||||
@cultivate_soil_link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id, category: "Soil Cultivation",
|
||||
description: "Recently finished #{@planting.crop.name} planting. Prepare for next planting.")
|
||||
end
|
||||
|
||||
respond_with @planting
|
||||
end
|
||||
|
||||
@@ -140,7 +133,7 @@ class PlantingsController < DataController
|
||||
:crop_id, :description, :garden_id, :planted_at,
|
||||
:parent_seed_id,
|
||||
:quantity, :sunniness, :planted_from, :finished,
|
||||
:finished_at, :failed, :overall_rating
|
||||
:finished_at, :failed
|
||||
)
|
||||
end
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ class RegistrationsController < Devise::RegistrationsController
|
||||
prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.
|
||||
|
||||
def edit
|
||||
@flickr_auth = current_member.auth('flickr')
|
||||
@flickr_auth = current_member.auth('flickr')
|
||||
render "edit"
|
||||
end
|
||||
|
||||
@@ -38,12 +38,6 @@ class RegistrationsController < Devise::RegistrationsController
|
||||
end
|
||||
end
|
||||
|
||||
def regenerate_api_token
|
||||
current_member.regenerate_api_token
|
||||
set_flash_message :notice, :api_token_regenerated
|
||||
redirect_to edit_member_registration_path + '#apps'
|
||||
end
|
||||
|
||||
def destroy
|
||||
if @member.valid_password?(params.require(:member)[:current_password])
|
||||
@member.discard
|
||||
|
||||
@@ -74,7 +74,7 @@ class ScientificNamesController < ApplicationController
|
||||
end
|
||||
|
||||
def scientific_name_params
|
||||
params.require(:scientific_name).permit(:crop_id, :name, :gbif_key, :wikidata_id)
|
||||
params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
|
||||
end
|
||||
|
||||
def gbif_service
|
||||
|
||||
@@ -19,7 +19,9 @@ class SeedsController < DataController
|
||||
where['parent_planting'] = @planting.id
|
||||
end
|
||||
|
||||
where['tradeable_to'] = params[:tradeable_to] if params[:tradeable_to].present?
|
||||
if params[:tradeable_to].present?
|
||||
where['tradeable_to'] = params[:tradeable_to]
|
||||
end
|
||||
|
||||
@show_all = (params[:all] == '1')
|
||||
where['finished'] = false unless @show_all
|
||||
@@ -43,7 +45,6 @@ class SeedsController < DataController
|
||||
|
||||
def new
|
||||
@seed = Seed.new
|
||||
@seed.source = 'my own seed saving'
|
||||
|
||||
if params[:planting_slug]
|
||||
@planting = Planting.find_by(slug: params[:planting_slug])
|
||||
@@ -57,8 +58,6 @@ class SeedsController < DataController
|
||||
|
||||
def create
|
||||
@seed = Seed.new(seed_params)
|
||||
@seed.source ||= 'my own seed saving'
|
||||
@seed.finished ||= false
|
||||
@seed.owner = current_member
|
||||
@seed.crop = @seed.parent_planting.crop if @seed.parent_planting
|
||||
flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
|
||||
@@ -86,7 +85,7 @@ class SeedsController < DataController
|
||||
:crop_id, :description, :quantity, :plant_before,
|
||||
:parent_planting_id, :saved_at,
|
||||
:days_until_maturity_min, :days_until_maturity_max,
|
||||
:organic, :gmo, :source,
|
||||
:organic, :gmo,
|
||||
:heirloom, :tradable_to, :slug,
|
||||
:finished, :finished_at
|
||||
)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'nokogiri'
|
||||
module ApplicationHelper
|
||||
def parse_date(str)
|
||||
str ||= '' # Date.parse barfs on nil
|
||||
@@ -22,32 +21,6 @@ module ApplicationHelper
|
||||
classes
|
||||
end
|
||||
|
||||
# Similar to Rails' time_ago_in_words, but gives a more standard
|
||||
# output like "in 3 days" or "5 months ago".
|
||||
# Also handles the case where from_time is a Date and to_time is a Date
|
||||
# (in which case it just says "today" if they're the same date).
|
||||
#
|
||||
# NOTE: This is similar to distance_of_time_in_words but different enough
|
||||
# that I think it's worth having a separate helper for it.
|
||||
#
|
||||
# from_time - the starting time (Time or Date)
|
||||
# to_time - the ending time (Time or Date). Default: now (Time.zone.now)
|
||||
# include_seconds - whether to include seconds in the calculation
|
||||
#
|
||||
# Returns a string like "in 3 days" or "5 months ago"
|
||||
def standard_time_distance(from_time, to_time = 0, include_seconds = false)
|
||||
return 'today' if from_time.is_a?(Date) && (from_time == to_time)
|
||||
|
||||
return 'now' if from_time == to_time
|
||||
return "#{distance_of_time_in_words(from_time, to_time, include_seconds:)} ago" if from_time < to_time
|
||||
|
||||
"in #{distance_of_time_in_words(from_time, to_time, include_seconds:)}"
|
||||
end
|
||||
|
||||
def count_github_contibutors
|
||||
File.open(Rails.root.join('CONTRIBUTORS.md')).readlines.grep(/^-/).size
|
||||
end
|
||||
|
||||
# Produces a cache key for uniquely identifying cached fragments.
|
||||
def cache_key_for(klass, identifier = "all")
|
||||
count = klass.count
|
||||
@@ -120,22 +93,4 @@ module ApplicationHelper
|
||||
def og_description(description)
|
||||
strip_tags(description).split(' ')[0..20].join(' ')
|
||||
end
|
||||
|
||||
def github_releases
|
||||
return [] if Rails.env.test?
|
||||
|
||||
feed_url = 'https://github.com/Growstuff/growstuff/releases.atom'
|
||||
Rails.cache.fetch(feed_url, expires_in: 1.day) do
|
||||
response = Faraday.get(feed_url)
|
||||
doc = Nokogiri::XML(response.body)
|
||||
doc.xpath('//xmlns:entry').first(2).map do |entry|
|
||||
{
|
||||
title: entry.xpath('xmlns:title').text,
|
||||
content: entry.xpath('xmlns:content').text,
|
||||
link: entry.xpath('xmlns:link/@href').text,
|
||||
updated: entry.xpath('xmlns:updated').text
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -13,7 +13,7 @@ module AutoSuggestHelper
|
||||
resource = resource.class.name.downcase
|
||||
source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
|
||||
%(
|
||||
<input id="#{source}" class="auto-suggest #{options[:class]}" #{'required="required"' if options[:required]}
|
||||
<input id="#{source}" class="auto-suggest #{options[:class]}" #{options[:required] ? 'required="required"' : ''}
|
||||
type="text" value="#{default}" data-source-url="#{source_path}",
|
||||
placeholder="e.g. lettuce">
|
||||
<noscript class="text-warning">
|
||||
|
||||
@@ -53,7 +53,7 @@ module ButtonsHelper
|
||||
link_to t('buttons.mark_as_inactive'),
|
||||
garden_path(garden, garden: { active: 0 }),
|
||||
method: :put, class: classes,
|
||||
data: { confirm: I18n.t('gardens.confirm_deactivate') }
|
||||
data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
|
||||
end
|
||||
|
||||
def create_button(model_to_create, path, icon, label)
|
||||
@@ -85,20 +85,7 @@ module ButtonsHelper
|
||||
end
|
||||
|
||||
def activity_edit_button(activity, classes: "btn btn-raised btn-info")
|
||||
edit_button(edit_activity_path(slug: activity.slug), classes:)
|
||||
end
|
||||
|
||||
def activity_copy_button(activity, classes: 'btn')
|
||||
link_to new_activity_path(
|
||||
name: activity.name,
|
||||
description: activity.description,
|
||||
category: activity.category,
|
||||
garden_id: activity.garden_id,
|
||||
planting_id: activity.planting_id,
|
||||
due_date: activity.due_date
|
||||
), class: classes do
|
||||
copy_icon + ' ' + t('buttons.copy')
|
||||
end
|
||||
edit_button(edit_activity_path(activity), classes:)
|
||||
end
|
||||
|
||||
def activity_finish_button(activity, classes: 'btn btn-default btn-secondary')
|
||||
|
||||
@@ -1,19 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module CropsHelper
|
||||
def crop_or_parent(crop, attribute)
|
||||
default = crop.send(attribute)
|
||||
return default if default.present?
|
||||
|
||||
parent = crop
|
||||
while parent = parent.parent
|
||||
return parent.send(attribute) if parent&.send(attribute).present?
|
||||
end
|
||||
|
||||
# For scopes, arrays, etc return the empty value
|
||||
default
|
||||
end
|
||||
|
||||
def display_seed_availability(member, crop)
|
||||
seeds = member.seeds.where(crop:)
|
||||
total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
|
||||
@@ -30,59 +17,4 @@ module CropsHelper
|
||||
def crop_ebay_seeds_url(crop)
|
||||
"https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
|
||||
end
|
||||
|
||||
def youtube_video_id(url)
|
||||
return unless url
|
||||
|
||||
regex = %r{(?:youtube(?:-nocookie)?\.com/(?:[^/\n\s]+/\S+/|(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)([a-zA-Z0-9_-]{11})}
|
||||
match = url.match(regex)
|
||||
match[1] if match
|
||||
end
|
||||
|
||||
def crop_jsonld_data(crop, full_attributes: true)
|
||||
same_as_urls = [crop.en_wikipedia_url]
|
||||
crop.scientific_names.each do |scientific_name|
|
||||
same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
|
||||
end
|
||||
|
||||
subject_of_entities = []
|
||||
if full_attributes
|
||||
if crop.en_youtube_url.present?
|
||||
subject_of_entities << {
|
||||
'@type': "VideoObject",
|
||||
url: crop.en_youtube_url
|
||||
}
|
||||
end
|
||||
|
||||
crop.posts.each do |post|
|
||||
subject_of_entities << {
|
||||
'@type': "SocialMediaPosting",
|
||||
url: post_url(post),
|
||||
author: post.author
|
||||
}
|
||||
end
|
||||
|
||||
images = []
|
||||
crop.photos.each do |photo|
|
||||
images << photo.fullsize_url
|
||||
end
|
||||
end
|
||||
|
||||
# TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
|
||||
# has_many :plantings, dependent: :destroy
|
||||
# has_many :seeds, dependent: :destroy
|
||||
# has_many :harvests, dependent: :destroy
|
||||
|
||||
{
|
||||
'@context': "https://schema.org",
|
||||
'@type': "BioChemEntity",
|
||||
name: crop.name,
|
||||
taxonomicRange: crop.scientific_names.map(&:name),
|
||||
description: crop.description,
|
||||
sameAs: same_as_urls,
|
||||
alternateName: crop.alternate_names.map(&:name),
|
||||
subjectOf: subject_of_entities,
|
||||
image: images
|
||||
}.compact
|
||||
end
|
||||
end
|
||||
|
||||
@@ -7,8 +7,6 @@ module EventHelper
|
||||
|
||||
def event_description(event)
|
||||
render "#{event.event_type.pluralize}/description", event_model: resolve_model(event)
|
||||
rescue ActionView::MissingTemplate
|
||||
"#{event.event_type.humanize.downcase}d"
|
||||
end
|
||||
|
||||
def resolve_model(event)
|
||||
|
||||
@@ -59,10 +59,6 @@ module IconsHelper
|
||||
image_icon 'delete'
|
||||
end
|
||||
|
||||
def copy_icon
|
||||
icon('far', 'copy')
|
||||
end
|
||||
|
||||
def add_photo_icon
|
||||
image_icon 'add-photo'
|
||||
end
|
||||
|
||||
@@ -76,7 +76,6 @@ class Ability
|
||||
if member.role? :crop_wrangler
|
||||
can :wrangle, Crop
|
||||
can :manage, Crop
|
||||
can :manage, CropCompanion
|
||||
can :manage, ScientificName
|
||||
can :manage, AlternateName
|
||||
can :openfarm, Crop
|
||||
|
||||
@@ -30,20 +30,4 @@ class Activity < ApplicationRecord
|
||||
def to_s
|
||||
name
|
||||
end
|
||||
|
||||
def garden_name
|
||||
garden&.name
|
||||
end
|
||||
|
||||
def garden_slug
|
||||
garden&.slug
|
||||
end
|
||||
|
||||
def planting_name
|
||||
planting&.crop&.name
|
||||
end
|
||||
|
||||
def planting_slug
|
||||
planting&.crop&.slug
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
class AustralianFoodClassificationData < ApplicationRecord
|
||||
end
|
||||
@@ -8,6 +8,14 @@ module OpenFarmData
|
||||
fetch_attr('main_image_path')
|
||||
end
|
||||
|
||||
def height
|
||||
fetch_attr('height')
|
||||
end
|
||||
|
||||
def spread
|
||||
fetch_attr('spread')
|
||||
end
|
||||
|
||||
def svg_icon
|
||||
icon = fetch_attr('svg_icon')
|
||||
return icon if icon.present?
|
||||
@@ -19,18 +27,42 @@ module OpenFarmData
|
||||
fetch_attr('tags_array')
|
||||
end
|
||||
|
||||
def description
|
||||
fetch_attr('description')
|
||||
end
|
||||
|
||||
def row_spacing
|
||||
fetch_attr('row_spacing')
|
||||
end
|
||||
|
||||
def common_names
|
||||
fetch_attr('common_names')
|
||||
end
|
||||
|
||||
def guides_count
|
||||
fetch_attr('guides_count')
|
||||
end
|
||||
|
||||
def binomial_name
|
||||
fetch_attr('binomial_name')
|
||||
end
|
||||
|
||||
def sowing_method
|
||||
fetch_attr('sowing_method')
|
||||
end
|
||||
|
||||
def main_image_path
|
||||
fetch_attr('main_image_path')
|
||||
end
|
||||
|
||||
def sun_requirements
|
||||
fetch_attr('sun_requirements')
|
||||
end
|
||||
|
||||
def growing_degree_days
|
||||
fetch_attr('growing_degree_days')
|
||||
end
|
||||
|
||||
def processing_pictures
|
||||
fetch_attr('processing_pictures')
|
||||
end
|
||||
@@ -39,6 +71,6 @@ module OpenFarmData
|
||||
def fetch_attr(key)
|
||||
return if openfarm_data.blank?
|
||||
|
||||
openfarm_data.dig('attributes', key)
|
||||
openfarm_data.fetch('attributes', {}).fetch(key, nil)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -94,9 +94,9 @@ module PredictPlanting
|
||||
private
|
||||
|
||||
def calculate_percentage_grown
|
||||
return 0 if age_in_days.to_i < 0
|
||||
return 0 if age_in_days < 0
|
||||
|
||||
percent = (age_in_days.to_f / expected_lifespan.to_f) * 100
|
||||
percent = (age_in_days / expected_lifespan.to_f) * 100
|
||||
(percent > 100 ? 100 : percent)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -9,9 +9,7 @@ module SearchActivities
|
||||
mappings: {
|
||||
properties: {
|
||||
active: { type: :boolean },
|
||||
created_at: { type: :integer },
|
||||
updated_at: { type: :integer },
|
||||
due_date: { type: :date }
|
||||
created_at: { type: :integer }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,10 +23,8 @@ module SearchActivities
|
||||
category:,
|
||||
garden_id:,
|
||||
garden_name: garden&.name,
|
||||
garden_slug: garden&.garden_slug,
|
||||
planting_id:,
|
||||
planting_name: planting&.crop&.name,
|
||||
planting_slug: planting&.slug,
|
||||
description:,
|
||||
|
||||
# owner
|
||||
|
||||
@@ -59,8 +59,7 @@ module SearchSeeds
|
||||
search('*', limit:,
|
||||
where: {
|
||||
finished: false,
|
||||
tradable: true,
|
||||
_or: [{ plant_before: nil }, { plant_before: { lt: Date.today } }]
|
||||
tradable: true
|
||||
},
|
||||
boost_by: [:created_at],
|
||||
load: false)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Crop < ApplicationRecord
|
||||
has_paper_trail
|
||||
extend FriendlyId
|
||||
include PhotoCapable
|
||||
include OpenFarmData
|
||||
@@ -56,12 +55,6 @@ class Crop < ApplicationRecord
|
||||
message: 'is not a valid English Wikipedia URL'
|
||||
},
|
||||
if: :approved?
|
||||
validates :en_youtube_url,
|
||||
format: {
|
||||
with: %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
|
||||
message: 'is not a valid YouTube URL'
|
||||
},
|
||||
allow_blank: true
|
||||
validates :name, uniqueness: { scope: :approval_status }, if: :pending?
|
||||
|
||||
def to_s
|
||||
@@ -97,7 +90,7 @@ class Crop < ApplicationRecord
|
||||
def popular_plant_parts
|
||||
PlantPart.joins(:harvests)
|
||||
.where("crop_id = ?", id)
|
||||
.order(count_harvests_id: :desc)
|
||||
.order("count_harvests_id DESC")
|
||||
.group("plant_parts.id", "plant_parts.name")
|
||||
.count("harvests.id")
|
||||
end
|
||||
@@ -160,20 +153,8 @@ class Crop < ApplicationRecord
|
||||
where(["lower(crops.name) = :value", { value: name.downcase }])
|
||||
end
|
||||
|
||||
def all_companions
|
||||
return companions unless parent
|
||||
|
||||
(companions + parent.all_companions).uniq
|
||||
end
|
||||
|
||||
before_destroy :destroy_reverse_companionships
|
||||
|
||||
private
|
||||
|
||||
def destroy_reverse_companionships
|
||||
CropCompanion.where(crop_b: self).destroy_all
|
||||
end
|
||||
|
||||
def count_uses_of_property(col_name)
|
||||
plantings.unscoped
|
||||
.where(crop_id: id)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
class Forum < ApplicationRecord
|
||||
extend FriendlyId
|
||||
include Ownable
|
||||
|
||||
validates :name, presence: true
|
||||
validates :description, presence: true
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
class GardenType < ApplicationRecord
|
||||
extend FriendlyId
|
||||
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
has_many :gardens, dependent: :nullify
|
||||
|
||||
@@ -2,14 +2,12 @@
|
||||
|
||||
class Member < ApplicationRecord
|
||||
include Discard::Model
|
||||
|
||||
acts_as_messageable # messages can be sent to this model
|
||||
include Geocodable
|
||||
include MemberFlickr
|
||||
include MemberNewsletter
|
||||
|
||||
extend FriendlyId
|
||||
|
||||
friendly_id :login_name, use: %i(slugged finders)
|
||||
|
||||
#
|
||||
@@ -26,20 +24,6 @@ class Member < ApplicationRecord
|
||||
has_many :notifications, foreign_key: 'recipient_id', inverse_of: :recipient
|
||||
has_many :sent_notifications, foreign_key: 'sender_id', inverse_of: :sender, class_name: "Notification"
|
||||
has_many :authentications, dependent: :destroy
|
||||
has_one :api_token, -> { where(provider: 'api') }, class_name: 'Authentication', dependent: :destroy
|
||||
|
||||
def api_token?
|
||||
api_token.present?
|
||||
end
|
||||
|
||||
def regenerate_api_token
|
||||
api_token.destroy if api_token?
|
||||
create_api_token(
|
||||
provider: 'api',
|
||||
uid: id,
|
||||
token: SecureRandom.hex(16)
|
||||
)
|
||||
end
|
||||
has_many :photos, inverse_of: :owner
|
||||
has_many :likes, dependent: :destroy
|
||||
|
||||
@@ -107,10 +91,9 @@ class Member < ApplicationRecord
|
||||
uniqueness: {
|
||||
case_sensitive: false
|
||||
}
|
||||
validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
|
||||
validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
|
||||
validates :instagram_handle, :facebook_handle, :bluesky_handle,
|
||||
format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
|
||||
validates :website_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
|
||||
validates :other_url, format: { with: /\Ahttps?:\/\//, message: "must start with http:// or https://" }, allow_blank: true
|
||||
validates :instagram_handle, :facebook_handle, :bluesky_handle, format: { without: %r{\Ahttps?:\/\/|\/}, message: "should be a handle, not a URL" }, allow_blank: true
|
||||
|
||||
#
|
||||
# Triggers
|
||||
|
||||
@@ -46,8 +46,7 @@ class Photo < ApplicationRecord
|
||||
flickr = owner.flickr
|
||||
info = flickr.photos.getInfo(photo_id: source_id)
|
||||
licenses = flickr.photos.licenses.getInfo
|
||||
license = licenses.find { |l| l.id.to_i == info.license.to_i }
|
||||
Rails.logger.error("Cannot find license: #{[info.license, licenses].inspect}") unless license
|
||||
license = licenses.find { |l| l.id == info.license }
|
||||
{
|
||||
title: calculate_title(info),
|
||||
license_name: license.name,
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
class PlantPart < ApplicationRecord
|
||||
extend FriendlyId
|
||||
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
|
||||
has_many :harvests, dependent: :destroy
|
||||
|
||||
@@ -25,8 +25,6 @@ class Planting < ApplicationRecord
|
||||
has_many :harvests, dependent: :destroy
|
||||
has_many :activities, dependent: :destroy
|
||||
|
||||
scope :current, -> { where.not(finished: true).where.not(failed: true) }
|
||||
|
||||
#
|
||||
# Ancestry of food
|
||||
belongs_to :parent_seed, class_name: 'Seed', # parent,
|
||||
@@ -85,9 +83,6 @@ class Planting < ApplicationRecord
|
||||
validates :planted_from, allow_blank: true, inclusion: {
|
||||
in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
|
||||
}
|
||||
validates :overall_rating, allow_blank: true, numericality: {
|
||||
only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
|
||||
}
|
||||
|
||||
def planting_slug
|
||||
[
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
class Role < ApplicationRecord
|
||||
extend FriendlyId
|
||||
|
||||
friendly_id :name, use: %i(slugged finders)
|
||||
validates :name, uniqueness: true, presence: true
|
||||
|
||||
|
||||
@@ -6,15 +6,12 @@ class Seed < ApplicationRecord
|
||||
include Finishable
|
||||
include Ownable
|
||||
include SearchSeeds
|
||||
|
||||
friendly_id :seed_slug, use: %i(slugged finders)
|
||||
|
||||
TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
|
||||
ORGANIC_VALUES = ['certified organic', 'non-certified organic', 'conventional/non-organic', 'unknown'].freeze
|
||||
GMO_VALUES = ['certified GMO-free', 'non-certified GMO-free', 'GMO', 'unknown'].freeze
|
||||
HEIRLOOM_VALUES = %w(heirloom hybrid unknown).freeze
|
||||
SOURCE_VALUES = ['seed catalogue', 'retail outlet', 'seed bank or similar institution',
|
||||
'traded from another person', 'my own seed saving', 'other/unknown'].freeze
|
||||
|
||||
#
|
||||
# Relationships
|
||||
@@ -47,9 +44,6 @@ class Seed < ApplicationRecord
|
||||
validates :heirloom, allow_blank: false,
|
||||
inclusion: { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
|
||||
"are heirloom, hybrid, or unknown" }
|
||||
validates :source, allow_blank: true,
|
||||
inclusion: { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
|
||||
"or that you don't know" }
|
||||
|
||||
#
|
||||
# Delegations
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Api
|
||||
module V1
|
||||
class ActivityResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
has_one :garden, always_include_linkage_data: true
|
||||
has_one :planting, always_include_linkage_data: true
|
||||
|
||||
attribute :name
|
||||
attribute :description
|
||||
attribute :category
|
||||
attribute :finished
|
||||
attribute :due_date
|
||||
|
||||
filter :owner
|
||||
filter :owner_id
|
||||
filter :garden
|
||||
filter :garden_id
|
||||
filter :planting
|
||||
filter :planting_id
|
||||
filter :category
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -3,7 +3,8 @@
|
||||
module Api
|
||||
module V1
|
||||
class CropResource < BaseResource
|
||||
immutable # TODO: Re-evaluate this later
|
||||
immutable
|
||||
|
||||
filter :approval_status, default: 'approved'
|
||||
|
||||
has_many :plantings
|
||||
@@ -12,7 +13,7 @@ module Api
|
||||
|
||||
has_many :photos
|
||||
|
||||
has_one :parent, class_name: 'Crop', always_include_linkage_data: true
|
||||
has_one :parent, class_name: 'Crop'
|
||||
|
||||
attribute :name
|
||||
attribute :en_wikipedia_url
|
||||
|
||||
@@ -3,22 +3,13 @@
|
||||
module Api
|
||||
module V1
|
||||
class GardenResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :plantings
|
||||
has_many :photos
|
||||
|
||||
attribute :name
|
||||
|
||||
filter :owner
|
||||
filter :owner_id
|
||||
filter :active
|
||||
filter :garden_type
|
||||
filter :location
|
||||
filter :slug
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,17 +3,11 @@
|
||||
module Api
|
||||
module V1
|
||||
class HarvestResource < BaseResource
|
||||
before_save do
|
||||
@model.owner = context[:current_user]
|
||||
@model.crop_id = @model.planting.crop_id if @model.planting_id
|
||||
@model.harvested_at = Time.zone.now if @model.harvested_at.blank?
|
||||
@model.plant_part = PlantPart.first
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :crop, always_include_linkage_data: true
|
||||
has_one :planting, always_include_linkage_data: true
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
# has_one :plant_part
|
||||
has_one :crop
|
||||
has_one :planting
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :photos
|
||||
|
||||
attribute :harvested_at
|
||||
@@ -22,15 +16,6 @@ module Api
|
||||
attribute :weight_quantity
|
||||
attribute :weight_unit
|
||||
attribute :si_weight
|
||||
|
||||
filter :owner
|
||||
filter :owner_id
|
||||
filter :crop
|
||||
filter :crop_id
|
||||
filter :planting
|
||||
filter :planting_id
|
||||
filter :plant_part
|
||||
filter :harvested_at
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -9,7 +9,6 @@ module Api
|
||||
has_many :plantings, foreign_key: 'owner_id'
|
||||
has_many :harvests, foreign_key: 'owner_id'
|
||||
has_many :seeds, foreign_key: 'owner_id'
|
||||
has_many :activities, foreign_key: 'owner_id'
|
||||
|
||||
has_many :photos
|
||||
|
||||
|
||||
@@ -3,12 +3,9 @@
|
||||
module Api
|
||||
module V1
|
||||
class PhotoResource < BaseResource
|
||||
immutable # TODO: Re-evaluate this.
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :plantings
|
||||
has_many :gardens
|
||||
has_many :harvests
|
||||
|
||||
@@ -3,13 +3,11 @@
|
||||
module Api
|
||||
module V1
|
||||
class PlantingResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :garden, always_include_linkage_data: true
|
||||
has_one :crop, always_include_linkage_data: true
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
has_one :garden
|
||||
has_one :crop
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_many :photos
|
||||
has_many :harvests
|
||||
|
||||
@@ -38,10 +36,6 @@ module Api
|
||||
filter :owner
|
||||
filter :owner_id
|
||||
filter :finished
|
||||
filter :active, apply: ->(records, _value, _options) { records.active }
|
||||
filter :failed, apply: ->(records, _value, _options) { records.failed }
|
||||
filter :sunniness
|
||||
filter :perennial, apply: ->(records, _value, _options) { records.perennial }
|
||||
|
||||
attribute :percentage_grown
|
||||
delegate :percentage_grown, to: :@model
|
||||
|
||||
@@ -3,12 +3,10 @@
|
||||
module Api
|
||||
module V1
|
||||
class SeedResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member', always_include_linkage_data: true
|
||||
has_one :crop, always_include_linkage_data: true
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_one :crop
|
||||
|
||||
attribute :description
|
||||
attribute :quantity
|
||||
@@ -19,15 +17,6 @@ module Api
|
||||
attribute :organic
|
||||
attribute :gmo
|
||||
attribute :heirloom
|
||||
|
||||
filter :owner
|
||||
filter :owner_id
|
||||
filter :crop
|
||||
filter :crop_id
|
||||
filter :tradable_to
|
||||
filter :organic
|
||||
filter :gmo
|
||||
filter :heirloom
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,16 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class BaseResource < JSONAPI::Resource
|
||||
immutable
|
||||
abstract
|
||||
|
||||
%i(create update remove).each do |action|
|
||||
set_callback action, :before, :authorize
|
||||
end
|
||||
|
||||
# Check authorisation for write operations.
|
||||
# NOTE: At a later time, we may require API tokens for READ operations.
|
||||
def authorize
|
||||
# context[:action] is simply context[:controller].params[:action]
|
||||
context[:current_ability].authorize! context[:action].to_sym, @model
|
||||
end
|
||||
end
|
||||
|
||||
108
app/services/openfarm_service.rb
Normal file
108
app/services/openfarm_service.rb
Normal file
@@ -0,0 +1,108 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
BASE = 'https://openfarm.cc/api/v1/'
|
||||
# BASE = 'http://127.0.0.1:3000/api/v1/'
|
||||
|
||||
class OpenfarmService
|
||||
def initialize
|
||||
@cropbot = Member.find_by(login_name: 'cropbot')
|
||||
end
|
||||
|
||||
def import!
|
||||
Crop.all.order(updated_at: :desc).each do |crop|
|
||||
Rails.logger.debug { "#{crop.id}, #{crop.name}" }
|
||||
update_crop(crop) if crop.valid?
|
||||
end
|
||||
end
|
||||
|
||||
def update_crop(crop)
|
||||
openfarm_record = fetch(crop.name)
|
||||
if openfarm_record.present? && openfarm_record.is_a?(String)
|
||||
Rails.logger.info(openfarm_record)
|
||||
elsif openfarm_record.present? && openfarm_record.fetch('data', false)
|
||||
crop.update! openfarm_data: openfarm_record.fetch('data', false)
|
||||
save_companions(crop, openfarm_record)
|
||||
save_photos(crop)
|
||||
else
|
||||
Rails.logger.debug "\tcrop not found on Open Farm"
|
||||
crop.update!(openfarm_data: false)
|
||||
end
|
||||
end
|
||||
|
||||
def save_companions(crop, openfarm_record)
|
||||
companions = openfarm_record.fetch('data').fetch('relationships').fetch('companions').fetch('data')
|
||||
crops = openfarm_record.fetch('included', []).select { |rec| rec["type"] == 'crops' }
|
||||
CropCompanion.transaction do
|
||||
companions.each do |com|
|
||||
companion_crop_hash = crops.detect { |c| c.fetch('id') == com.fetch('id') }
|
||||
companion_crop_name = companion_crop_hash.fetch('attributes').fetch('name').downcase
|
||||
companion_crop = Crop.where('lower(name) = ?', companion_crop_name).first
|
||||
companion_crop = Crop.create!(name: companion_crop_name, requester: @cropbot, approval_status: "pending") if companion_crop.nil?
|
||||
crop.companions << companion_crop unless crop.companions.where(id: companion_crop.id).any?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def save_photos(crop)
|
||||
pictures = fetch_pictures(crop.name)
|
||||
pictures.each do |picture|
|
||||
data = picture.fetch('attributes')
|
||||
Rails.logger.debug(data)
|
||||
next unless data.fetch('image_url').start_with? 'http'
|
||||
next if Photo.find_by(source_id: picture.fetch('id'), source: 'openfarm')
|
||||
|
||||
photo = Photo.new(
|
||||
source_id: picture.fetch('id'),
|
||||
source: 'openfarm',
|
||||
owner: @cropbot,
|
||||
thumbnail_url: data.fetch('thumbnail_url'),
|
||||
fullsize_url: data.fetch('image_url'),
|
||||
title: 'Open Farm photo',
|
||||
license_name: 'No rights reserved',
|
||||
link_url: "https://openfarm.cc/en/crops/#{name_to_slug(crop.name)}"
|
||||
)
|
||||
if photo.valid?
|
||||
Photo.transaction do
|
||||
photo.save
|
||||
PhotoAssociation.find_or_create_by! photo:, photographable: crop
|
||||
end
|
||||
Rails.logger.debug { "\t saved photo #{photo.id} #{photo.source_id}" }
|
||||
else
|
||||
Rails.logger.warn "Photo not valid"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def fetch(name)
|
||||
conn.get("crops/#{name_to_slug(name)}.json").body
|
||||
rescue NoMethodError
|
||||
Rails.logger.debug "error fetching crop"
|
||||
Rails.logger.debug "BODY: "
|
||||
Rails.logger.debug body
|
||||
end
|
||||
|
||||
def name_to_slug(name)
|
||||
CGI.escape(name.gsub(' ', '-').downcase)
|
||||
end
|
||||
|
||||
def fetch_all(page)
|
||||
conn.get("crops.json?page=#{page}").body.fetch('data', {})
|
||||
end
|
||||
|
||||
def fetch_pictures(name)
|
||||
body = conn.get("crops/#{name_to_slug(name)}/pictures.json").body
|
||||
body.fetch('data', false)
|
||||
rescue StandardError
|
||||
Rails.logger.debug "Error fetching photos"
|
||||
Rails.logger.debug []
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def conn
|
||||
Faraday.new BASE do |conn|
|
||||
conn.response :json, content_type: /\bjson$/
|
||||
conn.adapter Faraday.default_adapter
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -18,20 +18,10 @@ class TimelineService
|
||||
.union_all(photos_query)
|
||||
.union_all(seeds_query)
|
||||
.union_all(activities_query)
|
||||
.union_all(likes_query)
|
||||
.where.not(event_at: nil)
|
||||
.order(event_at: :desc)
|
||||
end
|
||||
|
||||
def self.likes_query
|
||||
Like
|
||||
.select("likes.id",
|
||||
"'like' as event_type",
|
||||
"likes.created_at as event_at",
|
||||
"likes.member_id as owner_id",
|
||||
"null as crop_id")
|
||||
end
|
||||
|
||||
def self.activities_query
|
||||
Activity.select(
|
||||
:id,
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
%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')
|
||||
= activity_copy_button(activity, classes: 'dropdown-item')
|
||||
- if activity.active
|
||||
= activity_finish_button(activity, classes: 'dropdown-item')
|
||||
.dropdown-divider
|
||||
|
||||
@@ -10,8 +10,9 @@
|
||||
%a.activity-menu.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", type: "button", href: '#'}
|
||||
|
||||
.dropdown-menu{"aria-labelledby" => "activity-menu"}
|
||||
= activity_edit_button(activity, classes: 'dropdown-item')
|
||||
= activity_copy_button(activity, classes: 'dropdown-item')
|
||||
= link_to edit_activity_path(slug: activity.slug), class: 'dropdown-item' do
|
||||
= edit_icon
|
||||
= t('buttons.edit')
|
||||
|
||||
- if activity.active
|
||||
= activity_finish_button(activity, classes: 'dropdown-item')
|
||||
@@ -19,24 +20,16 @@
|
||||
- if can? :destroy, activity
|
||||
.dropdown-divider
|
||||
= delete_button(activity, classes: 'dropdown-item text-danger')
|
||||
.card-body
|
||||
= link_to activity_path(slug: activity.slug) do
|
||||
= link_to activity_path(slug: activity.slug) do
|
||||
.card-body.text-center
|
||||
%h4= activity.name
|
||||
- if activity.due_date
|
||||
%small.due-date{title: activity.due_date}
|
||||
= standard_time_distance(activity.due_date.to_date, Time.zone.now.to_date)
|
||||
%div
|
||||
%small.text-justify{title: activity.description}= activity.description.truncate(150)
|
||||
%p
|
||||
%ul.list-unstyled
|
||||
- if activity.garden_name && activity.garden_slug
|
||||
%li
|
||||
%small= link_to activity.garden_name, garden_path(slug: activity.garden_slug)
|
||||
- if activity.planting_name && activity.planting_slug
|
||||
%li
|
||||
%small= link_to activity.planting_name, planting_path(slug: activity.planting_slug)
|
||||
|
||||
.text-center= activity.description
|
||||
- if activity.garden
|
||||
.text-center= activity.garden
|
||||
- if activity.planting
|
||||
.text-center= activity.planting
|
||||
.card-footer
|
||||
%small.chip.member-chip
|
||||
= link_to member_path(slug: activity.owner_slug) do
|
||||
= activity.owner_login_name
|
||||
.float-right
|
||||
%span.chip.member-chip
|
||||
= link_to member_path(slug: activity.owner_slug) do
|
||||
= activity.owner_login_name
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
.row
|
||||
.col-md-12
|
||||
= f.text_field :name, required: true, label: 'What needs to be done?', autofocus: true
|
||||
= f.text_field :name, required: true, label: 'What needs to be done?'
|
||||
.row
|
||||
.col-md-4
|
||||
= f.select(:category, Activity::CATEGORIES, include_blank: true)
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
.row
|
||||
.col-md-4
|
||||
= f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active.order_by_name,
|
||||
= f.collection_radio_buttons(:garden_id, @activity.owner.gardens.active,
|
||||
:id, :name,
|
||||
label: 'Is this for a specific garden?')
|
||||
= link_to "Add a garden.", new_garden_path
|
||||
|
||||
.col-md-4
|
||||
= f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active.recent,
|
||||
= f.collection_radio_buttons(:planting_id, @activity.owner.plantings.active,
|
||||
:id, :crop_name,
|
||||
label: 'Is this for a specific planting?')
|
||||
= link_to "Add a planting.", new_planting_path
|
||||
@@ -43,14 +43,6 @@
|
||||
value: @activity.due_date ? @activity.due_date.to_fs(:ymd) : '',
|
||||
label: 'When?'
|
||||
|
||||
.row
|
||||
.col-md-6
|
||||
= label_tag :repeat_times, 'Repeat how many times?'
|
||||
= number_field_tag :repeat_times, nil, class: 'form-control'
|
||||
.col-md-6
|
||||
= label_tag :repeat_weeks, 'Every how many weeks?'
|
||||
= number_field_tag :repeat_weeks, nil, class: 'form-control'
|
||||
|
||||
%hr
|
||||
|
||||
.row
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
%li.breadcrumb-item= link_to @activity.owner, member_activities_path(@activity.owner)
|
||||
%li.breadcrumb-item.active= link_to @activity.name, @activity
|
||||
|
||||
|
||||
.activity
|
||||
.row
|
||||
.col-md-8.col-xs-12
|
||||
@@ -23,14 +22,9 @@
|
||||
%small.text-muted= @activity.category
|
||||
%tt
|
||||
= @activity.due_date
|
||||
- if @repeat_link
|
||||
.alert.alert-info
|
||||
Activity marked as finished recently. Would you like to repeat in the near future?
|
||||
= link_to 'Repeat this activity', @repeat_link, class: 'btn btn-secondary btn-sm ml-2'
|
||||
- if @activity.description.present?
|
||||
:markdown
|
||||
#{strip_tags markdownify(@activity.description)}
|
||||
|
||||
= render 'likes/likes', object: @activity
|
||||
= render 'activities/actions', activity: @activity
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
%h1= "Companions for #{@crop.name}"
|
||||
|
||||
= link_to 'New Companion', new_admin_crop_crop_companion_path(@crop), class: 'btn btn-primary'
|
||||
|
||||
%table.table
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Source URL
|
||||
%th Actions
|
||||
%tbody
|
||||
- @crop_companions.each do |companion|
|
||||
%tr
|
||||
%td= companion.crop_b.name
|
||||
%td= companion.source_url
|
||||
%td= link_to 'Delete', admin_crop_crop_companion_path(@crop, companion), method: :delete, data: { confirm: 'Are you sure?' }
|
||||
@@ -1,6 +0,0 @@
|
||||
%h1= "New Companion for #{@crop.name}"
|
||||
|
||||
= bootstrap_form_for [:admin, @crop, @crop_companion] do |f|
|
||||
= f.collection_select :crop_b_id, Crop.order(:name), :id, :name, { label: 'Companion' }
|
||||
= f.text_field :source_url, label: 'Source URL'
|
||||
= f.submit 'Create'
|
||||
@@ -1,56 +0,0 @@
|
||||
- content_for :title, "Crop Wrangling"
|
||||
|
||||
%h1 Crop Wrangling
|
||||
|
||||
%nav.nav
|
||||
= link_to "Full crop hierarchy", hierarchy_crops_path, class: 'nav-link'
|
||||
= link_to "Add Crop", new_crop_path, class: 'btn'
|
||||
|
||||
%section.crop_wranglers
|
||||
%h2 Crop Wranglers
|
||||
- @crop_wranglers.each do |crop_wrangler|
|
||||
= render 'members/tiny', member: crop_wrangler
|
||||
|
||||
%hr/
|
||||
|
||||
%section
|
||||
%h2 Crops
|
||||
|
||||
|
||||
%ul#myTab.nav.nav-tabs{role: "tablist"}
|
||||
%li.nav-item
|
||||
%a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: 'active'}
|
||||
Recently edited
|
||||
%li.nav-item
|
||||
%a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab"}
|
||||
Recently added
|
||||
%li.nav-item
|
||||
%a#profile-tab.nav-link{ href: wrangle_crops_path(approval_status: "pending"), role: "tab"}
|
||||
Pending approval
|
||||
%li.nav-item
|
||||
%a#contact-tab.nav-link{ href: wrangle_crops_path(approval_status: "rejected"), role: "tab"}
|
||||
Rejected
|
||||
|
||||
.card
|
||||
%ul.list-group.list-group-flush
|
||||
- @versions.each do |version|
|
||||
- crop = version.item || version.reify
|
||||
- if crop
|
||||
%li.list-group-item
|
||||
.d-flex.w-100.justify-content-between
|
||||
%h5.mb-1
|
||||
- if version.event == "destroy"
|
||||
= crop.name
|
||||
- else
|
||||
= link_to crop.name, crop
|
||||
%small.text-muted= "was #{version.event}d"
|
||||
.d-inline-block
|
||||
%small.mr-2= time_ago_in_words(version.created_at) + " ago"
|
||||
- if can?(:wrangle, Crop)
|
||||
= link_to "Revert", revert_admin_version_path(version), method: :post, class: "btn btn-sm btn-outline-danger"
|
||||
- member = @members[version.whodunnit.to_i]
|
||||
- if member
|
||||
%p.mb-1
|
||||
Made by
|
||||
= link_to member.name, member
|
||||
= render 'shared/version_changeset', version: version
|
||||
@@ -1,6 +1,6 @@
|
||||
- if crop.approved? && signed_in?
|
||||
|
||||
.btn-group.crop-actions{"aria-label" => "Crop Actions", role: "group"}
|
||||
.btn-group{"aria-label" => "Crop Actions", role: "group"}
|
||||
= render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
|
||||
= render 'harvests/modal', harvest: Harvest.new(crop: @crop, owner: current_member)
|
||||
= render 'seeds/modal', seed: Seed.new(crop: @crop, owner: current_member)
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
Last harvest expected
|
||||
%strong= crop.median_days_to_last_harvest
|
||||
days after planting
|
||||
- if member_signed_in?
|
||||
.card-footer
|
||||
.d-flex.btn-group-vertical
|
||||
= render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
|
||||
- #= render 'harvests/modal', harvest: Harvest.new(crop: crop, owner: current_member)
|
||||
= render 'seeds/modal', seed: Seed.new(crop: crop, owner: current_member)
|
||||
- if member_signed_in?
|
||||
.card-footer
|
||||
.d-flex.justify-content-between
|
||||
= render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
|
||||
- #= render 'harvests/modal', harvest: Harvest.new(crop: crop, owner: current_member)
|
||||
= render 'seeds/modal', seed: Seed.new(crop: crop, owner: current_member)
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th Name
|
||||
%th Plantings
|
||||
%tbody
|
||||
- crops.each do |crop|
|
||||
%tr
|
||||
%td= link_to crop.name, crop
|
||||
%td= crop.plantings_count
|
||||
@@ -41,47 +41,11 @@
|
||||
= f.radio_button(:perennial, true, label: "Perennial")
|
||||
%span.help-block Living more than two years
|
||||
|
||||
%h2 Data
|
||||
- if @crop.description.blank? || can?(:wrangle, @crop)
|
||||
= f.text_area :description, label: 'Description'
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.description}
|
||||
- if @crop.row_spacing.blank? || can?(:wrangle, @crop)
|
||||
= f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.row_spacing}
|
||||
- if @crop.spread.blank? || can?(:wrangle, @crop)
|
||||
= f.number_field :spread, label: 'Spread (cm)', min: 0
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.spread}
|
||||
- if @crop.height.blank? || can?(:wrangle, @crop)
|
||||
= f.number_field :height, label: 'Height (cm)', min: 0
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.height}
|
||||
- if @crop.sowing_method.blank? || can?(:wrangle, @crop)
|
||||
= f.text_field :sowing_method
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.sowing_method}
|
||||
- if @crop.sun_requirements.blank? || can?(:wrangle, @crop)
|
||||
= f.text_field :sun_requirements
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.sun_requirements}
|
||||
- if @crop.growing_degree_days.blank? || can?(:wrangle, @crop)
|
||||
= f.number_field :growing_degree_days, min: 0
|
||||
- if @crop.parent
|
||||
%span.help-block Parent: #{@crop.parent.growing_degree_days}
|
||||
= f.text_field :public_food_key, label: 'Australian Food Composition Database Public Food Key'
|
||||
|
||||
- unless @crop.approved?
|
||||
= link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
|
||||
- if @crop.en_wikipedia_url.blank? || can?(:wrangle, @crop)
|
||||
= 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).
|
||||
- if @crop.en_youtube_url.blank? || can?(:wrangle, @crop)
|
||||
= f.url_field :en_youtube_url, label: 'YouTube URL'
|
||||
%span.help-block
|
||||
Link to a YouTube video about the crop in English.
|
||||
= 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).
|
||||
|
||||
-# Only crop wranglers see the crop hierarchy (for now)
|
||||
- if can? :wrangle, @crop
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#{harvest.owner} harvested #{display_quantity(harvest)}.
|
||||
.float-right= render 'members/location', member: harvest.owner
|
||||
.harvest-timeago
|
||||
%small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
|
||||
%small #{distance_of_time_in_words(harvest.harvested_at, Time.zone.now)} ago.
|
||||
%li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
|
||||
- if crop.approved?
|
||||
- if current_member
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
%section.history
|
||||
%h2 History
|
||||
.card
|
||||
%ul.list-group.list-group-flush
|
||||
- crop.versions.reorder(created_at: :desc).each do |version|
|
||||
- if version.changeset.present?
|
||||
%li.list-group-item
|
||||
.d-flex.w-100.justify-content-between
|
||||
%h5.mb-1= version.event.humanize
|
||||
%small= time_ago_in_words(version.created_at) + " ago"
|
||||
- member = @version_members.present? && @version_members[version.whodunnit.to_i]
|
||||
- if member
|
||||
%p.mb-1
|
||||
Made by
|
||||
= link_to member.name, member
|
||||
= render 'shared/version_changeset', version: version
|
||||
@@ -6,14 +6,14 @@
|
||||
- unless @crop.approved?
|
||||
%badge.badge-warning=@crop.approval_status
|
||||
%small.text-muted= @crop.default_scientific_name
|
||||
- if crop_or_parent(@crop, :sowing_method).present?
|
||||
- if @crop.sowing_method.present?
|
||||
%p
|
||||
%strong How to sow #{@crop.name}:
|
||||
= crop_or_parent(@crop, :sowing_method)
|
||||
- if crop_or_parent(@crop, :sun_requirements).present?
|
||||
= @crop.sowing_method
|
||||
- if @crop.sun_requirements.present?
|
||||
%p
|
||||
%strong Sun requirement for #{@crop}:
|
||||
Plant in #{crop_or_parent(@crop, :sun_requirements)}
|
||||
Plant in #{@crop.sun_requirements}
|
||||
%p.text-muted
|
||||
- if !@crop.plantings.empty?
|
||||
#{@crop.name.titleize} has been planted
|
||||
@@ -21,11 +21,8 @@
|
||||
by #{ENV['GROWSTUFF_SITE_NAME']} members.
|
||||
- else
|
||||
Nobody is growing this yet. You could be the first!
|
||||
- if crop_or_parent(@crop, :description).present?
|
||||
%p= simple_format crop_or_parent(@crop, :description)
|
||||
- else
|
||||
- if member_signed_in?
|
||||
%p= link_to "Add a description.", edit_crop_path(@crop, anchor: ":~:text=Description")
|
||||
- if @crop.description.present?
|
||||
%p= simple_format @crop.description
|
||||
.col-md-3
|
||||
= image_tag crop_image_path(@crop),
|
||||
class: 'img-responsive shadow rounded crop-hero-photo', alt: "Image of #{@crop.name}"
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
- if crop.row_spacing || crop.spread || crop.height || crop.sowing_method || crop.sun_requirements || crop.growing_degree_days
|
||||
= cute_icon
|
||||
.card
|
||||
.card-body
|
||||
%h4 OpenFarm Data
|
||||
%ul.list-group.list-group-flush
|
||||
- if crop.row_spacing
|
||||
%li.list-group-item
|
||||
%strong Row Spacing:
|
||||
= crop.row_spacing
|
||||
cm
|
||||
- if crop.spread
|
||||
%li.list-group-item
|
||||
%strong Spread:
|
||||
= crop.spread
|
||||
cm
|
||||
- if crop.height
|
||||
%li.list-group-item
|
||||
%strong Height:
|
||||
= crop.height
|
||||
cm
|
||||
- if crop.sowing_method
|
||||
%li.list-group-item
|
||||
%strong Sowing Method:
|
||||
= crop.sowing_method
|
||||
- if crop.sun_requirements
|
||||
%li.list-group-item
|
||||
%strong Sun Requirements:
|
||||
= crop.sun_requirements
|
||||
- if crop.growing_degree_days
|
||||
%li.list-group-item
|
||||
%strong Growing Degree Days:
|
||||
= crop.growing_degree_days
|
||||
@@ -1,7 +1,7 @@
|
||||
%h2 #{photo_icon} Photos
|
||||
- [Crop, Planting, Harvest, Seed].each do |model_name|
|
||||
- if crop_or_parent(crop, :photos).by_model(model_name).any?
|
||||
- if crop.photos.by_model(model_name).any?
|
||||
%h3 #{@crop.name.capitalize} #{t("activerecord.models.#{model_name.to_s.downcase}.other")}
|
||||
= render 'photos/gallery', photos: crop_or_parent(crop, :photos).by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
|
||||
= render 'photos/gallery', photos: crop.photos.by_model(model_name).includes(:owner).order(likes_count: :desc).limit(5)
|
||||
- if crop.photos.count.positive?
|
||||
= link_to 'more photos »', crop_photos_path(@crop), class: 'btn'
|
||||
|
||||
6
app/views/crops/_planting_advice.html.haml
Normal file
6
app/views/crops/_planting_advice.html.haml
Normal file
@@ -0,0 +1,6 @@
|
||||
- if crop.guides_count.present? && crop.guides_count.positive?
|
||||
%p
|
||||
There are
|
||||
= link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-').downcase}" do
|
||||
#{crop.guides_count} growing guides on Open Farm
|
||||
|
||||
@@ -54,7 +54,3 @@
|
||||
- if crop.growing_degree_days.present?
|
||||
= render 'layouts/fact_card',
|
||||
title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
|
||||
- if member_signed_in? && (!crop.height.present? || !crop.spread.present? || !crop.row_spacing.present? || !crop.growing_degree_days.present?)
|
||||
.card.fact-card
|
||||
.card-body.text-center
|
||||
%p= link_to "Add more attributes.", edit_crop_path(@crop, anchor: ":~:text=Data")
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
%script{type: "application/ld+json"}
|
||||
= crop_jsonld_data(crop).to_json.html_safe
|
||||
@@ -4,28 +4,25 @@
|
||||
%p None known.
|
||||
- else
|
||||
- crop.scientific_names.each do |sn|
|
||||
.d-inline-block
|
||||
- if can? :edit, sn
|
||||
.dropdown.planting-actions.d-inline-block
|
||||
%a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
|
||||
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
|
||||
= link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
|
||||
= edit_icon
|
||||
= t('.edit')
|
||||
.dropdown-divider
|
||||
= link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
|
||||
= delete_icon
|
||||
= t('.delete')
|
||||
- if can? :edit, sn
|
||||
.dropdown.planting-actions
|
||||
%a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
|
||||
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
|
||||
= link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
|
||||
= edit_icon
|
||||
= t('.edit')
|
||||
.dropdown-divider
|
||||
= link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
|
||||
= delete_icon
|
||||
= t('.delete')
|
||||
- else
|
||||
- if sn.gbif_key
|
||||
= link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
|
||||
class: 'card-link',
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer"
|
||||
- else
|
||||
- if sn.gbif_key
|
||||
= link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
|
||||
class: 'card-link',
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer"
|
||||
- else
|
||||
.badge= sn.name
|
||||
- if sn.wikidata_id.present?
|
||||
= link_to "WD", "https://www.wikidata.org/wiki/#{sn.wikidata_id}", class: 'badge badge-info ms-1', target: '_blank', rel: 'noopener noreferrer', title: 'Wikidata'
|
||||
.badge= sn.name
|
||||
|
||||
%p.text-right
|
||||
- if can? :edit, crop
|
||||
|
||||
@@ -14,10 +14,6 @@
|
||||
= icon 'far', 'update'
|
||||
Fetch data from GBIF
|
||||
|
||||
= link_to admin_crop_crop_companions_path(crop), class: 'dropdown-item' do
|
||||
= icon 'fas', 'leaf'
|
||||
Manage Companions
|
||||
|
||||
- if can? :destroy, crop
|
||||
.dropdown-divider
|
||||
= delete_button(crop, classes: 'dropdown-item text-danger')
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
%h1 Data Improvement
|
||||
|
||||
- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
|
||||
|
||||
%ul.nav.nav-tabs
|
||||
- tabs.each do |key, value|
|
||||
%li{class: ('active' if @active_tab == key.to_s)}
|
||||
= link_to value, data_improvement_crops_path(tab: key)
|
||||
|
||||
.tab-content
|
||||
.tab-pane.active
|
||||
%h2= "Crops without #{tabs[@active_tab.to_sym]}"
|
||||
= render 'crop_list', crops: @crops
|
||||
@@ -3,7 +3,6 @@
|
||||
- content_for :buttonbar do
|
||||
- if can? :wrangle, Crop
|
||||
= link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
|
||||
= link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
|
||||
- if can? :create, Crop
|
||||
= link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
= render 'schema_org', crop: @crop
|
||||
- content_for :title, @crop.name
|
||||
- content_for :opengraph do
|
||||
= tag("meta", property: "og:image", content: crop_image_path(@crop))
|
||||
@@ -12,8 +11,6 @@
|
||||
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item= link_to 'Crops', crops_path
|
||||
- if @crop.parent
|
||||
%li.breadcrumb-item.active= link_to @crop.parent.name.capitalize, @crop.parent
|
||||
%li.breadcrumb-item.active= link_to @crop.name.capitalize, @crop
|
||||
|
||||
= render 'approval_status_message', crop: @crop
|
||||
@@ -27,23 +24,12 @@
|
||||
%section.prediction
|
||||
= cute_icon
|
||||
= render 'predictions', crop: @crop
|
||||
- if @crop.all_companions.any?
|
||||
- if @crop.companions.any?
|
||||
%section.companions
|
||||
%h2 Companions
|
||||
- @crop.all_companions.each do |companion|
|
||||
- @crop.companions.each do |companion|
|
||||
= render 'crops/tiny', crop: companion
|
||||
|
||||
- if crop_or_parent(@crop, :en_youtube_url).present?
|
||||
%section.youtube
|
||||
%h2 Video
|
||||
.embed-responsive.embed-responsive-16by9
|
||||
%iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(crop_or_parent(@crop, :en_youtube_url))}", allowfullscreen: true }
|
||||
- else
|
||||
- if member_signed_in?
|
||||
%section.youtube
|
||||
%h2 Video
|
||||
%p= link_to "Submit a video.", edit_crop_path(@crop, anchor: ":~:text=Youtube")
|
||||
|
||||
%section.photos
|
||||
= cute_icon
|
||||
= render 'crops/photos', crop: @crop
|
||||
@@ -82,13 +68,13 @@
|
||||
|
||||
%section.posts= render 'crops/posts', crop: @crop
|
||||
|
||||
= render 'history', crop: @crop
|
||||
.col-md-3
|
||||
= cute_icon
|
||||
.card
|
||||
.card-body
|
||||
%h4 How to grow #{@crop.name.pluralize}
|
||||
= render 'grown_for', crop: @crop
|
||||
= render 'planting_advice', crop: @crop
|
||||
- if @crop.parent
|
||||
%hr/
|
||||
%p.parent-crop
|
||||
@@ -126,8 +112,6 @@
|
||||
= render 'harvests', crop: @crop
|
||||
= render 'find_seeds', crop: @crop
|
||||
|
||||
= render 'openfarm_data', crop: @crop
|
||||
|
||||
= cute_icon
|
||||
.card
|
||||
.card-body
|
||||
@@ -140,12 +124,13 @@
|
||||
= icon 'fas', 'external-link-alt'
|
||||
Wikipedia (English)
|
||||
|
||||
- if @crop.public_food_key.present?
|
||||
%li.list-group-item
|
||||
= link_to "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{@crop.public_food_key}", target: "_blank", rel: "noopener noreferrer" do
|
||||
= icon 'fas', 'external-link-alt'
|
||||
Australian Food Composition Database
|
||||
|
||||
%li.list-group-item
|
||||
= link_to "https://openfarm.cc/en/crops/#{CGI.escape @crop.name.gsub(' ', '-')}",
|
||||
class: 'card-link',
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do
|
||||
= icon 'fas', 'external-link-alt'
|
||||
OpenFarm - Growing guide
|
||||
%li.list-group-item
|
||||
= link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
|
||||
target: "_blank",
|
||||
@@ -178,10 +163,3 @@
|
||||
= icon 'fas', 'external-link-alt'
|
||||
Wikihow instructions
|
||||
|
||||
%li.list-group-item
|
||||
= link_to "https://www.youtube.com/results?search_query=#{CGI.escape "growing #{@crop.name}"}",
|
||||
target: "_blank",
|
||||
class: 'card-link',
|
||||
rel: "noopener noreferrer" do
|
||||
= icon 'fab', 'youtube'
|
||||
YouTube
|
||||
|
||||
@@ -17,9 +17,6 @@
|
||||
%h2 Crops
|
||||
|
||||
%ul#myTab.nav.nav-tabs{role: "tablist"}
|
||||
%li.nav-item
|
||||
%a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: ''}
|
||||
Recently edited
|
||||
%li.nav-item
|
||||
%a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab", class: @approval_status.blank? ? 'active' : ''}
|
||||
Recently added
|
||||
|
||||
@@ -15,16 +15,3 @@
|
||||
method: :delete, class: "remove btn btn-danger"
|
||||
- else
|
||||
= link_to 'Connect to Flickr', '/members/auth/flickr', class: 'btn'
|
||||
%hr
|
||||
.row
|
||||
.col-md-12
|
||||
%p
|
||||
= image_tag "icons/post.svg", size: "32x32", alt: 'API logo'
|
||||
- if current_member.api_token?
|
||||
Your API token is
|
||||
%code= current_member.api_token.token
|
||||
= link_to "Regenerate", regenerate_api_token_path,
|
||||
data: { confirm: "Are you sure? Your old token will stop working immediately." },
|
||||
method: :post, class: "remove btn btn-danger"
|
||||
- else
|
||||
= link_to 'Generate API Token', regenerate_api_token_path, method: :post, class: 'btn btn-primary'
|
||||
|
||||
@@ -15,4 +15,5 @@
|
||||
|
||||
- if can?(:destroy, garden)
|
||||
.dropdown-divider
|
||||
= delete_button(garden, classes: 'dropdown-item text-danger', message: 'gardens.confirm_delete')
|
||||
= delete_button(garden, classes: 'dropdown-item text-danger',
|
||||
message: 'All plantings associated with this garden will also be deleted. Are you sure?')
|
||||
|
||||
@@ -16,8 +16,3 @@
|
||||
.col-md-12
|
||||
%p Nothing has been planted here.
|
||||
|
||||
- if @finished_activities&.size&.positive?
|
||||
%h2 Finished activities in garden
|
||||
.index-cards
|
||||
- @finished_activities.each do |activity|
|
||||
= render "activities/card", activity: activity
|
||||
@@ -11,9 +11,6 @@
|
||||
|
||||
.row
|
||||
.col-md-2
|
||||
%small
|
||||
%a{href: "#content"}
|
||||
Skip to main content
|
||||
= render 'layouts/nav', model: Garden
|
||||
%label
|
||||
= link_to show_inactive_tickbox_path('gardens', owner: @owner, show_all: @show_all) do
|
||||
@@ -23,7 +20,7 @@
|
||||
%hr/
|
||||
= render @owner
|
||||
|
||||
.col-md-10#content
|
||||
.col-md-10
|
||||
- if @gardens.empty?
|
||||
%p There are no gardens to display.
|
||||
- if can?(:create, Garden) && @owner == current_member
|
||||
|
||||
@@ -66,7 +66,8 @@
|
||||
|
||||
- if can?(:destroy, @garden)
|
||||
.dropdown-divider
|
||||
= delete_button(@garden, classes: 'dropdown-item text-danger', message: 'gardens.confirm_delete')
|
||||
= delete_button(@garden, classes: 'dropdown-item text-danger',
|
||||
message: 'All plantings associated with this garden will also be deleted. Are you sure?')
|
||||
|
||||
%section
|
||||
%h2 Current activities in garden
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user