From 6d8031b0a2e6e95062b8ac20c45c6e7b8da243fa Mon Sep 17 00:00:00 2001 From: Wisp X Date: Fri, 11 Feb 2022 08:42:28 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/UserController.php | 11 + app/Http/Controllers/User/UserController.php | 2 +- app/Models/User.php | 11 - app/View/Components/AppLayout.php | 3 +- composer.lock | 68 +- public/css/app.css | 714 ++++++++---------- .../views/components/container.blade.php | 4 +- resources/views/layouts/app.blade.php | 2 +- resources/views/user/gallery.blade.php | 19 +- 9 files changed, 390 insertions(+), 444 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 5a33ffdc..c07eed7b 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -5,10 +5,13 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests\Admin\UserRequest; use App\Models\User; +use Illuminate\Auth\Events\PasswordReset; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Str; use Illuminate\View\View; class UserController extends Controller @@ -36,6 +39,14 @@ class UserController extends Controller /** @var User $user */ $user = User::query()->findOrFail($request->route('id')); $user->fill($request->validated()); + if ($password = $request->validated('password')) { + $user->forceFill([ + 'password' => Hash::make($password), + 'remember_token' => Str::random(60), + ]); + + event(new PasswordReset($user)); + } if (!$user->save()) { return $this->error('保存失败'); } diff --git a/app/Http/Controllers/User/UserController.php b/app/Http/Controllers/User/UserController.php index 48caae08..3dc4eeeb 100644 --- a/app/Http/Controllers/User/UserController.php +++ b/app/Http/Controllers/User/UserController.php @@ -53,7 +53,7 @@ class UserController extends Controller $user->forceFill([ 'password' => Hash::make($password), 'remember_token' => Str::random(60), - ])->save(); + ]); event(new PasswordReset($user)); } diff --git a/app/Models/User.php b/app/Models/User.php index c8670d49..5a7247b9 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -12,8 +12,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Str; use Laravel\Sanctum\HasApiTokens; /** @@ -91,15 +89,6 @@ class User extends Authenticatable implements MustVerifyEmail UserConfigKey::IsAutoClearPreview => false, ])->merge($user->configs ?: []); }); - - static::saving(function (self $user) { - if ($user->password) { - $user->password = Hash::make($user->password); - $user->remember_token = Str::random(60); - } else { - unset($user->password); - } - }); } public function group(): BelongsTo diff --git a/app/View/Components/AppLayout.php b/app/View/Components/AppLayout.php index e4f5522c..b45d3425 100644 --- a/app/View/Components/AppLayout.php +++ b/app/View/Components/AppLayout.php @@ -13,7 +13,6 @@ class AppLayout extends Component */ public function render() { - $is_full = request()->routeIs('images', 'gallery'); - return view('layouts.app', compact('is_full')); + return view('layouts.app'); } } diff --git a/composer.lock b/composer.lock index 8d14cfaf..8cc201b9 100644 --- a/composer.lock +++ b/composer.lock @@ -114,16 +114,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.209.21", + "version": "3.209.22", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "3f5b867920f422d605c38aad95f5c334183b39bb" + "reference": "2f8a8c885daf45fe9f919312a66a68115d6733b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3f5b867920f422d605c38aad95f5c334183b39bb", - "reference": "3f5b867920f422d605c38aad95f5c334183b39bb", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2f8a8c885daf45fe9f919312a66a68115d6733b5", + "reference": "2f8a8c885daf45fe9f919312a66a68115d6733b5", "shasum": "" }, "require": { @@ -199,9 +199,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.209.21" + "source": "https://github.com/aws/aws-sdk-php/tree/3.209.22" }, - "time": "2022-02-09T19:17:07+00:00" + "time": "2022-02-10T19:14:07+00:00" }, { "name": "brick/math", @@ -1243,16 +1243,16 @@ }, { "name": "laravel/framework", - "version": "v9.0.1", + "version": "v9.0.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "afeb58d019b203ecb1a1c4063a66a029ea6bea63" + "reference": "4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/afeb58d019b203ecb1a1c4063a66a029ea6bea63", - "reference": "afeb58d019b203ecb1a1c4063a66a029ea6bea63", + "url": "https://api.github.com/repos/laravel/framework/zipball/4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9", + "reference": "4c7cd8c4e95d161c0c6ada6efa0a5af4d0d487c9", "shasum": "" }, "require": { @@ -1418,7 +1418,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-02-09T15:00:05+00:00" + "time": "2022-02-10T15:07:46+00:00" }, { "name": "laravel/sanctum", @@ -1799,16 +1799,16 @@ }, { "name": "league/flysystem", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "9f8b4260031bfef5497477da53dd57b2aaff0e06" + "reference": "aef771741948595bfbed8e0342dd340695a368ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9f8b4260031bfef5497477da53dd57b2aaff0e06", - "reference": "9f8b4260031bfef5497477da53dd57b2aaff0e06", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/aef771741948595bfbed8e0342dd340695a368ff", + "reference": "aef771741948595bfbed8e0342dd340695a368ff", "shasum": "" }, "require": { @@ -1868,7 +1868,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.0.3" + "source": "https://github.com/thephpleague/flysystem/tree/3.0.4" }, "funding": [ { @@ -1884,7 +1884,7 @@ "type": "tidelift" } ], - "time": "2022-01-31T19:41:04+00:00" + "time": "2022-02-10T16:14:03+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -1944,16 +1944,16 @@ }, { "name": "league/flysystem-ftp", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-ftp.git", - "reference": "b905a8882187035f067a9b774ed89ddc9a382a92" + "reference": "408b2ba9dedfb9685e8ab9a24d4ca9b4fe636149" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/b905a8882187035f067a9b774ed89ddc9a382a92", - "reference": "b905a8882187035f067a9b774ed89ddc9a382a92", + "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/408b2ba9dedfb9685e8ab9a24d4ca9b4fe636149", + "reference": "408b2ba9dedfb9685e8ab9a24d4ca9b4fe636149", "shasum": "" }, "require": { @@ -1988,7 +1988,7 @@ "ftpd" ], "support": { - "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.0.3" + "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.0.4" }, "funding": [ { @@ -2004,7 +2004,7 @@ "type": "tidelift" } ], - "time": "2022-01-31T19:10:15+00:00" + "time": "2022-02-10T16:09:00+00:00" }, { "name": "league/flysystem-sftp", @@ -8275,16 +8275,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.3", + "version": "5.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" + "reference": "19c519631c5a511b7ed0ad64a6713fdb3fd25fe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/19c519631c5a511b7ed0ad64a6713fdb3fd25fe4", + "reference": "19c519631c5a511b7ed0ad64a6713fdb3fd25fe4", "shasum": "" }, "require": { @@ -8327,7 +8327,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.4" }, "funding": [ { @@ -8335,7 +8335,7 @@ "type": "github" } ], - "time": "2021-06-11T13:31:12+00:00" + "time": "2022-02-10T07:01:19+00:00" }, { "name": "sebastian/lines-of-code", @@ -8932,16 +8932,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "68250225a9f83b086462c2af1b1139dfde48fbd2" + "reference": "ca49c7f74022de49910715e8f1ac5ce52123eb3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/68250225a9f83b086462c2af1b1139dfde48fbd2", - "reference": "68250225a9f83b086462c2af1b1139dfde48fbd2", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/ca49c7f74022de49910715e8f1ac5ce52123eb3e", + "reference": "ca49c7f74022de49910715e8f1ac5ce52123eb3e", "shasum": "" }, "require": { @@ -9015,7 +9015,7 @@ "type": "github" } ], - "time": "2022-02-04T15:25:56+00:00" + "time": "2022-02-10T08:50:40+00:00" }, { "name": "symfony/debug", diff --git a/public/css/app.css b/public/css/app.css index 64b9f1be..da49a1df 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -652,18 +652,6 @@ select { bottom: 0px; left: 0px; } -.top-1 { - top: 0.25rem; -} -.right-1 { - right: 0.25rem; -} -.top-2 { - top: 0.5rem; -} -.right-2 { - right: 0.5rem; -} .top-14 { top: 3.5rem; } @@ -691,6 +679,18 @@ select { .bottom-2 { bottom: 0.5rem; } +.top-1 { + top: 0.25rem; +} +.right-1 { + right: 0.25rem; +} +.top-2 { + top: 0.5rem; +} +.right-2 { + right: 0.5rem; +} .z-0 { z-index: 0; } @@ -718,10 +718,6 @@ select { .m-2 { margin: 0.5rem; } -.my-6 { - margin-top: 1.5rem; - margin-bottom: 1.5rem; -} .mx-auto { margin-left: auto; margin-right: auto; @@ -742,78 +738,70 @@ select { margin-top: -0.5rem; margin-bottom: -0.5rem; } +.my-6 { + margin-top: 1.5rem; + margin-bottom: 1.5rem; +} .ml-3 { margin-left: 0.75rem; } .-ml-px { margin-left: -1px; } -.mb-4 { - margin-bottom: 1rem; -} -.mb-2 { - margin-bottom: 0.5rem; -} -.mt-3 { - margin-top: 0.75rem; -} -.ml-1 { - margin-left: 0.25rem; -} -.mt-2 { - margin-top: 0.5rem; -} -.ml-2 { - margin-left: 0.5rem; -} -.mt-1 { - margin-top: 0.25rem; -} -.mt-4 { - margin-top: 1rem; -} -.ml-4 { - margin-left: 1rem; -} -.mb-3 { - margin-bottom: 0.75rem; -} -.mt-6 { - margin-top: 1.5rem; -} -.mt-5 { - margin-top: 1.25rem; -} .mb-5 { margin-bottom: 1.25rem; } .mt-10 { margin-top: 2.5rem; } -.mr-2 { - margin-right: 0.5rem; +.mt-2 { + margin-top: 0.5rem; } -.mt-8 { - margin-top: 2rem; -} -.ml-12 { - margin-left: 3rem; -} -.-mt-px { - margin-top: -1px; -} -.mr-4 { - margin-right: 1rem; +.mb-2 { + margin-bottom: 0.5rem; } .-ml-1 { margin-left: -0.25rem; } +.mr-4 { + margin-right: 1rem; +} +.mb-4 { + margin-bottom: 1rem; +} +.mt-1 { + margin-top: 0.25rem; +} +.mt-4 { + margin-top: 1rem; +} +.ml-2 { + margin-left: 0.5rem; +} +.ml-4 { + margin-left: 1rem; +} +.mt-6 { + margin-top: 1.5rem; +} +.mt-3 { + margin-top: 0.75rem; +} .mr-3 { margin-right: 0.75rem; } +.ml-1 { + margin-left: 0.25rem; +} .-mr-2 { margin-right: -0.5rem; } +.mt-5 { + margin-top: 1.25rem; +} +.mb-3 { + margin-bottom: 0.75rem; +} .block { display: block; } @@ -838,24 +826,15 @@ select { .h-5 { height: 1.25rem; } +.h-56 { + height: 14rem; +} .h-full { height: 100%; } .h-8 { height: 2rem; } -.h-10 { - height: 2.5rem; -} -.h-4 { - height: 1rem; -} -.h-20 { - height: 5rem; -} -.h-9 { - height: 2.25rem; -} .h-screen { height: 100vh; } @@ -868,8 +847,8 @@ select { .h-1 { height: 0.25rem; } -.h-16 { - height: 4rem; +.h-20 { + height: 5rem; } .h-7 { height: 1.75rem; @@ -877,12 +856,21 @@ select { .h-6 { height: 1.5rem; } -.min-h-\[150px\] { - min-height: 150px; +.h-10 { + height: 2.5rem; +} +.h-4 { + height: 1rem; +} +.h-16 { + height: 4rem; } .min-h-screen { min-height: 100vh; } +.min-h-\[150px\] { + min-height: 150px; +} .w-5 { width: 1.25rem; } @@ -892,27 +880,9 @@ select { .w-8 { width: 2rem; } -.w-\[0\%\] { - width: 0%; -} -.w-10 { - width: 2.5rem; -} -.w-\[80\%\] { - width: 80%; -} -.w-4 { - width: 1rem; -} -.w-20 { - width: 5rem; -} .w-3\/4 { width: 75%; } -.w-auto { - width: auto; -} .w-48 { width: 12rem; } @@ -922,17 +892,32 @@ select { .w-\[90\%\] { width: 90%; } +.w-\[80\%\] { + width: 80%; +} .w-6 { width: 1.5rem; } +.w-20 { + width: 5rem; +} +.w-4 { + width: 1rem; +} +.w-\[0\%\] { + width: 0%; +} +.w-10 { + width: 2.5rem; +} +.w-auto { + width: auto; +} .min-w-full { min-width: 100%; } -.max-w-xl { - max-width: 36rem; -} -.max-w-6xl { - max-width: 72rem; +.max-w-2xl { + max-width: 42rem; } .max-w-\[70\%\] { max-width: 70%; @@ -946,6 +931,9 @@ select { .shrink-0 { flex-shrink: 0; } +.grow { + flex-grow: 1; +} .basis-1\/3 { flex-basis: 33.333333%; } @@ -1019,12 +1007,12 @@ select { .list-disc { list-style-type: disc; } -.grid-cols-6 { - grid-template-columns: repeat(6, minmax(0, 1fr)); -} .grid-cols-1 { grid-template-columns: repeat(1, minmax(0, 1fr)); } +.grid-cols-6 { + grid-template-columns: repeat(6, minmax(0, 1fr)); +} .flex-row { flex-direction: row; } @@ -1061,10 +1049,17 @@ select { .gap-6 { gap: 1.5rem; } -.space-y-4 > :not([hidden]) ~ :not([hidden]) { +.gap-y-10 { + row-gap: 2.5rem; +} +.gap-x-6 { + -moz-column-gap: 1.5rem; + column-gap: 1.5rem; +} +.space-y-3 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; - margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(1rem * var(--tw-space-y-reverse)); + margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.75rem * var(--tw-space-y-reverse)); } .space-y-2 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; @@ -1076,21 +1071,31 @@ select { margin-right: calc(0.5rem * var(--tw-space-x-reverse)); margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); } -.space-x-6 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(1.5rem * var(--tw-space-x-reverse)); - margin-left: calc(1.5rem * calc(1 - var(--tw-space-x-reverse))); -} -.space-y-3 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(0.75rem * var(--tw-space-y-reverse)); -} .space-x-1 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(0.25rem * var(--tw-space-x-reverse)); margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse))); } +.space-x-3 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(0.75rem * var(--tw-space-x-reverse)); + margin-left: calc(0.75rem * calc(1 - var(--tw-space-x-reverse))); +} +.space-y-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(1rem * var(--tw-space-y-reverse)); +} +.space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); +} +.space-y-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); +} .space-y-6 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(1.5rem * calc(1 - var(--tw-space-y-reverse))); @@ -1106,21 +1111,6 @@ select { margin-top: calc(2rem * calc(1 - var(--tw-space-y-reverse))); margin-bottom: calc(2rem * var(--tw-space-y-reverse)); } -.space-x-3 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(0.75rem * var(--tw-space-x-reverse)); - margin-left: calc(0.75rem * calc(1 - var(--tw-space-x-reverse))); -} -.space-x-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(2rem * var(--tw-space-x-reverse)); - margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); -} -.space-y-1 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); -} .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -1163,21 +1153,18 @@ select { .break-words { overflow-wrap: break-word; } -.break-all { - word-break: break-all; -} .rounded-md { border-radius: 0.375rem; } -.rounded-lg { - border-radius: 0.5rem; -} .rounded-full { border-radius: 9999px; } .rounded { border-radius: 0.25rem; } +.rounded-lg { + border-radius: 0.5rem; +} .rounded-l-md { border-top-left-radius: 0.375rem; border-bottom-left-radius: 0.375rem; @@ -1197,11 +1184,14 @@ select { .border { border-width: 1px; } +.border-0 { + border-width: 0px; +} .border-2 { border-width: 2px; } -.border-0 { - border-width: 0px; +.border-b { + border-bottom-width: 1px; } .border-b-2 { border-bottom-width: 2px; @@ -1209,15 +1199,6 @@ select { .border-t { border-top-width: 1px; } -.border-r { - border-right-width: 1px; -} -.border-b { - border-bottom-width: 1px; -} -.border-l-4 { - border-left-width: 4px; -} .border-solid { border-style: solid; } @@ -1228,6 +1209,13 @@ select { --tw-border-opacity: 1; border-color: rgb(209 213 219 / var(--tw-border-opacity)); } +.border-gray-500 { + --tw-border-opacity: 1; + border-color: rgb(107 114 128 / var(--tw-border-opacity)); +} +.border-transparent { + border-color: transparent; +} .border-stone-300 { --tw-border-opacity: 1; border-color: rgb(214 211 209 / var(--tw-border-opacity)); @@ -1236,29 +1224,14 @@ select { --tw-border-opacity: 1; border-color: rgb(99 102 241 / var(--tw-border-opacity)); } -.border-transparent { - border-color: transparent; +.border-gray-100 { + --tw-border-opacity: 1; + border-color: rgb(243 244 246 / var(--tw-border-opacity)); } .border-gray-200 { --tw-border-opacity: 1; border-color: rgb(229 231 235 / var(--tw-border-opacity)); } -.border-gray-400 { - --tw-border-opacity: 1; - border-color: rgb(156 163 175 / var(--tw-border-opacity)); -} -.border-gray-500 { - --tw-border-opacity: 1; - border-color: rgb(107 114 128 / var(--tw-border-opacity)); -} -.border-indigo-400 { - --tw-border-opacity: 1; - border-color: rgb(129 140 248 / var(--tw-border-opacity)); -} -.border-gray-100 { - --tw-border-opacity: 1; - border-color: rgb(243 244 246 / var(--tw-border-opacity)); -} .bg-white { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -1267,22 +1240,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } -.bg-gray-50 { - --tw-bg-opacity: 1; - background-color: rgb(249 250 251 / var(--tw-bg-opacity)); -} -.bg-gray-200 { - --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); -} -.bg-blue-500 { - --tw-bg-opacity: 1; - background-color: rgb(59 130 246 / var(--tw-bg-opacity)); -} -.bg-gray-500 { - --tw-bg-opacity: 1; - background-color: rgb(107 114 128 / var(--tw-bg-opacity)); -} .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -1295,14 +1252,18 @@ select { --tw-bg-opacity: 1; background-color: rgb(75 85 99 / var(--tw-bg-opacity)); } -.bg-slate-50 { +.bg-gray-500 { --tw-bg-opacity: 1; - background-color: rgb(248 250 252 / var(--tw-bg-opacity)); + background-color: rgb(107 114 128 / var(--tw-bg-opacity)); } .bg-red-500 { --tw-bg-opacity: 1; background-color: rgb(239 68 68 / var(--tw-bg-opacity)); } +.bg-gray-200 { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); +} .bg-indigo-500 { --tw-bg-opacity: 1; background-color: rgb(99 102 241 / var(--tw-bg-opacity)); @@ -1311,22 +1272,30 @@ select { --tw-bg-opacity: 1; background-color: rgb(96 165 250 / var(--tw-bg-opacity)); } -.bg-red-400 { - --tw-bg-opacity: 1; - background-color: rgb(248 113 113 / var(--tw-bg-opacity)); -} .bg-gray-700 { --tw-bg-opacity: 1; background-color: rgb(55 65 81 / var(--tw-bg-opacity)); } +.bg-slate-50 { + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); +} +.bg-blue-500 { + --tw-bg-opacity: 1; + background-color: rgb(59 130 246 / var(--tw-bg-opacity)); +} +.bg-gray-50 { + --tw-bg-opacity: 1; + background-color: rgb(249 250 251 / var(--tw-bg-opacity)); +} +.bg-red-400 { + --tw-bg-opacity: 1; + background-color: rgb(248 113 113 / var(--tw-bg-opacity)); +} .bg-yellow-500 { --tw-bg-opacity: 1; background-color: rgb(234 179 8 / var(--tw-bg-opacity)); } -.bg-indigo-50 { - --tw-bg-opacity: 1; - background-color: rgb(238 242 255 / var(--tw-bg-opacity)); -} .bg-sky-500 { --tw-bg-opacity: 1; background-color: rgb(14 165 233 / var(--tw-bg-opacity)); @@ -1344,9 +1313,25 @@ select { --tw-gradient-from: #000; --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to, rgb(0 0 0 / 0)); } +.bg-auto { + background-size: auto; +} +.bg-cover { + background-size: cover; +} +.bg-center { + background-position: center; +} +.bg-no-repeat { + background-repeat: no-repeat; +} .fill-current { fill: currentColor; } +.object-cover { + -o-object-fit: cover; + object-fit: cover; +} .p-4 { padding: 1rem; } @@ -1356,9 +1341,6 @@ select { .p-1 { padding: 0.25rem; } -.p-6 { - padding: 1.5rem; -} .p-3 { padding: 0.75rem; } @@ -1374,38 +1356,22 @@ select { padding-left: 0.5rem; padding-right: 0.5rem; } -.py-1 { - padding-top: 0.25rem; - padding-bottom: 0.25rem; -} -.px-8 { - padding-left: 2rem; - padding-right: 2rem; -} -.py-5 { - padding-top: 1.25rem; - padding-bottom: 1.25rem; -} -.py-3 { - padding-top: 0.75rem; - padding-bottom: 0.75rem; -} .px-6 { padding-left: 1.5rem; padding-right: 1.5rem; } -.py-4 { - padding-top: 1rem; - padding-bottom: 1rem; +.px-5 { + padding-left: 1.25rem; + padding-right: 1.25rem; +} +.py-1 { + padding-top: 0.25rem; + padding-bottom: 0.25rem; } .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; } -.px-5 { - padding-left: 1.25rem; - padding-right: 1.25rem; -} .px-2\.5 { padding-left: 0.625rem; padding-right: 0.625rem; @@ -1418,19 +1384,25 @@ select { padding-top: 3.5rem; padding-bottom: 3.5rem; } -.py-12 { - padding-top: 3rem; - padding-bottom: 3rem; +.py-4 { + padding-top: 1rem; + padding-bottom: 1rem; +} +.py-3 { + padding-top: 0.75rem; + padding-bottom: 0.75rem; } .py-10 { padding-top: 2.5rem; padding-bottom: 2.5rem; } -.pb-6 { - padding-bottom: 1.5rem; +.px-8 { + padding-left: 2rem; + padding-right: 2rem; } -.pt-6 { - padding-top: 1.5rem; +.py-5 { + padding-top: 1.25rem; + padding-bottom: 1.25rem; } .pb-14 { padding-bottom: 3.5rem; @@ -1438,14 +1410,11 @@ select { .pb-12 { padding-bottom: 3rem; } -.pt-8 { - padding-top: 2rem; +.pt-6 { + padding-top: 1.5rem; } -.pl-3 { - padding-left: 0.75rem; -} -.pr-4 { - padding-right: 1rem; +.pb-6 { + padding-bottom: 1.5rem; } .pt-2 { padding-top: 0.5rem; @@ -1478,38 +1447,38 @@ select { font-size: 0.875rem; line-height: 1.25rem; } -.text-2xl { - font-size: 1.5rem; - line-height: 2rem; -} .text-xl { font-size: 1.25rem; line-height: 1.75rem; } -.text-6xl { - font-size: 3.75rem; - line-height: 1; -} .text-xs { font-size: 0.75rem; line-height: 1rem; } -.text-base { - font-size: 1rem; - line-height: 1.5rem; -} .text-4xl { font-size: 2.25rem; line-height: 2.5rem; } -.text-lg { - font-size: 1.125rem; - line-height: 1.75rem; +.text-base { + font-size: 1rem; + line-height: 1.5rem; } .text-5xl { font-size: 3rem; line-height: 1; } +.text-2xl { + font-size: 1.5rem; + line-height: 2rem; +} +.text-6xl { + font-size: 3.75rem; + line-height: 1; +} +.text-lg { + font-size: 1.125rem; + line-height: 1.75rem; +} .font-medium { font-weight: 500; } @@ -1522,12 +1491,6 @@ select { .leading-5 { line-height: 1.25rem; } -.leading-7 { - line-height: 1.75rem; -} -.leading-tight { - line-height: 1.25; -} .tracking-wider { letter-spacing: 0.05em; } @@ -1542,6 +1505,14 @@ select { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); } +.text-white { + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); +} +.text-blue-500 { + --tw-text-opacity: 1; + color: rgb(59 130 246 / var(--tw-text-opacity)); +} .text-gray-400 { --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); @@ -1554,6 +1525,34 @@ select { --tw-text-opacity: 1; color: rgb(75 85 99 / var(--tw-text-opacity)); } +.text-red-400 { + --tw-text-opacity: 1; + color: rgb(248 113 113 / var(--tw-text-opacity)); +} +.text-slate-600 { + --tw-text-opacity: 1; + color: rgb(71 85 105 / var(--tw-text-opacity)); +} +.text-gray-300 { + --tw-text-opacity: 1; + color: rgb(209 213 219 / var(--tw-text-opacity)); +} +.text-indigo-600 { + --tw-text-opacity: 1; + color: rgb(79 70 229 / var(--tw-text-opacity)); +} +.text-green-600 { + --tw-text-opacity: 1; + color: rgb(22 163 74 / var(--tw-text-opacity)); +} +.text-red-600 { + --tw-text-opacity: 1; + color: rgb(220 38 38 / var(--tw-text-opacity)); +} +.text-gray-900 { + --tw-text-opacity: 1; + color: rgb(17 24 39 / var(--tw-text-opacity)); +} .text-green-500 { --tw-text-opacity: 1; color: rgb(34 197 94 / var(--tw-text-opacity)); @@ -1566,50 +1565,6 @@ select { --tw-text-opacity: 1; color: rgb(22 101 52 / var(--tw-text-opacity)); } -.text-red-600 { - --tw-text-opacity: 1; - color: rgb(220 38 38 / var(--tw-text-opacity)); -} -.text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} -.text-indigo-600 { - --tw-text-opacity: 1; - color: rgb(79 70 229 / var(--tw-text-opacity)); -} -.text-white { - --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-blue-500 { - --tw-text-opacity: 1; - color: rgb(59 130 246 / var(--tw-text-opacity)); -} -.text-gray-200 { - --tw-text-opacity: 1; - color: rgb(229 231 235 / var(--tw-text-opacity)); -} -.text-gray-300 { - --tw-text-opacity: 1; - color: rgb(209 213 219 / var(--tw-text-opacity)); -} -.text-orange-500 { - --tw-text-opacity: 1; - color: rgb(249 115 22 / var(--tw-text-opacity)); -} -.text-green-600 { - --tw-text-opacity: 1; - color: rgb(22 163 74 / var(--tw-text-opacity)); -} -.text-red-400 { - --tw-text-opacity: 1; - color: rgb(248 113 113 / var(--tw-text-opacity)); -} .text-amber-500 { --tw-text-opacity: 1; color: rgb(245 158 11 / var(--tw-text-opacity)); @@ -1622,25 +1577,17 @@ select { --tw-text-opacity: 1; color: rgb(74 222 128 / var(--tw-text-opacity)); } -.text-red-800 { +.text-yellow-500 { --tw-text-opacity: 1; - color: rgb(153 27 27 / var(--tw-text-opacity)); -} -.text-slate-600 { - --tw-text-opacity: 1; - color: rgb(71 85 105 / var(--tw-text-opacity)); -} -.text-indigo-700 { - --tw-text-opacity: 1; - color: rgb(67 56 202 / var(--tw-text-opacity)); + color: rgb(234 179 8 / var(--tw-text-opacity)); } .text-rose-500 { --tw-text-opacity: 1; color: rgb(244 63 94 / var(--tw-text-opacity)); } -.text-cyan-500 { +.text-orange-500 { --tw-text-opacity: 1; - color: rgb(6 182 212 / var(--tw-text-opacity)); + color: rgb(249 115 22 / var(--tw-text-opacity)); } .underline { -webkit-text-decoration-line: underline; @@ -1650,9 +1597,6 @@ select { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.opacity-70 { - opacity: 0.7; -} .opacity-0 { opacity: 0; } @@ -1665,6 +1609,9 @@ select { .opacity-75 { opacity: 0.75; } +.opacity-70 { + opacity: 0.7; +} .shadow-sm { --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color); @@ -1675,11 +1622,6 @@ select { --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color); box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } -.shadow { - --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); - --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); -} .outline-none { outline: 2px solid transparent; outline-offset: 2px; @@ -1722,6 +1664,11 @@ select { transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; } +.transition-shadow { + transition-property: box-shadow; + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-duration: 150ms; +} .transition-opacity { transition-property: opacity; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); @@ -1764,14 +1711,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } -.hover\:bg-gray-200:hover { - --tw-bg-opacity: 1; - background-color: rgb(229 231 235 / var(--tw-bg-opacity)); -} -.hover\:bg-blue-600:hover { - --tw-bg-opacity: 1; - background-color: rgb(37 99 235 / var(--tw-bg-opacity)); -} .hover\:bg-blue-300:hover { --tw-bg-opacity: 1; background-color: rgb(147 197 253 / var(--tw-bg-opacity)); @@ -1780,9 +1719,13 @@ select { --tw-bg-opacity: 1; background-color: rgb(75 85 99 / var(--tw-bg-opacity)); } -.hover\:bg-gray-50:hover { +.hover\:bg-blue-600:hover { --tw-bg-opacity: 1; - background-color: rgb(249 250 251 / var(--tw-bg-opacity)); + background-color: rgb(37 99 235 / var(--tw-bg-opacity)); +} +.hover\:bg-gray-200:hover { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); } .hover\:text-gray-500:hover { --tw-text-opacity: 1; @@ -1792,14 +1735,22 @@ select { --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); } -.hover\:text-indigo-400:hover { +.hover\:text-white:hover { --tw-text-opacity: 1; - color: rgb(129 140 248 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity)); } .hover\:text-gray-900:hover { --tw-text-opacity: 1; color: rgb(17 24 39 / var(--tw-text-opacity)); } +.hover\:text-indigo-400:hover { + --tw-text-opacity: 1; + color: rgb(129 140 248 / var(--tw-text-opacity)); +} +.hover\:text-gray-700:hover { + --tw-text-opacity: 1; + color: rgb(55 65 81 / var(--tw-text-opacity)); +} .hover\:text-indigo-900:hover { --tw-text-opacity: 1; color: rgb(49 46 129 / var(--tw-text-opacity)); @@ -1808,17 +1759,10 @@ select { --tw-text-opacity: 1; color: rgb(127 29 29 / var(--tw-text-opacity)); } -.hover\:text-white:hover { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} -.hover\:text-gray-800:hover { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} -.hover\:text-gray-700:hover { - --tw-text-opacity: 1; - color: rgb(55 65 81 / var(--tw-text-opacity)); +.hover\:shadow-xl:hover { + --tw-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } .focus\:z-10:focus { z-index: 10; @@ -1835,10 +1779,6 @@ select { --tw-border-opacity: 1; border-color: rgb(107 114 128 / var(--tw-border-opacity)); } -.focus\:border-indigo-700:focus { - --tw-border-opacity: 1; - border-color: rgb(67 56 202 / var(--tw-border-opacity)); -} .focus\:border-gray-300:focus { --tw-border-opacity: 1; border-color: rgb(209 213 219 / var(--tw-border-opacity)); @@ -1847,26 +1787,10 @@ select { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } -.focus\:bg-indigo-100:focus { - --tw-bg-opacity: 1; - background-color: rgb(224 231 255 / var(--tw-bg-opacity)); -} -.focus\:bg-gray-50:focus { - --tw-bg-opacity: 1; - background-color: rgb(249 250 251 / var(--tw-bg-opacity)); -} .focus\:bg-gray-100:focus { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } -.focus\:text-indigo-800:focus { - --tw-text-opacity: 1; - color: rgb(55 48 163 / var(--tw-text-opacity)); -} -.focus\:text-gray-800:focus { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} .focus\:text-gray-700:focus { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); @@ -1894,10 +1818,6 @@ select { --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color); box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); } -.focus\:ring-indigo-500:focus { - --tw-ring-opacity: 1; - --tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity)); -} .focus\:ring-white:focus { --tw-ring-opacity: 1; --tw-ring-color: rgb(255 255 255 / var(--tw-ring-opacity)); @@ -1906,6 +1826,10 @@ select { --tw-ring-opacity: 1; --tw-ring-color: rgb(199 210 254 / var(--tw-ring-opacity)); } +.focus\:ring-indigo-500:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity)); +} .focus\:ring-opacity-50:focus { --tw-ring-opacity: 0.5; } @@ -1937,10 +1861,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); } -.dark .dark\:bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); -} @media (min-width: 640px) { .sm\:left-0 { @@ -2005,12 +1925,12 @@ select { flex: 1 1 0%; } - .sm\:items-center { - align-items: center; + .sm\:grid-cols-2 { + grid-template-columns: repeat(2, minmax(0, 1fr)); } - .sm\:justify-start { - justify-content: flex-start; + .sm\:items-center { + align-items: center; } .sm\:justify-center { @@ -2021,28 +1941,28 @@ select { justify-content: space-between; } - .sm\:rounded-md { - border-radius: 0.375rem; - } - .sm\:rounded-lg { border-radius: 0.5rem; } + .sm\:rounded-md { + border-radius: 0.375rem; + } + .sm\:p-6 { padding: 1.5rem; } - .sm\:px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem; - } - .sm\:px-10 { padding-left: 2.5rem; padding-right: 2.5rem; } + .sm\:px-6 { + padding-left: 1.5rem; + padding-right: 1.5rem; + } + .sm\:pt-0 { padding-top: 0px; } @@ -2069,14 +1989,14 @@ select { margin-bottom: 2.5rem; } - .md\:mt-0 { - margin-top: 0px; - } - .md\:mt-8 { margin-top: 2rem; } + .md\:mt-0 { + margin-top: 0px; + } + .md\:block { display: block; } @@ -2097,6 +2017,10 @@ select { width: 70%; } + .md\:grid-cols-4 { + grid-template-columns: repeat(4, minmax(0, 1fr)); + } + .md\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } @@ -2154,6 +2078,14 @@ select { display: none; } + .lg\:max-w-7xl { + max-width: 80rem; + } + + .lg\:grid-cols-8 { + grid-template-columns: repeat(8, minmax(0, 1fr)); + } + .lg\:px-10 { padding-left: 2.5rem; padding-right: 2.5rem; @@ -2170,6 +2102,10 @@ select { width: 40%; } + .xl\:grid-cols-6 { + grid-template-columns: repeat(6, minmax(0, 1fr)); + } + .xl\:grid-cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); } diff --git a/resources/views/components/container.blade.php b/resources/views/components/container.blade.php index 348a0385..8a52e102 100644 --- a/resources/views/components/container.blade.php +++ b/resources/views/components/container.blade.php @@ -1,3 +1,5 @@ -
merge(['class' => ($full ?? false) ? 'h-full mx-auto sm:ml-64' : 'h-full mx-auto sm:ml-64 px-6 md:px-10 lg:px-10 xl:px-10 2xl:px-60']) }}> +@props(['full' => request()->routeIs('images', 'gallery')]) + +
merge(['class' => $full ? 'h-full mx-auto sm:ml-64' : 'h-full mx-auto sm:ml-64 px-6 md:px-10 lg:px-10 xl:px-10 2xl:px-60']) }}> {{ $slot }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 61c18a04..d836e2db 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -41,7 +41,7 @@ >
- + {{ $slot }} diff --git a/resources/views/user/gallery.blade.php b/resources/views/user/gallery.blade.php index 960a0dd2..700844d1 100644 --- a/resources/views/user/gallery.blade.php +++ b/resources/views/user/gallery.blade.php @@ -1,11 +1,20 @@ @section('title', '画廊') -@push('styles') - -@endpush - - 1 +
+
+ @foreach(\App\Models\Image::all() as $image) +
+
+ +
+
+ 11 +
+
+ @endforeach +
+
@push('scripts')