From bc82696027f2272c7f47aadac3607637859ec981 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Sat, 8 Jul 2023 17:35:54 +0800
Subject: [PATCH] =?UTF-8?q?EditFeature=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=98=BE?=
 =?UTF-8?q?=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 <gm@x-lf.cn>
---
 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)
             <div class="mx-auto mt-28 mb-3 max-w-4xl grid grid-cols-1 px-2">
                 <div class="text-2xl text-bold">{!! $valueSort->title !!}</div>
-                @if(!empty($valueSort->description))<div class="text-gray-500">{{ $valueSort->description }}</div> @endif
+                @if(!empty($valueSort->description))
+                    <div class="text-gray-500">{{ $valueSort->description }}</div>
+                @endif
             </div>
             <div class="mx-auto max-w-4xl mb-3 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4">
                 @foreach($blogLink as $valueLink)
                     @if($valueLink->blogLocation == $valueSort->id)
                         <a href="{{ $valueLink->blogUrl }}" target="_blank">
                             <div
-                                class="flex p-2 hover:bg-gray-100 bg-white border border-grey-200 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">
+                                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">
                                 <img id="Lazy"
                                      class="w-16 h-16 p-1 rounded-full ring-2 ring-gray-300 dark:ring-gray-500 me-2 sm:me-4"
                                      src="{{ asset('images/avatar.png') }}" data-src="{{ $valueLink->blogIcon }}"