Commit b586a45d authored by Viral Solani's avatar Viral Solani

Move all User related files in to Users folder

parent 71e026d7
...@@ -47,7 +47,7 @@ class UserController extends Controller ...@@ -47,7 +47,7 @@ class UserController extends Controller
*/ */
public function index(ManageUserRequest $request) public function index(ManageUserRequest $request)
{ {
return view('backend.access.index'); return view('backend.access.users.index');
} }
/** /**
...@@ -57,7 +57,7 @@ class UserController extends Controller ...@@ -57,7 +57,7 @@ class UserController extends Controller
*/ */
public function create(CreateUserRequest $request) public function create(CreateUserRequest $request)
{ {
return view('backend.access.create')->with([ return view('backend.access.users.create')->with([
'roles' => $this->roles->getAll(), 'roles' => $this->roles->getAll(),
]); ]);
} }
...@@ -82,7 +82,7 @@ class UserController extends Controller ...@@ -82,7 +82,7 @@ class UserController extends Controller
*/ */
public function show(User $user, ShowUserRequest $request) public function show(User $user, ShowUserRequest $request)
{ {
return view('backend.access.show') return view('backend.access.users.show')
->withUser($user); ->withUser($user);
} }
...@@ -100,15 +100,7 @@ class UserController extends Controller ...@@ -100,15 +100,7 @@ class UserController extends Controller
ksort($userPermissions); ksort($userPermissions);
ksort($permissions); ksort($permissions);
/*return view('backend.access.edit')->with([ return view('backend.access.users.edit', compact('userPermissions', 'permissions'))
'user' => $user,
'userRoles' => $user->roles->pluck('id')->all(),
'roles' => $this->roles->getAll(),
'userPermissions' => $userPermissions,
'permissions' => $permissions
]);*/
return view('backend.access.edit', compact('userPermissions', 'permissions'))
->withUser($user) ->withUser($user)
->withUserRoles($user->roles->pluck('id')->all()) ->withUserRoles($user->roles->pluck('id')->all())
->withRoles($this->roles->getAll()); ->withRoles($this->roles->getAll());
......
...@@ -34,7 +34,7 @@ class UserPasswordController extends Controller ...@@ -34,7 +34,7 @@ class UserPasswordController extends Controller
*/ */
public function edit(User $user, ManageUserRequest $request) public function edit(User $user, ManageUserRequest $request)
{ {
return view('backend.access.change-password') return view('backend.access.users.change-password')
->withUser($user); ->withUser($user);
} }
......
...@@ -35,7 +35,7 @@ class UserStatusController extends Controller ...@@ -35,7 +35,7 @@ class UserStatusController extends Controller
*/ */
public function getDeactivated(ManageDeactivatedRequest $request) public function getDeactivated(ManageDeactivatedRequest $request)
{ {
return view('backend.access.deactivated'); return view('backend.access.users.deactivated');
} }
/** /**
...@@ -45,7 +45,7 @@ class UserStatusController extends Controller ...@@ -45,7 +45,7 @@ class UserStatusController extends Controller
*/ */
public function getDeleted(ManageDeletedRequest $request) public function getDeleted(ManageDeletedRequest $request)
{ {
return view('backend.access.deleted'); return view('backend.access.users.deleted');
} }
/** /**
......
...@@ -64,7 +64,7 @@ class DashboardController extends Controller ...@@ -64,7 +64,7 @@ class DashboardController extends Controller
*/ */
public function editProfile(Request $request) public function editProfile(Request $request)
{ {
return view('backend.access.profile-edit') return view('backend.access.users.profile-edit')
->withLoggedInUser(access()->user()); ->withLoggedInUser(access()->user());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment