diff --git a/app/Http/Controllers/Video/VideoTable.php b/app/Http/Controllers/Video/VideoTable.php index b301be2..76e6249 100644 --- a/app/Http/Controllers/Video/VideoTable.php +++ b/app/Http/Controllers/Video/VideoTable.php @@ -36,10 +36,10 @@ class VideoTable extends Engine { if ($this->engine->user && $this->engine->user->perm['blg_addpost']) { $game = DB::table('vid_game')->get(); $res = ''; - $frm = array('title' => '', 'vid' => '', 'game_id' => '', 'thumbnail' => '', 'url' => '', 'youtube' => '', 'nicovideo' => '', 'bitchute' => '', 'odysee' => '', 'kerotube' => ''); + $frm = array('title' => '', 'vid' => '', 'game_id' => '', 'thumbnail' => '', 'url' => '', 'odysee' => '', 'kerotube' => ''); if (isset($r->submit)) { - if (empty($this->engine->err)) { if ($r->url == '' && $r->youtube == '' && $r->nicovideo == '' && $r->bitchute == '' && $r->odysee == '' && $r->kerotube == '') $this->engine->err = '1以上の動画URLをご入力下さい。'; } + if (empty($this->engine->err)) { if ($r->url == '' && $r->odysee == '' && $r->kerotube == '') $this->engine->err = '1以上の動画URLをご入力下さい。'; } // フォームの値を保存して $frm['title'] = $r->title; @@ -48,9 +48,6 @@ class VideoTable extends Engine { $frm['thumbnail'] = ($r->thumbnail ?: ''); $frm['publish_date'] = time(); $frm['url'] = ($r->url ?: ''); - $frm['youtube'] = ($r->youtube ?: ''); - $frm['nicovideo'] = ($r->nicovideo ?: ''); - $frm['bitchute'] = ($r->bitchute ?: ''); $frm['odysee'] = ($r->odysee ?: ''); $frm['kerotube'] = ($r->kerotube ?: ''); @@ -107,7 +104,7 @@ class VideoTable extends Engine { $res = ''; if (isset($r->submit)) { - if (empty($this->engine->err)) { if ($r->url == '' && $r->youtube == '' && $r->nicovideo == '' && $r->bitchute == '' && $r->odysee == '' && $r->kerotube) $this->engine->err = '1以上の動画URLをご入力下さい。'; } + if (empty($this->engine->err)) { if ($r->url == '' && $r->odysee == '' && $r->kerotube) $this->engine->err = '1以上の動画URLをご入力下さい。'; } // フォームの値を保存して $frm->title = $r->title; @@ -115,9 +112,6 @@ class VideoTable extends Engine { $frm->game_id = $r->game_id; $frm->thumbnail = $r->thumbnail; $frm->url = ($r->url ?: ''); - $frm->youtube = ($r->youtube ?: ''); - $frm->nicovideo = ($r->nicovideo ?: ''); - $frm->bitchute = ($r->bitchute ?: ''); $frm->odysee = ($r->odysee ?: ''); $frm->kerotube = ($r->kerotube ?: ''); diff --git a/resources/views/pages/common/contenttype.blade.php b/resources/views/pages/common/contenttype.blade.php index 669c347..4b3eca9 100644 --- a/resources/views/pages/common/contenttype.blade.php +++ b/resources/views/pages/common/contenttype.blade.php @@ -2,12 +2,12 @@
種類
- - + +
- - + +
diff --git a/resources/views/pages/site/profile.blade.php b/resources/views/pages/site/profile.blade.php index ca7274c..2d299fc 100644 --- a/resources/views/pages/site/profile.blade.php +++ b/resources/views/pages/site/profile.blade.php @@ -25,61 +25,9 @@
@if ($res->profile->bio) -

{{ __('site.jikosyokai') }}

- {{ $res->profile->bio }} +

{{ __('site.jikosyokai') }}

+ {{ $res->profile->bio }} @endif -
-

{{ __('site.renraku') }}

- - @if ($res->contacts->youtube_link && $res->contacts->youtube_name) -
-
ユーチューブ:
- -
- @endif - @if ($res->contacts->bitchute && $res->contacts->bitchute) -
-
ビットチュート:
- -
- @endif - @if ($res->contacts->niconico) -
-
ニコニコ動画:
- -
- @endif - @if ($res->contacts->discord) -
-
ディスコード:
-
{{ $res->contacts->discord }}
-
- @endif - @if ($res->contacts->pixiv) -
-
Pixiv:
-
{{ $res->contacts->pixiv }}
-
- @endif - @if ($res->contacts->twitter) -
-
ツイッター:
- -
- @endif - @if ($res->contacts->facebook) -
-
フェースブック:
- -
- @endif - @if ($res->contacts->instagram) -
-
インスタグラム:
- -
- @endif -
diff --git a/resources/views/pages/site/video/play/add.blade.php b/resources/views/pages/site/video/play/add.blade.php index 41994d2..708eab8 100644 --- a/resources/views/pages/site/video/play/add.blade.php +++ b/resources/views/pages/site/video/play/add.blade.php @@ -6,9 +6,9 @@
動画の追加
@if ($err) - + @endif
@csrf @@ -47,18 +47,6 @@
オディシー
-
-
ユーチューブ
-
-
-
-
ニコニコ動画
-
-
-
-
ビットチュート
-
-
diff --git a/resources/views/pages/site/video/play/edit.blade.php b/resources/views/pages/site/video/play/edit.blade.php index 7c4d2e3..e91d733 100644 --- a/resources/views/pages/site/video/play/edit.blade.php +++ b/resources/views/pages/site/video/play/edit.blade.php @@ -6,9 +6,9 @@
動画の編集
@if ($err) - + @endif @csrf @@ -44,18 +44,6 @@
オディシー
-
-
ユーチューブ
-
-
-
-
ニコニコ動画
-
-
-
-
ビットチュート
-
-
diff --git a/resources/views/pages/site/video/prayer.blade.php b/resources/views/pages/site/video/prayer.blade.php index 8122b3a..c8282d4 100644 --- a/resources/views/pages/site/video/prayer.blade.php +++ b/resources/views/pages/site/video/prayer.blade.php @@ -16,7 +16,7 @@
- @if (isset($res->youtube) || isset($res->nicovideo) || isset($res->bitchute) || isset($res->odysee) || isset($res->kerotube)) + @if (isset($res->odysee) || isset($res->kerotube))
@if (isset($res->kerotube) && $res->kerotube != '')
076video
@@ -24,15 +24,6 @@ @if (isset($res->odysee) && $res->odysee != '')
Odysee
@endif - @if (isset($res->nicovideo) && $res->nicovideo != '') -
ニコ動
- @endif - @if (isset($res->youtube) && $res->youtube != '') -
YouTube
- @endif - @if (isset($res->bitchute) && $res->bitchute != '') -
Bitchute
- @endif
@endif diff --git a/resources/views/pages/site/video/videotable.blade.php b/resources/views/pages/site/video/videotable.blade.php index 810aa64..184d441 100644 --- a/resources/views/pages/site/video/videotable.blade.php +++ b/resources/views/pages/site/video/videotable.blade.php @@ -14,7 +14,6 @@ self 076video odysee - youtube @foreach ($res as $k => $r) @@ -25,7 +24,6 @@ @if ($r->kerotube) 【{{ $r->gametitle }}】{{ $r->title }} @endif @if ($r->kerotube) 【{{ $r->gametitle }}】{{ $r->title }} @endif @if ($r->odysee) 【{{ $r->gametitle }}】{{ $r->title }} @endif - @if ($r->youtube) 【{{ $r->gametitle }}】{{ $r->title }} @endif @endforeach