Compare commits

..

57 Commits

Author SHA1 Message Date
Brenda Wallace
952224b2e1 Merge branch 'master' into dev 2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca Merge pull request #1605 from Br3nda/feature/ownable
Adding counter caches and ownable concern
2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd Merge branch 'dev' into feature/ownable 2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb Merge pull request #1606 from Br3nda/fix/dependents
Set the behaviour of dependent models when crops are deleted from the database:

 - plantings, seeds and harvests are deleted
 - child crops are orphaned.
2018-04-02 15:52:10 +01:00
pozorvlak
c3b694ea7d Merge branch 'dev' into fix/dependents 2018-04-02 15:39:16 +01:00
pozorvlak
a3e2b892d1 Merge pull request #1596 from Br3nda/fix/coverage
Adding codeclimate coverage
2018-04-02 15:36:48 +01:00
pozorvlak
d0f6d63d36 Merge branch 'dev' into fix/dependents 2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7 Merge branch 'dev' into fix/coverage 2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4 Merge pull request #1602 from Br3nda/fix/ordering
Fix ordering of recent plantings on crops#show
2018-04-02 15:21:29 +01:00
pozorvlak
a7cfecf82c Merge branch 'dev' into feature/ownable 2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef Merge branch 'dev' into fix/ordering 2018-04-02 14:43:40 +01:00
pozorvlak
2c090757cc Merge pull request #1601 from Br3nda/feature/fluid-layout
Feature/fluid layout
2018-04-02 14:40:44 +01:00
Brenda Wallace
106d187e67 Add dependent clauses on crop model 2018-04-02 10:29:10 +12:00
Brenda Wallace
8521047803 Merge branch 'dev' into feature/ownable 2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130 Merge branch 'dev' into fix/ordering 2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb Merge branch 'dev' into feature/fluid-layout 2018-04-02 10:22:03 +12:00
Brenda Wallace
2460f73673 Merge branch 'dev' into fix/coverage 2018-04-02 10:21:22 +12:00
Brenda Wallace
324dcfc821 Merge pull request #1598 from Growstuff/bundle-update-2018-03-22-131347
Bundle Update on 2018-03-22
2018-04-02 10:21:04 +12:00
Brenda Wallace
e3bb43477b Adding counter caches and ownable concern 2018-04-02 10:13:19 +12:00
Brenda Wallace
2d309b7645 Removing jasmine, we have no jasmine specs 2018-04-02 09:58:02 +12:00
Brenda Wallace
a59f7dd137 Merge branch 'dev' into fix/coverage 2018-04-02 09:50:11 +12:00
Brenda Wallace
1fb3c4e0f9 Regnerated and secured code climate key 2018-04-02 09:47:04 +12:00
Brenda Wallace
b64a294245 Removed duplicate margins in css 2018-04-01 18:45:35 +12:00
Brenda Wallace
31d2aa052a More bundle updates 2018-04-01 14:16:50 +12:00
Brenda Wallace
b7f78d5dc9 Fix ordering of recent plantings on crops#show 2018-04-01 13:05:23 +12:00
Brenda Wallace
f1afe1ca79 Expanding layout to use full screen 2018-04-01 12:44:59 +12:00
Brenda Wallace
e029ef17ab Merge remote-tracking branch 'upstream/dev' into dev 2018-04-01 09:21:37 +12:00
Brenda Wallace
d5c8b9ae27 Merge branch 'dev' into bundle-update-2018-03-22-131347 2018-03-31 18:15:25 +13:00
Brenda Wallace
f907ba9e4b Merge pull request #1599 from Growstuff/dev
Release 43
2018-03-30 16:14:06 +13:00
Brenda Wallace
25070f73d7 Merge pull request #1591 from Br3nda/feature/photos-helper
Use photos helpers to find photos
2018-03-26 18:14:32 +13:00
Brenda Wallace
2fe6012342 Merge branch 'dev' into feature/photos-helper 2018-03-23 15:03:01 +13:00
deppbot
61468b3587 Bundle Update on 2018-03-22 2018-03-22 13:13:48 +08:00
Brenda Wallace
58c4d82087 Merge pull request #1590 from Growstuff/dev
Release 42
2018-03-22 15:01:52 +13:00
deppbot
c80685bf0d Security Update on 2018-03-20 (#1597)
* Security Update on 2018-03-20

* Ordered gems, to please rubocop
2018-03-22 14:14:19 +13:00
Brenda Wallace
69018f2c5c Merge remote-tracking branch 'upstream/dev' into dev 2018-03-22 11:53:29 +13:00
Brenda Wallace
00ea96a73e Can't rename GROWSTUFF_ELASTICSEARCH 2018-03-20 11:35:01 +13:00
Brenda Wallace
a1e33ae36e Only set up database and assets in test run, not linter run 2018-03-20 11:13:11 +13:00
Brenda Wallace
7f24927dc9 Clean up errors on undefined shell vars 2018-03-20 11:06:37 +13:00
Brenda Wallace
a178d3d42a Fix ES install on travis 2018-03-19 18:02:26 +13:00
Brenda Wallace
6089198f5c fixed path to scripts 2018-03-19 17:52:25 +13:00
Brenda Wallace
715ff4d41d Merge branch 'dev' into fix/coverage 2018-03-19 17:47:01 +13:00
Brenda Wallace
5992c974c7 Adding codeclimate coverage 2018-03-19 17:08:04 +13:00
Brenda Wallace
511e89fa58 Merge branch 'dev' into feature/photos-helper 2018-03-19 13:39:02 +13:00
Daniel O'Connor
13d8a29773 Merge pull request #1592 from Br3nda/fix/layout
Layout fixes for mobile and smaller screens
2018-03-19 10:38:12 +10:30
Brenda Wallace
dc09a6ea91 Merge branch 'dev' into fix/layout 2018-03-16 14:55:03 +13:00
Brenda Wallace
f8e83cdb9c Merge branch 'dev' into feature/photos-helper 2018-03-16 14:54:53 +13:00
deppbot
64a8cfb59f Security Update on 2018-03-16 (#1593) 2018-03-16 14:54:36 +13:00
Brenda Wallace
2f81d6c78d Layout fixes for mobile and smaller screens 2018-03-15 23:01:51 +13:00
Brenda Wallace
ece7113c89 DRY photo helper spec 2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4 Specs for photos helper 2018-03-14 22:25:30 +13:00
Brenda Wallace
1bf1076076 Photos helper 2018-03-14 19:28:18 +13:00
Brenda Wallace
8906fd38ae For seeds, use planting photo if no seeds photo 2018-03-14 15:21:40 +13:00
Daniel O'Connor
d5be92ac8b Merge pull request #1588 from Br3nda/fix/photo-order-1547
Fix/photo order 1547
2018-03-13 00:22:35 +10:30
Brenda Wallace
40d71ae070 Merge branch 'dev' into fix/photo-order-1547 2018-03-12 11:41:12 +13:00
Brenda Wallace
2f45041f8c Fixed ordering of photos on crops#show 2018-03-12 08:56:39 +13:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
2018-03-12 08:39:32 +13:00
Brenda Wallace
80203ad215 Merge pull request #1585 from Growstuff/dev
Release 41
2018-03-11 14:03:50 +13:00
109 changed files with 1207 additions and 1610 deletions

View File

@@ -7,47 +7,37 @@ cache:
- tmp/cache/assets/test/sprockets
env:
matrix:
- GROWSTUFF_ELASTICSEARCH='true' RSPEC_TAG=elasticsearch STATIC_CHECKS=false
- GROWSTUFF_ELASTICSEARCH='false' RSPEC_TAG=~elasticsearch STATIC_CHECKS=false
- GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true
- GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
- STATIC_CHECKS=true
global:
- GROWSTUFF_SITE_NAME="Growstuff (travis)"
- RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
- secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
before_install:
- ./script/install_phantomjs;
- ./script/install_phantomjs.sh
- export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
- ./script/install_codeclimate.sh
- ./script/install_linters.sh
# Force Travis to use Elastic Search 2.4.0
- >
if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
sudo dpkg -r elasticsearch;
curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb;
sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb;
sudo service elasticsearch start;
sleep 10;
curl localhost:9200;
fi
before_script:
- set -e
- >
if [ "${STATIC_CHECKS}" = "true" ]; then
./script/install_linters;
else
RAILS_ENV=test bundle exec rake db:create db:migrate;
bundle exec rake assets:precompile;
fi
- set +e
- ./script/install_elasticsearch.sh
script:
- set -e
- >
if [ "${STATIC_CHECKS}" = "true" ]; then
./script/check_static.rb
else
bundle exec rake db:migrate --trace;
set +e;
RAILS_ENV=test bundle exec rake db:create db:migrate;
bundle exec rake assets:precompile;
bundle exec rspec --tag $RSPEC_TAG spec/;
bundle exec rake jasmine:ci;
fi;
- set +e
after_script:
- >
if [ "${COVERAGE}" = "true" ]; then
./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT;
fi
before_deploy:
- bundle exec script/heroku_maintenance.rb on
deploy:
@@ -70,4 +60,5 @@ after_deploy:
- bundle exec script/heroku_maintenance.rb off
addons:
code_climate:
repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6
repo_token:
secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="

View File

@@ -137,7 +137,6 @@ group :development, :test do
gem 'haml-rails' # HTML templating language
gem 'haml_lint' # Checks haml files for goodness
gem 'i18n-tasks' # adds tests for finding missing and unused translations
gem 'jasmine' # javascript unit testing
gem 'poltergeist' # for headless JS testing
gem 'rainbow', '< 2.2.0' # See https://github.com/sickill/rainbow/issues/44
gem 'rspec-activemodel-mocks'
@@ -155,3 +154,5 @@ end
group :travis do
gem 'platform-api'
end
gem 'loofah', '>= 2.2.1'
gem 'rack-protection', '>= 2.0.1'

View File

@@ -26,8 +26,8 @@ GEM
addressable
active_median (0.1.4)
activerecord
active_utils (3.3.9)
activesupport (>= 3.2, < 5.2.0)
active_utils (3.3.11)
activesupport (>= 3.2, < 6.0)
i18n
activejob (4.2.10)
activesupport (= 4.2.10)
@@ -51,7 +51,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
ast (2.4.0)
autoprefixer-rails (7.2.5)
autoprefixer-rails (8.2.0)
execjs
bcrypt (3.1.11)
better_errors (2.2.0)
@@ -61,10 +61,8 @@ GEM
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bluecloth (2.2.0)
bonsai-elasticsearch-rails (0.2.0)
elasticsearch-model (~> 0)
elasticsearch-rails (~> 0)
bootstrap-datepicker-rails (1.7.1.1)
bonsai-elasticsearch-rails (0.0.4)
bootstrap-datepicker-rails (1.8.0.1)
railties (>= 3.0)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
@@ -74,12 +72,12 @@ GEM
sass (>= 3.3.4)
bootstrap_form (2.7.0)
builder (3.2.3)
bullet (5.7.2)
bullet (5.7.5)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
byebug (10.0.0)
byebug (10.0.2)
cancancan (2.1.3)
capybara (2.17.0)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
@@ -92,13 +90,11 @@ GEM
capybara-screenshot (1.0.18)
capybara (>= 1.0, < 3)
launchy
chartkick (2.2.5)
childprocess (0.8.0)
chartkick (2.3.3)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.2.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13)
codemirror-rails (5.16.0)
@@ -137,13 +133,13 @@ GEM
crass (1.0.3)
csv_shaper (1.3.0)
activesupport (>= 3.0.0)
dalli (2.7.6)
dalli (2.7.7)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.4.1)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
@@ -156,16 +152,16 @@ GEM
elasticsearch-transport (= 2.0.2)
elasticsearch-api (2.0.2)
multi_json
elasticsearch-model (0.1.9)
elasticsearch-model (5.0.0)
activesupport (> 3)
elasticsearch (> 0.4)
elasticsearch (> 1)
hashie
elasticsearch-rails (0.1.9)
elasticsearch-rails (5.0.2)
elasticsearch-transport (2.0.2)
faraday
multi_json
erubis (2.7.0)
excon (0.60.0)
excon (0.62.0)
execjs (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
@@ -176,16 +172,16 @@ GEM
i18n (>= 0.7)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.21)
ffi (1.9.23)
figaro (1.1.1)
thor (~> 0.14)
flickraw (0.9.9)
font-awesome-sass (4.7.0)
font-awesome-sass (5.0.9)
sass (>= 3.2)
formatador (0.2.5)
friendly_id (5.2.3)
activerecord (>= 4.0.0)
geocoder (1.4.5)
geocoder (1.4.7)
gibbon (1.2.1)
httparty
multi_json (>= 1.9.0)
@@ -241,9 +237,9 @@ GEM
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
httparty (0.15.6)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (0.9.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.12)
activesupport (>= 4.0.2)
@@ -255,12 +251,6 @@ GEM
parser (>= 2.2.3.0)
term-ansicolor (>= 1.3.2)
terminal-table (>= 1.5.1)
jasmine (2.9.0)
jasmine-core (>= 2.9.0, < 3.0.0)
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (2.99.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
@@ -300,10 +290,10 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.12)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
memcachier (0.0.2)
@@ -320,7 +310,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0)
newrelic_rpm (4.8.0.341)
newrelic_rpm (5.0.0.342)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
@@ -351,17 +341,16 @@ GEM
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.5.0)
paperclip (5.2.1)
paperclip (6.0.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
terrapin (~> 0.6.0)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
parser (2.5.0.5)
ast (~> 2.4.0)
pg (0.21.0)
phantomjs (2.1.1.0)
platform-api (2.1.0)
heroics (~> 0.0.23)
moneta (~> 0.8.1)
@@ -375,11 +364,11 @@ GEM
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
public_suffix (3.0.2)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
rack-protection (2.0.0)
rack (1.6.9)
rack-protection (2.0.1)
rack
rack-test (0.6.3)
rack (>= 1.0)
@@ -403,8 +392,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
@@ -420,8 +409,8 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.19.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redis (4.0.1)
@@ -461,12 +450,12 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
ruby-units (2.2.1)
ruby-units (2.3.0)
ruby_dep (1.5.0)
ruby_parser (3.10.1)
ruby_parser (3.11.0)
sexp_processor (~> 4.9)
rubyzip (1.2.1)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -477,16 +466,16 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.9.0)
selenium-webdriver (3.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
sexp_processor (4.10.0)
sexp_processor (4.10.1)
shellany (0.0.1)
sidekiq (5.1.0)
sidekiq (5.1.2)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.4, < 5)
redis (>= 3.3.5, < 5)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
@@ -507,6 +496,8 @@ GEM
tins (~> 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (0.19.4)
thread (0.2.2)
thread_safe (0.3.6)
@@ -516,7 +507,7 @@ GEM
trollop (1.16.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.5)
uglifier (4.1.8)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0)
unicorn (5.4.0)
@@ -587,7 +578,6 @@ DEPENDENCIES
haml_lint
hashie (>= 3.5.3)
i18n-tasks
jasmine
jquery-rails
jquery-ui-rails (~> 5.0.2)
js-routes
@@ -595,6 +585,7 @@ DEPENDENCIES
kaminari
leaflet-rails
letter_opener
loofah (>= 2.2.1)
memcachier
newrelic_rpm
omniauth (~> 1.3)
@@ -606,6 +597,7 @@ DEPENDENCIES
poltergeist
pry
quiet_assets
rack-protection (>= 2.0.1)
rails (~> 4.2.8)
rails-assets-leaflet.markercluster!
rails_12factor

View File

@@ -0,0 +1,39 @@
jQuery ->
$('#add-sci_name-row').css("display", "inline-block")
$('#remove-sci_name-row').css("display", "inline-block")
$("#add-alt_name-row").css("display", "inline-block")
$("#remove-alt_name-row").css("display", "inline-block")
-$ ->
sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
sci_index = $('#scientific_names .template').length + 1
$('#add-sci_name-row').click ->
compiled_input = $(sci_template.split("INDEX").join(sci_index))
$('#scientific_names').append(compiled_input)
sci_index = sci_index + 1
$('#remove-sci_name-row').click ->
if (sci_index > 2)
sci_index = sci_index - 1
tmp = 'sci_template[' + sci_index + ']'
element = document.getElementById(tmp)
element.remove()
alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
alt_index = $('#alternate_names .template').length + 1
$('#add-alt_name-row').click ->
compiled_input = $(alt_template.split("INDEX").join(alt_index))
$('#alternate_names').append(compiled_input)
alt_index = alt_index + 1
$('#remove-alt_name-row').click ->
if (alt_index > 2)
alt_index = alt_index - 1
tmp = 'alt_template[' + alt_index + ']'
element = document.getElementById(tmp)
console.log("%s",tmp)
element.remove()

View File

@@ -0,0 +1,19 @@
# Clears the finished at date field when
# a seed is marked unfinished, and
# repopulates the field with a cached value
# marking unfinished is undone.
jQuery ->
previousValue = ''
$('#seed_finished').on('click', ->
finished = $('#seed_finished_at')
if @checked
if previousValue.length
date = previousValue
finished.val(date)
else
finished.trigger('focus')
else
previousValue = finished.val()
finished.val('')
)

View File

@@ -4,41 +4,3 @@
jQuery ->
$('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
$('#add-sci_name-row').css("display", "inline-block")
$('#remove-sci_name-row').css("display", "inline-block")
$("#add-alt_name-row").css("display", "inline-block")
$("#remove-alt_name-row").css("display", "inline-block")
$ ->
sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
sci_index = $('#scientific_names .template').length + 1
$('#add-sci_name-row').click ->
compiled_input = $(sci_template.split("INDEX").join(sci_index))
$('#scientific_names').append(compiled_input)
sci_index = sci_index + 1
$('#remove-sci_name-row').click ->
if (sci_index > 2)
sci_index = sci_index - 1
tmp = 'sci_template[' + sci_index + ']'
element = document.getElementById(tmp)
element.remove()
alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
alt_index = $('#alternate_names .template').length + 1
$('#add-alt_name-row').click ->
compiled_input = $(alt_template.split("INDEX").join(alt_index))
$('#alternate_names').append(compiled_input)
alt_index = alt_index + 1
$('#remove-alt_name-row').click ->
if (alt_index > 2)
alt_index = alt_index - 1
tmp = 'alt_template[' + alt_index + ']'
element = document.getElementById(tmp)
console.log("%s",tmp)
element.remove()

View File

@@ -94,21 +94,6 @@ p.stats
dd
margin-left: auto
@media (min-width: $screen-md-min)
.planting-thumbnail
dl.planting-attributes
width: 100%
dt
text-align: left
width: 120px
dd
padding-left: 120px
margin-left: auto
.navbar .navbar-form
width: 250px
#placesmap, #cropmap
height: 500px
@@ -161,6 +146,7 @@ p.stats
border: none
text-align: center
margin-bottom: 1.5em
max-width: 160px
.member-thumbnail
text-align: left
@@ -236,6 +222,7 @@ footer
#maincontainer
min-height: 80%
padding: 50px
html, body
height: 100%
@@ -254,24 +241,6 @@ html, body
a
font-weight: 800
// Overrides applying only to mobile view. This must be at the end of the overrides file.
@media only screen and (max-width: 767px)
.sidebar
margin-left: 0
border-left: none
padding-left: 0
#map
height: 300px
.navbar .nav > li
display: block
.navbar .navbar-form
width: 185px
padding-left: 0
padding-right: 0
/* override "info" alert boxes to be green, not blue, on Growstuff */
$state-info-text: darken($green, 10%)
@@ -326,3 +295,47 @@ ul.thumbnail-buttons
.hover-wrapper:hover .text
visibility: visible
.homepage-listing
padding-bottom: 6px
@media (min-width: $screen-md-min)
.planting-thumbnail
dl.planting-attributes
width: 100%
dt
text-align: left
width: 120px
dd
padding-left: 120px
margin-left: auto
.navbar .navbar-form
width: 250px
// Overrides applying only to mobile view. This must be at the end of the overrides file.
@media only screen and (max-width: 767px)
.sidebar
margin-left: 0
border-left: none
padding-left: 0
#map
height: 300px
.navbar .nav > li
display: block
.navbar .navbar-form
width: 185px
padding-left: 0
padding-right: 0
.homepage
.thumbnail
height: 180px
.seed-thumbnail
height: 220px
#maincontainer
padding: 10px

View File

@@ -37,6 +37,7 @@ class PlantingsController < ApplicationController
def new
@planting = Planting.new(planted_at: Time.zone.today)
@seed = Seed.find_by(slug: params[:seed_id]) if params[:seed_id]
# using find_by_id here because it returns nil, unlike find
@crop = Crop.approved.find_by(id: params[:crop_id]) || Crop.new
@@ -54,6 +55,7 @@ class PlantingsController < ApplicationController
def create
@planting = Planting.new(planting_params)
@planting.owner = current_member
@planting.crop = @planting.parent_seed.crop if @planting.parent_seed.present?
@planting.save!
respond_with @planting
end
@@ -82,6 +84,7 @@ class PlantingsController < ApplicationController
params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
params.require(:planting).permit(
:crop_id, :description, :garden_id, :planted_at,
:parent_seed_id,
:quantity, :sunniness, :planted_from, :finished,
:finished_at
)

View File

@@ -16,44 +16,37 @@ class SeedsController < ApplicationController
respond_with(@seeds)
end
# GET /seeds/1
# GET /seeds/1.json
def show
@photos = @seed.photos.includes(:owner).order(created_at: :desc).paginate(page: params[:page])
respond_with(@seed)
end
# GET /seeds/new
# GET /seeds/new.json
def new
@seed = Seed.new
# using find_by_id here because it returns nil, unlike find
@crop = Crop.find_or_initialize_by(id: params[:crop_id])
if params[:planting_id]
@planting = Planting.find_by(slug: params[:planting_id])
else
@crop = Crop.find_or_initialize_by(id: params[:crop_id])
end
respond_with(@seed)
end
# GET /seeds/1/edit
def edit; end
# POST /seeds
# POST /seeds.json
def create
@seed = Seed.new(seed_params)
@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
respond_with(@seed)
end
# PUT /seeds/1
# PUT /seeds/1.json
def update
flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
respond_with(@seed)
end
# DELETE /seeds/1
# DELETE /seeds/1.json
def destroy
@seed.destroy
respond_with(@seed)
@@ -64,8 +57,11 @@ class SeedsController < ApplicationController
def seed_params
params.require(:seed).permit(
:crop_id, :description, :quantity, :plant_before,
:days_until_maturity_min, :days_until_maturity_max, :organic, :gmo,
:heirloom, :tradable_to, :slug
:parent_planting_id,
:days_until_maturity_min, :days_until_maturity_max,
:organic, :gmo,
:heirloom, :tradable_to, :slug,
:finished, :finished_at
)
end

View File

@@ -28,7 +28,12 @@ module HarvestsHelper
end
def display_harvest_description(harvest)
return "No description provided." if harvest.description.nil?
harvest.description
if harvest.description.nil?
"no description provided."
else
truncate(harvest.description, length: 50, separator: ' ', omission: '... ') do
link_to "Read more", harvest_path(harvest)
end
end
end
end

View File

@@ -0,0 +1,51 @@
module PhotosHelper
def crop_image_path(crop)
if crop.default_photo.present?
crop.default_photo.thumbnail_url
else
placeholder_image
end
end
def garden_image_path(garden)
if garden.default_photo.present?
garden.default_photo.thumbnail_url
else
placeholder_image
end
end
def planting_image_path(planting)
if planting.photos.present?
planting.photos.first.thumbnail_url
else
placeholder_image
end
end
def harvest_image_path(harvest)
if harvest.photos.present?
harvest.photos.first.thumbnail_url
elsif harvest.planting.present? && harvest.planting.photos.present?
harvest.planting.photos.first.thumbnail_url
else
placeholder_image
end
end
def seed_image_path(seed)
if seed.default_photo.present?
seed.default_photo.thumbnail_url
elsif seed.crop.default_photo.present?
seed.crop.default_photo.thumbnail_url
else
placeholder_image
end
end
private
def placeholder_image
'placeholder_150.png'
end
end

View File

@@ -111,9 +111,12 @@ class Ability
can :update, Photo, owner_id: member.id
can :destroy, Photo, owner_id: member.id
can :create, Seed
can :update, Seed, owner_id: member.id
can :create, Seed
can :update, Seed, owner_id: member.id
can :destroy, Seed, owner_id: member.id
can :create, Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
can :update, Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
can :destroy, Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
# following/unfollowing permissions
can :create, Follow

View File

@@ -0,0 +1,12 @@
module Finishable
extend ActiveSupport::Concern
included do
scope :finished, -> { where(finished: true) }
scope :current, -> { where.not(finished: true) }
def active?
!finished
end
end
end

View File

@@ -0,0 +1,7 @@
module Ownable
extend ActiveSupport::Concern
included do
belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
end
end

View File

@@ -11,28 +11,26 @@ class Crop < ActiveRecord::Base
has_many :scientific_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
has_many :alternate_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
has_many :plantings
has_many :plantings, dependent: :destroy
has_many :seeds, dependent: :destroy
has_many :harvests, dependent: :destroy
has_many :photos, through: :plantings
has_many :seeds
has_many :harvests
has_many :plant_parts, -> { uniq.reorder("plant_parts.name") }, through: :harvests
belongs_to :creator, class_name: 'Member'
belongs_to :requester, class_name: 'Member'
belongs_to :parent, class_name: 'Crop'
has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify
has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
##
## Scopes
scope :recent, -> { approved.order(created_at: :desc) }
scope :toplevel, -> { approved.where(parent_id: nil) }
scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") }
# ok on sqlite and psql, but not on mysql
scope :randomized, -> { approved.reorder('random()') }
scope :popular, -> { approved.order("plantings_count desc, lower(name) asc") }
scope :pending_approval, -> { where(approval_status: "pending") }
scope :approved, -> { where(approval_status: "approved") }
scope :rejected, -> { where(approval_status: "rejected") }
scope :interesting, -> { approved.has_photos.randomized }
scope :interesting, -> { approved.has_photos }
scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
##
@@ -120,12 +118,7 @@ class Crop < ActiveRecord::Base
# later we can choose a default photo based on different criteria,
# eg. popularity
def default_photo
# most recent photo
return photos.order(created_at: :desc).first if photos.any?
# Crop has no photos? Look for the most recent harvest with a photo.
harvest_with_photo = Harvest.where(crop_id: id).joins(:photos).order('harvests.id DESC').limit(1).first
harvest_with_photo.photos.first if harvest_with_photo
first_photo(:plantings) || first_photo(:harvests) || first_photo(:seeds)
end
# returns hash indicating whether this crop is grown in
@@ -242,4 +235,8 @@ class Crop < ActiveRecord::Base
return unless reason_for_rejection == "other" && rejection_notes.blank?
errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
end
def first_photo(type)
Photo.joins(type).where("#{type}": { crop_id: id }).order("photos.created_at DESC").first
end
end

View File

@@ -1,10 +1,10 @@
class Forum < ActiveRecord::Base
extend FriendlyId
include Ownable
validates :name, presence: true
friendly_id :name, use: %i(slugged finders)
has_many :posts
belongs_to :owner, class_name: "Member"
def to_s
name

View File

@@ -2,9 +2,9 @@ class Garden < ActiveRecord::Base
extend FriendlyId
include Geocodable
include PhotoCapable
include Ownable
friendly_id :garden_slug, use: %i(slugged finders)
belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
has_many :plantings, dependent: :destroy
has_many :crops, through: :plantings

View File

@@ -2,6 +2,7 @@ class Harvest < ActiveRecord::Base
include ActionView::Helpers::NumberHelper
extend FriendlyId
include PhotoCapable
include Ownable
friendly_id :harvest_slug, use: %i(slugged finders)
@@ -33,13 +34,19 @@ class Harvest < ActiveRecord::Base
##
## Relationships
belongs_to :crop
belongs_to :owner, class_name: 'Member', counter_cache: true
belongs_to :plant_part
belongs_to :planting
##
## Scopes
default_scope { joins(:owner) } # Ensures owner exists
scope :interesting, -> { has_photos.one_per_owner }
scope :recent, -> { order(created_at: :desc) }
scope :one_per_owner, lambda {
joins("JOIN members m ON (m.id=harvests.owner_id)
LEFT OUTER JOIN harvests h2
ON (m.id=h2.owner_id AND harvests.id < h2.id)").where("h2 IS NULL")
}
##
## Validations

View File

@@ -1,5 +1,5 @@
class Photo < ActiveRecord::Base
belongs_to :owner, class_name: 'Member'
include Ownable
PHOTO_CAPABLE = %w(Garden Planting Harvest Seed).freeze

View File

@@ -1,6 +1,8 @@
class Planting < ActiveRecord::Base
extend FriendlyId
include PhotoCapable
include Finishable
include Ownable
friendly_id :planting_slug, use: %i(slugged finders)
# Constants
@@ -16,15 +18,18 @@ class Planting < ActiveRecord::Base
before_save :calculate_lifespan
belongs_to :garden
belongs_to :owner, class_name: 'Member', counter_cache: true
belongs_to :crop, counter_cache: true
has_many :harvests, dependent: :destroy
#
# Ancestry of food
belongs_to :parent_seed, class_name: 'Seed', foreign_key: 'parent_seed_id' # parent
has_many :child_seeds, class_name: 'Seed',
foreign_key: 'parent_planting_id', dependent: :nullify # children
##
## Scopes
default_scope { joins(:owner) } # Ensures the owner still exists
scope :finished, -> { where(finished: true) }
scope :current, -> { where(finished: false) }
scope :interesting, -> { has_photos.one_per_owner }
scope :recent, -> { order(created_at: :desc) }
scope :one_per_owner, lambda {

View File

@@ -1,6 +1,8 @@
class Seed < ActiveRecord::Base
extend FriendlyId
include PhotoCapable
include Finishable
include Ownable
friendly_id :seed_slug, use: %i(slugged finders)
TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
@@ -11,7 +13,9 @@ class Seed < ActiveRecord::Base
#
# Relationships
belongs_to :crop
belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
belongs_to :parent_planting, class_name: 'Planting', foreign_key: 'parent_planting_id' # parent
has_many :child_plantings, class_name: 'Planting',
foreign_key: 'parent_seed_id', dependent: :nullify # children
#
# Validations

View File

@@ -11,5 +11,5 @@
%th
- @members.each do |member|
%tr
%td= ember.login_name
%td= member.login_name
%td= member.email

View File

@@ -0,0 +1,8 @@
- if can? :create, Planting
= link_to "Plant this", new_planting_path(crop_id: crop.id), class: 'btn btn-default'
- if can? :create, Harvest
= link_to "Harvest this", new_harvest_path(crop_id: crop.id), class: 'btn btn-default'
- if can? :create, Seed
= link_to 'Add seeds to stash', new_seed_path(params: { crop_id: crop.id }), class: 'btn btn-default'

View File

@@ -1,5 +1,5 @@
- cache crop do
= link_to image_tag(crop.default_photo.present? ? crop.default_photo.thumbnail_url : 'placeholder_150.png',
= link_to image_tag(crop_image_path(crop),
alt: crop.name, class: 'image-responsive crop-image'),
crop.name,
rel: "popover",

View File

@@ -1,7 +1,7 @@
.well
.row
.col-md-4
= link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(crop_image_path(crop),
alt: '',
class: 'img crop-image'),
crop

View File

@@ -8,7 +8,7 @@
- unless crop.photos.empty?
%h3 Photos of #{crop.name} plants
.row
- crop.photos.first(6).each do |p|
- crop.photos.order(date_taken: :desc).first(6).each do |p|
.col-xs-6.col-md-2
= render "photos/thumbnail", photo: p
.row

View File

@@ -4,9 +4,9 @@
Nobody has planted this crop yet.
- else
%ul
- crop.plantings.take(3).each do |planting|
- crop.plantings.order(planted_at: :desc).limit(3).each do |planting|
%li
= link_to display_planting(planting), planting_path(planting)
= link_to planting, planting_path(planting)
= render partial: 'members/location', locals: { member: planting.owner }
%small
= distance_of_time_in_words(planting.created_at, Time.zone.now)
@@ -18,4 +18,3 @@
%p= link_to "Plant #{crop.name}", new_planting_path(crop_id: crop.id)
- else
= render partial: 'shared/signin_signup', locals: { to: "track your #{crop.name} plantings" }

View File

@@ -1,8 +1,8 @@
.thumbnail
.crop-thumbnail
- if crop
- cache cache_key_for(Crop, crop.id) do
= link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
- cache cache_key_for(Crop, crop.id) do
.thumbnail
.crop-thumbnail
- if crop
= link_to image_tag(crop_image_path(crop),
alt: crop.name, class: 'img'),
crop
.cropinfo

View File

@@ -15,14 +15,7 @@
- if @crop.approved?
- content_for :buttonbar do
- if can? :create, Planting
= link_to "Plant this", new_planting_path(crop_id: @crop.id), class: 'btn btn-default'
- if can? :create, Harvest
= link_to "Harvest this", new_harvest_path(crop_id: @crop.id), class: 'btn btn-default'
- if can? :create, Seed
= link_to 'Add seeds to stash', new_seed_path(params: { crop_id: @crop.id }), class: 'btn btn-default'
= render 'crops/actions', crop: @crop
.row
.col-md-9

View File

@@ -1,28 +1,29 @@
- if can?(:edit, garden) || can?(:delete, garden)
- if can? :edit, garden
- if garden.active
= link_to new_planting_path(garden_id: garden.id), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-grain{ title: "Plant" }
Plant something
= link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
method: :put, class: 'btn btn-default',
data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
- else
= link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
method: :put,
class: 'btn btn-default'
= link_to edit_garden_path(garden), class: 'btn btn-default', id: 'edit_garden_link' do
%span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
Edit
.garden-actions
- if can?(:edit, garden)
.btn-group
- if garden.active
= link_to new_planting_path(garden_id: garden.id), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-grain{ title: "Plant" }
Plant something
= link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
method: :put, class: 'btn btn-default btn-xs',
data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
- else
= link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
method: :put
= render 'shared/buttons/edit', path: edit_garden_path(garden)
- if can?(:edit, garden) && can?(:create, Photo)
= link_to new_photo_path(type: "garden", id: garden.id),
class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo
- if can?(:destroy, garden)
= link_to garden,
method: :delete,
data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
class: 'btn btn-default', id: 'delete_garden_link' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
Delete
- if can?(:edit, garden) && can?(:create, Photo)
= link_to new_photo_path(type: "garden", id: garden.id),
class: 'btn btn-primary' do
%span.glyphicon.glyphicon-camera{ title: "Add Photo" }
Add Photo
.pull-right
= link_to garden_path(garden),
method: :delete,
data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
class: 'btn btn-default btn-xs', id: 'delete_garden_link' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
Delete

View File

@@ -4,12 +4,7 @@
= link_to "Everyone's gardens", gardens_path, class: 'btn btn-default'
= link_to gardens_active_tickbox_path(@owner, show_all) do
= check_box_tag 'active', 'all', show_all
include in-active
- if can?(:create, Garden)
= link_to 'Add a garden', new_garden_path, class: 'btn btn-primary'
- unless current_member
= render partial: 'shared/signin_signup', locals: { to: 'add a new garden' }
- if can?(:create, Garden)
= link_to 'Add a garden', new_garden_path, class: 'btn btn-default'
- unless current_member
= render 'shared/signin_signup', to: 'add a new garden'

View File

@@ -1,9 +1,7 @@
.panel.panel-success
.panel-heading
%h3.panel-title
= link_to garden.name, garden_path(garden)
.panel-body
.row
.col-md-2.col-xs-12.garden-info
@@ -11,15 +9,17 @@
.col-md-12.col-xs-6
= render 'gardens/photo', garden: garden
.col-md-12.col-xs-6
= render 'gardens/actions', garden: garden
= display_garden_description(garden)
.col-md-10
.row
- if garden.plantings.current.size.positive?
- garden.plantings.current.includes(:crop).each do |planting|
.col-md-2.col-sm-6.col-xs-6
.hover-wrapper
.text= render 'plantings/actions', planting: planting
.text
= render 'plantings/actions', planting: planting
= render partial: "plantings/thumbnail", locals: { planting: planting }
- else
no plantings
-# .panel-footer
.col-md-2.col-sm-6.col-xs-6 no plantings
- if can?(:edit, garden)
.panel-footer= render 'gardens/actions', garden: garden

View File

@@ -1,3 +1,3 @@
= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(garden_image_path(garden),
alt: garden.name, class: 'img-responsive'),
garden_path(garden)

View File

@@ -8,7 +8,7 @@
.panel-body{ id: "gardens_panel_body" }
.row
.col-md-4
= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(garden_image_path(garden),
alt: garden.name, class: 'img'),
garden_path(garden)
.col-md-8

View File

@@ -1,6 +1,10 @@
- content_for :title, @owner ? "#{@owner}'s gardens" : "Everyone's gardens"
= render 'nav', owner: @owner, show_all: @show_all
= render 'nav'
= link_to gardens_active_tickbox_path(@owner, @show_all) do
= check_box_tag 'active', 'all', @show_all
include in-active
.pagination
= page_entries_info @gardens

View File

@@ -16,7 +16,8 @@
.row
.col-md-9
%p.btn-group= render 'gardens/actions', garden: @garden
= render 'gardens/actions', garden: @garden
- unless @garden.active
.alert.alert-warning
@@ -26,20 +27,21 @@
to plant something in this garden.
%div
:growstuff_markdown
#{strip_tags @garden.description}
- unless @garden.description
.row-fluid
%p No description available yet.
%p
:growstuff_markdown
#{strip_tags @garden.description}
- unless @garden.description
.row-fluid
%p No description available yet.
- if can? :edit, @garden
%p
Why not
= link_to 'tell us more.', edit_garden_path(@garden)
- if can? :edit, @garden
%p
Why not
= link_to 'tell us more.', edit_garden_path(@garden)
%h3 Garden timeline
.row
= timeline garden_timeline_path(@garden), adapter: "google"
.col-md-12= timeline garden_timeline_path(@garden), adapter: "google"
%h3 Current plantings in garden
.row

View File

@@ -0,0 +1,6 @@
- if can?(:edit, harvest) || can?(:destroy, harvest)
.btn-group.harvest-actions
- if can? :edit, harvest
= render 'shared/buttons/edit', path: edit_harvest_path(harvest)
- if can? :destroy, harvest
.pull-right= render 'shared/buttons/delete', path: harvest_path(harvest)

View File

@@ -8,7 +8,7 @@
.panel-body
.row
.col-md-4
= link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(harvest_image_path(harvest),
alt: harvest.crop.name, class: 'img'),
harvest
.col-md-8
@@ -21,9 +21,11 @@
%dd= display_quantity(harvest)
%dt Harvest date :
%dd= harvest.harvested_at
.panel-footer
%dt Description
%dd.truncate
= display_harvest_description(harvest)
= if harvest.description.present?
- link_to "Read more", harvest_path(harvest)
%dd Notes:
%dt=display_harvest_description(harvest)
- if harvest.planting.present?
%dt Harvested from
%dd= link_to(harvest.planting, planting_path(harvest.planting))
.row
.col-md-12
= render 'harvests/actions', harvest: harvest

View File

@@ -0,0 +1,9 @@
= link_to image_tag(harvest_image_path(harvest),
alt: harvest.to_s,
class: 'image-responsive crop-image'),
harvest,
rel: "popover",
'data-trigger': 'hover',
'data-title': harvest.to_s,
'data-content': render('harvests/popover', harvest: harvest),
'data-html': true

View File

@@ -0,0 +1,10 @@
- harvests.each do |h|
- cache h do
.row
.col-lg-6.col-md-3.col-xs-4.homepage-listing
= render 'harvests/image_with_popover', harvest: h
.col-lg-3.col-md-9.col-xs-4
= link_to h.crop, crop_path(h.crop)
%br/
%small
%i= h.owner.location

View File

@@ -0,0 +1,3 @@
%p
%small
= harvest.harvested_at

View File

@@ -1,9 +1,10 @@
.thumbnail
.harvest-thumbnail
- if harvest
= link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(harvest_image_path(harvest),
alt: harvest.crop.name, class: 'img'),
harvest
.harvestinfo
.harvest-name
= link_to harvest, harvest
= I18n.l(harvest.harvested_at.to_date)

View File

@@ -32,13 +32,7 @@
%b Quantity:
= display_quantity(@harvest)
- if can?(:edit, @harvest) || can?(:destroy, @harvest)
%p
- if can? :edit, @harvest
= link_to 'Edit', edit_harvest_path(@harvest), class: 'btn btn-default btn-xs'
- if can? :destroy, @harvest
= link_to 'Delete', @harvest, method: :delete, data: { confirm: 'Are you sure?' },
class: 'btn btn-default btn-xs'
= render 'harvests/actions', harvest: @harvest
.col-md-6
= render partial: "crops/index_card", locals: { crop: @harvest.crop }

View File

@@ -1,16 +1,13 @@
.col-md-12
%h1= ENV['GROWSTUFF_SITE_NAME']
.row
.col-md-8.info
%p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
= render partial: 'stats'
.col-md-4.signup
%p= t('.perks')
%p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg')
%p
%small
= t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path))
.container
.row
.col-md-12
%h1= ENV['GROWSTUFF_SITE_NAME']
.col-md-8.info
%p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
= render partial: 'stats'
.col-md-4.signup
%p= t('.perks')
%p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg')
%p
%small
= t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path))

View File

@@ -1,28 +1,6 @@
.row
.col-md-8
- cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do
%h2= t('.our_crops')
.hidden-xs
- Crop.interesting.includes(:scientific_names, :photos).first(8).each do |c|
.col-md-3
= render partial: 'crops/thumbnail', locals: { crop: c }
.visible-xs
- Crop.interesting.includes(:scientific_names, :photos).first(3).each do |c|
.col-md-3
= render partial: 'crops/thumbnail', locals: { crop: c }
.col-md-4.hidden-xs
- cache cache_key_for(Planting) do
%h2= t('.recently_planted')
= render 'plantings/list', plantings: Planting.includes(:owner, :photos).interesting.recent.first(6)
.row
.col-md-12
- cache cache_key_for(Crop, 'recent') do
%p{ style: 'margin-top: 11.25px' }
%strong
#{t('.recently_added')}:
!= Crop.recent.limit(12).map { |c| link_to(c, c) }.join(", ")
%p.text-right
= link_to "#{t('.view_all')} »", crops_path
- cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do
.row
%h2= t('.our_crops')
- Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |c|
.col-lg-2.col-md-4.col-sm-3.col-xs-6
= render 'crops/thumbnail', crop: c

View File

@@ -1,6 +1,6 @@
%h2= t('.discussion')
- posts = Post.limit(6)
- posts = Post.order(created_at: :desc).limit(6)
- if posts
= render "posts/summary", posts: posts, howmany: 6

View File

@@ -0,0 +1,3 @@
- cache cache_key_for(Harvest) do
%h2 Recently Harvested
= render 'harvests/list', harvests: Harvest.includes(:crop, :owner, :photos).has_photos.recent.first(6)

View File

@@ -1,13 +1,13 @@
- cache cache_key_for(Member) do
.hidden-xs
- members = Member.interesting.first(6)
- members = Member.includes(plantings: :crop).interesting.first(6)
- if members.present?
%section
%h2= t('.title')
.member-cards
- members.each do |m|
= render partial: "members/thumbnail", locals: { member: m }
= render "members/thumbnail", member: m
%p.text-right
= link_to "#{t('.view_all')} »", members_path

View File

@@ -0,0 +1,3 @@
- cache cache_key_for(Planting, 'home'), expires_in: 1.day do
%h2= t('.recently_planted')
= render 'plantings/list', plantings: Planting.includes(:crop, garden: :owner).has_photos.recent.limit(6)

View File

@@ -1,21 +1,22 @@
- cache cache_key_for(Seed, 'interesting'), expires_in: 1.day do
%h2= t('.title')
.row
.col-md-8
- Seed.includes(:owner, crop: :photos).order(created_at: :desc).interesting.first(6).each do |seed|
.col-md-3
.thumbnail
- cache cache_key_for(Crop, seed.id) do
= link_to image_tag((seed.default_photo ? seed.default_photo.thumbnail_url : 'placeholder_150.png'),
alt: seed.crop.name, class: 'img'),
seed
.seedinfo
= link_to seed.crop.name, seed
.trade-to
%p= seed.owner.location
%p
- Seed.current.tradable.includes(:owner, :crop).order(created_at: :desc).limit(6).each do |seed|
.col-md-2.col-sm-2.col-xs-6
.thumbnail.seed-thumbnail
- cache cache_key_for(Crop, seed.id) do
= link_to image_tag(seed_image_path(seed),
alt: seed.crop.name, class: 'img'),
seed
.seedinfo
= link_to seed.crop.name, seed
.trade-to
%p= seed.owner.location
%p
%small
Will trade to:
%br/
#{seed.tradable_to}
%em= seed.tradable_to
%p.text-right
= link_to "#{t('.view_all')} »", seeds_path

View File

@@ -1,9 +1,9 @@
.row
.homepage.row
.col-md-12
- if member_signed_in?
%h1= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
= render partial: 'stats'
= render 'stats'
%p
.btn-group
= link_to t('.plant'), new_planting_path, class: 'btn btn-default'
@@ -14,12 +14,30 @@
- else
.hidden-xs
.jumbotron
= render partial: 'blurb'
= render 'blurb'
.visible-xs
= render partial: 'blurb'
= render 'blurb'
= render partial: 'crops'
= render partial: 'seeds'
= render partial: 'members'
= render partial: 'discuss'
.row
.col-lg-8.col-md-6.col-sm-12
= render 'crops'
.col-lg-2.col-md-3.col-sm-6
= render 'plantings'
.col-lg-2.col-md-3.col-sm-6
= render 'harvests'
.col-md-12
- cache cache_key_for(Crop, 'recent') do
%p{ style: 'margin-top: 11.25px' }
%strong
#{t('.recently_added')}:
!= Crop.recent.limit(30).map { |c| link_to(c, c) }.join(", ")
%p.text-right
= link_to "#{t('home.crops.view_all')} »", crops_path
.row
.col-md-12
= render 'seeds'
= render 'members'
.row
.col-md-12
= render 'discuss'

View File

@@ -5,7 +5,7 @@
%body
= render partial: "layouts/header"
.container#maincontainer
#maincontainer
.row
.col-md-12
- if content_for?(:title)
@@ -15,9 +15,7 @@
%small= yield(:subtitle)
- if content_for?(:buttonbar)
%p
.btn-group
= yield(:buttonbar)
.btn-group.layout-actions= yield(:buttonbar)
= render partial: "shared/flash_messages", flash: flash
= yield

View File

@@ -0,0 +1,6 @@
- if can?(:edit, @photo) && can?(:destroy, @photo)
%p.photo-actions
- if can?(:edit, @photo)
= render 'shared/buttons/edit', path: edit_photo_path(@photo)
- if can?(:destroy, @photo)
= render 'shared/buttons/delete', path: photo_path(@photo)

View File

@@ -1,16 +1,14 @@
%h2 Photos
- if photos.size.positive? || (can?(:edit, item) && can?(:create, Photo))
%h2 Photos
- if photos.size.positive?
= page_entries_info photos
= will_paginate photos
.row
.pagination
= page_entries_info photos
= will_paginate photos
.row
- photos.each do |photo|
.col-md-2.six-across= render 'photos/thumbnail', photo: photo
- if can?(:create, Photo) && can?(:edit, item)
.col-md-2
.thumbnail
= link_to new_photo_path(type: type, id: item.id), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo
- photos.each do |photo|
.col-xs-6.col-md-3.six-across= render 'photos/thumbnail', photo: photo
- if can?(:create, Photo) && can?(:edit, item)
= link_to new_photo_path(type: type, id: item.id), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo

View File

@@ -1,10 +1,12 @@
.thumbnail.photo-thumbnail
= link_to image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-responsive'), photo
.text
%p
= link_to photo.title, photo
%br/
%small
%i
by
= link_to photo.owner, photo.owner
.thumbnail
.photo-thumbnail
= link_to image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-responsive'), photo
.text
%p
= link_to photo.title, photo
%br/
%small
%i
by
= link_to photo.owner, photo.owner
= I18n.l(photo.created_at.to_date)

View File

@@ -12,15 +12,7 @@
%p= image_tag(@photo.fullsize_url, alt: @photo.title, class: 'img img-responsive')
.col-md-4
%p
- if can? :destroy, @photo
= link_to @photo, method: :delete,
data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
- if can? :edit, @photo
= link_to edit_photo_path(@photo), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
= render 'photos/actions', photo: @photo
%p
%strong Posted by:
= link_to @photo.owner, @photo.owner

View File

@@ -1,27 +1,12 @@
- if can?(:edit, planting) || can?(:destroy, planting)
- if can? :edit, planting
= link_to edit_planting_path(planting), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
Edit
- if can?(:edit, planting)
.btn-group.planting-actions
= render 'shared/buttons/edit', path: edit_planting_path(planting)
= render 'shared/buttons/add_photo', path: new_photo_path(id: planting.id, type: 'planting')
- if planting.active?
= render 'shared/buttons/finish_planting', planting: planting
= render 'shared/buttons/harvest_planting', planting: planting
= render 'shared/buttons/save_seeds', planting: planting
- if can? :destroy, planting
= link_to planting, method: :delete,
data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
Delete
- unless planting.finished
= link_to planting_path(planting, planting: { finished: 1 }),
method: :put, class: 'btn btn-default btn-xs append-date' do
%span.glyphicon.glyphicon-ok{ title: "Finished" }
Mark as finished
- if can? :edit, planting
= link_to new_planting_harvest_path(planting), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-leaf{ title: "Harvest" }
Harvest
- if can?(:edit, planting) && can?(:create, Photo)
= link_to new_photo_path(id: planting.id, type: 'planting'), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo
= render 'shared/buttons/delete', path: planting

View File

@@ -8,7 +8,7 @@
.panel-body
.row
.col-xs-12.col-md-5
= link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(planting_image_path(planting),
alt: planting.crop_id, class: 'img img-responsive'),
planting
.col-xs-12.col-md-7
@@ -35,24 +35,6 @@
%dt Finish expected:
%dd= planting.finish_predicted_at if planting.finish_predicted_at.present?
%p= render 'plantings/progress', planting: planting, show_explanation: true
= link_to 'Details', planting_path(planting),
class: 'btn btn-default btn-xs'
- if can?(:edit, planting) && can?(:create, Harvest)
= link_to 'Harvest', new_planting_harvest_path(planting),
class: 'btn btn-default btn-xs'
- if can?(:edit, planting) && !planting.finished
= link_to "Mark as finished",
planting_path(planting, planting: { finished: 1 }),
method: :put,
class: 'btn btn-default btn-xs append-date'
- if can? :destroy, planting
= link_to planting, method: :delete,
data: { confirm: 'Are you sure?' },
class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
.row
.col-md-12= render 'plantings/actions', planting: planting

View File

@@ -0,0 +1,14 @@
%h2 Seeds saved from this planting
- if planting.child_seeds.size.positive?
.row
- planting.child_seeds.each do |seed|
.col-xs-6.col-sm-4.col-md-3
= render 'seeds/thumbnail', seed: seed
- else
%p No seeds saved
- if planting.active? && can?(:create, Seed) && can?(:edit, planting)
= link_to new_planting_seed_path(planting), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-heart{ title: "Add photo" }
Save seeds

View File

@@ -13,10 +13,14 @@
.form-group.required
= f.label :crop, 'What did you plant?', class: 'control-label col-md-2'
.col-md-8
= auto_suggest @planting, :crop, class: 'form-control', default: @crop
%span.help-inline
Can't find what you're looking for?
= link_to "Request new crops.", new_crop_path
- if @seed.present?
= link_to @seed, seed_path(@seed)
= f.hidden_field :parent_seed_id, value: @seed.id
- else
= auto_suggest @planting, :crop, class: 'form-control', default: @crop
%span.help-inline
Can't find what you're looking for?
= link_to "Request new crops.", new_crop_path
.form-group.required
= f.label :garden_id, 'Where did you plant it?', class: 'control-label col-md-2'
.col-md-8

View File

@@ -1,12 +1,13 @@
%h2 Harvests
- if planting.harvests.empty?
%p no harvests yet
%p No harvests
- else
.row
- planting.harvests.order(created_at: :desc).includes(:crop).each do |harvest|
.col-xs-6.col-md-2
.col-xs-6.col-sm-4.col-md-3
= render 'harvests/thumbnail', harvest: harvest
- if can? :edit, planting
.col-xs-6.col-md-2
= link_to new_planting_harvest_path(planting), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-leaf{ title: "Harvest" }
Harvest
- if planting.active? && can?(:edit, planting)
= link_to new_planting_harvest_path(planting), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-leaf{ title: "Harvest" }
Harvest

View File

@@ -1,10 +1,10 @@
- cache planting do
= link_to image_tag(planting.photos.present? ? planting.photos.first.thumbnail_url : 'placeholder_150.png',
= link_to image_tag(planting_image_path(planting),
alt: planting.to_s,
class: 'image-responsive crop-image'),
planting,
rel: "popover",
'data-trigger': 'hover',
'data-title': planting.to_s,
'data-content': render(partial: 'plantings/popover', locals: { planting: planting }),
'data-title': planting.crop.name,
'data-content': render('plantings/popover', planting: planting),
'data-html': true

View File

@@ -1,15 +1,10 @@
- plantings.each do |p|
- cache p do
.row
.col-md-3{ style: 'padding-bottom: 6px' }
= render partial: 'plantings/image_with_popover', locals: { planting: p }
.col-md-9
.col-lg-6.col-md-3.col-xs-4.homepage-listing
= render 'plantings/image_with_popover', planting: p
.col-lg-3.col-md-9.col-xs-4
= link_to p.crop, p.crop
in
= succeed "'s" do
= link_to p.garden.owner, p.garden.owner
= link_to display_garden_name(p.garden), p.garden
%br/
%small
%i
= p.owner.location
%i= p.location

View File

@@ -1,7 +1,11 @@
%p
%small
Quantity:
= planting.quantity ? planting.quantity : 'unknown'
%br/
Planted on:
= planting.planted_at.to_s
- if planting.quantity.present?
%p
%small
Quantity:
= planting.quantity
- if planting.planted_at.present?
%p
%small
Planted:
= planting.planted_at.to_s

View File

@@ -1,7 +1,7 @@
.thumbnail
.planting-thumbnail
- if planting
= link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
= link_to image_tag(planting_image_path(planting),
alt: planting.crop.name, class: 'img'),
planting
.plantinginfo

View File

@@ -9,9 +9,11 @@
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
%p= render 'plantings/actions', planting: @planting
- content_for :buttonbar do
= render 'plantings/actions', planting: @planting
.row.planting
.col-md-6
.col-xs-12.col-sm-6
%dl.dl-horizontal.planting-attributes
%dt Owner:
%dd
@@ -26,14 +28,17 @@
%dd
= link_to "#{@planting.owner}'s", @planting.owner
= link_to @planting.garden, @planting.garden
- unless @planting.owner.location.blank?
- if @planting.owner.location.present?
(#{@planting.owner.location})
%dt Quantity:
%dd= display_planting_quantity(@planting)
- unless @planting.planted_from.blank?
%dt Planted from:
%dd= display_planted_from(@planting)
%dt Planted from:
%dd
- if @planting.parent_seed
= link_to @planting.parent_seed, seed_path(@planting.parent_seed)
- else
= display_planted_from(@planting)
%dt Sun or shade?
%dd
@@ -64,23 +69,23 @@
%dt Last Harvest:
%dd #{@planting.days_to_last_harvest} days after planting
%dt Progress
%dd= render 'plantings/progress', planting: @planting, show_explanation: true
%h2 Progress
%p= render 'plantings/progress', planting: @planting, show_explanation: true
%h2 Harvests
%p= render 'plantings/harvests', planting: @planting
.col-md-6
.col-xs-12.col-sm-6
= render partial: "crops/index_card", locals: { crop: @planting.crop }
- if @planting.owner.location
%p
%small
View other plantings, members and more near
= link_to @planting.owner.location, place_path(@planting.owner.location, anchor: "plantings")
- if @planting.description
%h2 Notes
:growstuff_markdown
#{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
= render 'photos/item_photos', item: @planting, type: 'planting', photos: @photos
.row
.col-md-6
- if @planting.description
%h2 Notes
:growstuff_markdown
#{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
= render 'plantings/harvests', planting: @planting
= render 'plantings/descendants', planting: @planting
.col-md-6
= render 'photos/item_photos', item: @planting, type: 'planting', photos: @photos

View File

@@ -1,11 +1,15 @@
- if can? :edit, @seed
= link_to edit_seed_path(@seed), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
Edit
= link_to new_photo_path(id: seed.id, type: 'seed'), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo
- if can? :destroy, @seed
= link_to @seed, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
Delete
- if can? :edit, seed
.btn-group
= render 'shared/buttons/edit', path: edit_seed_path(seed)
= render 'shared/buttons/add_photo', path: new_photo_path(id: seed.id, type: 'seed')
- if can?(:create, Planting) && seed.active?
= link_to new_planting_path(seed_id: seed), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
Plant seeds
= render 'shared/buttons/finish_seeds', seed: seed
- if can? :destroy, seed
= render 'shared/buttons/delete', path: seed

View File

@@ -0,0 +1,32 @@
.panel.panel-success
.panel-heading
%h3.panel-title
= link_to seed, seed
- if can? :edit, seed
%a.pull-right{ href: edit_seed_path(seed), role: "button", id: "edit_seed_glyphicon" }
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
.panel-body
.row
.col-md-4
= link_to image_tag(seed_image_path(seed),
alt: seed.crop.name, class: 'img'),
seed.crop
.col-md-8
%dl.dl-horizontal
%dt Crop :
%dd= link_to seed.crop.name, seed.crop
- if seed.parent_planting.present?
%dt Saved from
%dd= link_to seed.parent_planting, planting_path(seed.parent_planting)
%dt Plant before :
%dd= seed.plant_before
%dt Quantity :
%dd= seed.quantity
%dt Will trade to :
%dd= seed.tradable_to
%dt From location :
%dd= seed.owner.location
%dt Owner :
%dd= link_to seed.owner.login_name, seed.owner
.col-md-12
%p= render 'seeds/actions', seed: seed

View File

@@ -0,0 +1,13 @@
%h2 Plants grown from these seeds
- if @seed.child_plantings
.row
- seed.child_plantings.each do |planting|
.col-md-3
= render 'plantings/thumbnail', planting: planting
- else
%p No plants grown yet.
- if can?(:create, Planting) && can?(:edit, seed)
= link_to new_seed_planting_path(seed), class: 'btn btn-primary' do
%span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
Plant seeds

View File

@@ -9,14 +9,17 @@
%ul
- @seed.errors.full_messages.each do |msg|
%li= msg
.form-group.required
= f.label :crop, 'Crop:', class: 'control-label col-md-2'
.col-md-8
= auto_suggest @seed, :crop, class: 'form-control', default: @crop
%span.help-inline
Can't find what you're looking for?
= link_to "Request new crops.", new_crop_path
- if @planting
= link_to @planting, planting_path(@planting)
= f.hidden_field :parent_planting_id, value: @planting.id
- else
= auto_suggest @seed, :crop, class: 'form-control', default: @crop
%span.help-inline
Can't find what you're looking for?
= link_to "Request new crops.", new_crop_path
.form-group
= f.label :quantity, 'Quantity:', class: 'control-label col-md-2'
.col-md-2
@@ -28,6 +31,19 @@
= f.text_field :plant_before, class: 'add-datepicker form-control',
value: @seed.plant_before ? @seed.plant_before.to_s(:ymd) : ''
= render partial: 'shared/form_optional'
.form-group
= f.label :finished, 'Mark as finished', class: 'control-label col-md-2'
.col-md-8
= f.check_box :finished
= render partial: 'shared/form_optional'
%span.help-block
= t('.finish_helper')
.form-group
= f.label :finished_at, 'Finished at:', class: 'control-label col-md-2'
.col-md-2
= f.text_field :finished_at, class: 'add-datepicker form-control',
value: @seed.finished_at ? @seed.finished_at.to_s(:ymd) : ''
= render partial: 'shared/form_optional'
.form-group
= f.label :days_until_maturity_min, 'Days until maturity:', class: 'control-label col-md-2'
%fieldset

View File

@@ -1,31 +1,14 @@
.panel.panel-success
.panel-heading
%h3.panel-title
= link_to "#{seed.owner.login_name}'s seed", seed
- if can? :edit, seed
%a.pull-right{ href: edit_seed_path(seed), role: "button", id: "edit_seed_glyphicon" }
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
.panel-body
.row
.col-md-4
= link_to image_tag((seed.crop.default_photo ? seed.crop.default_photo.thumbnail_url : 'placeholder_150.png'),
alt: seed.crop.name, class: 'img'),
seed.crop
.col-md-8
%dl.dl-horizontal
%dt Crop :
%dd= link_to seed.crop.name, seed.crop
%dt Plant before :
%dd= seed.plant_before
%dt Quantity :
%dd= seed.quantity
%dt Will trade to :
%dd= seed.tradable_to
%dt From location :
%dd= seed.owner.location
%dt Owner :
%dd= link_to seed.owner.login_name, seed.owner
.panel-footer
%dt Description
%dd
= display_seed_description(seed)
.thumbnail
.seed-thumbnail
= link_to image_tag(seed_image_path(seed),
alt: seed.crop.name, class: 'img'),
seed_path(seed)
.seedinfo
.seed-name
= link_to seed, seed_path(seed)
.trade-to
%p= seed.owner.location
%p
Will trade to:
%br/
= seed.tradable_to

View File

@@ -28,7 +28,7 @@
- unless @seeds.empty?
- @seeds.each do |seed|
.col-md-6
= render partial: 'seeds/thumbnail', locals: { seed: seed }
= render 'seeds/card', seed: seed
.pagination
= page_entries_info @seeds

View File

@@ -9,47 +9,56 @@
= tag("meta", property: "og:url", content: request.original_url)
= tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
- content_for :buttonbar do
= render 'seeds/actions', seed: @seed
.row
.col-md-6
%p
%b Owner:
= link_to @seed.owner, @seed.owner
&mdash;
= link_to "view all #{@seed.owner}'s seeds", seeds_by_owner_path(owner: @seed.owner.slug)
%p
%b Quantity:
= @seed.quantity.blank? ? "not specified" : @seed.quantity
%p
%b Plant before:
= @seed.plant_before.to_s
%p
%b Days until maturity:
= render partial: 'days_until_maturity', locals: { seed: @seed }
%p
%b Organic?
= @seed.organic
%p
%b GMO?
= @seed.gmo
%p
%b Heirloom?
= @seed.heirloom
%p
%b Will trade:
= @seed.tradable_to
- if @seed.owner.location.blank?
(from unspecified location)
- if current_member == @seed.owner
= link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
- else
(from
= succeed ")" do
= link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
%dl.dl-horizontal
%dt Owner
%dd
= link_to @seed.owner, @seed.owner
&mdash;
= link_to "view all #{@seed.owner}'s seeds",
seeds_by_owner_path(owner: @seed.owner.slug)
%dt Quantity:
%dd= @seed.quantity.blank? ? "not specified" : @seed.quantity
%dt Plant before:
%dd= @seed.plant_before.to_s
-if @seed.finished_at
%dt Finished at:
%dd= @seed.finished_at.to_s
%dt Days until maturity:
%dd= render partial: 'days_until_maturity', locals: { seed: @seed }
%dt Organic?
%dd= @seed.organic
%dt GMO?
%dd= @seed.gmo
%dt Heirloom?
%dd= @seed.heirloom
%dt Will trade:
%dd
= @seed.tradable_to
- if @seed.owner.location.blank?
(from unspecified location)
- if current_member == @seed.owner
= link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
- else
(from
= succeed ")" do
= link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
%p
%b Description:
:growstuff_markdown
#{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
%dt When?
%dd
= @seed.created_at
- if @seed.parent_planting
%dt Saved from planting:
%dd
= link_to @seed.parent_planting, planting_path(@seed.parent_planting)
%dt Description:
%dd
:growstuff_markdown
#{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
- if current_member
- if @seed.tradable? && current_member != @seed.owner
@@ -60,9 +69,9 @@
- else
= render 'shared/signin_signup', to: 'request seeds'
- if can?(:edit, @seed) || can?(:destroy, @seed)
%p
= render 'actions', seed: @seed
= render 'seeds/descendants', seed: @seed
= render 'photos/item_photos', item: @seed, type: 'seed', photos: @photos
.col-md-6
= render partial: "crops/index_card", locals: { crop: @seed.crop }
- if @seed.owner.location
@@ -75,5 +84,3 @@
Or
= link_to "purchase seeds via Ebay",
crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer"
= render 'photos/item_photos', item: @seed, type: 'seed', photos: @photos

View File

@@ -0,0 +1,4 @@
- if can?(:create, Photo)
= link_to path, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-camera{ title: "Add photo" }
Add photo

View File

@@ -0,0 +1,4 @@
= link_to path, method: :delete,
data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-trash{ title: "Delete" }
Delete

View File

@@ -0,0 +1,3 @@
= link_to path, class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-pencil{ title: "Edit" }
Edit

View File

@@ -0,0 +1,5 @@
- unless planting.finished
= link_to planting_path(planting, planting: { finished: 1 }),
method: :put, class: 'btn btn-default btn-xs append-date' do
%span.glyphicon.glyphicon-ok{ title: "Finished" }
Mark as finished

View File

@@ -0,0 +1,5 @@
- unless seed.finished
= link_to seed_path(seed, seed: { finished: 1 }),
method: :put, class: 'btn btn-default btn-xs append-date' do
%span.glyphicon.glyphicon-ok{ title: "Finished" }
Mark as finished

View File

@@ -0,0 +1,4 @@
- planting.active? && if can?(:create, Harvest) && can?(:edit, planting)
= link_to new_planting_harvest_path(planting), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-leaf{ title: "Harvest" }
Harvest

View File

@@ -0,0 +1,4 @@
- if planting.active?
= link_to new_planting_seed_path(planting), class: 'btn btn-default btn-xs' do
%span.glyphicon.glyphicon-heart{ title: "Save seeds" }
Save seeds

View File

@@ -23,6 +23,7 @@ Growstuff::Application.routes.draw do
resources :plantings do
resources :harvests
resources :seeds
end
get '/plantings/owner/:owner' => 'plantings#index', as: 'plantings_by_owner'
get '/plantings/crop/:crop' => 'plantings#index', as: 'plantings_by_crop'
@@ -32,7 +33,9 @@ Growstuff::Application.routes.draw do
end
get '/gardens/owner/:owner' => 'gardens#index', as: 'gardens_by_owner'
resources :seeds
resources :seeds do
resources :plantings
end
get '/seeds/owner/:owner' => 'seeds#index', as: 'seeds_by_owner'
get '/seeds/crop/:crop' => 'seeds#index', as: 'seeds_by_crop'

View File

@@ -0,0 +1,22 @@
class SeedUsage < ActiveRecord::Migration
def change
# # seed can be all sown, meaning there is none left
add_column(:seeds, :finished, :boolean, default: false)
add_column(:seeds, :finished_at, :date, default: nil)
# plantings can be grown from a seed
add_column(:plantings, :parent_seed_id, :integer)
add_foreign_key(:plantings, :seeds,
column: :parent_seed_id,
primary_key: :id,
name: :parent_seed,
on_delete: :nullify)
# seeds can be harvest from planting
add_column(:seeds, :parent_planting_id, :integer)
add_foreign_key(:seeds, :plantings,
column: :parent_planting_id,
primary_key: :id,
name: :parent_planting,
on_delete: :nullify)
end
end

View File

@@ -0,0 +1,6 @@
class AddMemberCountCaches < ActiveRecord::Migration
def change
add_column :members, :photos_count, :integer
add_column :members, :forums_count, :integer
end
end

View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20180205000612) do
ActiveRecord::Schema.define(version: 20180401220637) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -318,6 +318,8 @@ ActiveRecord::Schema.define(version: 20180205000612) do
t.integer "harvests_count"
t.integer "seeds_count"
t.datetime "deleted_at"
t.integer "photos_count"
t.integer "forums_count"
end
add_index "members", ["confirmation_token"], name: "index_members_on_confirmation_token", unique: true, using: :btree
@@ -409,6 +411,7 @@ ActiveRecord::Schema.define(version: 20180205000612) do
t.integer "lifespan"
t.integer "days_to_first_harvest"
t.integer "days_to_last_harvest"
t.integer "parent_seed_id"
end
add_index "plantings", ["slug"], name: "index_plantings_on_slug", unique: true, using: :btree
@@ -459,10 +462,15 @@ ActiveRecord::Schema.define(version: 20180205000612) do
t.text "organic", default: "unknown"
t.text "gmo", default: "unknown"
t.text "heirloom", default: "unknown"
t.boolean "finished", default: false
t.date "finished_at"
t.integer "parent_planting_id"
end
add_index "seeds", ["slug"], name: "index_seeds_on_slug", unique: true, using: :btree
add_foreign_key "harvests", "plantings"
add_foreign_key "photographings", "photos"
add_foreign_key "plantings", "seeds", column: "parent_seed_id", name: "parent_seed", on_delete: :nullify
add_foreign_key "seeds", "plantings", column: "parent_planting_id", name: "parent_planting", on_delete: :nullify
end

7
script/install_codeclimate.sh Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
if [ "${COVERAGE}" = "true" ]; then
set -euv
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter;
chmod +x ./cc-test-reporter;
fi

11
script/install_elasticsearch.sh Executable file
View File

@@ -0,0 +1,11 @@
#!/bin/bash
if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
set -euv
sudo dpkg -r elasticsearch
curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb
sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb
sudo service elasticsearch start
sleep 10
curl -v localhost:9200
fi

View File

@@ -1,12 +0,0 @@
#!/bin/bash
set -euv
gem install --update overcommit rubocop haml-lint bundler-audit
npm install
pip install yamllint --user
overcommit --install
overcommit --sign
overcommit --sign pre-commit
bundle-audit update

14
script/install_linters.sh Executable file
View File

@@ -0,0 +1,14 @@
#!/bin/bash
if [ "${STATIC_CHECKS}" = "true" ]; then
set -euv
gem install --update overcommit rubocop haml-lint bundler-audit;
npm install;
pip install yamllint --user;
overcommit --install;
overcommit --sign;
overcommit --sign pre-commit;
bundle-audit update;
fi

View File

@@ -90,6 +90,14 @@ describe PlantingsController do
it { expect(assigns(:planting).planted_at).to eq Time.zone.today }
end
context 'with parent seed' do
let(:seed) { FactoryBot.create :seed, owner: member }
before { get :new, seed_id: seed.to_param }
it { expect(assigns(:seed)).to eq(seed) }
end
end
describe 'POST :create' do
describe "sets the owner automatically" do
before { post :create, planting: valid_attributes }
it { expect(assigns(:planting).owner).to eq subject.current_member }

View File

@@ -1,11 +1,28 @@
require 'rails_helper'
describe SeedsController do
let(:owner) { FactoryBot.create(:member) }
describe "GET index" do
before { get :index, owner: owner.slug }
it "picks up owner from params" do
owner = FactoryBot.create(:member)
get :index, owner: owner.slug
assigns(:owner).should eq(owner)
end
end
describe 'GET new' do
before { sign_in owner }
it { expect(response).to be_success }
context 'no parent planting' do
before { get :new }
end
context 'with parent planting' do
let(:planting) { FactoryBot.create :planting, owner: owner }
before { get :new, planting_id: planting.to_param }
it { expect(assigns(:planting)).to eq(planting) }
end
end
end

View File

@@ -13,9 +13,17 @@ FactoryBot.define do
heirloom 'unknown'
days_until_maturity_min nil
days_until_maturity_max nil
finished_at nil
factory :finished_seed do
finished true
finished_at { Date.new }
end
factory :tradable_seed do
tradable_to "locally"
finished false
finished_at nil
end
factory :untradable_seed do

View File

@@ -0,0 +1,84 @@
require 'rails_helper'
require 'custom_matchers'
feature "Gardens" do
context 'logged in' do
let(:member) { FactoryBot.create :member }
background { login_as member }
subject { page }
let(:garden) { member.gardens.first }
describe '#index' do
shared_examples "has buttons bar at top" do
it "has buttons bar at top" do
within '.layout-actions' do
is_expected.to have_link 'Add a garden'
is_expected.to have_link 'My Gardens'
is_expected.to have_link "Everyone's gardens"
end
end
end
context 'my gardens' do
before { visit gardens_path(owner: member) }
include_examples "has buttons bar at top"
it "has actions on garden" do
within '.garden-actions' do
is_expected.to have_link 'Plant something'
is_expected.to have_link 'Mark as inactive'
is_expected.to have_link 'Edit'
is_expected.to have_link 'Add photo'
is_expected.to have_link 'Delete'
end
end
end
context 'all gardens' do
before { visit gardens_path }
include_examples "has buttons bar at top"
end
context "other member's garden" do
before { visit gardens_path(owner: FactoryBot.create(:member)) }
include_examples "has buttons bar at top"
it 'does not show actions on other member garden' do
is_expected.not_to have_link 'Plant something'
is_expected.not_to have_link 'Mark as inactive'
end
end
end
describe '#show' do
end
end
# background do
# login_as member
# visit new_garden_path
# end
# it "has the required fields help text" do
# expect(page).to have_content "* denotes a required field"
# end
# it "displays required and optional fields properly" do
# expect(page).to have_selector ".form-group.required", text: "Name"
# expect(page).to have_optional 'textarea#garden_description'
# expect(page).to have_optional 'input#garden_location'
# expect(page).to have_optional 'input#garden_area'
# end
# scenario "Create new garden" do
# fill_in "Name", with: "New garden"
# click_button "Save"
# expect(page).to have_content "Garden was successfully created"
# expect(page).to have_content "New garden"
# end
# scenario "Refuse to create new garden with negative area" do
# visit new_garden_path
# fill_in "Name", with: "Negative Garden"
# fill_in "Area", with: -5
# click_button "Save"
# expect(page).not_to have_content "Garden was successfully created"
# expect(page).to have_content "Area must be greater than or equal to 0"
# end
end

View File

@@ -59,7 +59,7 @@ feature "Planting a crop", js: true do
end
scenario "button on index to edit garden" do
first(".garden-info").click_link("edit_garden_link")
click_link href: edit_garden_path(garden)
expect(page).to have_content 'Edit garden'
end
end
@@ -68,7 +68,9 @@ feature "Planting a crop", js: true do
visit new_garden_path
fill_in "Name", with: "New garden"
click_button "Save"
click_link 'edit_garden_link'
within '.garden-actions' do
click_link 'Edit'
end
fill_in "Name", with: "Different name"
click_button "Save"
expect(page).to have_content "Garden was successfully updated"

View File

@@ -4,19 +4,14 @@ feature "browse harvests" do
let!(:member) { create :member }
let!(:harvest) { create :harvest, owner: member }
background do
login_as member
end
background { login_as member }
subject { page }
feature 'blank optional fields' do
let!(:harvest) { create :harvest, :no_description }
before(:each) do
visit harvests_path
end
before { visit harvests_path }
scenario 'read more' do
expect(page).not_to have_link "Read more"
is_expected.not_to have_link "Read more"
end
end
@@ -28,11 +23,11 @@ feature "browse harvests" do
end
scenario 'read more' do
expect(page).to have_link "Read more"
is_expected.to have_link "Read more"
end
it 'links to #show' do
expect(page).to have_link harvest.crop.name, href: harvest_path(harvest)
is_expected.to have_link harvest.crop.name, href: harvest_path(harvest)
end
end
end

View File

@@ -78,7 +78,9 @@ feature "Harvesting a crop", :js, :elasticsearch do
scenario "Harvesting from planting page" do
planting = create :planting, crop: maize, owner: member, garden: member.gardens.first
visit planting_path(planting)
click_link "Harvest"
within ".planting-actions" do
click_link "Harvest"
end
select plant_part.name, from: 'harvest[plant_part_id]'
click_button "Save"

View File

@@ -0,0 +1,84 @@
require 'rails_helper'
feature "home page" do
let(:member) { FactoryBot.create :member }
# let(:seed_photo) { FactoryBot.create :photo }
let(:photo) { FactoryBot.create :photo }
let(:crop) { FactoryBot.create :crop, created_at: 1.day.ago }
let(:planting) { FactoryBot.create :planting, owner: member, crop: crop }
let(:seed) { FactoryBot.create :tradable_seed, owner: member, crop: crop }
let(:harvest) { FactoryBot.create :harvest, owner: member, crop: crop }
let!(:tradable_seed) { FactoryBot.create :tradable_seed, finished: false }
let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true }
let!(:untradable_seed) { FactoryBot.create :untradable_seed }
background do
# Add photos, so they can appear on home page
planting.photos << photo
seed.photos << photo
harvest.photos << photo
end
subject { page }
before { visit root_path }
shared_examples 'shows seeds' do
it "show tradeable seed" do
is_expected.to have_link href: seed_path(tradable_seed)
end
it "does not show finished seeds" do
is_expected.not_to have_link href: seed_path(finished_seed)
end
it "does not show untradable seeds" do
is_expected.not_to have_link href: seed_path(untradable_seed)
end
it { is_expected.to have_text 'View all seeds' }
end
shared_examples 'show plantings' do
it 'shows plantings section' do
is_expected.to have_text 'Recently Planted'
is_expected.to have_link href: planting_path(planting)
end
end
shared_examples 'show harvests' do
it 'shows harvests section' do
is_expected.to have_text 'Recently Harvested'
is_expected.to have_link href: harvest_path(harvest)
end
end
shared_examples "show crops" do
describe 'shows crops section' do
it { is_expected.to have_text 'Some of our crops' }
it { is_expected.to have_link href: crop_path(crop) }
end
describe 'shows recently added crops' do
it { is_expected.to have_text 'Recently Added' }
it 'link to newest crops' do
is_expected.to have_link crop.name, href: crop_path(crop)
end
end
it 'includes a link to all crops' do
is_expected.to have_link 'View all crops'
end
end
context 'when anonymous' do
include_examples 'show crops'
include_examples 'show plantings'
include_examples 'show harvests'
include_examples 'shows seeds'
it { is_expected.to have_text 'community of food gardeners' }
end
context "when signed in" do
background { login_as member }
include_examples 'show crops'
include_examples 'show plantings'
include_examples 'show harvests'
include_examples 'shows seeds'
end
end

View File

@@ -33,7 +33,9 @@ feature "new photo page" do
scenario "add photo" do
visit garden_path(garden)
click_link "Add photo"
within '.garden-actions' do
click_link "Add photo"
end
expect(page).to have_text garden.name
end
end

View File

@@ -5,9 +5,7 @@ feature "seeds", js: true do
let(:member) { create :member }
let(:crop) { create :crop }
background do
login_as member
end
background { login_as member }
scenario "button on index to edit seed" do
seed = create :seed, owner: member

View File

@@ -0,0 +1,79 @@
require 'rails_helper'
describe PhotosHelper do
let(:crop) { FactoryBot.create :crop }
let(:garden) { FactoryBot.create :garden }
let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg') }
let(:planting) { FactoryBot.create :planting, crop: crop }
let(:planting_photo) { FactoryBot.create(:photo, thumbnail_url: 'planting.jpg') }
let(:harvest) { FactoryBot.create :harvest, crop: crop }
let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg') }
let(:seed) { FactoryBot.create :seed, crop: crop }
let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg') }
describe "crops" do
subject { crop_image_path(crop) }
it { is_expected.to eq 'placeholder_150.png' }
describe "with a planting" do
before { planting.photos << planting_photo }
it "uses planting photos" do
is_expected.to eq planting_photo.thumbnail_url
end
end
describe "with a harvest photos" do
before { harvest.photos << harvest_photo }
it "uses harvest photos" do
is_expected.to eq harvest_photo.thumbnail_url
end
end
describe "uses seed photo" do
before { seed.photos << seed_photo }
it "uses seed photos" do
is_expected.to eq seed_photo.thumbnail_url
end
end
end
describe "gardens" do
subject { garden_image_path(garden) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses garden's own photo" do
before { garden.photos << garden_photo }
it { is_expected.to eq garden_photo.thumbnail_url }
end
end
describe 'plantings' do
subject { planting_image_path(planting) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses planting's own photo" do
before { planting.photos << planting_photo }
it { is_expected.to eq planting_photo.thumbnail_url }
end
end
describe 'harvests' do
subject { harvest_image_path(harvest) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses harvest's own photo" do
before { harvest.photos << harvest_photo }
it { is_expected.to eq harvest_photo.thumbnail_url }
end
end
describe 'seeds' do
subject { seed_image_path(seed) }
it { is_expected.to eq 'placeholder_150.png' }
describe "uses seed's own photo" do
before { seed.photos << seed_photo }
it { is_expected.to eq seed_photo.thumbnail_url }
end
end
end

Some files were not shown because too many files have changed in this diff Show More