From 66f4c45f5c9c2e4f31913d66c3ff21be551284e6 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Wed, 4 Sep 2019 20:52:26 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=89?=
 =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=82=92=E5=A4=89=E6=9B=B4=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/SettingController.php | 10 ++++++++++
 resources/views/setting/profile.blade.php  |  9 ++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 1448360..76c9676 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
 
 class SettingController extends Controller
 {
@@ -18,10 +19,18 @@ class SettingController extends Controller
         $inputs = $request->all();
         $validator = Validator::make($inputs, [
             'display_name' => 'required|string|max:20',
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore(Auth::user()->email, 'email')
+            ],
             'bio' => 'nullable|string|max:160',
             'url' => 'nullable|url|max:2000'
         ], [], [
             'display_name' => '名前',
+            'email' => 'メールアドレス',
             'bio' => '自己紹介',
             'url' => 'URL'
         ]);
@@ -32,6 +41,7 @@ class SettingController extends Controller
 
         $user = Auth::user();
         $user->display_name = $inputs['display_name'];
+        $user->email = $inputs['email'];
         $user->bio = $inputs['bio'] ?? '';
         $user->url = $inputs['url'] ?? '';
         $user->save();
diff --git a/resources/views/setting/profile.blade.php b/resources/views/setting/profile.blade.php
index 0abfb94..706b1df 100644
--- a/resources/views/setting/profile.blade.php
+++ b/resources/views/setting/profile.blade.php
@@ -32,9 +32,12 @@
             <small class="form-text text-muted">現在は変更できません。</small>
         </div>
         <div class="from-group mt-3">
-            <label for="name">メールアドレス</label>
-            <input id="name" name="name" type="text" class="form-control" value="{{ Auth::user()->email }}" disabled>
-            <small class="form-text text-muted">現在は変更できません。</small>
+            <label for="email">メールアドレス</label>
+            <input id="email" name="email" type="email" class="form-control {{ $errors->has('email') ? ' is-invalid' : '' }}" value="{{ old('email') ?? Auth::user()->email }}">
+
+            @if ($errors->has('email'))
+                <div class="invalid-feedback">{{ $errors->first('email') }}</div>
+            @endif
         </div>
         <div class="form-group mt-3">
             <label for="bio">自己紹介</label>