From a1a2af66dfb04a1f665171228f206417d7a18562 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, 24 Feb 2020 22:23:51 +0900 Subject: [PATCH] =?UTF-8?q?getPosts=E3=81=AE=E7=A3=A8=E3=81=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/HomeController.php | 2 +- app/Http/Controllers/SiteController.php | 106 +-------------------- resources/views/layouts/site.blade.php | 2 +- resources/views/pages/site/index.blade.php | 6 +- resources/views/pages/site/post.blade.php | 26 +++++ routes/view/admin.php | 12 +++ 6 files changed, 48 insertions(+), 106 deletions(-) create mode 100644 resources/views/pages/site/post.blade.php create mode 100644 routes/view/admin.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a2da8d0..461f64f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -30,7 +30,7 @@ class HomeController extends Controller { } public function index () { - $res = $this->objSite->getPosts(); + $res = $this->objSite->getPosts(1); return view('pages.site.index', ['res' => $res, 'menu' => $this->menu, 'user' => $this->user]); } diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index 8017c4c..ae36ae2 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -22,111 +22,19 @@ class SiteController extends Controller { $this->objPermission = new PermissionController(); } - public function getPosts () { + public function getPosts ($ispost=1) { $kero_token = (isset($_COOKIE['kero_token']) ? $_COOKIE['kero_token'] : ''); $check = $this->objAuth->checkLegit($kero_token); $ucol = $this->objUser->getGroupColours(); $valid = $this->objAuth->getPermissions($kero_token); - 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) - ->orderBy('publish_date', 'desc') - ->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) - ->orderBy('publish_date', 'desc') - ->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(); - $key = 0; + $get = DB::table('blg_content')->where('isPost', $ispost)->orderBy('publish_date', 'desc')->get(); setlocale(LC_ALL, 'ja_JP.utf8'); - foreach ($get as $i) { - $showName = ''; - $showCol = ''; - $showGroupName = ''; + foreach ($get as $g) { if ($valid['blg_addpost'] == 0 && $valid['blg_editpost'] == 0 && $g->public_status != 0) unset($g); } - if (!empty($i->display_name)) $showName = $i->display_name; - else $showName = $i->username; - - 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; - } - } - } - - $gname = $this->objUser->getGroupName($i->user_id); - $showGroupName = $gname[0]->name; - - array_push($res, [ - 'key' => $key, - '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, - 'avatar' => $i->avatar, - 'showcol' => $showCol, - 'showname' => $showName - ]); - $key++; - } - - return $res; + return $get; } public function getPost ($slug, $kero) { @@ -212,8 +120,6 @@ class SiteController extends Controller { $gname = $this->objUser->getGroupName($i->user_id); $showGroupName = $gname[0]->name; - $comment = $this->getComments($i->id); - array_push($res, [ 'id' => $i->id, 'user_id' => $i->user_id, @@ -226,8 +132,7 @@ class SiteController extends Controller { 'gender' => $i->gender, 'avatar' => $i->avatar, 'showcol' => $showCol, - 'showname' => $showName, - 'comment' => $comment + 'showname' => $showName ]); } @@ -272,7 +177,6 @@ class SiteController extends Controller { if (!empty($i->display_name)) $showName = $i->display_name; else $showName = $i->username; - if (empty($i->avatar) || $i->avatar == '') $i->avatar = 'assets/avatars/haznoavaz.png'; if (!empty($i->name_style)) $showCol = $i->name_style; else { diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php index 487d71a..488b32e 100644 --- a/resources/views/layouts/site.blade.php +++ b/resources/views/layouts/site.blade.php @@ -55,7 +55,7 @@
- トップ + トップ @foreach ($menu as $m) {{ $m['title'] }} @endforeach diff --git a/resources/views/pages/site/index.blade.php b/resources/views/pages/site/index.blade.php index c7b88c9..50b7c4b 100644 --- a/resources/views/pages/site/index.blade.php +++ b/resources/views/pages/site/index.blade.php @@ -3,9 +3,9 @@ @section('content') @foreach ($res as $r) -
-
- {{ $r['title'] }} +
+
+ {{ $r->title }}
@endforeach diff --git a/resources/views/pages/site/post.blade.php b/resources/views/pages/site/post.blade.php new file mode 100644 index 0000000..8c24928 --- /dev/null +++ b/resources/views/pages/site/post.blade.php @@ -0,0 +1,26 @@ +@extends('layouts.site') + +@section('content') + +
+
{{ $res[0]['title'] }}
+
+ + + {{ $res[0]['showname'] }} + 、 + {{ $res[0]['publish_date'] }}で公開 +
+
+ {!! $res[0]['message'] !!} +
+
+
+
+
コメントは見つかれませんでした。
+
+
+
+
+ +@endsection diff --git a/routes/view/admin.php b/routes/view/admin.php new file mode 100644 index 0000000..7bc1855 --- /dev/null +++ b/routes/view/admin.php @@ -0,0 +1,12 @@ +