diff --git a/composer.lock b/composer.lock index dc5c4610..d0a780eb 100644 --- a/composer.lock +++ b/composer.lock @@ -334,16 +334,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.211.0", + "version": "3.212.0", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "be209936fc1c70bb2e842cad2f3550ebb12d4eb8" + "reference": "d7670125548a886f90e889e08ae0ae7be4958908" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/be209936fc1c70bb2e842cad2f3550ebb12d4eb8", - "reference": "be209936fc1c70bb2e842cad2f3550ebb12d4eb8", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d7670125548a886f90e889e08ae0ae7be4958908", + "reference": "d7670125548a886f90e889e08ae0ae7be4958908", "shasum": "", "mirrors": [ { @@ -425,9 +425,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.211.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.212.0" }, - "time": "2022-02-28T19:50:29+00:00" + "time": "2022-03-02T19:29:21+00:00" }, { "name": "brick/math", @@ -2173,16 +2173,16 @@ }, { "name": "laravel/framework", - "version": "v9.2.0", + "version": "v9.3.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "13372872bed31ae75df8709b9de5cde01d50646e" + "reference": "d442195be0c1a95324522d733e2369e406db51d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/13372872bed31ae75df8709b9de5cde01d50646e", - "reference": "13372872bed31ae75df8709b9de5cde01d50646e", + "url": "https://api.github.com/repos/laravel/framework/zipball/d442195be0c1a95324522d733e2369e406db51d1", + "reference": "d442195be0c1a95324522d733e2369e406db51d1", "shasum": "", "mirrors": [ { @@ -2354,7 +2354,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-02-22T15:30:23+00:00" + "time": "2022-03-02T14:37:13+00:00" }, { "name": "laravel/sanctum", @@ -3295,6 +3295,61 @@ }, "time": "2021-06-14T00:11:39+00:00" }, + { + "name": "myclabs/php-enum", + "version": "1.6.6", + "source": { + "type": "git", + "url": "https://github.com/myclabs/php-enum.git", + "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/32c4202886c51fbe5cc3a7c34ec5c9a4a790345e", + "reference": "32c4202886c51fbe5cc3a7c34ec5c9a4a790345e", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "squizlabs/php_codesniffer": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/master" + }, + "time": "2019-02-04T21:18:49+00:00" + }, { "name": "nesbot/carbon", "version": "2.57.0", @@ -4583,16 +4638,16 @@ }, { "name": "qiniu/php-sdk", - "version": "v7.4.1", + "version": "v7.4.2", "source": { "type": "git", "url": "https://github.com/qiniu/php-sdk.git", - "reference": "10c7ead8357743b4b987a335c14964fb07700d57" + "reference": "8414ee6b0027acc682469c7a2e7144f3ed2b7676" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/10c7ead8357743b4b987a335c14964fb07700d57", - "reference": "10c7ead8357743b4b987a335c14964fb07700d57", + "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/8414ee6b0027acc682469c7a2e7144f3ed2b7676", + "reference": "8414ee6b0027acc682469c7a2e7144f3ed2b7676", "shasum": "", "mirrors": [ { @@ -4602,6 +4657,7 @@ ] }, "require": { + "myclabs/php-enum": "1.6.6", "php": ">=5.3.3" }, "require-dev": { @@ -4639,9 +4695,9 @@ ], "support": { "issues": "https://github.com/qiniu/php-sdk/issues", - "source": "https://github.com/qiniu/php-sdk/tree/v7.4.1" + "source": "https://github.com/qiniu/php-sdk/tree/v7.4.2" }, - "time": "2021-09-24T09:39:16+00:00" + "time": "2022-03-02T04:10:03+00:00" }, { "name": "ralouphie/getallheaders", @@ -8599,16 +8655,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.2", + "version": "1.10.3", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/c6a951b75d684fd43fbbd69617488e1e2e8924ba", + "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba", "shasum": "", "mirrors": [ { @@ -8620,13 +8676,14 @@ "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", "autoload": { @@ -8651,7 +8708,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.3" }, "funding": [ { @@ -8659,7 +8716,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2022-03-02T14:16:47+00:00" }, { "name": "nunomaduro/collision", @@ -10715,16 +10772,16 @@ }, { "name": "spatie/flare-client-php", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "edf253c68fba62cdb29ad6b48e211e29691dcee8" + "reference": "8ada1e5f4d7a2869f491c5e75d1f689b69db423e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/edf253c68fba62cdb29ad6b48e211e29691dcee8", - "reference": "edf253c68fba62cdb29ad6b48e211e29691dcee8", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/8ada1e5f4d7a2869f491c5e75d1f689b69db423e", + "reference": "8ada1e5f4d7a2869f491c5e75d1f689b69db423e", "shasum": "", "mirrors": [ { @@ -10773,7 +10830,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.0.4" + "source": "https://github.com/spatie/flare-client-php/tree/1.0.5" }, "funding": [ { @@ -10781,20 +10838,20 @@ "type": "github" } ], - "time": "2022-02-28T15:04:23+00:00" + "time": "2022-03-01T10:52:59+00:00" }, { "name": "spatie/ignition", - "version": "1.0.5", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "6b7bb804f4834b080f5ac941f6ac6800a485011e" + "reference": "5c554067887b7080bc58977fa30a488624d85d20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/6b7bb804f4834b080f5ac941f6ac6800a485011e", - "reference": "6b7bb804f4834b080f5ac941f6ac6800a485011e", + "url": "https://api.github.com/repos/spatie/ignition/zipball/5c554067887b7080bc58977fa30a488624d85d20", + "reference": "5c554067887b7080bc58977fa30a488624d85d20", "shasum": "", "mirrors": [ { @@ -10858,7 +10915,7 @@ "type": "github" } ], - "time": "2022-02-17T21:40:47+00:00" + "time": "2022-03-02T10:51:55+00:00" }, { "name": "spatie/laravel-ignition", diff --git a/config/convention.php b/config/convention.php index ebf202e7..658b664b 100644 --- a/config/convention.php +++ b/config/convention.php @@ -12,7 +12,7 @@ use App\Enums\Watermark\ImageOption; return [ 'app' => [ ConfigKey::AppName => 'Lsky Pro', - ConfigKey::AppVersion => '2.0', + ConfigKey::AppVersion => 'V 2.0', ConfigKey::SiteKeywords => 'Lsky Pro,lsky,兰空图床', ConfigKey::SiteDescription => 'Lsky Pro, Your photo album on the cloud.', ConfigKey::SiteNotice => '', diff --git a/public/css/app.css b/public/css/app.css index 194ef58e..08a304a7 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -694,12 +694,6 @@ select { .left-1 { left: 0.25rem; } -.top-3 { - top: 0.75rem; -} -.left-3 { - left: 0.75rem; -} .z-0 { z-index: 0; } @@ -790,12 +784,12 @@ select { .ml-4 { margin-left: 1rem; } -.mt-6 { - margin-top: 1.5rem; -} .mt-5 { margin-top: 1.25rem; } +.mt-6 { + margin-top: 1.5rem; +} .mb-8 { margin-bottom: 2rem; } @@ -934,6 +928,9 @@ select { .w-20 { width: 5rem; } +.w-16 { + width: 4rem; +} .w-3\/4 { width: 75%; } @@ -955,18 +952,12 @@ select { .w-6 { width: 1.5rem; } -.w-24 { - width: 6rem; -} -.w-16 { - width: 4rem; -} -.w-14 { - width: 3.5rem; -} .w-\[95\%\] { width: 95%; } +.w-24 { + width: 6rem; +} .min-w-full { min-width: 100%; } @@ -1099,9 +1090,6 @@ select { .flex-nowrap { flex-wrap: nowrap; } -.items-end { - align-items: flex-end; -} .items-center { align-items: center; } @@ -1337,10 +1325,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(229 231 235 / var(--tw-bg-opacity)); } -.bg-sky-500 { - --tw-bg-opacity: 1; - background-color: rgb(14 165 233 / var(--tw-bg-opacity)); -} .bg-blue-500 { --tw-bg-opacity: 1; background-color: rgb(59 130 246 / var(--tw-bg-opacity)); @@ -1349,6 +1333,10 @@ select { --tw-bg-opacity: 1; background-color: rgb(107 114 128 / var(--tw-bg-opacity)); } +.bg-sky-500 { + --tw-bg-opacity: 1; + background-color: rgb(14 165 233 / var(--tw-bg-opacity)); +} .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -1361,6 +1349,10 @@ select { --tw-bg-opacity: 1; background-color: rgb(234 179 8 / var(--tw-bg-opacity)); } +.bg-gray-400 { + --tw-bg-opacity: 1; + background-color: rgb(156 163 175 / var(--tw-bg-opacity)); +} .bg-gray-800 { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); @@ -1389,10 +1381,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(55 65 81 / var(--tw-bg-opacity)); } -.bg-gray-400 { - --tw-bg-opacity: 1; - background-color: rgb(156 163 175 / var(--tw-bg-opacity)); -} .bg-slate-700 { --tw-bg-opacity: 1; background-color: rgb(51 65 85 / var(--tw-bg-opacity)); @@ -1472,14 +1460,14 @@ select { padding-top: 0.75rem; padding-bottom: 0.75rem; } -.px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem; -} .py-5 { padding-top: 1.25rem; padding-bottom: 1.25rem; } +.px-6 { + padding-left: 1.5rem; + padding-right: 1.5rem; +} .px-5 { padding-left: 1.25rem; padding-right: 1.25rem; @@ -1669,6 +1657,10 @@ select { --tw-text-opacity: 1; color: rgb(255 255 255 / var(--tw-text-opacity)); } +.text-yellow-500 { + --tw-text-opacity: 1; + color: rgb(234 179 8 / var(--tw-text-opacity)); +} .text-indigo-600 { --tw-text-opacity: 1; color: rgb(79 70 229 / var(--tw-text-opacity)); @@ -1677,10 +1669,6 @@ select { --tw-text-opacity: 1; color: rgb(22 163 74 / var(--tw-text-opacity)); } -.text-yellow-500 { - --tw-text-opacity: 1; - color: rgb(234 179 8 / var(--tw-text-opacity)); -} .text-red-700 { --tw-text-opacity: 1; color: rgb(185 28 28 / var(--tw-text-opacity)); @@ -1878,15 +1866,6 @@ select { .duration-75 { transition-duration: 75ms; } -.duration-1000 { - transition-duration: 1000ms; -} -.duration-700 { - transition-duration: 700ms; -} -.duration-\[7000\] { - transition-duration: 7000; -} .ease-in-out { transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); } @@ -2068,27 +2047,6 @@ select { --tw-brightness: brightness(.5); filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); } -@media (prefers-reduced-motion: no-preference) { - - @-webkit-keyframes spin { - - to { - transform: rotate(360deg); - } - } - - @keyframes spin { - - to { - transform: rotate(360deg); - } - } - - .motion-safe\:animate-spin { - -webkit-animation: spin 1s linear infinite; - animation: spin 1s linear infinite; - } -} .dark .dark\:bg-gray-900 { --tw-bg-opacity: 1; background-color: rgb(17 24 39 / var(--tw-bg-opacity)); diff --git a/resources/views/admin/console/index.blade.php b/resources/views/admin/console/index.blade.php index 35eb30c7..ac290d52 100644 --- a/resources/views/admin/console/index.blade.php +++ b/resources/views/admin/console/index.blade.php @@ -123,18 +123,18 @@