update

app/Http/Controllers/Auth/AuthenticationController.php

@@ -49,7 +49,7 @@ class AuthenticationController extends Controller
             'phone' => ['required', 'integer'],
         ]);
 
-        User::create([
+       $user = User::create([
             'name' => $request->name,
             'email' => $request->email,
             'password' => bcrypt($request->password),
@@ -59,6 +59,7 @@ class AuthenticationController extends Controller
             'email_verified_at' => now()
         ])->assignRole('user');
 
+        dd($user);
         return response()->json(['success' => true, 'message' => 'User created successfully!', 'redirect_url' => route('userLogin')]);
     }
 

app/Http/Controllers/CommentsController.php

@@ -0,0 +1,171 @@
+<?php
+        namespace App\Http\Controllers;
+        use App\Http\Controllers\Controller;
+        use Illuminate\Http\Request;
+        use App\Models\Comments;
+        use Illuminate\Support\Facades\DB;
+        use Illuminate\Support\Facades\Validator;
+        use App\Service\CommonModelService;
+        use App\Repositories\CommentsRepository;
+        use Log;
+        use Exception;
+
+        class CommentsController extends Controller
+        {
+            protected $modelService;
+            protected $commentRepository;
+            public function __construct(Comments $model, CommentsRepository $commentRepository)
+            {
+                $this->modelService = new CommonModelService($model);
+                $this->commentRepository = $commentRepository;
+            }
+           public function index(Request $request)
+            {
+                createActivityLog(CommentsController::class, 'index', ' Comments index');
+                $data = Comments::where('status','<>',-1)->orderBy('created_at')->get();
+               
+                return view("crud.generated.comments.index", compact('data'));
+            }
+
+            public function create(Request $request)
+            {
+                createActivityLog(CommentsController::class, 'create', ' Comments create');
+                $TableData = Comments::where('status','<>',-1)->orderBy('created_at')->get();
+                return view("crud.generated.comments.create",compact('TableData'));
+            }
+
+            public function store(Request $request)
+            {
+                createActivityLog(CommentsController::class, 'store', ' Comments store');
+                $validator = Validator::make($request->all(), [
+                    //ADD REQUIRED FIELDS FOR VALIDATION
+                ]);
+
+                if ($validator->fails()) {
+                    return response()->json([
+                        'error' => $validator->errors(),
+                    ],500);
+                }
+               
+                $requestData=$request->all();
+                array_walk_recursive($requestData, function (&$value) {
+                    $value = str_replace(env('APP_URL').'/', '', $value);
+                });
+                array_walk_recursive($requestData, function (&$value) {
+                    $value = str_replace(env('APP_URL'), '', $value);
+                });              
+                $this->commentRepository->create($requestData);
+
+                if ($request->ajax()) {
+                    return response()->json(['status' => true, 'message' => 'The Comments Created Successfully.'], 200);
+                }
+                return redirect()->route('comments.index')->with('success','The Comments created Successfully.');
+            }
+          
+            public function sort(Request $request)
+            {
+                $idOrder = $request->input('id_order');
+                
+                foreach ($idOrder as $index => $id) {
+                    $companyArticle = Comments::find($id);
+                    $companyArticle->display_order = $index + 1;
+                    $companyArticle->save();
+                }
+            
+                return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+            }
+            public function updatealias(Request $request)
+            {
+                
+                $articleId = $request->input('articleId');
+                $newAlias = $request->input('newAlias');
+                $companyArticle = Comments::find($articleId);
+                if (!$companyArticle) {
+                    return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
+                }
+                $companyArticle->alias = $newAlias;
+                $companyArticle->save();
+                return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
+            }
+        
+            
+            
+
+            public function show(Request $request, $id)
+            {
+                createActivityLog(CommentsController::class, 'show', ' Comments show');
+                $data = Comments::findOrFail($id);
+                
+                return view("crud.generated.comments.show", compact('data'));
+            }
+
+
+            public function edit(Request $request, $id)
+            {
+                createActivityLog(CommentsController::class, 'edit', ' Comments edit');
+                $TableData = Comments::where('status','<>',-1)->orderBy('created_at')->get();
+                $data = Comments::findOrFail($id);
+                if ($request->ajax()) {
+                    $html = view("crud.generated.comments.ajax.edit", compact('data'))->render();
+                    return response()->json(['status' => true, 'content' => $html], 200);
+                }
+                return view("crud.generated.comments.edit", compact('data','TableData'));
+            }
+
+
+            public function update(Request $request, $id)
+            {
+                createActivityLog(CommentsController::class, 'update', ' Comments update');
+                $validator = Validator::make($request->all(), [
+                   //ADD VALIDATION FOR REQIRED FIELDS
+                ]);
+
+                if ($validator->fails()) {
+                    return response()->json([
+                        'error' => $validator->errors(),
+                    ],500);
+                }
+                $filterData=$request->except(['_method','_token']);
+                array_walk_recursive($filterData, function (&$value) {
+                    $value = str_replace(env('APP_URL').'/', '', $value);
+                });
+                array_walk_recursive($filterData, function (&$value) {
+                    $value = str_replace(env('APP_URL'), '', $value);
+                });
+                $this->commentRepository->update($id, $filterData);
+                if ($request->ajax()) {
+                    return response()->json(['status' => true, 'message' => 'The Comments updated Successfully.'], 200);
+                }
+                // return redirect()->route('comments.index')->with('success','The Comments updated Successfully.');
+                return redirect()->back()->with('success', 'The  Comments  updated successfully.');
+            }
+
+            public function destroy(Request $request,$id)
+            {
+                // dd($id);
+                $this->commentRepository->delete($id);
+                return response()->json(['status'=>true,'message'=>'The Comments Deleted Successfully.'],200);
+            }
+            public function toggle(Request $request,$id)
+            {
+                createActivityLog(CommentsController::class, 'destroy', ' Comments destroy');
+                $data = Comments::findOrFail($id);
+                $requestData=['status'=>($data->status==1)?0:1];
+                DB::beginTransaction();
+                try {
+                    $OperationNumber = getOperationNumber();
+                    $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
+                } catch (Exception $e) {
+                    DB::rollBack();
+                    Log::info($e->getMessage());
+                    createErrorLog(CommentsController::class, 'destroy', $e->getMessage());
+                    return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+                }
+                DB::commit();
+                return response()->json(['status'=>true,'message'=>'The Comments Deleted Successfully.'],200);
+            }
+         
+
+            
+        }
+        

app/Http/Controllers/PermissionsController.php

@@ -3,148 +3,104 @@
 namespace App\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\RoleRepository;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
-use App\Service\CommonModelService;
 use Spatie\Permission\Models\Permission;
-use Spatie\Permission\Models\Role;
-use Log;
-use Exception;
+use App\Repositories\PermissionRepository;
+
 
 class PermissionsController extends Controller
 {
-    protected $modelService;
-    public function __construct(Permission $model)
-    {
-        $this->modelService = new CommonModelService($model);
-    }
-    public function index(Request $request)
-    {
-        createActivityLog(PermissionsController::class, 'index', ' Permissions index');
-        $data = Permission::get();
+    private $permissionRepository;
+    private $role;
 
-        return view("crud.generated.permissions.index", compact('data'));
+    public function __construct(permissionRepository $permissionRepository,
+                                RoleRepository $role)
+    {
+        $this->permissionRepository = $permissionRepository;
+        $this->role = $role;
+    }
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $data['title'] = 'Permission Lists';
+        $data['permissionLists'] = $this->permissionRepository->getPermissionListsArrangedByPrefix();
+        $data['roles'] = $this->role->pluck();
+        $data['editable'] = false;
+        return view('crud.generated.permissions.index', $data);
     }
 
-    public function create(Request $request)
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
     {
-        createActivityLog(PermissionsController::class, 'create', ' Permissions create');
-        $TableData = Permission::get();
-        return view("crud.generated.permissions.create", compact('TableData'));
+        $data['editable'] = false;
+        $data['permissionLists'] = $this->permissionRepository->getPermissionListsArrangedByPrefix();
+        return view('user::role.create', $data);
+
     }
 
+    /**
+     * Store a newly created resource in storage.
+     */
     public function store(Request $request)
     {
-        $validated = $request->validate([
-            'name' => 'required|max:255',
-        ]);
 
-        Permission::create($validated);
-
-        if ($request->ajax()) {
-            return response()->json(['status' => true, 'message' => 'The Permissions Created Successfully.'], 200);
-        }
-        return redirect()->route('permissions.index')->with('success', 'The Permissions created Successfully.');
     }
 
-    public function sort(Request $request)
-    {
-        $idOrder = $request->input('id_order');
-
-        foreach ($idOrder as $index => $id) {
-            $companyArticle = Permission::find($id);
-            $companyArticle->display_order = $index + 1;
-            $companyArticle->save();
-        }
-
-        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
-    }
-    public function updatealias(Request $request)
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
     {
 
-        $articleId = $request->input('articleId');
-        $newAlias = $request->input('newAlias');
-        $companyArticle = Permission::find($articleId);
-        if (!$companyArticle) {
-            return response()->json(['status' => false, 'content' => 'Company article not found.'], 404);
-        }
-        $companyArticle->alias = $newAlias;
-        $companyArticle->save();
-        return response()->json(['status' => true, 'content' => 'Alias updated successfully.'], 200);
     }
 
-
-
-
-    public function show(Request $request, $id)
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(Permission $permission)
     {
-        createActivityLog(PermissionsController::class, 'show', ' Permissions show');
-        $data = Permission::findOrFail($id);
-
-        return view("crud.generated.permissions.show", compact('data'));
+        $data['title'] = "Edit Role";
+        $data['editable'] = true;
+        $data['role'] = $this->role->getRoleById($id);
+        $data['permissionIDsArray'] = $data['role']?->permissions?->pluck('id')->toArray();
+        $data['permissionLists'] = $this->permissionRepository->getPermissionListsArrangedByPrefix();
+        return view('user::role.edit', $data);
     }
 
-
-    public function edit(Request $request, $id)
-    {
-        createActivityLog(PermissionsController::class, 'edit', ' Permissions edit');
-        $TableData = Permission::get();
-        $data = Permission::findOrFail($id);
-        if ($request->ajax()) {
-            $html = view("crud.generated.permissions.ajax.edit", compact('data'))->render();
-            return response()->json(['status' => true, 'content' => $html], 200);
-        }
-        return view("crud.generated.permissions.edit", compact('data', 'TableData'));
-    }
-
-
+    /**
+     * Update the specified resource in storage.
+     */
     public function update(Request $request, Permission $permission)
     {
-
-        $validated = $request->validate(['name' => 'required']);
-
-        $permission->update($validated);
-       
-        if ($request->ajax()) {
-            return response()->json(['status' => true, 'message' => 'The Permissions updated Successfully.'], 200);
-        }
-        // return redirect()->route('permissions.index')->with('success','The Permissions updated Successfully.');
-        return redirect()->route('permissions.index')->with('success', 'The  Permissions  updated successfully.');
+        //
     }
 
-    public function destroy(Request $request, $id)
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
     {
-        createActivityLog(PermissionsController::class, 'destroy', ' Permissions destroy');
-        DB::beginTransaction();
-        try {
-            $OperationNumber = getOperationNumber();
-            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
-        } catch (Exception $e) {
-            DB::rollBack();
-            Log::info($e->getMessage());
-            createErrorLog(PermissionsController::class, 'destroy', $e->getMessage());
-            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
-        }
-        DB::commit();
-        return response()->json(['status' => true, 'message' => 'The Permissions Deleted Successfully.'], 200);
+       $permissionDelete = $this->permissionRepository->getPermissionById($id);
+
+        $permissionDelete->delete();
+        return response()->json(['status' => true, 'message' => 'Permission has been deleted'] );
     }
-    public function toggle(Request $request, $id)
+
+    public function generatePermissionFromRoutes()
     {
-        createActivityLog(PermissionsController::class, 'destroy', ' Permissions destroy');
-        $data = Permission::findOrFail($id);
-        $requestData = ['status' => ($data->status == 1) ? 0 : 1];
-        DB::beginTransaction();
         try {
-            $OperationNumber = getOperationNumber();
-            $this->modelService->update($OperationNumber, $OperationNumber, null, $requestData, $id);
-        } catch (Exception $e) {
-            DB::rollBack();
-            Log::info($e->getMessage());
-            createErrorLog(PermissionsController::class, 'destroy', $e->getMessage());
-            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+            $this->permissionRepository->generatePermissionFromRoutes();
+            toastr()->success('Permission generated successfully!');
+        } catch (\Throwable $th) {
+            toastr()->error($th->getMessage());
+
         }
-        DB::commit();
-        return response()->json(['status' => true, 'message' => 'The Permissions Deleted Successfully.'], 200);
+        return to_route('permissions.index');
+
     }
 }

app/Http/Controllers/RolesController.php

@@ -3,123 +3,101 @@
 namespace App\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\PermissionRepository;
 use Illuminate\Http\Request;
 use App\Models\Roles;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
-use App\Service\CommonModelService;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
+use Illuminate\Http\RedirectResponse;
+use Brian2694\Toastr\Facades\Toastr;
+use App\Repositories\RoleRepository;
 use Log;
 use Exception;
 
 class RolesController extends Controller
 {
-    protected $modelService;
-    public function __construct(Roles $model)
-    {
-        $this->modelService = new CommonModelService($model);
+    private $roleRepository;
+    private $permissionRepository;
+    public function __construct(
+        RoleRepository $roleRepository,
+        PermissionRepository $permissionRepository
+    ) {
+        $this->roleRepository = $roleRepository;
+        $this->permissionRepository = $permissionRepository;
     }
+
     public function index(Request $request)
     {
+        $data['title'] = "List Roles";
         createActivityLog(RolesController::class, 'index', ' Roles index');
-        $data = Role::whereNotIn('name', ['admin'])->get();
+        $roles = $this->roleRepository->findAll();
 
-        return view("crud.generated.roles.index", compact('data'));
+        return view("crud.generated.roles.index", compact('roles'));
     }
 
-    public function create(Request $request)
+    public function create()
     {
-        createActivityLog(RolesController::class, 'create', ' Roles create');
-        $TableData = Roles::get();
-        $permissions = Permission::all();
-        return view("crud.generated.roles.create", compact('TableData', 'permissions'));
+        $data['title'] = "Create Role";
+        $data['editable'] = false;
+        $data['permissionLists'] = $this->permissionRepository->getPermissionListsArrangedByPrefix();
+        return view('crud.generated.roles.create', $data);
     }
 
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
     {
-        $validated = $request->validate(['name' => ['required', 'min:3']]);
-        $role = Role::create($validated);
+        try {
 
-        if ($role->hasPermissionTo($request->permission, 'web')) {
-            return back()->with('message', 'Permission exists.');
+            $validatedData = $request->validate([
+                'name' => 'required',
+                'guard_name' => 'string',
+            ]);
+
+            $role = $this->roleRepository->create($validatedData);
+
+            $role->permissions()->attach($request->permissions);
+
+            Toastr::success('New Role has been created', 'Title', ["positionClass" => "toast-top-center"]);
+        } catch (\Throwable $th) {
+            Toastr::success('Error while creating', 'Title', ["positionClass" => "toast-top-center"]);
         }
-        $role->givePermissionTo($request->permission);
-
-        if ($request->ajax()) {
-            return response()->json(['status' => true, 'message' => 'The Roles Created Successfully.'], 200);
-        }
-        return redirect()->route('roles.index')->with('success', 'The Roles created Successfully.');
+        return redirect()->route('roles.index');
     }
-
-    public function sort(Request $request)
+    public function show(string $id)
     {
-        $idOrder = $request->input('id_order');
-
-        foreach ($idOrder as $index => $id) {
-            $companyArticle = Roles::find($id);
-            $companyArticle->display_order = $index + 1;
-            $companyArticle->save();
-        }
-
-        return response()->json(['status' => true, 'content' => 'The articles sorted successfully.'], 200);
+        //
     }
 
 
-
-
-    public function show(Request $request, $id)
+    public function edit($id)
     {
-        createActivityLog(RolesController::class, 'show', ' Roles show');
-        $data = Roles::findOrFail($id);
-
-        return view("crud.generated.roles.show", compact('data'));
+        $data['title'] = "Edit Role";
+        $data['editable'] = false;
+        $data['role'] = $this->roleRepository->getRoleById($id);
+        $data['permissionIDsArray'] = $data['role']?->permissions?->pluck('id')->toArray();
+        $data['permissionLists'] = $this->permissionRepository->getPermissionListsArrangedByPrefix();
+        return view('crud.generated.roles.edit', $data);
     }
 
-
-    public function edit(Request $request, $id)
+    public function update(Request $request, $id): RedirectResponse
     {
-        createActivityLog(RolesController::class, 'edit', ' Roles edit');
-        $permissions = Permission::all();
-        $TableData = Role::get();
-        $data = Role::findOrFail($id);
-        if ($request->ajax()) {
-            $html = view("crud.generated.roles.ajax.edit", compact('data'))->render();
-            return response()->json(['status' => true, 'content' => $html], 200);
+        try {
+            $validatedData = $request->validate([
+                'name' => 'required',
+                'guard_name' => 'string',
+            ]);
+
+            $role = $this->roleRepository->update($id, $validatedData);
+            $role->permissions()->sync($request->permissions);
+
+            Toastr::success('Role has been updated', 'Title', ["positionClass" => "toast-top-center"]);
+        } catch (\Throwable $th) {
+            Toastr::success('Error while updating', 'Title', ["positionClass" => "toast-top-center"]);
         }
-        return view("crud.generated.roles.edit", compact('data', 'TableData', 'permissions'));
+        return redirect()->route('roles.index');
     }
 
-
-    public function update(Request $request, Role $role)
+    public function destroy($id)
     {
-        $permission = $request->permission;
-        $validated = $request->validate(['name' => ['required', 'min:3']]);
-        $role->update($validated);
-
-        if($permission){
-            $role->givePermissionTo($permission);
-        }
-
-        if ($request->ajax()) {
-            return response()->json(['status' => true, 'message' => 'The Roles updated Successfully.'], 200);
-        }
-        // return redirect()->route('roles.index')->with('success','The Roles updated Successfully.');
-        return redirect()->back()->with('success', 'The  Roles  updated successfully.');
-    }
-
-    public function destroy(Role $role)
-    {
-        $role->delete();
-        return response()->json(['status' => true, 'message' => 'The Roles Deleted Successfully.'], 200);
-    }
-
-    public function revokePermission(Role $role, Permission $permission)
-    {
-        if ($role->hasPermissionTo($permission)) {
-            $role->revokePermissionTo($permission);
-            return back()->with('message', 'Permission revoked.');
-        }
-        return back()->with('message', 'Permission not exists.');
+        $this->roleRepository->delete($id);
+        Toastr::success('Role has been deleted', 'Title', ["positionClass" => "toast-top-center"]);
+        return response()->json(['status' => true, 'message' => 'Role has been deleted!']);
     }
 }

app/Http/Controllers/UsersController.php

@@ -3,115 +3,135 @@
 namespace App\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\RoleInterface;
+use App\Repositories\RoleRepository;
+use App\Repositories\UserRepository;
 use Illuminate\Http\Request;
-use App\Models\User;
-use Illuminate\Support\Facades\DB;
-use Spatie\Permission\Models\Permission;
-use Spatie\Permission\Models\Role;
-use App\Service\CommonModelService;
-use Log;
-use Exception;
+use Illuminate\Http\RedirectResponse;
+use Brian2694\Toastr\Facades\Toastr;
 
 class UsersController extends Controller
 {
-    protected $modelService;
+    protected $userRepository;
+    protected $employeeRepository;
+    protected $roleRepository;
 
-    public function __construct(User $model)
+    public function __construct(UserRepository $userRepository, RoleRepository $roleRepository)
     {
-        $this->modelService = new CommonModelService($model);
+        $this->userRepository = $userRepository;
+        $this->roleRepository = $roleRepository;
     }
 
-    public function index(Request $request)
+    public function index()
     {
-        createActivityLog(UsersController::class, 'index', 'User index');
-        $data = User::get();
-        return view("crud.generated.users.index", compact('data'));
+        $data['users'] = $this->userRepository->findAll();
+        $data['editable'] = false;
+        $data['roleLists'] = $this->roleRepository->pluck();
+        return view('crud.generated.users.index', $data);
     }
 
-    public function show(Request $request, $id)
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
     {
-        createActivityLog(UsersController::class, 'show', 'User show');
-        $data = User::findOrFail($id);
-        return view("crud.generated.User.show", compact('data'));
+        $data['title'] = "Create User";
+        $data['editable'] = false;
+        $data['roleLists'] = $this->roleRepository->pluck();
+        return view('crud.generated.users.create', $data);
     }
 
-    public function edit(Request $request, $id)
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
     {
-        createActivityLog(UsersController::class, 'edit', 'User edit');
-        $TableData = User::get();
-        $data = User::findOrFail($id);
-        $roles = Role::all();
-        $permissions = Permission::all();
+        // try {
 
-        if ($request->ajax()) {
-            $html = view("crud.generated.User.ajax.edit", compact('data'))->render();
-            return response()->json(['status' => true, 'content' => $html], 200);
-        }
+        $validated = $request->validate([
+            'name' => 'required|min:5',
+            'email' => 'required',
+            'password' => 'required',
+        ]);
 
-        return view("crud.generated.users.edit", compact('data', 'TableData', 'roles', 'permissions'));
+        $validated['password'] = bcrypt($validated['password']);
+
+        $this->userRepository->create($validated, $request->role);
+
+        Toastr::success('User has been created successfully.', 'Title', ["positionClass" => "toast-top-center"]);
+
+        // } catch (\Throwable $th) {
+
+        //     echo $th->getMessage();
+
+        //     toastr()->error($th->getMessage());
+
+        // }
+
+        return redirect()->route('user.index');
     }
 
-    public function update(Request $request, User $user)
+    /**
+     * Show the specified resource.
+     */
+
+    public function show($id)
     {
-        // dd($request->toArray());
-
-        if ($request->permission) {
-            if ($user->hasPermissionTo($request->permission)) {
-                return redirect()->back()->with('error', 'The User already has this permission.');
-            }
-            $user->givePermissionTo($request->permission);
-        }
-        if ($request->role) {
-            if ($user->hasRole($request->role)) {
-                return redirect()->back()->with('error', 'The User already has this role.');
-            }
-            $user->assignRole($request->role);
-        }
-
-        if ($request->ajax()) {
-            return response()->json(['status' => true, 'message' => 'The User updated Successfully.'], 200);
-        }
-
-        // Logic to update user should be added here
-
-        return redirect()->back()->with('success', 'The User updated successfully.');
+        $data['user'] = $this->userRepository->getUserById($id);
+        return view('user::user.show');
     }
 
-    public function destroy(Request $request, $id)
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
     {
-        createActivityLog(UsersController::class, 'destroy', 'User destroy');
-        DB::beginTransaction();
+        $data['title'] = "Edit User";
+        $data['editable'] = true;
+        $data['roleLists'] = $this->roleRepository->pluck();
+        $data['user'] = $this->userRepository->getUserById($id);
+        return view('crud.generated.users.edit', $data);
+    }
 
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
         try {
-            $OperationNumber = getOperationNumber();
-            $this->modelService->destroy($OperationNumber, $OperationNumber, $id);
-        } catch (Exception $e) {
-            DB::rollBack();
-            Log::info($e->getMessage());
-            createErrorLog(UsersController::class, 'destroy', $e->getMessage());
-            return response()->json(['status' => false, 'message' => $e->getMessage()], 500);
+
+            $validated = $request->validate([
+                'name' => 'required|min:5',
+                'email' => 'required',
+                'password' => 'required',
+            ]);
+
+            $validated['password'] = bcrypt($validated['password']);
+
+            $this->userRepository->update($id, $validated, $request->role);
+
+            Toastr::success('User has been updated', 'Title', ["positionClass" => "toast-top-center"]);
+        } catch (\Throwable $th) {
+
+            toastr()->error($th->getMessage());
         }
 
-        DB::commit();
-        return response()->json(['status' => true, 'message' => 'The User Deleted Successfully.'], 200);
+        return redirect()->route('user.index');
     }
 
-    public function removeRole(User $user, Role $role)
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
     {
-        if ($user->hasRole($role)) {
-            $user->removeRole($role);
-            return back()->with('message', 'Role removed.');
-        }
+        try {
 
-        return back()->with('message', 'Role not exists.');
-    }
+            $this->userRepository->delete($id);
 
-    public function revokePermission(User $user, Permission $permission)
-    {
-        if ($user->hasPermissionTo($permission)) {
-            $user->revokePermissionTo($permission);
-            return back()->with('message', 'Permission revoked.');
+            Toastr::success('User has been deleted', 'Title', ["positionClass" => "toast-top-center"]);
+        } catch (\Throwable $th) {
+
+            Toastr::success('Error deleting user', 'Title', ["positionClass" => "toast-top-center"]);
         }
-        return back()->with('message', 'Permission does not exists.');
     }
 }

app/Http/Controllers/WebsiteController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Mail\sendEmail;
 use App\Models\Advertisements;
 use App\Models\Articles;
+use App\Models\Comments;
 use App\Models\Economies;
 use App\Models\Horoscopes;
 use App\Models\Menuitems;
@@ -18,6 +19,7 @@ use App\Models\Teams;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Route;
 use App\Models\Videos;
 use Share;
 
@@ -27,6 +29,13 @@ class WebsiteController extends Controller
 
     public function __construct()
     {
+        $routes = Route::getRoutes();
+        // dd($routes);
+        // foreach ($routes as $route) {
+        //    $name=  $route->getName();
+        //    dump($name);
+        // }
+        // dd('end');
         $this->path = config('app.client_path');
 
         $headerMenuItems = Menuitems::where(['parent_menu' => 0, "status" => 1, "menulocations_id" => 1])->with('children')->orderBy('display_order')->get();
@@ -36,6 +45,8 @@ class WebsiteController extends Controller
         $ads = Advertisements::where('status', 1)->where('parent_advertisement', 0)->get();
         $adsWithChildren = Advertisements::where('status', 1)->where('parent_advertisement', 0)->orderBy('display_order')->with('children')->get();
         $popup = Popups::where('status',1)->latest()->first();
+        $route = Route::getRoutes();
+    
         View::share(
             [
                 'headerMenuItems' => $headerMenuItems,
@@ -104,7 +115,8 @@ class WebsiteController extends Controller
 
         $news->views_count = $news->views_count + 1;
         $news->save();
-
+        $newsWithComment = News::with('comments')->where('news_id', $news->news_id)->get();
+        // dd($newsWithComment->toArray());
         $recentNews = News::where('status', 1)
             ->where('news_id', '!=', $news->news_id)
             ->inRandomOrder()
@@ -112,7 +124,7 @@ class WebsiteController extends Controller
             ->latest()
             ->get();
 
-        return view($this->path . '.news-detail', compact('news', 'recentNews','shareComponent'));
+        return view($this->path . '.news-detail', compact('news', 'recentNews','shareComponent','newsWithComment'));
     }
 
 

app/Http/Kernel.php

@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\PermissionMiddleware::class,
         ],
 
         'api' => [
@@ -64,8 +65,8 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
-        'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class,
-        'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
+        // 'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
+        'permission' => \App\Http\Middleware\PermissionMiddleware::class,
+        // 'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
     ];
 }

app/Http/Middleware/PermissionMiddleware.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use Spatie\Permission\Exceptions\UnauthorizedException;
+use Spatie\Permission\Guard;
+
+class PermissionMiddleware
+{
+    public function handle($request, Closure $next, $guard = null)
+    {
+        $authGuard = Auth::guard($guard);
+
+        $user = $authGuard->user();
+
+        // For machine-to-machine Passport clients
+        if (!$user && $request->bearerToken() && config('permission.use_passport_client_credentials')) {
+
+            $user = Guard::getPassportClient($guard);
+        }
+
+        if (!$user) {
+
+            throw UnauthorizedException::notLoggedIn();
+        }
+
+        if (!method_exists($user, 'hasAnyPermission')) {
+
+            throw UnauthorizedException::missingTraitHasRoles($user);
+        }
+
+        // if ($user->hasRole('admin')) {
+        //     return $next($request);
+        // }
+
+        foreach ($user->roles as $role) {
+            if ($role->hasPermissionTo($request->route()->getName())) {
+                return $next($request);
+            }
+        }
+
+        throw UnauthorizedException::forPermissions($user->getAllPermissions()->toArray());
+
+    }
+
+    /**
+     * Specify the permission and guard for the middleware.
+     *
+     * @param  array|string  $permission
+     * @param  string|null  $guard
+     * @return string
+     */
+    public static function using($permission, $guard = null)
+    {
+        $permissionString = is_string($permission) ? $permission : implode('|', $permission);
+        $args = is_null($guard) ? $permissionString : "$permissionString,$guard";
+
+        return static::class . ':' . $args;
+    }
+}