22
33namespace App \Http \Controllers \Admin ;
44
5+ use App \Actions \Admin \User \CreateUser ;
6+ use App \Actions \Admin \User \UpdateUser ;
57use App \Http \Controllers \Controller ;
68use App \Http \Requests \Admin \StoreUserRequest ;
79use App \Http \Requests \Admin \UpdateUserRequest ;
8- use App \Actions \Admin \User \CreateUser ;
9- use App \Actions \Admin \User \UpdateUser ;
10- use App \Models \User ;
1110use App \Models \Role ;
11+ use App \Models \User ;
1212use Illuminate \Http \Request ;
1313use Illuminate \Support \Facades \Hash ;
1414use Illuminate \Validation \Rules ;
1515
1616class UserController extends Controller
1717{
18- function __construct ()
18+ public function __construct ()
1919 {
20- $ this ->middleware ('can:user list ' , ['only ' => ['index ' ,'show ' ]]);
21- $ this ->middleware ('can:user create ' , ['only ' => ['create ' ,'store ' ]]);
22- $ this ->middleware ('can:user edit ' , ['only ' => ['edit ' ,'update ' ]]);
23- $ this ->middleware ('can:user delete ' , ['only ' => ['destroy ' ]]);
20+ $ this ->middleware ('can:user list ' , ['only ' => ['index ' , 'show ' ]]);
21+ $ this ->middleware ('can:user create ' , ['only ' => ['create ' , 'store ' ]]);
22+ $ this ->middleware ('can:user edit ' , ['only ' => ['edit ' , 'update ' ]]);
23+ $ this ->middleware ('can:user delete ' , ['only ' => ['destroy ' ]]);
2424 }
25+
2526 /**
2627 * Display a listing of the resource.
2728 *
@@ -32,7 +33,7 @@ public function index()
3233 $ users = (new User )->newQuery ();
3334
3435 if (request ()->has ('search ' )) {
35- $ users ->where ('name ' , 'Like ' , '% ' . request ()->input ('search ' ) . '% ' );
36+ $ users ->where ('name ' , 'Like ' , '% ' . request ()->input ('search ' ). '% ' );
3637 }
3738
3839 if (request ()->query ('sort ' )) {
@@ -49,7 +50,7 @@ public function index()
4950
5051 $ users = $ users ->paginate (5 );
5152
52- return view ('admin.user.index ' ,compact ('users ' ))
53+ return view ('admin.user.index ' , compact ('users ' ))
5354 ->with ('i ' , (request ()->input ('page ' , 1 ) - 1 ) * 5 );
5455 }
5556
@@ -61,14 +62,15 @@ public function index()
6162 public function create ()
6263 {
6364 $ roles = Role::all ();
65+
6466 return view ('admin.user.create ' , compact ('roles ' ));
6567 }
6668
6769 /**
6870 * Store a newly created resource in storage.
6971 *
7072 * @param \App\Http\Requests\Admin\StoreUserRequest $request
71- * @param \App\Actions\Admin\User\CreateUser $createUser
73+ * @param \App\Actions\Admin\User\CreateUser $createUser
7274 * @return \Illuminate\Http\Response
7375 */
7476 public function store (StoreUserRequest $ request , CreateUser $ createUser )
@@ -89,6 +91,7 @@ public function show(User $user)
8991 {
9092 $ roles = Role::all ();
9193 $ userHasRoles = array_column (json_decode ($ user ->roles , true ), 'id ' );
94+
9295 return view ('admin.user.show ' , compact ('user ' , 'roles ' , 'userHasRoles ' ));
9396 }
9497
@@ -111,7 +114,7 @@ public function edit(User $user)
111114 *
112115 * @param \App\Http\Requests\Admin\UpdateUserRequest $request
113116 * @param \App\Models\User $user
114- * @param \App\Actions\Admin\User\UpdateUser $updateUser
117+ * @param \App\Actions\Admin\User\UpdateUser $updateUser
115118 * @return \Illuminate\Http\Response
116119 */
117120 public function update (UpdateUserRequest $ request , User $ user , UpdateUser $ updateUser )
@@ -159,9 +162,9 @@ public function accountInfoStore(Request $request)
159162 $ user = \Auth::user ()->update ($ request ->except (['_token ' ]));
160163
161164 if ($ user ) {
162- $ message = " Account updated successfully. " ;
165+ $ message = ' Account updated successfully. ' ;
163166 } else {
164- $ message = " Error while saving. Please try again. " ;
167+ $ message = ' Error while saving. Please try again. ' ;
165168 }
166169
167170 return redirect ()->route ('admin.account.info ' )->with ('account_message ' , __ ($ message ));
@@ -179,7 +182,9 @@ public function changePasswordStore(Request $request)
179182 ]);
180183
181184 $ validator ->after (function ($ validator ) use ($ request ) {
182- if ($ validator ->failed ()) return ;
185+ if ($ validator ->failed ()) {
186+ return ;
187+ }
183188 if (! Hash::check ($ request ->input ('old_password ' ), \Auth::user ()->password )) {
184189 $ validator ->errors ()->add (
185190 'old_password ' , __ ('Old password is incorrect. ' )
@@ -194,9 +199,9 @@ public function changePasswordStore(Request $request)
194199 ]);
195200
196201 if ($ user ) {
197- $ message = " Password updated successfully. " ;
202+ $ message = ' Password updated successfully. ' ;
198203 } else {
199- $ message = " Error while saving. Please try again. " ;
204+ $ message = ' Error while saving. Please try again. ' ;
200205 }
201206
202207 return redirect ()->route ('admin.account.info ' )->with ('password_message ' , __ ($ message ));
0 commit comments