From 63bd4f3760dde72461bfef27f5aa83fd003ff76a Mon Sep 17 00:00:00 2001 From: barunsoft Date: Thu, 25 Aug 2022 11:18:30 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9D=98=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=EC=9E=90=20ID=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20cms=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=9B=84=20=EC=9D=B4=EB=8F=99=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Auth/LoginController.php | 2 +- .../Controllers/Front/IndexController.php | 2 +- app/Http/Middleware/AuthAdmin.php | 4 +- app/Libs/TraitBoard.php | 5 ++- public/js/main.js | 37 +++++++++---------- resources/views/pages/inquiry.blade.php | 1 + 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2e26196..bea4d0e 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -29,7 +29,7 @@ class LoginController extends Controller * * @var string */ - protected $redirectTo = '/cms'; + protected $redirectTo = '/'; /** * Create a new controller instance. diff --git a/app/Http/Controllers/Front/IndexController.php b/app/Http/Controllers/Front/IndexController.php index 8d941f8..ce47499 100644 --- a/app/Http/Controllers/Front/IndexController.php +++ b/app/Http/Controllers/Front/IndexController.php @@ -51,7 +51,7 @@ class IndexController extends Controller */ public function galleryList(Request $request) { - $result = $this->getPostList($request, 'gallery', 4); + $result = $this->getPostList($request, 'gallery', 12); // logger(json_decode(json_encode($result), true)); $lists = []; diff --git a/app/Http/Middleware/AuthAdmin.php b/app/Http/Middleware/AuthAdmin.php index 56e5e72..7d35a30 100644 --- a/app/Http/Middleware/AuthAdmin.php +++ b/app/Http/Middleware/AuthAdmin.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Auth\Middleware\Authenticate as Middleware; +use Illuminate\Http\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; class AuthAdmin extends Middleware @@ -11,8 +12,9 @@ class AuthAdmin extends Middleware /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request + * @param Request $request * @param \Closure $next + * @param mixed ...$guards * @return mixed */ public function handle($request, Closure $next, ...$guards) diff --git a/app/Libs/TraitBoard.php b/app/Libs/TraitBoard.php index 7f0b69a..05b5e5e 100644 --- a/app/Libs/TraitBoard.php +++ b/app/Libs/TraitBoard.php @@ -330,10 +330,13 @@ trait TraitBoard } else { $appends = [ 'uid' => Str::uuid()->toString(), - 'created_id' => auth()->user()->id, 'created_at' => (string)Carbon::now() ]; + if (auth()->check()) { + $appends['created_id'] = auth()->user()->id; + } + $postData = array_merge($postData, $appends); $data = BoardArticle::query()->create($postData); diff --git a/public/js/main.js b/public/js/main.js index bad1509..de5aba6 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -23,27 +23,7 @@ $(document).ready(function() { return false; }); -}); - -$(window).on('resize', function() { - resizeGallery(); -}); - -function resizeGallery() { - $('.g-main').each(function() { - if($(this).find('.empty-txt').length > 0 || $(this).find('.grid').length == 0) return; - - var gel = $(this).find('.grid').eq(0); - var gw = parseFloat(gel[0].getBoundingClientRect().width); - var gpl = parseFloat(gel.css('padding-left').replace(/[^0-9]/g,'')); - var gpr = parseFloat(gel.css('padding-right').replace(/[^0-9]/g,'')); - var g_img_height = (gw - (gpl+gpr)) * parseFloat(1); - - $(this).find('.grid .g-img').css('height', g_img_height + 'px'); - }); -} -$(document).ready(function() { var currentPage = 1; function getGalleryData(uid) { @@ -112,5 +92,22 @@ $(document).ready(function() { e.preventDefault(); getGalleryList(); }) +}); +$(window).on('resize', function() { + resizeGallery(); }); + +function resizeGallery() { + $('.g-main').each(function() { + if($(this).find('.empty-txt').length > 0 || $(this).find('.grid').length == 0) return; + + var gel = $(this).find('.grid').eq(0); + var gw = parseFloat(gel[0].getBoundingClientRect().width); + var gpl = parseFloat(gel.css('padding-left').replace(/[^0-9]/g,'')); + var gpr = parseFloat(gel.css('padding-right').replace(/[^0-9]/g,'')); + var g_img_height = (gw - (gpl+gpr)) * parseFloat(1); + + $(this).find('.grid .g-img').css('height', g_img_height + 'px'); + }); +} diff --git a/resources/views/pages/inquiry.blade.php b/resources/views/pages/inquiry.blade.php index a7d3baa..1798245 100644 --- a/resources/views/pages/inquiry.blade.php +++ b/resources/views/pages/inquiry.blade.php @@ -16,6 +16,7 @@ +