work on user role module

Modules/User/app/Http/Controllers/RoleController.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Modules\User\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Modules\User\Repositories\RoleRepository;
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
+
+class RoleController extends Controller
+{
+    private $roleRepository;
+    public function __construct(RoleRepository $roleRepository){
+        $this->roleRepository = $roleRepository;
+    }
+   /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $data['roles'] = $this->roleRepository->findAll();
+        $data['editable'] = false;
+        return view('user::role.index', $data);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        $data['permissions'] = Permission::get();
+        $data['title'] = "Create Role";
+        return view('user::role.create', $data);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        $request->validate(['name' => 'required']);
+
+        $role = $this->roleRepository->create($request->all());
+
+        $role->syncPermissions($request->permissions);
+
+        toastr()->success('New role has been created!');
+
+        return redirect()->route('role.index');
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(Role $role)
+    {
+        $data['permissions'] = Permission::get();
+        $data['role'] = $role;
+        $data['title'] = "Edit Role";
+        return view('user::role.edit', $data);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, Role $role)
+    {
+        $role->update(['name' => $request->name]);
+        $role->syncPermissions($request->permissions);
+        toastr()->success('Role has been updated!');
+        return redirect()->route('role.index');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(Role $role)
+    {
+        $role->delete();
+        toastr()->success('Role has been deleted!');
+    }
+}

Modules/User/app/Http/Controllers/UserController.php

@@ -22,9 +22,9 @@ class UserController extends Controller
 
     public function index()
     {
-        $data = User::latest()->get();
-        $editable = false;
-        return view('user::index', compact('data', 'editable'));
+        $data['editable'] = false;
+        $data['users'] = $this->userRepository->findAll();
+        return view('user::user.index', $data);
     }
 
     /**
@@ -33,8 +33,7 @@ class UserController extends Controller
     public function create()
     {
         $data['title'] = "Create User";
-        $data['users'] = User::latest()->get();
-        return view('user::create', $data);
+        return view('user::user.create', $data);
     }
 
     /**
@@ -50,7 +49,7 @@ class UserController extends Controller
 
         $user = $this->userRepository->create($validatedData, $request->role);
         toastr()->success('User has been created!');
-        return redirect()->route('users.index');
+        return redirect()->route('user.index');
     }
 
     /**
@@ -59,7 +58,8 @@ class UserController extends Controller
 
     public function show($id)
     {
-        return view('user::show');
+        $data['user'] = $this->userRepository->getUserById($id);
+        return view('user::user.show');
     }
 
     /**
@@ -68,8 +68,8 @@ class UserController extends Controller
     public function edit($id)
     {
         $data['title'] = "Edit User";
-        $data['user'] = User::findOrFail($id);
-        return view('user::edit', $data);
+        $data['user'] = $this->userRepository->getUserById($id);
+        return view('user::user.edit', $data);
     }
 
     /**