From bc82696027f2272c7f47aadac3607637859ec981 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 8 Jul 2023 17:35:54 +0800 Subject: [PATCH 01/24] =?UTF-8?q?EditFeature=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改显示内容配置内容,显示颜色 Signed-off-by: XiaoLFeng --- app/Http/Controllers/Function/Link.php | 19 ++++++++++++------- resources/views/function/link.blade.php | 9 +++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index 43b2e06..11097ff 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -784,16 +784,21 @@ protected function viewEditFriend(HttpRequest $request, $friendId): Application| protected function viewLink(): Factory|View|Application { $this->data['webSubTitle'] = '友链'; - $this->getFriendsLink($this->data); + $this->data['blogLink'] = DB::table('blog_link') + ->whereNotIn('blog_link.blogLocation', [0]) + ->get() + ->toArray(); + $this->data['blogSort'] = DB::table('blog_sort') + ->orderBy('blog_sort.sort') + ->get() + ->toArray(); + $this->data['blogColor'] = DB::table('blog_color') + ->orderBy('id') + ->get() + ->toArray(); return view('function.link', $this->data); } - private function getFriendsLink(array &$data): void - { - $data['blogLink'] = DB::table('blog_link')->whereNotIn('blog_link.blogLocation', [0])->get()->toArray(); - $data['blogSort'] = DB::table('blog_sort')->orderBy('blog_sort.sort')->get()->toArray(); - } - protected function viewMakeFriend(): Factory|View|Application { $this->data['webSubTitle'] = '添加友链'; diff --git a/resources/views/function/link.blade.php b/resources/views/function/link.blade.php index 9679d47..f163147 100644 --- a/resources/views/function/link.blade.php +++ b/resources/views/function/link.blade.php @@ -23,14 +23,19 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat @foreach($blogSort as $valueSort)
{!! $valueSort->title !!}
- @if(!empty($valueSort->description))
{{ $valueSort->description }}
@endif + @if(!empty($valueSort->description)) +
{{ $valueSort->description }}
+ @endif
@foreach($blogLink as $valueLink) @if($valueLink->blogLocation == $valueSort->id)
+ class="flex p-2 hover:bg-gray-100 bg-white border-2 {{ $blogColor[$valueLink->blogSetColor-1]->colorLightType }} rounded-lg + shadow-lg sm:p-4 + dark:bg-gray-800 + dark:hover:bg-gray-700 dark:border-gray-700 grid-cols-2 m-1"> Date: Sat, 8 Jul 2023 17:59:17 +0800 Subject: [PATCH 02/24] =?UTF-8?q?EditFeature=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E9=80=89=E6=8B=A9=E7=9A=84=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改内容显示禁止选择内容配置 Signed-off-by: XiaoLFeng --- resources/views/function/edit-friend.blade.php | 3 ++- resources/views/function/make-friend.blade.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/function/edit-friend.blade.php b/resources/views/function/edit-friend.blade.php index e01ef71..a4df03b 100644 --- a/resources/views/function/edit-friend.blade.php +++ b/resources/views/function/edit-friend.blade.php @@ -213,7 +213,8 @@ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus: @else @foreach($blogColor as $blogValue) + @if($blogValue->id == $blog->blogSetColor)selected @endif @if($blogValue->onlyAdminUse)disabled @endif>{!! + $blogValue->comment !!} @endforeach @endif diff --git a/resources/views/function/make-friend.blade.php b/resources/views/function/make-friend.blade.php index 05383bd..f2c6317 100644 --- a/resources/views/function/make-friend.blade.php +++ b/resources/views/function/make-friend.blade.php @@ -152,13 +152,14 @@ class="w-16 h-16 p-1 rounded-full ring-2 ring-gray-300 dark:ring-gray-500 me-2 s
- @if(empty($blogColor[0])) @else @foreach($blogColor as $blogValue) - + @endforeach @endif -- 2.43.0 From 564ba06adab5c5cbad0b907e934af743b7e5938f Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 8 Jul 2023 17:59:17 +0800 Subject: [PATCH 03/24] =?UTF-8?q?EditFeature=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E9=80=89=E6=8B=A9=E7=9A=84=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改内容显示禁止选择内容配置 Signed-off-by: XiaoLFeng --- resources/views/function/edit-friend.blade.php | 3 ++- resources/views/function/make-friend.blade.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/function/edit-friend.blade.php b/resources/views/function/edit-friend.blade.php index e01ef71..e28bf74 100644 --- a/resources/views/function/edit-friend.blade.php +++ b/resources/views/function/edit-friend.blade.php @@ -213,7 +213,8 @@ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus: @else @foreach($blogColor as $blogValue) + @if($blogValue->id == $blog->blogSetColor)selected @endif @if($blogValue->onlyAdminUse)disabled @endif> + {!! $blogValue->comment !!} @endforeach @endif diff --git a/resources/views/function/make-friend.blade.php b/resources/views/function/make-friend.blade.php index 05383bd..f2c6317 100644 --- a/resources/views/function/make-friend.blade.php +++ b/resources/views/function/make-friend.blade.php @@ -152,13 +152,14 @@ class="w-16 h-16 p-1 rounded-full ring-2 ring-gray-300 dark:ring-gray-500 me-2 s
- @if(empty($blogColor[0])) @else @foreach($blogColor as $blogValue) - + @endforeach @endif -- 2.43.0 From 6f759ced2952462d63abdd93bed159ea09c09d16 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sun, 9 Jul 2023 10:36:54 +0800 Subject: [PATCH 04/24] =?UTF-8?q?EditFeature=EF=BC=9A=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理数据编辑修改内容 Signed-off-by: XiaoLFeng --- app/Http/Controllers/DataBase.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/DataBase.php b/app/Http/Controllers/DataBase.php index fc73829..bfce5eb 100644 --- a/app/Http/Controllers/DataBase.php +++ b/app/Http/Controllers/DataBase.php @@ -21,6 +21,10 @@ public function __construct() ->toArray(); foreach ($result as $value) { $value->blog_rss_judge ? $value->blog_rss_judge = 1 : $value->blog_rss_judge = 0; + if ($value->blog_sel_color == 8) $value->blog_sel_color = 6; + if ($value->blog_sel_color == 2) $value->blog_sel_color = 8; + if ($value->blog_sel_color == 7) $value->blog_sel_color = 4; + if ($value->blog_sel_color == 5) $value->blog_sel_color = 3; DB::table('blog_link') ->insert([ 'blogName' => $value->blog_name, -- 2.43.0 From 1963214d14f3d413bbb1e74dc0a4fc5d5e9faec1 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sun, 9 Jul 2023 10:55:48 +0800 Subject: [PATCH 05/24] =?UTF-8?q?AddFeature=EF=BC=9A=E6=B7=BB=E5=8A=A0Tool?= =?UTF-8?q?tip=E6=98=BE=E7=A4=BA=E5=8F=8B=E9=93=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在链接处添加 data-tooltip-target 添加内容 Signed-off-by: XiaoLFeng --- resources/views/function/link.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/views/function/link.blade.php b/resources/views/function/link.blade.php index f163147..5bc93c4 100644 --- a/resources/views/function/link.blade.php +++ b/resources/views/function/link.blade.php @@ -30,7 +30,12 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat
@foreach($blogLink as $valueLink) @if($valueLink->blogLocation == $valueSort->id) - + + - + + @@ -422,13 +502,25 @@ function ajax() { data: $('#FormData').serialize(), url: '@if($subDescriptionForLine == '友链修改') {{ route('api.link.console.edit') }} @else {{ route('api.link.console.check') }} @endif', dataType: "json", + beforeSend: function () { + $('#SubmitSend').prop('disabled', true).removeClass('bg-green-500').addClass('bg-green-600') + .html('' + + '正在操作'); + $('#SubmitRefuse').prop('disabled', true).removeClass('bg-red-500').addClass('bg-red-600'); + }, success: function (returnData) { if (returnData.output === "Success") { + $('#SubmitSend').html('操作成功') + Toast.toggle('操作成功', ''); setTimeout(function () { location.href = '{{ route('console.friends-link.list') }}'; }, 3000); } else { + $('#SubmitSend').html('@if($subDescriptionForLine == '友链修改')提交修改@else审核通过@endif') + .prop('disabled', false).removeClass('bg-green-600').addClass('bg-green-500'); + $('#SubmitRefuse').html('@if($subDescriptionForLine == '友链修改')删除友链@else审核拒绝@endif') + .prop('disabled', false).removeClass('bg-red-600').addClass('bg-red-500'); Toast('未知错误', ''); } }, @@ -443,6 +535,58 @@ function ajax() { } else { Toast.toggle('未知错误', ''); } + $('#SubmitSend').html('@if($subDescriptionForLine == '友链修改')提交修改@else审核通过@endif') + .prop('disabled', false).removeClass('bg-green-600').addClass('bg-green-500'); + $('#SubmitRefuse').html('@if($subDescriptionForLine == '友链修改')删除友链@else审核拒绝@endif') + .prop('disabled', false).removeClass('bg-red-600').addClass('bg-red-500'); + } + }); + } + + function cancel() { + $.ajax({ + async: true, + method: "POST", + data: $('#FormDataCancel').serialize(), + url: '@if($subDescriptionForLine == '友链修改') {{ route('api.link.console.delete') }} @else {{ route('api.link.console.check-fail') }} @endif', + dataType: "json", + beforeSend: function () { + $('#SubmitSend').prop('disabled', true).removeClass('bg-green-500').addClass('bg-green-600'); + $('#SubmitRefuse').prop('disabled', true).removeClass('bg-red-500').addClass('bg-red-600') + .html('' + + '正在操作'); + }, + success: function (returnData) { + $('#SubmitRefuse').html('操作成功') + + if (returnData.output === "Success") { + Toast.toggle('操作成功', ''); + setTimeout(function () { + location.href = '{{ route('console.friends-link.list') }}'; + }, 3000); + } else { + Toast('未知错误', ''); + $('#SubmitSend').html('@if($subDescriptionForLine == '友链修改')提交修改@else审核通过@endif') + .prop('disabled', false).removeClass('bg-green-600').addClass('bg-green-500'); + $('#SubmitRefuse').html('@if($subDescriptionForLine == '友链修改')删除友链@else审核拒绝@endif') + .prop('disabled', false).removeClass('bg-red-600').addClass('bg-red-500'); + } + }, + error: function (returnData) { + Toast.set('其他错误', ''); + if (returnData.responseJSON.output === 'DataFormatError') { + for (let key in Enum) { + if (returnData.responseJSON.data.errorSingle.info === key) { + Toast.toggle(Enum[key] + '错误,注意格式', ''); + } + } + } else { + Toast.toggle('未知错误', ''); + } + $('#SubmitSend').html('@if($subDescriptionForLine == '友链修改')提交修改@else审核通过@endif') + .prop('disabled', false).removeClass('bg-green-600').addClass('bg-green-500'); + $('#SubmitRefuse').html('@if($subDescriptionForLine == '友链修改')删除友链@else审核拒绝@endif') + .prop('disabled', false).removeClass('bg-red-600').addClass('bg-red-500'); } }); } diff --git a/resources/views/mail/link-console-delete.blade.php b/resources/views/mail/link-console-delete.blade.php new file mode 100644 index 0000000..5725d51 --- /dev/null +++ b/resources/views/mail/link-console-delete.blade.php @@ -0,0 +1,55 @@ + + + + + Mail + + + + + + + + + + + + +
{{ env('APP_NAME') }}
+ + + + + + + + + + +
+ 时间: {{ date('Y-m-d H:i:s') }} +
+ Dear. {{ $userEmail }} +
+ 您好 {{ $userBlog }} + 的站长:{{ $userEmail }}
+ 您在本博客({{ env('APP_NAME') }})的友链已被删除!
+
+ 此邮件为特此提醒,若对此删除有疑问请询问管理员
+ {{ $sqlEmail }} +
+
+ + + + +
+ © 2022 - {{ date('Y') }}. {{ env('APP_NAME') }} All Rights Reserved.
+ 本邮件为自动发出,请勿直接回复 +
+
+ + + + diff --git a/resources/views/mail/link-console-refuse-verify.blade.php b/resources/views/mail/link-console-refuse-verify.blade.php new file mode 100644 index 0000000..33e9d22 --- /dev/null +++ b/resources/views/mail/link-console-refuse-verify.blade.php @@ -0,0 +1,56 @@ + + + + + Mail + + + + + + + + + + + + +
{{ env('APP_NAME') }}
+ + + + + + + + + + +
+ 时间: {{ date('Y-m-d H:i:s') }} +
+ Dear. {{ $blog[0]->blogOwnEmail }} +
+ 您好 {{ $blog[0]->blogName }} + 的站长:{{ $userEmail }}
+ 您在本博客({{ env('APP_NAME') }})申请的友链 + 审核通过!
+ @if(!empty($reason)) +
未通过原因如下:
{{ $reason }} + @endif +
+
+ + + + +
+ © 2022 - {{ date('Y') }}. {{ env('APP_NAME') }} All Rights Reserved.
+ 本邮件为自动发出,请勿直接回复 +
+
+ + + + diff --git a/routes/api.php b/routes/api.php index 85bc9c9..a207354 100644 --- a/routes/api.php +++ b/routes/api.php @@ -8,7 +8,6 @@ use App\Http\Controllers\Authme; use App\Http\Controllers\Console\Link as ConsoleLink; use App\Http\Controllers\Function\Link; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Route; @@ -24,10 +23,6 @@ | */ -Route::middleware('auth')->get('/user', function (Request $request) { - return $request->user(); -}); - // 登陆类 Route::prefix('auth')->group(function () { Route::post('login',[Authme::class,'Login'])->name('api.auth.login'); @@ -44,6 +39,8 @@ Route::post('add', [ConsoleLink::class, 'apiConsoleAdd'])->name('api.link.console.add'); Route::post('edit', [ConsoleLink::class, 'apiConsoleEdit'])->name('api.link.console.edit'); Route::post('check', [ConsoleLink::class, 'apiConsoleCheck'])->name('api.link.console.check'); + Route::post('check-fail', [ConsoleLink::class, 'apiConsoleCheckFail'])->name('api.link.console.check-fail'); + Route::post('delete', [ConsoleLink::class, 'apiConsoleDelete'])->name('api.link.console.delete'); }); Route::prefix('custom')->group(function () { Route::post('add', [Link::class, 'apiCustomAdd'])->name('api.link.custom.add'); -- 2.43.0