From 905e98acbf433834700f76edfc10431d95e6a25d 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: Sat, 30 Oct 2021 18:21:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/MeetingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index 2fae25ba..1c077548 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -466,7 +466,7 @@ class MeetingsController extends Controller { $meeting_select = ['id', 'father_id', 'title', 'text', 'memo', 'pdf', 'updated_at', 'is_favorite']; $meeting_images_select = ['image']; $meeting_approvals_select = ['approval_at', 'child_id']; - $child_select = ['image']; + $child_select = ['image', 'last_name', 'first_name']; // 取得に成功 if (null === ($list = Meeting::select($meeting_select)->where('id', $meeting_id)->where('father_id', $r->father_id)->get())) { From a9046ff5972d882220dcb633e0d11b7616465a7b 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: Sat, 30 Oct 2021 23:13:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/Api/AdminController.php | 2 +- .../Controllers/Api/AuthenticationTrait.php | 2 +- .../Controllers/Api/ChildrenController.php | 2 +- .../Controllers/Api/FathersController.php | 2 +- backend/app/Http/Middleware/Authenticate.php | 4 ++ backend/routes/api.php | 8 ++-- backend/routes/web.php | 38 ++++++++++--------- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/backend/app/Http/Controllers/Api/AdminController.php b/backend/app/Http/Controllers/Api/AdminController.php index ee9b88f3..d1490672 100644 --- a/backend/app/Http/Controllers/Api/AdminController.php +++ b/backend/app/Http/Controllers/Api/AdminController.php @@ -14,7 +14,7 @@ class AdminController extends Controller { /* Traitで使うメソッド */ protected function getGuard () { - return 'admin'; + return 'admins'; } protected function getModel () { return new \App\Models\Admin(); diff --git a/backend/app/Http/Controllers/Api/AuthenticationTrait.php b/backend/app/Http/Controllers/Api/AuthenticationTrait.php index 443bb15c..b87130ef 100644 --- a/backend/app/Http/Controllers/Api/AuthenticationTrait.php +++ b/backend/app/Http/Controllers/Api/AuthenticationTrait.php @@ -52,7 +52,7 @@ trait AuthenticationTrait { // セッションを想像する $guard = $this->getGuard(); - if ($r->session()->has($guard)) { + if (!$r->session()->has($guard)) { // 認証されたデータのpassword以外を把握する $login_user_datum = $get->toArray(); unset($login_user_datum['password']); diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index 3347b04e..7442fdeb 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -22,7 +22,7 @@ class ChildrenController extends Controller { /* Traitで使うメソッド */ protected function getGuard () { - return 'child'; + return 'children'; } protected function getModel () { return new \App\Models\Child(); diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php index 40bd098b..c862118e 100644 --- a/backend/app/Http/Controllers/Api/FathersController.php +++ b/backend/app/Http/Controllers/Api/FathersController.php @@ -22,7 +22,7 @@ class FathersController extends Controller { /* Traitで使うメソッド */ protected function getGuard () { - return 'father'; + return 'fathers'; } protected function getModel () { return new \App\Models\Father(); diff --git a/backend/app/Http/Middleware/Authenticate.php b/backend/app/Http/Middleware/Authenticate.php index f9572a01..9af87d07 100644 --- a/backend/app/Http/Middleware/Authenticate.php +++ b/backend/app/Http/Middleware/Authenticate.php @@ -20,6 +20,10 @@ class Authenticate extends Middleware } public function handle ($request, Closure $next, ...$guard) { + if (!$request->session()->has($guard)) { + return redirect(route($guard[0].'login')); + } + return $next($request); } } diff --git a/backend/routes/api.php b/backend/routes/api.php index a7585dce..5ad5eedd 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Route; Route::group(['prefix' => 'admin'], function () { // AdminController - Route::post('/login', '\App\Http\Controllers\Api\AdminController@login')->name('adminlogin'); + Route::post('/login', '\App\Http\Controllers\Api\AdminController@login')->name('adminslogin'); Route::group(['middleware' => 'auth:admins'], function () { // AdminController @@ -73,9 +73,9 @@ Route::post('/contacts/register', '\App\Http\Controllers\Api\ContactsController@ Route::group(['prefix' => 'fathers'], function () { // FathersController - Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain')->name('fatherregistermain'); - Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword')->name('fatherrequestpassword'); - Route::post('/login', '\App\Http\Controllers\Api\FathersController@login')->name('fatherlogin'); + Route::post('/registerMain', '\App\Http\Controllers\Api\FathersController@registerMain')->name('fathersregistermain'); + Route::post('/requestPassword', '\App\Http\Controllers\Api\FathersController@requestPassword')->name('fathersrequestpassword'); + Route::post('/login', '\App\Http\Controllers\Api\FathersController@login')->name('fatherslogin'); Route::group(['middleware' => 'auth:fathers'], function () { Route::put('/updateImage/{father_id}', '\App\Http\Controllers\Api\FathersController@updateImage'); diff --git a/backend/routes/web.php b/backend/routes/web.php index 159f1d5c..9dd3c002 100644 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -59,7 +59,7 @@ Route::get('/unknown-error ', function () { return vie // ---------------------------------------- Child Account ------------------------------------------- // Route::group(['prefix' => 'c-account'], function () { Route::get('/register-temporary', function () { return view('c_account.auth'); }); - Route::get('/login', function () { return view('c_account.auth'); }); + Route::get('/login', function () { return view('c_account.auth'); })->name('childrenlogin'); Route::group(['prefix' => 'register'], function () { Route::get('/', function () { return view('c_account.auth'); }); Route::get('/complete', function () { return view('c_account.auth'); }); @@ -71,29 +71,31 @@ Route::group(['prefix' => 'c-account'], function () { Route::get('/complete', function () { return view('c_account.auth'); }); }); - Route::group(['prefix' => 'meeting'], function () { - Route::get('/', function () { return view('c_account.index'); }); - Route::get('/detail/{id}', function () { return view('c_account.index'); }); - }); - Route::get('/search', function () { return view('c_account.index'); }); - Route::group(['prefix' => 'parent'], function () { - Route::get('/', function () { return view('c_account.index'); }); - Route::get('/detail/{father_id}', function () { return view('c_account.index'); }); - }); + Route::group(['middleware' => 'auth:children'], function () { + Route::group(['prefix' => 'meeting'], function () { + Route::get('/', function () { return view('c_account.index'); }); + Route::get('/detail/{id}', function () { return view('c_account.index'); }); + }); + Route::get('/search', function () { return view('c_account.index'); }); + Route::group(['prefix' => 'parent'], function () { + Route::get('/', function () { return view('c_account.index'); }); + Route::get('/detail/{father_id}', function () { return view('c_account.index'); }); + }); - Route::group(['prefix' => 'profile'], function () { - Route::get('/', function () { return view('c_account.index'); }); - Route::get('/detail/{child_id}', function () { return view('c_account.index'); }); - Route::get('/edit/{child_id}', function () { return view('c_account.index'); }); - Route::get('/password-edit/{child_id}', function () { return view('c_account.index'); }); - Route::get('/withdrawal', function () { return view('c_account.index'); }); + Route::group(['prefix' => 'profile'], function () { + Route::get('/', function () { return view('c_account.index'); }); + Route::get('/detail/{child_id}', function () { return view('c_account.index'); }); + Route::get('/edit/{child_id}', function () { return view('c_account.index'); }); + Route::get('/password-edit/{child_id}', function () { return view('c_account.index'); }); + Route::get('/withdrawal', function () { return view('c_account.index'); }); + }); + Route::get('/withdrawal/complete', function () { return view('c_account.withdrawal.complete'); }); }); - Route::get('/withdrawal/complete', function () { return view('c_account.withdrawal.complete'); }); }); // ---------------------------------------- Admin Account ------------------------------------------- // Route::group(['prefix' => 'admin'], function () { - Route::get('/login', '\App\Http\Controllers\Api\AdminController@checkLogin')->name('adminlogin'); + Route::get('/login', '\App\Http\Controllers\Api\AdminController@checkLogin')->name('adminslogin'); Route::get('/logout', '\App\Http\Controllers\Api\AdminController@logout'); Route::group(['middleware' => 'auth:admins'], function () { From 1601f1751434915ac963246da36f10b40818deb2 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: Sat, 30 Oct 2021 23:32:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=81=A1=E3=82=87=E3=81=A3=E3=81=A8?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=88=E8=AB=8F=E8=A8=AA=E5=AD=90=E3=81=AE?= =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/Api/MeetingImagesController.php | 12 ++++++++++-- .../app/Http/Controllers/Api/MeetingsController.php | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingImagesController.php b/backend/app/Http/Controllers/Api/MeetingImagesController.php index ba12274e..b7d9cebc 100644 --- a/backend/app/Http/Controllers/Api/MeetingImagesController.php +++ b/backend/app/Http/Controllers/Api/MeetingImagesController.php @@ -12,7 +12,7 @@ use App\Models\MeetingImage; class MeetingImagesController extends Controller { public function register (Request $r) { - if (!isset($r->meeting_id)) { + if (!isset($r->meeting_id) || !isset($r->image)) { return ['status' => 400]; } @@ -30,10 +30,17 @@ class MeetingImagesController extends Controller { return ['status_code' => 422, 'error_messages' => $validate->errors()]; } - $insert = ['meeting_id' => $meeting_id, 'image' => $image]; + $insert = ['meeting_id' => $r->meeting_id]; foreach ($r->images as $image) { try { + $insert['image'] = $image; + + $ext = explode('/', mime_content_type($image))[1]; + $filename = uniqid() . '.'.$ext; + $img = base64_decode(substr($image, strpos($image, ',') + 1)); + Storage::disk('public')->put($filename, $img); + MeetingImage::create($insert); } catch (\Throwable $e) { // 失敗 @@ -41,6 +48,7 @@ class MeetingImagesController extends Controller { return ['status_code' => 400]; } } + return ['status_code' => 200]; } diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index 1c077548..1caa51e4 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -501,7 +501,7 @@ class MeetingsController extends Controller { 'title' => 'required|max:100', 'text' => 'required|max:2000', 'memo' => 'nullable|max:2000', - 'pdf' => 'nullable|mimes:pdf' + 'pdf' => 'nullable|mimes:pdf', ]); if ($validate->fails()) {