diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php index e906a75..ba9e249 100644 --- a/app/Http/Controllers/EjaculationController.php +++ b/app/Http/Controllers/EjaculationController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\User; use Validator; use App\Ejaculation; use Illuminate\Http\Request; @@ -53,8 +54,11 @@ class EjaculationController extends Controller // TODO: not implemented } - public function destroy() + public function destroy($id) { - // TODO: not implemented + $ejaculation = Ejaculation::findOrFail($id); + $user = User::findOrFail($ejaculation->user_id); + $ejaculation->delete(); + return redirect()->route('profile', ['name' => $user->name])->with('status', '削除しました。'); } } \ No newline at end of file diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 3f2cad8..f398126 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -22,6 +22,7 @@ class UserController extends Controller // チェックインの取得 $query = Ejaculation::select(DB::raw(<<<'SQL' +id, to_char(ejaculated_date, 'YYYY/MM/DD HH24:MI') AS ejaculated_date, note, is_private, diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php new file mode 100644 index 0000000..3049ff3 --- /dev/null +++ b/resources/views/components/modal.blade.php @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index d339ae6..e1b0176 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,7 +1,7 @@ @extends('layouts.base') -@section('head') -@endsection +@push('head') +@endpush @section('content')
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index c8b8c15..2817a1f 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -12,7 +12,7 @@ - @yield('head') + @stack('head')
+@if (session('status')) +
+ +
+@endif @yield('content')