From abf8b052534b7393205df14bd14bbf49e9acc9d5 Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 3 Nov 2017 17:48:58 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E5=89=8A=E9=99=A4=E6=A9=9F=E8=83=BD=E3=81=AE=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EjaculationController.php | 8 +- app/Http/Controllers/UserController.php | 1 + resources/views/components/modal.blade.php | 18 ++ resources/views/home.blade.php | 4 +- resources/views/layouts/base.blade.php | 20 +- resources/views/user/base.blade.php | 49 ++++ resources/views/user/profile.blade.php | 236 ++++++++---------- routes/web.php | 1 + 8 files changed, 193 insertions(+), 144 deletions(-) create mode 100644 resources/views/components/modal.blade.php create mode 100644 resources/views/user/base.blade.php 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')