mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-06-06 07:07:33 -04:00
Compare commits
73 Commits
release78
...
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 |
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
|
||||||
|
|||||||
10
Gemfile
10
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
|
||||||
@@ -202,3 +207,6 @@ end
|
|||||||
gem "i18n_data", "~> 1.1"
|
gem "i18n_data", "~> 1.1"
|
||||||
|
|
||||||
gem "paper_trail", "~> 17.0"
|
gem "paper_trail", "~> 17.0"
|
||||||
|
|
||||||
|
gem 'sitemap_generator'
|
||||||
|
gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
|
||||||
|
|||||||
59
Gemfile.lock
59
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)
|
||||||
@@ -472,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
|
||||||
@@ -551,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
|
||||||
@@ -655,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)
|
||||||
@@ -669,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)
|
||||||
@@ -688,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)
|
||||||
@@ -697,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)
|
||||||
@@ -708,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)
|
||||||
@@ -759,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
|
||||||
@@ -773,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
|
||||||
@@ -854,6 +886,7 @@ DEPENDENCIES
|
|||||||
searchkick
|
searchkick
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
sidekiq
|
sidekiq
|
||||||
|
sitemap_generator
|
||||||
sprockets (< 4)
|
sprockets (< 4)
|
||||||
terser
|
terser
|
||||||
timecop
|
timecop
|
||||||
|
|||||||
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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,6 +170,8 @@ class CropsController < ApplicationController
|
|||||||
Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
|
Crop.approved.where(sun_requirements: [nil, '']).order(plantings_count: :desc)
|
||||||
when 'height'
|
when 'height'
|
||||||
Crop.approved.where(height: nil).order(plantings_count: :desc)
|
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
|
else
|
||||||
Crop.none
|
Crop.none
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -58,7 +58,11 @@ module CropsHelper
|
|||||||
subject_of_entities << {
|
subject_of_entities << {
|
||||||
'@type': "SocialMediaPosting",
|
'@type': "SocialMediaPosting",
|
||||||
url: post_url(post),
|
url: post_url(post),
|
||||||
author: post.author
|
author: {
|
||||||
|
'@type': 'Person',
|
||||||
|
name: post.author.login_name
|
||||||
|
},
|
||||||
|
'datePublished': post.created_at
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,8 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class AustralianFoodClassificationData < ApplicationRecord
|
class AustralianFoodClassificationData < ApplicationRecord
|
||||||
|
belongs_to :crop,
|
||||||
|
foreign_key: :public_food_key,
|
||||||
|
primary_key: :public_food_key,
|
||||||
|
inverse_of: :australian_food_classification_data
|
||||||
end
|
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('*',
|
||||||
|
|||||||
@@ -28,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
|
||||||
|
|
||||||
|
|||||||
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
|
||||||
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"
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
%h1 Data Improvement
|
%h1 Data Improvement
|
||||||
|
|
||||||
- tabs = { photos: "Photos", descriptions: "Descriptions", youtube: "YouTube videos", alternate_names: "Alternate names", wikidata: "Wikidata ID", row_spacing: "Row spacing", sun_requirements: "Sun requirements", height: "Height" }
|
- 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
|
%ul.nav.nav-tabs
|
||||||
- tabs.each do |key, value|
|
- tabs.each do |key, value|
|
||||||
%li{class: ('active' if @active_tab == key.to_s)}
|
%li{class: "nav-item #{('active' if @active_tab == key.to_s)}"}
|
||||||
= link_to value, data_improvement_crops_path(tab: key)
|
= link_to value, data_improvement_crops_path(tab: key)
|
||||||
|
|
||||||
.tab-content
|
.tab-content
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
- 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
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
= render 'schema_org', crop: @crop
|
= render 'schema_org', crop: @crop
|
||||||
- content_for :title, @crop.name
|
- 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)
|
||||||
@@ -128,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
|
||||||
|
|||||||
@@ -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")
|
||||||
@@ -71,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}")
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
.form-group
|
.form-group
|
||||||
= f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
|
= f.label :wikidata_id, "Wikidata ID", class: 'control-label col-md-2'
|
||||||
.col-md-8
|
.col-md-8
|
||||||
= f.text_field :wikidata_id, class: 'form-control'
|
= 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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
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,7 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class AddIndexToCropsPublicFoodKey < ActiveRecord::Migration[7.2]
|
||||||
|
def change
|
||||||
|
add_index :crops, :public_food_key
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -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_30_053104) 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"
|
||||||
|
|
||||||
@@ -564,6 +564,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_11_30_053104) do
|
|||||||
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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
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