ちょっとFSの変更
このコミットが含まれているのは:
コミット
ecdd27a269
|
@ -28,7 +28,7 @@ class Local extends Common {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getVideo ($start, $count) {
|
function getVideo ($start, $count) {
|
||||||
$get = $this->ptapi_get('/api/v1/videos/?start='.$start.'&count='.$count.'&sort=-publishedAt&filter=local&skipCount=true&nsfw=both');
|
$get = $this->ptapi_get('/api/v1/videos?start='.$start.'&count='.$count.'&sort=-publishedAt&skipCount=true&isLocal=true&nsfw=both');
|
||||||
return $this->vidlist($get);
|
return $this->vidlist($get);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.a')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<div class="root ng-star-inserted">
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.a.info')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.a.links')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.a.channels')
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.c')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.c.head')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.c.links')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,34 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.videos.local')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<my-videos-list>
|
||||||
|
<div class="margin-content">
|
||||||
|
<div class="videos-header">
|
||||||
|
<h1 placement="bottom" container="body" class="title ng-star-inserted"> ローカル動画 </h1>
|
||||||
|
<div class="title-subscription ng-star-inserted">
|
||||||
|
Subscribe to RSS feed "ローカル動画"
|
||||||
|
<my-feed>
|
||||||
|
<div class="feed">
|
||||||
|
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
||||||
|
</my-global-icon>
|
||||||
|
</div>
|
||||||
|
</my-feed>
|
||||||
|
</div>
|
||||||
|
<div class="action-block"></div>
|
||||||
|
</div>
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
||||||
|
'root' => '/peertube/videos/local'
|
||||||
|
])
|
||||||
|
</div>
|
||||||
|
</my-videos-list>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,22 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.videos.overview')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<h1 class="sr-only">ディスカバー</h1>
|
||||||
|
<div class="margin-content">
|
||||||
|
@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
|
||||||
|
<div style="margin-top: 16px;"></div>
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
||||||
|
'root' => '/peertube/videos/overview'
|
||||||
|
])
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,34 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.videos.recentlyadded')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<my-videos-list>
|
||||||
|
<div class="margin-content">
|
||||||
|
<div class="videos-header">
|
||||||
|
<h1 placement="bottom" container="body" class="title ng-star-inserted"> 最近投稿された動画 </h1>
|
||||||
|
<div class="title-subscription ng-star-inserted">
|
||||||
|
Subscribe to RSS feed "最近投稿された動画"
|
||||||
|
<my-feed>
|
||||||
|
<div class="feed">
|
||||||
|
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
||||||
|
</my-global-icon>
|
||||||
|
</div>
|
||||||
|
</my-feed>
|
||||||
|
</div>
|
||||||
|
<div class="action-block"></div>
|
||||||
|
</div>
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
||||||
|
'root' => '/peertube/videos/recently-added'
|
||||||
|
])
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,38 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.videos.trending')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<ng-component class="ng-star-inserted">
|
||||||
|
<my-videos-list>
|
||||||
|
<div class="margin-content">
|
||||||
|
<div class="videos-header">
|
||||||
|
<h1 placement="bottom" container="body" class="title ng-star-inserted"> トレンド </h1>
|
||||||
|
<div class="title-subscription ng-star-inserted">
|
||||||
|
Subscribe to RSS feed "トレンド"
|
||||||
|
<my-feed>
|
||||||
|
<div class="feed">
|
||||||
|
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
||||||
|
</my-global-icon>
|
||||||
|
</div>
|
||||||
|
</my-feed>
|
||||||
|
</div>
|
||||||
|
<div class="action-block"></div>
|
||||||
|
</div>
|
||||||
|
<div class="videos">
|
||||||
|
@foreach ($res['video']->data as $v)
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
||||||
|
'root' => '/peertube/videos/trending'
|
||||||
|
])
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
@extends('theme.'.env('THEME').'.peertube')
|
@extends('theme.'.env('THEME').'.peertube')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@include('theme.'.env('THEME').'.component.peertube.w')
|
<div id="content" tabindex="-1" class="main-col">
|
||||||
|
<div class="main-row">
|
||||||
|
<my-video-watch class="ng-star-inserted">
|
||||||
|
<div class="root">
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.w.player')
|
||||||
|
@include('theme.'.env('THEME').'.component.peertube.parts.w.info')
|
||||||
|
</div>
|
||||||
|
</my-video-watch>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<div class="root ng-star-inserted">
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.a.info')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.a.links')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.a.channels')
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -11,8 +11,8 @@
|
||||||
$seconds = $v->duration;
|
$seconds = $v->duration;
|
||||||
$hours = floor($seconds / 3600);
|
$hours = floor($seconds / 3600);
|
||||||
$seconds -= $hours * 3600;
|
$seconds -= $hours * 3600;
|
||||||
$minutes = floor($seconds / 60);
|
$minutes = sprintf("%02d", floor($seconds / 60));
|
||||||
$seconds -= $minutes * 60;
|
$seconds -= sprintf("%02d", $minutes * 60);
|
||||||
@endphp
|
@endphp
|
||||||
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
|
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
|
||||||
<div class="play-overlay ng-star-inserted">
|
<div class="play-overlay ng-star-inserted">
|
|
@ -1,5 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.c.head')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.c.links')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.c.'.($res['cat'] == 'video-playlists' ? 'playlists' : 'videos'))
|
|
||||||
</div>
|
|
|
@ -17,8 +17,8 @@
|
||||||
$seconds = $v->duration;
|
$seconds = $v->duration;
|
||||||
$hours = floor($seconds / 3600);
|
$hours = floor($seconds / 3600);
|
||||||
$seconds -= $hours * 3600;
|
$seconds -= $hours * 3600;
|
||||||
$minutes = floor($seconds / 60);
|
$minutes = sprintf("%02d", floor($seconds / 60));
|
||||||
$seconds -= $minutes * 60;
|
$seconds -= sprintf("%02d", $minutes * 60);
|
||||||
@endphp
|
@endphp
|
||||||
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
|
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ $hours != 0 ? $hours.':' : '' }}{{ $minutes != 0 ? $minutes.':' : '0:' }}{{ $seconds }}</div>
|
||||||
<div class="play-overlay ng-star-inserted">
|
<div class="play-overlay ng-star-inserted">
|
|
@ -1,30 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<my-videos-list>
|
|
||||||
<div class="margin-content">
|
|
||||||
<div class="videos-header">
|
|
||||||
<h1 placement="bottom" container="body" class="title ng-star-inserted"> ローカル動画 </h1>
|
|
||||||
<div class="title-subscription ng-star-inserted">
|
|
||||||
Subscribe to RSS feed "ローカル動画"
|
|
||||||
<my-feed>
|
|
||||||
<div class="feed">
|
|
||||||
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
|
||||||
</my-global-icon>
|
|
||||||
</div>
|
|
||||||
</my-feed>
|
|
||||||
</div>
|
|
||||||
<div class="action-block"></div>
|
|
||||||
</div>
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
|
||||||
'root' => '/peertube/videos/local'
|
|
||||||
])
|
|
||||||
</div>
|
|
||||||
</my-videos-list>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -1,18 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<h1 class="sr-only">ディスカバー</h1>
|
|
||||||
<div class="margin-content">
|
|
||||||
@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
|
|
||||||
<div style="margin-top: 16px;"></div>
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
|
||||||
'root' => '/peertube/videos/overview'
|
|
||||||
])
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -1,30 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<my-videos-list>
|
|
||||||
<div class="margin-content">
|
|
||||||
<div class="videos-header">
|
|
||||||
<h1 placement="bottom" container="body" class="title ng-star-inserted"> 最近投稿された動画 </h1>
|
|
||||||
<div class="title-subscription ng-star-inserted">
|
|
||||||
Subscribe to RSS feed "最近投稿された動画"
|
|
||||||
<my-feed>
|
|
||||||
<div class="feed">
|
|
||||||
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
|
||||||
</my-global-icon>
|
|
||||||
</div>
|
|
||||||
</my-feed>
|
|
||||||
</div>
|
|
||||||
<div class="action-block"></div>
|
|
||||||
</div>
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.videosbydate')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
|
||||||
'root' => '/peertube/videos/recently-added'
|
|
||||||
])
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -1,34 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<ng-component class="ng-star-inserted">
|
|
||||||
<my-videos-list>
|
|
||||||
<div class="margin-content">
|
|
||||||
<div class="videos-header">
|
|
||||||
<h1 placement="bottom" container="body" class="title ng-star-inserted"> トレンド </h1>
|
|
||||||
<div class="title-subscription ng-star-inserted">
|
|
||||||
Subscribe to RSS feed "トレンド"
|
|
||||||
<my-feed>
|
|
||||||
<div class="feed">
|
|
||||||
<my-global-icon role="button" aria-label="Open syndication dropdown" placement="bottom left auto" iconname="syndication" class="icon-syndication ng-star-inserted">
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rss"><path d="M4 11a9 9 0 0 1 9 9"></path><path d="M4 4a16 16 0 0 1 16 16"></path><circle cx="5" cy="19" r="1"></circle></svg>
|
|
||||||
</my-global-icon>
|
|
||||||
</div>
|
|
||||||
</my-feed>
|
|
||||||
</div>
|
|
||||||
<div class="action-block"></div>
|
|
||||||
</div>
|
|
||||||
<div class="videos">
|
|
||||||
@foreach ($res['video']->data as $v)
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.videominature')
|
|
||||||
@endforeach
|
|
||||||
</div>
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.common.paginate', [
|
|
||||||
'root' => '/peertube/videos/trending'
|
|
||||||
])
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -1,10 +0,0 @@
|
||||||
<div id="content" tabindex="-1" class="main-col">
|
|
||||||
<div class="main-row">
|
|
||||||
<my-video-watch class="ng-star-inserted">
|
|
||||||
<div class="root">
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.w.player')
|
|
||||||
@include('theme.'.env('THEME').'.component.peertube.parts.w.info')
|
|
||||||
</div>
|
|
||||||
</my-video-watch>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
新しいイシューから参照