From 516fb71b52f2c110de6427b91011f76d461115d4 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 15 Dec 2022 21:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=B9=95=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DanmakuQueryController.php    |  2 +-
 resources/views/common/footer.blade.php       | 10 +--
 resources/views/common/header.blade.php       |  4 +-
 resources/views/danmaku/index.blade.php       | 82 ++++++++++---------
 resources/views/index.blade.php               |  4 +-
 5 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/app/Http/Controllers/DanmakuQueryController.php b/app/Http/Controllers/DanmakuQueryController.php
index 4d9b769..4beb846 100644
--- a/app/Http/Controllers/DanmakuQueryController.php
+++ b/app/Http/Controllers/DanmakuQueryController.php
@@ -13,7 +13,7 @@ class DanmakuQueryController extends BaseController
     public function index()
     {
         $video_list = Videos::query()
-            ->withCount("danmakus", "bilibili_danmakus", "ixigua_danmakus", "douyin_danmakus")
+            ->withCount("danmakus", "bilibili_danmakus", "ixigua_danmakus", "douyin_danmakus", "programs")
             ->orderByDesc("created_at")
             ->paginate(10)->withQueryString();
         return view("danmaku.index", [
diff --git a/resources/views/common/footer.blade.php b/resources/views/common/footer.blade.php
index bd7cd1c..6c9634e 100644
--- a/resources/views/common/footer.blade.php
+++ b/resources/views/common/footer.blade.php
@@ -1,9 +1,9 @@
-<footer class="bg-white dark:bg-gray-800 pt-4 pb-8 xl:pt-8">
+<footer class="mt-4 bg-gray-100 dark:bg-gray-800 pb-8 xl:pt-8">
     <div class="max-w-screen-lg px-4 mx-auto text-gray-400 xl:max-w-screen-xl sm:px-6 md:px-8 dark:text-gray-300">
         <ul class="flex flex-wrap justify-center pb-8 text-lg font-light">
             <li class="w-1/2 md:w-1/4">
                 <div class="text-center">
-                    <h2 class="text-gray-500 dark:text-gray-200 text-md mb-4">
+                    <h2 class="text-gray-500 dark:text-gray-200 text-md my-4">
                         永恒de草薙
                     </h2>
                     <ul>
@@ -18,7 +18,7 @@
             </li>
             <li class="w-1/2 md:w-1/4">
                 <div class="text-center">
-                    <h2 class="text-gray-500 dark:text-gray-200 text-md mb-4">
+                    <h2 class="text-gray-500 dark:text-gray-200 text-md my-4">
                         课代表们
                     </h2>
                     <ul>
@@ -33,7 +33,7 @@
             </li>
             <li class="w-1/2 md:w-1/4">
                 <div class="text-center">
-                    <h2 class="text-gray-500 dark:text-gray-200 text-md mb-4">
+                    <h2 class="text-gray-500 dark:text-gray-200 text-md my-4">
                         录播文件
                     </h2>
                     <ul>
@@ -54,7 +54,7 @@
             </li>
             <li class="w-1/2 md:w-1/4">
                 <div class="text-center">
-                    <h2 class="text-gray-500 dark:text-gray-200 text-md mb-4">
+                    <h2 class="text-gray-500 dark:text-gray-200 text-md my-4">
                         杂项
                     </h2>
                     <ul>
diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index dfb974c..534d931 100644
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -18,7 +18,7 @@
                 <div class="hidden sm:ml-6 md:block">
                     <div class="flex space-x-4">
                         <a class="{{ (request()->is('comments', 'video/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} px-3 py-2 rounded-md text-sm font-medium" href="/comments">节目单查询</a>
-                        <a class="{{ (request()->is('danmakus', 'danmakus/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} px-3 py-2 rounded-md text-sm font-medium" href="/danmakus">直播弹幕查询</a>
+                        <a class="{{ (request()->is('danmakus', 'danmakus/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} px-3 py-2 rounded-md text-sm font-medium" href="/danmakus">稿件查询</a>
                         <a class="{{ (request()->is('programs', '/', 'programs/*/video')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} px-3 py-2 rounded-md text-sm font-medium" href="/programs" title="数据不全，待补充">节目查询</a>
                         @auth("web")
                             <a class="{{ (request()->is('programs/construct', 'programs/construct/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} px-3 py-2 rounded-md text-sm font-medium" href="/programs/construct">节目建设</a>
@@ -47,7 +47,7 @@
     <div class="md:hidden" id="_mobile_menu" style="display: none">
         <div class="space-y-1 px-2 pt-2 pb-3">
             <a class="{{ (request()->is('comments', 'video/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} block px-3 py-2 rounded-md text-base font-medium" href="/comments">节目单查询</a>
-            <a class="{{ (request()->is('danmakus', 'danmakus/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} block px-3 py-2 rounded-md text-base font-medium" href="/danmakus">直播弹幕查询</a>
+            <a class="{{ (request()->is('danmakus', 'danmakus/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} block px-3 py-2 rounded-md text-base font-medium" href="/danmakus">稿件查询</a>
             <a class="{{ (request()->is('programs', '/', 'programs/*/video')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} block px-3 py-2 rounded-md text-base font-medium" href="/programs" title="数据不全，待补充">节目查询</a>
             @auth("web")
                 <a class="{{ (request()->is('programs/construct', 'programs/construct/*')) ? 'bg-gray-900 text-white' : 'text-gray-700 hover:bg-gray-700 hover:text-white' }} block px-3 py-2 rounded-md text-base font-medium" href="/programs/construct">节目建设</a>
diff --git a/resources/views/danmaku/index.blade.php b/resources/views/danmaku/index.blade.php
index 307c25e..a46c5b4 100644
--- a/resources/views/danmaku/index.blade.php
+++ b/resources/views/danmaku/index.blade.php
@@ -1,51 +1,57 @@
 <html lang="zh">
 <head>
     <meta charset="UTF-8">
-    <title>录播弹幕查询</title>
+    <title>稿件查询</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="{{ mix('/css/app.css') }}" rel="stylesheet"/>
 </head>
 <body>
     @include("common.header")
-    <table class="table-auto border-collapse w-full lg:border lg:border-black">
-        <thead>
-        <tr class="border border-black sticky bg-white lg:static top-0 left-0 right-0">
-            <th class="border border-black">视频标题</th>
-            <th class="border border-black">弹幕条数</th>
-            <th class="border border-black hidden lg:table-cell">操作</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach($video_list as $video)
-            <tr>
-                <td class="border text-sm lg:text-current">
-                    @if($video->danmakus_count > 0)
-                        <a class="text-blue-600 lg:text-current underline lg:no-underline break-all" href="/danmakus/{{$video->bvid}}">{{$video->title}}</a>
-                        @if($video->bilibili_danmakus_count > 0)
-                            <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/bilibili.ico" alt="B站" title="包含B站直播弹幕">
-                        @endif
-                        @if($video->ixigua_danmakus_count > 0)
-                            <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/ixigua.ico" alt="西瓜视频" title="包含西瓜视频直播弹幕">
-                        @endif
-                        @if($video->douyin_danmakus_count > 0)
-                            <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/douyin.ico" alt="抖音" title="包含抖音直播弹幕">
-                        @endif
-                    @else
-                        {{$video->title}}
+    @foreach($video_list as $video)
+        <div class="max-w xl:max-w-5xl lg:max-w-2xl md:max-w-lg mx-2 md:mx-auto px-2 md:px-4 py-4 bg-white border border-gray-200 rounded-lg shadow-md my-4 dark:bg-gray-800">
+            <div>
+                <a href="/video/{{$video->id}}" class="text-2xl font-bold text-gray-700 dark:text-white hover:text-gray-600 dark:hover:text-gray-200 hover:underline" tabindex="0" role="link">{{$video->title}}</a>
+                <div class="px-2 md:px-4 lg:px-8 mt-2 flex items-center justify-between">
+                    <span class="text-sm font-light text-gray-600 dark:text-gray-400 hidden md:block">投稿时间：{{$video->created_at}}</span>
+                </div>
+                <p class="px-2 md:px-4 lg:px-8 mt-2 text-gray-600 dark:text-gray-300">视频时长：{{$video->total_duration}}</p>
+                @if($video->danmakus_count > 0)
+                <p class="px-2 md:px-4 lg:px-8 mt-2 text-gray-600 dark:text-gray-300">
+                    弹幕数量：{{$video->danmakus_count}}
+                    @if($video->bilibili_danmakus_count > 0)
+                        <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/bilibili.ico" alt="B站" title="包含B站直播弹幕">
                     @endif
-                </td>
-                <td class="border">{{$video->danmakus_count}}</td>
-                <td class="border hidden lg:table-cell">
-                    @if($video->danmakus_count > 0)
-                        <a class="text-blue-600 underline" href="/danmakus/{{$video->bvid}}">详情</a>
-                    @else
-                        无弹幕
+                    @if($video->ixigua_danmakus_count > 0)
+                        <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/ixigua.ico" alt="西瓜视频" title="包含西瓜视频直播弹幕">
                     @endif
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
+                    @if($video->douyin_danmakus_count > 0)
+                        <img class="w-4 h-4 inline-block" src="https://cdn.jerryyan.net/luboimg/douyin.ico" alt="抖音" title="包含抖音直播弹幕">
+                    @endif
+                </p>
+                @endif
+                @if($video->programs_count > 0)
+                <p class="px-2 md:px-4 lg:px-8 mt-2 text-gray-600 dark:text-gray-300">节目数量：{{$video->programs_count}}</p>
+                @endif
+            </div>
+
+            <div class="flex items-center gap-4 mt-4">
+                <a href="https://www.bilibili.com/video/{{$video->bvid}}" target="_blank" class="inline-flex text-blue-600 dark:text-blue-400 hover:underline" tabindex="0" role="link">
+                    去B站浏览
+                    <svg class="w-5 h-5 ml-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg>
+                </a>
+                @if($video->danmakus_count > 0)
+                <a href="/danmakus/{{$video->bvid}}" class="inline-flex text-blue-600 dark:text-blue-400 hover:underline" tabindex="0" role="link">
+                    直播弹幕明细
+                </a>
+                @endif
+                @if($video->programs_count > 0)
+                <a href="/video/{{$video->id}}" class="inline-flex text-blue-600 dark:text-blue-400 hover:underline" tabindex="0" role="link">
+                    节目列表
+                </a>
+                @endif
+            </div>
+        </div>
+    @endforeach
     {{$video_list->links()}}
     @include("common.footer")
 </body>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index e92e0a7..031bebc 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -13,7 +13,7 @@
     <input class="border border-black" type="submit">
 </form>
 @foreach($comments as $comment)
-    <div class="max-w xl:max-w-5xl lg:max-w-2xl md:max-w-lg mx-2 md:mx-auto px-1 sm:px-2 md:px-4 py-4 bg-white border border-gray-200 rounded-lg shadow-md my-4 dark:bg-gray-800">
+    <div class="max-w xl:max-w-5xl lg:max-w-2xl md:max-w-lg mx-2 md:mx-auto px-2 md:px-4 py-4 bg-white border border-gray-200 rounded-lg shadow-md my-4 dark:bg-gray-800">
         <div>
             <a href="/video/{{$comment->video->id}}" class="text-2xl font-bold text-gray-700 dark:text-white hover:text-gray-600 dark:hover:text-gray-200 hover:underline" tabindex="0" role="link">{{$comment->video->title}}</a>
             <div class="px-2 md:px-4 lg:px-8 mt-2 flex items-center justify-between">
@@ -25,7 +25,7 @@
 
 
         <div class="flex items-center justify-between mt-4">
-            <a href="https://space.bilibili.com/{{$comment->mid}}" target="_blank" class="inline-flex text-blue-600 dark:text-blue-400 hover:underline" tabindex="0" role="link">
+            <a href="https://www.bilibili.com/video/{{$comment->video->bvid}}" target="_blank" class="inline-flex text-blue-600 dark:text-blue-400 hover:underline" tabindex="0" role="link">
                 去B站浏览
                 <svg class="w-5 h-5 ml-2" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg>
             </a>