Merge branch 'develop' of github.com:THM-Health/PILOS into fix-admin-…

…ui-user-management # Conflicts: # database/seeders/RolesAndPermissionsSeeder.php
THM-Health · Jan 2, 2025 · 869bcbf · 869bcbf
2 parents 4621996 + f064e92
commit 869bcbf
Show file tree

Hide file tree

Showing 184 changed files with 19,785 additions and 6,834 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,16 +25,16 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
 
--   OS: [e.g. iOS]
--   Browser [e.g. chrome, safari]
--   Version [e.g. 22]
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
 
--   Device: [e.g. iPhone6]
--   OS: [e.g. iOS8.1]
--   Browser [e.g. stock browser, safari]
--   Version [e.g. 22]
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -2,20 +2,20 @@
 
 ## Type (Highlight the corresponding type)
 
--   **Bugfix**
--   Feature
--   Documentation
--   Refactoring (e.g. Style updates, Test implementation, etc.)
--   Other (please describe):
+- **Bugfix**
+- Feature
+- Documentation
+- Refactoring (e.g. Style updates, Test implementation, etc.)
+- Other (please describe):
 
 ## Checklist
 
--   [ ] Code updated to current develop branch head
--   [ ] Passes CI checks
--   [ ] Is a part of an issue
--   [ ] Tests added for the bugfix or newly implemented feature, describe below why if not
--   [ ] Changelog is updated
--   [ ] Documentation of code and features exists
+- [ ] Code updated to current develop branch head
+- [ ] Passes CI checks
+- [ ] Is a part of an issue
+- [ ] Tests added for the bugfix or newly implemented feature, describe below why if not
+- [ ] Changelog is updated
+- [ ] Documentation of code and features exists
 
 ## Changes
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,7 @@ on:
 
 env:
   PHP_VERSION: 8.3
+  CYPRESS_PROJECT_ID: w8t3fx
 
 jobs:
   backend:
@@ -59,10 +60,10 @@ jobs:
           while ! pg_isready -h"127.0.0.1" -p"$PORT" > /dev/null 2> /dev/null; do
             sleep 1
           done
-      - name: Install pipe viewer tool
+      - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install pv
+          sudo apt-get install pv mariadb-client
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
@@ -98,7 +99,7 @@ jobs:
           DB_PASSWORD: password
         run: php artisan migrate --no-interaction -vvv --force
       - name: Execute code style check via Laravel Pint
-        run: vendor/bin/pint --test
+        run: vendor/bin/pint --test -v
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
         env:
@@ -134,10 +135,9 @@ jobs:
           LOG_CHANNEL: stack
         run: php artisan test --parallel --testsuite=Unit,Feature
       - name: Upload coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload laravel logs
         uses: actions/upload-artifact@v4
         if: failure()
@@ -248,18 +248,23 @@ jobs:
           record: true
           tag: ${{ github.event_name }}
         env:
-          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}
+          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
           COMMIT_INFO_SHA: ${{ github.event.pull_request.head.sha }}
           APP_URL: "http://localhost:9080"
           TZ: "America/New_York"
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: cypress-screenshots
+          path: tests/Frontend/screenshots
       - name: Upload coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
           directory: coverage
   system-tests:
     name: System Tests
@@ -309,10 +314,16 @@ jobs:
           tag: ${{ github.event_name }}
           project: ./tests/System
         env:
-          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}
+          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
           COMMIT_INFO_SHA: ${{ github.event.pull_request.head.sha }}
           APP_URL: "http://localhost:9080"
           TZ: "America/New_York"
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: cypress-screenshots
+          path: tests/System/screenshots