Skip to content

Commit c668d33

Browse files
authored
Fix/deactivate pwa prompt (#100)
* fix: update docker compose command * fix: add variable in local storage to prevent pwa prompt * ci: update upload-artifact action * ci: add libu2f-udev & imagemagick * ci: update ci again * ci: try fix ci again * ci: another try to fix ci
1 parent eed3a33 commit c668d33

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

.github/workflows/ci_cd.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ jobs:
9393
name: RSpec
9494
- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
9595
name: Upload coverage
96-
- uses: actions/upload-artifact@v3
96+
- uses: actions/upload-artifact@v4
9797
if: always()
9898
with:
9999
name: screenshots
100100
path: ./spec/tmp/screenshots
101-
- uses: actions/upload-artifact@v3
101+
- uses: actions/upload-artifact@v4
102102
if: always()
103103
with:
104104
name: assets-manifest-${{ matrix.slice }}
@@ -136,6 +136,10 @@ jobs:
136136
with:
137137
ruby-version: ${{ env.RUBY_VERSION }}
138138
bundler-cache: true
139+
- run: |
140+
sudo apt update
141+
sudo apt install libu2f-udev imagemagick
142+
name: install libu2f-udev & imagemagick
139143
- uses: actions/setup-node@v3
140144
with:
141145
node-version: ${{ env.NODE_VERSION }}
@@ -158,12 +162,12 @@ jobs:
158162
name: RSpec
159163
- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
160164
name: Upload coverage
161-
- uses: actions/upload-artifact@v3
165+
- uses: actions/upload-artifact@v4
162166
if: always()
163167
with:
164168
name: screenshots
165169
path: ./spec/tmp/screenshots
166-
- uses: actions/upload-artifact@v3
170+
- uses: actions/upload-artifact@v4
167171
if: always()
168172
with:
169173
name: assets-manifest-${{ matrix.slice }}

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ run: up
22
@make create-seeds
33

44
up:
5-
docker-compose -f docker-compose.local.yml up --build -d
5+
docker compose -f docker-compose.local.yml up --build -d
66
@make setup-database
77

88
# Stops containers and remove volumes
99
teardown:
10-
docker-compose -f docker-compose.local.yml down -v --rmi all
10+
docker compose -f docker-compose.local.yml down -v --rmi all
1111

1212
create-database:
13-
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:create'
13+
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:create'
1414

1515
setup-database: create-database
16-
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:migrate'
16+
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:migrate'
1717

1818
# Create seeds
1919
create-seeds:
20-
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:schema:load db:seed'
20+
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:schema:load db:seed'
2121

2222
# Restore dump
2323
restore-dump:
2424
bundle exec rake restore_dump
2525

2626
shell:
27-
docker-compose -f docker-compose.local.yml exec app /bin/bash
27+
docker compose -f docker-compose.local.yml exec app /bin/bash
2828

2929
restart:
30-
docker-compose -f docker-compose.local.yml up -d
30+
docker compose -f docker-compose.local.yml up -d
3131

3232
rebuild:
33-
docker-compose -f docker-compose.local.yml up --build -d
33+
docker compose -f docker-compose.local.yml up --build -d
3434

3535
status:
36-
docker-compose -f docker-compose.local.yml ps
36+
docker compose -f docker-compose.local.yml ps
3737

3838
logs:
39-
docker-compose -f docker-compose.local.yml logs app
39+
docker compose -f docker-compose.local.yml logs app

app/packs/src/decidim/decidim_application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// as part of that pack
33

44
import "src/decidim/append_after_action_to_modals"
5+
import "src/decidim/disable_pwa_prompt.js"
56

67
// Load images
78
require.context("../../images", true)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// disable the prompt for pwa
2+
(() => {
3+
if (localStorage.getItem("pwaInstallPromptSeen") !== 'true') {
4+
localStorage.setItem("pwaInstallPromptSeen", true);
5+
}
6+
})();

0 commit comments

Comments
 (0)