Bump react-bootstrap from 1.5.1 to 2.7.0

Bumps [react-bootstrap](https://github.com/react-bootstrap/react-bootstrap) from 1.5.1 to 2.7.0.
- [Release notes](https://github.com/react-bootstrap/react-bootstrap/releases)
- [Changelog](https://github.com/react-bootstrap/react-bootstrap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/react-bootstrap/compare/v1.5.1...v2.7.0)

---
updated-dependencies:
- dependency-name: react-bootstrap
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

.github/dependabot.yml

@@ -0,0 +1,79 @@
+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,59 +1,29 @@
-name: Dev
+name: Build Dev Image
 
 on:
   push:
     branches: [ dev ]
 
 jobs:
-  laravel-tests:
-
+  build:
     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
+      - 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,linux/arm/v7
+          push: true
+          tags: henrywhitaker3/speedtest-tracker:dev,henrywhitaker3/speedtest-tracker:dev-arm

.github/workflows/laravel-master.yml

@@ -0,0 +1,29 @@
+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,linux/arm/v7
+          push: true
+          tags: henrywhitaker3/speedtest-tracker:latest,henrywhitaker3/speedtest-tracker:latest-arm

.github/workflows/laravel-stable.yml

@@ -1,59 +0,0 @@
-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/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)
+[![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.2-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.
 

app/Http/Controllers/HomepageDataController.php

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

changelog.json

@@ -1,4 +1,10 @@
 {
+    "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)",

config/auth.php

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

config/speedtest.php

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

docker/arm.Dockerfile

@@ -3,7 +3,8 @@ LABEL maintainer=henrywhitaker3@outlook.com
 
 ENV arch='arm'
 
-COPY conf/ /
+COPY docker/conf/ /
+COPY . /site
 
 EXPOSE 80 443
 

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

@@ -22,14 +22,21 @@ else
     if [ ! -f /config/www/app/Bin/speedtest ]; then
         echo "Ookla GDPR and EULA accepted. Downloading Speedtest CLI."
         cd /tmp
-        wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-$arch-linux.tgz -O speedtest.tgz > /dev/null
+
+        if [ $(uname -m) == "x86_64" ]; then
+            wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz > /dev/null
+        else
+            wget https://install.speedtest.net/app/cli/ookla-speedtest-1.0.0-arm-linux.tgz -O speedtest.tgz > /dev/null
+        fi
+
         tar zxvf speedtest.tgz > /dev/null
         cp speedtest /site/app/Bin/
 
-        HOME=/config && s6-setuidgid abc /site/artisan speedtest:eula > /dev/null
+        chmod +x /site/artisan
+        HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
         HOME=/root
     else
-        HOME=/config && s6-setuidgid abc /config/www/artisan speedtest:eula > /dev/null
+        HOME=/config && s6-setuidgid abc /site/app/Bin/speedtest --accept-license --accept-gdpr > /dev/null
         HOME=/root
     fi
 fi

package-lock.json

@@ -10,7 +10,7 @@
                 "csv-file-validator": "^1.10.1",
                 "js-cookie": "^2.2.1",
                 "react-beautiful-dnd": "^13.1.0",
-                "react-bootstrap": "^1.5.1",
+                "react-bootstrap": "^2.7.0",
                 "react-chartjs-2": "^2.11.1",
                 "react-router": "^5.2.0",
                 "react-router-dom": "^5.2.0",
@@ -1308,11 +1308,14 @@
             "dev": true
         },
         "node_modules/@babel/runtime": {
-            "version": "7.13.10",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
-            "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
+            "version": "7.20.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
+            "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
             "dependencies": {
-                "regenerator-runtime": "^0.13.4"
+                "regenerator-runtime": "^0.13.11"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template": {
@@ -1377,28 +1380,55 @@
             }
         },
         "node_modules/@popperjs/core": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.0.tgz",
-            "integrity": "sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew=="
-        },
-        "node_modules/@restart/context": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-            "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
-        },
-        "node_modules/@restart/hooks": {
-            "version": "0.3.26",
-            "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.26.tgz",
-            "integrity": "sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g==",
-            "dependencies": {
-                "lodash": "^4.17.20",
-                "lodash-es": "^4.17.20"
+            "version": "2.11.6",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+            "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/popperjs"
             }
         },
-        "node_modules/@types/classnames": {
-            "version": "2.2.11",
-            "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz",
-            "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="
+        "node_modules/@react-aria/ssr": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.4.0.tgz",
+            "integrity": "sha512-qzuGk14/fUyUAoW/EBwgFcuMkVNXJVGlezTgZ1HovpCZ+p9844E7MUFHE7CuzFzPEIkVeqhBNIoIu+VJJ8YCOA==",
+            "dependencies": {
+                "@babel/runtime": "^7.6.2"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
+            }
+        },
+        "node_modules/@restart/hooks": {
+            "version": "0.4.7",
+            "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.7.tgz",
+            "integrity": "sha512-ZbjlEHcG+FQtpDPHd7i4FzNNvJf2enAwZfJbpM8CW7BhmOAbsHpZe3tsHwfQUrBuyrxWqPYp2x5UMnilWcY22A==",
+            "dependencies": {
+                "dequal": "^2.0.2"
+            },
+            "peerDependencies": {
+                "react": ">=16.8.0"
+            }
+        },
+        "node_modules/@restart/ui": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.4.1.tgz",
+            "integrity": "sha512-J7wFOx2DcmkBqCqiZgDsggLO7faiNh4Nv1/v80FmbRgP+MYpwaVDKKXLC69DA4+ejgNIsBP5ORtC74EZqO1j8A==",
+            "dependencies": {
+                "@babel/runtime": "^7.18.3",
+                "@popperjs/core": "^2.11.5",
+                "@react-aria/ssr": "^3.2.0",
+                "@restart/hooks": "^0.4.7",
+                "@types/warning": "^3.0.0",
+                "dequal": "^2.0.2",
+                "dom-helpers": "^5.2.0",
+                "uncontrollable": "^7.2.1",
+                "warning": "^4.0.3"
+            },
+            "peerDependencies": {
+                "react": ">=16.14.0",
+                "react-dom": ">=16.14.0"
+            }
         },
         "node_modules/@types/glob": {
             "version": "7.1.3",
@@ -1419,11 +1449,6 @@
                 "hoist-non-react-statics": "^3.3.0"
             }
         },
-        "node_modules/@types/invariant": {
-            "version": "2.2.34",
-            "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz",
-            "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg=="
-        },
         "node_modules/@types/json-schema": {
             "version": "7.0.5",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
@@ -1474,22 +1499,17 @@
             }
         },
         "node_modules/@types/react-transition-group": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz",
-            "integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==",
+            "version": "4.4.5",
+            "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
+            "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
             "dependencies": {
                 "@types/react": "*"
             }
         },
-        "node_modules/@types/react/node_modules/csstype": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-            "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g=="
-        },
         "node_modules/@types/warning": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
-            "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
+            "integrity": "sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA=="
         },
         "node_modules/@vue/component-compiler-utils": {
             "version": "3.2.0",
@@ -2852,9 +2872,9 @@
             }
         },
         "node_modules/classnames": {
-            "version": "2.2.6",
-            "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-            "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+            "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
         },
         "node_modules/clean-css": {
             "version": "4.2.3",
@@ -3671,9 +3691,9 @@
             }
         },
         "node_modules/csstype": {
-            "version": "2.6.10",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz",
-            "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+            "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
         },
         "node_modules/csv-file-validator": {
             "version": "1.10.1",
@@ -3895,6 +3915,14 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/dequal": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+            "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/des.js": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
@@ -3982,12 +4010,12 @@
             }
         },
         "node_modules/dom-helpers": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
-            "integrity": "sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==",
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+            "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
             "dependencies": {
                 "@babel/runtime": "^7.8.7",
-                "csstype": "^2.6.7"
+                "csstype": "^3.0.2"
             }
         },
         "node_modules/dom-serializer": {
@@ -7371,11 +7399,6 @@
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
-        "node_modules/lodash-es": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-            "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-        },
         "node_modules/lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -9404,13 +9427,13 @@
             "dev": true
         },
         "node_modules/prop-types": {
-            "version": "15.7.2",
-            "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-            "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+            "version": "15.8.1",
+            "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+            "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
             "dependencies": {
                 "loose-envify": "^1.4.0",
                 "object-assign": "^4.1.1",
-                "react-is": "^16.8.1"
+                "react-is": "^16.13.1"
             }
         },
         "node_modules/prop-types-extra": {
@@ -9638,28 +9661,32 @@
             }
         },
         "node_modules/react-bootstrap": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.5.1.tgz",
-            "integrity": "sha512-jbJNGx9n4JvKgxlvT8DLKSeF3VcqnPJXS9LFdzoZusiZCCGoYecZ9qSCBH5n2A+kjmuura9JkvxI9l7HD+bIdQ==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.7.0.tgz",
+            "integrity": "sha512-Jcrn6aUuRVBeSB6dzKODKZU1TONOdhAxu0IDm4Sv74SJUm98dMdhSotF2SNvFEADANoR+stV+7TK6SNX1wWu5w==",
             "dependencies": {
-                "@babel/runtime": "^7.4.2",
-                "@restart/context": "^2.1.4",
-                "@restart/hooks": "^0.3.21",
-                "@types/classnames": "^2.2.10",
-                "@types/invariant": "^2.2.33",
-                "@types/prop-types": "^15.7.3",
-                "@types/react": ">=16.9.35",
-                "@types/react-transition-group": "^4.4.0",
-                "@types/warning": "^3.0.0",
-                "classnames": "^2.2.6",
-                "dom-helpers": "^5.1.2",
+                "@babel/runtime": "^7.17.2",
+                "@restart/hooks": "^0.4.6",
+                "@restart/ui": "^1.4.1",
+                "@types/react-transition-group": "^4.4.4",
+                "classnames": "^2.3.1",
+                "dom-helpers": "^5.2.1",
                 "invariant": "^2.2.4",
-                "prop-types": "^15.7.2",
+                "prop-types": "^15.8.1",
                 "prop-types-extra": "^1.1.0",
-                "react-overlays": "^5.0.0",
-                "react-transition-group": "^4.4.1",
-                "uncontrollable": "^7.0.0",
+                "react-transition-group": "^4.4.2",
+                "uncontrollable": "^7.2.1",
                 "warning": "^4.0.3"
+            },
+            "peerDependencies": {
+                "@types/react": ">=16.14.8",
+                "react": ">=16.14.0",
+                "react-dom": ">=16.14.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
             }
         },
         "node_modules/react-chartjs-2": {
@@ -9691,35 +9718,6 @@
             "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
             "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
         },
-        "node_modules/react-overlays": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.0.0.tgz",
-            "integrity": "sha512-TKbqfAv23TFtCJ2lzISdx76p97G/DP8Rp4TOFdqM9n8GTruVYgE3jX7Zgb8+w7YJ18slTVcDTQ1/tFzdCqjVhA==",
-            "dependencies": {
-                "@babel/runtime": "^7.12.1",
-                "@popperjs/core": "^2.5.3",
-                "@restart/hooks": "^0.3.25",
-                "@types/warning": "^3.0.0",
-                "dom-helpers": "^5.2.0",
-                "prop-types": "^15.7.2",
-                "uncontrollable": "^7.0.0",
-                "warning": "^4.0.3"
-            }
-        },
-        "node_modules/react-overlays/node_modules/csstype": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-            "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g=="
-        },
-        "node_modules/react-overlays/node_modules/dom-helpers": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
-            "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
-            "dependencies": {
-                "@babel/runtime": "^7.8.7",
-                "csstype": "^3.0.2"
-            }
-        },
         "node_modules/react-redux": {
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.3.tgz",
@@ -9837,14 +9835,18 @@
             }
         },
         "node_modules/react-transition-group": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
-            "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
+            "version": "4.4.5",
+            "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+            "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
             "dependencies": {
                 "@babel/runtime": "^7.5.5",
                 "dom-helpers": "^5.0.1",
                 "loose-envify": "^1.4.0",
                 "prop-types": "^15.6.2"
+            },
+            "peerDependencies": {
+                "react": ">=16.6.0",
+                "react-dom": ">=16.6.0"
             }
         },
         "node_modules/readable-stream": {
@@ -9919,9 +9921,9 @@
             }
         },
         "node_modules/regenerator-runtime": {
-            "version": "0.13.5",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-            "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+            "version": "0.13.11",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
         },
         "node_modules/regenerator-transform": {
             "version": "0.14.5",
@@ -11759,6 +11761,9 @@
                 "@types/react": ">=16.9.11",
                 "invariant": "^2.2.4",
                 "react-lifecycles-compat": "^3.0.4"
+            },
+            "peerDependencies": {
+                "react": ">=15.0.0"
             }
         },
         "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -14417,11 +14422,11 @@
             }
         },
         "@babel/runtime": {
-            "version": "7.13.10",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
-            "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
+            "version": "7.20.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz",
+            "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==",
             "requires": {
-                "regenerator-runtime": "^0.13.4"
+                "regenerator-runtime": "^0.13.11"
             }
         },
         "@babel/template": {
@@ -14480,28 +14485,41 @@
             "dev": true
         },
         "@popperjs/core": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.0.tgz",
-            "integrity": "sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew=="
+            "version": "2.11.6",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+            "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
         },
-        "@restart/context": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-            "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
-        },
-        "@restart/hooks": {
-            "version": "0.3.26",
-            "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.26.tgz",
-            "integrity": "sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g==",
+        "@react-aria/ssr": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.4.0.tgz",
+            "integrity": "sha512-qzuGk14/fUyUAoW/EBwgFcuMkVNXJVGlezTgZ1HovpCZ+p9844E7MUFHE7CuzFzPEIkVeqhBNIoIu+VJJ8YCOA==",
             "requires": {
-                "lodash": "^4.17.20",
-                "lodash-es": "^4.17.20"
+                "@babel/runtime": "^7.6.2"
             }
         },
-        "@types/classnames": {
-            "version": "2.2.11",
-            "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz",
-            "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="
+        "@restart/hooks": {
+            "version": "0.4.7",
+            "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.7.tgz",
+            "integrity": "sha512-ZbjlEHcG+FQtpDPHd7i4FzNNvJf2enAwZfJbpM8CW7BhmOAbsHpZe3tsHwfQUrBuyrxWqPYp2x5UMnilWcY22A==",
+            "requires": {
+                "dequal": "^2.0.2"
+            }
+        },
+        "@restart/ui": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.4.1.tgz",
+            "integrity": "sha512-J7wFOx2DcmkBqCqiZgDsggLO7faiNh4Nv1/v80FmbRgP+MYpwaVDKKXLC69DA4+ejgNIsBP5ORtC74EZqO1j8A==",
+            "requires": {
+                "@babel/runtime": "^7.18.3",
+                "@popperjs/core": "^2.11.5",
+                "@react-aria/ssr": "^3.2.0",
+                "@restart/hooks": "^0.4.7",
+                "@types/warning": "^3.0.0",
+                "dequal": "^2.0.2",
+                "dom-helpers": "^5.2.0",
+                "uncontrollable": "^7.2.1",
+                "warning": "^4.0.3"
+            }
         },
         "@types/glob": {
             "version": "7.1.3",
@@ -14522,11 +14540,6 @@
                 "hoist-non-react-statics": "^3.3.0"
             }
         },
-        "@types/invariant": {
-            "version": "2.2.34",
-            "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz",
-            "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg=="
-        },
         "@types/json-schema": {
             "version": "7.0.5",
             "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
@@ -14563,13 +14576,6 @@
             "requires": {
                 "@types/prop-types": "*",
                 "csstype": "^3.0.2"
-            },
-            "dependencies": {
-                "csstype": {
-                    "version": "3.0.7",
-                    "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-                    "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g=="
-                }
             }
         },
         "@types/react-redux": {
@@ -14584,9 +14590,9 @@
             }
         },
         "@types/react-transition-group": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz",
-            "integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==",
+            "version": "4.4.5",
+            "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
+            "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
             "requires": {
                 "@types/react": "*"
             }
@@ -14594,7 +14600,7 @@
         "@types/warning": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
-            "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
+            "integrity": "sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA=="
         },
         "@vue/component-compiler-utils": {
             "version": "3.2.0",
@@ -15809,9 +15815,9 @@
             }
         },
         "classnames": {
-            "version": "2.2.6",
-            "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-            "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+            "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
         },
         "clean-css": {
             "version": "4.2.3",
@@ -16502,9 +16508,9 @@
             }
         },
         "csstype": {
-            "version": "2.6.10",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz",
-            "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+            "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
         },
         "csv-file-validator": {
             "version": "1.10.1",
@@ -16689,6 +16695,11 @@
             "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
             "dev": true
         },
+        "dequal": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+            "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="
+        },
         "des.js": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
@@ -16772,12 +16783,12 @@
             }
         },
         "dom-helpers": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz",
-            "integrity": "sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==",
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+            "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
             "requires": {
                 "@babel/runtime": "^7.8.7",
-                "csstype": "^2.6.7"
+                "csstype": "^3.0.2"
             }
         },
         "dom-serializer": {
@@ -19515,11 +19526,6 @@
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         },
-        "lodash-es": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-            "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-        },
         "lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -21255,13 +21261,13 @@
             "dev": true
         },
         "prop-types": {
-            "version": "15.7.2",
-            "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-            "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+            "version": "15.8.1",
+            "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+            "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
             "requires": {
                 "loose-envify": "^1.4.0",
                 "object-assign": "^4.1.1",
-                "react-is": "^16.8.1"
+                "react-is": "^16.13.1"
             }
         },
         "prop-types-extra": {
@@ -21460,27 +21466,21 @@
             }
         },
         "react-bootstrap": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.5.1.tgz",
-            "integrity": "sha512-jbJNGx9n4JvKgxlvT8DLKSeF3VcqnPJXS9LFdzoZusiZCCGoYecZ9qSCBH5n2A+kjmuura9JkvxI9l7HD+bIdQ==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.7.0.tgz",
+            "integrity": "sha512-Jcrn6aUuRVBeSB6dzKODKZU1TONOdhAxu0IDm4Sv74SJUm98dMdhSotF2SNvFEADANoR+stV+7TK6SNX1wWu5w==",
             "requires": {
-                "@babel/runtime": "^7.4.2",
-                "@restart/context": "^2.1.4",
-                "@restart/hooks": "^0.3.21",
-                "@types/classnames": "^2.2.10",
-                "@types/invariant": "^2.2.33",
-                "@types/prop-types": "^15.7.3",
-                "@types/react": ">=16.9.35",
-                "@types/react-transition-group": "^4.4.0",
-                "@types/warning": "^3.0.0",
-                "classnames": "^2.2.6",
-                "dom-helpers": "^5.1.2",
+                "@babel/runtime": "^7.17.2",
+                "@restart/hooks": "^0.4.6",
+                "@restart/ui": "^1.4.1",
+                "@types/react-transition-group": "^4.4.4",
+                "classnames": "^2.3.1",
+                "dom-helpers": "^5.2.1",
                 "invariant": "^2.2.4",
-                "prop-types": "^15.7.2",
+                "prop-types": "^15.8.1",
                 "prop-types-extra": "^1.1.0",
-                "react-overlays": "^5.0.0",
-                "react-transition-group": "^4.4.1",
-                "uncontrollable": "^7.0.0",
+                "react-transition-group": "^4.4.2",
+                "uncontrollable": "^7.2.1",
                 "warning": "^4.0.3"
             }
         },
@@ -21513,37 +21513,6 @@
             "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
             "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
         },
-        "react-overlays": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.0.0.tgz",
-            "integrity": "sha512-TKbqfAv23TFtCJ2lzISdx76p97G/DP8Rp4TOFdqM9n8GTruVYgE3jX7Zgb8+w7YJ18slTVcDTQ1/tFzdCqjVhA==",
-            "requires": {
-                "@babel/runtime": "^7.12.1",
-                "@popperjs/core": "^2.5.3",
-                "@restart/hooks": "^0.3.25",
-                "@types/warning": "^3.0.0",
-                "dom-helpers": "^5.2.0",
-                "prop-types": "^15.7.2",
-                "uncontrollable": "^7.0.0",
-                "warning": "^4.0.3"
-            },
-            "dependencies": {
-                "csstype": {
-                    "version": "3.0.7",
-                    "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz",
-                    "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g=="
-                },
-                "dom-helpers": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
-                    "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
-                    "requires": {
-                        "@babel/runtime": "^7.8.7",
-                        "csstype": "^3.0.2"
-                    }
-                }
-            }
-        },
         "react-redux": {
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.3.tgz",
@@ -21653,9 +21622,9 @@
             }
         },
         "react-transition-group": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
-            "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
+            "version": "4.4.5",
+            "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+            "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
             "requires": {
                 "@babel/runtime": "^7.5.5",
                 "dom-helpers": "^5.0.1",
@@ -21726,9 +21695,9 @@
             }
         },
         "regenerator-runtime": {
-            "version": "0.13.5",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-            "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+            "version": "0.13.11",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
         },
         "regenerator-transform": {
             "version": "0.14.5",

package.json

@@ -30,7 +30,7 @@
         "csv-file-validator": "^1.10.1",
         "js-cookie": "^2.2.1",
         "react-beautiful-dnd": "^13.1.0",
-        "react-bootstrap": "^1.5.1",
+        "react-bootstrap": "^2.7.0",
         "react-chartjs-2": "^2.11.1",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",