diff --git a/app/Http/Controllers/Console/Link.php b/app/Http/Controllers/Console/Link.php index d2c1393..abb97bf 100644 --- a/app/Http/Controllers/Console/Link.php +++ b/app/Http/Controllers/Console/Link.php @@ -148,21 +148,14 @@ protected function viewColor(): Factory|View|Application return view('console.friends-link.color', $this->data); } - public function apiConsoleAdd() + public function apiConsoleAdd(Request $request): JsonResponse { // 检查数据 - - } - - public function apiConsoleEdit(Request $request): JsonResponse - { - // 检查用户是否登录 if (Auth::check()) { if (Auth::user()->admin) { // 处理获取数据 $dataCheck = Validator::make($request->all(), [ - 'userId' => 'required|int', - 'userEmail' => 'required|email', + 'userEmail' => 'email', 'userServerHost' => 'required|string', 'userBlog' => 'required|string', 'userUrl' => 'required|regex:#[a-zA-z]+://[^\s]*#', @@ -196,6 +189,98 @@ public function apiConsoleEdit(Request $request): JsonResponse ], ]; } else { + if (empty($request->userEmail)) $request->userEmail = null; + if (empty($request->checkRssJudge)) $request->checkRssJudge = 0; + if (empty($request->userRss)) $request->userRss = null; + // 更新数据库 + DB::table('blog_link') + ->insert([ + 'blogOwnEmail' => $request->userEmail, + 'blogServerHost' => $request->userServerHost, + 'blogName' => $request->userBlog, + 'blogUrl' => $request->userUrl, + 'blogDescription' => $request->userDescription, + 'blogIcon' => $request->userIcon, + 'blogRssJudge' => $request->checkRssJudge, + 'blogRSS' => $request->userRss, + 'blogSetColor' => $request->userSelColor, + 'blogLocation' => $request->userLocation, + 'created_at' => date('Y-m-d H:i:s'), + ]); + $returnData = [ + 'output' => 'Success', + 'code' => 200, + 'data' => [ + 'message' => '数据插入成功', + ], + ]; + } + } else { + $returnData = [ + 'output' => 'NoPermission', + 'code' => 403, + 'data' => [ + 'message' => '没有权限', + ], + ]; + } + } else { + $returnData = [ + 'output' => 'PleaseLogin', + 'code' => 403, + 'data' => [ + 'message' => '请登录', + ], + ]; + } + return Response::json($returnData, $returnData['code']); + } + + public function apiConsoleEdit(Request $request): JsonResponse + { + // 检查用户是否登录 + if (Auth::check()) { + if (Auth::user()->admin) { + // 处理获取数据 + $dataCheck = Validator::make($request->all(), [ + 'userId' => 'required|int', + 'userEmail' => 'email', + 'userServerHost' => 'required|string', + 'userBlog' => 'required|string', + 'userUrl' => 'required|regex:#[a-zA-z]+://[^\s]*#', + 'userDescription' => 'required|string', + 'userIcon' => 'required|regex:#[a-zA-z]+://[^\s]*#', + 'checkRssJudge' => 'boolean', + 'userRss' => 'string|regex:#[a-zA-z]+://[^\s]*#', + 'userSelColor' => 'required|int', + 'userLocation' => 'required|string', + ]); + if ($dataCheck->fails()) { + $errorType = array_keys($dataCheck->failed()); + $i = 0; + foreach ($dataCheck->failed() as $valueData) { + $errorInfo[$errorType[$i]] = array_keys($valueData); + if ($i == 0) { + $errorSingle = [ + 'info' => $errorType[$i], + 'need' => $errorInfo[$errorType[$i]], + ]; + } + $i++; + } + $returnData = [ + 'output' => 'DataFormatError', + 'code' => 403, + 'data' => [ + 'message' => '输入内容有错误', + 'errorSingle' => $errorSingle, + 'error' => $errorInfo, + ], + ]; + } else { + if (empty($request->userEmail)) $request->userEmail = null; + if (empty($request->checkRssJudge)) $request->checkRssJudge = 0; + if (empty($request->userRss)) $request->userRss = null; // 更新数据库 DB::table('blog_link') ->where([['id', '=', $request->userId]]) diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index a714aa6..2d79b83 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -99,6 +99,8 @@ public function apiCustomAdd(HttpRequest $request): JsonResponse ])->get()->toArray(); if (empty($resultBlog)) { + if (empty($request->checkRssJudge)) $request->checkRssJudge = 0; + if (empty($request->userRss)) $request->userRss = null; // 数据写入数据库 $insertData = DB::table('blog_link') ->insert([ diff --git a/app/Http/Controllers/Index.php b/app/Http/Controllers/Index.php index 23bf6c1..fd6aff8 100644 --- a/app/Http/Controllers/Index.php +++ b/app/Http/Controllers/Index.php @@ -25,7 +25,7 @@ public function __construct() 'webDescription' => empty($tempStorage = DB::table('info')->find(2)->data) ? '未定义副标题' : $tempStorage, 'webSubTitle' => empty($tempStorage = DB::table('info')->find(3)->data) ? '未定义小标题' : $tempStorage, 'webSubTitleDescription' => empty($tempStorage = DB::table('info')->find(4)->data) ? '未定义小标题内容' : $tempStorage, - 'webIcon' => empty($tempStorage = DB::table('info')->find(5)->data) ? asset('images/logo.jpg') : $tempStorage, + 'webIcon' => empty($tempStorage = DB::table('info')->find(5)->data) ? asset('images/favicon.png') : $tempStorage, 'webHeader' => DB::table('info')->find(7)->data, 'webFooter' => DB::table('info')->find(8)->data, 'webKeyword' => empty($tempStorage = DB::table('info')->find(6)->data) ? '筱锋,凌中的锋雨,xiao_lfeng' : $tempStorage, diff --git a/resources/images/favicon.png b/resources/images/favicon.png new file mode 100644 index 0000000..b4a0b2f Binary files /dev/null and b/resources/images/favicon.png differ diff --git a/resources/views/console/friends-link/add.blade.php b/resources/views/console/friends-link/add.blade.php new file mode 100644 index 0000000..ef04abe --- /dev/null +++ b/resources/views/console/friends-link/add.blade.php @@ -0,0 +1,434 @@ + + + + + + + + + @include('modules.head') + {!! $webHeader !!} + + + + + +@include('console.modules.aside') + +
+
+ @include('console.modules.personal') +
+
友链添加
+
+
+
+
+

当前友链 条

+

超级友链 条

+

待审友链 条

+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+
+
+
+ +
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+
+ + +
+
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+
+ +
+
+ + +
+
+ +
+ +
+
+
+
+
+
+ + +
+
+ + + +
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ + 参考样式 +
+
+ +
+ Bordered avatar +
+

标题

+

副标题

+
+
+
+
+ +
+ Bordered avatar +
+

标题

+

副标题

+
+
+
+
+
+
+
+
+
+ + + + + + + diff --git a/resources/views/modules/head.blade.php b/resources/views/modules/head.blade.php index af08ffb..31c29aa 100644 --- a/resources/views/modules/head.blade.php +++ b/resources/views/modules/head.blade.php @@ -6,5 +6,9 @@ - + + + + + diff --git a/webpack.mix.js b/webpack.mix.js index 1bd471e..4facf55 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -20,4 +20,5 @@ const mix = require('laravel-mix'); mix.js('resources/js/app.js', 'public/js') .postCss('resources/css/app.css', 'public/css', [ require("tailwindcss") - ]); + ]) + .copy('resources/images/*', 'public/images');