diff --git a/.github/workflows/2wr-app.yaml b/.github/workflows/2wr-app.yaml index 52b3ef9..cac7baf 100644 --- a/.github/workflows/2wr-app.yaml +++ b/.github/workflows/2wr-app.yaml @@ -43,99 +43,15 @@ jobs: TWO_WEEKS_READY_E2E_TEST_PASSWORD: ${{ secrets.TWO_WEEKS_READY_E2E_TEST_PASSWORD }} working-directory: ./2wr-app - name: Upload e2e Test Results Recordings and Screenshots - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: e2e-test-results path: ./2wr-app/test-results - name: Upload e2e Test Results Report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: e2e-test-report path: ./2wr-app/playwright-report - - name: Clear sample env file from e2e tests - run: 'rm ./2wr-app/.env' - - name: Write env file - run: 'echo "$DEV_ENV" > ./2wr-app/.env' - shell: bash - env: - DEV_ENV: ${{secrets.DEV_ENV}} - - run: npm run build - working-directory: ./2wr-app - deploy_to_dev: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [16.x] - - needs: build - if: github.event_name != 'pull_request' - environment: development - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - working-directory: ./2wr-app - - name: Write env file - run: 'echo "$DEV_ENV" > ./2wr-app/.env' - shell: bash - env: - DEV_ENV: ${{secrets.DEV_ENV}} - - run: npm run build - working-directory: ./2wr-app - - name: Azure Login - uses: azure/login@v1 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - - name: Azure Deploy Resources - uses: Azure/cli@v1.0.0 - with: - inlineScript: | - chmod +x $GITHUB_WORKSPACE/az/deploy-frontend.sh - $GITHUB_WORKSPACE/az/deploy-frontend.sh -s $GITHUB_WORKSPACE/2wr-app/dist/ - - deploy_to_beta: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [16.x] - - needs: deploy_to_dev - if: github.event_name != 'pull_request' - environment: beta - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - working-directory: ./2wr-app - - name: Write env file - run: 'echo "$ENV" > ./2wr-app/.env' - shell: bash - env: - ENV: ${{secrets.ENV}} - - run: npm run build - working-directory: ./2wr-app - - name: Azure Login - uses: azure/login@v1 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - - name: Azure Deploy Resources - uses: Azure/cli@v1.0.0 - with: - inlineScript: | - chmod +x $GITHUB_WORKSPACE/az/deploy-frontend.sh - $GITHUB_WORKSPACE/az/deploy-frontend.sh -s $GITHUB_WORKSPACE/2wr-app/dist/ -r 2wr-beta-resources -e 2wrbeta diff --git a/2wr-app/package-lock.json b/2wr-app/package-lock.json index b6fe62f..ea70aec 100644 --- a/2wr-app/package-lock.json +++ b/2wr-app/package-lock.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@mdi/font": "^5.8.55", - "@playwright/test": "^1.40.0", + "@playwright/test": "^1.49.1", "@vue/cli-plugin-babel": "^4.5.10", "@vue/cli-plugin-eslint": "^4.5.10", "@vue/cli-plugin-pwa": "^4.5.10", @@ -1736,18 +1736,18 @@ } }, "node_modules/@playwright/test": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.40.0.tgz", - "integrity": "sha512-PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz", + "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==", "dev": true, "dependencies": { - "playwright": "1.40.0" + "playwright": "1.49.1" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@soda/friendly-errors-webpack-plugin": { @@ -11043,33 +11043,33 @@ } }, "node_modules/playwright": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz", - "integrity": "sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz", + "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==", "dev": true, "dependencies": { - "playwright-core": "1.40.0" + "playwright-core": "1.49.1" }, "bin": { "playwright": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" }, "optionalDependencies": { "fsevents": "2.3.2" } }, "node_modules/playwright-core": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz", - "integrity": "sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz", + "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==", "dev": true, "bin": { "playwright-core": "cli.js" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/pnp-webpack-plugin": { @@ -17761,12 +17761,12 @@ "dev": true }, "@playwright/test": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.40.0.tgz", - "integrity": "sha512-PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz", + "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==", "dev": true, "requires": { - "playwright": "1.40.0" + "playwright": "1.49.1" } }, "@soda/friendly-errors-webpack-plugin": { @@ -25234,19 +25234,19 @@ } }, "playwright": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.0.tgz", - "integrity": "sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz", + "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==", "dev": true, "requires": { "fsevents": "2.3.2", - "playwright-core": "1.40.0" + "playwright-core": "1.49.1" } }, "playwright-core": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.0.tgz", - "integrity": "sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz", + "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==", "dev": true }, "pnp-webpack-plugin": { diff --git a/2wr-app/package.json b/2wr-app/package.json index 9566822..f910341 100644 --- a/2wr-app/package.json +++ b/2wr-app/package.json @@ -1,3 +1,5 @@ + + { "name": "2wr-app", "version": "0.1.0", @@ -31,7 +33,7 @@ }, "devDependencies": { "@mdi/font": "^5.8.55", - "@playwright/test": "^1.40.0", + "@playwright/test": "^1.49.1", "@vue/cli-plugin-babel": "^4.5.10", "@vue/cli-plugin-eslint": "^4.5.10", "@vue/cli-plugin-pwa": "^4.5.10", diff --git a/2wr-app/src/components/prepare/hazards/hazard-info.vue b/2wr-app/src/components/prepare/hazards/hazard-info.vue index 92ff346..385c6a1 100644 --- a/2wr-app/src/components/prepare/hazards/hazard-info.vue +++ b/2wr-app/src/components/prepare/hazards/hazard-info.vue @@ -17,7 +17,7 @@

{{item.name}} Safety

- Before + Before During diff --git a/2wr-app/src/components/welcome/welcome-landing.vue b/2wr-app/src/components/welcome/welcome-landing.vue index da77b73..5e26c30 100644 --- a/2wr-app/src/components/welcome/welcome-landing.vue +++ b/2wr-app/src/components/welcome/welcome-landing.vue @@ -7,7 +7,7 @@

Welcome to 2 weeks ready

-

+

2 Weeks Ready is a mobile application that makes emergency preparedness a simple, easy, sharable, and diff --git a/TwoWeeksReady.Common/TwoWeeksReady.Common.csproj b/TwoWeeksReady.Common/TwoWeeksReady.Common.csproj index 6e86919..64031c5 100644 --- a/TwoWeeksReady.Common/TwoWeeksReady.Common.csproj +++ b/TwoWeeksReady.Common/TwoWeeksReady.Common.csproj @@ -5,7 +5,8 @@ - + + diff --git a/api/TwoWeeksReady/TwoWeeksReady.csproj b/api/TwoWeeksReady/TwoWeeksReady.csproj index f6d7c40..7ef72e5 100644 --- a/api/TwoWeeksReady/TwoWeeksReady.csproj +++ b/api/TwoWeeksReady/TwoWeeksReady.csproj @@ -8,9 +8,9 @@ - + - +