diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 520e178..c813ded 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use App\Http\Controllers\AuthController; use App\Http\Controllers\SiteController; use App\Http\Controllers\UserController; @@ -51,6 +52,33 @@ class HomeController extends Controller { return view('pages.site.profile', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user]); } + public function videoGame () { + $res = DB::table('vid_game')->get(); + + foreach ($res as $r) { + $p = DB::table('vid_platform')->where('id', $r->platform_id)->first(); + $r->name = $r->name.'（'.$p->name.'）'; + } + + return view('pages.site.video.game', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user]); + } + + public function videoTable ($slug) { + $slg = DB::table('vid_game')->select('id', 'name')->where('slug', $slug)->first(); + $res = DB::table('vid_video')->where('game_id', $slg->id)->orderBy('id', 'desc')->get(); + + foreach ($res as $r) { + $r->gametitle = explode('】', $r->title); + $r->title = $r->gametitle[1]; + $r->gametitle = $r->gametitle[0]; + $r->gametitle = str_replace('【'.$slg->name, '', $r->gametitle); + + if ($r->gametitle == '') $r->gametitle = '初代'; + } + + return view('pages.site.video.videotable', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user]); + } + public function addContent (Request $r) { if ($this->user && ($this->user['blg_addpost'] || $this->user['blg_addpage'])) { $bdl = array(); diff --git a/package.json b/package.json index 5fa9500..981c9f0 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,32 @@ { - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "npm run development -- --watch", - "watch-poll": "npm run watch -- --watch-poll", - "w": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "clear": "php artisan cache:clear && php artisan view:clear && php artisan route:clear" - }, - "devDependencies": { - "axios": "^0.19", - "cross-env": "^7.0", - "laravel-mix": "^5.0.1", - "lodash": "^4.17.13", - "resolve-url-loader": "^3.1.0", - "sass": "^1.15.2", - "sass-loader": "^8.0.0", - "vue-template-compiler": "^2.6.11" - }, - "dependencies": { - "bootstrap": "^4.5.0", - "jquery": "^3.5.1", - "popper.js": "^1.16.1", - "vue": "^2.6.11", - "vue-draggable-resizable": "^2.2.0" - } + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", + "watch-poll": "npm run watch -- --watch-poll", + "w": "npm run watch -- --watch-poll", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "clear": "php artisan cache:clear && php artisan view:clear && php artisan route:clear" + }, + "devDependencies": { + "axios": "^0.19", + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "lodash": "^4.17.19", + "resolve-url-loader": "^3.1.0", + "sass": "^1.15.2", + "sass-loader": "^8.0.0", + "vue-template-compiler": "^2.6.11" + }, + "dependencies": { + "bootstrap": "^4.5.0", + "jquery": "^3.5.1", + "popper.js": "^1.16.1", + "vue": "^2.6.11", + "vue-bootstrap-datetimepicker": "^5.0.1", + "vue-draggable-resizable": "^2.2.0" + } } diff --git a/public/img/bitchute.png b/public/img/bitchute.png deleted file mode 100644 index 7f88f0d..0000000 Binary files a/public/img/bitchute.png and /dev/null differ diff --git a/public/img/bt-box.webp b/public/img/bt-box.webp new file mode 100644 index 0000000..bcf2f90 Binary files /dev/null and b/public/img/bt-box.webp differ diff --git a/public/img/discord.png b/public/img/discord.png deleted file mode 100644 index 972de89..0000000 Binary files a/public/img/discord.png and /dev/null differ diff --git a/public/img/header.jpg b/public/img/header.jpg deleted file mode 100755 index 429516c..0000000 Binary files a/public/img/header.jpg and /dev/null differ diff --git a/public/img/header.png b/public/img/header.png deleted file mode 100755 index 429516c..0000000 Binary files a/public/img/header.png and /dev/null differ diff --git a/public/img/keromayokatta.png b/public/img/keromayokatta.png deleted file mode 100755 index 71cb84a..0000000 Binary files a/public/img/keromayokatta.png and /dev/null differ diff --git a/public/img/nico-box.webp b/public/img/nico-box.webp new file mode 100644 index 0000000..65558e0 Binary files /dev/null and b/public/img/nico-box.webp differ diff --git a/public/img/niconico.png b/public/img/niconico.png deleted file mode 100644 index 4b1f3c4..0000000 Binary files a/public/img/niconico.png and /dev/null differ diff --git a/public/img/play-box.webp b/public/img/play-box.webp new file mode 100644 index 0000000..fade3a4 Binary files /dev/null and b/public/img/play-box.webp differ diff --git a/public/img/swk-box.webp b/public/img/swk-box.webp new file mode 100644 index 0000000..3d1e5f1 Binary files /dev/null and b/public/img/swk-box.webp differ diff --git a/public/img/twit-box.webp b/public/img/twit-box.webp new file mode 100644 index 0000000..ca93e45 Binary files /dev/null and b/public/img/twit-box.webp differ diff --git a/public/img/twitter.png b/public/img/twitter.png deleted file mode 100644 index a349c50..0000000 Binary files a/public/img/twitter.png and /dev/null differ diff --git a/public/img/youtube.png b/public/img/youtube.png deleted file mode 100644 index 9dc0a6b..0000000 Binary files a/public/img/youtube.png and /dev/null differ diff --git a/public/img/yt-box.webp b/public/img/yt-box.webp new file mode 100644 index 0000000..c0c872b Binary files /dev/null and b/public/img/yt-box.webp differ diff --git a/resources/sass/_logo.scss b/resources/sass/_logo.scss index cbe2c6c..39654cc 100644 --- a/resources/sass/_logo.scss +++ b/resources/sass/_logo.scss @@ -16,6 +16,17 @@ border: 1px solid $black2; } +.logo-play { + transition: background 0.3s, color 0.3s; + background-color: transparent; + border-radius: 25%; + padding: 2px; +} + +.logo-play:hover { + background-color: $ng4; +} + .logo-br { position: absolute; bottom: 8px; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 56d398e..92cd8df 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -25,6 +25,10 @@ @import "conponent/check"; @import "conponent/form"; @import "conponent/modal"; +@import "conponent/select"; + +// テーブル +@import "conponent/table"; // その他 #app { diff --git a/resources/sass/conponent/_button.scss b/resources/sass/conponent/_button.scss index 8209035..50fd6a7 100644 --- a/resources/sass/conponent/_button.scss +++ b/resources/sass/conponent/_button.scss @@ -46,6 +46,15 @@ border-right-color: $kawaii2; } +.btn-fumei-check { + color: $white1; + background-color: $kawaii3; + border-color: transparent; + border-bottom-color: $kawaii2; + border-right-color: $kawaii2; + box-shadow: 0px 0px 7px 3px $kawaii2; +} + .btn-danshi, .btn-danshi.disabled, .btn-danshi:disabled { background: radial-gradient(ellipse at top, $dan2, transparent), radial-gradient(ellipse at bottom, $black1, transparent); @@ -57,10 +66,19 @@ .btn-danshi:hover { color: $white1; - background-color: $suwa08; + background-color: $dan4; border-color: transparent; - border-bottom-color: $suwa04; - border-right-color: $suwa04; + border-bottom-color: $dan3; + border-right-color: $dan3; +} + +.btn-danshi-check { + color: $white1; + background-color: $dan4; + border-color: transparent; + border-bottom-color: $dan3; + border-right-color: $dan3; + box-shadow: 0px 0px 7px 3px $dan3; } .btn-joshi, .btn-joshi.disabled, .btn-joshi:disabled { @@ -80,6 +98,15 @@ border-right-color: $jo3; } +.btn-joshi-check { + color: $white1; + background-color: $jo4; + border-color: transparent; + border-bottom-color: $jo3; + border-right-color: $jo3; + box-shadow: 0px 0px 7px 3px $jo3; +} + .btn-primary, .btn-primary.disabled, .btn-primary:disabled { background: radial-gradient(ellipse at top, $suwa03, transparent), radial-gradient(ellipse at bottom, $black1, transparent); diff --git a/resources/sass/conponent/_select.scss b/resources/sass/conponent/_select.scss new file mode 100644 index 0000000..e51ea0c --- /dev/null +++ b/resources/sass/conponent/_select.scss @@ -0,0 +1,5 @@ +.custom-select { + background-color: $black1; + border: 1px solid $suwa10; + color: $white1; +} diff --git a/resources/sass/conponent/_table.scss b/resources/sass/conponent/_table.scss new file mode 100644 index 0000000..169fb6d --- /dev/null +++ b/resources/sass/conponent/_table.scss @@ -0,0 +1,20 @@ +.table-dark { + color: $white1; + background-color: $black3; + border: 2px solid $suwa03; + transition: background-color 0.3s; +} + +.table-dark th, .table-dark td, .table-dark thead th { + border-color: $suwa03; +} + +.table-dark.table-hover tbody tr { + transition: background-color 0.3s; + background-color: $black3; +} + +.table-dark.table-hover tbody tr:hover { + color: $white1; + background-color: $suwa07; +} diff --git a/resources/views/pages/site/profile.blade.php b/resources/views/pages/site/profile.blade.php index 2ae5894..c304330 100644 --- a/resources/views/pages/site/profile.blade.php +++ b/resources/views/pages/site/profile.blade.php @@ -70,13 +70,13 @@ @if ($res->contacts->facebook)
フェースブック：
-
{{ $res->contacts->facebook }}
+
{{ $res->contacts->facebook }}
@endif @if ($res->contacts->instagram)
インスタグラム：
-
{{ $res->contacts->instagram }}
+
{{ $res->contacts->instagram }}
@endif diff --git a/resources/views/pages/site/video/game.blade.php b/resources/views/pages/site/video/game.blade.php new file mode 100644 index 0000000..0ce023e --- /dev/null +++ b/resources/views/pages/site/video/game.blade.php @@ -0,0 +1,15 @@ +@extends('layouts.site') + +@section('content') +
+
ゲームを選んで下さい
+
+ +
+
+ +@endsection diff --git a/resources/views/pages/site/video/videotable.blade.php b/resources/views/pages/site/video/videotable.blade.php new file mode 100644 index 0000000..e8fc7f4 --- /dev/null +++ b/resources/views/pages/site/video/videotable.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.site') + +@section('content') +
+
動画を選んで下さい
+
+
+ + + + + + + + + + + + + @foreach ($res as $k => $r) + + + + + + + + + + @endforeach +
ゲーム名件名selfyoutubetwitternicovideobitchute
{{ $r->gametitle }}{{ $r->title }}@if ($r->url) 【{{ $r->gametitle }}】$r->title @endif@if ($r->youtube) 【{{ $r->gametitle }}】$r->title @endif@if ($r->twitter) 【{{ $r->gametitle }}】$r->title @endif@if ($r->nicovideo) 【{{ $r->gametitle }}】$r->title @endif@if ($r->bitchute) 【{{ $r->gametitle }}】$r->title @endif
+
+
+
+ +@endsection