diff --git a/README.md b/README.md index 513d7013..cc51dc0f 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,11 @@ npm run watch ( npm run dev ) php artisan migrate:fresh --seed ``` +#### 6.ストレージのリンク +``` +php artisan storage:link +``` + # 仕様書 diff --git a/backend/.env.example b/backend/.env.example index 340b207b..e0150aa9 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -1,4 +1,4 @@ -APP_NAME=KIKIkan +APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/backend/.env.release b/backend/.env.release index 340b207b..e0150aa9 100644 --- a/backend/.env.release +++ b/backend/.env.release @@ -1,4 +1,4 @@ -APP_NAME=KIKIkan +APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/backend/app/Http/Controllers/Api/FatherRelationsController.php b/backend/app/Http/Controllers/Api/FatherRelationsController.php index cfdb2791..bd6c02db 100644 --- a/backend/app/Http/Controllers/Api/FatherRelationsController.php +++ b/backend/app/Http/Controllers/Api/FatherRelationsController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Validator; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use App\Models\Child; @@ -99,10 +100,22 @@ class FatherRelationsController extends Controller { } try { - FatherRelation::where('father_id', session()->get('fathers')['id'])->where('child_id', $child_id)->delete(); + DB::beginTransaction(); + + $rel = FatherRelation::where('father_id', session()->get('fathers')['id'])->where('child_id', (int)$child_id); + + foreach (Meeting::where('father_id', session()->get('fathers')['id'])->get() as $m) { + $apr = MeetingApprovals::where('child_id', (int)$child_id)->where('meeting_id', $m->id); + $apr->delete(); + } + + $rel->delete(); + + DB::commit(); } catch (\Throwable $e) { // 失敗 Log::critical($e->getMessage()); + DB::rollback(); return ['status_code' => 400, 'error_messages' => ['子の削除に失敗しました。']]; } diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index 2e35a9ab..c6e2aa54 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -120,10 +120,9 @@ class MeetingsController extends Controller { $fnames[] = $fname; $image = base64_decode(substr($img, strpos($img, ',') + 1)); Storage::disk('private')->put($fname, $image); - $this->fiximg($filename); + $this->fiximg($fname); $imgname = '/files/'.$fname; - } else { $imgname = $img; @@ -332,7 +331,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->orderBy('created_at', 'desc')->get())) { return ['status_code' => 400]; } @@ -379,7 +378,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->orderBy('created_at', 'desc')->get())) { return ['status_code' => 400]; } @@ -420,7 +419,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('is_favorite', 1)->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('is_favorite', 1)->orderBy('created_at', 'desc')->get())) { return ['status_code' => 400]; } @@ -454,7 +453,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('is_favorite', 0)->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('is_favorite', 0)->orderBy('created_at', 'desc')->get())) { return ['status_code' => 400]; } @@ -556,7 +555,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('title', 'LIKE', '%'.$r->keyword.'%')->orWhere('text', 'LIKE', '%'.$r->keyword.'%')->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('title', 'LIKE', '%'.$r->keyword.'%')->orWhere('text', 'LIKE', '%'.$r->keyword.'%')->orderBy('created_at', 'desc')->get())) { $list = []; } @@ -603,7 +602,7 @@ class MeetingsController extends Controller { $child_select = ['image']; // 取得に成功 - if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('title', 'LIKE', '%'.$r->keyword.'%')->orWhere('text', 'LIKE', '%'.$r->keyword.'%')->get())) { + if (null === ($list = Meeting::select($meeting_select)->where('father_id', (int)$r->father_id)->where('title', 'LIKE', '%'.$r->keyword.'%')->orWhere('text', 'LIKE', '%'.$r->keyword.'%')->orderBy('created_at', 'desc')->get())) { $list = []; } diff --git a/backend/app/Mail/FathersRegistrationTemporaryMail.php b/backend/app/Mail/FathersRegistrationTemporaryMail.php index 5a12c259..696c81a1 100644 --- a/backend/app/Mail/FathersRegistrationTemporaryMail.php +++ b/backend/app/Mail/FathersRegistrationTemporaryMail.php @@ -16,7 +16,7 @@ class FathersRegistrationTemporaryMail extends Mailable { } public function build () { - return $this->subject('【KIKIkan】会員登録のご案内')->markdown('emails.fathers.registration.temporary', [ + return $this->subject('【KIKI】会員登録のご案内')->markdown('emails.fathers.registration.temporary', [ 'token' => $this->token ]); } diff --git a/backend/resources/views/emails/fathers/registration/temporary.blade.php b/backend/resources/views/emails/fathers/registration/temporary.blade.php index 0d1b0827..4331452e 100644 --- a/backend/resources/views/emails/fathers/registration/temporary.blade.php +++ b/backend/resources/views/emails/fathers/registration/temporary.blade.php @@ -1,9 +1,9 @@ @component('mail::message') -# 【KIKIkan】会員登録のご案内 +# 【KIKI】会員登録のご案内 -KIKIkanサービスの会員登録のご案内です。 +KIKIサービスの会員登録のご案内です。 -KIKIkanシステムのご利用ありがとうございます。 +KIKIシステムのご利用ありがとうございます。 ※本登録完了後にホーム画面もしくはブックマークに登録してください。
ログインする際に利用します。 @@ -22,7 +22,7 @@ URLの有効期限を過ぎると、再登録が必要になりますので、 ■□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□■ -KIKIkan運営事務局
+KIKI運営事務局
56@zotman.jp
{{ url('/') }}/ diff --git a/backend/resources/views/vendor/mail/html/header.blade.php b/backend/resources/views/vendor/mail/html/header.blade.php index ed61a133..6276d9ea 100755 --- a/backend/resources/views/vendor/mail/html/header.blade.php +++ b/backend/resources/views/vendor/mail/html/header.blade.php @@ -1,7 +1,7 @@ - +