diff --git a/.eslintignore b/.eslintignore
index 262a4ccf5..01050140a 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,5 @@ public
node_modules
resources/views
babel.config.js
+tailwind.config.js
webpack.config.js
diff --git a/composer.lock b/composer.lock
index a45f81aa2..1470d18ea 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "87961b026d9057d13cfc3f9cb21d367d",
+ "content-hash": "e90dffea56fa4b612863202553cba883",
"packages": [
{
"name": "aws/aws-sdk-php",
- "version": "3.184.6",
+ "version": "3.185.12",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "0b7187c96ced465d400ad9427157e05ddee68edc"
+ "reference": "65299008b7a04245bf63cd71fca8e6d4ab3728bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0b7187c96ced465d400ad9427157e05ddee68edc",
- "reference": "0b7187c96ced465d400ad9427157e05ddee68edc",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/65299008b7a04245bf63cd71fca8e6d4ab3728bc",
+ "reference": "65299008b7a04245bf63cd71fca8e6d4ab3728bc",
"shasum": ""
},
"require": {
@@ -92,9 +92,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.184.6"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.185.12"
},
- "time": "2021-06-17T18:24:56+00:00"
+ "time": "2021-07-13T19:37:41+00:00"
},
{
"name": "brick/math",
@@ -154,16 +154,16 @@
},
{
"name": "doctrine/cache",
- "version": "1.11.3",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "3bb5588cec00a0268829cc4a518490df6741af9d"
+ "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d",
- "reference": "3bb5588cec00a0268829cc4a518490df6741af9d",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/c9622c6820d3ede1e2315a6a377ea1076e421d88",
+ "reference": "c9622c6820d3ede1e2315a6a377ea1076e421d88",
"shasum": ""
},
"require": {
@@ -233,7 +233,7 @@
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
- "source": "https://github.com/doctrine/cache/tree/1.11.3"
+ "source": "https://github.com/doctrine/cache/tree/2.0.3"
},
"funding": [
{
@@ -249,35 +249,36 @@
"type": "tidelift"
}
],
- "time": "2021-05-25T09:01:55+00:00"
+ "time": "2021-05-25T09:43:04+00:00"
},
{
"name": "doctrine/dbal",
- "version": "2.13.1",
+ "version": "2.13.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9"
+ "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9",
- "reference": "c800380457948e65bbd30ba92cc17cda108bf8c9",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4",
+ "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4",
"shasum": ""
},
"require": {
- "doctrine/cache": "^1.0",
+ "doctrine/cache": "^1.0|^2.0",
"doctrine/deprecations": "^0.5.3",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
"php": "^7.1 || ^8"
},
"require-dev": {
- "doctrine/coding-standard": "8.2.0",
+ "doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2020.2",
"phpstan/phpstan": "0.12.81",
- "phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
+ "phpunit/phpunit": "^7.5.20|^8.5|9.5.5",
"squizlabs/php_codesniffer": "3.6.0",
+ "symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.6.4"
},
@@ -340,7 +341,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/2.13.1"
+ "source": "https://github.com/doctrine/dbal/tree/2.13.2"
},
"funding": [
{
@@ -356,7 +357,7 @@
"type": "tidelift"
}
],
- "time": "2021-04-17T17:30:19+00:00"
+ "time": "2021-06-18T21:48:39+00:00"
},
{
"name": "doctrine/deprecations",
@@ -1289,16 +1290,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.47.0",
+ "version": "v8.50.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "93db226946453f4285558b7c3166ddb6e7ea5400"
+ "reference": "d892dbacbe3859cf9303ccda98ac8d782141d5ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/93db226946453f4285558b7c3166ddb6e7ea5400",
- "reference": "93db226946453f4285558b7c3166ddb6e7ea5400",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/d892dbacbe3859cf9303ccda98ac8d782141d5ae",
+ "reference": "d892dbacbe3859cf9303ccda98ac8d782141d5ae",
"shasum": ""
},
"require": {
@@ -1308,7 +1309,7 @@
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
- "league/commonmark": "^1.3",
+ "league/commonmark": "^1.3|^2.0",
"league/flysystem": "^1.1",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.31",
@@ -1377,7 +1378,7 @@
"guzzlehttp/guzzle": "^6.5.5|^7.0.1",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.4.2",
- "orchestra/testbench-core": "^6.8",
+ "orchestra/testbench-core": "^6.23",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^8.5.8|^9.3.3",
"predis/predis": "^1.1.2",
@@ -1453,7 +1454,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-06-15T14:00:32+00:00"
+ "time": "2021-07-13T12:41:53+00:00"
},
{
"name": "laravel/helpers",
@@ -1774,16 +1775,16 @@
},
{
"name": "league/commonmark",
- "version": "1.6.4",
+ "version": "1.6.5",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "c3c8b7217c52572fb42aaf84211abccf75a151b2"
+ "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c3c8b7217c52572fb42aaf84211abccf75a151b2",
- "reference": "c3c8b7217c52572fb42aaf84211abccf75a151b2",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
+ "reference": "44ffd8d3c4a9133e4bd0548622b09c55af39db5f",
"shasum": ""
},
"require": {
@@ -1871,20 +1872,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-19T20:08:14+00:00"
+ "time": "2021-06-26T11:57:13+00:00"
},
{
"name": "league/flysystem",
- "version": "1.1.3",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "9be3b16c877d477357c015cec057548cf9b2a14a"
+ "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a",
- "reference": "9be3b16c877d477357c015cec057548cf9b2a14a",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
+ "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
"shasum": ""
},
"require": {
@@ -1900,7 +1901,6 @@
"phpunit/phpunit": "^8.5.8"
},
"suggest": {
- "ext-fileinfo": "Required for MimeType",
"ext-ftp": "Allows you to use FTP server storage",
"ext-openssl": "Allows you to use FTPS server storage",
"league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
@@ -1958,7 +1958,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/1.x"
+ "source": "https://github.com/thephpleague/flysystem/tree/1.1.4"
},
"funding": [
{
@@ -1966,7 +1966,7 @@
"type": "other"
}
],
- "time": "2020-08-23T07:39:11+00:00"
+ "time": "2021-06-23T21:56:05+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
@@ -2248,16 +2248,16 @@
},
{
"name": "monolog/monolog",
- "version": "2.2.0",
+ "version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
+ "reference": "df991fd88693ab703aa403413d83e15f688dae33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
- "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/df991fd88693ab703aa403413d83e15f688dae33",
+ "reference": "df991fd88693ab703aa403413d83e15f688dae33",
"shasum": ""
},
"require": {
@@ -2276,7 +2276,7 @@
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpspec/prophecy": "^1.6.1",
- "phpstan/phpstan": "^0.12.59",
+ "phpstan/phpstan": "^0.12.91",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
@@ -2328,7 +2328,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
+ "source": "https://github.com/Seldaek/monolog/tree/2.3.0"
},
"funding": [
{
@@ -2340,7 +2340,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-14T13:15:25+00:00"
+ "time": "2021-07-05T11:34:13+00:00"
},
{
"name": "mtdowling/jmespath.php",
@@ -2405,16 +2405,16 @@
},
{
"name": "nesbot/carbon",
- "version": "2.49.0",
+ "version": "2.50.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee"
+ "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee",
- "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
+ "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
"shasum": ""
},
"require": {
@@ -2466,15 +2466,15 @@
{
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
- "homepage": "http://nesbot.com"
+ "homepage": "https://markido.com"
},
{
"name": "kylekatarnls",
- "homepage": "http://github.com/kylekatarnls"
+ "homepage": "https://github.com/kylekatarnls"
}
],
"description": "An API extension for DateTime that supports 281 different languages.",
- "homepage": "http://carbon.nesbot.com",
+ "homepage": "https://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
@@ -2494,20 +2494,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-02T07:31:40+00:00"
+ "time": "2021-06-28T22:38:45+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.10.5",
+ "version": "v4.11.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+ "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
- "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
+ "reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
"shasum": ""
},
"require": {
@@ -2548,9 +2548,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
},
- "time": "2021-05-03T19:11:20+00:00"
+ "time": "2021-07-03T13:36:55+00:00"
},
{
"name": "opis/closure",
@@ -3836,16 +3836,16 @@
},
{
"name": "spatie/laravel-query-builder",
- "version": "3.4.1",
+ "version": "3.5.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-query-builder.git",
- "reference": "6c09f1f9d6c988bf2e1220be072c7bd1ac958cc9"
+ "reference": "4e5257be24139836dc092f618d7c73bcb1c00302"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/6c09f1f9d6c988bf2e1220be072c7bd1ac958cc9",
- "reference": "6c09f1f9d6c988bf2e1220be072c7bd1ac958cc9",
+ "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/4e5257be24139836dc092f618d7c73bcb1c00302",
+ "reference": "4e5257be24139836dc092f618d7c73bcb1c00302",
"shasum": ""
},
"require": {
@@ -3902,7 +3902,7 @@
"type": "custom"
}
],
- "time": "2021-05-24T10:13:32+00:00"
+ "time": "2021-07-05T14:17:44+00:00"
},
{
"name": "staudenmeir/belongs-to-through",
@@ -4265,16 +4265,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v5.3.0",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2"
+ "reference": "43323e79c80719e8a4674e33484bca98270d223f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/0e6768b8c0dcef26df087df2bbbaa143867a59b2",
- "reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/43323e79c80719e8a4674e33484bca98270d223f",
+ "reference": "43323e79c80719e8a4674e33484bca98270d223f",
"shasum": ""
},
"require": {
@@ -4314,7 +4314,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v5.3.0"
+ "source": "https://github.com/symfony/error-handler/tree/v5.3.3"
},
"funding": [
{
@@ -4330,7 +4330,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:43:10+00:00"
+ "time": "2021-06-24T08:13:00+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -4637,16 +4637,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v5.3.2",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd"
+ "reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7b6dd714d95106b831aaa7f3c9c612ab886516bd",
- "reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0e45ab1574caa0460d9190871a8ce47539e40ccf",
+ "reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf",
"shasum": ""
},
"require": {
@@ -4690,7 +4690,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v5.3.2"
+ "source": "https://github.com/symfony/http-foundation/tree/v5.3.3"
},
"funding": [
{
@@ -4706,20 +4706,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-12T10:15:17+00:00"
+ "time": "2021-06-27T09:19:40+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v5.3.2",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e7021165d9dbfb4051296b8de827e92c8a7b5c87"
+ "reference": "90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e7021165d9dbfb4051296b8de827e92c8a7b5c87",
- "reference": "e7021165d9dbfb4051296b8de827e92c8a7b5c87",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8",
+ "reference": "90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8",
"shasum": ""
},
"require": {
@@ -4802,7 +4802,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v5.3.2"
+ "source": "https://github.com/symfony/http-kernel/tree/v5.3.3"
},
"funding": [
{
@@ -4818,7 +4818,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-17T14:18:27+00:00"
+ "time": "2021-06-30T08:27:49+00:00"
},
{
"name": "symfony/mime",
@@ -5933,16 +5933,16 @@
},
{
"name": "symfony/string",
- "version": "v5.3.2",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
+ "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
- "reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
+ "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
+ "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"shasum": ""
},
"require": {
@@ -5996,7 +5996,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.3.2"
+ "source": "https://github.com/symfony/string/tree/v5.3.3"
},
"funding": [
{
@@ -6012,20 +6012,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-06T09:51:56+00:00"
+ "time": "2021-06-27T11:44:38+00:00"
},
{
"name": "symfony/translation",
- "version": "v5.3.2",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "7e2603bcc598e14804c4d2359d8dc4ee3c40391b"
+ "reference": "380b8c9e944d0e364b25f28e8e555241eb49c01c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/7e2603bcc598e14804c4d2359d8dc4ee3c40391b",
- "reference": "7e2603bcc598e14804c4d2359d8dc4ee3c40391b",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/380b8c9e944d0e364b25f28e8e555241eb49c01c",
+ "reference": "380b8c9e944d0e364b25f28e8e555241eb49c01c",
"shasum": ""
},
"require": {
@@ -6091,7 +6091,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v5.3.2"
+ "source": "https://github.com/symfony/translation/tree/v5.3.3"
},
"funding": [
{
@@ -6107,7 +6107,7 @@
"type": "tidelift"
}
],
- "time": "2021-06-06T09:51:56+00:00"
+ "time": "2021-06-27T12:22:47+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -6189,16 +6189,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.3.2",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae"
+ "reference": "46aa709affb9ad3355bd7a810f9662d71025c384"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/905a22c68b292ffb6f20d7636c36b220d1fba5ae",
- "reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46aa709affb9ad3355bd7a810f9662d71025c384",
+ "reference": "46aa709affb9ad3355bd7a810f9662d71025c384",
"shasum": ""
},
"require": {
@@ -6257,7 +6257,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.3.2"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.3.3"
},
"funding": [
{
@@ -6273,20 +6273,20 @@
"type": "tidelift"
}
],
- "time": "2021-06-06T09:51:56+00:00"
+ "time": "2021-06-24T08:13:00+00:00"
},
{
"name": "symfony/yaml",
- "version": "v4.4.25",
+ "version": "v4.4.26",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc"
+ "reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
- "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
+ "reference": "e096ef4b4c4c9a2f72c2ac660f54352cd31c60f8",
"shasum": ""
},
"require": {
@@ -6328,7 +6328,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v4.4.25"
+ "source": "https://github.com/symfony/yaml/tree/v4.4.26"
},
"funding": [
{
@@ -6344,7 +6344,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:39:37+00:00"
+ "time": "2021-06-23T19:06:53+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -7515,16 +7515,16 @@
},
{
"name": "facade/ignition",
- "version": "2.10.2",
+ "version": "2.11.0",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4"
+ "reference": "dc6818335f50ccf0b90284784718ea9a82604286"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/43688227bbf27c43bc1ad83af224f135b6ef0ff4",
- "reference": "43688227bbf27c43bc1ad83af224f135b6ef0ff4",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/dc6818335f50ccf0b90284784718ea9a82604286",
+ "reference": "dc6818335f50ccf0b90284784718ea9a82604286",
"shasum": ""
},
"require": {
@@ -7532,7 +7532,6 @@
"ext-mbstring": "*",
"facade/flare-client-php": "^1.6",
"facade/ignition-contracts": "^1.0.2",
- "filp/whoops": "^2.4",
"illuminate/support": "^7.0|^8.0",
"monolog/monolog": "^2.0",
"php": "^7.2.5|^8.0",
@@ -7588,7 +7587,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2021-06-11T06:57:25+00:00"
+ "time": "2021-07-12T15:55:51+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -7645,16 +7644,16 @@
},
{
"name": "fakerphp/faker",
- "version": "v1.14.1",
+ "version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
- "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1"
+ "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
- "reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
+ "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/89c6201c74db25fa759ff16e78a4d8f32547770e",
+ "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e",
"shasum": ""
},
"require": {
@@ -7704,22 +7703,22 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
- "source": "https://github.com/FakerPHP/Faker/tree/v.1.14.1"
+ "source": "https://github.com/FakerPHP/Faker/tree/v1.15.0"
},
- "time": "2021-03-30T06:27:33+00:00"
+ "time": "2021-07-06T20:39:40+00:00"
},
{
"name": "filp/whoops",
- "version": "2.13.0",
+ "version": "2.14.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "2edbc73a4687d9085c8f20f398eebade844e8424"
+ "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424",
- "reference": "2edbc73a4687d9085c8f20f398eebade844e8424",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/fdf92f03e150ed84d5967a833ae93abffac0315b",
+ "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b",
"shasum": ""
},
"require": {
@@ -7769,7 +7768,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.13.0"
+ "source": "https://github.com/filp/whoops/tree/2.14.0"
},
"funding": [
{
@@ -7777,7 +7776,7 @@
"type": "github"
}
],
- "time": "2021-06-04T12:00:00+00:00"
+ "time": "2021-07-13T12:00:00+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
@@ -8011,16 +8010,16 @@
},
{
"name": "laravel/dusk",
- "version": "v6.15.0",
+ "version": "v6.15.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/dusk.git",
- "reference": "45b55fa20321086c4f8cc4e712cbe54db644e21c"
+ "reference": "6978f331f526e84f06b803ed4407d372a6db065f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/dusk/zipball/45b55fa20321086c4f8cc4e712cbe54db644e21c",
- "reference": "45b55fa20321086c4f8cc4e712cbe54db644e21c",
+ "url": "https://api.github.com/repos/laravel/dusk/zipball/6978f331f526e84f06b803ed4407d372a6db065f",
+ "reference": "6978f331f526e84f06b803ed4407d372a6db065f",
"shasum": ""
},
"require": {
@@ -8078,9 +8077,9 @@
],
"support": {
"issues": "https://github.com/laravel/dusk/issues",
- "source": "https://github.com/laravel/dusk/tree/v6.15.0"
+ "source": "https://github.com/laravel/dusk/tree/v6.15.1"
},
- "time": "2021-04-06T14:14:57+00:00"
+ "time": "2021-07-06T16:42:00+00:00"
},
{
"name": "maximebf/debugbar",
@@ -8279,16 +8278,16 @@
},
{
"name": "nunomaduro/collision",
- "version": "v5.4.0",
+ "version": "v5.5.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "41b7e9999133d5082700d31a1d0977161df8322a"
+ "reference": "b5cb36122f1c142c3c3ee20a0ae778439ef0244b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/41b7e9999133d5082700d31a1d0977161df8322a",
- "reference": "41b7e9999133d5082700d31a1d0977161df8322a",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5cb36122f1c142c3c3ee20a0ae778439ef0244b",
+ "reference": "b5cb36122f1c142c3c3ee20a0ae778439ef0244b",
"shasum": ""
},
"require": {
@@ -8363,7 +8362,7 @@
"type": "patreon"
}
],
- "time": "2021-04-09T13:38:32+00:00"
+ "time": "2021-06-22T20:47:22+00:00"
},
{
"name": "phar-io/manifest",
@@ -9332,16 +9331,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.5",
+ "version": "9.5.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276"
+ "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276",
- "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+ "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
"shasum": ""
},
"require": {
@@ -9371,7 +9370,7 @@
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^2.3.2",
+ "sebastian/type": "^2.3.4",
"sebastian/version": "^3.0.2"
},
"require-dev": {
@@ -9419,7 +9418,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
},
"funding": [
{
@@ -9431,7 +9430,7 @@
"type": "github"
}
],
- "time": "2021-06-05T04:49:07+00:00"
+ "time": "2021-06-23T05:14:38+00:00"
},
{
"name": "react/promise",
@@ -10336,7 +10335,6 @@
"type": "github"
}
],
- "abandoned": true,
"time": "2020-09-28T06:45:17+00:00"
},
{
@@ -10630,16 +10628,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.3.0",
+ "version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "348116319d7fb7d1faa781d26a48922428013eb2"
+ "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/348116319d7fb7d1faa781d26a48922428013eb2",
- "reference": "348116319d7fb7d1faa781d26a48922428013eb2",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
+ "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
"shasum": ""
},
"require": {
@@ -10672,7 +10670,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.3.0"
+ "source": "https://github.com/symfony/filesystem/tree/v5.3.3"
},
"funding": [
{
@@ -10688,7 +10686,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:43:10+00:00"
+ "time": "2021-06-30T07:27:52+00:00"
},
{
"name": "symfony/options-resolver",
@@ -10949,6 +10947,7 @@
"php": "^7.4 || ^8.0",
"ext-json": "*",
"ext-mbstring": "*",
+ "ext-pdo": "*",
"ext-pdo_mysql": "*",
"ext-zip": "*"
},
diff --git a/package.json b/package.json
index 708f0e88c..2535b8739 100644
--- a/package.json
+++ b/package.json
@@ -116,6 +116,7 @@
"@typescript-eslint/parser": "^4.28.2",
"autoprefixer": "^10.2.6",
"babel-loader": "^8.2.2",
+ "babel-plugin-macros": "^3.1.0",
"babel-plugin-styled-components": "^1.13.2",
"browserslist": "^4.16.6",
"cross-env": "^7.0.3",
diff --git a/public/favicons/df4b367461890fa5fd0d9339d3c3f9c6.ico.zip b/public/favicons/df4b367461890fa5fd0d9339d3c3f9c6.ico.zip
deleted file mode 100644
index 8d2efae04..000000000
Binary files a/public/favicons/df4b367461890fa5fd0d9339d3c3f9c6.ico.zip and /dev/null differ
diff --git a/resources/scripts/api/admin/getVersion.ts b/resources/scripts/api/admin/getVersion.ts
index bed670b4c..3f24911e4 100644
--- a/resources/scripts/api/admin/getVersion.ts
+++ b/resources/scripts/api/admin/getVersion.ts
@@ -4,11 +4,11 @@ export interface VersionData {
panel: {
current: string;
latest: string;
- };
+ }
wings: {
latest: string;
- };
+ }
git: string | null;
}
diff --git a/resources/scripts/assets/css/GlobalStylesheet.ts b/resources/scripts/assets/css/GlobalStylesheet.ts
deleted file mode 100644
index a38dff74e..000000000
--- a/resources/scripts/assets/css/GlobalStylesheet.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import tw from 'twin.macro';
-import { createGlobalStyle } from 'styled-components/macro';
-
-export default createGlobalStyle`
- body {
- ${tw`font-sans bg-neutral-800 text-neutral-200`};
- letter-spacing: 0.015em;
- }
-
- h1, h2, h3, h4, h5, h6 {
- ${tw`font-medium tracking-normal font-header`};
- }
-
- p {
- ${tw`text-neutral-200 leading-snug font-sans`};
- }
-
- form {
- ${tw`m-0`};
- }
-
- textarea, select, input, button, button:focus, button:focus-visible {
- ${tw`outline-none`};
- }
-
- input[type=number]::-webkit-outer-spin-button,
- input[type=number]::-webkit-inner-spin-button {
- -webkit-appearance: none !important;
- margin: 0;
- }
-
- input[type=number] {
- -moz-appearance: textfield !important;
- }
-
- /* Scroll Bar Style */
- ::-webkit-scrollbar {
- background: none;
- width: 16px;
- height: 16px;
- }
-
- ::-webkit-scrollbar-thumb {
- border: solid 0 rgb(0 0 0 / 0%);
- border-right-width: 4px;
- border-left-width: 4px;
- -webkit-border-radius: 9px 4px;
- -webkit-box-shadow: inset 0 0 0 1px hsl(211, 10%, 53%), inset 0 0 0 4px hsl(209deg 18% 30%);
- }
-
- ::-webkit-scrollbar-track-piece {
- margin: 4px 0;
- }
-
- ::-webkit-scrollbar-thumb:horizontal {
- border-right-width: 0;
- border-left-width: 0;
- border-top-width: 4px;
- border-bottom-width: 4px;
- -webkit-border-radius: 4px 9px;
- }
-
- ::-webkit-scrollbar-thumb:hover {
- -webkit-box-shadow:
- inset 0 0 0 1px hsl(212, 92%, 43%),
- inset 0 0 0 4px hsl(212, 92%, 43%);
- }
-
- ::-webkit-scrollbar-corner {
- background: transparent;
- }
-`;
diff --git a/resources/scripts/components/App.tsx b/resources/scripts/components/App.tsx
index 3a76ceb2e..340e2b7bb 100644
--- a/resources/scripts/components/App.tsx
+++ b/resources/scripts/components/App.tsx
@@ -11,10 +11,9 @@ import { SiteSettings } from '@/state/settings';
import ProgressBar from '@/components/elements/ProgressBar';
import { NotFound } from '@/components/elements/ScreenBlock';
import tw from 'twin.macro';
-import GlobalStylesheet from '@/assets/css/GlobalStylesheet';
import { history } from '@/components/history';
import { setupInterceptors } from '@/api/interceptors';
-import TailwindGlobalStyles from '@/components/GlobalStyles';
+import GlobalStyles from '@/components/GlobalStyles';
const ChunkedAdminRouter = lazy(() => import(/* webpackChunkName: "admin" */'@/routers/AdminRouter'));
@@ -81,11 +80,9 @@ const App = () => {
return (
<>
-
-
+
-
Loading...
}>
diff --git a/resources/scripts/components/GlobalStyles.tsx b/resources/scripts/components/GlobalStyles.tsx
index 8c87749a6..43f613b1f 100644
--- a/resources/scripts/components/GlobalStyles.tsx
+++ b/resources/scripts/components/GlobalStyles.tsx
@@ -1,6 +1,83 @@
import React from 'react';
-import { GlobalStyles } from 'twin.macro';
+// eslint-disable-next-line no-restricted-imports
+import { createGlobalStyle } from 'styled-components';
+import tw, { GlobalStyles as BaseStyles } from 'twin.macro';
-export default () => {
- return ;
-};
+const CustomStyles = createGlobalStyle`
+ body {
+ ${tw`font-sans bg-neutral-800 text-neutral-200`};
+ letter-spacing: 0.015em;
+ }
+
+ h1, h2, h3, h4, h5, h6 {
+ ${tw`font-medium tracking-normal font-header`};
+ }
+
+ p {
+ ${tw`text-neutral-200 leading-snug font-sans`};
+ }
+
+ form {
+ ${tw`m-0`};
+ }
+
+ textarea, select, input, button, button:focus, button:focus-visible {
+ ${tw`outline-none`};
+ }
+
+ input[type=number]::-webkit-outer-spin-button,
+ input[type=number]::-webkit-inner-spin-button {
+ -webkit-appearance: none !important;
+ margin: 0;
+ }
+
+ input[type=number] {
+ -moz-appearance: textfield !important;
+ }
+
+ /* Scroll Bar Style */
+ ::-webkit-scrollbar {
+ background: none;
+ width: 16px;
+ height: 16px;
+ }
+
+ ::-webkit-scrollbar-thumb {
+ border: solid 0 rgb(0 0 0 / 0%);
+ border-right-width: 4px;
+ border-left-width: 4px;
+ -webkit-border-radius: 9px 4px;
+ -webkit-box-shadow: inset 0 0 0 1px hsl(211, 10%, 53%), inset 0 0 0 4px hsl(209deg 18% 30%);
+ }
+
+ ::-webkit-scrollbar-track-piece {
+ margin: 4px 0;
+ }
+
+ ::-webkit-scrollbar-thumb:horizontal {
+ border-right-width: 0;
+ border-left-width: 0;
+ border-top-width: 4px;
+ border-bottom-width: 4px;
+ -webkit-border-radius: 4px 9px;
+ }
+
+ ::-webkit-scrollbar-thumb:hover {
+ -webkit-box-shadow:
+ inset 0 0 0 1px hsl(212, 92%, 43%),
+ inset 0 0 0 4px hsl(212, 92%, 43%);
+ }
+
+ ::-webkit-scrollbar-corner {
+ background: transparent;
+ }
+`;
+
+const GlobalStyles = () => (
+ <>
+
+
+
+);
+
+export default GlobalStyles;
diff --git a/yarn.lock b/yarn.lock
index 79e796e65..96f7ea57d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1511,7 +1511,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.6":
+"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.6":
version: 7.14.6
resolution: "@babel/runtime@npm:7.14.6"
dependencies:
@@ -3386,6 +3386,17 @@ __metadata:
languageName: node
linkType: hard
+"babel-plugin-macros@npm:^3.1.0":
+ version: 3.1.0
+ resolution: "babel-plugin-macros@npm:3.1.0"
+ dependencies:
+ "@babel/runtime": ^7.12.5
+ cosmiconfig: ^7.0.0
+ resolve: ^1.19.0
+ checksum: 7d7a02fe055a4d9ec5af83d51d9cf96d6de430e51a0a31d513728e181211d2b5dcc148eb9763bed6437f374b5590d1f55515d4dbd21393637bf5713142d125a0
+ languageName: node
+ linkType: hard
+
"babel-plugin-polyfill-corejs2@npm:^0.2.2":
version: 0.2.2
resolution: "babel-plugin-polyfill-corejs2@npm:0.2.2"
@@ -9682,6 +9693,7 @@ fsevents@^1.2.7:
autoprefixer: ^10.2.6
axios: ^0.21.1
babel-loader: ^8.2.2
+ babel-plugin-macros: ^3.1.0
babel-plugin-styled-components: ^1.13.2
browserslist: ^4.16.6
chart.js: ^2.9.3
@@ -10571,7 +10583,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
-"resolve@^1.14.2, resolve@^1.20.0":
+"resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0":
version: 1.20.0
resolution: "resolve@npm:1.20.0"
dependencies:
@@ -10609,7 +10621,7 @@ resolve@^2.0.0-next.3:
languageName: node
linkType: hard
-"resolve@patch:resolve@^1.14.2#builtin, resolve@patch:resolve@^1.20.0#builtin":
+"resolve@patch:resolve@^1.14.2#builtin, resolve@patch:resolve@^1.19.0#builtin, resolve@patch:resolve@^1.20.0#builtin":
version: 1.20.0
resolution: "resolve@patch:resolve@npm%3A1.20.0#builtin::version=1.20.0&hash=3388aa"
dependencies: