Merge tag 'v1.3.2' into production

.env.local.example

@@ -0,0 +1,78 @@
+# accessibility-app variables
+APP_NAME="The Accessibility Exchange"
+APP_ENV=local
+APP_KEY=
+APP_URL=https://platform.test
+APP_SERVICE=platform.test
+
+DB_CONNECTION=mysql
+DB_HOST=platform.mysql
+DB_PORT=3306
+DB_DATABASE=accessibilityexchange
+DB_USERNAME=root
+DB_PASSWORD=
+
+FILES_PATH="/opt/data/storage"
+CACHE_PATH="/opt/data/cache"
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=database
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=memcached
+
+# REDIS_HOST=127.0.0.1
+REDIS_HOST=platform.redis
+REDIS_PASSWORD=
+REDIS_PORT=6379
+
+
+MAIL_MAILER=smtp
+MAIL_HOST=platform.mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=
+[email protected]
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+SNAPSHOTS_DISK=snapshots
+SNAPSHOTS_AWS_ACCESS_KEY_ID=
+SNAPSHOTS_AWS_SECRET_ACCESS_KEY=
+SNAPSHOTS_AWS_DEFAULT_REGION=us-east-1
+SNAPSHOTS_AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SAIL_XDEBUG_MODE=develop,debug,coverage
+
+CIPHERSWEET_KEY=
+
+FLARE_KEY=
+
+WWWUSER=
+WWWGROUP=
+
+# if you want to test s3 connection from local setup and have proper credentials to an s3 bucket
+# MINIO_DRIVER=s3
+# MINIO_ENDPOINT=
+# MINIO_REGION=
+# MINIO_PROJECT_BUCKET=
+# MINIO_ACCESS_KEY=
+# MINIO_SECRET_KEY=

.eslintrc.json

@@ -1,7 +1,8 @@
 {
     "extends": [
         "fluid",
-        "prettier"
+        "prettier",
+        "plugin:jsonc/recommended-with-json"
     ],
     "ignorePatterns": ["public/**/*.js"],
     "env": {

.github/workflows/analyze.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.1]
+        php: [8.2]
 
     steps:
       - uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
           coverage: none
       - name: Cache Composer packages
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('**/composer.lock') }}

.github/workflows/asset-lint.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.1]
+        php: [8.2]
 
     steps:
       - uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
           coverage: none
       - name: Cache Composer packages
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('**/composer.lock') }}
@@ -43,7 +43,7 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}

.github/workflows/frontend.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.1]
+        php: [8.2]
 
     steps:
       - uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
           coverage: none
       - name: Cache Composer packages
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('**/composer.lock') }}
@@ -46,7 +46,7 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
@@ -90,13 +90,13 @@ jobs:
         run: php artisan pest:dusk
       - name: Upload Screenshots
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tests/Browser/screenshots
       - name: Upload Console Logs
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: console
           path: tests/Browser/console

.github/workflows/laravel.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2]
+        php: [8.2, 8.3]
 
     name: tests - PHP ${{ matrix.php }}
 
@@ -35,7 +35,7 @@ jobs:
           coverage: pcov
       - name: Cache Composer packages
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('**/composer.lock') }}
@@ -48,7 +48,7 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
@@ -74,7 +74,7 @@ jobs:
         if: steps.git-diff.outputs.diff
         run: chmod -R 777 storage bootstrap/cache
       - name: Run tests
-        if: steps.git-diff.outputs.diff && matrix.php == '8.2'
+        if: steps.git-diff.outputs.diff && matrix.php == '8.3'
         env:
           DB_DATABASE: tae-test
           DB_PASSWORD: root
@@ -84,7 +84,7 @@ jobs:
           php artisan storage:link
           php artisan test
       - name: Run tests with coverage
-        if: steps.git-diff.outputs.diff && matrix.php == '8.1'
+        if: steps.git-diff.outputs.diff && matrix.php == '8.2'
         env:
           DB_DATABASE: tae-test
           DB_PASSWORD: root
@@ -94,8 +94,8 @@ jobs:
           php artisan storage:link
           php artisan test --coverage-clover coverage.xml
       - name: Save code coverage to artifact
-        uses: actions/upload-artifact@v3
-        if: steps.git-diff.outputs.diff && matrix.php == '8.1'
+        uses: actions/upload-artifact@v4
+        if: steps.git-diff.outputs.diff && matrix.php == '8.2'
         with:
           name: code-coverage
           path: "coverage.xml"
@@ -105,15 +105,15 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - laravel-tests
-    if: needs.laravel-tests.outputs.diff
+    if: needs.laravel-tests.outputs.diff && github.repository == 'accessibility-exchange/platform'
     steps:
       - uses: actions/checkout@v4
       - name: Fetch code coverage artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: code-coverage
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

.github/workflows/lighthouse.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.1]
+        php: [8.2]
 
     steps:
       - uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
           coverage: none
       - name: Cache Composer packages
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('**/composer.lock') }}
@@ -49,7 +49,7 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}

.github/workflows/release-please.yml

@@ -9,10 +9,9 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          release-type: php
-          package-name: accessibility-exchange/platform
-          pull-request-title-pattern: "chore(release): release ${version}"
+          config-file: release-please-config.json
+          manifest-file: .release-please-manifest.json

.gitignore

@@ -11,11 +11,13 @@
 .DS_Store
 .env
 .env.backup
+.env.testing
 .idea
 .nova
 .php-cs-fixer.cache
 .phpstorm.meta.php
 .phpunit.result.cache
+.phpunit.cache
 .vscode
 Homestead.json
 Homestead.yaml

.kube/app/Dockerfile

@@ -1,9 +1,9 @@
-FROM php:8.1-fpm
+FROM php:8.2-fpm
 
-ENV PHP_VERSION 8.1
-ENV NODE_VERSION 18
+ENV PHP_VERSION 8.2
+ENV NODE_VERSION 18.18.2
 ENV NVM_VERSION 0.39.3
-ENV NVM_DIR /root/.nvm
+ENV NVM_DIR /var/www/.nvm
 
 ENV APP_DIR /app
 ENV KUBE_DIR .kube/app
@@ -34,11 +34,7 @@ RUN apt-get install -y \
     s3cmd
 
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg
-RUN docker-php-ext-install -j$(nproc) gd
-RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath bz2 zip soap
-RUN docker-php-ext-install opcache
-RUN docker-php-ext-configure intl
-RUN docker-php-ext-install intl
+RUN docker-php-ext-install -j$(nproc) gd pdo_mysql mbstring exif pcntl bcmath bz2 zip soap intl opcache
 
 RUN apt-get install -y libmagickwand-dev --no-install-recommends
 
@@ -54,6 +50,7 @@ RUN pecl install -o -f redis && \
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
+RUN mkdir -p $NVM_DIR
 RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
 RUN . "$NVM_DIR/nvm.sh" && nvm install $NODE_VERSION
 ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
@@ -70,6 +67,6 @@ RUN composer install
 
 RUN . "$NVM_DIR/nvm.sh" && nvm use $NODE_VERSION && npm ci
 
-RUN chown www-data:root $APP_DIR/public/ -R
+RUN chown -R www-data:root $APP_DIR/public/ $NVM_DIR
 
 ENTRYPOINT $APP_DIR/$KUBE_DIR/entrypoint.sh