From 9c917d392b29d66f1bd9810b99253680ed9117d4 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: Mon, 6 Jan 2020 18:24:32 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=A1=E3=82=87=E3=81=A3=E3=81=A8=E3=81=A0?= =?UTF-8?q?=E3=81=91=E3=81=A7=E3=81=8D=E3=81=9F=E3=81=AD=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AuthController.php | 14 +- app/Http/Controllers/HomeController.php | 49 ++++- app/Http/Controllers/SiteController.php | 139 +++++++++++++- app/Http/Controllers/UserController.php | 70 ++++++- public/assets/img/bitchute.png | Bin 0 -> 5721 bytes public/assets/img/discord.png | Bin 0 -> 3716 bytes public/assets/img/twitter.png | Bin 0 -> 3059 bytes resources/assets/sass/_variables.scss | 6 +- resources/assets/sass/app.scss | 143 +++++++++----- resources/views/layouts/site.blade.php | 84 ++++----- resources/views/pages/site/login.blade.php | 23 +++ resources/views/pages/site/page.blade.php | 9 + resources/views/pages/site/post.blade.php | 178 +++--------------- resources/views/pages/site/profile.blade.php | 5 + resources/views/pages/site/register.blade.php | 58 ++++++ routes/view/bash.php | 2 +- routes/view/site.php | 8 +- 17 files changed, 523 insertions(+), 265 deletions(-) create mode 100644 public/assets/img/bitchute.png create mode 100644 public/assets/img/discord.png create mode 100644 public/assets/img/twitter.png create mode 100644 resources/views/pages/site/login.blade.php create mode 100644 resources/views/pages/site/profile.blade.php create mode 100644 resources/views/pages/site/register.blade.php diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 049566d..c810354 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -20,20 +20,12 @@ class AuthController extends Controller { public function checkSelf(Request $r) { // /api/auth/checkself $check = $this->checkLegit($r->kero_token); - return array($check); } - public function checkLegit($t) { - if (!isset($t)) { - return 0; - } - - $check = DB::table('users') - ->select('id') - ->where('kero_token', $t) - ->first(); - + public function checkLegit ($t) { + if (!isset($t) || empty($t) || is_null($t)) return 0; + $check = DB::table('users')->select('id')->where('kero_token', $t)->first(); return $check->id; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index edcd643..ef03b91 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,21 +3,68 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Http\Controllers\AuthController; use App\Http\Controllers\SiteController; +use App\Http\Controllers\UserController; class HomeController extends Controller { + private $objAuth; private $objSite; + private $objUser; private $menu; public function __construct() { + $this->objAuth = new AuthController(); $this->objSite = new SiteController(); + $this->objUser = new UserController(); $this->menu = $this->objSite->getPagesInMenu(); //$this->middleware('auth'); } public function index () { $menu = $this->menu; + $cook = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); + $id = $this->objAuth->checkLegit($cook); + $user = $this->objUser->getUser2($id, $cook); $res = $this->objSite->getPosts2(); - return view('pages.site.index', compact(['res', 'menu'])); + return view('pages.site.index', compact(['res', 'menu', 'user'])); + } + + public function post ($slug) { + $menu = $this->menu; + $cook = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); + $id = $this->objAuth->checkLegit($cook); + $user = $this->objUser->getUser2($id, $cook); + $res = $this->objSite->getPost2($slug, $cook); + return view('pages.site.post', compact(['res', 'menu', 'user'])); + } + + public function page ($slug) { + $menu = $this->menu; + $cook = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); + $id = $this->objAuth->checkLegit($cook); + $user = $this->objUser->getUser2($id, $cook); + $res = $this->objSite->getPage2($slug, $cook); + return view('pages.site.page', compact(['res', 'menu', 'user'])); + } + + public function login () { + if (isset($_COOKIE['kero_token'])) return redirect(''); + $menu = $this->menu; + $cook = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); + $id = $this->objAuth->checkLegit($cook); + $user = $this->objUser->getUser2($id, $cook); + $res = array(); + return view('pages.site.login', compact(['res', 'menu', 'user'])); + } + + public function register () { + if (isset($_COOKIE['kero_token'])) return redirect(''); + $menu = $this->menu; + $cook = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); + $id = $this->objAuth->checkLegit($cook); + $user = $this->objUser->getUser2($id, $cook); + $res = array(); + return view('pages.site.register', compact(['res', 'menu', 'user'])); } } diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index b752fb6..7379ac4 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -23,8 +23,8 @@ class SiteController extends Controller { } // Posts - public function getPosts2() { // /api/rpc/site/post/get/all - $kero_token = $_COOKIE['kero_token']; + public function getPosts2 () { + $kero_token = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); $check = $this->objAuth->checkLegit($kero_token); // Load group colours. @@ -304,6 +304,119 @@ class SiteController extends Controller { return $res; } + public function getPost2 ($slug, $kero) { + $check = $this->objAuth->checkLegit($kero); + $valid = $this->objAuth->getPermissions($kero); + + // Load group colours. + $ucol = $this->objUser->getGroupColours(); + + // Load content. + if ($valid['blg_editpost']) { + $get = DB::table('blg_content') + ->join('users', 'blg_content.user_id', '=', 'users.id') + ->join('usr_details', 'usr_details.user_id', '=', 'blg_content.user_id') + ->join('usr_profile', 'usr_profile.user_id', '=', 'blg_content.user_id') + ->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'blg_content.user_id') + ->where('isPost', 1) + ->where('slug', $slug) + ->get(array( + 'blg_content.id', + 'blg_content.user_id', + 'title', + 'slug', + 'post_date', + 'publish_date', + 'public_status', + 'message', + 'username', + 'perm_id', + 'gender', + 'avatar', + 'name_style', + 'display_name' + )); + } + else { + $get = DB::table('blg_content') + ->join('users', 'blg_content.user_id', '=', 'users.id') + ->join('usr_details', 'usr_details.user_id', '=', 'blg_content.user_id') + ->join('usr_profile', 'usr_profile.user_id', '=', 'blg_content.user_id') + ->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'blg_content.user_id') + ->where('public_status', 0) + ->where('isPost', 1) + ->where('slug', $slug) + ->get(array( + 'blg_content.id', + 'blg_content.user_id', + 'title', + 'slug', + 'post_date', + 'publish_date', + 'public_status', + 'message', + 'username', + 'perm_id', + 'gender', + 'avatar', + 'name_style', + 'display_name' + )); + } + + $res = array(); + setlocale(LC_ALL, 'ja_JP.utf8'); + + foreach ($get as $i) { + $showName = ''; + $showCol = ''; + $showGroupName = ''; + + // Display name or username? + if (!empty($i->display_name)) { + $showName = $i->display_name; + } + else { + $showName = $i->username; + } + + // Custom name styling or default? + if (!empty($i->name_style)) { + $showCol = $i->name_style; + } + else { + foreach ($ucol as $j) { + if ($j->id == $i->perm_id) { + if ($i->gender == 1) $showCol = $j->colour_m; + else if ($i->gender == 2) $showCol = $j->colour_f; + else $showCol = $j->colour_u; + } + } + } + + // Group names. + $gname = $this->objUser->getGroupName($i->user_id); + $showGroupName = $gname[0]->name; + + array_push($res, [ + 'id' => $i->id, + 'user_id' => $i->user_id, + 'title' => $i->title, + 'slug' => $i->slug, + 'post_date' => strftime('%Y/%m/%d(%a) %H:%M:%S %Z', $i->post_date), + 'publish_date' => strftime('%Y/%m/%d(%a) %H:%M:%S %Z', $i->publish_date), + 'public_status' => $i->public_status, + 'message' => $i->message, + 'gender' => $i->gender, + 'avatar' => $i->avatar, + 'showcol' => $showCol, + 'showname' => $showName + ]); + } + + return $res; + } + public function getPost($slug, Request $r) { // /api/rpc/site/post/get/slug/slug $check = $this->objAuth->checkLegit($r->kero_token); $valid = $this->objAuth->getPermissions($r->kero_token); @@ -887,6 +1000,28 @@ class SiteController extends Controller { ->get(); } + public function getPage2 ($slug, $kero) { + $valid = $this->objAuth->getPermissions($kero); + + if ($valid['blg_editpage'] == 1) { + return DB::table('blg_content') + ->select('id', 'title', 'slug', 'isMenu', 'public_status', 'message') + ->where('isPost', 0) + ->where('slug', $slug) + ->orderBy('sortorder', 'asc') + ->first(); + } + else { + return DB::table('blg_content') + ->select('id', 'title', 'slug', 'isMenu', 'public_status', 'message') + ->where('public_status', 0) + ->where('isPost', 0) + ->where('slug', $slug) + ->orderBy('sortorder', 'asc') + ->first(); + } + } + public function getPage($slug, Request $r) { // /api/rpc/site/page/get/slug/slug $valid = $this->objAuth->getPermissions($r->kero_token); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 449d4a9..7628a1a 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -172,7 +172,75 @@ class UserController extends Controller { return $get; } - public function getUser($id, Request $r) { // /api/rpc/user/user/getuser/id/uid + public function getUser2 ($id, $kero) { // /api/rpc/user/user/getuser/id/uid + $getting = array( + 'users.id', + 'users.username', + 'usr_perm_module.name as group_name', + 'usr_profile.display_name', + 'usr_profile.name_style', + 'usr_perm_id.perm_id', + 'usr_profile.member_title', + 'usr_details.total_posts', + 'usr_details.total_threads', + 'usr_details.reg_date', + 'usr_contacts.website_link', + 'usr_contacts.website_name', + 'usr_profile.post_style as poststyle', + 'usr_profile.gender', + 'usr_profile.location', + 'usr_profile.birthday', + 'usr_profile.bio', + 'usr_profile.avatar', + 'usr_profile.country', + 'usr_contacts.website_link', + 'usr_contacts.website_name', + 'usr_contacts.youtube_link', + 'usr_contacts.youtube_name', + 'usr_contacts.niconico', + 'usr_contacts.pixiv', + 'usr_contacts.discord', + 'usr_contacts.mastodon', + 'usr_contacts.twitter' + ); + + $check = $this->objAuth->checkLegit($kero); + $valid = $this->objAuth->getPermissions($kero); + $cols = $this->getGroupColours()->toArray(); + + if ($valid['usr_editother'] == 1 || $id == $check) { + array_push($getting, 'users.password'); + } + + if ($valid['usr_emailshow'] == 1 || $id == $check) { + array_push($getting, 'users.email'); + } + + if ($valid['usr_ipshow'] == 1 || $id == $check) { + array_push($getting, 'usr_profile.ip_address'); + } + + if ($valid['usr_canwarn'] == 1 || $id == $check) { + array_push($getting, 'usr_details.strikes'); + } + + $get = DB::table('users') + ->join('usr_details', 'usr_details.user_id', '=', 'users.id') + ->join('usr_profile', 'usr_profile.user_id', '=', 'users.id') + ->join('usr_contacts', 'usr_contacts.user_id', '=', 'users.id') + ->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id') + ->join('usr_perm_module', 'usr_perm_module.id', 'usr_perm_id.perm_id') + ->where('users.id', $id) + ->get($getting); + + foreach ($get as $g) { + $g->showname = (!empty($g->display_name) && !is_null($g->display_name) ? $g->display_name : $g->username); + } + + return $get; + } + + public function getUser ($id, Request $r) { // /api/rpc/user/user/getuser/id/uid $getting = array( 'users.id', 'users.username', diff --git a/public/assets/img/bitchute.png b/public/assets/img/bitchute.png new file mode 100644 index 0000000000000000000000000000000000000000..c25a5016ec39b38c4aa57e64d37e5167015f26a9 GIT binary patch literal 5721 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 LNkvXXu0mjfr492u literal 0 HcmV?d00001 diff --git a/public/assets/img/discord.png b/public/assets/img/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..220607748670ed2c9c9098dec76f249d2a36a127 GIT binary patch literal 3716 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 i(v$P)G_cV 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 a { - color: #fcfcfc; - } - .bar > a:hover { - text-decoration: none; - } - .bar:hover { - background: linear-gradient( - to bottom, - #2980b9 0%, - #6e93ad 34%, - #2b6b8b 100% - ); - // background-color: #2980b9; - } + .bar > a { color: #fcfcfc; } + .bar > a:hover { text-decoration: none; } + .bar:hover { background: linear-gradient(to bottom, #2980b9 0%, #6e93ad 34%, #2b6b8b 100%) } .meta { padding: 5px; text-align: left; background-color: #2c3e50; border-bottom: solid 2px #3daee9; } - .comment { - border-top: solid 2px #3daee9; - } + .comment { border-top: solid 2px #3daee9; } .back, .comment { padding: 10px; background-color: #31363b; text-align: left; } - .modal-header, .modal-body, .modal-footer { - color: #fcfcfc; - } + .modal-header, .modal-body, .modal-footer { color: #fcfcfc; } .modal-header { background: linear-gradient( to bottom, @@ -118,12 +177,8 @@ body { #3daee9 100% ); } - .modal-body { - background-color: #4d4d4d; - } - .modal-footer { - background-color: #31363b; - } + .modal-body { background-color: #4d4d4d; } + .modal-footer { background-color: #31363b; } .form-control, .form-control:focus { background-color: #31363b; color: #fcfcfc; diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php index 9b82939..cc78a9a 100644 --- a/resources/views/layouts/site.blade.php +++ b/resources/views/layouts/site.blade.php @@ -7,21 +7,7 @@ - {{ config('app.name', 'Laravel') }} - - - @@ -29,46 +15,60 @@
-
画像
+
+ +
テクニカル諏訪子
+
+
ビットチュートのロゴ
+
ツイッターのロゴ
+
ディスコードのロゴ
+
+
-
+
+ トップ @foreach ($menu as $m) - {{ $m['title'] }} + {{ $m['title'] }} @endforeach
diff --git a/resources/views/pages/site/login.blade.php b/resources/views/pages/site/login.blade.php new file mode 100644 index 0000000..2af9c74 --- /dev/null +++ b/resources/views/pages/site/login.blade.php @@ -0,0 +1,23 @@ +@extends('layouts.site') + +@section('content') + +
+
サインイン
+
+
+
ユーザー名
+
+
+
+
パスワード
+
+
+
+
+
+
+
+
+ +@endsection diff --git a/resources/views/pages/site/page.blade.php b/resources/views/pages/site/page.blade.php index e69de29..9c14e5f 100644 --- a/resources/views/pages/site/page.blade.php +++ b/resources/views/pages/site/page.blade.php @@ -0,0 +1,9 @@ +@extends('layouts.site') + +@section('content') +
+
{{ $res->title }}
+
{!! $res->message !!}
+
+ +@endsection diff --git a/resources/views/pages/site/post.blade.php b/resources/views/pages/site/post.blade.php index 45be6fd..e3cf540 100644 --- a/resources/views/pages/site/post.blade.php +++ b/resources/views/pages/site/post.blade.php @@ -1,158 +1,26 @@ - +@extends('layouts.site') - +
+
{{ $res[0]['title'] }}
+
+ + + {{ $res[0]['showname'] }} + 、 + {{ $res[0]['publish_date'] }}で公開 +
+
+ {!! $res[0]['message'] !!} +
+
+
+
+
コメントは見つかれませんでした。
+
+
+
+
+@endsection diff --git a/resources/views/pages/site/profile.blade.php b/resources/views/pages/site/profile.blade.php new file mode 100644 index 0000000..94bd13f --- /dev/null +++ b/resources/views/pages/site/profile.blade.php @@ -0,0 +1,5 @@ +@extends('layouts.site') + +@section('content') + +@endsection diff --git a/resources/views/pages/site/register.blade.php b/resources/views/pages/site/register.blade.php new file mode 100644 index 0000000..2a859c2 --- /dev/null +++ b/resources/views/pages/site/register.blade.php @@ -0,0 +1,58 @@ +@extends('layouts.site') + +@section('content') + +
+
新規登録
+
+
+
ユーザー名 必須
+
+
+
+
パスワード 必須
+
+
+
+
パスワード確認 必須
+
+
+
+
電子メール 必須
+
+
+
+
国
+
+
+
+
性別
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+ +@endsection diff --git a/routes/view/bash.php b/routes/view/bash.php index ad52620..76e1d9f 100644 --- a/routes/view/bash.php +++ b/routes/view/bash.php @@ -1,3 +1,3 @@