mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-27 02:10:07 -04:00
Compare commits
1 Commits
release71
...
refactor-e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e763da0d75 |
9
.github/workflows/ci-features-admin.yml
vendored
9
.github/workflows/ci-features-admin.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
9
.github/workflows/ci-features-comments.yml
vendored
9
.github/workflows/ci-features-comments.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
9
.github/workflows/ci-features-crops.yml
vendored
9
.github/workflows/ci-features-crops.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
9
.github/workflows/ci-features-gardens.yml
vendored
9
.github/workflows/ci-features-gardens.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-harvests.yml
vendored
11
.github/workflows/ci-features-harvests.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/harvests/ -fd -t ~@flaky
|
||||
11
.github/workflows/ci-features-home.yml
vendored
11
.github/workflows/ci-features-home.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/home/ -fd -t ~@flaky
|
||||
11
.github/workflows/ci-features-members.yml
vendored
11
.github/workflows/ci-features-members.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/members/ -fd -t ~@flaky
|
||||
9
.github/workflows/ci-features-places.yml
vendored
9
.github/workflows/ci-features-places.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
9
.github/workflows/ci-features-plantings.yml
vendored
9
.github/workflows/ci-features-plantings.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-posts.yml
vendored
11
.github/workflows/ci-features-posts.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: CI Features - Posts
|
||||
name: CI Features - Admin
|
||||
|
||||
on: [pull_request]
|
||||
|
||||
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
9
.github/workflows/ci-features-seeds.yml
vendored
9
.github/workflows/ci-features-seeds.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
|
||||
11
.github/workflows/ci-features-timeline.yml
vendored
11
.github/workflows/ci-features-timeline.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/timeline/ -fd -t ~@flaky
|
||||
11
.github/workflows/ci-features.yml
vendored
11
.github/workflows/ci-features.yml
vendored
@@ -74,7 +74,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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@v4
|
||||
with:
|
||||
name: screenshots
|
||||
path: tmp/screenshots
|
||||
run: bundle exec rspec spec/features/rss/ -fd
|
||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -89,7 +89,7 @@ jobs:
|
||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
||||
|
||||
- name: Install NodeJS
|
||||
uses: actions/setup-node@v5
|
||||
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.
|
||||
|
||||
1
Gemfile
1
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
|
||||
|
||||
28
Gemfile.lock
28
Gemfile.lock
@@ -142,7 +142,7 @@ GEM
|
||||
erubi (>= 1.0.0)
|
||||
rack (>= 0.9.0)
|
||||
rouge (>= 1.0.0)
|
||||
bigdecimal (3.2.3)
|
||||
bigdecimal (3.2.2)
|
||||
bluecloth (2.2.0)
|
||||
bonsai-elasticsearch-rails (7.0.1)
|
||||
elasticsearch-model (< 8)
|
||||
@@ -198,7 +198,7 @@ GEM
|
||||
comfy_bootstrap_form (4.0.9)
|
||||
rails (>= 5.0.0)
|
||||
concurrent-ruby (1.3.5)
|
||||
connection_pool (2.5.4)
|
||||
connection_pool (2.5.3)
|
||||
crass (1.0.6)
|
||||
crowdin-api (1.12.0)
|
||||
open-uri (>= 0.1.0, < 0.2.0)
|
||||
@@ -257,9 +257,9 @@ GEM
|
||||
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)
|
||||
@@ -294,6 +294,12 @@ GEM
|
||||
temple (>= 0.8.2)
|
||||
thor
|
||||
tilt
|
||||
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)
|
||||
@@ -457,8 +463,8 @@ GEM
|
||||
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)
|
||||
@@ -475,7 +481,7 @@ GEM
|
||||
date
|
||||
stringio
|
||||
public_suffix (6.0.1)
|
||||
puma (7.0.2)
|
||||
puma (6.6.1)
|
||||
nio4r (~> 2.0)
|
||||
query_diet (0.7.2)
|
||||
racc (1.8.1)
|
||||
@@ -601,7 +607,7 @@ GEM
|
||||
rswag-ui (2.16.0)
|
||||
actionpack (>= 5.2, < 8.1)
|
||||
railties (>= 5.2, < 8.1)
|
||||
rubocop (1.80.2)
|
||||
rubocop (1.80.1)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
@@ -630,7 +636,7 @@ GEM
|
||||
rubocop-rake (0.7.1)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (>= 1.72.1)
|
||||
rubocop-rspec (3.7.0)
|
||||
rubocop-rspec (3.6.0)
|
||||
lint_roller (~> 1.1)
|
||||
rubocop (~> 1.72, >= 1.72.1)
|
||||
rubocop-rspec_rails (2.31.0)
|
||||
@@ -688,13 +694,14 @@ GEM
|
||||
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.3)
|
||||
trollop (1.16.2)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (3.1.5)
|
||||
@@ -781,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)
|
||||
|
||||
@@ -17,9 +17,7 @@ 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
|
||||
|
||||
@@ -37,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;
|
||||
|
||||
@@ -132,8 +132,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%;
|
||||
|
||||
@@ -29,7 +29,7 @@ class ActivitiesController < DataController
|
||||
|
||||
def new
|
||||
@activity = Activity.new(
|
||||
owner: current_member,
|
||||
owner: current_member,
|
||||
due_date: Date.today
|
||||
)
|
||||
if params[:garden_id]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -192,8 +192,6 @@ class CropsController < ApplicationController
|
||||
:parent_id, :perennial,
|
||||
:request_notes, :reason_for_rejection,
|
||||
:rejection_notes,
|
||||
:row_spacing, :spread, :height,
|
||||
:sowing_method, :sun_requirements, :growing_degree_days,
|
||||
scientific_names_attributes: %i(scientific_name _destroy id)
|
||||
)
|
||||
end
|
||||
|
||||
@@ -20,7 +20,6 @@ class GardensController < DataController
|
||||
def show
|
||||
@current_plantings = @garden.plantings.current.where.not(failed: true).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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -134,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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -21,28 +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
|
||||
@@ -119,4 +97,8 @@ module ApplicationHelper
|
||||
def og_description(description)
|
||||
strip_tags(description).split(' ')[0..20].join(' ')
|
||||
end
|
||||
|
||||
def site_name
|
||||
ENV.fetch('GROWSTUFF_SITE_NAME', 'Growstuff')
|
||||
end
|
||||
end
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class ApplicationMailer < ActionMailer::Base
|
||||
helper :application
|
||||
default from: 'from@example.com'
|
||||
layout 'mailer'
|
||||
end
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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?
|
||||
@@ -23,6 +31,10 @@ module OpenFarmData
|
||||
fetch_attr('description')
|
||||
end
|
||||
|
||||
def row_spacing
|
||||
fetch_attr('row_spacing')
|
||||
end
|
||||
|
||||
def common_names
|
||||
fetch_attr('common_names')
|
||||
end
|
||||
@@ -31,10 +43,22 @@ module OpenFarmData
|
||||
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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -24,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
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -83,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
|
||||
[
|
||||
|
||||
@@ -12,8 +12,6 @@ class Seed < ApplicationRecord
|
||||
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
|
||||
@@ -46,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'
|
||||
has_one :garden
|
||||
has_one :planting
|
||||
|
||||
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
|
||||
|
||||
@@ -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'
|
||||
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
|
||||
has_one :planting
|
||||
has_one :owner, class_name: 'Member'
|
||||
# has_one :plant_part
|
||||
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
|
||||
|
||||
@@ -3,10 +3,7 @@
|
||||
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'
|
||||
has_many :plantings
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
module Api
|
||||
module V1
|
||||
class PlantingResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :garden
|
||||
has_one :crop
|
||||
@@ -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,9 +3,7 @@
|
||||
module Api
|
||||
module V1
|
||||
class SeedResource < BaseResource
|
||||
before_create do
|
||||
@model.owner = context[:current_user]
|
||||
end
|
||||
immutable
|
||||
|
||||
has_one :owner, class_name: 'Member'
|
||||
has_one :crop
|
||||
@@ -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
|
||||
|
||||
[: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,
|
||||
|
||||
@@ -20,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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title
|
||||
Recent activities from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
Recent activities from #{@owner ? @owner : 'all members'} (#{site_name})
|
||||
%link= activities_url
|
||||
- @activities.each do |activity|
|
||||
%item
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
= tag("meta", property: "og:description", content: og_description(@activity.description))
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item= link_to 'Activities', activities_path
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item.active= link_to 'Admin', admin_path
|
||||
|
||||
%h1 Manage #{ENV['GROWSTUFF_SITE_NAME']}
|
||||
%h1 Manage #{site_name}
|
||||
|
||||
.row
|
||||
.col-md-4
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
= tag("meta", property: "og:title", content: @alternate_name.name)
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
%p#notice= notice
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title Recent comments on all posts (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
%title Recent comments on all posts (#{site_name})
|
||||
%link= comments_url
|
||||
- @comments.each do |comment|
|
||||
%item
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -41,14 +41,6 @@
|
||||
= f.radio_button(:perennial, true, label: "Perennial")
|
||||
%span.help-block Living more than two years
|
||||
|
||||
%h2 OpenFarm Data
|
||||
= f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
|
||||
= f.number_field :spread, label: 'Spread (cm)', min: 0
|
||||
= f.number_field :height, label: 'Height (cm)', min: 0
|
||||
= f.text_field :sowing_method
|
||||
= f.text_field :sun_requirements
|
||||
= f.number_field :growing_degree_days, min: 0
|
||||
|
||||
- unless @crop.approved?
|
||||
= link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
|
||||
= f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
- if !@crop.plantings.empty?
|
||||
#{@crop.name.titleize} has been planted
|
||||
= pluralize(@crop.plantings.size, "time")
|
||||
by #{ENV['GROWSTUFF_SITE_NAME']} members.
|
||||
by #{site_name} members.
|
||||
- else
|
||||
Nobody is growing this yet. You could be the first!
|
||||
- if @crop.description.present?
|
||||
|
||||
@@ -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 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title Recently added crops (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
%title Recently added crops (#{site_name})
|
||||
%link= crops_url
|
||||
- @crops.each do |crop|
|
||||
%item
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
= tag("meta", property: "og:title", content: @crop.name)
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :scripts do
|
||||
= javascript_include_tag "charts"
|
||||
@@ -111,13 +111,11 @@
|
||||
= render 'harvests', crop: @crop
|
||||
= render 'find_seeds', crop: @crop
|
||||
|
||||
= render 'openfarm_data', crop: @crop
|
||||
|
||||
= cute_icon
|
||||
.card
|
||||
.card-body
|
||||
%h3 Learn more about #{@crop.name.pluralize}
|
||||
%h4.text-muted resources outside #{ENV['GROWSTUFF_SITE_NAME']}
|
||||
%h4.text-muted resources outside #{site_name}
|
||||
|
||||
%ul.list-group.list-group-flush
|
||||
%li.list-group-item
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
- site_name = ENV['GROWSTUFF_SITE_NAME']
|
||||
%p Hello #{@resource.login_name},
|
||||
|
||||
%p
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
- site_name = ENV['GROWSTUFF_SITE_NAME']
|
||||
%p Hello #{@resource.login_name},
|
||||
|
||||
%p
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
- site_name = ENV['GROWSTUFF_SITE_NAME']
|
||||
%p Hello #{@resource.login_name},
|
||||
|
||||
%p
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
%br/
|
||||
= render 'devise/shared/error_messages', resource: resource
|
||||
|
||||
%p Delete your account from #{ENV['GROWSTUFF_SITE_NAME']}.
|
||||
%p Delete your account from #{site_name}.
|
||||
.form-group
|
||||
= f.label :current_password, "Password required to delete", class: 'control-label col-md-2'
|
||||
.col-md-4
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
.col-md-offset-2.col-md-8.checkbox
|
||||
%label
|
||||
= f.check_box :newsletter
|
||||
Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter
|
||||
Subscribe to the #{site_name} newsletter
|
||||
.help-block
|
||||
= render partial: 'newsletter_blurb'
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
The #{ENV['GROWSTUFF_SITE_NAME']} newsletter is sent out
|
||||
The #{site_name} newsletter is sent out
|
||||
every few weeks. Check out our
|
||||
= link_to 'past newsletters', 'http://blog.growstuff.org/category/newsletter/'
|
||||
if you want to see the sort of thing we'll send you. Of course, we'll never spam you
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
.form-page
|
||||
.card.form-card
|
||||
%h1 Join #{ENV['GROWSTUFF_SITE_NAME']}
|
||||
%h1 Join #{site_name}
|
||||
.card-body
|
||||
%p Sign up for a #{ENV['GROWSTUFF_SITE_NAME']} account to track your vegetable garden and connect with other local growers.
|
||||
%p Sign up for a #{site_name} account to track your vegetable garden and connect with other local growers.
|
||||
%p If you have accessibility issues with the captcha, please contact us via the links in the footer and we will help.
|
||||
|
||||
= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name),
|
||||
@@ -24,7 +24,7 @@
|
||||
to the #{link_to 'Terms of Service', "/policy/tos"}
|
||||
|
||||
%p
|
||||
= f.check_box :newsletter, checked: true, label: "Subscribe to the #{ENV['GROWSTUFF_SITE_NAME']} newsletter"
|
||||
= f.check_box :newsletter, checked: true, label: "Subscribe to the #{site_name} newsletter"
|
||||
%p= render partial: 'newsletter_blurb'
|
||||
|
||||
= f.submit "Sign up", class: 'btn btn-block btn-success'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
= tag("meta", property: "og:title", content: @forum.name)
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
%h1= @forum.name
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
%hr/
|
||||
%p.text-center
|
||||
#{ENV['GROWSTUFF_SITE_NAME']} helps you track what you're
|
||||
#{site_name} helps you track what you're
|
||||
harvesting from your home garden and see how productive it is.
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- content_for :title, 'GardenTypes'
|
||||
|
||||
%p
|
||||
#{ENV['GROWSTUFF_SITE_NAME']} tracks who's growing what, where.
|
||||
#{site_name} tracks who's growing what, where.
|
||||
View any garden_type page to see which of our members have used it.
|
||||
|
||||
.index-cards
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
= tag("meta", property: "og:title", content: "#{@garden.owner}'s #{@garden}")
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item= link_to 'Gardens', gardens_path
|
||||
@@ -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
|
||||
|
||||
@@ -5,8 +5,3 @@
|
||||
- @matching_plantings.each do |planting|
|
||||
= f.radio_button :planting_id, planting.id, label: planting
|
||||
= f.submit "save", class: 'btn btn-sm'
|
||||
|
||||
- if @harvest.planting.present? && @harvest.planting.overall_rating.blank?
|
||||
.alert.alert-info{role: "alert"}
|
||||
This harvest is from a planting that hasn't been rated yet.
|
||||
= link_to "Rate this planting", edit_planting_path(@harvest.planting, anchor: "planting_overall_rating"), class: 'alert-link'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title
|
||||
Recent harvests from #{@owner ||= 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
Recent harvests from #{@owner ||= 'all members'} (#{site_name})
|
||||
%link= harvests_url
|
||||
- @harvests.each do |harvest|
|
||||
%item
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
= tag("meta", property: "og:title", content: "#{@harvest.crop} harvested by #{@harvest.owner}")
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item= link_to 'Harvests', harvests_path
|
||||
@@ -46,7 +46,7 @@
|
||||
%h3
|
||||
Harvested
|
||||
= editable :date, @harvest, :harvested_at, display_field: '.harvested_at'
|
||||
%strong.harvested_at #{standard_time_distance @harvest.harvested_at, Time.zone.now.to_date}
|
||||
%strong.harvested_at #{distance_of_time_in_words @harvest.harvested_at, Time.zone.now.to_date} ago
|
||||
%span.harvested_at= I18n.l @harvest.harvested_at
|
||||
|
||||
.card{class: @harvest.quantity.present? ? '' : 'text-muted'}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.row.homepage-blurb
|
||||
.col-md-8.info
|
||||
%h1 Growstuff - An open gardening platform
|
||||
%p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
|
||||
%p= t('.intro', site_name: site_name)
|
||||
= render 'stats'
|
||||
.col-md-4
|
||||
.signup
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
|
||||
number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
|
||||
number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path),
|
||||
contributors: link_to(count_github_contibutors, 'https://github.com/Growstuff/growstuff/blob/dev/CONTRIBUTORS.md', target: '_blank', rel: 'noopener'),
|
||||
contributors: link_to(count_github_contibutors, 'http://github.com/Growstuff/growstuff/CONTRIBUTORS.md', target: '_blank', rel: 'noopener'),
|
||||
github: link_to('GitHub', 'http://github.com/Growstuff/growstuff', target: '_blank', rel: 'noopener'))
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
- content_for :title do
|
||||
= ENV['GROWSTUFF_SITE_NAME']
|
||||
= site_name
|
||||
|
||||
- if member_signed_in?
|
||||
.row
|
||||
.col-lg-8.col-md-12
|
||||
%h1.display-4= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
|
||||
%h1.display-4= t('.welcome', site_name: site_name, member_name: current_member)
|
||||
|
||||
%p= render 'stats', cached: true
|
||||
.col
|
||||
%br
|
||||
%p
|
||||
- if current_member.plantings.active.any?
|
||||
= link_to member_path(current_member, anchor: "content"), class: 'btn btn-dark' do
|
||||
= link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
|
||||
= planting_icon
|
||||
Track my plantings
|
||||
%p
|
||||
= link_to member_gardens_path(current_member, anchor: "content"), class: 'btn btn-dark' do
|
||||
= link_to member_gardens_path(current_member), class: 'btn btn-dark' do
|
||||
= garden_icon
|
||||
Show me my garden
|
||||
- else
|
||||
|
||||
@@ -6,27 +6,27 @@
|
||||
- else
|
||||
= tag("meta", property: "og:image", content: image_url('facebook-thumbnail.png'))
|
||||
= tag("meta", property: "og:title",
|
||||
content: (content_for?(:title) ? yield(:title) + " - " : "") + ENV['GROWSTUFF_SITE_NAME'])
|
||||
content: (content_for?(:title) ? yield(:title) + " - " : "") + site_name)
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: root_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- if content_for?(:member_rss_login_name) && content_for(:member_rss_slug)
|
||||
= auto_discovery_link_tag(:rss,
|
||||
{ controller: "/members", action: 'show', format: "rss", id: yield(:member_rss_slug) },
|
||||
title: "#{ENV['GROWSTUFF_SITE_NAME']}- #{yield(:member_rss_login_name)}'s posts")
|
||||
title: "#{site_name}- #{yield(:member_rss_login_name)}'s posts")
|
||||
= auto_discovery_link_tag(:rss,
|
||||
{ controller: "/posts", format: "rss" },
|
||||
title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recent posts from all members")
|
||||
title: "#{site_name} - Recent posts from all members")
|
||||
= auto_discovery_link_tag(:rss,
|
||||
{ controller: "/crops", format: "rss" },
|
||||
title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recently added crops")
|
||||
title: "#{site_name} - Recently added crops")
|
||||
= auto_discovery_link_tag(:rss,
|
||||
{ controller: "/plantings", format: "rss" },
|
||||
title: "#{ENV['GROWSTUFF_SITE_NAME']} - Recent plantings from all members")
|
||||
title: "#{site_name} - Recent plantings from all members")
|
||||
|
||||
%title
|
||||
= content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
|
||||
= content_for?(:title) ? yield(:title) + " - #{site_name} " : site_name
|
||||
= csrf_meta_tags
|
||||
= stylesheet_link_tag "application", media: "all"
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
%ul.navbar-nav.mr-auto.bg-dark
|
||||
- if signed_in?
|
||||
%li.nav-item
|
||||
= link_to timeline_index_path, method: :get, class: 'nav-link text-white', title: "Timeline" do
|
||||
= link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
|
||||
= image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
|
||||
%li.nav-item
|
||||
= link_to member_gardens_path(current_member, anchor: "content"), class: 'nav-link text-white', title: "My gardens" do
|
||||
= link_to member_gardens_path(current_member), class: 'nav-link text-white', title: "My gardens" do
|
||||
= image_icon 'gardens'
|
||||
%li.nav-item.dropdown
|
||||
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
#{link_to event_model.member, event_model.member} liked #{link_to event_model.likeable.class.name.downcase, event_model.likeable}
|
||||
@@ -1,8 +1,8 @@
|
||||
= content_for :title, t(".title", site_name: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= content_for :title, t(".title", site_name: site_name)
|
||||
|
||||
%h1
|
||||
= member_icon
|
||||
= t(".title", site_name: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= t(".title", site_name: site_name)
|
||||
= bootstrap_form_tag(url: members_path, method: :get, layout: :inline) do |f|
|
||||
= f.select "sort",
|
||||
options_for_select({ "alphabetically": 'alpha', "recently joined": "recently_joined" },
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
= tag("meta", property: "og:title", content: @member.login_name)
|
||||
= tag("meta", property: "og:type", content: "profile")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :member_rss_login_name, @member.login_name
|
||||
- content_for :member_rss_slug, @member.slug
|
||||
@@ -28,7 +28,7 @@
|
||||
%a{href: "#content"}
|
||||
Skip to main content
|
||||
- if @member.bio.blank?
|
||||
- if member_signed_in? && current_member == @member
|
||||
- if can? :edit, @member
|
||||
= link_to "Add a bio to complete your profile.", edit_member_registration_path
|
||||
- else
|
||||
#{@member.login_name} hasn't written a bio yet.
|
||||
@@ -83,14 +83,14 @@
|
||||
.row
|
||||
%section.order-3.order-md-1.col-12= render "map", member: @member
|
||||
- if @harvesting.size.positive?
|
||||
%section.harvests.order-2.order-md-1.col-12#harvests
|
||||
%section.harvests.order-2.order-md-1.col-12
|
||||
%h2 Ready to harvest
|
||||
.index-cards
|
||||
- @harvesting.each do |planting|
|
||||
= render 'plantings/thumbnail', planting: planting
|
||||
|
||||
- if @others.size.positive?
|
||||
%section.planting-progress.order-2.order-md-1.col-12#planting-progress
|
||||
%section.planting-progress.order-2.order-md-1.col-12
|
||||
%h2 Progress report
|
||||
%p Still growing and not ready for harvesting.
|
||||
.list-group
|
||||
@@ -99,7 +99,7 @@
|
||||
%span= render 'plantings/tiny', planting: planting
|
||||
%span= render 'plantings/progress', planting: planting
|
||||
- if @late.size.positive?
|
||||
%section.late.order-2.order-md-1.col-12#late
|
||||
%section.late.order-2.order-md-1.col-12
|
||||
%h2 Late
|
||||
%p
|
||||
These plantings are at the end of their lifecycle.
|
||||
@@ -109,7 +109,7 @@
|
||||
- @late.each do |planting|
|
||||
= render 'plantings/thumbnail', planting: planting
|
||||
- if @super_late.any?
|
||||
%section.superlate.order-2.order-md-1.col-12#superlate
|
||||
%section.superlate.order-2.order-md-1.col-12
|
||||
%h2 Super late
|
||||
%p
|
||||
We suspect the following plantings finished long ago and no longer need tracking.
|
||||
@@ -122,14 +122,14 @@
|
||||
planted on #{planting.planted_at.to_date}
|
||||
|
||||
- if @harvests.any?
|
||||
%section.havests.order-2.order-md-1.col-12#recent-harvests
|
||||
%section.havests.order-2.order-md-1.col-12
|
||||
%h2 Recent Harvests
|
||||
.index-cards
|
||||
- @harvests.each do |harvest|
|
||||
= render 'harvests/thumbnail', harvest: harvest
|
||||
|
||||
- if @activity.any?
|
||||
%section.activity.order-2.order-md-1.col-12#activity
|
||||
%section.activity.order-2.order-md-1.col-12
|
||||
%h2 Activity
|
||||
.list-group
|
||||
- @activity.each do |event|
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title #{@member.login_name}'s recent posts (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
%title #{@member.login_name}'s recent posts (#{site_name})
|
||||
%link= member_url(@member)
|
||||
- @member.posts.each do |post|
|
||||
%item
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%p
|
||||
The #{ENV['GROWSTUFF_SITE_NAME']} team.
|
||||
The #{site_name} team.
|
||||
%br/
|
||||
= link_to root_url, root_url
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
%p
|
||||
= @request.requester.login_name
|
||||
has requested a new crop on
|
||||
= ENV['GROWSTUFF_SITE_NAME']
|
||||
= site_name
|
||||
|
||||
%ul
|
||||
%li Name: #{@request.name}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
= tag("meta", property: "og:image:user_generated", content: "true")
|
||||
= tag("meta", property: "og:type", content: "website")
|
||||
= tag("meta", property: "og:url", content: request.original_url)
|
||||
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
|
||||
= tag("meta", property: "og:site_name", content: site_name)
|
||||
|
||||
- content_for :breadcrumbs do
|
||||
%li.breadcrumb-item= link_to 'Photos', photos_path
|
||||
|
||||
@@ -89,9 +89,3 @@
|
||||
- if planting.finished_at.present?
|
||||
%span.plantingfact--finish
|
||||
= planting.finished_at.year
|
||||
- if planting.overall_rating.present?
|
||||
.card.fact-card
|
||||
.card-body
|
||||
%h3 Overall Rating
|
||||
%p.card-text
|
||||
%strong= "#{planting.overall_rating}/5"
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
.row
|
||||
.col-md-8
|
||||
= f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active.order_by_name,
|
||||
= f.collection_radio_buttons(:garden_id, @planting.owner.gardens.active,
|
||||
:id, :name, required: true,
|
||||
label: 'Where did you plant it?')
|
||||
= link_to "Add a garden.", new_garden_path
|
||||
@@ -43,15 +43,6 @@
|
||||
= f.select(:sunniness, Planting::SUNNINESS_VALUES, { include_blank: '', label: 'Sun or shade?' } )
|
||||
.col-md-4
|
||||
= f.number_field :quantity, label: 'How many?', min: 1
|
||||
.col-md-12
|
||||
= f.range_field :overall_rating, min: 1, max: 5, include_blank: 'Leave blank', label: 'Overall Rating', list: "rating-list", title: "How well is the planting going?"
|
||||
%datalist{"id": "rating-list"}
|
||||
%option{"value": "1"} Poor
|
||||
%option{"value": "2"}
|
||||
%option{"value": "3"}
|
||||
%option{"value": "4"}
|
||||
%option{"value": "5"} Great
|
||||
|
||||
= f.text_area :description, rows: 6, label: 'Tell us more about it'
|
||||
|
||||
.row
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
%p Which garden is the planting in?
|
||||
|
||||
%ul.list-group
|
||||
- planting.owner.gardens.active.order_by_name.each do |garden|
|
||||
- planting.owner.gardens.active.order(:name).each do |garden|
|
||||
%li.list-group-item
|
||||
= link_to plantings_path(planting: {crop_id: planting.crop_id, garden_id: garden.id}), method: :post do
|
||||
.md-v-line
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
%rss{ version: 2.0 }
|
||||
%channel
|
||||
%title
|
||||
Recent plantings from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
|
||||
Recent plantings from #{@owner ? @owner : 'all members'} (#{site_name})
|
||||
%link= plantings_url
|
||||
- @plantings.each do |planting|
|
||||
%item
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user