user can set password

summerblue · Jan 17, 2017 · 1fd45b8 · 1fd45b8
1 parent f7a3730
commit 1fd45b8
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 34 deletions.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -11,6 +11,7 @@
 use Auth;
 use Flash;
 use App\Http\Requests\UpdateUserRequest;
+use App\Http\Requests\ResetPasswordRequest;
 use App\Jobs\SendActivateMail;
 use Phphub\Handler\Exception\ImageUploadException;
 
@@ -185,16 +186,17 @@ public function editPassword($id)
         return view('users.edit_password', compact('user'));
     }
 
-    public function updatePassword($id, Request $request)
+    public function updatePassword($id, ResetPasswordRequest $request)
     {
         $user = User::findOrFail($id);
         $this->authorize('update', $user);
-        $user->email_notify_enabled = $request->email_notify_enabled == 'on' ? 'yes' : 'no';
+
+        $user->password = bcrypt($request->password);
         $user->save();
 
         Flash::success(lang('Operation succeeded.'));
 
-        return redirect(route('users.edit_email_notify', $id));
+        return redirect(route('users.edit_password', $id));
     }
 
     public function githubApiProxy($username)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
@@ -69,11 +69,11 @@
     		            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
     		            邮箱未激活，请前往 {{ Auth::user()->email }} 查收激活邮件，激活后才能完整地使用社区功能，如发帖和回帖。未收到邮件？请前往 <a href="{{ route('email-verification-required') }}">重发邮件</a> 。
     		        </div>
-                {{-- @elseif (Auth::check() && empty(Auth::user()->password) )
+                @elseif (Auth::check() && empty(Auth::user()->password) )
                     <div class="alert alert-warning">
     		            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
     		            未设置登录密码，请前往 <a href="{{ route('users.edit_password', [Auth::id()]) }}">修改密码</a> 页面进行设置。
-    		        </div> --}}
+    		        </div>
 				@endif
 
 				@include('flash::message')

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
@@ -1,18 +1,18 @@
 @extends('layouts.default')
 
 @section('title')
-{{ lang('Edit Profile') }}_@parent
+{{ lang('Edit Profile') }} | @parent
 @stop
 
 @section('content')
 
 <div class="users-show">
 
-  <div class="col-md-3 box" style="padding: 15px 15px;">
+  <div class="col-md-3 main-col">
     @include('users.partials.setting_nav')
   </div>
 
-  <div class="main-col col-md-9 left-col">
+  <div class="col-md-9  left-col ">
 
     <div class="panel panel-default padding-md">
 

diff --git a/resources/views/users/edit_avatar.blade.php b/resources/views/users/edit_avatar.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts.default')
 
 @section('title')
-{{ lang('Photo Upload') }}_@parent
+{{ lang('Photo Upload') }} | @parent
 @stop
 
 @section('content')
 
 <div class="users-show">
 
-  <div class="col-md-3 box" style="padding: 15px 15px;">
+  <div class="col-md-3 main-col ">
     @include('users.partials.setting_nav')
   </div>
 

diff --git a/resources/views/users/edit_email_notify.blade.php b/resources/views/users/edit_email_notify.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts.default')
 
 @section('title')
-{{ lang('Edit Email Notify') }}_@parent
+{{ lang('Edit Email Notify') }} | @parent
 @stop
 
 @section('content')
 
 <div class="users-show">
 
-  <div class="col-md-3 box" style="padding: 15px 15px;">
+  <div class="col-md-3 main-col " >
     @include('users.partials.setting_nav')
   </div>
 
@@ -53,4 +53,4 @@
 
 </div>
 
-@stop
+@stop
diff --git a/resources/views/users/edit_social_binding.blade.php b/resources/views/users/edit_social_binding.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts.default')
 
 @section('title')
-{{ lang('Edit Social Binding') }}_@parent
+{{ lang('Edit Social Binding') }} | @parent
 @stop
 
 @section('content')
 
 <div class="users-show">
 
-  <div class="col-md-3 box" style="padding: 15px 15px;">
+  <div class="col-md-3 main-col ">
     @include('users.partials.setting_nav')
   </div>
 

diff --git a/resources/views/users/partials/setting_nav.blade.php b/resources/views/users/partials/setting_nav.blade.php
@@ -1,20 +1,27 @@
-<div class="padding-md">
-    <div class="list-group text-center">
-      <a href="{{ route('users.edit', $user->id) }}" class="list-group-item {{ navViewActive('users.edit') }}">
-          <i class="text-md fa fa-list-alt" aria-hidden="true"></i>
-          &nbsp;{{ lang('Basic Info') }}
-      </a>
-      <a href="{{ route('users.edit_avatar', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_avatar') }}">
-          <i class="text-md fa fa-picture-o" aria-hidden="true"></i>
-           &nbsp;{{ lang('Change Avatar') }}
-       </a>
-      <a href="{{ route('users.edit_email_notify', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_email_notify') }}">
-          <i class="text-md fa fa-bell" aria-hidden="true"></i>
-          &nbsp;{{ lang('Notification Settings') }}
-      </a>
-      <a href="{{ route('users.edit_social_binding', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_social_binding') }}">
-          <i class="text-md fa fa-flask" aria-hidden="true"></i>
-          &nbsp;{{ lang('Social Account Binding') }}
-      </a>
+<div class="box">
+    <div class="padding-md ">
+        <div class="list-group text-center">
+          <a href="{{ route('users.edit', $user->id) }}" class="list-group-item {{ navViewActive('users.edit') }}">
+              <i class="text-md fa fa-list-alt" aria-hidden="true"></i>
+              &nbsp;{{ lang('Basic Info') }}
+          </a>
+          <a href="{{ route('users.edit_avatar', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_avatar') }}">
+              <i class="text-md fa fa-picture-o" aria-hidden="true"></i>
+               &nbsp;{{ lang('Change Avatar') }}
+           </a>
+          <a href="{{ route('users.edit_email_notify', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_email_notify') }}">
+              <i class="text-md fa fa-bell" aria-hidden="true"></i>
+              &nbsp;{{ lang('Notification Settings') }}
+          </a>
+          <a href="{{ route('users.edit_social_binding', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_social_binding') }}">
+              <i class="text-md fa fa-flask" aria-hidden="true"></i>
+              &nbsp;{{ lang('Social Account Binding') }}
+          </a>
+          <a href="{{ route('users.edit_password', $user->id) }}" class="list-group-item {{ navViewActive('users.edit_password') }}">
+              <i class="text-md fa fa-lock" aria-hidden="true"></i>
+              &nbsp;修改密码
+          </a>
+        </div>
     </div>
+
 </div>
diff --git a/routes/web.php b/routes/web.php
@@ -30,7 +30,7 @@
 Route::get('/users/{id}/edit_email_notify', 'UsersController@editEmailNotify')->name('users.edit_email_notify');
 Route::post('/users/{id}/update_email_notify', 'UsersController@updateEmailNotify')->name('users.update_email_notify');
 Route::get('/users/{id}/edit_password', 'UsersController@editPassword')->name('users.edit_password');
-Route::post('/users/{id}/update_password', 'UsersController@updatePassword')->name('users.update_password');
+Route::patch('/users/{id}/update_password', 'UsersController@updatePassword')->name('users.update_password');
 Route::get('/users/{id}/edit_social_binding', 'UsersController@editSocialBinding')->name('users.edit_social_binding');
 
 Route::get('/users', 'UsersController@index')->name('users.index');