mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-06-07 07:37:36 -04:00
Compare commits
108 Commits
release76
...
playwright
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
561aa6cd75 | ||
|
|
49e24bb92b | ||
|
|
3165d8b5c2 | ||
|
|
a77b601327 | ||
|
|
b70168e3a1 | ||
|
|
d279f9bb64 | ||
|
|
83f7ff7c3f | ||
|
|
ae639b6e74 | ||
|
|
d0ca944899 | ||
|
|
1edd4163e1 | ||
|
|
9c03e85882 | ||
|
|
a303fd6b77 | ||
|
|
21fea20c7e | ||
|
|
5049b6fd3b | ||
|
|
4bb8749948 | ||
|
|
58548de1bd | ||
|
|
673a96aaa0 | ||
|
|
1bc3217be6 | ||
|
|
c2a94c9068 | ||
|
|
70d3856914 | ||
|
|
e6487e639c | ||
|
|
8d7cc71503 | ||
|
|
773cbd06bf | ||
|
|
3d7d6d9e73 | ||
|
|
c7b98720e9 | ||
|
|
3ddef1b2e5 | ||
|
|
78d665391e | ||
|
|
cf12b910d5 | ||
|
|
400139bb6a | ||
|
|
ceb4986542 | ||
|
|
7457edf559 | ||
|
|
62951dc5d6 | ||
|
|
f1c2a2a7fb | ||
|
|
48f96faba4 | ||
|
|
a0e8beb372 | ||
|
|
d91799cd51 | ||
|
|
840f57aa8f | ||
|
|
d28d2ebffd | ||
|
|
fe51feb1b5 | ||
|
|
dad09384df | ||
|
|
d7452280da | ||
|
|
0d799f00f7 | ||
|
|
4ef1120ccb | ||
|
|
4b9b85bdce | ||
|
|
e4c98487ba | ||
|
|
be59bd9f27 | ||
|
|
62be64fd38 | ||
|
|
18df97acd6 | ||
|
|
7ea74d8604 | ||
|
|
0054e7d868 | ||
|
|
b34442b16b | ||
|
|
0c6cb5b6fd | ||
|
|
7f75aed146 | ||
|
|
91e1f1c004 | ||
|
|
9e68fba87c | ||
|
|
ff658c0eb6 | ||
|
|
88c63900c5 | ||
|
|
b029c65692 | ||
|
|
d6a643fd88 | ||
|
|
2742dba7fa | ||
|
|
e168070f08 | ||
|
|
65def47ead | ||
|
|
b5aaf2a124 | ||
|
|
16956682a9 | ||
|
|
9ed06bebe6 | ||
|
|
e372ef3341 | ||
|
|
c45b75a967 | ||
|
|
72e7b7323f | ||
|
|
87f79fb071 | ||
|
|
c94cf21f72 | ||
|
|
31c72799ea | ||
|
|
9ae47afe04 | ||
|
|
e7d8ec6fd0 | ||
|
|
620337fbac | ||
|
|
4de062838b | ||
|
|
2aaca7b713 | ||
|
|
323c7dc3ee | ||
|
|
d1509a303e | ||
|
|
05e4ae7fbf | ||
|
|
30e7c5d01c | ||
|
|
ff6a6e2e11 | ||
|
|
6f0d0afdb8 | ||
|
|
c31d9cd09c | ||
|
|
3ba3c0077f | ||
|
|
460daf36f9 | ||
|
|
13a8276313 | ||
|
|
756c79b1e0 | ||
|
|
d2ac7bad15 | ||
|
|
315af0aa7e | ||
|
|
b53bda136f | ||
|
|
7ef0ed6131 | ||
|
|
6ce3d1c069 | ||
|
|
d659df1814 | ||
|
|
0709baa4f8 | ||
|
|
d72a3989b5 | ||
|
|
bf9f67667d | ||
|
|
58bad7eeb0 | ||
|
|
38aa245290 | ||
|
|
d570b27a7b | ||
|
|
7d43d4d9e2 | ||
|
|
e8dbcb0916 | ||
|
|
d31a6ec221 | ||
|
|
a000ea835d | ||
|
|
b204030f70 | ||
|
|
63477ee59d | ||
|
|
b27e263fdf | ||
|
|
e3a2bdd6aa | ||
|
|
6ae241dc0d |
18
.github/workflows/ci-features-admin.yml
vendored
18
.github/workflows/ci-features-admin.yml
vendored
@@ -68,10 +68,24 @@ jobs:
|
|||||||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-yarn-
|
${{ runner.os }}-yarn-
|
||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-comments.yml
vendored
17
.github/workflows/ci-features-comments.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-conversations.yml
vendored
17
.github/workflows/ci-features-conversations.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-crops.yml
vendored
17
.github/workflows/ci-features-crops.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-gardens.yml
vendored
17
.github/workflows/ci-features-gardens.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-harvests.yml
vendored
17
.github/workflows/ci-features-harvests.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-home.yml
vendored
17
.github/workflows/ci-features-home.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-members.yml
vendored
17
.github/workflows/ci-features-members.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-places.yml
vendored
17
.github/workflows/ci-features-places.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
17
.github/workflows/ci-features-plantings.yml
vendored
17
.github/workflows/ci-features-plantings.yml
vendored
@@ -71,7 +71,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Install required OS packages
|
- name: Install required OS packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get -y install libpq-dev google-chrome-stable
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Install NodeJS
|
- name: Install NodeJS
|
||||||
uses: actions/setup-node@v6
|
uses: actions/setup-node@v6
|
||||||
|
|||||||
20
.github/workflows/ci-features-posts.yml
vendored
20
.github/workflows/ci-features-posts.yml
vendored
@@ -86,8 +86,24 @@ jobs:
|
|||||||
- name: Install required JS packages
|
- name: Install required JS packages
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: install chrome
|
- name: Install required OS packages
|
||||||
run: sudo apt-get install google-chrome-stable
|
run: |
|
||||||
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Prepare database for testing
|
- name: Prepare database for testing
|
||||||
run: bundle exec rails db:prepare
|
run: bundle exec rails db:prepare
|
||||||
|
|||||||
20
.github/workflows/ci-features-seeds.yml
vendored
20
.github/workflows/ci-features-seeds.yml
vendored
@@ -86,8 +86,24 @@ jobs:
|
|||||||
- name: Install required JS packages
|
- name: Install required JS packages
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: install chrome
|
- name: Install required OS packages
|
||||||
run: sudo apt-get install google-chrome-stable
|
run: |
|
||||||
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Prepare database for testing
|
- name: Prepare database for testing
|
||||||
run: bundle exec rails db:prepare
|
run: bundle exec rails db:prepare
|
||||||
|
|||||||
20
.github/workflows/ci-features-timeline.yml
vendored
20
.github/workflows/ci-features-timeline.yml
vendored
@@ -86,8 +86,24 @@ jobs:
|
|||||||
- name: Install required JS packages
|
- name: Install required JS packages
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: install chrome
|
- name: Install required OS packages
|
||||||
run: sudo apt-get install google-chrome-stable
|
run: |
|
||||||
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Prepare database for testing
|
- name: Prepare database for testing
|
||||||
run: bundle exec rails db:prepare
|
run: bundle exec rails db:prepare
|
||||||
|
|||||||
20
.github/workflows/ci-features.yml
vendored
20
.github/workflows/ci-features.yml
vendored
@@ -86,8 +86,24 @@ jobs:
|
|||||||
- name: Install required JS packages
|
- name: Install required JS packages
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: install chrome
|
- name: Install required OS packages
|
||||||
run: sudo apt-get install google-chrome-stable
|
run: |
|
||||||
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Prepare database for testing
|
- name: Prepare database for testing
|
||||||
run: bundle exec rails db:prepare
|
run: bundle exec rails db:prepare
|
||||||
|
|||||||
20
.github/workflows/ci.yml
vendored
20
.github/workflows/ci.yml
vendored
@@ -101,8 +101,24 @@ jobs:
|
|||||||
- name: Install required JS packages
|
- name: Install required JS packages
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|
||||||
- name: install chrome
|
- name: Install required OS packages
|
||||||
run: sudo apt-get install google-chrome-stable
|
run: |
|
||||||
|
sudo apt-get -y install libpq-dev
|
||||||
|
|
||||||
|
- name: Cache Playwright Chromium browser
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser (with deps)
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
||||||
|
run: yarn run playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium browser deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: yarn run playwright install-deps chromium
|
||||||
|
|
||||||
- name: Prepare database for testing
|
- name: Prepare database for testing
|
||||||
run: bundle exec rails db:prepare
|
run: bundle exec rails db:prepare
|
||||||
|
|||||||
12
Gemfile
12
Gemfile
@@ -136,6 +136,11 @@ gem "gbifrb"
|
|||||||
|
|
||||||
gem "msgpack"
|
gem "msgpack"
|
||||||
|
|
||||||
|
# Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
|
||||||
|
# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
|
||||||
|
# /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
|
||||||
|
gem "connection_pool", "< 3"
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
|
gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
|
||||||
gem 'dalli'
|
gem 'dalli'
|
||||||
@@ -190,7 +195,7 @@ group :test do
|
|||||||
gem "percy-capybara", "~> 5.0.0"
|
gem "percy-capybara", "~> 5.0.0"
|
||||||
gem 'rails-controller-testing'
|
gem 'rails-controller-testing'
|
||||||
gem "rspec-rebound"
|
gem "rspec-rebound"
|
||||||
gem 'selenium-webdriver'
|
gem 'capybara-playwright-driver'
|
||||||
gem 'timecop'
|
gem 'timecop'
|
||||||
gem 'vcr'
|
gem 'vcr'
|
||||||
end
|
end
|
||||||
@@ -200,3 +205,8 @@ group :travis do
|
|||||||
end
|
end
|
||||||
|
|
||||||
gem "i18n_data", "~> 1.1"
|
gem "i18n_data", "~> 1.1"
|
||||||
|
|
||||||
|
gem "paper_trail", "~> 17.0"
|
||||||
|
|
||||||
|
gem 'sitemap_generator'
|
||||||
|
gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
|
||||||
|
|||||||
67
Gemfile.lock
67
Gemfile.lock
@@ -121,6 +121,25 @@ GEM
|
|||||||
ast (2.4.3)
|
ast (2.4.3)
|
||||||
autoprefixer-rails (10.4.16.0)
|
autoprefixer-rails (10.4.16.0)
|
||||||
execjs (~> 2)
|
execjs (~> 2)
|
||||||
|
aws-eventstream (1.4.0)
|
||||||
|
aws-partitions (1.1189.0)
|
||||||
|
aws-sdk-core (3.239.2)
|
||||||
|
aws-eventstream (~> 1, >= 1.3.0)
|
||||||
|
aws-partitions (~> 1, >= 1.992.0)
|
||||||
|
aws-sigv4 (~> 1.9)
|
||||||
|
base64
|
||||||
|
bigdecimal
|
||||||
|
jmespath (~> 1, >= 1.6.1)
|
||||||
|
logger
|
||||||
|
aws-sdk-kms (1.118.0)
|
||||||
|
aws-sdk-core (~> 3, >= 3.239.1)
|
||||||
|
aws-sigv4 (~> 1.5)
|
||||||
|
aws-sdk-s3 (1.205.0)
|
||||||
|
aws-sdk-core (~> 3, >= 3.234.0)
|
||||||
|
aws-sdk-kms (~> 1)
|
||||||
|
aws-sigv4 (~> 1.5)
|
||||||
|
aws-sigv4 (1.12.1)
|
||||||
|
aws-eventstream (~> 1, >= 1.0.2)
|
||||||
axe-core-api (4.11.0)
|
axe-core-api (4.11.0)
|
||||||
dumb_delegator
|
dumb_delegator
|
||||||
ostruct
|
ostruct
|
||||||
@@ -175,6 +194,10 @@ GEM
|
|||||||
capybara-email (3.0.2)
|
capybara-email (3.0.2)
|
||||||
capybara (>= 2.4, < 4.0)
|
capybara (>= 2.4, < 4.0)
|
||||||
mail
|
mail
|
||||||
|
capybara-playwright-driver (0.5.7)
|
||||||
|
addressable
|
||||||
|
capybara
|
||||||
|
playwright-ruby-client (>= 1.16.0)
|
||||||
capybara-screenshot (1.0.26)
|
capybara-screenshot (1.0.26)
|
||||||
capybara (>= 1.0, < 4)
|
capybara (>= 1.0, < 4)
|
||||||
launchy
|
launchy
|
||||||
@@ -235,9 +258,9 @@ GEM
|
|||||||
discard (1.4.0)
|
discard (1.4.0)
|
||||||
activerecord (>= 4.2, < 9.0)
|
activerecord (>= 4.2, < 9.0)
|
||||||
domain_name (0.6.20240107)
|
domain_name (0.6.20240107)
|
||||||
dotenv (3.1.8)
|
dotenv (3.2.0)
|
||||||
dotenv-rails (3.1.8)
|
dotenv-rails (3.2.0)
|
||||||
dotenv (= 3.1.8)
|
dotenv (= 3.2.0)
|
||||||
railties (>= 6.1)
|
railties (>= 6.1)
|
||||||
drb (2.2.3)
|
drb (2.2.3)
|
||||||
dumb_delegator (1.1.0)
|
dumb_delegator (1.1.0)
|
||||||
@@ -265,7 +288,7 @@ GEM
|
|||||||
factory_bot_rails (6.5.1)
|
factory_bot_rails (6.5.1)
|
||||||
factory_bot (~> 6.5)
|
factory_bot (~> 6.5)
|
||||||
railties (>= 6.1.0)
|
railties (>= 6.1.0)
|
||||||
faker (3.5.2)
|
faker (3.5.3)
|
||||||
i18n (>= 1.8.11, < 2)
|
i18n (>= 1.8.11, < 2)
|
||||||
faraday (2.14.0)
|
faraday (2.14.0)
|
||||||
faraday-net_http (>= 2.0, < 3.5)
|
faraday-net_http (>= 2.0, < 3.5)
|
||||||
@@ -277,7 +300,7 @@ GEM
|
|||||||
flickraw (0.9.10)
|
flickraw (0.9.10)
|
||||||
font-awesome-sass (5.15.1)
|
font-awesome-sass (5.15.1)
|
||||||
sassc (>= 1.11)
|
sassc (>= 1.11)
|
||||||
friendly_id (5.5.1)
|
friendly_id (5.6.0)
|
||||||
activerecord (>= 4.0.0)
|
activerecord (>= 4.0.0)
|
||||||
gbifrb (0.2.0)
|
gbifrb (0.2.0)
|
||||||
geocoder (1.8.6)
|
geocoder (1.8.6)
|
||||||
@@ -293,7 +316,7 @@ GEM
|
|||||||
gravatar-ultimate (2.0.0)
|
gravatar-ultimate (2.0.0)
|
||||||
activesupport (>= 2.3.14)
|
activesupport (>= 2.3.14)
|
||||||
rack
|
rack
|
||||||
haml (7.0.2)
|
haml (7.1.0)
|
||||||
temple (>= 0.8.2)
|
temple (>= 0.8.2)
|
||||||
thor
|
thor
|
||||||
tilt
|
tilt
|
||||||
@@ -356,6 +379,7 @@ GEM
|
|||||||
pp (>= 0.6.0)
|
pp (>= 0.6.0)
|
||||||
rdoc (>= 4.0.0)
|
rdoc (>= 4.0.0)
|
||||||
reline (>= 0.4.2)
|
reline (>= 0.4.2)
|
||||||
|
jmespath (1.6.2)
|
||||||
jquery-rails (4.6.1)
|
jquery-rails (4.6.1)
|
||||||
rails-dom-testing (>= 1, < 3)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
@@ -442,7 +466,7 @@ GEM
|
|||||||
nokogiri (1.18.10-x86_64-linux-gnu)
|
nokogiri (1.18.10-x86_64-linux-gnu)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
oauth (0.5.6)
|
oauth (0.5.6)
|
||||||
oj (3.16.12)
|
oj (3.16.13)
|
||||||
bigdecimal (>= 3.0)
|
bigdecimal (>= 3.0)
|
||||||
ostruct (>= 0.2)
|
ostruct (>= 0.2)
|
||||||
omniauth (1.9.2)
|
omniauth (1.9.2)
|
||||||
@@ -457,6 +481,9 @@ GEM
|
|||||||
open-uri (0.1.0)
|
open-uri (0.1.0)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
ostruct (0.6.3)
|
ostruct (0.6.3)
|
||||||
|
paper_trail (17.0.0)
|
||||||
|
activerecord (>= 7.1)
|
||||||
|
request_store (~> 1.4)
|
||||||
parallel (1.27.0)
|
parallel (1.27.0)
|
||||||
parser (3.3.10.0)
|
parser (3.3.10.0)
|
||||||
ast (~> 2.4.1)
|
ast (~> 2.4.1)
|
||||||
@@ -469,6 +496,9 @@ GEM
|
|||||||
heroics (~> 0.1.1)
|
heroics (~> 0.1.1)
|
||||||
moneta (~> 1.0.0)
|
moneta (~> 1.0.0)
|
||||||
rate_throttle_client (~> 0.1.0)
|
rate_throttle_client (~> 0.1.0)
|
||||||
|
playwright-ruby-client (1.57.0)
|
||||||
|
concurrent-ruby (>= 1.1.6)
|
||||||
|
mime-types (>= 3.0)
|
||||||
popper_js (2.11.8)
|
popper_js (2.11.8)
|
||||||
pp (0.6.3)
|
pp (0.6.3)
|
||||||
prettyprint
|
prettyprint
|
||||||
@@ -548,7 +578,7 @@ GEM
|
|||||||
rb-fsevent (0.11.2)
|
rb-fsevent (0.11.2)
|
||||||
rb-inotify (0.10.1)
|
rb-inotify (0.10.1)
|
||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
rdoc (6.16.1)
|
rdoc (6.17.0)
|
||||||
erb
|
erb
|
||||||
psych (>= 4.0.0)
|
psych (>= 4.0.0)
|
||||||
tsort
|
tsort
|
||||||
@@ -558,6 +588,8 @@ GEM
|
|||||||
regexp_parser (2.11.3)
|
regexp_parser (2.11.3)
|
||||||
reline (0.6.3)
|
reline (0.6.3)
|
||||||
io-console (~> 0.5)
|
io-console (~> 0.5)
|
||||||
|
request_store (1.7.0)
|
||||||
|
rack (>= 1.4)
|
||||||
responders (3.2.0)
|
responders (3.2.0)
|
||||||
actionpack (>= 7.0)
|
actionpack (>= 7.0)
|
||||||
railties (>= 7.0)
|
railties (>= 7.0)
|
||||||
@@ -630,7 +662,7 @@ GEM
|
|||||||
rubocop-factory_bot (2.28.0)
|
rubocop-factory_bot (2.28.0)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rubocop (~> 1.72, >= 1.72.1)
|
rubocop (~> 1.72, >= 1.72.1)
|
||||||
rubocop-rails (2.34.1)
|
rubocop-rails (2.34.2)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
lint_roller (~> 1.1)
|
lint_roller (~> 1.1)
|
||||||
rack (>= 1.1)
|
rack (>= 1.1)
|
||||||
@@ -650,7 +682,7 @@ GEM
|
|||||||
ruby-units (4.1.0)
|
ruby-units (4.1.0)
|
||||||
ruby-vips (2.2.1)
|
ruby-vips (2.2.1)
|
||||||
ffi (~> 1.12)
|
ffi (~> 1.12)
|
||||||
rubyzip (3.2.1)
|
rubyzip (3.2.2)
|
||||||
sass (3.7.4)
|
sass (3.7.4)
|
||||||
sass-listen (~> 4.0.0)
|
sass-listen (~> 4.0.0)
|
||||||
sass-listen (4.0.0)
|
sass-listen (4.0.0)
|
||||||
@@ -664,13 +696,13 @@ GEM
|
|||||||
sprockets (> 3.0)
|
sprockets (> 3.0)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
tilt
|
tilt
|
||||||
scout_apm (5.8.0)
|
scout_apm (6.0.0)
|
||||||
parser
|
parser
|
||||||
searchkick (5.3.1)
|
searchkick (5.3.1)
|
||||||
activemodel (>= 6.1)
|
activemodel (>= 6.1)
|
||||||
hashie
|
hashie
|
||||||
securerandom (0.4.1)
|
securerandom (0.4.1)
|
||||||
selenium-webdriver (4.38.0)
|
selenium-webdriver (4.39.0)
|
||||||
base64 (~> 0.2)
|
base64 (~> 0.2)
|
||||||
logger (~> 1.4)
|
logger (~> 1.4)
|
||||||
rexml (~> 3.2, >= 3.2.5)
|
rexml (~> 3.2, >= 3.2.5)
|
||||||
@@ -683,6 +715,8 @@ GEM
|
|||||||
rack (>= 2.2.4)
|
rack (>= 2.2.4)
|
||||||
redis-client (>= 0.22.2)
|
redis-client (>= 0.22.2)
|
||||||
simple_po_parser (1.1.6)
|
simple_po_parser (1.1.6)
|
||||||
|
sitemap_generator (6.3.0)
|
||||||
|
builder (~> 3.0)
|
||||||
sprockets (3.7.5)
|
sprockets (3.7.5)
|
||||||
base64
|
base64
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
@@ -692,7 +726,7 @@ GEM
|
|||||||
activesupport (>= 5.2)
|
activesupport (>= 5.2)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
ssrf_filter (1.1.2)
|
ssrf_filter (1.1.2)
|
||||||
stringio (3.1.8)
|
stringio (3.1.9)
|
||||||
sysexits (1.2.0)
|
sysexits (1.2.0)
|
||||||
temple (0.10.4)
|
temple (0.10.4)
|
||||||
terminal-table (4.0.0)
|
terminal-table (4.0.0)
|
||||||
@@ -703,7 +737,7 @@ GEM
|
|||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.6.1)
|
tilt (2.6.1)
|
||||||
timecop (0.9.10)
|
timecop (0.9.10)
|
||||||
timeout (0.4.4)
|
timeout (0.5.0)
|
||||||
tsort (0.2.0)
|
tsort (0.2.0)
|
||||||
tzinfo (2.0.6)
|
tzinfo (2.0.6)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
@@ -754,6 +788,7 @@ DEPENDENCIES
|
|||||||
active_median
|
active_median
|
||||||
active_record_union
|
active_record_union
|
||||||
active_utils
|
active_utils
|
||||||
|
aws-sdk-s3 (~> 1, >= 1.114.0)
|
||||||
axe-core-capybara
|
axe-core-capybara
|
||||||
axe-core-rspec
|
axe-core-rspec
|
||||||
better_errors
|
better_errors
|
||||||
@@ -768,10 +803,12 @@ DEPENDENCIES
|
|||||||
cancancan
|
cancancan
|
||||||
capybara
|
capybara
|
||||||
capybara-email
|
capybara-email
|
||||||
|
capybara-playwright-driver
|
||||||
capybara-screenshot
|
capybara-screenshot
|
||||||
chartkick
|
chartkick
|
||||||
coffee-rails
|
coffee-rails
|
||||||
comfortable_mexican_sofa!
|
comfortable_mexican_sofa!
|
||||||
|
connection_pool (< 3)
|
||||||
crowdin-cli
|
crowdin-cli
|
||||||
csv_shaper
|
csv_shaper
|
||||||
dalli
|
dalli
|
||||||
@@ -813,6 +850,7 @@ DEPENDENCIES
|
|||||||
oj
|
oj
|
||||||
omniauth (~> 1.3)
|
omniauth (~> 1.3)
|
||||||
omniauth-flickr (>= 0.0.15)
|
omniauth-flickr (>= 0.0.15)
|
||||||
|
paper_trail (~> 17.0)
|
||||||
percy-capybara (~> 5.0.0)
|
percy-capybara (~> 5.0.0)
|
||||||
pg
|
pg
|
||||||
platform-api
|
platform-api
|
||||||
@@ -848,6 +886,7 @@ DEPENDENCIES
|
|||||||
searchkick
|
searchkick
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
sidekiq
|
sidekiq
|
||||||
|
sitemap_generator
|
||||||
sprockets (< 4)
|
sprockets (< 4)
|
||||||
terser
|
terser
|
||||||
timecop
|
timecop
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ Vibe Coding is more than okay, just make sure you indicate if you have done so a
|
|||||||
|
|
||||||
* [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
|
* [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
|
||||||
working on, known bugs, etc)
|
working on, known bugs, etc)
|
||||||
* [](https://gitter.im/Growstuff/growstuff?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
|
||||||
* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
|
* [Wiki](https://github.com/Growstuff/growstuff/wiki) (general documentation, etc.)
|
||||||
|
|
||||||
## For coders
|
## For coders
|
||||||
|
|||||||
835
app/assets/images/girlwithvegetables-0038331hotifw.svg
Normal file
835
app/assets/images/girlwithvegetables-0038331hotifw.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 266 KiB |
@@ -33,4 +33,4 @@
|
|||||||
|
|
||||||
@view-transition {
|
@view-transition {
|
||||||
navigation: auto;
|
navigation: auto;
|
||||||
}
|
}
|
||||||
|
|||||||
19
app/controllers/admin/crops_controller.rb
Normal file
19
app/controllers/admin/crops_controller.rb
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Admin::CropsController < ApplicationController
|
||||||
|
before_action :authenticate_member!
|
||||||
|
before_action :authorize_admin!
|
||||||
|
|
||||||
|
def index
|
||||||
|
@versions = PaperTrail::Version.where(item_type: 'Crop').order(created_at: :desc).limit(100)
|
||||||
|
member_ids = @versions.map(&:whodunnit).compact.map(&:to_i)
|
||||||
|
@members = Member.where(id: member_ids).index_by(&:id)
|
||||||
|
@crop_wranglers = Role.crop_wranglers
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def authorize_admin!
|
||||||
|
authorize! :wrangle, Crop
|
||||||
|
end
|
||||||
|
end
|
||||||
24
app/controllers/admin/versions_controller.rb
Normal file
24
app/controllers/admin/versions_controller.rb
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module Admin
|
||||||
|
class VersionsController < ApplicationController
|
||||||
|
before_action :authenticate_member!
|
||||||
|
before_action :authorize_admin!
|
||||||
|
|
||||||
|
def revert
|
||||||
|
@version = PaperTrail::Version.find(params[:id])
|
||||||
|
@object = @version.reify
|
||||||
|
if @object.save
|
||||||
|
redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
|
||||||
|
else
|
||||||
|
redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def authorize_admin!
|
||||||
|
authorize! :wrangle, Crop
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -73,6 +73,8 @@ class CropsController < ApplicationController
|
|||||||
format.html do
|
format.html do
|
||||||
@posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
|
@posts = @crop.posts.order(created_at: :desc).paginate(page: params[:page])
|
||||||
@companions = @crop.companions.approved
|
@companions = @crop.companions.approved
|
||||||
|
member_ids = @crop.versions.map(&:whodunnit).compact.map(&:to_i)
|
||||||
|
@version_members = Member.where(id: member_ids).index_by(&:id)
|
||||||
end
|
end
|
||||||
format.svg do
|
format.svg do
|
||||||
icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
|
icon_data = @crop.svg_icon.presence || File.read(Rails.root.join("app/assets/images/icons/sprout.svg"))
|
||||||
@@ -147,6 +149,34 @@ class CropsController < ApplicationController
|
|||||||
respond_with @crop
|
respond_with @crop
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def data_improvement
|
||||||
|
@active_tab = params[:tab] || 'photos'
|
||||||
|
|
||||||
|
@crops = case @active_tab
|
||||||
|
when 'photos'
|
||||||
|
Crop.approved.where(photo_associations_count: 0).order(plantings_count: :desc)
|
||||||
|
when 'descriptions'
|
||||||
|
Crop.approved.where(description: [nil, '']).order(plantings_count: :desc)
|
||||||
|
when 'youtube'
|
||||||
|
Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
|
||||||
|
when 'alternate_names'
|
||||||
|
Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
|
||||||
|
when 'wikidata'
|
||||||
|
crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
|
||||||
|
Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
|
||||||
|
when 'row_spacing'
|
||||||
|
Crop.approved.where(row_spacing: nil).order(plantings_count: :desc)
|
||||||
|
when 'sun_requirements'
|
||||||
|
Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
|
||||||
|
when 'height'
|
||||||
|
Crop.approved.where(height: nil).order(plantings_count: :desc)
|
||||||
|
when 'public_food_key'
|
||||||
|
Crop.approved.where(public_food_key: [nil, '']).order(plantings_count: :desc)
|
||||||
|
else
|
||||||
|
Crop.none
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def notifier
|
def notifier
|
||||||
@@ -193,6 +223,7 @@ class CropsController < ApplicationController
|
|||||||
:request_notes, :reason_for_rejection,
|
:request_notes, :reason_for_rejection,
|
||||||
:rejection_notes,
|
:rejection_notes,
|
||||||
:description,
|
:description,
|
||||||
|
:public_food_key,
|
||||||
:row_spacing, :spread, :height,
|
:row_spacing, :spread, :height,
|
||||||
:sowing_method, :sun_requirements, :growing_degree_days,
|
:sowing_method, :sun_requirements, :growing_degree_days,
|
||||||
scientific_names_attributes: %i(scientific_name _destroy id)
|
scientific_names_attributes: %i(scientific_name _destroy id)
|
||||||
|
|||||||
@@ -10,4 +10,6 @@ class HomeController < ApplicationController
|
|||||||
# the relevant class methods directly in the view, so that fragment
|
# the relevant class methods directly in the view, so that fragment
|
||||||
# caching will be effective.
|
# caching will be effective.
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def community_gardens; end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class ScientificNamesController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def scientific_name_params
|
def scientific_name_params
|
||||||
params.require(:scientific_name).permit(:crop_id, :name, :gbif_key)
|
params.require(:scientific_name).permit(:crop_id, :name, :gbif_key, :wikidata_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def gbif_service
|
def gbif_service
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
module CropsHelper
|
module CropsHelper
|
||||||
|
|
||||||
def crop_or_parent(crop, attribute)
|
def crop_or_parent(crop, attribute)
|
||||||
default = crop.send(attribute)
|
default = crop.send(attribute)
|
||||||
return default if default.present?
|
return default if default.present?
|
||||||
while parent = crop.parent do
|
|
||||||
|
parent = crop
|
||||||
|
while parent = parent.parent
|
||||||
return parent.send(attribute) if parent&.send(attribute).present?
|
return parent.send(attribute) if parent&.send(attribute).present?
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -37,4 +38,55 @@ module CropsHelper
|
|||||||
match = url.match(regex)
|
match = url.match(regex)
|
||||||
match[1] if match
|
match[1] if match
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def crop_jsonld_data(crop, full_attributes: true)
|
||||||
|
same_as_urls = [crop.en_wikipedia_url]
|
||||||
|
crop.scientific_names.each do |scientific_name|
|
||||||
|
same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
|
||||||
|
end
|
||||||
|
|
||||||
|
subject_of_entities = []
|
||||||
|
if full_attributes
|
||||||
|
if crop.en_youtube_url.present?
|
||||||
|
subject_of_entities << {
|
||||||
|
'@type': "VideoObject",
|
||||||
|
url: crop.en_youtube_url
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
crop.posts.each do |post|
|
||||||
|
subject_of_entities << {
|
||||||
|
'@type': "SocialMediaPosting",
|
||||||
|
url: post_url(post),
|
||||||
|
author: {
|
||||||
|
'@type': 'Person',
|
||||||
|
name: post.author.login_name
|
||||||
|
},
|
||||||
|
'datePublished': post.created_at
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
images = []
|
||||||
|
crop.photos.each do |photo|
|
||||||
|
images << photo.fullsize_url
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
|
||||||
|
# has_many :plantings, dependent: :destroy
|
||||||
|
# has_many :seeds, dependent: :destroy
|
||||||
|
# has_many :harvests, dependent: :destroy
|
||||||
|
|
||||||
|
{
|
||||||
|
'@context': "https://schema.org",
|
||||||
|
'@type': "BioChemEntity",
|
||||||
|
name: crop.name,
|
||||||
|
taxonomicRange: crop.scientific_names.map(&:name),
|
||||||
|
description: crop.description,
|
||||||
|
sameAs: same_as_urls,
|
||||||
|
alternateName: crop.alternate_names.map(&:name),
|
||||||
|
subjectOf: subject_of_entities,
|
||||||
|
image: images
|
||||||
|
}.compact
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
8
app/models/australian_food_classification_data.rb
Normal file
8
app/models/australian_food_classification_data.rb
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class AustralianFoodClassificationData < ApplicationRecord
|
||||||
|
belongs_to :crop,
|
||||||
|
foreign_key: :public_food_key,
|
||||||
|
primary_key: :public_food_key,
|
||||||
|
inverse_of: :australian_food_classification_data
|
||||||
|
end
|
||||||
@@ -53,7 +53,9 @@ module SearchHarvests
|
|||||||
owners = []
|
owners = []
|
||||||
1..limit.times do
|
1..limit.times do
|
||||||
where = {
|
where = {
|
||||||
photos_count: { gt: 0 },
|
# Disabled for now so that more relevant harvests are
|
||||||
|
# surfaced; even if we're falling back to crop photos.
|
||||||
|
# photos_count: { gt: 0 },
|
||||||
owner_id: { not: owners }
|
owner_id: { not: owners }
|
||||||
}
|
}
|
||||||
one_record = search('*',
|
one_record = search('*',
|
||||||
|
|||||||
@@ -66,7 +66,9 @@ module SearchPlantings
|
|||||||
owners = []
|
owners = []
|
||||||
1..limit.times do
|
1..limit.times do
|
||||||
where = {
|
where = {
|
||||||
photos_count: { gt: 0 },
|
# Disabled for now so that more relevant plantings are
|
||||||
|
# surfaced; even if we're falling back to crop photos.
|
||||||
|
# photos_count: { gt: 0 },
|
||||||
owner_id: { not: owners }
|
owner_id: { not: owners }
|
||||||
}
|
}
|
||||||
one_record = search('*',
|
one_record = search('*',
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Crop < ApplicationRecord
|
class Crop < ApplicationRecord
|
||||||
|
has_paper_trail
|
||||||
extend FriendlyId
|
extend FriendlyId
|
||||||
include PhotoCapable
|
include PhotoCapable
|
||||||
include OpenFarmData
|
include OpenFarmData
|
||||||
@@ -27,6 +28,10 @@ class Crop < ApplicationRecord
|
|||||||
has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
|
has_many :companions, through: :crop_companions, source: :crop_b, class_name: 'Crop'
|
||||||
has_many :crop_posts, dependent: :delete_all
|
has_many :crop_posts, dependent: :delete_all
|
||||||
has_many :posts, through: :crop_posts, dependent: :delete_all
|
has_many :posts, through: :crop_posts, dependent: :delete_all
|
||||||
|
has_one :australian_food_classification_data,
|
||||||
|
foreign_key: :public_food_key,
|
||||||
|
primary_key: :public_food_key,
|
||||||
|
inverse_of: :crop
|
||||||
|
|
||||||
accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
|
accepts_nested_attributes_for :scientific_names, allow_destroy: true, reject_if: :all_blank
|
||||||
|
|
||||||
|
|||||||
56
app/views/admin/crops/index.html.haml
Normal file
56
app/views/admin/crops/index.html.haml
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
- content_for :title, "Crop Wrangling"
|
||||||
|
|
||||||
|
%h1 Crop Wrangling
|
||||||
|
|
||||||
|
%nav.nav
|
||||||
|
= link_to "Full crop hierarchy", hierarchy_crops_path, class: 'nav-link'
|
||||||
|
= link_to "Add Crop", new_crop_path, class: 'btn'
|
||||||
|
|
||||||
|
%section.crop_wranglers
|
||||||
|
%h2 Crop Wranglers
|
||||||
|
- @crop_wranglers.each do |crop_wrangler|
|
||||||
|
= render 'members/tiny', member: crop_wrangler
|
||||||
|
|
||||||
|
%hr/
|
||||||
|
|
||||||
|
%section
|
||||||
|
%h2 Crops
|
||||||
|
|
||||||
|
|
||||||
|
%ul#myTab.nav.nav-tabs{role: "tablist"}
|
||||||
|
%li.nav-item
|
||||||
|
%a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: 'active'}
|
||||||
|
Recently edited
|
||||||
|
%li.nav-item
|
||||||
|
%a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab"}
|
||||||
|
Recently added
|
||||||
|
%li.nav-item
|
||||||
|
%a#profile-tab.nav-link{ href: wrangle_crops_path(approval_status: "pending"), role: "tab"}
|
||||||
|
Pending approval
|
||||||
|
%li.nav-item
|
||||||
|
%a#contact-tab.nav-link{ href: wrangle_crops_path(approval_status: "rejected"), role: "tab"}
|
||||||
|
Rejected
|
||||||
|
|
||||||
|
.card
|
||||||
|
%ul.list-group.list-group-flush
|
||||||
|
- @versions.each do |version|
|
||||||
|
- crop = version.item || version.reify
|
||||||
|
- if crop
|
||||||
|
%li.list-group-item
|
||||||
|
.d-flex.w-100.justify-content-between
|
||||||
|
%h5.mb-1
|
||||||
|
- if version.event == "destroy"
|
||||||
|
= crop.name
|
||||||
|
- else
|
||||||
|
= link_to crop.name, crop
|
||||||
|
%small.text-muted= "was #{version.event}d"
|
||||||
|
.d-inline-block
|
||||||
|
%small.mr-2= time_ago_in_words(version.created_at) + " ago"
|
||||||
|
- if can?(:wrangle, Crop)
|
||||||
|
= link_to "Revert", revert_admin_version_path(version), method: :post, class: "btn btn-sm btn-outline-danger"
|
||||||
|
- member = @members[version.whodunnit.to_i]
|
||||||
|
- if member
|
||||||
|
%p.mb-1
|
||||||
|
Made by
|
||||||
|
= link_to member.name, member
|
||||||
|
= render 'shared/version_changeset', version: version
|
||||||
13
app/views/comments/index.html.haml
Normal file
13
app/views/comments/index.html.haml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
- content_for :title, "Comments"
|
||||||
|
- content_for :meta_description, "Browse and search for comments."
|
||||||
|
- content_for :breadcrumbs do
|
||||||
|
%li.breadcrumb-item.active= link_to "Comments", comments_path
|
||||||
|
|
||||||
|
%h1 Comments
|
||||||
|
|
||||||
|
= will_paginate @comments
|
||||||
|
|
||||||
|
- @comments.each do |comment|
|
||||||
|
= render 'single', comment: comment
|
||||||
|
|
||||||
|
= will_paginate @comments
|
||||||
10
app/views/crops/_crop_list.html.haml
Normal file
10
app/views/crops/_crop_list.html.haml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
%table.table.table-striped
|
||||||
|
%thead
|
||||||
|
%tr
|
||||||
|
%th Name
|
||||||
|
%th Plantings
|
||||||
|
%tbody
|
||||||
|
- crops.each do |crop|
|
||||||
|
%tr
|
||||||
|
%td= link_to crop.name, crop
|
||||||
|
%td= crop.plantings_count
|
||||||
@@ -42,36 +42,46 @@
|
|||||||
%span.help-block Living more than two years
|
%span.help-block Living more than two years
|
||||||
|
|
||||||
%h2 Data
|
%h2 Data
|
||||||
= f.text_area :description, label: 'Description'
|
- if @crop.description.blank? || can?(:wrangle, @crop)
|
||||||
- if @crop.parent
|
= f.text_area :description, label: 'Description'
|
||||||
%span.help-block Parent: #{@crop.parent.description}
|
- if @crop.parent
|
||||||
= f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
|
%span.help-block Parent: #{@crop.parent.description}
|
||||||
- if @crop.parent
|
- if @crop.row_spacing.blank? || can?(:wrangle, @crop)
|
||||||
%span.help-block Parent: #{@crop.parent.row_spacing}
|
= f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
|
||||||
= f.number_field :spread, label: 'Spread (cm)', min: 0
|
- if @crop.parent
|
||||||
- if @crop.parent
|
%span.help-block Parent: #{@crop.parent.row_spacing}
|
||||||
%span.help-block Parent: #{@crop.parent.spread}
|
- if @crop.spread.blank? || can?(:wrangle, @crop)
|
||||||
= f.number_field :height, label: 'Height (cm)', min: 0
|
= f.number_field :spread, label: 'Spread (cm)', min: 0
|
||||||
- if @crop.parent
|
- if @crop.parent
|
||||||
%span.help-block Parent: #{@crop.parent.height}
|
%span.help-block Parent: #{@crop.parent.spread}
|
||||||
= f.text_field :sowing_method
|
- if @crop.height.blank? || can?(:wrangle, @crop)
|
||||||
- if @crop.parent
|
= f.number_field :height, label: 'Height (cm)', min: 0
|
||||||
%span.help-block Parent: #{@crop.parent.sowing_method}
|
- if @crop.parent
|
||||||
= f.text_field :sun_requirements
|
%span.help-block Parent: #{@crop.parent.height}
|
||||||
- if @crop.parent
|
- if @crop.sowing_method.blank? || can?(:wrangle, @crop)
|
||||||
%span.help-block Parent: #{@crop.parent.sun_requirements}
|
= f.text_field :sowing_method
|
||||||
= f.number_field :growing_degree_days, min: 0
|
- if @crop.parent
|
||||||
- if @crop.parent
|
%span.help-block Parent: #{@crop.parent.sowing_method}
|
||||||
%span.help-block Parent: #{@crop.parent.growing_degree_days}
|
- if @crop.sun_requirements.blank? || can?(:wrangle, @crop)
|
||||||
|
= f.text_field :sun_requirements
|
||||||
|
- if @crop.parent
|
||||||
|
%span.help-block Parent: #{@crop.parent.sun_requirements}
|
||||||
|
- if @crop.growing_degree_days.blank? || can?(:wrangle, @crop)
|
||||||
|
= f.number_field :growing_degree_days, min: 0
|
||||||
|
- if @crop.parent
|
||||||
|
%span.help-block Parent: #{@crop.parent.growing_degree_days}
|
||||||
|
= f.text_field :public_food_key, label: 'Australian Food Composition Database Public Food Key'
|
||||||
|
|
||||||
- unless @crop.approved?
|
- unless @crop.approved?
|
||||||
= link_to 'Search wikipedia', "https://en.wikipedia.org/w/index.php?search=#{@crop.name}", target: '_blank'
|
= 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'
|
- if @crop.en_wikipedia_url.blank? || can?(:wrangle, @crop)
|
||||||
%span.help-block
|
= f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
|
||||||
Link to the crop's page on the English language Wikipedia (required).
|
%span.help-block
|
||||||
= f.url_field :en_youtube_url, label: 'YouTube URL'
|
Link to the crop's page on the English language Wikipedia (required).
|
||||||
%span.help-block
|
- if @crop.en_youtube_url.blank? || can?(:wrangle, @crop)
|
||||||
Link to a YouTube video about the crop in English.
|
= f.url_field :en_youtube_url, label: 'YouTube URL'
|
||||||
|
%span.help-block
|
||||||
|
Link to a YouTube video about the crop in English.
|
||||||
|
|
||||||
-# Only crop wranglers see the crop hierarchy (for now)
|
-# Only crop wranglers see the crop hierarchy (for now)
|
||||||
- if can? :wrangle, @crop
|
- if can? :wrangle, @crop
|
||||||
|
|||||||
16
app/views/crops/_history.html.haml
Normal file
16
app/views/crops/_history.html.haml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
%section.history
|
||||||
|
%h2 History
|
||||||
|
.card
|
||||||
|
%ul.list-group.list-group-flush
|
||||||
|
- crop.versions.reorder(created_at: :desc).each do |version|
|
||||||
|
- if version.changeset.present?
|
||||||
|
%li.list-group-item
|
||||||
|
.d-flex.w-100.justify-content-between
|
||||||
|
%h5.mb-1= version.event.humanize
|
||||||
|
%small= time_ago_in_words(version.created_at) + " ago"
|
||||||
|
- member = @version_members.present? && @version_members[version.whodunnit.to_i]
|
||||||
|
- if member
|
||||||
|
%p.mb-1
|
||||||
|
Made by
|
||||||
|
= link_to member.name, member
|
||||||
|
= render 'shared/version_changeset', version: version
|
||||||
@@ -23,6 +23,9 @@
|
|||||||
Nobody is growing this yet. You could be the first!
|
Nobody is growing this yet. You could be the first!
|
||||||
- if crop_or_parent(@crop, :description).present?
|
- if crop_or_parent(@crop, :description).present?
|
||||||
%p= simple_format crop_or_parent(@crop, :description)
|
%p= simple_format crop_or_parent(@crop, :description)
|
||||||
|
- else
|
||||||
|
- if member_signed_in?
|
||||||
|
%p= link_to "Add a description.", edit_crop_path(@crop, anchor: ":~:text=Description")
|
||||||
.col-md-3
|
.col-md-3
|
||||||
= image_tag crop_image_path(@crop),
|
= image_tag crop_image_path(@crop),
|
||||||
class: 'img-responsive shadow rounded crop-hero-photo', alt: "Image of #{@crop.name}"
|
class: 'img-responsive shadow rounded crop-hero-photo', alt: "Image of #{@crop.name}"
|
||||||
|
|||||||
38
app/views/crops/_nutritional_data.html.haml
Normal file
38
app/views/crops/_nutritional_data.html.haml
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
- data = crop.australian_food_classification_data
|
||||||
|
- if data
|
||||||
|
.card
|
||||||
|
.card-body
|
||||||
|
%h4.card-title Nutritional Data
|
||||||
|
%p.card-text A summary of nutritional data per 100g for #{data.food_name}.
|
||||||
|
%table.table.table-sm.table-borderless
|
||||||
|
%tbody
|
||||||
|
- if data.energy_with_dietary_fibre_equated_kj.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Energy
|
||||||
|
%td= "#{data.energy_with_dietary_fibre_equated_kj.to_f.round(1)} kJ"
|
||||||
|
- if data.protein_g.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Protein
|
||||||
|
%td= "#{data.protein_g.to_f.round(1)} g"
|
||||||
|
- if data.fat_total_g.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Fat, total
|
||||||
|
%td= "#{data.fat_total_g.to_f.round(1)} g"
|
||||||
|
- if data.available_carbohydrate_with_sugar_alcohols_g.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Carbohydrate
|
||||||
|
%td= "#{data.available_carbohydrate_with_sugar_alcohols_g.to_f.round(1)} g"
|
||||||
|
- if data.total_sugars_g.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th - Sugars
|
||||||
|
%td= "#{data.total_sugars_g.to_f.round(1)} g"
|
||||||
|
- if data.total_dietary_fibre_g.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Fibre
|
||||||
|
%td= "#{data.total_dietary_fibre_g.to_f.round(1)} g"
|
||||||
|
- if data.sodium_na_mg.to_f > 0
|
||||||
|
%tr
|
||||||
|
%th Sodium
|
||||||
|
%td= "#{data.sodium_na_mg.to_f.round(1)} mg"
|
||||||
|
.card-footer
|
||||||
|
= link_to "See more", "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
|
||||||
@@ -54,3 +54,7 @@
|
|||||||
- if crop.growing_degree_days.present?
|
- if crop.growing_degree_days.present?
|
||||||
= render 'layouts/fact_card',
|
= render 'layouts/fact_card',
|
||||||
title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
|
title: 'Growing Degree Days', value: crop.growing_degree_days, description: nil
|
||||||
|
- if member_signed_in? && (!crop.height.present? || !crop.spread.present? || !crop.row_spacing.present? || !crop.growing_degree_days.present?)
|
||||||
|
.card.fact-card
|
||||||
|
.card-body.text-center
|
||||||
|
%p= link_to "Add more attributes.", edit_crop_path(@crop, anchor: ":~:text=Data")
|
||||||
|
|||||||
2
app/views/crops/_schema_org.html.haml
Normal file
2
app/views/crops/_schema_org.html.haml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
%script{type: "application/ld+json"}
|
||||||
|
= crop_jsonld_data(crop).to_json.html_safe
|
||||||
@@ -4,25 +4,28 @@
|
|||||||
%p None known.
|
%p None known.
|
||||||
- else
|
- else
|
||||||
- crop.scientific_names.each do |sn|
|
- crop.scientific_names.each do |sn|
|
||||||
- if can? :edit, sn
|
.d-inline-block
|
||||||
.dropdown.planting-actions
|
- if can? :edit, sn
|
||||||
%a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
|
.dropdown.planting-actions.d-inline-block
|
||||||
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
|
%a#planting-actions-scinames.dropdown-toggle.card-link{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}= sn.name
|
||||||
= link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
|
.dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
|
||||||
= edit_icon
|
= link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
|
||||||
= t('.edit')
|
= edit_icon
|
||||||
.dropdown-divider
|
= t('.edit')
|
||||||
= link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
|
.dropdown-divider
|
||||||
= delete_icon
|
= link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
|
||||||
= t('.delete')
|
= delete_icon
|
||||||
- else
|
= t('.delete')
|
||||||
- if sn.gbif_key
|
|
||||||
= link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
|
|
||||||
class: 'card-link',
|
|
||||||
target: "_blank",
|
|
||||||
rel: "noopener noreferrer"
|
|
||||||
- else
|
- else
|
||||||
.badge= sn.name
|
- if sn.gbif_key
|
||||||
|
= link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",
|
||||||
|
class: 'card-link',
|
||||||
|
target: "_blank",
|
||||||
|
rel: "noopener noreferrer"
|
||||||
|
- else
|
||||||
|
.badge= sn.name
|
||||||
|
- if sn.wikidata_id.present?
|
||||||
|
= link_to "WD", "https://www.wikidata.org/wiki/#{sn.wikidata_id}", class: 'badge badge-info ms-1', target: '_blank', rel: 'noopener noreferrer', title: 'Wikidata'
|
||||||
|
|
||||||
%p.text-right
|
%p.text-right
|
||||||
- if can? :edit, crop
|
- if can? :edit, crop
|
||||||
|
|||||||
13
app/views/crops/data_improvement.html.haml
Normal file
13
app/views/crops/data_improvement.html.haml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
%h1 Data Improvement
|
||||||
|
|
||||||
|
- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", public_food_key: "Public Food Key", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
|
||||||
|
|
||||||
|
%ul.nav.nav-tabs
|
||||||
|
- tabs.each do |key, value|
|
||||||
|
%li{class: "nav-item #{('active' if @active_tab == key.to_s)}"}
|
||||||
|
= link_to value, data_improvement_crops_path(tab: key)
|
||||||
|
|
||||||
|
.tab-content
|
||||||
|
.tab-pane.active
|
||||||
|
%h2= "Crops without #{tabs[@active_tab.to_sym]}"
|
||||||
|
= render 'crop_list', crops: @crops
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
- content_for :title, t('.title')
|
- content_for :title, t('.title')
|
||||||
|
- content_for :meta_description, "Browse and search for crops."
|
||||||
|
|
||||||
- content_for :buttonbar do
|
- content_for :buttonbar do
|
||||||
- if can? :wrangle, Crop
|
- if can? :wrangle, Crop
|
||||||
= link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
|
= link_to 'Wrangle Crops', wrangle_crops_path, class: 'btn btn-secondary'
|
||||||
|
= link_to 'Data Improvement', data_improvement_crops_path, class: 'btn btn-info'
|
||||||
- if can? :create, Crop
|
- if can? :create, Crop
|
||||||
= link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'
|
= link_to 'Add New Crop', new_crop_path, class: 'btn btn-primary'
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,13 @@
|
|||||||
- content_for :title, @crop.name
|
= render 'schema_org', crop: @crop
|
||||||
|
- content_for :title do
|
||||||
|
= @crop.name.titleize
|
||||||
|
- if @crop.default_scientific_name.present?
|
||||||
|
= " (#{@crop.default_scientific_name})"
|
||||||
|
- content_for :meta_description do
|
||||||
|
- if @crop.description.present?
|
||||||
|
= @crop.description
|
||||||
|
- else
|
||||||
|
= "Learn how to grow #{@crop.name}."
|
||||||
- content_for :opengraph do
|
- content_for :opengraph do
|
||||||
= tag("meta", property: "og:image", content: crop_image_path(@crop))
|
= tag("meta", property: "og:image", content: crop_image_path(@crop))
|
||||||
= tag("meta", property: "og:title", content: @crop.name)
|
= tag("meta", property: "og:title", content: @crop.name)
|
||||||
@@ -37,6 +46,11 @@
|
|||||||
%h2 Video
|
%h2 Video
|
||||||
.embed-responsive.embed-responsive-16by9
|
.embed-responsive.embed-responsive-16by9
|
||||||
%iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(crop_or_parent(@crop, :en_youtube_url))}", allowfullscreen: true }
|
%iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(crop_or_parent(@crop, :en_youtube_url))}", allowfullscreen: true }
|
||||||
|
- else
|
||||||
|
- if member_signed_in?
|
||||||
|
%section.youtube
|
||||||
|
%h2 Video
|
||||||
|
%p= link_to "Submit a video.", edit_crop_path(@crop, anchor: ":~:text=Youtube")
|
||||||
|
|
||||||
%section.photos
|
%section.photos
|
||||||
= cute_icon
|
= cute_icon
|
||||||
@@ -76,6 +90,7 @@
|
|||||||
|
|
||||||
%section.posts= render 'crops/posts', crop: @crop
|
%section.posts= render 'crops/posts', crop: @crop
|
||||||
|
|
||||||
|
= render 'history', crop: @crop
|
||||||
.col-md-3
|
.col-md-3
|
||||||
= cute_icon
|
= cute_icon
|
||||||
.card
|
.card
|
||||||
@@ -121,6 +136,8 @@
|
|||||||
|
|
||||||
= render 'openfarm_data', crop: @crop
|
= render 'openfarm_data', crop: @crop
|
||||||
|
|
||||||
|
= render 'nutritional_data', crop: @crop
|
||||||
|
|
||||||
= cute_icon
|
= cute_icon
|
||||||
.card
|
.card
|
||||||
.card-body
|
.card-body
|
||||||
@@ -133,6 +150,12 @@
|
|||||||
= icon 'fas', 'external-link-alt'
|
= icon 'fas', 'external-link-alt'
|
||||||
Wikipedia (English)
|
Wikipedia (English)
|
||||||
|
|
||||||
|
- if @crop.public_food_key.present?
|
||||||
|
%li.list-group-item
|
||||||
|
= link_to "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{@crop.public_food_key}", target: "_blank", rel: "noopener noreferrer" do
|
||||||
|
= icon 'fas', 'external-link-alt'
|
||||||
|
Australian Food Composition Database
|
||||||
|
|
||||||
%li.list-group-item
|
%li.list-group-item
|
||||||
= link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
|
= link_to "https://www.gardenate.com/plant/#{CGI.escape @crop.name}",
|
||||||
target: "_blank",
|
target: "_blank",
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
%h2 Crops
|
%h2 Crops
|
||||||
|
|
||||||
%ul#myTab.nav.nav-tabs{role: "tablist"}
|
%ul#myTab.nav.nav-tabs{role: "tablist"}
|
||||||
|
%li.nav-item
|
||||||
|
%a#home-tab.nav-link{ href: admin_crops_path, role: "tab", class: ''}
|
||||||
|
Recently edited
|
||||||
%li.nav-item
|
%li.nav-item
|
||||||
%a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab", class: @approval_status.blank? ? 'active' : ''}
|
%a#home-tab.nav-link{ href: wrangle_crops_path, role: "tab", class: @approval_status.blank? ? 'active' : ''}
|
||||||
Recently added
|
Recently added
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
- content_for(:title) do
|
- content_for(:title) do
|
||||||
= title('harvests', @owner, @crop, @planting)
|
= title('harvests', @owner, @crop, @planting)
|
||||||
|
- content_for :meta_description, "Browse and search for harvests."
|
||||||
- content_for :breadcrumbs do
|
- content_for :breadcrumbs do
|
||||||
- if @owner
|
- if @owner
|
||||||
%li.breadcrumb-item= link_to 'Harvests', harvests_path
|
%li.breadcrumb-item= link_to 'Harvests', harvests_path
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
= content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
|
= content_for :title, "#{@harvest.crop} harvested by #{@harvest.owner}"
|
||||||
|
- content_for :meta_description do
|
||||||
|
- if @harvest.description.present?
|
||||||
|
= @harvest.description
|
||||||
|
- else
|
||||||
|
= "#{@harvest.crop} harvested by #{@harvest.owner}."
|
||||||
- content_for :opengraph do
|
- content_for :opengraph do
|
||||||
= tag("meta", property: "og:image", content: harvest_image_path(@harvest))
|
= tag("meta", property: "og:image", content: harvest_image_path(@harvest))
|
||||||
= tag("meta", property: "og:image:user_generated", content: "true")
|
= tag("meta", property: "og:image:user_generated", content: "true")
|
||||||
@@ -7,6 +12,9 @@
|
|||||||
= tag("meta", property: "og:url", content: request.original_url)
|
= 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: ENV['GROWSTUFF_SITE_NAME'])
|
||||||
|
|
||||||
|
%script{type: "application/ld+json"}
|
||||||
|
= crop_jsonld_data(@harvest.crop, full_attributes: false).to_json.html_safe
|
||||||
|
|
||||||
- content_for :breadcrumbs do
|
- content_for :breadcrumbs do
|
||||||
%li.breadcrumb-item= link_to 'Harvests', harvests_path
|
%li.breadcrumb-item= link_to 'Harvests', harvests_path
|
||||||
%li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
|
%li.breadcrumb-item= link_to @harvest.owner, member_harvests_path(@harvest.owner)
|
||||||
@@ -68,3 +76,4 @@
|
|||||||
|
|
||||||
.col-md-4.col-xs-12
|
.col-md-4.col-xs-12
|
||||||
= render @harvest.crop
|
= render @harvest.crop
|
||||||
|
= render 'crops/nutritional_data', crop: @harvest.crop
|
||||||
|
|||||||
37
app/views/home/community_gardens.html.haml
Normal file
37
app/views/home/community_gardens.html.haml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
- content_for :title do
|
||||||
|
= t('community_gardens.title')
|
||||||
|
- content_for :meta_description do
|
||||||
|
= t('community_gardens.meta_description')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.container.mt-5
|
||||||
|
|
||||||
|
.row
|
||||||
|
.col-lg-6.col-sm-12
|
||||||
|
.row
|
||||||
|
%h1.display-4= t('community_gardens.header')
|
||||||
|
%p.lead= t('community_gardens.lead')
|
||||||
|
.row
|
||||||
|
%h2= t('community_gardens.features_title')
|
||||||
|
%ul
|
||||||
|
%li Track all your plantings and harvests
|
||||||
|
%li Keep notes your community's progress
|
||||||
|
%li Add collaborators to your garden plots
|
||||||
|
%li See what other community gardens are growing
|
||||||
|
%li Get advice and support from our community of gardeners
|
||||||
|
|
||||||
|
.row
|
||||||
|
%h2= t('community_gardens.get_started')
|
||||||
|
%p= t('community_gardens.get_started_text')
|
||||||
|
%p
|
||||||
|
= link_to t('.sign_up'), new_member_registration_path, class: 'btn btn-success btn-lg'
|
||||||
|
.row
|
||||||
|
%h2= t('community_gardens.collaborate')
|
||||||
|
%p= t('community_gardens.collaborate_text')
|
||||||
|
%p
|
||||||
|
= link_to t('community_gardens.learn_more'), gardens_path, class: 'btn btn-info btn-lg'
|
||||||
|
|
||||||
|
.col-lg-6.d-lg-block.d-xs-none
|
||||||
|
.container
|
||||||
|
=image_tag("girlwithvegetables-0038331hotifw.svg", width: "100%")
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
- content_for :title do
|
- content_for :title do
|
||||||
= ENV['GROWSTUFF_SITE_NAME']
|
= ENV['GROWSTUFF_SITE_NAME']
|
||||||
|
- content_for :meta_description do
|
||||||
|
Growstuff is a community of food gardeners. Let's learn to grow food together.
|
||||||
|
|
||||||
- if member_signed_in?
|
- if member_signed_in?
|
||||||
.row
|
.row
|
||||||
|
|||||||
@@ -27,9 +27,14 @@
|
|||||||
|
|
||||||
%title
|
%title
|
||||||
= content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
|
= content_for?(:title) ? yield(:title) + " - #{ENV['GROWSTUFF_SITE_NAME']} " : ENV['GROWSTUFF_SITE_NAME']
|
||||||
|
- if content_for?(:meta_description)
|
||||||
|
%meta{name: "description", content: yield(:meta_description)}
|
||||||
|
- else
|
||||||
|
%meta{name: "description", content: "Growstuff is a community of food gardeners. Let's learn to grow food together. All our data is open data."}
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
= stylesheet_link_tag "application", media: "all"
|
= stylesheet_link_tag "application", media: "all"
|
||||||
|
|
||||||
%link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
|
%link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
|
||||||
%link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
|
%link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
|
||||||
= favicon_link_tag 'favicon.ico'
|
= favicon_link_tag 'favicon.ico'
|
||||||
|
= tag("meta", name: "google-site-verification", content: "j249rPGdBqZ7gcShcdsSXCnGN5lqCuTISJnlQXxOfu4")
|
||||||
|
|||||||
@@ -52,6 +52,7 @@
|
|||||||
.dropdown-menu{"aria-labelledby" => "navbarDropdown"}
|
.dropdown-menu{"aria-labelledby" => "navbarDropdown"}
|
||||||
= link_to t('.community_map'), places_path, class: 'dropdown-item'
|
= link_to t('.community_map'), places_path, class: 'dropdown-item'
|
||||||
= link_to t('.browse_members'), members_path, class: 'dropdown-item'
|
= link_to t('.browse_members'), members_path, class: 'dropdown-item'
|
||||||
|
= link_to t('.community_gardens'), community_gardens_path, class: 'dropdown-item'
|
||||||
= link_to t('.posts'), posts_path, class: 'dropdown-item'
|
= link_to t('.posts'), posts_path, class: 'dropdown-item'
|
||||||
= link_to t('.forums'), forums_path, class: 'dropdown-item'
|
= link_to t('.forums'), forums_path, class: 'dropdown-item'
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
- content_for :title, @member.login_name
|
- content_for :title, @member.login_name
|
||||||
|
- content_for :meta_description do
|
||||||
|
- if @member.bio.present?
|
||||||
|
= @member.bio
|
||||||
|
- else
|
||||||
|
= "Gardening profile for #{@member.login_name}."
|
||||||
- content_for :opengraph do
|
- content_for :opengraph do
|
||||||
= tag("meta", property: "og:image", content: avatar_uri(@member, 200))
|
= tag("meta", property: "og:image", content: avatar_uri(@member, 200))
|
||||||
= tag("meta", property: "og:image:user_generated", content: "true")
|
= tag("meta", property: "og:image:user_generated", content: "true")
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
- content_for :title, title('plantings', @owner, @crop, @planting)
|
- content_for :title, title('plantings', @owner, @crop, @planting)
|
||||||
|
- content_for :meta_description, "Browse and search for plantings."
|
||||||
|
|
||||||
- content_for :breadcrumbs do
|
- content_for :breadcrumbs do
|
||||||
- if @owner
|
- if @owner
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
= content_for :title, "#{@planting.crop} in #{@planting.location}"
|
= content_for :title, "#{@planting.crop} in #{@planting.location}"
|
||||||
|
- content_for :meta_description do
|
||||||
|
- if @planting.description.present?
|
||||||
|
= @planting.description
|
||||||
|
- else
|
||||||
|
= "#{@planting.crop} planted in #{@planting.location} by #{@planting.owner}."
|
||||||
- content_for :opengraph do
|
- content_for :opengraph do
|
||||||
= tag("meta", property: "og:image", content: planting_image_path(@planting))
|
= tag("meta", property: "og:image", content: planting_image_path(@planting))
|
||||||
= tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
|
= tag("meta", property: "og:title", content: "#{@planting.crop} in #{@planting.location}")
|
||||||
@@ -16,6 +21,8 @@
|
|||||||
"ratingValue": "#{@planting.overall_rating}",
|
"ratingValue": "#{@planting.overall_rating}",
|
||||||
"bestRating": "5"
|
"bestRating": "5"
|
||||||
}
|
}
|
||||||
|
%script{type: "application/ld+json"}
|
||||||
|
= crop_jsonld_data(@planting.crop, full_attributes: false).to_json.html_safe
|
||||||
|
|
||||||
- content_for :breadcrumbs do
|
- content_for :breadcrumbs do
|
||||||
%li.breadcrumb-item= link_to 'Plantings', plantings_path
|
%li.breadcrumb-item= link_to 'Plantings', plantings_path
|
||||||
|
|||||||
@@ -24,6 +24,10 @@
|
|||||||
= f.label :name, class: 'control-label col-md-2'
|
= f.label :name, class: 'control-label col-md-2'
|
||||||
.col-md-8
|
.col-md-8
|
||||||
= f.text_field :name, class: 'form-control'
|
= f.text_field :name, class: 'form-control'
|
||||||
|
.form-group
|
||||||
|
= f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
|
||||||
|
.col-md-8
|
||||||
|
= f.text_field :wikidata_id, class: 'form-control', pattern: 'Q[1-9][0-9]*'
|
||||||
.form-group
|
.form-group
|
||||||
.form-actions.col-md-offset-2.col-md-8
|
.form-actions.col-md-offset-2.col-md-8
|
||||||
= f.submit 'Save', class: 'btn btn-primary'
|
= f.submit 'Save', class: 'btn btn-primary'
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
%li.breadcrumb-item.active= link_to 'Seeds', seeds_path
|
%li.breadcrumb-item.active= link_to 'Seeds', seeds_path
|
||||||
|
|
||||||
- content_for :title, title('seeds', @owner, @crop, @planting)
|
- content_for :title, title('seeds', @owner, @crop, @planting)
|
||||||
|
- content_for :meta_description, "Browse and search for seeds."
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-2
|
.col-md-2
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
- content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
|
- content_for :title, "#{@seed.owner}'s #{@seed.crop} seeds"
|
||||||
|
- content_for :meta_description do
|
||||||
|
- if @seed.description.present?
|
||||||
|
= @seed.description
|
||||||
|
- else
|
||||||
|
= "Seeds for #{@seed.crop.name}, shared by #{@seed.owner}."
|
||||||
- content_for :opengraph do
|
- content_for :opengraph do
|
||||||
= tag("meta", property: "og:image", content: seed_image_path(@seed))
|
= tag("meta", property: "og:image", content: seed_image_path(@seed))
|
||||||
- if @seed.description
|
- if @seed.description
|
||||||
@@ -8,6 +13,8 @@
|
|||||||
= tag("meta", property: "og:url", content: request.original_url)
|
= 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: ENV['GROWSTUFF_SITE_NAME'])
|
||||||
|
|
||||||
|
%script{type: "application/ld+json"}
|
||||||
|
= crop_jsonld_data(@seed.crop, full_attributes: false).to_json.html_safe
|
||||||
|
|
||||||
- content_for :breadcrumbs do
|
- content_for :breadcrumbs do
|
||||||
%li.breadcrumb-item= link_to 'Seeds', seeds_path
|
%li.breadcrumb-item= link_to 'Seeds', seeds_path
|
||||||
|
|||||||
17
app/views/shared/_version_changeset.html.haml
Normal file
17
app/views/shared/_version_changeset.html.haml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
- if version.changeset.present?
|
||||||
|
.changes
|
||||||
|
- version.changeset.each do |field, changes|
|
||||||
|
- if field != "updated_at"
|
||||||
|
.row
|
||||||
|
.col-md-3
|
||||||
|
%strong= field.humanize
|
||||||
|
.col-md-9
|
||||||
|
- if changes[0].present?
|
||||||
|
%em= changes[0]
|
||||||
|
- else
|
||||||
|
%em (blank)
|
||||||
|
%span.text-muted ->
|
||||||
|
- if changes[1].present?
|
||||||
|
%em= changes[1]
|
||||||
|
- else
|
||||||
|
%em (blank)
|
||||||
@@ -3,4 +3,6 @@
|
|||||||
# This file is used by Rack-based servers to start the application.
|
# This file is used by Rack-based servers to start the application.
|
||||||
|
|
||||||
require File.expand_path('config/environment', __dir__)
|
require File.expand_path('config/environment', __dir__)
|
||||||
|
|
||||||
|
use Rack::Deflater
|
||||||
run Rails.application
|
run Rails.application
|
||||||
|
|||||||
@@ -219,6 +219,18 @@ en:
|
|||||||
pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
|
pwa_ios_steps_html: 1. Tap the <strong>Share</strong> button in Safari.<br>2. Scroll down and tap <strong>Add to Home Screen</strong>'.
|
||||||
pwa_ios_title: For iOS (iPhone/iPad)
|
pwa_ios_title: For iOS (iPhone/iPad)
|
||||||
pwa_title: Want to install Growstuff on your phone?
|
pwa_title: Want to install Growstuff on your phone?
|
||||||
|
community_gardens:
|
||||||
|
title: Community Gardens on Growstuff
|
||||||
|
meta_description: Manage your community garden, track your plantings, and collaborate with other gardeners.
|
||||||
|
header: Community Gardens
|
||||||
|
lead: Growstuff is open source and the perfect place to manage your community garden. Track your plantings, celebrate your harvests, and collaborate with your fellow gardeners, all in one place.
|
||||||
|
get_started: Get Started Today
|
||||||
|
get_started_text: Signing up for Growstuff is free and easy. Create an account to start tracking your garden today.
|
||||||
|
sign_up: Sign up for free
|
||||||
|
collaborate: Collaborate with Your Team
|
||||||
|
collaborate_text: Invite other gardeners to collaborate on your garden plots. Share the work, share the harvest, and grow together as a community.
|
||||||
|
learn_more: Learn more about gardens
|
||||||
|
features_title: Features for Community Gardens
|
||||||
label:
|
label:
|
||||||
days_until_harvest: "%{number} days"
|
days_until_harvest: "%{number} days"
|
||||||
weeks_until_harvest: "%{number} weeks until harvest"
|
weeks_until_harvest: "%{number} weeks until harvest"
|
||||||
@@ -235,6 +247,7 @@ en:
|
|||||||
browse_members: Browse Members
|
browse_members: Browse Members
|
||||||
community: Community
|
community: Community
|
||||||
community_map: Community Map
|
community_map: Community Map
|
||||||
|
community_gardens: Community Gardens
|
||||||
garden_type: Garden Type
|
garden_type: Garden Type
|
||||||
garden_types: Garden Types
|
garden_types: Garden Types
|
||||||
crop_wrangling: Crop Wrangling
|
crop_wrangling: Crop Wrangling
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ Rails.application.routes.draw do
|
|||||||
resources :authentications, only: %i(create destroy)
|
resources :authentications, only: %i(create destroy)
|
||||||
|
|
||||||
get "home/index"
|
get "home/index"
|
||||||
|
get '/community-gardens', to: 'home#community_gardens'
|
||||||
root to: 'home#index'
|
root to: 'home#index'
|
||||||
|
|
||||||
concern :has_photos do
|
concern :has_photos do
|
||||||
@@ -89,6 +90,14 @@ Rails.application.routes.draw do
|
|||||||
get 'wrangle'
|
get 'wrangle'
|
||||||
get 'hierarchy'
|
get 'hierarchy'
|
||||||
get 'search'
|
get 'search'
|
||||||
|
get 'data_improvement'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
namespace :admin do
|
||||||
|
resources :crops, only: [:index]
|
||||||
|
resources :versions, only: [] do
|
||||||
|
post :revert, on: :member, as: :revert
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
55
config/sitemap.rb
Normal file
55
config/sitemap.rb
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'aws-sdk-s3'
|
||||||
|
|
||||||
|
# Set the host name for URL creation
|
||||||
|
SitemapGenerator::Sitemap.default_host = 'https://growstuff.org'
|
||||||
|
|
||||||
|
SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
|
||||||
|
ENV['S3_SITEMAP_BUCKET'],
|
||||||
|
access_key_id: ENV['S3_ACCESS_KEY'],
|
||||||
|
secret_access_key: ENV['S3_SECRET_KEY'],
|
||||||
|
region: ENV.fetch('S3_AWS_REGION', 'us-east-1')
|
||||||
|
)
|
||||||
|
|
||||||
|
SitemapGenerator::Sitemap.create do
|
||||||
|
# Add static pages
|
||||||
|
add '/about', changefreq: 'monthly'
|
||||||
|
add '/community', changefreq: 'monthly'
|
||||||
|
add '/contact', changefreq: 'monthly'
|
||||||
|
|
||||||
|
# Add crops
|
||||||
|
Crop.approved.find_each do |crop|
|
||||||
|
add crop_path(crop), lastmod: crop.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add members
|
||||||
|
Member.kept.find_each do |member|
|
||||||
|
add member_path(member), lastmod: member.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add plantings
|
||||||
|
Planting.active.find_each do |planting|
|
||||||
|
add planting_path(planting), lastmod: planting.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add seeds
|
||||||
|
Seed.active.find_each do |seed|
|
||||||
|
add seed_path(seed), lastmod: seed.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add harvests
|
||||||
|
Harvest.find_each do |harvest|
|
||||||
|
add harvest_path(harvest), lastmod: harvest.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add posts
|
||||||
|
Post.find_each do |post|
|
||||||
|
add post_path(post), lastmod: post.updated_at
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add photos
|
||||||
|
Photo.find_each do |photo|
|
||||||
|
add photo_path(photo), lastmod: photo.updated_at
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,301 @@
|
|||||||
|
class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
create_table :australian_food_classification_data do |t|
|
||||||
|
t.string :public_food_key, index: true, unique: true
|
||||||
|
t.string :classification
|
||||||
|
t.string :food_name
|
||||||
|
t.decimal :energy_with_dietary_fibre_equated_kj
|
||||||
|
t.decimal :energy_without_dietary_fibre_equated_kj
|
||||||
|
t.decimal :moisture_water_g
|
||||||
|
t.decimal :protein_g
|
||||||
|
t.decimal :nitrogen_g
|
||||||
|
t.decimal :fat_total_g
|
||||||
|
t.decimal :ash_g
|
||||||
|
t.decimal :total_dietary_fibre_g
|
||||||
|
t.decimal :alcohol_g
|
||||||
|
t.decimal :fructose_g
|
||||||
|
t.decimal :glucose_g
|
||||||
|
t.decimal :sucrose_g
|
||||||
|
t.decimal :maltose_g
|
||||||
|
t.decimal :lactose_g
|
||||||
|
t.decimal :galactose_g
|
||||||
|
t.decimal :maltotrios_g
|
||||||
|
t.decimal :total_sugars_g
|
||||||
|
t.decimal :added_sugars_g
|
||||||
|
t.decimal :free_sugars_g
|
||||||
|
t.decimal :starch_g
|
||||||
|
t.decimal :dextrin_g
|
||||||
|
t.decimal :glycerol_g
|
||||||
|
t.decimal :glycogen_g
|
||||||
|
t.decimal :inulin_g
|
||||||
|
t.decimal :erythritol_g
|
||||||
|
t.decimal :maltitol_g
|
||||||
|
t.decimal :mannitol_g
|
||||||
|
t.decimal :xylitol_g
|
||||||
|
t.decimal :maltodextrin_g
|
||||||
|
t.decimal :oligosaccharides_g
|
||||||
|
t.decimal :polydextrose_g
|
||||||
|
t.decimal :raffinose_g
|
||||||
|
t.decimal :stachyose_g
|
||||||
|
t.decimal :sorbitol_g
|
||||||
|
t.decimal :resistant_starch_g
|
||||||
|
t.decimal :available_carbohydrate_without_sugar_alcohols_g
|
||||||
|
t.decimal :available_carbohydrate_with_sugar_alcohols_g
|
||||||
|
t.decimal :acetic_acid_g
|
||||||
|
t.decimal :citric_acid_g
|
||||||
|
t.decimal :fumaric_acid_g
|
||||||
|
t.decimal :lactic_acid_g
|
||||||
|
t.decimal :malic_acid_g
|
||||||
|
t.decimal :oxalic_acid_g
|
||||||
|
t.decimal :propionic_acid_g
|
||||||
|
t.decimal :quinic_acid_g
|
||||||
|
t.decimal :shikimic_acid_g
|
||||||
|
t.decimal :succinic_acid_g
|
||||||
|
t.decimal :tartaric_acid_g
|
||||||
|
t.decimal :aluminium_al_ug
|
||||||
|
t.decimal :antimony_sb_ug
|
||||||
|
t.decimal :arsenic_as_ug
|
||||||
|
t.decimal :cadmium_cd_ug
|
||||||
|
t.decimal :calcium_ca_mg
|
||||||
|
t.decimal :chromium_cr_ug
|
||||||
|
t.decimal :chloride_cl_mg
|
||||||
|
t.decimal :cobalt_co_ug
|
||||||
|
t.decimal :copper_cu_mg
|
||||||
|
t.decimal :fluoride_f_ug
|
||||||
|
t.decimal :iodine_i_ug
|
||||||
|
t.decimal :iron_fe_mg
|
||||||
|
t.decimal :lead_pb_ug
|
||||||
|
t.decimal :magnesium_mg_mg
|
||||||
|
t.decimal :manganese_mn_mg
|
||||||
|
t.decimal :mercury_hg_ug
|
||||||
|
t.decimal :molybdenum_mo_ug
|
||||||
|
t.decimal :nickel_ni_ug
|
||||||
|
t.decimal :phosphorus_p_mg
|
||||||
|
t.decimal :potassium_k_mg
|
||||||
|
t.decimal :selenium_se_ug
|
||||||
|
t.decimal :sodium_na_mg
|
||||||
|
t.decimal :sulphur_s_mg
|
||||||
|
t.decimal :tin_sn_ug
|
||||||
|
t.decimal :zinc_zn_mg
|
||||||
|
t.decimal :retinol_preformed_vitamin_a_ug
|
||||||
|
t.decimal :alpha_carotene_ug
|
||||||
|
t.decimal :beta_carotene_ug
|
||||||
|
t.decimal :cryptoxanthin_ug
|
||||||
|
t.decimal :beta_carotene_equivalents_provitamin_a_ug
|
||||||
|
t.decimal :vitamin_a_retinol_equivalents_ug
|
||||||
|
t.decimal :lutein_ug
|
||||||
|
t.decimal :lycopene_ug
|
||||||
|
t.decimal :xanthophyl_ug
|
||||||
|
t.decimal :thiamin_b1_mg
|
||||||
|
t.decimal :riboflavin_b2_mg
|
||||||
|
t.decimal :niacin_b3_mg
|
||||||
|
t.decimal :niacin_derived_from_tryptophan_mg
|
||||||
|
t.decimal :niacin_derived_equivalents_mg
|
||||||
|
t.decimal :pantothenic_acid_b5_mg
|
||||||
|
t.decimal :pyridoxine_b6_mg
|
||||||
|
t.decimal :biotin_b7_ug
|
||||||
|
t.decimal :cobalamin_b12_ug
|
||||||
|
t.decimal :folate_natural_ug
|
||||||
|
t.decimal :folic_acid_ug
|
||||||
|
t.decimal :total_folates_ug
|
||||||
|
t.decimal :dietary_folate_equivalents_ug
|
||||||
|
t.decimal :vitamin_c_mg
|
||||||
|
t.decimal :cholecalciferol_d3_ug
|
||||||
|
t.decimal :ergocalciferol_d2_ug
|
||||||
|
t.decimal :c25_hydroxy_cholecalciferol_25_oh_d3_ug
|
||||||
|
t.decimal :c25_hydroxy_ergocalciferol_25_oh_d2_ug
|
||||||
|
t.decimal :vitamin_d3_equivalents_ug
|
||||||
|
t.decimal :alpha_tocopherol_mg
|
||||||
|
t.decimal :alpha_tocotrienol_mg
|
||||||
|
t.decimal :beta_tocopherol_mg
|
||||||
|
t.decimal :beta_tocotrienol_mg
|
||||||
|
t.decimal :delta_tocopherol_mg
|
||||||
|
t.decimal :delta_tocotrienol_mg
|
||||||
|
t.decimal :gamma_tocopherol_mg
|
||||||
|
t.decimal :gamma_tocotrienol_mg
|
||||||
|
t.decimal :vitamin_e_mg
|
||||||
|
t.decimal :c4_t
|
||||||
|
t.decimal :c6_t
|
||||||
|
t.decimal :c8_t
|
||||||
|
t.decimal :c10_t
|
||||||
|
t.decimal :c11_t
|
||||||
|
t.decimal :c12_t
|
||||||
|
t.decimal :c13_t
|
||||||
|
t.decimal :c14_t
|
||||||
|
t.decimal :c15_t
|
||||||
|
t.decimal :c16_t
|
||||||
|
t.decimal :c17_t
|
||||||
|
t.decimal :c18_t
|
||||||
|
t.decimal :c19_t
|
||||||
|
t.decimal :c20_t
|
||||||
|
t.decimal :c21_t
|
||||||
|
t.decimal :c22_t
|
||||||
|
t.decimal :c23_t
|
||||||
|
t.decimal :c24_t
|
||||||
|
t.decimal :total_saturated_fatty_acids_equated_t
|
||||||
|
t.decimal :c10_1_t
|
||||||
|
t.decimal :c12_1_t
|
||||||
|
t.decimal :c14_1_t
|
||||||
|
t.decimal :c15_1_t
|
||||||
|
t.decimal :c16_1_t
|
||||||
|
t.decimal :c17_1_t
|
||||||
|
t.decimal :c18_1_t
|
||||||
|
t.decimal :c18_1w5_t
|
||||||
|
t.decimal :c18_1w6_t
|
||||||
|
t.decimal :c18_1w7_t
|
||||||
|
t.decimal :c18_1w9_t
|
||||||
|
t.decimal :c20_1_t
|
||||||
|
t.decimal :c20_1w9_t
|
||||||
|
t.decimal :c20_1w13_t
|
||||||
|
t.decimal :c20_1w11_t
|
||||||
|
t.decimal :c22_1_t
|
||||||
|
t.decimal :c22_1w9_t
|
||||||
|
t.decimal :c22_1w11_t
|
||||||
|
t.decimal :c24_1_t
|
||||||
|
t.decimal :c24_1w9_t
|
||||||
|
t.decimal :c24_1w11_t
|
||||||
|
t.decimal :c24_1w13_t
|
||||||
|
t.decimal :total_monounsaturated_fatty_acids_equated_t
|
||||||
|
t.decimal :c12_2_t
|
||||||
|
t.decimal :c16_2w4_t
|
||||||
|
t.decimal :c16_3_t
|
||||||
|
t.decimal :c18_2w6_t
|
||||||
|
t.decimal :c18_3w3_t
|
||||||
|
t.decimal :c18_3w4_t
|
||||||
|
t.decimal :c18_3w6_t
|
||||||
|
t.decimal :c18_4w1_t
|
||||||
|
t.decimal :c18_4w3_t
|
||||||
|
t.decimal :c20_2_t
|
||||||
|
t.decimal :c20_2w6_t
|
||||||
|
t.decimal :c20_3_t
|
||||||
|
t.decimal :c20_4_t
|
||||||
|
t.decimal :c20_3w3_t
|
||||||
|
t.decimal :c20_3w6_t
|
||||||
|
t.decimal :c20_4w3_t
|
||||||
|
t.decimal :c20_4w6_t
|
||||||
|
t.decimal :c20_5w3_t
|
||||||
|
t.decimal :c21_5w3_t
|
||||||
|
t.decimal :c22_2_t
|
||||||
|
t.decimal :c22_2w6_t
|
||||||
|
t.decimal :c22_4w6_t
|
||||||
|
t.decimal :c22_5w3_t
|
||||||
|
t.decimal :c22_5w6_t
|
||||||
|
t.decimal :c22_6w3_t
|
||||||
|
t.decimal :total_polyunsaturated_fatty_acids_equated_t
|
||||||
|
t.decimal :total_long_chain_omega_3_fatty_acids_equated_t
|
||||||
|
t.decimal :total_undifferentiated_fatty_acids_t
|
||||||
|
t.decimal :total_trans_fatty_acids_imputed_t
|
||||||
|
t.decimal :c4_g
|
||||||
|
t.decimal :c6_g
|
||||||
|
t.decimal :c8_g
|
||||||
|
t.decimal :c10_g
|
||||||
|
t.decimal :c11_g
|
||||||
|
t.decimal :c12_g
|
||||||
|
t.decimal :c13_g
|
||||||
|
t.decimal :c14_g
|
||||||
|
t.decimal :c15_g
|
||||||
|
t.decimal :c16_g
|
||||||
|
t.decimal :c17_g
|
||||||
|
t.decimal :c18_g
|
||||||
|
t.decimal :c19_g
|
||||||
|
t.decimal :c20_g
|
||||||
|
t.decimal :c21_g
|
||||||
|
t.decimal :c22_g
|
||||||
|
t.decimal :c23_g
|
||||||
|
t.decimal :c24_g
|
||||||
|
t.decimal :total_saturated_fatty_acids_equated_g
|
||||||
|
t.decimal :c10_1_g
|
||||||
|
t.decimal :c12_1_g
|
||||||
|
t.decimal :c14_1_g
|
||||||
|
t.decimal :c15_1_g
|
||||||
|
t.decimal :c16_1_g
|
||||||
|
t.decimal :c17_1_g
|
||||||
|
t.decimal :c18_1_g
|
||||||
|
t.decimal :c18_1w5_mg
|
||||||
|
t.decimal :c18_1w6_mg
|
||||||
|
t.decimal :c18_1w7_g
|
||||||
|
t.decimal :c18_1w9_mg
|
||||||
|
t.decimal :c20_1_g
|
||||||
|
t.decimal :c20_1w9_mg
|
||||||
|
t.decimal :c20_1w13_mg
|
||||||
|
t.decimal :c20_1w11_mg
|
||||||
|
t.decimal :c22_1_g
|
||||||
|
t.decimal :c22_1w9_mg
|
||||||
|
t.decimal :c22_1w11_mg
|
||||||
|
t.decimal :c24_1_g
|
||||||
|
t.decimal :c24_1w9_mg
|
||||||
|
t.decimal :c24_1w11_mg
|
||||||
|
t.decimal :c24_1w13_mg
|
||||||
|
t.decimal :total_monounsaturated_fatty_acids_equated_g
|
||||||
|
t.decimal :c12_2_g
|
||||||
|
t.decimal :c16_2w4_mg
|
||||||
|
t.decimal :c16_3_g
|
||||||
|
t.decimal :c18_2w6_g
|
||||||
|
t.decimal :c18_3w3_g
|
||||||
|
t.decimal :c18_3w4_g
|
||||||
|
t.decimal :c18_3w6_mg
|
||||||
|
t.decimal :c18_4w1_g
|
||||||
|
t.decimal :c18_4w3_mg
|
||||||
|
t.decimal :c20_2_mg
|
||||||
|
t.decimal :c20_2w6_mg
|
||||||
|
t.decimal :c20_3_mg
|
||||||
|
t.decimal :c20_3w3_mg
|
||||||
|
t.decimal :c20_3w6_mg
|
||||||
|
t.decimal :c20_4_g
|
||||||
|
t.decimal :c20_4w3_mg
|
||||||
|
t.decimal :c20_4w6_mg
|
||||||
|
t.decimal :c20_5w3_mg
|
||||||
|
t.decimal :c21_5w3_g
|
||||||
|
t.decimal :c22_5w3_mg
|
||||||
|
t.decimal :c22_4w6_mg
|
||||||
|
t.decimal :c22_2_g
|
||||||
|
t.decimal :c22_2w6_mg
|
||||||
|
t.decimal :c22_5w6_g
|
||||||
|
t.decimal :c22_6w3_mg
|
||||||
|
t.decimal :total_polyunsaturated_fatty_acids_equated_g
|
||||||
|
t.decimal :total_long_chain_omega_3_fatty_acids_equated_mg
|
||||||
|
t.decimal :total_undifferentiated_fatty_acids_mass_basis_basis_mg
|
||||||
|
t.decimal :total_trans_fatty_acids_imputed_mg
|
||||||
|
t.decimal :caffeine_mg
|
||||||
|
t.decimal :cholesterol_mg
|
||||||
|
t.decimal :alanine_mg_gn
|
||||||
|
t.decimal :arginine_mg_gn
|
||||||
|
t.decimal :aspartic_acid_mg_gn
|
||||||
|
t.decimal :cystine_plus_cysteine_mg_gn
|
||||||
|
t.decimal :glutamic_acid_mg_gn
|
||||||
|
t.decimal :glycine_mg_gn
|
||||||
|
t.decimal :histidine_mg_gn
|
||||||
|
t.decimal :isoleucine_mg_gn
|
||||||
|
t.decimal :leucine_mg_gn
|
||||||
|
t.decimal :lysine_mg_gn
|
||||||
|
t.decimal :methionine_mg_gn
|
||||||
|
t.decimal :phenylalanine_mg_gn
|
||||||
|
t.decimal :proline_mg_gn
|
||||||
|
t.decimal :serine_mg_gn
|
||||||
|
t.decimal :threonine_mg_gn
|
||||||
|
t.decimal :tyrosine_mg_gn
|
||||||
|
t.decimal :tryptophan_mg_gn
|
||||||
|
t.decimal :valine_mg_gn
|
||||||
|
t.decimal :alanine_mg
|
||||||
|
t.decimal :arginine_mg
|
||||||
|
t.decimal :aspartic_acid_mg
|
||||||
|
t.decimal :cystine_plus_cysteine_mg
|
||||||
|
t.decimal :glutamic_acid_mg
|
||||||
|
t.decimal :glycine_mg
|
||||||
|
t.decimal :histidine_mg
|
||||||
|
t.decimal :isoleucine_mg
|
||||||
|
t.decimal :leucine_mg
|
||||||
|
t.decimal :lysine_mg
|
||||||
|
t.decimal :methionine_mg
|
||||||
|
t.decimal :phenylalanine_mg
|
||||||
|
t.decimal :proline_mg
|
||||||
|
t.decimal :serine_mg
|
||||||
|
t.decimal :threonine_mg
|
||||||
|
t.decimal :tyrosine_mg
|
||||||
|
t.decimal :tryptophan_mg
|
||||||
|
t.decimal :valine_mg
|
||||||
|
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
41
db/migrate/20251130035700_create_versions.rb
Normal file
41
db/migrate/20251130035700_create_versions.rb
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# This migration creates the `versions` table for the Version class.
|
||||||
|
# All other migrations PT provides are optional.
|
||||||
|
class CreateVersions < ActiveRecord::Migration[7.2]
|
||||||
|
|
||||||
|
# The largest text column available in all supported RDBMS is
|
||||||
|
# 1024^3 - 1 bytes, roughly one gibibyte. We specify a size
|
||||||
|
# so that MySQL will use `longtext` instead of `text`. Otherwise,
|
||||||
|
# when serializing very large objects, `text` might not be big enough.
|
||||||
|
TEXT_BYTES = 1_073_741_823
|
||||||
|
|
||||||
|
def change
|
||||||
|
create_table :versions do |t|
|
||||||
|
# Consider using bigint type for performance if you are going to store only numeric ids.
|
||||||
|
# t.bigint :whodunnit
|
||||||
|
t.string :whodunnit
|
||||||
|
|
||||||
|
# Known issue in MySQL: fractional second precision
|
||||||
|
# -------------------------------------------------
|
||||||
|
#
|
||||||
|
# MySQL timestamp columns do not support fractional seconds unless
|
||||||
|
# defined with "fractional seconds precision". MySQL users should manually
|
||||||
|
# add fractional seconds precision to this migration, specifically, to
|
||||||
|
# the `created_at` column.
|
||||||
|
# (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
|
||||||
|
#
|
||||||
|
# MySQL users should also upgrade to at least rails 4.2, which is the first
|
||||||
|
# version of ActiveRecord with support for fractional seconds in MySQL.
|
||||||
|
# (https://github.com/rails/rails/pull/14359)
|
||||||
|
#
|
||||||
|
# MySQL users should use the following line for `created_at`
|
||||||
|
# t.datetime :created_at, limit: 6
|
||||||
|
t.datetime :created_at
|
||||||
|
|
||||||
|
t.bigint :item_id, null: false
|
||||||
|
t.string :item_type, null: false
|
||||||
|
t.string :event, null: false
|
||||||
|
t.text :object, limit: TEXT_BYTES
|
||||||
|
end
|
||||||
|
add_index :versions, %i[item_type item_id]
|
||||||
|
end
|
||||||
|
end
|
||||||
12
db/migrate/20251130035701_add_object_changes_to_versions.rb
Normal file
12
db/migrate/20251130035701_add_object_changes_to_versions.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# This migration adds the optional `object_changes` column, in which PaperTrail
|
||||||
|
# will store the `changes` diff for each update event. See the readme for
|
||||||
|
# details.
|
||||||
|
class AddObjectChangesToVersions < ActiveRecord::Migration[7.2]
|
||||||
|
# The largest text column available in all supported RDBMS.
|
||||||
|
# See `create_versions.rb` for details.
|
||||||
|
TEXT_BYTES = 1_073_741_823
|
||||||
|
|
||||||
|
def change
|
||||||
|
add_column :versions, :object_changes, :text, limit: TEXT_BYTES
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
|
||||||
|
def change
|
||||||
|
add_column :crops, :public_food_key, :string
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class AddIndexToCropsPublicFoodKey < ActiveRecord::Migration[7.2]
|
||||||
|
def change
|
||||||
|
add_index :crops, :public_food_key
|
||||||
|
end
|
||||||
|
end
|
||||||
314
db/schema.rb
314
db/schema.rb
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
|
ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
|
||||||
@@ -73,6 +73,305 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
|
|||||||
t.index ["language"], name: "index_alternate_names_on_language"
|
t.index ["language"], name: "index_alternate_names_on_language"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "australian_food_classification_data", force: :cascade do |t|
|
||||||
|
t.string "public_food_key"
|
||||||
|
t.string "classification"
|
||||||
|
t.string "food_name"
|
||||||
|
t.decimal "energy_with_dietary_fibre_equated_kj"
|
||||||
|
t.decimal "energy_without_dietary_fibre_equated_kj"
|
||||||
|
t.decimal "moisture_water_g"
|
||||||
|
t.decimal "protein_g"
|
||||||
|
t.decimal "nitrogen_g"
|
||||||
|
t.decimal "fat_total_g"
|
||||||
|
t.decimal "ash_g"
|
||||||
|
t.decimal "total_dietary_fibre_g"
|
||||||
|
t.decimal "alcohol_g"
|
||||||
|
t.decimal "fructose_g"
|
||||||
|
t.decimal "glucose_g"
|
||||||
|
t.decimal "sucrose_g"
|
||||||
|
t.decimal "maltose_g"
|
||||||
|
t.decimal "lactose_g"
|
||||||
|
t.decimal "galactose_g"
|
||||||
|
t.decimal "maltotrios_g"
|
||||||
|
t.decimal "total_sugars_g"
|
||||||
|
t.decimal "added_sugars_g"
|
||||||
|
t.decimal "free_sugars_g"
|
||||||
|
t.decimal "starch_g"
|
||||||
|
t.decimal "dextrin_g"
|
||||||
|
t.decimal "glycerol_g"
|
||||||
|
t.decimal "glycogen_g"
|
||||||
|
t.decimal "inulin_g"
|
||||||
|
t.decimal "erythritol_g"
|
||||||
|
t.decimal "maltitol_g"
|
||||||
|
t.decimal "mannitol_g"
|
||||||
|
t.decimal "xylitol_g"
|
||||||
|
t.decimal "maltodextrin_g"
|
||||||
|
t.decimal "oligosaccharides_g"
|
||||||
|
t.decimal "polydextrose_g"
|
||||||
|
t.decimal "raffinose_g"
|
||||||
|
t.decimal "stachyose_g"
|
||||||
|
t.decimal "sorbitol_g"
|
||||||
|
t.decimal "resistant_starch_g"
|
||||||
|
t.decimal "available_carbohydrate_without_sugar_alcohols_g"
|
||||||
|
t.decimal "available_carbohydrate_with_sugar_alcohols_g"
|
||||||
|
t.decimal "acetic_acid_g"
|
||||||
|
t.decimal "citric_acid_g"
|
||||||
|
t.decimal "fumaric_acid_g"
|
||||||
|
t.decimal "lactic_acid_g"
|
||||||
|
t.decimal "malic_acid_g"
|
||||||
|
t.decimal "oxalic_acid_g"
|
||||||
|
t.decimal "propionic_acid_g"
|
||||||
|
t.decimal "quinic_acid_g"
|
||||||
|
t.decimal "shikimic_acid_g"
|
||||||
|
t.decimal "succinic_acid_g"
|
||||||
|
t.decimal "tartaric_acid_g"
|
||||||
|
t.decimal "aluminium_al_ug"
|
||||||
|
t.decimal "antimony_sb_ug"
|
||||||
|
t.decimal "arsenic_as_ug"
|
||||||
|
t.decimal "cadmium_cd_ug"
|
||||||
|
t.decimal "calcium_ca_mg"
|
||||||
|
t.decimal "chromium_cr_ug"
|
||||||
|
t.decimal "chloride_cl_mg"
|
||||||
|
t.decimal "cobalt_co_ug"
|
||||||
|
t.decimal "copper_cu_mg"
|
||||||
|
t.decimal "fluoride_f_ug"
|
||||||
|
t.decimal "iodine_i_ug"
|
||||||
|
t.decimal "iron_fe_mg"
|
||||||
|
t.decimal "lead_pb_ug"
|
||||||
|
t.decimal "magnesium_mg_mg"
|
||||||
|
t.decimal "manganese_mn_mg"
|
||||||
|
t.decimal "mercury_hg_ug"
|
||||||
|
t.decimal "molybdenum_mo_ug"
|
||||||
|
t.decimal "nickel_ni_ug"
|
||||||
|
t.decimal "phosphorus_p_mg"
|
||||||
|
t.decimal "potassium_k_mg"
|
||||||
|
t.decimal "selenium_se_ug"
|
||||||
|
t.decimal "sodium_na_mg"
|
||||||
|
t.decimal "sulphur_s_mg"
|
||||||
|
t.decimal "tin_sn_ug"
|
||||||
|
t.decimal "zinc_zn_mg"
|
||||||
|
t.decimal "retinol_preformed_vitamin_a_ug"
|
||||||
|
t.decimal "alpha_carotene_ug"
|
||||||
|
t.decimal "beta_carotene_ug"
|
||||||
|
t.decimal "cryptoxanthin_ug"
|
||||||
|
t.decimal "beta_carotene_equivalents_provitamin_a_ug"
|
||||||
|
t.decimal "vitamin_a_retinol_equivalents_ug"
|
||||||
|
t.decimal "lutein_ug"
|
||||||
|
t.decimal "lycopene_ug"
|
||||||
|
t.decimal "xanthophyl_ug"
|
||||||
|
t.decimal "thiamin_b1_mg"
|
||||||
|
t.decimal "riboflavin_b2_mg"
|
||||||
|
t.decimal "niacin_b3_mg"
|
||||||
|
t.decimal "niacin_derived_from_tryptophan_mg"
|
||||||
|
t.decimal "niacin_derived_equivalents_mg"
|
||||||
|
t.decimal "pantothenic_acid_b5_mg"
|
||||||
|
t.decimal "pyridoxine_b6_mg"
|
||||||
|
t.decimal "biotin_b7_ug"
|
||||||
|
t.decimal "cobalamin_b12_ug"
|
||||||
|
t.decimal "folate_natural_ug"
|
||||||
|
t.decimal "folic_acid_ug"
|
||||||
|
t.decimal "total_folates_ug"
|
||||||
|
t.decimal "dietary_folate_equivalents_ug"
|
||||||
|
t.decimal "vitamin_c_mg"
|
||||||
|
t.decimal "cholecalciferol_d3_ug"
|
||||||
|
t.decimal "ergocalciferol_d2_ug"
|
||||||
|
t.decimal "c25_hydroxy_cholecalciferol_25_oh_d3_ug"
|
||||||
|
t.decimal "c25_hydroxy_ergocalciferol_25_oh_d2_ug"
|
||||||
|
t.decimal "vitamin_d3_equivalents_ug"
|
||||||
|
t.decimal "alpha_tocopherol_mg"
|
||||||
|
t.decimal "alpha_tocotrienol_mg"
|
||||||
|
t.decimal "beta_tocopherol_mg"
|
||||||
|
t.decimal "beta_tocotrienol_mg"
|
||||||
|
t.decimal "delta_tocopherol_mg"
|
||||||
|
t.decimal "delta_tocotrienol_mg"
|
||||||
|
t.decimal "gamma_tocopherol_mg"
|
||||||
|
t.decimal "gamma_tocotrienol_mg"
|
||||||
|
t.decimal "vitamin_e_mg"
|
||||||
|
t.decimal "c4_t"
|
||||||
|
t.decimal "c6_t"
|
||||||
|
t.decimal "c8_t"
|
||||||
|
t.decimal "c10_t"
|
||||||
|
t.decimal "c11_t"
|
||||||
|
t.decimal "c12_t"
|
||||||
|
t.decimal "c13_t"
|
||||||
|
t.decimal "c14_t"
|
||||||
|
t.decimal "c15_t"
|
||||||
|
t.decimal "c16_t"
|
||||||
|
t.decimal "c17_t"
|
||||||
|
t.decimal "c18_t"
|
||||||
|
t.decimal "c19_t"
|
||||||
|
t.decimal "c20_t"
|
||||||
|
t.decimal "c21_t"
|
||||||
|
t.decimal "c22_t"
|
||||||
|
t.decimal "c23_t"
|
||||||
|
t.decimal "c24_t"
|
||||||
|
t.decimal "total_saturated_fatty_acids_equated_t"
|
||||||
|
t.decimal "c10_1_t"
|
||||||
|
t.decimal "c12_1_t"
|
||||||
|
t.decimal "c14_1_t"
|
||||||
|
t.decimal "c15_1_t"
|
||||||
|
t.decimal "c16_1_t"
|
||||||
|
t.decimal "c17_1_t"
|
||||||
|
t.decimal "c18_1_t"
|
||||||
|
t.decimal "c18_1w5_t"
|
||||||
|
t.decimal "c18_1w6_t"
|
||||||
|
t.decimal "c18_1w7_t"
|
||||||
|
t.decimal "c18_1w9_t"
|
||||||
|
t.decimal "c20_1_t"
|
||||||
|
t.decimal "c20_1w9_t"
|
||||||
|
t.decimal "c20_1w13_t"
|
||||||
|
t.decimal "c20_1w11_t"
|
||||||
|
t.decimal "c22_1_t"
|
||||||
|
t.decimal "c22_1w9_t"
|
||||||
|
t.decimal "c22_1w11_t"
|
||||||
|
t.decimal "c24_1_t"
|
||||||
|
t.decimal "c24_1w9_t"
|
||||||
|
t.decimal "c24_1w11_t"
|
||||||
|
t.decimal "c24_1w13_t"
|
||||||
|
t.decimal "total_monounsaturated_fatty_acids_equated_t"
|
||||||
|
t.decimal "c12_2_t"
|
||||||
|
t.decimal "c16_2w4_t"
|
||||||
|
t.decimal "c16_3_t"
|
||||||
|
t.decimal "c18_2w6_t"
|
||||||
|
t.decimal "c18_3w3_t"
|
||||||
|
t.decimal "c18_3w4_t"
|
||||||
|
t.decimal "c18_3w6_t"
|
||||||
|
t.decimal "c18_4w1_t"
|
||||||
|
t.decimal "c18_4w3_t"
|
||||||
|
t.decimal "c20_2_t"
|
||||||
|
t.decimal "c20_2w6_t"
|
||||||
|
t.decimal "c20_3_t"
|
||||||
|
t.decimal "c20_4_t"
|
||||||
|
t.decimal "c20_3w3_t"
|
||||||
|
t.decimal "c20_3w6_t"
|
||||||
|
t.decimal "c20_4w3_t"
|
||||||
|
t.decimal "c20_4w6_t"
|
||||||
|
t.decimal "c20_5w3_t"
|
||||||
|
t.decimal "c21_5w3_t"
|
||||||
|
t.decimal "c22_2_t"
|
||||||
|
t.decimal "c22_2w6_t"
|
||||||
|
t.decimal "c22_4w6_t"
|
||||||
|
t.decimal "c22_5w3_t"
|
||||||
|
t.decimal "c22_5w6_t"
|
||||||
|
t.decimal "c22_6w3_t"
|
||||||
|
t.decimal "total_polyunsaturated_fatty_acids_equated_t"
|
||||||
|
t.decimal "total_long_chain_omega_3_fatty_acids_equated_t"
|
||||||
|
t.decimal "total_undifferentiated_fatty_acids_t"
|
||||||
|
t.decimal "total_trans_fatty_acids_imputed_t"
|
||||||
|
t.decimal "c4_g"
|
||||||
|
t.decimal "c6_g"
|
||||||
|
t.decimal "c8_g"
|
||||||
|
t.decimal "c10_g"
|
||||||
|
t.decimal "c11_g"
|
||||||
|
t.decimal "c12_g"
|
||||||
|
t.decimal "c13_g"
|
||||||
|
t.decimal "c14_g"
|
||||||
|
t.decimal "c15_g"
|
||||||
|
t.decimal "c16_g"
|
||||||
|
t.decimal "c17_g"
|
||||||
|
t.decimal "c18_g"
|
||||||
|
t.decimal "c19_g"
|
||||||
|
t.decimal "c20_g"
|
||||||
|
t.decimal "c21_g"
|
||||||
|
t.decimal "c22_g"
|
||||||
|
t.decimal "c23_g"
|
||||||
|
t.decimal "c24_g"
|
||||||
|
t.decimal "total_saturated_fatty_acids_equated_g"
|
||||||
|
t.decimal "c10_1_g"
|
||||||
|
t.decimal "c12_1_g"
|
||||||
|
t.decimal "c14_1_g"
|
||||||
|
t.decimal "c15_1_g"
|
||||||
|
t.decimal "c16_1_g"
|
||||||
|
t.decimal "c17_1_g"
|
||||||
|
t.decimal "c18_1_g"
|
||||||
|
t.decimal "c18_1w5_mg"
|
||||||
|
t.decimal "c18_1w6_mg"
|
||||||
|
t.decimal "c18_1w7_g"
|
||||||
|
t.decimal "c18_1w9_mg"
|
||||||
|
t.decimal "c20_1_g"
|
||||||
|
t.decimal "c20_1w9_mg"
|
||||||
|
t.decimal "c20_1w13_mg"
|
||||||
|
t.decimal "c20_1w11_mg"
|
||||||
|
t.decimal "c22_1_g"
|
||||||
|
t.decimal "c22_1w9_mg"
|
||||||
|
t.decimal "c22_1w11_mg"
|
||||||
|
t.decimal "c24_1_g"
|
||||||
|
t.decimal "c24_1w9_mg"
|
||||||
|
t.decimal "c24_1w11_mg"
|
||||||
|
t.decimal "c24_1w13_mg"
|
||||||
|
t.decimal "total_monounsaturated_fatty_acids_equated_g"
|
||||||
|
t.decimal "c12_2_g"
|
||||||
|
t.decimal "c16_2w4_mg"
|
||||||
|
t.decimal "c16_3_g"
|
||||||
|
t.decimal "c18_2w6_g"
|
||||||
|
t.decimal "c18_3w3_g"
|
||||||
|
t.decimal "c18_3w4_g"
|
||||||
|
t.decimal "c18_3w6_mg"
|
||||||
|
t.decimal "c18_4w1_g"
|
||||||
|
t.decimal "c18_4w3_mg"
|
||||||
|
t.decimal "c20_2_mg"
|
||||||
|
t.decimal "c20_2w6_mg"
|
||||||
|
t.decimal "c20_3_mg"
|
||||||
|
t.decimal "c20_3w3_mg"
|
||||||
|
t.decimal "c20_3w6_mg"
|
||||||
|
t.decimal "c20_4_g"
|
||||||
|
t.decimal "c20_4w3_mg"
|
||||||
|
t.decimal "c20_4w6_mg"
|
||||||
|
t.decimal "c20_5w3_mg"
|
||||||
|
t.decimal "c21_5w3_g"
|
||||||
|
t.decimal "c22_5w3_mg"
|
||||||
|
t.decimal "c22_4w6_mg"
|
||||||
|
t.decimal "c22_2_g"
|
||||||
|
t.decimal "c22_2w6_mg"
|
||||||
|
t.decimal "c22_5w6_g"
|
||||||
|
t.decimal "c22_6w3_mg"
|
||||||
|
t.decimal "total_polyunsaturated_fatty_acids_equated_g"
|
||||||
|
t.decimal "total_long_chain_omega_3_fatty_acids_equated_mg"
|
||||||
|
t.decimal "total_undifferentiated_fatty_acids_mass_basis_basis_mg"
|
||||||
|
t.decimal "total_trans_fatty_acids_imputed_mg"
|
||||||
|
t.decimal "caffeine_mg"
|
||||||
|
t.decimal "cholesterol_mg"
|
||||||
|
t.decimal "alanine_mg_gn"
|
||||||
|
t.decimal "arginine_mg_gn"
|
||||||
|
t.decimal "aspartic_acid_mg_gn"
|
||||||
|
t.decimal "cystine_plus_cysteine_mg_gn"
|
||||||
|
t.decimal "glutamic_acid_mg_gn"
|
||||||
|
t.decimal "glycine_mg_gn"
|
||||||
|
t.decimal "histidine_mg_gn"
|
||||||
|
t.decimal "isoleucine_mg_gn"
|
||||||
|
t.decimal "leucine_mg_gn"
|
||||||
|
t.decimal "lysine_mg_gn"
|
||||||
|
t.decimal "methionine_mg_gn"
|
||||||
|
t.decimal "phenylalanine_mg_gn"
|
||||||
|
t.decimal "proline_mg_gn"
|
||||||
|
t.decimal "serine_mg_gn"
|
||||||
|
t.decimal "threonine_mg_gn"
|
||||||
|
t.decimal "tyrosine_mg_gn"
|
||||||
|
t.decimal "tryptophan_mg_gn"
|
||||||
|
t.decimal "valine_mg_gn"
|
||||||
|
t.decimal "alanine_mg"
|
||||||
|
t.decimal "arginine_mg"
|
||||||
|
t.decimal "aspartic_acid_mg"
|
||||||
|
t.decimal "cystine_plus_cysteine_mg"
|
||||||
|
t.decimal "glutamic_acid_mg"
|
||||||
|
t.decimal "glycine_mg"
|
||||||
|
t.decimal "histidine_mg"
|
||||||
|
t.decimal "isoleucine_mg"
|
||||||
|
t.decimal "leucine_mg"
|
||||||
|
t.decimal "lysine_mg"
|
||||||
|
t.decimal "methionine_mg"
|
||||||
|
t.decimal "phenylalanine_mg"
|
||||||
|
t.decimal "proline_mg"
|
||||||
|
t.decimal "serine_mg"
|
||||||
|
t.decimal "threonine_mg"
|
||||||
|
t.decimal "tyrosine_mg"
|
||||||
|
t.decimal "tryptophan_mg"
|
||||||
|
t.decimal "valine_mg"
|
||||||
|
t.datetime "created_at", precision: nil, null: false
|
||||||
|
t.datetime "updated_at", precision: nil, null: false
|
||||||
|
t.index ["public_food_key"], name: "index_australian_food_classification_data_on_public_food_key"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "authentications", id: :serial, force: :cascade do |t|
|
create_table "authentications", id: :serial, force: :cascade do |t|
|
||||||
t.integer "member_id", null: false
|
t.integer "member_id", null: false
|
||||||
t.string "provider", null: false
|
t.string "provider", null: false
|
||||||
@@ -261,9 +560,11 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
|
|||||||
t.integer "growing_degree_days"
|
t.integer "growing_degree_days"
|
||||||
t.string "en_youtube_url"
|
t.string "en_youtube_url"
|
||||||
t.text "description"
|
t.text "description"
|
||||||
|
t.string "public_food_key"
|
||||||
t.index ["creator_id"], name: "index_crops_on_creator_id"
|
t.index ["creator_id"], name: "index_crops_on_creator_id"
|
||||||
t.index ["name"], name: "index_crops_on_name"
|
t.index ["name"], name: "index_crops_on_name"
|
||||||
t.index ["parent_id"], name: "index_crops_on_parent_id"
|
t.index ["parent_id"], name: "index_crops_on_parent_id"
|
||||||
|
t.index ["public_food_key"], name: "index_crops_on_public_food_key"
|
||||||
t.index ["requester_id"], name: "index_crops_on_requester_id"
|
t.index ["requester_id"], name: "index_crops_on_requester_id"
|
||||||
t.index ["slug"], name: "index_crops_on_slug", unique: true
|
t.index ["slug"], name: "index_crops_on_slug", unique: true
|
||||||
end
|
end
|
||||||
@@ -658,6 +959,17 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
|
|||||||
t.index ["source"], name: "index_seeds_on_source"
|
t.index ["source"], name: "index_seeds_on_source"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "versions", force: :cascade do |t|
|
||||||
|
t.string "whodunnit"
|
||||||
|
t.datetime "created_at"
|
||||||
|
t.bigint "item_id", null: false
|
||||||
|
t.string "item_type", null: false
|
||||||
|
t.string "event", null: false
|
||||||
|
t.text "object"
|
||||||
|
t.text "object_changes"
|
||||||
|
t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
|
||||||
|
end
|
||||||
|
|
||||||
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "harvests", "plantings"
|
add_foreign_key "harvests", "plantings"
|
||||||
|
|||||||
1771
lib/tasks/australian_food_classification_data.csv
Normal file
1771
lib/tasks/australian_food_classification_data.csv
Normal file
File diff suppressed because it is too large
Load Diff
325
lib/tasks/import.rake
Normal file
325
lib/tasks/import.rake
Normal file
@@ -0,0 +1,325 @@
|
|||||||
|
require 'csv'
|
||||||
|
|
||||||
|
namespace :import do
|
||||||
|
desc "Import Australian Food Classification Data from a CSV file"
|
||||||
|
task australian_food_classification_data: :environment do
|
||||||
|
HEADER_MAP = {
|
||||||
|
"Public Food Key" => :public_food_key,
|
||||||
|
"Classification" => :classification,
|
||||||
|
"Food Name" => :food_name,
|
||||||
|
"Energy with dietary fibre, equated \n(kJ)" => :energy_with_dietary_fibre_equated_kj,
|
||||||
|
"Energy, without dietary fibre, equated \n(kJ)" => :energy_without_dietary_fibre_equated_kj,
|
||||||
|
"Moisture (water) \n(g)" => :moisture_water_g,
|
||||||
|
"Protein \n(g)" => :protein_g,
|
||||||
|
"Nitrogen \n(g)" => :nitrogen_g,
|
||||||
|
"Fat, total \n(g)" => :fat_total_g,
|
||||||
|
"Ash \n(g)" => :ash_g,
|
||||||
|
"Total dietary fibre \n(g)" => :total_dietary_fibre_g,
|
||||||
|
"Alcohol \n(g)" => :alcohol_g,
|
||||||
|
"Fructose \n(g)" => :fructose_g,
|
||||||
|
"Glucose \n(g)" => :glucose_g,
|
||||||
|
"Sucrose\n(g)" => :sucrose_g,
|
||||||
|
"Maltose \n(g)" => :maltose_g,
|
||||||
|
"Lactose \n(g)" => :lactose_g,
|
||||||
|
"Galactose \n(g)" => :galactose_g,
|
||||||
|
"Maltotrios \n(g)" => :maltotrios_g,
|
||||||
|
"Total sugars (g)" => :total_sugars_g,
|
||||||
|
"Added sugars (g)" => :added_sugars_g,
|
||||||
|
"Free sugars \n(g)" => :free_sugars_g,
|
||||||
|
"Starch \n(g)" => :starch_g,
|
||||||
|
"Dextrin \n(g)" => :dextrin_g,
|
||||||
|
"Glycerol \n(g)" => :glycerol_g,
|
||||||
|
"Glycogen \n(g)" => :glycogen_g,
|
||||||
|
"Inulin \n(g)" => :inulin_g,
|
||||||
|
"Erythritol \n(g)" => :erythritol_g,
|
||||||
|
"Maltitol \n(g)" => :maltitol_g,
|
||||||
|
"Mannitol \n(g)" => :mannitol_g,
|
||||||
|
"Xylitol \n(g)" => :xylitol_g,
|
||||||
|
"Maltodextrin (g)" => :maltodextrin_g,
|
||||||
|
"Oligosaccharides \n(g)" => :oligosaccharides_g,
|
||||||
|
"Polydextrose \n(g)" => :polydextrose_g,
|
||||||
|
"Raffinose \n(g)" => :raffinose_g,
|
||||||
|
"Stachyose \n(g)" => :stachyose_g,
|
||||||
|
"Sorbitol \n(g)" => :sorbitol_g,
|
||||||
|
"Resistant starch \n(g)" => :resistant_starch_g,
|
||||||
|
"Available carbohydrate, without sugar alcohols \n(g)" => :available_carbohydrate_without_sugar_alcohols_g,
|
||||||
|
"Available carbohydrate, with sugar alcohols \n(g)" => :available_carbohydrate_with_sugar_alcohols_g,
|
||||||
|
"Acetic acid \n(g)" => :acetic_acid_g,
|
||||||
|
"Citric acid \n(g)" => :citric_acid_g,
|
||||||
|
"Fumaric acid \n(g)" => :fumaric_acid_g,
|
||||||
|
"Lactic acid \n(g)" => :lactic_acid_g,
|
||||||
|
"Malic acid\n (g)" => :malic_acid_g,
|
||||||
|
"Oxalic acid \n(g)" => :oxalic_acid_g,
|
||||||
|
"Propionic acid \n(g)" => :propionic_acid_g,
|
||||||
|
"Quinic acid \n(g)" => :quinic_acid_g,
|
||||||
|
"Shikimic acid \n(g)" => :shikimic_acid_g,
|
||||||
|
"Succinic acid \n(g)" => :succinic_acid_g,
|
||||||
|
"Tartaric acid \n(g)" => :tartaric_acid_g,
|
||||||
|
"Aluminium (Al) \n(ug)" => :aluminium_al_ug,
|
||||||
|
"Antimony (Sb) \n(ug)" => :antimony_sb_ug,
|
||||||
|
"Arsenic (As) \n(ug)" => :arsenic_as_ug,
|
||||||
|
"Cadmium (Cd) \n(ug)" => :cadmium_cd_ug,
|
||||||
|
"Calcium (Ca) \n(mg)" => :calcium_ca_mg,
|
||||||
|
"Chromium (Cr) \n(ug)" => :chromium_cr_ug,
|
||||||
|
"Chloride (Cl) \n(mg)" => :chloride_cl_mg,
|
||||||
|
"Cobalt (Co) \n(ug)" => :cobalt_co_ug,
|
||||||
|
"Copper (Cu) \n(mg)" => :copper_cu_mg,
|
||||||
|
"Fluoride (F) \n(ug)" => :fluoride_f_ug,
|
||||||
|
"Iodine (I) \n(ug)" => :iodine_i_ug,
|
||||||
|
"Iron (Fe) \n(mg)" => :iron_fe_mg,
|
||||||
|
"Lead (Pb) \n(ug)" => :lead_pb_ug,
|
||||||
|
"Magnesium (Mg) \n(mg)" => :magnesium_mg_mg,
|
||||||
|
"Manganese (Mn) \n(mg)" => :manganese_mn_mg,
|
||||||
|
"Mercury (Hg) \n(ug)" => :mercury_hg_ug,
|
||||||
|
"Molybdenum (Mo) \n(ug)" => :molybdenum_mo_ug,
|
||||||
|
"Nickel (Ni) \n(ug)" => :nickel_ni_ug,
|
||||||
|
"Phosphorus (P) \n(mg)" => :phosphorus_p_mg,
|
||||||
|
"Potassium (K) \n(mg)" => :potassium_k_mg,
|
||||||
|
"Selenium (Se) \n(ug)" => :selenium_se_ug,
|
||||||
|
"Sodium (Na) \n(mg)" => :sodium_na_mg,
|
||||||
|
"Sulphur (S) \n(mg)" => :sulphur_s_mg,
|
||||||
|
"Tin (Sn) \n(ug)" => :tin_sn_ug,
|
||||||
|
"Zinc (Zn) \n(mg)" => :zinc_zn_mg,
|
||||||
|
"Retinol (preformed vitamin A) \n(ug)" => :retinol_preformed_vitamin_a_ug,
|
||||||
|
"Alpha-carotene \n(ug)" => :alpha_carotene_ug,
|
||||||
|
"Beta-carotene \n(ug)" => :beta_carotene_ug,
|
||||||
|
"Cryptoxanthin \n(ug)" => :cryptoxanthin_ug,
|
||||||
|
"Beta-carotene equivalents (provitamin A) \n(ug)" => :beta_carotene_equivalents_provitamin_a_ug,
|
||||||
|
"Vitamin A retinol equivalents \n(ug)" => :vitamin_a_retinol_equivalents_ug,
|
||||||
|
"Lutein \n(ug)" => :lutein_ug,
|
||||||
|
"Lycopene \n(ug)" => :lycopene_ug,
|
||||||
|
"Xanthophyl \n(ug)" => :xanthophyl_ug,
|
||||||
|
"Thiamin (B1) \n(mg)" => :thiamin_b1_mg,
|
||||||
|
"Riboflavin (B2) \n(mg)" => :riboflavin_b2_mg,
|
||||||
|
"Niacin (B3) \n(mg)" => :niacin_b3_mg,
|
||||||
|
"Niacin derived from tryptophan \n(mg)" => :niacin_derived_from_tryptophan_mg,
|
||||||
|
"Niacin derived equivalents \n(mg)" => :niacin_derived_equivalents_mg,
|
||||||
|
"Pantothenic acid (B5) \n(mg)" => :pantothenic_acid_b5_mg,
|
||||||
|
"Pyridoxine (B6) \n(mg)" => :pyridoxine_b6_mg,
|
||||||
|
"Biotin (B7) \n(ug)" => :biotin_b7_ug,
|
||||||
|
"Cobalamin (B12) \n(ug)" => :cobalamin_b12_ug,
|
||||||
|
"Folate, natural \n(ug)" => :folate_natural_ug,
|
||||||
|
"Folic acid \n(ug)" => :folic_acid_ug,
|
||||||
|
"Total folates \n(ug)" => :total_folates_ug,
|
||||||
|
"Dietary folate equivalents \n(ug)" => :dietary_folate_equivalents_ug,
|
||||||
|
"Vitamin C \n(mg)" => :vitamin_c_mg,
|
||||||
|
"Cholecalciferol (D3) \n(ug)" => :cholecalciferol_d3_ug,
|
||||||
|
"Ergocalciferol (D2) \n(ug)" => :ergocalciferol_d2_ug,
|
||||||
|
"25-hydroxy cholecalciferol (25-OH D3) \n(ug)" => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
|
||||||
|
"25-hydroxy ergocalciferol (25-OH D2) \n(ug)" => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
|
||||||
|
"Vitamin D3 equivalents \n(ug)" => :vitamin_d3_equivalents_ug,
|
||||||
|
"Alpha tocopherol \n(mg)" => :alpha_tocopherol_mg,
|
||||||
|
"Alpha tocotrienol \n(mg)" => :alpha_tocotrienol_mg,
|
||||||
|
"Beta tocopherol \n(mg)" => :beta_tocopherol_mg,
|
||||||
|
"Beta tocotrienol \n(mg)" => :beta_tocotrienol_mg,
|
||||||
|
"Delta tocopherol \n(mg)" => :delta_tocopherol_mg,
|
||||||
|
"Delta tocotrienol \n(mg)" => :delta_tocotrienol_mg,
|
||||||
|
"Gamma tocopherol \n(mg)" => :gamma_tocopherol_mg,
|
||||||
|
"Gamma tocotrienol \n(mg)" => :gamma_tocotrienol_mg,
|
||||||
|
"Vitamin E \n(mg)" => :vitamin_e_mg,
|
||||||
|
"C4 (%T)" => :c4_t,
|
||||||
|
"C6 (%T)" => :c6_t,
|
||||||
|
"C8 (%T)" => :c8_t,
|
||||||
|
"C10 (%T)" => :c10_t,
|
||||||
|
"C11 (%T)" => :c11_t,
|
||||||
|
"C12 (%T)" => :c12_t,
|
||||||
|
"C13 (%T)" => :c13_t,
|
||||||
|
"C14 (%T)" => :c14_t,
|
||||||
|
"C15 (%T)" => :c15_t,
|
||||||
|
"C16 (%T)" => :c16_t,
|
||||||
|
"C17 (%T)" => :c17_t,
|
||||||
|
"C18 (%T)" => :c18_t,
|
||||||
|
"C19 (%T)" => :c19_t,
|
||||||
|
"C20 (%T)" => :c20_t,
|
||||||
|
"C21 (%T)" => :c21_t,
|
||||||
|
"C22 (%T)" => :c22_t,
|
||||||
|
"C23 (%T)" => :c23_t,
|
||||||
|
"C24 (%T)" => :c24_t,
|
||||||
|
"Total saturated fatty acids, equated (%T)" => :total_saturated_fatty_acids_equated_t,
|
||||||
|
"C10:1 (%T)" => :c10_1_t,
|
||||||
|
"C12:1 (%T)" => :c12_1_t,
|
||||||
|
"C14:1 (%T)" => :c14_1_t,
|
||||||
|
"C15:1 (%T)" => :c15_1_t,
|
||||||
|
"C16:1 (%T)" => :c16_1_t,
|
||||||
|
"C17:1 (%T)" => :c17_1_t,
|
||||||
|
"C18:1 (%T)" => :c18_1_t,
|
||||||
|
"C18:1w5 (%T)" => :c18_1w5_t,
|
||||||
|
"C18:1w6 (%T)" => :c18_1w6_t,
|
||||||
|
"C18:1w7 (%T)" => :c18_1w7_t,
|
||||||
|
"C18:1w9 (%T)" => :c18_1w9_t,
|
||||||
|
"C20:1 (%T)" => :c20_1_t,
|
||||||
|
"C20:1w9 (%T)" => :c20_1w9_t,
|
||||||
|
"C20:1w13 (%T)" => :c20_1w13_t,
|
||||||
|
"C20:1w11 (%T)" => :c20_1w11_t,
|
||||||
|
"C22:1 (%T)" => :c22_1_t,
|
||||||
|
"C22:1w9 (%T)" => :c22_1w9_t,
|
||||||
|
"C22:1w11 (%T)" => :c22_1w11_t,
|
||||||
|
"C24:1 (%T)" => :c24_1_t,
|
||||||
|
"C24:1w9 (%T)" => :c24_1w9_t,
|
||||||
|
"C24:1w11 (%T)" => :c24_1w11_t,
|
||||||
|
"C24:1w13 (%T)" => :c24_1w13_t,
|
||||||
|
"Total monounsaturated fatty acids, equated (%T)" => :total_monounsaturated_fatty_acids_equated_t,
|
||||||
|
"C12:2 (%T)" => :c12_2_t,
|
||||||
|
"C16:2w4 (%T)" => :c16_2w4_t,
|
||||||
|
"C16:3 (%T)" => :c16_3_t,
|
||||||
|
"C18:2w6 (%T)" => :c18_2w6_t,
|
||||||
|
"C18:3w3 (%T)" => :c18_3w3_t,
|
||||||
|
"C18:3w4 (%T)" => :c18_3w4_t,
|
||||||
|
"C18:3w6 (%T)" => :c18_3w6_t,
|
||||||
|
"C18:4w1 (%T)" => :c18_4w1_t,
|
||||||
|
"C18:4w3 (%T)" => :c18_4w3_t,
|
||||||
|
"C20:2 (%T)" => :c20_2_t,
|
||||||
|
"C20:2w6 (%T)" => :c20_2w6_t,
|
||||||
|
"C20:3 (%T)" => :c20_3_t,
|
||||||
|
"C20:4 (%T)" => :c20_4_t,
|
||||||
|
"C20:3w3 (%T)" => :c20_3w3_t,
|
||||||
|
"C20:3w6 (%T)" => :c20_3w6_t,
|
||||||
|
"C20:4w3 (%T)" => :c20_4w3_t,
|
||||||
|
"C20:4w6 (%T)" => :c20_4w6_t,
|
||||||
|
"C20:5w3 (%T)" => :c20_5w3_t,
|
||||||
|
"C21:5w3 (%T)" => :c21_5w3_t,
|
||||||
|
"C22:2 (%T)" => :c22_2_t,
|
||||||
|
"C22:2w6 (%T)" => :c22_2w6_t,
|
||||||
|
"C22:4w6 (%T)" => :c22_4w6_t,
|
||||||
|
"C22:5w3 (%T)" => :c22_5w3_t,
|
||||||
|
"C22:5w6 (%T)" => :c22_5w6_t,
|
||||||
|
"C22:6w3 (%T)" => :c22_6w3_t,
|
||||||
|
"Total polyunsaturated fatty acids, equated (%T)" => :total_polyunsaturated_fatty_acids_equated_t,
|
||||||
|
"Total long chain omega 3 fatty acids, equated \n(%T)" => :total_long_chain_omega_3_fatty_acids_equated_t,
|
||||||
|
"Total undifferentiated fatty acids \n(%T)" => :total_undifferentiated_fatty_acids_t,
|
||||||
|
"Total trans fatty acids, imputed \n(%T)" => :total_trans_fatty_acids_imputed_t,
|
||||||
|
"C4 (g)" => :c4_g,
|
||||||
|
"C6 (g)" => :c6_g,
|
||||||
|
"C8 (g)" => :c8_g,
|
||||||
|
"C10 (g)" => :c10_g,
|
||||||
|
"C11 (g)" => :c11_g,
|
||||||
|
"C12 (g)" => :c12_g,
|
||||||
|
"C13 (g)" => :c13_g,
|
||||||
|
"C14 (g)" => :c14_g,
|
||||||
|
"C15 (g)" => :c15_g,
|
||||||
|
"C16 (g)" => :c16_g,
|
||||||
|
"C17 (g)" => :c17_g,
|
||||||
|
"C18 (g)" => :c18_g,
|
||||||
|
"C19 (g)" => :c19_g,
|
||||||
|
"C20 (g)" => :c20_g,
|
||||||
|
"C21 (g)" => :c21_g,
|
||||||
|
"C22 (g)" => :c22_g,
|
||||||
|
"C23 (g)" => :c23_g,
|
||||||
|
"C24 (g)" => :c24_g,
|
||||||
|
"Total saturated fatty acids, equated \n(g)" => :total_saturated_fatty_acids_equated_g,
|
||||||
|
"C10:1 (g)" => :c10_1_g,
|
||||||
|
"C12:1 (g)" => :c12_1_g,
|
||||||
|
"C14:1 (g)" => :c14_1_g,
|
||||||
|
"C15:1 (g)" => :c15_1_g,
|
||||||
|
"C16:1 (g)" => :c16_1_g,
|
||||||
|
"C17:1 (g)" => :c17_1_g,
|
||||||
|
"C18:1 (g)" => :c18_1_g,
|
||||||
|
"C18:1w5 (mg)" => :c18_1w5_mg,
|
||||||
|
"C18:1w6 (mg)" => :c18_1w6_mg,
|
||||||
|
"C18:1w7 (g)" => :c18_1w7_g,
|
||||||
|
"C18:1w9 (mg)" => :c18_1w9_mg,
|
||||||
|
"C20:1 (g)" => :c20_1_g,
|
||||||
|
"C20:1w9 (mg)" => :c20_1w9_mg,
|
||||||
|
"C20:1w13 (mg)" => :c20_1w13_mg,
|
||||||
|
"C20:1w11 (mg)" => :c20_1w11_mg,
|
||||||
|
"C22:1 (g)" => :c22_1_g,
|
||||||
|
"C22:1w9 (mg)" => :c22_1w9_mg,
|
||||||
|
"C22:1w11 (mg)" => :c22_1w11_mg,
|
||||||
|
"C24:1 (g)" => :c24_1_g,
|
||||||
|
"C24:1w9 (mg)" => :c24_1w9_mg,
|
||||||
|
"C24:1w11 (mg)" => :c24_1w11_mg,
|
||||||
|
"C24:1w13 (mg)" => :c24_1w13_mg,
|
||||||
|
"Total monounsaturated fatty acids, equated \n(g)" => :total_monounsaturated_fatty_acids_equated_g,
|
||||||
|
"C12:2 (g)" => :c12_2_g,
|
||||||
|
"C16:2w4 (mg)" => :c16_2w4_mg,
|
||||||
|
"C16:3 (g)" => :c16_3_g,
|
||||||
|
"C18:2w6 (g)" => :c18_2w6_g,
|
||||||
|
"C18:3w3 (g)" => :c18_3w3_g,
|
||||||
|
"C18:3w4 (g)" => :c18_3w4_g,
|
||||||
|
"C18:3w6 (mg)" => :c18_3w6_mg,
|
||||||
|
"C18:4w1 (g)" => :c18_4w1_g,
|
||||||
|
"C18:4w3 (mg)" => :c18_4w3_mg,
|
||||||
|
"C20:2 (mg)" => :c20_2_mg,
|
||||||
|
"C20:2w6 (mg)" => :c20_2w6_mg,
|
||||||
|
"C20:3 (mg)" => :c20_3_mg,
|
||||||
|
"C20:3w3 (mg)" => :c20_3w3_mg,
|
||||||
|
"C20:3w6 (mg)" => :c20_3w6_mg,
|
||||||
|
"C20:4 (g)" => :c20_4_g,
|
||||||
|
"C20:4w3 (mg)" => :c20_4w3_mg,
|
||||||
|
"C20:4w6 (mg)" => :c20_4w6_mg,
|
||||||
|
"C20:5w3 (mg)" => :c20_5w3_mg,
|
||||||
|
"C21:5w3 (g)" => :c21_5w3_g,
|
||||||
|
"C22:5w3 (mg)" => :c22_5w3_mg,
|
||||||
|
"C22:4w6 (mg)" => :c22_4w6_mg,
|
||||||
|
"C22:2 (g)" => :c22_2_g,
|
||||||
|
"C22:2w6 (mg)" => :c22_2w6_mg,
|
||||||
|
"C22:5w6 (g)" => :c22_5w6_g,
|
||||||
|
"C22:6w3 (mg)" => :c22_6w3_mg,
|
||||||
|
"Total polyunsaturated fatty acids, equated \n(g)" => :total_polyunsaturated_fatty_acids_equated_g,
|
||||||
|
"Total long chain omega 3 fatty acids, equated \n(mg)" => :total_long_chain_omega_3_fatty_acids_equated_mg,
|
||||||
|
"Total undifferentiated fatty acids, mass basis basis \n(mg)" => :total_undifferentiated_fatty_acids_mass_basis_basis_mg,
|
||||||
|
"Total trans fatty acids, imputed \n(mg)" => :total_trans_fatty_acids_imputed_mg,
|
||||||
|
"Caffeine \n(mg)" => :caffeine_mg,
|
||||||
|
"Cholesterol \n(mg)" => :cholesterol_mg,
|
||||||
|
"Alanine \n(mg/gN)" => :alanine_mg_gn,
|
||||||
|
"Arginine \n(mg/gN)" => :arginine_mg_gn,
|
||||||
|
"Aspartic acid \n(mg/gN)" => :aspartic_acid_mg_gn,
|
||||||
|
"Cystine plus cysteine \n(mg/gN)" => :cystine_plus_cysteine_mg_gn,
|
||||||
|
"Glutamic acid \n(mg/gN)" => :glutamic_acid_mg_gn,
|
||||||
|
"Glycine \n(mg/gN)" => :glycine_mg_gn,
|
||||||
|
"Histidine \n(mg/gN)" => :histidine_mg_gn,
|
||||||
|
"Isoleucine \n(mg/gN)" => :isoleucine_mg_gn,
|
||||||
|
"Leucine \n(mg/gN)" => :leucine_mg_gn,
|
||||||
|
"Lysine \n(mg/gN)" => :lysine_mg_gn,
|
||||||
|
"Methionine \n(mg/gN)" => :methionine_mg_gn,
|
||||||
|
"Phenylalanine \n(mg/gN)" => :phenylalanine_mg_gn,
|
||||||
|
"Proline \n(mg/gN)" => :proline_mg_gn,
|
||||||
|
"Serine \n(mg/gN)" => :serine_mg_gn,
|
||||||
|
"Threonine \n(mg/gN)" => :threonine_mg_gn,
|
||||||
|
"Tyrosine \n(mg/gN)" => :tyrosine_mg_gn,
|
||||||
|
"Tryptophan \n(mg/gN)" => :tryptophan_mg_gn,
|
||||||
|
"Valine \n(mg/gN)" => :valine_mg_gn,
|
||||||
|
"Alanine \n(mg)" => :alanine_mg,
|
||||||
|
"Arginine \n(mg)" => :arginine_mg,
|
||||||
|
"Aspartic acid \n(mg)" => :aspartic_acid_mg,
|
||||||
|
"Cystine plus cysteine \n(mg)" => :cystine_plus_cysteine_mg,
|
||||||
|
"Glutamic acid \n(mg)" => :glutamic_acid_mg,
|
||||||
|
"Glycine \n(mg)" => :glycine_mg,
|
||||||
|
"Histidine \n(mg)" => :histidine_mg,
|
||||||
|
"Isoleucine \n(mg)" => :isoleucine_mg,
|
||||||
|
"Leucine \n(mg)" => :leucine_mg,
|
||||||
|
"Lysine \n(mg)" => :lysine_mg,
|
||||||
|
"Methionine \n(mg)" => :methionine_mg,
|
||||||
|
"Phenylalanine \n(mg)" => :phenylalanine_mg,
|
||||||
|
"Proline \n(mg)" => :proline_mg,
|
||||||
|
"Serine \n(mg)" => :serine_mg,
|
||||||
|
"Threonine \n(mg)" => :threonine_mg,
|
||||||
|
"Tyrosine \n(mg)" => :tyrosine_mg,
|
||||||
|
"Tryptophan \n(mg)" => :tryptophan_mg,
|
||||||
|
"Valine \n(mg)" => :valine_mg
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
csv_file = File.read(Rails.root.join('lib', 'tasks', 'australian_food_classification_data.csv'))
|
||||||
|
csv = CSV.parse(csv_file, headers: true)
|
||||||
|
|
||||||
|
csv.each do |row|
|
||||||
|
record = AustralianFoodClassificationData.find_or_initialize_by(
|
||||||
|
public_food_key: row.fetch("Public Food Key")
|
||||||
|
)
|
||||||
|
|
||||||
|
attributes = {}
|
||||||
|
HEADER_MAP.each do |csv_header, db_column|
|
||||||
|
raw_value = row[csv_header]
|
||||||
|
value = if raw_value&.match?(/\A-?[\d,.]+\z/)
|
||||||
|
raw_value.gsub(',', '')
|
||||||
|
else
|
||||||
|
raw_value
|
||||||
|
end
|
||||||
|
attributes[db_column] = value
|
||||||
|
end
|
||||||
|
|
||||||
|
record.assign_attributes(attributes)
|
||||||
|
record.save!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -13,45 +13,65 @@ namespace :wikidata do
|
|||||||
end
|
end
|
||||||
|
|
||||||
Crop.all.each do |crop|
|
Crop.all.each do |crop|
|
||||||
next unless crop.en_wikipedia_url.present?
|
puts "Processing crop: #{crop.name}"
|
||||||
|
wikidata_id = nil
|
||||||
|
|
||||||
begin
|
# Try to find Wikidata ID from the scientific_names table first
|
||||||
title = crop.en_wikipedia_url.split('/').last
|
if (sci_name_with_id = crop.scientific_names.find { |sn| sn.wikidata_id.present? })
|
||||||
puts "Processing crop: #{crop.name} (Wikipedia title: #{title})"
|
wikidata_id = sci_name_with_id.wikidata_id
|
||||||
|
puts " Found Wikidata ID in scientific_names table: #{wikidata_id}"
|
||||||
|
# If not found, try the existing en_wikipedia_url method
|
||||||
|
elsif crop.en_wikipedia_url.present?
|
||||||
|
begin
|
||||||
|
title = crop.en_wikipedia_url.split('/').last
|
||||||
|
puts " Searching for Wikidata ID using Wikipedia URL: #{crop.en_wikipedia_url}"
|
||||||
|
|
||||||
# Get Wikidata ID from Wikipedia API
|
# Get Wikidata ID from Wikipedia API
|
||||||
wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
|
wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
|
||||||
wiki_response = Net::HTTP.get(wiki_uri)
|
wiki_response = Net::HTTP.get(wiki_uri)
|
||||||
wiki_data = JSON.parse(wiki_response)
|
wiki_data = JSON.parse(wiki_response)
|
||||||
page_id = wiki_data['query']['pages'].keys.first
|
pages = wiki_data['query']['pages']
|
||||||
wikidata_id = wiki_data['query']['pages'][page_id]['pageprops']['wikibase_item']
|
page_id = pages.keys.first
|
||||||
|
|
||||||
if wikidata_id
|
if page_id != "-1" && pages[page_id]['pageprops'] && pages[page_id]['pageprops']['wikibase_item']
|
||||||
puts " Found Wikidata ID: #{wikidata_id}"
|
wikidata_id = pages[page_id]['pageprops']['wikibase_item']
|
||||||
|
puts " Found Wikidata ID via Wikipedia URL: #{wikidata_id}"
|
||||||
|
end
|
||||||
|
rescue StandardError => e
|
||||||
|
puts " Error querying Wikipedia for URL #{crop.en_wikipedia_url}: #{e.message}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if wikidata_id
|
||||||
|
begin
|
||||||
# Get aliases from Wikidata API
|
# Get aliases from Wikidata API
|
||||||
wikidata_uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=aliases&format=json")
|
wikidata_uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=aliases&format=json")
|
||||||
wikidata_response = Net::HTTP.get(wikidata_uri)
|
wikidata_response = Net::HTTP.get(wikidata_uri)
|
||||||
wikidata_data = JSON.parse(wikidata_response)
|
wikidata_data = JSON.parse(wikidata_response)
|
||||||
|
|
||||||
aliases = wikidata_data['entities'][wikidata_id]['aliases']
|
aliases = wikidata_data.dig('entities', wikidata_id, 'aliases')
|
||||||
aliases.each do |lang, values|
|
if aliases
|
||||||
values.each do |value|
|
aliases.each do |lang, values|
|
||||||
next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
|
values.each do |value|
|
||||||
|
next if AlternateName.exists?(name: value['value'], language: lang, crop: crop)
|
||||||
|
|
||||||
AlternateName.create!(
|
AlternateName.create!(
|
||||||
name: value['value'],
|
name: value['value'],
|
||||||
language: lang,
|
language: lang,
|
||||||
crop: crop,
|
crop: crop,
|
||||||
creator: creator
|
creator: creator
|
||||||
)
|
)
|
||||||
puts " Added alternate name: #{value['value']} (#{lang})"
|
puts " Added alternate name: #{value['value']} (#{lang})"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
puts " No aliases found for Wikidata ID: #{wikidata_id}"
|
||||||
end
|
end
|
||||||
else
|
rescue StandardError => e
|
||||||
puts " Could not find Wikidata ID for #{crop.name}"
|
puts " Error processing Wikidata aliases for #{crop.name}: #{e.message}"
|
||||||
end
|
end
|
||||||
rescue StandardError => e
|
else
|
||||||
puts " Error processing crop #{crop.name}: #{e.message}"
|
puts " Could not find Wikidata ID for #{crop.name}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,7 +16,8 @@
|
|||||||
"csslint": "^1.0.5",
|
"csslint": "^1.0.5",
|
||||||
"eslint": "^5.0.0",
|
"eslint": "^5.0.0",
|
||||||
"eslint-config-google": "^0.9.1",
|
"eslint-config-google": "^0.9.1",
|
||||||
"jshint": "^2.9.4"
|
"jshint": "^2.9.4",
|
||||||
|
"playwright": "1.57.0"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
@@ -140,3 +140,5 @@ Crawl-delay: 5
|
|||||||
#
|
#
|
||||||
User-agent: *
|
User-agent: *
|
||||||
Disallow: /api/
|
Disallow: /api/
|
||||||
|
|
||||||
|
Sitemap: https://growstuff-prod.s3.us-west-2.amazonaws.com/sitemap.xml.gz
|
||||||
|
|||||||
38
spec/features/admin/reverting_crops_spec.rb
Normal file
38
spec/features/admin/reverting_crops_spec.rb
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.feature 'Reverting crops' do
|
||||||
|
let(:wrangler) { create(:crop_wrangling_member) }
|
||||||
|
let(:member) { create(:member) }
|
||||||
|
let!(:crop) { create(:crop, name: 'Initial Name') }
|
||||||
|
|
||||||
|
before do
|
||||||
|
crop.update(name: 'Updated Name')
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when logged in as an wrangler' do
|
||||||
|
before do
|
||||||
|
login_as(wrangler, scope: :member)
|
||||||
|
end
|
||||||
|
|
||||||
|
scenario 'Admin reverts a crop' do
|
||||||
|
visit admin_crops_path
|
||||||
|
click_link 'Revert', match: :first
|
||||||
|
expect(page).to have_content('Reverted to version from')
|
||||||
|
crop.reload
|
||||||
|
expect(crop.name).to eq('Initial Name')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when logged in as a regular member' do
|
||||||
|
before do
|
||||||
|
login_as(member, scope: :member)
|
||||||
|
end
|
||||||
|
|
||||||
|
scenario 'Member cannot revert a crop' do
|
||||||
|
visit admin_crops_path
|
||||||
|
expect(page).not_to have_link('Revert')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -196,7 +196,7 @@ describe "crop detail page", :js do
|
|||||||
context 'crop is Perennial' do
|
context 'crop is Perennial' do
|
||||||
let(:crop) { FactoryBot.create(:perennial_crop) }
|
let(:crop) { FactoryBot.create(:perennial_crop) }
|
||||||
|
|
||||||
it { expect(page).to have_text 'Perennial' }
|
it { expect(find('.index-cards.facts')).to have_text 'Perennial' }
|
||||||
it { expect(page).to have_text 'living more than two years' }
|
it { expect(page).to have_text 'living more than two years' }
|
||||||
it { expect(page).to have_no_text 'Annual' }
|
it { expect(page).to have_no_text 'Annual' }
|
||||||
end
|
end
|
||||||
@@ -204,7 +204,7 @@ describe "crop detail page", :js do
|
|||||||
context 'crop Perennial value is null' do
|
context 'crop Perennial value is null' do
|
||||||
let(:crop) { FactoryBot.create(:crop, perennial: nil) }
|
let(:crop) { FactoryBot.create(:crop, perennial: nil) }
|
||||||
|
|
||||||
it { expect(page).to have_no_text 'Perennial' }
|
it { expect(find('.index-cards.facts')).to have_no_text 'Perennial' }
|
||||||
it { expect(page).to have_no_text 'Annual' }
|
it { expect(page).to have_no_text 'Annual' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -605,7 +605,7 @@ describe Planting do
|
|||||||
|
|
||||||
before { described_class.reindex }
|
before { described_class.reindex }
|
||||||
|
|
||||||
it { expect(subject.count).to eq 2 }
|
it { expect(subject.count).to eq 3 }
|
||||||
it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s]) }
|
it { expect(subject.map(&:id)).to eq([interesting_planting.id.to_s, finished_interesting_planting.id.to_s, planting.id.to_s]) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,35 +10,36 @@ Rails.application.eager_load!
|
|||||||
|
|
||||||
require 'capybara'
|
require 'capybara'
|
||||||
require 'capybara/rspec'
|
require 'capybara/rspec'
|
||||||
require 'selenium/webdriver'
|
# require 'capybara-screenshot/rspec'
|
||||||
require 'capybara-screenshot/rspec'
|
# require 'axe-capybara'
|
||||||
require 'axe-capybara'
|
# require 'axe-rspec'
|
||||||
require 'axe-rspec'
|
|
||||||
|
|
||||||
# Required for running in the dev container
|
# Required for running in the dev container
|
||||||
Capybara.register_driver :selenium_chrome_customised_headless do |app|
|
Capybara.register_driver :playwright_chrome_customised do |app|
|
||||||
options = Selenium::WebDriver::Options.chrome
|
# options = Capybara::Playwright::Options.chrome
|
||||||
options.add_argument("--headless")
|
# # options.add_argument("--headless")
|
||||||
options.add_argument("--no-sandbox")
|
# options.add_argument("--no-sandbox")
|
||||||
options.add_argument("--window-size=1920,1080")
|
# options.add_argument("--window-size=1920,1080")
|
||||||
options.add_argument("--disable-dev-shm-usage")
|
# options.add_argument("--disable-dev-shm-usage")
|
||||||
|
|
||||||
# driver = Selenium::WebDriver.for :chrome, options: options
|
|
||||||
|
|
||||||
Capybara::Selenium::Driver.new(app, browser: :chrome, options:)
|
Capybara::Playwright::Driver.new(app,
|
||||||
|
browser_type: ENV["PLAYWRIGHT_BROWSER"]&.to_sym || :chromium,
|
||||||
|
headless: true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# Ability to pass in flags to
|
# Ability to pass in flags to
|
||||||
if ENV["CAPYBARA_DRIVER"]
|
if ENV["CAPYBARA_DRIVER"]
|
||||||
Capybara.default_driver = ENV["CAPYBARA_DRIVER"].to_sym
|
Capybara.default_driver = ENV["CAPYBARA_DRIVER"].to_sym
|
||||||
Capybara.javascript_driver = ENV["CAPYBARA_DRIVER"].to_sym
|
Capybara.javascript_driver = ENV["CAPYBARA_DRIVER"].to_sym
|
||||||
else
|
else
|
||||||
Capybara.default_driver = :selenium_chrome_customised_headless
|
Capybara.default_driver = :playwright_chrome_customised
|
||||||
Capybara.javascript_driver = :selenium_chrome_customised_headless
|
Capybara.javascript_driver = :playwright_chrome_customised
|
||||||
end
|
end
|
||||||
Capybara.enable_aria_label = true
|
Capybara.enable_aria_label = true
|
||||||
|
|
||||||
Capybara::Screenshot.register_driver(:selenium_chrome_customised_headless) do |driver, path|
|
Capybara::Screenshot.register_driver(:playwright_chrome_customised) do |driver, path|
|
||||||
driver.browser.save_screenshot(path)
|
driver.browser.save_screenshot(path)
|
||||||
end
|
end
|
||||||
Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
|
Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
|
||||||
@@ -50,7 +51,7 @@ Capybara.server_port = 8081
|
|||||||
|
|
||||||
# TODO: Find a better home.
|
# TODO: Find a better home.
|
||||||
shared_examples 'is accessible' do
|
shared_examples 'is accessible' do
|
||||||
it "is accessible" do
|
it "is accessible", pending: 'not compatible with playwright' do
|
||||||
expect(page).to be_axe_clean.skipping('color-contrast', 'heading-order', 'aria-required-children').according_to :wcag2a
|
expect(page).to be_axe_clean.skipping('color-contrast', 'heading-order', 'aria-required-children').according_to :wcag2a
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -122,15 +123,15 @@ RSpec.configure do |config|
|
|||||||
# TODO: Why are we setting this page size then straight afterwards, maximising?
|
# TODO: Why are we setting this page size then straight afterwards, maximising?
|
||||||
width = 1920
|
width = 1920
|
||||||
height = 1080
|
height = 1080
|
||||||
Capybara.current_session.driver.browser.manage.window.resize_to(width, height)
|
# Capybara.current_session.driver.browser.manage.window.resize_to(width, height)
|
||||||
|
|
||||||
if page.driver.browser.respond_to?(:url_blacklist)
|
# if page.driver.browser.respond_to?(:url_blacklist)
|
||||||
page.driver.browser.url_blacklist = [
|
# page.driver.browser.url_blacklist = [
|
||||||
'gravatar.com',
|
# 'gravatar.com',
|
||||||
'okfn.org',
|
# 'okfn.org',
|
||||||
'googlecode.com'
|
# 'googlecode.com'
|
||||||
]
|
# ]
|
||||||
end
|
# end
|
||||||
|
|
||||||
# Historically, we wanted to .maximize; but this actually undoes the resize_to step above
|
# Historically, we wanted to .maximize; but this actually undoes the resize_to step above
|
||||||
# with chrome headless
|
# with chrome headless
|
||||||
|
|||||||
26
spec/tasks/import_spec.rb
Normal file
26
spec/tasks/import_spec.rb
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
require 'rake'
|
||||||
|
|
||||||
|
describe 'import:australian_food_classification_data' do
|
||||||
|
before :all do
|
||||||
|
Rails.application.load_tasks
|
||||||
|
end
|
||||||
|
|
||||||
|
it "imports the data from the CSV file" do
|
||||||
|
Rake::Task['import:australian_food_classification_data'].invoke
|
||||||
|
expect(AustralianFoodClassificationData.count).to eq(2)
|
||||||
|
|
||||||
|
first_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002258')
|
||||||
|
expect(first_record.food_name).to eq('Cardamom seed, dried, ground')
|
||||||
|
expect(first_record.protein_g).to eq(BigDecimal('10.8'))
|
||||||
|
|
||||||
|
second_record = AustralianFoodClassificationData.find_by(public_food_key: 'F002893')
|
||||||
|
expect(second_record.food_name).to eq('Chilli (chili), dried, ground')
|
||||||
|
expect(second_record.fat_total_g).to eq(BigDecimal('14.3'))
|
||||||
|
|
||||||
|
# Test idempotency
|
||||||
|
Rake::Task['import:australian_food_classification_data'].reenable
|
||||||
|
Rake::Task['import:australian_food_classification_data'].invoke
|
||||||
|
expect(AustralianFoodClassificationData.count).to eq(2)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -12,6 +12,7 @@ describe "crops/show" do
|
|||||||
@current_member = @member
|
@current_member = @member
|
||||||
@harvest = FactoryBot.create(:harvest, owner: @member)
|
@harvest = FactoryBot.create(:harvest, owner: @member)
|
||||||
controller.stub(:current_user) { @member }
|
controller.stub(:current_user) { @member }
|
||||||
|
assign(:version_members, {})
|
||||||
end
|
end
|
||||||
|
|
||||||
it "hides sunniness block if no sunniness" do
|
it "hides sunniness block if no sunniness" do
|
||||||
|
|||||||
19
yarn.lock
19
yarn.lock
@@ -801,6 +801,11 @@ fs.realpath@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
|
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
|
||||||
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
|
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
|
||||||
|
|
||||||
|
fsevents@2.3.2:
|
||||||
|
version "2.3.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
|
||||||
|
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
|
||||||
|
|
||||||
function-bind@^1.1.1:
|
function-bind@^1.1.1:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
|
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
|
||||||
@@ -1298,6 +1303,20 @@ picomatch@^2.3.0, picomatch@^2.3.1:
|
|||||||
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
|
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
|
||||||
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
|
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
|
||||||
|
|
||||||
|
playwright-core@1.57.0:
|
||||||
|
version "1.57.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.57.0.tgz#3dcc9a865af256fa9f0af0d67fc8dd54eecaebf5"
|
||||||
|
integrity sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==
|
||||||
|
|
||||||
|
playwright@1.57.0:
|
||||||
|
version "1.57.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.57.0.tgz#74d1dacff5048dc40bf4676940b1901e18ad0f46"
|
||||||
|
integrity sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==
|
||||||
|
dependencies:
|
||||||
|
playwright-core "1.57.0"
|
||||||
|
optionalDependencies:
|
||||||
|
fsevents "2.3.2"
|
||||||
|
|
||||||
prelude-ls@~1.1.2:
|
prelude-ls@~1.1.2:
|
||||||
version "1.1.2"
|
version "1.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
|
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
|
||||||
|
|||||||
Reference in New Issue
Block a user