Merge branch 'release-1.0.93'

Author: entrotech

.github/workflows/deployFullstackToDockerHub.yaml

@@ -10,19 +10,25 @@ on:
       - published
 jobs:
   fullstack:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Build and push Full-Stack Container to Docker Hub
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: build-and-push-image
-        uses: docker/build-push-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: foodoasisla/foodoasisla
-          dockerfile: ./Dockerfile
-          tag_with_ref: true
-          tag_with_sha: true
-          add_git_labels: true
-          labels: description="Food Oasis",maintained="[email protected]"
+      - name: build-and-push-image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            foodoasisla/foodoasisla:${{ github.ref_name }}
+            foodoasisla/foodoasisla:${{ github.sha }}
+          labels: |
+            description=Food Oasis
+            [email protected]

.github/workflows/deployWebAPIOnlyToDockerHub.yaml

@@ -11,19 +11,25 @@ on:
       - published
 jobs:
   webapi:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     name: Build and push Web API Container to Docker Hub
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: build-and-push-image
-        uses: docker/build-push-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
         with:
-          dockerfile: ./Dockerfile-jared
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: foodoasisla/foodoasisla
-          tag_with_ref: true
-          tag_with_sha: true
-          add_git_labels: true
-          labels: description="Food Oasis",maintained="[email protected]"
+      - name: build-and-push-image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile-jared
+          push: true
+          tags: |
+            foodoasisla/foodoasisla:${{ github.ref_name }}
+            foodoasisla/foodoasisla:${{ github.sha }}
+          labels: |
+            description=Food Oasis
+            [email protected]

.github/workflows/developToHeroku.yml

@@ -7,9 +7,14 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
+      - name: Install Heroku CLI
+        run: |
+          curl https://cli-assets.heroku.com/install.sh | sh
+
       - uses: akhileshns/[email protected] # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}

.github/workflows/mainToHeroku.yml

@@ -7,9 +7,14 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
+      - name: Install Heroku CLI
+        run: |
+          curl https://cli-assets.heroku.com/install.sh | sh
+
       - uses: akhileshns/[email protected] # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}

.github/workflows/playwright.yml

@@ -0,0 +1,41 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master, develop ]
+  pull_request:
+    branches: [ main, master, develop ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+
+    - name: Install dependencies
+      working-directory: ./client
+      run: npm ci
+
+    - name: Install Playwright Browsers
+      working-directory: ./client
+      run: npx playwright install --with-deps
+
+    - name: Install wait-on
+      working-directory: ./client
+      run: npm install wait-on
+
+    - name: Run Playwright tests
+      working-directory: ./client
+      run: |
+        npm run start & 
+        npx wait-on http://localhost:3000
+        npx playwright test
+      
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30

.github/workflows/viteToHeroku.yml

@@ -7,12 +7,17 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
+      - name: Install Heroku CLI
+        run: |
+          curl https://cli-assets.heroku.com/install.sh | sh
+
       - uses: akhileshns/[email protected] # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "foodoasisvite" #Must be unique in Heroku
+          heroku_app_name: "foodoasisvite" # Must be unique in Heroku
           heroku_email: "[email protected]"
           usedocker: true

.gitignore

@@ -254,4 +254,11 @@ dotenv
 # End of project-specific exclusions
 #
 
-/thunder-tests/thunderActivity.json
+/thunder-tests/thunderActivity.json
+
+# Playwright
+node_modules/
+/client/test-results/
+/client/playwright-report/
+/client/blob-report/
+/client/playwright/.cache/