From a7ab28e96a750c95b58c70513773ef4f5f925daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <d@076.ne.jp>
Date: Sat, 12 Dec 2020 19:51:17 +0900
Subject: [PATCH] =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=81=AE=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Video/Prayer.php                 | 1 +
 app/Http/Controllers/Video/VideoTable.php             | 6 +++++-
 app/helpers.php                                       | 2 +-
 resources/views/pages/site/video/prayer.blade.php     | 1 +
 resources/views/pages/site/video/videotable.blade.php | 7 ++++++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Video/Prayer.php b/app/Http/Controllers/Video/Prayer.php
index 387d892..576e39a 100644
--- a/app/Http/Controllers/Video/Prayer.php
+++ b/app/Http/Controllers/Video/Prayer.php
@@ -21,6 +21,7 @@ class Prayer {
     $game = DB::table('vid_game')->where('id', $res->game_id)->first();
     if (!$game) return view('pages.site.notfound', ['menu' => $this->menu, 'user' => $this->user]);
 
+    $res->publish_date = date('Y月m月d日', $res->publish_date);
     $res->gametitle = explode('】', $res->title);
     $res->title = $res->gametitle[1];
     $res->gametitle = $res->gametitle[0];
diff --git a/app/Http/Controllers/Video/VideoTable.php b/app/Http/Controllers/Video/VideoTable.php
index 276e870..2d8dcff 100644
--- a/app/Http/Controllers/Video/VideoTable.php
+++ b/app/Http/Controllers/Video/VideoTable.php
@@ -17,10 +17,11 @@ class VideoTable {
   public function index ($slug) {
     $slg = DB::table('vid_game')->select('id', 'name')->where('slug', $slug)->first();
     if (!$slg) return view('pages.site.notfound', ['menu' => $this->menu, 'user' => $this->user]);
-    $res = DB::table('vid_video')->where('game_id', $slg->id)->orderBy('id', 'desc')->get();
+    $res = DB::table('vid_video')->where('game_id', $slg->id)->orderBy('publish_date', 'desc')->get();
     if (!$res) return view('pages.site.notfound', ['menu' => $this->menu, 'user' => $this->user]);
 
     foreach ($res as $r) {
+      $r->publish_date = date('Y月m月d日', $r->publish_date);
       $r->gametitle = explode('】', $r->title);
       $r->title = (isset($r->gametitle[1]) ? $r->gametitle[1] : '');
       $r->gametitle = $r->gametitle[0];
@@ -46,6 +47,8 @@ class VideoTable {
         $frm['title'] = $r->title;
         $frm['vid'] = $r->vid;
         $frm['game_id'] = $r->game_id;
+        $frm['thumbnail'] = $r->thumbnail;
+        $frm['publish_date'] = time();
         $frm['url'] = ($r->url ?: '');
         $frm['youtube'] = ($r->youtube ?: '');
         $frm['twitter'] = ($r->twitter ?: '');
@@ -113,6 +116,7 @@ class VideoTable {
         $frm->title = $r->title;
         $frm->vid = $r->vid;
         $frm->game_id = $r->game_id;
+        $frm->thumbnail = $r->thumbnail;
         $frm->url = ($r->url ?: '');
         $frm->youtube = ($r->youtube ?: '');
         $frm->twitter = ($r->twitter ?: '');
diff --git a/app/helpers.php b/app/helpers.php
index e81aabf..b8a6456 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -56,7 +56,7 @@ function userDetail ($id, $kero=null) {
       }
     }
 
-    $p3->avatar = ($p3->avatar ? '/'.$p3->avatar : '/img/noicon.webp');
+    $p3->avatar = ($p3->avatar ? '/'.$p3->avatar : '/img/noicon.jpg');
     return array('user_id' => $user_id, 'showname' => $showname, 'showcol' => $showcol, 'avatar' => $p3->avatar);
   }
 
diff --git a/resources/views/pages/site/video/prayer.blade.php b/resources/views/pages/site/video/prayer.blade.php
index 53d8339..f8635da 100644
--- a/resources/views/pages/site/video/prayer.blade.php
+++ b/resources/views/pages/site/video/prayer.blade.php
@@ -3,6 +3,7 @@
 @section('content')
 <div class="within">
   <div class="bar">【<a href="/video/{{ $res->slug }}">{{ $res->mgametitle }}</a>{{ $res->gametitle }}】{{ $res->title }}</div>
+  <div class="meta" style="text-align: right;">{{ $res->publish_date }}で公開</div>
   <div class="back">
     <video style="max-width: 813px; width: 100%; height: 458px;" src="{{ $res->url }}" controls></video>
   </div>
diff --git a/resources/views/pages/site/video/videotable.blade.php b/resources/views/pages/site/video/videotable.blade.php
index 8582083..c86823a 100644
--- a/resources/views/pages/site/video/videotable.blade.php
+++ b/resources/views/pages/site/video/videotable.blade.php
@@ -21,7 +21,12 @@
         @foreach ($res as $k => $r)
           <tr>
             <td scope="row">{{ $r->gametitle }}</td>
-            <td scope="row">{{ $r->title }}</td>
+            <td scope="row">
+              <div class="row">
+                @if ($r->thumbnail) <div class="col-2"><img src="{{ $r->thumbnail }}" alt="{{ $r->title }}のサムネ" style="width: 70px;" /></div> @endif
+                <div class="col">{{ $r->title }}<br /><span style="font-size: 8px;">公開日：{{ $r->publish_date }}</span></div>
+              </div>
+            </td>
             <td scope="row">@if ($r->url) <a href="/video/play/{{ $r->vid }}"><img src="/img/play-box.png" class="logo-play" alt="【{{ $r->gametitle }}】{{ $r->title }}"></a> @endif</td>
             <td scope="row">@if ($r->youtube) <a href="{{ $r->youtube }}"><img src="/img/play-box.png" class="logo-play" alt="【{{ $r->gametitle }}】{{ $r->title }}"></a> @endif</td>
             <td scope="row">@if ($r->twitter) <a href="{{ $r->twitter }}"><img src="/img/play-box.png" class="logo-play" alt="【{{ $r->gametitle }}】{{ $r->title }}"></a> @endif</td>