Bump react-chartjs-2 from 2.11.1 to 2.11.2

Bumps [react-chartjs-2](https://github.com/reactchartjs/react-chartjs-2) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/reactchartjs/react-chartjs-2/releases)
- [Commits](https://github.com/reactchartjs/react-chartjs-2/commits)

---
updated-dependencies:
- dependency-name: react-chartjs-2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -1,79 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  target-branch: dev
-  ignore:
-  - dependency-name: laravel/framework
-    versions:
-    - 7.30.3
-    - 8.36.2
-    - 8.37.0
-    - 8.38.0
-  - dependency-name: doctrine/dbal
-    versions:
-    - 2.13.0
-    - 3.0.0
-  - dependency-name: phpunit/phpunit
-    versions:
-    - 9.5.1
-    - 9.5.3
-  - dependency-name: facade/ignition
-    versions:
-    - 2.5.10
-    - 2.5.11
-    - 2.5.12
-    - 2.5.13
-    - 2.5.9
-  - dependency-name: laravel/tinker
-    versions:
-    - 2.6.0
-  - dependency-name: nunomaduro/collision
-    versions:
-    - 5.3.0
-  - dependency-name: nunomaduro/larastan
-    versions:
-    - 0.6.13
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-  target-branch: dev
-  ignore:
-  - dependency-name: chart.js
-    versions:
-    - 3.1.0
-    - 3.1.1
-  - dependency-name: laravel-mix
-    versions:
-    - 6.0.16
-  - dependency-name: y18n
-    versions:
-    - 4.0.1
-    - 4.0.2
-  - dependency-name: react-dom
-    versions:
-    - 17.0.2
-  - dependency-name: react
-    versions:
-    - 17.0.2
-  - dependency-name: react-bootstrap
-    versions:
-    - 1.4.3
-    - 1.5.0
-  - dependency-name: sass
-    versions:
-    - 1.32.5
-    - 1.32.6
-    - 1.32.7
-  - dependency-name: "@babel/plugin-proposal-class-properties"
-    versions:
-    - 7.12.13
-  - dependency-name: react-toastify
-    versions:
-    - 7.0.1
-    - 7.0.2

.github/workflows/laravel-dev.yml

@@ -1,29 +1,59 @@
-name: Build Dev Image
+name: Dev
 
 on:
   push:
     branches: [ dev ]
 
 jobs:
-  build:
+  laravel-tests:
+
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Docker Setup Buildx
-        uses: docker/setup-buildx-action@v1.2.0
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: henrywhitaker3/speedtest-tracker:dev,henrywhitaker3/speedtest-tracker:dev-arm
+    - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+      with:
+        php-version: '7.4'
+    - uses: actions/checkout@v2
+    - name: Copy .env
+      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+    - name: Update .env with secrets
+      env:
+        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+        TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        HEALTHCHECKS_UUID: ${{ secrets.HEALTHCHECKS_UUID }}
+      run: |
+        echo SLACK_WEBHOOK=$SLACK_WEBHOOK >> .env
+        echo TELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN >> .env
+        echo TELEGRAM_CHAT_ID=$TELEGRAM_CHAT_ID >> .env
+        echo HEALTHCHECKS_UUID=$HEALTHCHECKS_UUID >> .env
+    - name: Install Dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+    - name: Create Database
+      run: |
+        mkdir -p database
+        touch database/database.sqlite
+    - name: Generate key
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan key:generate
+    - name: Generate JWT key
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan jwt:secret
+    - name: Directory Permissions
+      run: chmod -R 777 storage bootstrap/cache
+    - name: Download Speedtest binary
+      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
+    - name: Accept EULA
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan speedtest:eula
+    - name: Execute tests (Unit and Feature tests) via PHPUnit
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: vendor/bin/phpunit

.github/workflows/laravel-master.yml

@@ -1,29 +0,0 @@
-name: Build Latest Image
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Docker Setup Buildx
-        uses: docker/setup-buildx-action@v1.2.0
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: henrywhitaker3/speedtest-tracker:latest,henrywhitaker3/speedtest-tracker:latest-arm

.github/workflows/laravel-pr.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
       with:
-        php-version: '8.2'
+        php-version: '7.4'
     - uses: actions/checkout@v2
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
@@ -46,7 +46,7 @@ jobs:
     - name: Directory Permissions
       run: chmod -R 777 storage bootstrap/cache
     - name: Download Speedtest binary
-      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
+      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
     - name: Accept EULA
       env:
         DB_CONNECTION: sqlite

.github/workflows/laravel-stable.yml

@@ -0,0 +1,59 @@
+name: Stable
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  laravel-tests:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+      with:
+        php-version: '7.4'
+    - uses: actions/checkout@v2
+    - name: Copy .env
+      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+    - name: Update .env with secrets
+      env:
+        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+        TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        HEALTHCHECKS_UUID: ${{ secrets.HEALTHCHECKS_UUID }}
+      run: |
+        echo SLACK_WEBHOOK=$SLACK_WEBHOOK >> .env
+        echo TELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN >> .env
+        echo TELEGRAM_CHAT_ID=$TELEGRAM_CHAT_ID >> .env
+        echo HEALTHCHECKS_UUID=$HEALTHCHECKS_UUID >> .env
+    - name: Install Dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+    - name: Create Database
+      run: |
+        mkdir -p database
+        touch database/database.sqlite
+    - name: Generate key
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan key:generate
+    - name: Generate JWT key
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan jwt:secret
+    - name: Directory Permissions
+      run: chmod -R 777 storage bootstrap/cache
+    - name: Download Speedtest binary
+      run: wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz && tar zxvf speedtest.tgz && mv speedtest app/Bin/
+    - name: Accept EULA
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: php artisan speedtest:eula
+    - name: Execute tests (Unit and Feature tests) via PHPUnit
+      env:
+        DB_CONNECTION: sqlite
+        DB_DATABASE: database/database.sqlite
+      run: vendor/bin/phpunit

README.md

@@ -1,6 +1,6 @@
 # Speedtest Tracker
 
-[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/henrywhitaker3/Speedtest-Tracker/laravel-master.yml?branch=master&label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/henrywhitaker3/Speedtest-Tracker/laravel-dev.yml?branch=dev&label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.3-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
+[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.1-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
 
 This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.
 

Taskfile.yaml

@@ -1,15 +0,0 @@
-version: "3"
-
-vars:
-  RTAG:
-    sh: head -n 25 /dev/random | md5sum | head -c 8
-
-tasks:
-  build:
-    cmds:
-      - docker build . -f docker/Dockerfile --tag henrywhitaker3/speedtest-tracker:{{ .RTAG }}
-
-  run:
-    deps: [build]
-    cmds:
-      - docker run --rm -p 8765:80 -e OOKLA_EULA_GDPR=true henrywhitaker3/speedtest-tracker:{{ .RTAG }}

app/Actions/QueueSpeedtest.php

@@ -30,6 +30,6 @@ class QueueSpeedtest implements ActionInterface
     {
         SettingsHelper::loadIntegrationConfig();
 
-        SpeedtestJob::dispatch($this->speedtestProvider, false, config('integrations'));
+        SpeedtestJob::dispatch(false, config('integrations'), $this->speedtestProvider);
     }
 }

app/Console/Kernel.php

@@ -32,9 +32,9 @@ class Kernel extends ConsoleKernel
         if ((bool)SettingsHelper::get('schedule_enabled')->value) {
             $schedule->job(
                 new SpeedtestJob(
-                    app()->make(SpeedtestProvider::class),
                     true,
                     config('integrations'),
+                    app()->make(SpeedtestProvider::class)
                 )
             )
                 ->cron(SettingsHelper::get('schedule')['value'])

app/Http/Controllers/HomepageDataController.php

@@ -28,7 +28,7 @@ class HomepageDataController extends Controller
         return [
             'latest' => run(GetLatestSpeedtestData::class),
             'time' => run(GetSpeedtestTimeData::class, $days),
-            'fail' => run(GetFailedSpeedtestData::class, $days),
+            'fail' => run(GetFailedSpeedtestData::class),
             'config' => SettingsHelper::getConfig(),
         ];
     }

app/Jobs/SpeedtestJob.php

@@ -43,7 +43,7 @@ class SpeedtestJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct(SpeedtestProvider $speedtestProvider, $scheduled = true, $config = [])
+    public function __construct($scheduled = true, $config = [], SpeedtestProvider $speedtestProvider)
     {
         $this->scheduled = $scheduled;
         $this->config = $config;

changelog.json

@@ -1,20 +1,4 @@
 {
-    "1.12.3": [
-        {
-            "description": "Updated to PHP 8.2",
-            "link": ""
-        },
-        {
-            "description": "Updated speedtest cli to 1.2.0 (#1119)",
-            "link": "https://github.com/henrywhitaker3/Speedtest-Tracker/issues/1119"
-        }
-    ],
-    "1.12.2": [
-        {
-            "description": "Fixed a bug where the latest X days widget would not update for the failure graph",
-            "link": ""
-        }
-    ],
     "1.12.1": [
         {
             "description": "Fixed a bug where the latest X days widget would not update (#680)",

composer.json

@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8",
+        "php": "^7.2.5",
         "doctrine/dbal": "^2.10",
         "dragonmantank/cron-expression": "^3",
         "fideloper/proxy": "^4.2",

config/auth.php

@@ -62,7 +62,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\Models\User::class,
+            'model' => App\User::class,
         ],
 
         // 'users' => [

config/speedtest.php

@@ -7,7 +7,7 @@ return [
     |--------------------------------------------------------------------------
     */
 
-    'version' => '1.12.3',
+    'version' => '1.12.1',
 
     /*
     |--------------------------------------------------------------------------

docker/Dockerfile

@@ -3,8 +3,6 @@ LABEL maintainer=henrywhitaker3@outlook.com
 
 ENV arch='x86_64'
 
-RUN apk add php82-tokenizer
-
 COPY docker/conf/ /
 COPY . /site
 

docker/arm.Dockerfile

@@ -3,8 +3,6 @@ LABEL maintainer=henrywhitaker3@outlook.com
 
 ENV arch='arm'
 
-RUN apk add php82-tokenizer
-
 COPY docker/conf/ /
 COPY . /site
 

docker/conf/defaults/crontab

@@ -6,5 +6,5 @@
 0       3       *       *       6       run-parts /etc/periodic/weekly
 0       5       1       *       *       run-parts /etc/periodic/monthly
 # speedtest cron
-* * * * * php82 /config/www/artisan schedule:run >> /config/log/speedtest/cron.log
-# */5 * * * * php82 /config/www/artisan queue:retry all >> /config/log/speedtest.cron.log
+* * * * * php /config/www/artisan schedule:run >> /config/log/speedtest/cron.log
+# */5 * * * * php /config/www/artisan queue:retry all >> /config/log/speedtest.cron.log

docker/conf/etc/cont-init.d/50-speedtest

@@ -11,18 +11,6 @@ function eulaError()
     exit 1
 }
 
-function downloadSpeedtestCli()
-{
-    if [ $(uname -m) == "x86_64" ]; then
-        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -O speedtest.tgz > /dev/null
-    else
-        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-aarch64.tgz -O speedtest.tgz > /dev/null
-    fi
-
-    tar zxvf speedtest.tgz > /dev/null
-    cp speedtest /site/app/Bin/
-}
-
 # Do Ookla stuff
 if [ -z ${OOKLA_EULA_GDPR+x} ]; then
     eulaError
@@ -34,28 +22,19 @@ else
     if [ ! -f /config/www/app/Bin/speedtest ]; then
         echo "Ookla GDPR and EULA accepted. Downloading Speedtest CLI."
         cd /tmp
-
-        downloadSpeedtestCli
+        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-$arch-linux.tgz -O speedtest.tgz > /dev/null
+        tar zxvf speedtest.tgz > /dev/null
+        cp speedtest /site/app/Bin/
 
         chmod +x /site/artisan
         HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
         HOME=/root
     else
-        /config/www/app/Bin/speedtest --version | grep -E "1\.2\.0"
-        rc=$?
-
-        if [ $rc -ne 0 ]; then
-            downloadSpeedtestCli
-        fi
-
         HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
         HOME=/root
     fi
 fi
 
-# Copy latest nginx config
-cp /defaults/nginx/nginx.conf.sample /config/nginx/nginx.conf
-
 # Copy site files to /config
 echo "Copying latest site files to config"
 cp -rfT /site/ /config/www/
@@ -84,19 +63,19 @@ fi
 
 echo 'Updating packages'
 apk add composer
-cd /config/www && php82 /usr/bin/composer.phar install && echo date > /config/www/.composer-time
+cd /config/www && composer install && echo date > /config/www/.composer-time
 
 sed "s,DB_DATABASE=.*,DB_DATABASE=/config/speed.db," -i.bak /config/www/.env
 
 echo "Running database migrations"
-php82 /config/www/artisan migrate
+php /config/www/artisan migrate
 
 # Check app key exists
 if grep -E "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /config/www/.env > /dev/null; then
     echo "App key exists"
 else
     echo "Generating app key"
-    php82 /config/www/artisan key:generate
+    php /config/www/artisan key:generate
 fi
 
 # Check JWT secret exists
@@ -104,7 +83,7 @@ if grep -E "JWT_SECRET=[0-9A-Za-z:+\/=]{1,}" /config/www/.env > /dev/null ; then
     echo "JWT secret exists"
 else
     echo "Generating JWT secret"
-    php82 /config/www/artisan jwt:secret
+    php /config/www/artisan jwt:secret
 fi
 
 if [ -z ${SLACK_WEBHOOK+x} ]; then
@@ -113,7 +92,7 @@ if [ -z ${SLACK_WEBHOOK+x} ]; then
 else
     echo "Slack webhook set, updating db"
     sed "s,SLACK_WEBHOOK=.*,SLACK_WEBHOOK=$SLACK_WEBHOOK," -i.bak /config/www/.env
-    php82 /config/www/artisan speedtest:slack $SLACK_WEBHOOK
+    php /config/www/artisan speedtest:slack $SLACK_WEBHOOK
 fi
 
 if [ -z ${TELEGRAM_BOT_TOKEN+x} ] && [ -z ${TELEGRAM_CHAT_ID+x} ]; then
@@ -124,7 +103,7 @@ else
     echo "Telegram chat id and bot token set, updating .env"
     sed "s,TELEGRAM_BOT_TOKEN=.*,TELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN," -i.bak /config/www/.env
     sed "s,TELEGRAM_CHAT_ID=.*,TELEGRAM_CHAT_ID=$TELEGRAM_CHAT_ID," -i.bak /config/www/.env
-    php82 /config/www/artisan speedtest:telegram --chat=$TELEGRAM_CHAT_ID --bot=$TELEGRAM_BOT_TOKEN
+    php /config/www/artisan speedtest:telegram --chat=$TELEGRAM_CHAT_ID --bot=$TELEGRAM_BOT_TOKEN
 fi
 
 if [ -z ${BASE_PATH+x} ]; then
@@ -137,19 +116,19 @@ fi
 
 if [ -z ${AUTH+x} ]; then
     echo "AUTH variable not set. Disabling authentication"
-    php82 /config/www/artisan speedtest:auth --disable
+    php /config/www/artisan speedtest:auth --disable
 else
     if [ $AUTH == 'true' ]; then
         echo "AUTH variable set. Enabling authentication"
-        php82 /config/www/artisan speedtest:auth --enable
+        php /config/www/artisan speedtest:auth --enable
     else
         echo "AUTH variable set, but not to 'true'. Disabling authentication"
-        php82 /config/www/artisan speedtest:auth --disable
+        php /config/www/artisan speedtest:auth --disable
     fi
 fi
 
 echo "Clearing old jobs from queue"
-php82 /config/www/artisan queue:clear
+php /config/www/artisan queue:clear
 
 mkdir -p /config/log/speedtest
 

docker/conf/etc/services.d/speedtest/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-exec s6-setuidgid abc php82 /config/www/artisan queue:work --timeout=120 >> /config/log/speedtest/queue.log
+exec s6-setuidgid abc php /config/www/artisan queue:work --timeout=120 >> /config/log/speedtest/queue.log

package-lock.json

@@ -11,7 +11,7 @@
                 "js-cookie": "^2.2.1",
                 "react-beautiful-dnd": "^13.1.0",
                 "react-bootstrap": "^1.5.1",
-                "react-chartjs-2": "^2.11.1",
+                "react-chartjs-2": "^2.11.2",
                 "react-router": "^5.2.0",
                 "react-router-dom": "^5.2.0",
                 "react-toastify": "^7.0.3"
@@ -9663,12 +9663,17 @@
             }
         },
         "node_modules/react-chartjs-2": {
-            "version": "2.11.1",
-            "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz",
-            "integrity": "sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA==",
+            "version": "2.11.2",
+            "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz",
+            "integrity": "sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw==",
             "dependencies": {
                 "lodash": "^4.17.19",
                 "prop-types": "^15.7.2"
+            },
+            "peerDependencies": {
+                "chart.js": "^2.3",
+                "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
+                "react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
             }
         },
         "node_modules/react-dom": {
@@ -21485,9 +21490,9 @@
             }
         },
         "react-chartjs-2": {
-            "version": "2.11.1",
-            "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz",
-            "integrity": "sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA==",
+            "version": "2.11.2",
+            "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz",
+            "integrity": "sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw==",
             "requires": {
                 "lodash": "^4.17.19",
                 "prop-types": "^15.7.2"

package.json

@@ -31,7 +31,7 @@
         "js-cookie": "^2.2.1",
         "react-beautiful-dnd": "^13.1.0",
         "react-bootstrap": "^1.5.1",
-        "react-chartjs-2": "^2.11.1",
+        "react-chartjs-2": "^2.11.2",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",
         "react-toastify": "^7.0.3"

routes/web.php

@@ -1,7 +1,6 @@
 <?php
 
 use App\Helpers\SettingsHelper;
-use GuzzleHttp\Psr7\MimeType;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Route;
@@ -22,7 +21,7 @@ Route::get(SettingsHelper::getBase() . 'files/{path?}', function ($file) {
     $fileP = public_path() . '/' . $fileP;
     if (file_exists($fileP)) {
         $contents = File::get($fileP);
-        $mime = MimeType::fromFilename($fileP);
+        $mime = \GuzzleHttp\Psr7\mimetype_from_filename($fileP);
         return Response::make(File::get($fileP), 200, ['Content-type' => $mime]);
     } else {
         abort(404);