diff --git a/composer.json b/composer.json
index 02437e5e..cf3d162b 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
"laravel/tinker": "^2.6",
"mews/captcha": "^3.2",
"mews/purifier": "^3.3",
- "overtrue/laravel-lang": "^4.2",
+ "overtrue/laravel-lang": "~5.0",
"phpoffice/phpspreadsheet": "^1.16",
"rap2hpoutre/laravel-log-viewer": "^1.7",
"riverslei/payment": "^5.1",
diff --git a/composer.lock b/composer.lock
index 82c14e31..00ab9dc4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0e7fb2dbb9264d385f8aa2f9c2725596",
+ "content-hash": "075d615d07f2e7c4f894c0df5a8099ad",
"packages": [
{
"name": "asm89/stack-cors",
@@ -1179,16 +1179,16 @@
},
{
"name": "fruitcake/laravel-cors",
- "version": "v2.0.3",
+ "version": "v2.0.4",
"source": {
"type": "git",
"url": "https://github.com/fruitcake/laravel-cors.git",
- "reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a"
+ "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
- "reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
+ "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/a8ccedc7ca95189ead0e407c43b530dc17791d6a",
+ "reference": "a8ccedc7ca95189ead0e407c43b530dc17791d6a",
"shasum": "",
"mirrors": [
{
@@ -1207,8 +1207,8 @@
},
"require-dev": {
"laravel/framework": "^6|^7|^8",
- "orchestra/testbench-dusk": "^4|^5|^6",
- "phpunit/phpunit": "^6|^7|^8",
+ "orchestra/testbench-dusk": "^4|^5|^6|^7",
+ "phpunit/phpunit": "^6|^7|^8|^9",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
@@ -1250,7 +1250,7 @@
],
"support": {
"issues": "https://github.com/fruitcake/laravel-cors/issues",
- "source": "https://github.com/fruitcake/laravel-cors/tree/v2.0.3"
+ "source": "https://github.com/fruitcake/laravel-cors/tree/v2.0.4"
},
"funding": [
{
@@ -1258,7 +1258,7 @@
"type": "github"
}
],
- "time": "2020-10-22T13:57:20+00:00"
+ "time": "2021-04-26T11:24:25+00:00"
},
{
"name": "geoip2/geoip2",
@@ -1463,16 +1463,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.8.1",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1"
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1",
- "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+ "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
"shasum": "",
"mirrors": [
{
@@ -1538,9 +1538,9 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/1.8.1"
+ "source": "https://github.com/guzzle/psr7/tree/1.8.2"
},
- "time": "2021-03-21T16:25:00+00:00"
+ "time": "2021-04-26T09:17:50+00:00"
},
{
"name": "hashids/hashids",
@@ -2007,16 +2007,16 @@
},
{
"name": "laravel-lang/lang",
- "version": "7.0.9",
+ "version": "8.1.3",
"source": {
"type": "git",
"url": "https://github.com/Laravel-Lang/lang.git",
- "reference": "679a65755db37b35acd36a5e0ca51e055815a00a"
+ "reference": "54048d1319b211daa8ab73655b698feb09588876"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/679a65755db37b35acd36a5e0ca51e055815a00a",
- "reference": "679a65755db37b35acd36a5e0ca51e055815a00a",
+ "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/54048d1319b211daa8ab73655b698feb09588876",
+ "reference": "54048d1319b211daa8ab73655b698feb09588876",
"shasum": "",
"mirrors": [
{
@@ -2028,6 +2028,13 @@
"require": {
"ext-json": "*"
},
+ "require-dev": {
+ "andrey-helldar/pretty-array": "^2.3",
+ "andrey-helldar/support": "^3.4",
+ "php": "^8.0",
+ "phpunit/phpunit": "^9.5",
+ "symfony/var-dumper": "^5.2"
+ },
"suggest": {
"andrey-helldar/laravel-lang-publisher": "Easy installation and update of translation files for your project",
"arcanedev/laravel-lang": "Translations manager and checker for Laravel 5",
@@ -2040,7 +2047,8 @@
],
"authors": [
{
- "name": "Laravel-Lang Team"
+ "name": "Laravel-Lang Team",
+ "homepage": "https://github.com/Laravel-Lang"
}
],
"description": "Languages for Laravel",
@@ -2052,9 +2060,9 @@
],
"support": {
"issues": "https://github.com/Laravel-Lang/lang/issues",
- "source": "https://github.com/Laravel-Lang/lang/tree/7.0.9"
+ "source": "https://github.com/Laravel-Lang/lang"
},
- "time": "2020-11-30T20:35:41+00:00"
+ "time": "2021-04-14T17:41:45+00:00"
},
{
"name": "laravel-notification-channels/bearychat",
@@ -3867,16 +3875,16 @@
},
{
"name": "overtrue/laravel-lang",
- "version": "4.2.1",
+ "version": "5.0.0",
"source": {
"type": "git",
"url": "https://github.com/overtrue/laravel-lang.git",
- "reference": "653189caa6eac682fa5d15482f271489721231c7"
+ "reference": "30133b4b97a43368949ca48985cd04968d50ba40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/overtrue/laravel-lang/zipball/653189caa6eac682fa5d15482f271489721231c7",
- "reference": "653189caa6eac682fa5d15482f271489721231c7",
+ "url": "https://api.github.com/repos/overtrue/laravel-lang/zipball/30133b4b97a43368949ca48985cd04968d50ba40",
+ "reference": "30133b4b97a43368949ca48985cd04968d50ba40",
"shasum": "",
"mirrors": [
{
@@ -3887,7 +3895,7 @@
},
"require": {
"ext-json": "*",
- "laravel-lang/lang": "^7.0",
+ "laravel-lang/lang": "^8.0",
"symfony/process": "^5.0.0"
},
"require-dev": {
@@ -3926,7 +3934,7 @@
],
"support": {
"issues": "https://github.com/overtrue/laravel-lang/issues",
- "source": "https://github.com/overtrue/laravel-lang/tree/4.2.1"
+ "source": "https://github.com/overtrue/laravel-lang/tree/5.0.0"
},
"funding": [
{
@@ -3934,7 +3942,7 @@
"type": "patreon"
}
],
- "time": "2020-11-12T01:44:31+00:00"
+ "time": "2021-04-28T03:56:56+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
@@ -8801,16 +8809,16 @@
},
{
"name": "composer/composer",
- "version": "2.0.12",
+ "version": "2.0.13",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "6c12ce263da71641903e399c3ce8ecb08fd375fb"
+ "reference": "986e8b86b7b570632ad0a905c3726c33dd4c0efb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/6c12ce263da71641903e399c3ce8ecb08fd375fb",
- "reference": "6c12ce263da71641903e399c3ce8ecb08fd375fb",
+ "url": "https://api.github.com/repos/composer/composer/zipball/986e8b86b7b570632ad0a905c3726c33dd4c0efb",
+ "reference": "986e8b86b7b570632ad0a905c3726c33dd4c0efb",
"shasum": "",
"mirrors": [
{
@@ -8821,6 +8829,7 @@
},
"require": {
"composer/ca-bundle": "^1.0",
+ "composer/metadata-minifier": "^1.0",
"composer/semver": "^3.0",
"composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^1.1",
@@ -8884,7 +8893,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues",
- "source": "https://github.com/composer/composer/tree/2.0.12"
+ "source": "https://github.com/composer/composer/tree/2.0.13"
},
"funding": [
{
@@ -8900,7 +8909,82 @@
"type": "tidelift"
}
],
- "time": "2021-04-01T08:14:59+00:00"
+ "time": "2021-04-27T11:11:08+00:00"
+ },
+ {
+ "name": "composer/metadata-minifier",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/metadata-minifier.git",
+ "reference": "c549d23829536f0d0e984aaabbf02af91f443207"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207",
+ "reference": "c549d23829536f0d0e984aaabbf02af91f443207",
+ "shasum": "",
+ "mirrors": [
+ {
+ "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+ "preferred": true
+ }
+ ]
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0 || ^8.0"
+ },
+ "require-dev": {
+ "composer/composer": "^2",
+ "phpstan/phpstan": "^0.12.55",
+ "symfony/phpunit-bridge": "^4.2 || ^5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Composer\\MetadataMinifier\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Small utility library that handles metadata minification and expansion.",
+ "keywords": [
+ "composer",
+ "compression"
+ ],
+ "support": {
+ "issues": "https://github.com/composer/metadata-minifier/issues",
+ "source": "https://github.com/composer/metadata-minifier/tree/1.0.0"
+ },
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2021-04-07T13:37:33+00:00"
},
{
"name": "composer/semver",
@@ -9292,16 +9376,16 @@
},
{
"name": "facade/ignition",
- "version": "2.8.3",
+ "version": "2.8.4",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "a8201d51aae83addceaef9344592a3b068b5d64d"
+ "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/a8201d51aae83addceaef9344592a3b068b5d64d",
- "reference": "a8201d51aae83addceaef9344592a3b068b5d64d",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/87fb348dab0ae1a7c206c3e902a5a44ba541742f",
+ "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f",
"shasum": "",
"mirrors": [
{
@@ -9371,7 +9455,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2021-04-09T20:45:59+00:00"
+ "time": "2021-04-29T13:55:26+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -9505,16 +9589,16 @@
},
{
"name": "filp/whoops",
- "version": "2.12.0",
+ "version": "2.12.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "d501fd2658d55491a2295ff600ae5978eaad7403"
+ "reference": "c13c0be93cff50f88bbd70827d993026821914dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403",
- "reference": "d501fd2658d55491a2295ff600ae5978eaad7403",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd",
+ "reference": "c13c0be93cff50f88bbd70827d993026821914dd",
"shasum": "",
"mirrors": [
{
@@ -9570,7 +9654,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.12.0"
+ "source": "https://github.com/filp/whoops/tree/2.12.1"
},
"funding": [
{
@@ -9578,7 +9662,7 @@
"type": "github"
}
],
- "time": "2021-03-30T12:00:00+00:00"
+ "time": "2021-04-25T12:00:00+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -12813,5 +12897,5 @@
"ext-simplexml": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index 51e14752..282835c8 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -47,7 +47,7 @@
-