From 6f0a6d98609c61823900e79211a53554ea1db5a8 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?= Date: Thu, 16 Dec 2021 15:42:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=82=A3=E3=82=B9=E3=82=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Peertube/Videos/Overview.php | 15 ++++++++------- .../pages/peertube/videos/overview.blade.php | 5 +++++ .../peertube/parts/videos/categories.blade.php | 8 ++++++++ .../peertube/parts/videos/channels.blade.php | 13 +++++++++++++ .../peertube/parts/videos/tags.blade.php | 8 ++++++++ .../peertube/videos/overview.blade.php | 18 ++++++++++++++++++ routes/view/peertube.php | 2 +- 7 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 resources/views/pages/peertube/videos/overview.blade.php create mode 100644 resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php create mode 100644 resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php create mode 100644 resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php create mode 100644 resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php diff --git a/app/Http/Controllers/Peertube/Videos/Overview.php b/app/Http/Controllers/Peertube/Videos/Overview.php index a0674cb..0e56aa9 100644 --- a/app/Http/Controllers/Peertube/Videos/Overview.php +++ b/app/Http/Controllers/Peertube/Videos/Overview.php @@ -13,17 +13,18 @@ class Overview extends Common { $this->common = new Common; } - public function index () { + public function index ($page=1) { $res = [ - 'page' => 'dummy', + 'page' => 'videoslist', + 'paginate' => $page, + 'pagetotal' => 500, 'userinfo' => $this->common->user, ]; - // $res['owner'] = $this->getOwner($id); - return view('pages.peertube.notyet', ['res' => $res]); + $res['video'] = $this->getVideo($page); + return view('pages.peertube.videos.overview', ['res' => $res]); } - function getOwner ($id) { - //https://video.076.ne.jp/api/v1/overviews/videos?page=1 - return $this->ptapi_get('/api/v1/accounts/'.$id); + function getVideo ($page) { + return $this->ptapi_get('/api/v1/overviews/videos?page='.$page); } } diff --git a/resources/views/pages/peertube/videos/overview.blade.php b/resources/views/pages/peertube/videos/overview.blade.php new file mode 100644 index 0000000..bd6d6dc --- /dev/null +++ b/resources/views/pages/peertube/videos/overview.blade.php @@ -0,0 +1,5 @@ +@extends('theme.'.env('THEME').'.peertube') + +@section('content') + @include('theme.'.env('THEME').'.component.peertube.videos.overview') +@endsection diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php new file mode 100644 index 0000000..0a05a85 --- /dev/null +++ b/resources/views/theme/techsuwa/component/peertube/parts/videos/categories.blade.php @@ -0,0 +1,8 @@ +
+

+ {{ $res['video']->categories[0]->category->label }} +

+ @foreach ($res['video']->categories[0]->videos as $k => $v) + @include('theme.'.env('THEME').'.component.peertube.parts.common.videominature') + @endforeach +
\ No newline at end of file diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php new file mode 100644 index 0000000..238526f --- /dev/null +++ b/resources/views/theme/techsuwa/component/peertube/parts/videos/channels.blade.php @@ -0,0 +1,13 @@ +
+
+ + + チャンネルのアバター + +

{{ $res['video']->channels[0]->channel->displayName }}

+ +
+ @foreach ($res['video']->channels[0]->videos as $k => $v) + @include('theme.'.env('THEME').'.component.peertube.parts.common.videominature') + @endforeach +
\ No newline at end of file diff --git a/resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php new file mode 100644 index 0000000..31663ac --- /dev/null +++ b/resources/views/theme/techsuwa/component/peertube/parts/videos/tags.blade.php @@ -0,0 +1,8 @@ +
+

+ {{ '#'.$res['video']->tags[0]->tag }} +

+ @foreach ($res['video']->tags[0]->videos as $k => $v) + @include('theme.'.env('THEME').'.component.peertube.parts.common.videominature') + @endforeach +
\ No newline at end of file diff --git a/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php new file mode 100644 index 0000000..8ad476a --- /dev/null +++ b/resources/views/theme/techsuwa/component/peertube/videos/overview.blade.php @@ -0,0 +1,18 @@ +
+
+ + +

ディスカバー

+
+ @if (!empty($res['video']->categories)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.categories') @endif + @if (!empty($res['video']->tags)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.tags') @endif + @if (!empty($res['video']->channels)) @include('theme.'.env('THEME').'.component.peertube.parts.videos.channels') @endif +
+ @include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [ + 'root' => '/peertube/videos/overview' + ]) +
+
+
+ + \ No newline at end of file diff --git a/routes/view/peertube.php b/routes/view/peertube.php index eae8f0b..bdd0d15 100644 --- a/routes/view/peertube.php +++ b/routes/view/peertube.php @@ -36,7 +36,7 @@ Route::group(['prefix' => 'peertube'], function () { Route::group(['prefix' => 'videos'], function () { Route::any('/', 'Peertube\Videos\Local@index'); Route::any('/subscriptions', 'Peertube\Videos\Subscriptions@index'); - Route::any('/overview', 'Peertube\Videos\Overview@index'); + Route::any('/overview/{page?}', 'Peertube\Videos\Overview@index'); Route::any('/trending/{page?}', 'Peertube\Videos\Trending@index'); Route::any('/recently-added/{page?}', 'Peertube\Videos\Recentlyadded@index'); Route::any('/local/{page?}', 'Peertube\Videos\Local@index');