From 12736d53c56651cb7ce38c5effd981c7fc8a42b7 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Tue, 12 May 2026 13:58:40 +0330 Subject: [PATCH 1/6] create base thing such as Roler permission Expert and user Management and their dependency for Admin --- .../ExpertManagementController.php | 97 ++++++++ .../PermissionManagementController.php | 78 +++++++ .../Controllers/RoleManagementController.php | 77 ++++++ .../Controllers/UserManagementController.php | 113 +++++++++ .../ExpertManagement/StoreRequest.php | 35 +++ .../ExpertManagement/UpdateRequest.php | 43 ++++ .../PermissionManagement/StoreRequest.php | 29 +++ .../PermissionManagement/UpdateRequest.php | 33 +++ .../Requests/RoleManagement/StoreRequest.php | 31 +++ .../Requests/RoleManagement/UpdateRequest.php | 35 +++ .../Requests/UserManagement/StoreRequest.php | 43 ++++ .../Requests/UserManagement/UpdateRequest.php | 52 +++++ .../Resources/ExpertManagementResource.php | 39 ++++ .../Resources/UserManagementResource.php | 43 ++++ backend/app/Models/User.php | 1 - .../Dashboard/ConfirmController.php | 14 -- .../Dashboard/DocumentationController.php | 24 ++ backend/composer.json | 3 +- backend/composer.lock | 150 +++++++++++- backend/config/permission.php | 219 ++++++++++++++++++ ..._05_10_123913_create_permission_tables.php | 137 +++++++++++ 21 files changed, 1279 insertions(+), 17 deletions(-) create mode 100644 backend/app/Admin/Controllers/ExpertManagementController.php create mode 100644 backend/app/Admin/Controllers/PermissionManagementController.php create mode 100755 backend/app/Admin/Controllers/RoleManagementController.php create mode 100644 backend/app/Admin/Controllers/UserManagementController.php create mode 100644 backend/app/Admin/Requests/ExpertManagement/StoreRequest.php create mode 100644 backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php create mode 100644 backend/app/Admin/Requests/PermissionManagement/StoreRequest.php create mode 100644 backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php create mode 100644 backend/app/Admin/Requests/RoleManagement/StoreRequest.php create mode 100644 backend/app/Admin/Requests/RoleManagement/UpdateRequest.php create mode 100644 backend/app/Admin/Requests/UserManagement/StoreRequest.php create mode 100644 backend/app/Admin/Requests/UserManagement/UpdateRequest.php create mode 100644 backend/app/Admin/Resources/ExpertManagementResource.php create mode 100644 backend/app/Admin/Resources/UserManagementResource.php delete mode 100755 backend/app/User/Controller/Dashboard/ConfirmController.php create mode 100755 backend/app/User/Controller/Dashboard/DocumentationController.php create mode 100644 backend/config/permission.php create mode 100644 backend/database/migrations/2026_05_10_123913_create_permission_tables.php diff --git a/backend/app/Admin/Controllers/ExpertManagementController.php b/backend/app/Admin/Controllers/ExpertManagementController.php new file mode 100644 index 00000000..ef793960 --- /dev/null +++ b/backend/app/Admin/Controllers/ExpertManagementController.php @@ -0,0 +1,97 @@ +json($data); + } + + /** + * Store a newly created resource in storage. + */ + public function store(StoreRequest $request): JsonResponse + { + Expert::query()->create([ + 'username' => $request->username, + 'first_name' => $request->first_name, + 'last_name' => $request->last_name, + 'national_id' => $request->national_id, + 'password' => Hash::make($request->password), + 'email' => $request->email, + 'phone_number' => $request->phone_number, + ]); + + return $this->successResponse(); + } + + /** + * Display the specified resource. + */ + public function show(Expert $expert): JsonResponse + { + return $this->successResponse( + new ExpertManagementResource($expert) + ); + } + + /** + * Update the specified resource in storage. + */ + public function update(UpdateRequest $request, Expert $expert): JsonResponse + { + $expert->update([ + 'username' => $request->username, + 'first_name' => $request->first_name, + 'last_name' => $request->last_name, + 'national_id' => $request->national_id, + 'password' => Hash::make($request->password), + 'email' => $request->email, + 'phone_number' => $request->phone_number, + ]); + + return $this->successResponse(); + } + + /** + * Remove the specified resource from storage. + * @throws Throwable + */ + public function destroy(Expert $expert): JsonResponse + { + DB::transaction(function () use ($expert) { + $expert->roles()->detach(); + $expert->permissions()->detach(); + $expert->delete(); + }); + + return $this->successResponse(); + } +} diff --git a/backend/app/Admin/Controllers/PermissionManagementController.php b/backend/app/Admin/Controllers/PermissionManagementController.php new file mode 100644 index 00000000..10462a70 --- /dev/null +++ b/backend/app/Admin/Controllers/PermissionManagementController.php @@ -0,0 +1,78 @@ +json( + DataTableFacade::run( + Permission::query(), + $request, + allowedFilters: ['*'], + allowedSortings: ['*'] + ) + ); + } + + /** + * Store a newly created resource in storage. + */ + public function store(StoreRequest $request): JsonResponse + { + Permission::create([ + 'name' => $request->name, + 'guard_name' => 'web', + ]); + + return $this->successResponse(); + } + + /** + * Display the specified resource. + */ + public function show(Permission $permission): JsonResponse + { + return $this->successResponse($permission); + } + + /** + * Update the specified resource in storage. + */ + public function update(UpdateRequest $request, Permission $permission): JsonResponse + { + $permission->update([ + 'name' => $request->name, + ]); + + return $this->successResponse(); + } + + /** + * Remove the specified resource from storage. + */ + public function destroy(Permission $permission): JsonResponse + { + $permission->delete(); + + return $this->successResponse(); + } +} diff --git a/backend/app/Admin/Controllers/RoleManagementController.php b/backend/app/Admin/Controllers/RoleManagementController.php new file mode 100755 index 00000000..0a64039c --- /dev/null +++ b/backend/app/Admin/Controllers/RoleManagementController.php @@ -0,0 +1,77 @@ +json($data); + } + + /** + * @throws Throwable + */ + public function store(StoreRequest $request): JsonResponse + { + DB::transaction(function () use ($request) { + $role = Role::create([ + 'name' => $request->name, + 'guard_name' => 'web', + ]); + + $role->givePermissionTo($request->permissions); + }); + + return $this->successResponse(); + } + + /** + * @throws Throwable + */ + public function update(UpdateRequest $request, Role $role): JsonResponse + { + DB::transaction(function () use ($request, $role) { + $role->update([ + 'name' => $request->name, + 'guard_name' => 'web', + ]); + + $role->syncPermissions($request->permissions); + }); + + return $this->successResponse(); + } + + public function show(Role $role): JsonResponse + { + return $this->successResponse($role); + } + + public function destroy(Role $role): JsonResponse + { + $role->delete(); + return $this->successResponse(); + } +} diff --git a/backend/app/Admin/Controllers/UserManagementController.php b/backend/app/Admin/Controllers/UserManagementController.php new file mode 100644 index 00000000..94adf110 --- /dev/null +++ b/backend/app/Admin/Controllers/UserManagementController.php @@ -0,0 +1,113 @@ +json($data); + } + + /** + * Store a newly created resource in storage. + */ + public function store(StoreRequest $request): JsonResponse + { + User::query()->create([ + 'username' => $request->username, + 'first_name' => $request->first_name, + 'last_name' => $request->last_name, + 'national_id' => $request->national_id, + 'password' => Hash::make($request->password), + 'email' => $request->email, + 'birthday' => $request->birthday, + 'phone_number' => $request->phone_number, + 'postal_code' => $request->postal_code, + 'address' => $request->address, + 'province_id' => $request->province_id, + 'province_name' => Province::query()->find($request->province_id)->name, + 'city_id' => $request->city_id, + 'city_name' => City::query()->find($request->city_id)->name, + 'key_status' => $request->key_status, + 'level' => $request->level, + 'tax_id' => $request->tax_id, + ]); + + return $this->successResponse(); + } + + + /** + * Display the specified resource. + */ + public function show(User $user): JsonResponse + { + return $this->successResponse( + new UserManagementResource($user) + ); + } + + /** + * Update the specified resource in storage. + */ + public function update(UpdateRequest $request, User $user): JsonResponse + { + $user->update([ + 'first_name' => $request->first_name, + 'username' => $request->username, + 'last_name' => $request->last_name, + 'national_id' => $request->national_id, + 'password' => Hash::make($request->password), + 'email' => $request->email, + 'birthday' => $request->birthday, + 'phone_number' => $request->phone_number, + 'postal_code' => $request->postal_code, + 'address' => $request->address, + 'province_id' => $request->province_id, + 'province_name' => Province::query()->find($request->province_id)->name, + 'city_id' => $request->city_id, + 'city_name' => City::query()->find($request->city_id)->name, + 'key_status' => $request->key_status, + 'level' => $request->level, + 'tax_id' => $request->tax_id, + ]); + + return $this->successResponse(); + } + + /** + * Remove the specified resource from storage. + * @throws Throwable + */ + public function destroy(User $user): JsonResponse + { + $user->delete(); + + return $this->successResponse(); + } +} diff --git a/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php new file mode 100644 index 00000000..4018cf9f --- /dev/null +++ b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php @@ -0,0 +1,35 @@ + + */ + public function rules(): array + { + return [ + 'username' => 'required|string|max:255|unique:users,username', + 'first_name' => 'required|string|max:255', + 'last_name' => 'required|string|max:255', + 'national_id' => 'required|string|max:20|unique:users,national_id', + 'password' => 'required|string|min:8|confirmed', + 'email' => 'required|email|max:255|unique:users,email', + 'phone_number' => 'required|string|max:20|unique:users,phone_number', + ]; + } +} diff --git a/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php new file mode 100644 index 00000000..732d7fe9 --- /dev/null +++ b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php @@ -0,0 +1,43 @@ + + */ + public function rules(): array + { + return [ + 'username' => ['string', 'max:255', + Rule::unique('users', 'username')->ignore($this->user->id),], + 'first_name' => 'string|max:255', + 'last_name' => 'string|max:255', + 'national_id' => ['string', 'max:20', + Rule::unique('users', 'national_id')->ignore($this->user->id),], + 'password' => 'nullable|string|min:8|confirmed', + 'email' => ['email', 'max:255', + Rule::unique('users', 'email')->ignore($this->user->id),], + 'phone_number' => ['string', 'max:20', + Rule::unique('users', 'phone_number')->ignore($this->user->id),], + ]; + } +} diff --git a/backend/app/Admin/Requests/PermissionManagement/StoreRequest.php b/backend/app/Admin/Requests/PermissionManagement/StoreRequest.php new file mode 100644 index 00000000..7f91eda7 --- /dev/null +++ b/backend/app/Admin/Requests/PermissionManagement/StoreRequest.php @@ -0,0 +1,29 @@ + + */ + public function rules(): array + { + return [ + 'name' => 'required|string|unique:permissions,name', + ]; + } +} diff --git a/backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php b/backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php new file mode 100644 index 00000000..529ec458 --- /dev/null +++ b/backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php @@ -0,0 +1,33 @@ + + */ + public function rules(): array + { + return [ + 'name' => ['required', 'string', 'max:255', Rule::unique('permission', 'name')->ignore($this->permission->id)], + ]; + } +} diff --git a/backend/app/Admin/Requests/RoleManagement/StoreRequest.php b/backend/app/Admin/Requests/RoleManagement/StoreRequest.php new file mode 100644 index 00000000..b30125a9 --- /dev/null +++ b/backend/app/Admin/Requests/RoleManagement/StoreRequest.php @@ -0,0 +1,31 @@ + + */ + public function rules(): array + { + return [ + 'name' => 'required|string|unique:roles,name', + 'permissions' => 'required|array', + 'permissions.*.name' => 'required|string|exists:permissions,name', + ]; + } +} diff --git a/backend/app/Admin/Requests/RoleManagement/UpdateRequest.php b/backend/app/Admin/Requests/RoleManagement/UpdateRequest.php new file mode 100644 index 00000000..4dd1cbf0 --- /dev/null +++ b/backend/app/Admin/Requests/RoleManagement/UpdateRequest.php @@ -0,0 +1,35 @@ + + */ + public function rules(): array + { + return [ + 'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)], + 'permissions' => 'required|array', + 'permissions.*.name' => 'required|string|exists:permissions,name', + ]; + } +} diff --git a/backend/app/Admin/Requests/UserManagement/StoreRequest.php b/backend/app/Admin/Requests/UserManagement/StoreRequest.php new file mode 100644 index 00000000..d0e2a741 --- /dev/null +++ b/backend/app/Admin/Requests/UserManagement/StoreRequest.php @@ -0,0 +1,43 @@ + + */ + public function rules(): array + { + return [ + 'username' => 'required|string|max:255|unique:users,username', + 'first_name' => 'required|string|max:255', + 'last_name' => 'required|string|max:255', + 'national_id' => 'required|string|max:20|unique:users,national_id', + 'password' => 'required|string|min:6|confirmed', + 'email' => 'required|email|max:255|unique:users,email', + 'birthday' => 'nullable|date', + 'phone_number' => 'required|string|max:20|unique:users,phone_number', + 'postal_code' => 'nullable|string|max:20', + 'address' => 'nullable|string|max:1000', + 'province_id' => 'required|integer|exists:provinces,id', + 'city_id' => 'required|integer|exists:cities,id', + 'key_status' => 'nullable|string|max:255', + 'level' => 'nullable|string|max:255', + 'tax_id' => 'nullable|string|max:50', + ]; + } +} diff --git a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php new file mode 100644 index 00000000..2f4774cd --- /dev/null +++ b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php @@ -0,0 +1,52 @@ + + */ + public function rules(): array + { + + return [ + 'username' => ['string', 'max:255', + Rule::unique('users', 'username')->ignore($this->user->id),], + 'first_name' => 'string|max:255', + 'last_name' => 'string|max:255', + 'national_id' => ['string', 'max:20', + Rule::unique('users', 'national_id')->ignore($this->user->id),], + 'password' => 'nullable|string|min:8|confirmed', + 'email' => ['email', 'max:255', + Rule::unique('users', 'email')->ignore($this->user->id),], + 'birthday' => 'nullable|date', + 'phone_number' => ['string', 'max:20', + Rule::unique('users', 'phone_number')->ignore($this->user->id),], + 'postal_code' => 'nullable|string|max:20', + 'address' => 'nullable|string|max:1000', + 'province_id' => 'integer|exists:provinces,id', + 'city_id' => 'integer|exists:cities,id', + 'key_status' => 'nullable|string|max:255', + 'level' => 'nullable|string|max:255', + 'tax_id' => 'nullable|string|max:50', + ]; + } +} diff --git a/backend/app/Admin/Resources/ExpertManagementResource.php b/backend/app/Admin/Resources/ExpertManagementResource.php new file mode 100644 index 00000000..7cdb154b --- /dev/null +++ b/backend/app/Admin/Resources/ExpertManagementResource.php @@ -0,0 +1,39 @@ + + */ + public function toArray(Request $request): array + { + return [ + 'id' => $this->id, + 'username' => $this->username, + 'first_name' => $this->first_name, + 'last_name' => $this->last_name, + 'national_id' => $this->national_id, + 'email' => $this->email, + 'phone_number' => $this->phone_number, + 'roles' => $this->roles() + ->pluck('name') + ->values(), + + 'permissions' => $this->getAllPermissions() + ->pluck('name') + ->values(), + ]; + } +} + diff --git a/backend/app/Admin/Resources/UserManagementResource.php b/backend/app/Admin/Resources/UserManagementResource.php new file mode 100644 index 00000000..0cb7d05e --- /dev/null +++ b/backend/app/Admin/Resources/UserManagementResource.php @@ -0,0 +1,43 @@ + + */ + public function toArray(Request $request): array + { + return [ + 'id' => $this->id, + 'username' => $this->username, + 'first_name' => $this->first_name, + 'last_name' => $this->last_name, + 'national_id' => $this->national_id, + 'email' => $this->email, + 'phone_number' => $this->phone_number, + 'postal_code' => $this->postal_code, + 'address' => $this->address, + 'province_name' => $this->province_name, + 'city_name' => $this->city_name, + 'roles' => $this->roles() + ->pluck('name') + ->values(), + + 'permissions' => $this->getAllPermissions() + ->pluck('name') + ->values(), + ]; + } +} + diff --git a/backend/app/Models/User.php b/backend/app/Models/User.php index 9f73d3cc..989ac3a2 100755 --- a/backend/app/Models/User.php +++ b/backend/app/Models/User.php @@ -4,7 +4,6 @@ namespace App\Models; // use Illuminate\Contracts\Auth\MustVerifyEmail; use Database\Factories\UserFactory; -use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Guarded; use Illuminate\Database\Eloquent\Attributes\Hidden; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/backend/app/User/Controller/Dashboard/ConfirmController.php b/backend/app/User/Controller/Dashboard/ConfirmController.php deleted file mode 100755 index b8e918e5..00000000 --- a/backend/app/User/Controller/Dashboard/ConfirmController.php +++ /dev/null @@ -1,14 +0,0 @@ - [ + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * Eloquent model should be used to retrieve your permissions. Of course, it + * is often just the "Permission" model but you may use whatever you like. + * + * The model you want to use as a Permission model needs to implement the + * `Spatie\Permission\Contracts\Permission` contract. + */ + + 'permission' => Permission::class, + + /* + * When using the "HasRoles" trait from this package, we need to know which + * Eloquent model should be used to retrieve your roles. Of course, it + * is often just the "Role" model but you may use whatever you like. + * + * The model you want to use as a Role model needs to implement the + * `Spatie\Permission\Contracts\Role` contract. + */ + + 'role' => Role::class, + + /* + * When using the "Teams" feature from this package, we need to know which + * Eloquent model should be used to retrieve your teams. Of course, it + * is often just the "Team" model but you may use whatever you like. + */ + 'team' => null, + + /* + * When using the "HasModels" trait and passing raw IDs to syncModels, + * attachModels, or detachModels, this model class will be used to + * resolve those IDs. If null, defaults to the guard's model. + */ + 'default_model' => null, + ], + + 'table_names' => [ + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your roles. We have chosen a basic + * default value but you may easily change it to any table you like. + */ + + 'roles' => 'roles', + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * table should be used to retrieve your permissions. We have chosen a basic + * default value but you may easily change it to any table you like. + */ + + 'permissions' => 'permissions', + + /* + * When using the "HasPermissions" trait from this package, we need to know which + * table should be used to retrieve your models permissions. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'model_has_permissions' => 'model_has_permissions', + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your models roles. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'model_has_roles' => 'model_has_roles', + + /* + * When using the "HasRoles" trait from this package, we need to know which + * table should be used to retrieve your roles permissions. We have chosen a + * basic default value but you may easily change it to any table you like. + */ + + 'role_has_permissions' => 'role_has_permissions', + ], + + 'column_names' => [ + /* + * Change this if you want to name the related pivots other than defaults + */ + 'role_pivot_key' => null, // default 'role_id', + 'permission_pivot_key' => null, // default 'permission_id', + + /* + * Change this if you want to name the related model primary key other than + * `model_id`. + * + * For example, this would be nice if your primary keys are all UUIDs. In + * that case, name this `model_uuid`. + */ + + 'model_morph_key' => 'model_id', + + /* + * Change this if you want to use the teams feature and your related model's + * foreign key is other than `team_id`. + */ + + 'team_foreign_key' => 'team_id', + ], + + /* + * When set to true, the method for checking permissions will be registered on the gate. + * Set this to false if you want to implement custom logic for checking permissions. + */ + + 'register_permission_check_method' => true, + + /* + * When set to true, Laravel\Octane\Events\OperationTerminated event listener will be registered + * this will refresh permissions on every TickTerminated, TaskTerminated and RequestTerminated + * NOTE: This should not be needed in most cases, but an Octane/Vapor combination benefited from it. + */ + 'register_octane_reset_listener' => false, + + /* + * Events will fire when a role or permission is assigned/unassigned: + * \Spatie\Permission\Events\RoleAttachedEvent + * \Spatie\Permission\Events\RoleDetachedEvent + * \Spatie\Permission\Events\PermissionAttachedEvent + * \Spatie\Permission\Events\PermissionDetachedEvent + * + * To enable, set to true, and then create listeners to watch these events. + */ + 'events_enabled' => false, + + /* + * Teams Feature. + * When set to true the package implements teams using the 'team_foreign_key'. + * If you want the migrations to register the 'team_foreign_key', you must + * set this to true before doing the migration. + * If you already did the migration then you must make a new migration to also + * add 'team_foreign_key' to 'roles', 'model_has_roles', and 'model_has_permissions' + * (view the latest version of this package's migration file) + */ + + 'teams' => false, + + /* + * The class to use to resolve the permissions team id + */ + 'team_resolver' => DefaultTeamResolver::class, + + /* + * Passport Client Credentials Grant + * When set to true the package will use Passports Client to check permissions + */ + + 'use_passport_client_credentials' => false, + + /* + * When set to true, the required permission names are added to exception messages. + * This could be considered an information leak in some contexts, so the default + * setting is false here for optimum safety. + */ + + 'display_permission_in_exception' => false, + + /* + * When set to true, the required role names are added to exception messages. + * This could be considered an information leak in some contexts, so the default + * setting is false here for optimum safety. + */ + + 'display_role_in_exception' => false, + + /* + * By default wildcard permission lookups are disabled. + * See documentation to understand supported syntax. + */ + + 'enable_wildcard_permission' => false, + + /* + * The class to use for interpreting wildcard permissions. + * If you need to modify delimiters, override the class and specify its name here. + */ + // 'wildcard_permission' => Spatie\Permission\WildcardPermission::class, + + /* Cache-specific settings */ + + 'cache' => [ + + /* + * By default all permissions are cached for 24 hours to speed up performance. + * When permissions or roles are updated the cache is flushed automatically. + */ + + 'expiration_time' => DateInterval::createFromDateString('24 hours'), + + /* + * The cache key used to store all permissions. + */ + + 'key' => 'spatie.permission.cache', + + /* + * You may optionally indicate a specific cache driver to use for permission and + * role caching using any of the `store` drivers listed in the cache.php config + * file. Using 'default' here means to use the `default` set in cache.php. + */ + + 'store' => 'default', + ], +]; diff --git a/backend/database/migrations/2026_05_10_123913_create_permission_tables.php b/backend/database/migrations/2026_05_10_123913_create_permission_tables.php new file mode 100644 index 00000000..89862751 --- /dev/null +++ b/backend/database/migrations/2026_05_10_123913_create_permission_tables.php @@ -0,0 +1,137 @@ +id(); // permission id + $table->string('name'); + $table->string('guard_name'); + $table->timestamps(); + + $table->unique(['name', 'guard_name']); + }); + + /** + * See `docs/prerequisites.md` for suggested lengths on 'name' and 'guard_name' if "1071 Specified key was too long" errors are encountered. + */ + Schema::create($tableNames['roles'], static function (Blueprint $table) use ($teams, $columnNames) { + $table->id(); // role id + if ($teams || config('permission.testing')) { // permission.testing is a fix for sqlite testing + $table->unsignedBigInteger($columnNames['team_foreign_key'])->nullable(); + $table->index($columnNames['team_foreign_key'], 'roles_team_foreign_key_index'); + } + $table->string('name'); + $table->string('guard_name'); + $table->timestamps(); + if ($teams || config('permission.testing')) { + $table->unique([$columnNames['team_foreign_key'], 'name', 'guard_name']); + } else { + $table->unique(['name', 'guard_name']); + } + }); + + Schema::create($tableNames['model_has_permissions'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotPermission, $teams) { + $table->unsignedBigInteger($pivotPermission); + + $table->string('model_type'); + $table->unsignedBigInteger($columnNames['model_morph_key']); + $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_permissions_model_id_model_type_index'); + + $table->foreign($pivotPermission) + ->references('id') // permission id + ->on($tableNames['permissions']) + ->cascadeOnDelete(); + if ($teams) { + $table->unsignedBigInteger($columnNames['team_foreign_key']); + $table->index($columnNames['team_foreign_key'], 'model_has_permissions_team_foreign_key_index'); + + $table->primary([$columnNames['team_foreign_key'], $pivotPermission, $columnNames['model_morph_key'], 'model_type'], + 'model_has_permissions_permission_model_type_primary'); + } else { + $table->primary([$pivotPermission, $columnNames['model_morph_key'], 'model_type'], + 'model_has_permissions_permission_model_type_primary'); + } + }); + + Schema::create($tableNames['model_has_roles'], static function (Blueprint $table) use ($tableNames, $columnNames, $pivotRole, $teams) { + $table->unsignedBigInteger($pivotRole); + + $table->string('model_type'); + $table->unsignedBigInteger($columnNames['model_morph_key']); + $table->index([$columnNames['model_morph_key'], 'model_type'], 'model_has_roles_model_id_model_type_index'); + + $table->foreign($pivotRole) + ->references('id') // role id + ->on($tableNames['roles']) + ->cascadeOnDelete(); + if ($teams) { + $table->unsignedBigInteger($columnNames['team_foreign_key']); + $table->index($columnNames['team_foreign_key'], 'model_has_roles_team_foreign_key_index'); + + $table->primary([$columnNames['team_foreign_key'], $pivotRole, $columnNames['model_morph_key'], 'model_type'], + 'model_has_roles_role_model_type_primary'); + } else { + $table->primary([$pivotRole, $columnNames['model_morph_key'], 'model_type'], + 'model_has_roles_role_model_type_primary'); + } + }); + + Schema::create($tableNames['role_has_permissions'], static function (Blueprint $table) use ($tableNames, $pivotRole, $pivotPermission) { + $table->unsignedBigInteger($pivotPermission); + $table->unsignedBigInteger($pivotRole); + + $table->foreign($pivotPermission) + ->references('id') // permission id + ->on($tableNames['permissions']) + ->cascadeOnDelete(); + + $table->foreign($pivotRole) + ->references('id') // role id + ->on($tableNames['roles']) + ->cascadeOnDelete(); + + $table->primary([$pivotPermission, $pivotRole], 'role_has_permissions_permission_id_role_id_primary'); + }); + + app('cache') + ->store(config('permission.cache.store') != 'default' ? config('permission.cache.store') : null) + ->forget(config('permission.cache.key')); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + $tableNames = config('permission.table_names'); + + throw_if(empty($tableNames), 'Error: config/permission.php not found and defaults could not be merged. Please publish the package configuration before proceeding, or drop the tables manually.'); + + Schema::dropIfExists($tableNames['role_has_permissions']); + Schema::dropIfExists($tableNames['model_has_roles']); + Schema::dropIfExists($tableNames['model_has_permissions']); + Schema::dropIfExists($tableNames['roles']); + Schema::dropIfExists($tableNames['permissions']); + } +}; -- 2.49.1 From 32c14bd6c49e56179edde8cbb255d6aa4bb820c7 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 13 May 2026 08:56:02 +0330 Subject: [PATCH 2/6] save for get develop --- .../Controllers/UserManagementController.php | 22 +++++--- .../Requests/UserManagement/StoreRequest.php | 2 +- .../Requests/UserManagement/UpdateRequest.php | 2 +- backend/routes/web.php | 50 +++++++++++++++++++ 4 files changed, 67 insertions(+), 9 deletions(-) diff --git a/backend/app/Admin/Controllers/UserManagementController.php b/backend/app/Admin/Controllers/UserManagementController.php index 94adf110..81ad99ad 100644 --- a/backend/app/Admin/Controllers/UserManagementController.php +++ b/backend/app/Admin/Controllers/UserManagementController.php @@ -27,7 +27,9 @@ class UserManagementController extends Controller $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id', 'username', 'province_id', 'city_id', 'first_name', 'last_name', 'mobile',], + allowedSelects: ['id', 'username','first_name', 'last_name','kyc_status','national_id', + 'phone_number','postal_code','province_id','province_name', 'city_id', 'city_name', + 'birth_date','tax_id', 'password', 'email', 'level', 'key_status'], ); return response()->json($data); @@ -38,6 +40,9 @@ class UserManagementController extends Controller */ public function store(StoreRequest $request): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + User::query()->create([ 'username' => $request->username, 'first_name' => $request->first_name, @@ -45,14 +50,14 @@ class UserManagementController extends Controller 'national_id' => $request->national_id, 'password' => Hash::make($request->password), 'email' => $request->email, - 'birthday' => $request->birthday, + 'birth_date' => $request->birth_date, 'phone_number' => $request->phone_number, 'postal_code' => $request->postal_code, 'address' => $request->address, 'province_id' => $request->province_id, - 'province_name' => Province::query()->find($request->province_id)->name, + 'province_name' => $province->name, 'city_id' => $request->city_id, - 'city_name' => City::query()->find($request->city_id)->name, + 'city_name' => $city->name, 'key_status' => $request->key_status, 'level' => $request->level, 'tax_id' => $request->tax_id, @@ -77,6 +82,9 @@ class UserManagementController extends Controller */ public function update(UpdateRequest $request, User $user): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + $user->update([ 'first_name' => $request->first_name, 'username' => $request->username, @@ -84,14 +92,14 @@ class UserManagementController extends Controller 'national_id' => $request->national_id, 'password' => Hash::make($request->password), 'email' => $request->email, - 'birthday' => $request->birthday, + 'birth_date' => $request->birth_date, 'phone_number' => $request->phone_number, 'postal_code' => $request->postal_code, 'address' => $request->address, 'province_id' => $request->province_id, - 'province_name' => Province::query()->find($request->province_id)->name, + 'province_name' => $province->name, 'city_id' => $request->city_id, - 'city_name' => City::query()->find($request->city_id)->name, + 'city_name' => $city->name, 'key_status' => $request->key_status, 'level' => $request->level, 'tax_id' => $request->tax_id, diff --git a/backend/app/Admin/Requests/UserManagement/StoreRequest.php b/backend/app/Admin/Requests/UserManagement/StoreRequest.php index d0e2a741..a3c9cf92 100644 --- a/backend/app/Admin/Requests/UserManagement/StoreRequest.php +++ b/backend/app/Admin/Requests/UserManagement/StoreRequest.php @@ -29,7 +29,7 @@ class StoreRequest extends FormRequest 'national_id' => 'required|string|max:20|unique:users,national_id', 'password' => 'required|string|min:6|confirmed', 'email' => 'required|email|max:255|unique:users,email', - 'birthday' => 'nullable|date', + 'birth_date' => 'nullable|date', 'phone_number' => 'required|string|max:20|unique:users,phone_number', 'postal_code' => 'nullable|string|max:20', 'address' => 'nullable|string|max:1000', diff --git a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php index 2f4774cd..4d8c56b4 100644 --- a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php @@ -37,7 +37,7 @@ class UpdateRequest extends FormRequest 'password' => 'nullable|string|min:8|confirmed', 'email' => ['email', 'max:255', Rule::unique('users', 'email')->ignore($this->user->id),], - 'birthday' => 'nullable|date', + 'birth_date' => 'nullable|date', 'phone_number' => ['string', 'max:20', Rule::unique('users', 'phone_number')->ignore($this->user->id),], 'postal_code' => 'nullable|string|max:20', diff --git a/backend/routes/web.php b/backend/routes/web.php index fc6836d2..439b076a 100755 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -1,5 +1,9 @@ name('edit'); Route::post('change_password', 'changePassword')->name('changePassword'); }); + +Route::prefix('admin') + ->name('Admin.') + ->group(function () { + Route::prefix('user_management') + ->name('user_management.') + ->controller(UserManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('roles') + ->name('roles.') + ->controller(RoleManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('permissions') + ->name('permissions.') + ->controller(PermissionManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + Route::prefix('expert') + ->name('expert.') + ->controller(ExpertManagementController::class) + ->group(function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::get('/{id}', 'show')->name('show'); + Route::post('/{id}', 'update')->name('update'); + Route::post('destroy/{id}', 'destroy')->name('destroy'); + }); + }); + -- 2.49.1 From ae8ca057fd6e7b0c34c60701faa3d0de98371273 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 13 May 2026 09:27:03 +0330 Subject: [PATCH 3/6] change some item in controller and request --- .../ExpertManagementController.php | 19 +++++++++++++++++++ .../Controllers/UserManagementController.php | 6 ------ .../ExpertManagement/StoreRequest.php | 4 +++- .../ExpertManagement/UpdateRequest.php | 2 ++ .../Requests/UserManagement/StoreRequest.php | 3 --- .../Requests/UserManagement/UpdateRequest.php | 3 --- .../Resources/ExpertManagementResource.php | 2 ++ backend/app/Models/Expert.php | 4 ++++ 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/backend/app/Admin/Controllers/ExpertManagementController.php b/backend/app/Admin/Controllers/ExpertManagementController.php index ef793960..6178646e 100644 --- a/backend/app/Admin/Controllers/ExpertManagementController.php +++ b/backend/app/Admin/Controllers/ExpertManagementController.php @@ -7,6 +7,9 @@ use App\Admin\Requests\ExpertManagement\UpdateRequest; use App\Admin\Resources\ExpertManagementResource; use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; +use App\Models\City; +use App\Models\Expert; +use App\Models\Province; use App\Traits\ApiResponse; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -39,6 +42,9 @@ class ExpertManagementController extends Controller */ public function store(StoreRequest $request): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + Expert::query()->create([ 'username' => $request->username, 'first_name' => $request->first_name, @@ -47,6 +53,11 @@ class ExpertManagementController extends Controller 'password' => Hash::make($request->password), 'email' => $request->email, 'phone_number' => $request->phone_number, + 'province_id' => $request->province_id, + 'province_name' => $province->name, + 'city_id' => $request->city_id, + 'city_name' => $city->name, + 'level' => $request->level, ]); return $this->successResponse(); @@ -67,6 +78,9 @@ class ExpertManagementController extends Controller */ public function update(UpdateRequest $request, Expert $expert): JsonResponse { + $province = Province::query()->find($request->province_id); + $city = City::query()->find($request->city_id); + $expert->update([ 'username' => $request->username, 'first_name' => $request->first_name, @@ -75,6 +89,11 @@ class ExpertManagementController extends Controller 'password' => Hash::make($request->password), 'email' => $request->email, 'phone_number' => $request->phone_number, + 'province_id' => $request->province_id, + 'province_name' => $province->name, + 'city_id' => $request->city_id, + 'city_name' => $city->name, + 'level' => $request->level, ]); return $this->successResponse(); diff --git a/backend/app/Admin/Controllers/UserManagementController.php b/backend/app/Admin/Controllers/UserManagementController.php index 81ad99ad..fc89237a 100644 --- a/backend/app/Admin/Controllers/UserManagementController.php +++ b/backend/app/Admin/Controllers/UserManagementController.php @@ -58,9 +58,6 @@ class UserManagementController extends Controller 'province_name' => $province->name, 'city_id' => $request->city_id, 'city_name' => $city->name, - 'key_status' => $request->key_status, - 'level' => $request->level, - 'tax_id' => $request->tax_id, ]); return $this->successResponse(); @@ -100,9 +97,6 @@ class UserManagementController extends Controller 'province_name' => $province->name, 'city_id' => $request->city_id, 'city_name' => $city->name, - 'key_status' => $request->key_status, - 'level' => $request->level, - 'tax_id' => $request->tax_id, ]); return $this->successResponse(); diff --git a/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php index 4018cf9f..16a1612c 100644 --- a/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php +++ b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php @@ -30,6 +30,8 @@ class StoreRequest extends FormRequest 'password' => 'required|string|min:8|confirmed', 'email' => 'required|email|max:255|unique:users,email', 'phone_number' => 'required|string|max:20|unique:users,phone_number', - ]; + 'province_id' => 'required|integer|exists:provinces,id', + 'city_id' => 'required|integer|exists:cities,id', + ]; } } diff --git a/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php index 732d7fe9..da3ed7ed 100644 --- a/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php @@ -38,6 +38,8 @@ class UpdateRequest extends FormRequest Rule::unique('users', 'email')->ignore($this->user->id),], 'phone_number' => ['string', 'max:20', Rule::unique('users', 'phone_number')->ignore($this->user->id),], + 'province_id' => 'required|integer|exists:provinces,id', + 'city_id' => 'required|integer|exists:cities,id', ]; } } diff --git a/backend/app/Admin/Requests/UserManagement/StoreRequest.php b/backend/app/Admin/Requests/UserManagement/StoreRequest.php index a3c9cf92..38208575 100644 --- a/backend/app/Admin/Requests/UserManagement/StoreRequest.php +++ b/backend/app/Admin/Requests/UserManagement/StoreRequest.php @@ -35,9 +35,6 @@ class StoreRequest extends FormRequest 'address' => 'nullable|string|max:1000', 'province_id' => 'required|integer|exists:provinces,id', 'city_id' => 'required|integer|exists:cities,id', - 'key_status' => 'nullable|string|max:255', - 'level' => 'nullable|string|max:255', - 'tax_id' => 'nullable|string|max:50', ]; } } diff --git a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php index 4d8c56b4..2c9f363a 100644 --- a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php @@ -44,9 +44,6 @@ class UpdateRequest extends FormRequest 'address' => 'nullable|string|max:1000', 'province_id' => 'integer|exists:provinces,id', 'city_id' => 'integer|exists:cities,id', - 'key_status' => 'nullable|string|max:255', - 'level' => 'nullable|string|max:255', - 'tax_id' => 'nullable|string|max:50', ]; } } diff --git a/backend/app/Admin/Resources/ExpertManagementResource.php b/backend/app/Admin/Resources/ExpertManagementResource.php index 7cdb154b..788c0c93 100644 --- a/backend/app/Admin/Resources/ExpertManagementResource.php +++ b/backend/app/Admin/Resources/ExpertManagementResource.php @@ -26,6 +26,8 @@ class ExpertManagementResource extends JsonResource 'national_id' => $this->national_id, 'email' => $this->email, 'phone_number' => $this->phone_number, + 'province_name' => $this->province_name, + 'city_name' => $this->city_name, 'roles' => $this->roles() ->pluck('name') ->values(), diff --git a/backend/app/Models/Expert.php b/backend/app/Models/Expert.php index 214bb797..b55f8f55 100644 --- a/backend/app/Models/Expert.php +++ b/backend/app/Models/Expert.php @@ -6,6 +6,10 @@ use Database\Factories\ExpertFactory; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +/** + * @method roles() + * @method permissions() + */ class Expert extends Model { /** @use HasFactory */ -- 2.49.1 From 7b0507bdda77f16c7a564d37651d483d80b99e1b Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 13 May 2026 10:33:59 +0330 Subject: [PATCH 4/6] fix code --- .../ExpertManagementController.php | 2 - .../Controllers/RoleManagementController.php | 2 +- .../Controllers/UserManagementController.php | 8 ++-- .../ExpertManagement/StoreRequest.php | 8 ++-- .../ExpertManagement/UpdateRequest.php | 12 +++--- .../Requests/UserManagement/UpdateRequest.php | 2 +- .../Resources/UserManagementResource.php | 43 ------------------- 7 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 backend/app/Admin/Resources/UserManagementResource.php diff --git a/backend/app/Admin/Controllers/ExpertManagementController.php b/backend/app/Admin/Controllers/ExpertManagementController.php index 6178646e..6591a8a8 100644 --- a/backend/app/Admin/Controllers/ExpertManagementController.php +++ b/backend/app/Admin/Controllers/ExpertManagementController.php @@ -57,7 +57,6 @@ class ExpertManagementController extends Controller 'province_name' => $province->name, 'city_id' => $request->city_id, 'city_name' => $city->name, - 'level' => $request->level, ]); return $this->successResponse(); @@ -93,7 +92,6 @@ class ExpertManagementController extends Controller 'province_name' => $province->name, 'city_id' => $request->city_id, 'city_name' => $city->name, - 'level' => $request->level, ]); return $this->successResponse(); diff --git a/backend/app/Admin/Controllers/RoleManagementController.php b/backend/app/Admin/Controllers/RoleManagementController.php index 0a64039c..c1dc1004 100755 --- a/backend/app/Admin/Controllers/RoleManagementController.php +++ b/backend/app/Admin/Controllers/RoleManagementController.php @@ -24,7 +24,7 @@ class RoleManagementController extends Controller $request, allowedFilters: ['*'], allowedSortings: ['*'], - allowedSelects: ['id', 'name', 'description'] + allowedSelects: ['id', 'name'] ); return response()->json($data); diff --git a/backend/app/Admin/Controllers/UserManagementController.php b/backend/app/Admin/Controllers/UserManagementController.php index fc89237a..63e96da7 100644 --- a/backend/app/Admin/Controllers/UserManagementController.php +++ b/backend/app/Admin/Controllers/UserManagementController.php @@ -4,7 +4,6 @@ namespace App\Admin\Controllers; use App\Admin\Requests\UserManagement\StoreRequest; use App\Admin\Requests\UserManagement\UpdateRequest; -use App\Admin\Resources\UserManagementResource; use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; use App\Models\City; @@ -29,7 +28,7 @@ class UserManagementController extends Controller allowedSortings: ['*'], allowedSelects: ['id', 'username','first_name', 'last_name','kyc_status','national_id', 'phone_number','postal_code','province_id','province_name', 'city_id', 'city_name', - 'birth_date','tax_id', 'password', 'email', 'level', 'key_status'], + 'birth_date','tax_id', 'password', 'email'], ); return response()->json($data); @@ -69,9 +68,8 @@ class UserManagementController extends Controller */ public function show(User $user): JsonResponse { - return $this->successResponse( - new UserManagementResource($user) - ); + return $this->successResponse($user); + } /** diff --git a/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php index 16a1612c..3a866cfe 100644 --- a/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php +++ b/backend/app/Admin/Requests/ExpertManagement/StoreRequest.php @@ -23,13 +23,13 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'username' => 'required|string|max:255|unique:users,username', + 'username' => 'required|string|max:255|unique:experts,username', 'first_name' => 'required|string|max:255', 'last_name' => 'required|string|max:255', - 'national_id' => 'required|string|max:20|unique:users,national_id', + 'national_id' => 'required|string|max:20|unique:experts,national_id', 'password' => 'required|string|min:8|confirmed', - 'email' => 'required|email|max:255|unique:users,email', - 'phone_number' => 'required|string|max:20|unique:users,phone_number', + 'email' => 'required|email|max:255|unique:experts,email', + 'phone_number' => 'required|string|max:20|unique:experts,phone_number', 'province_id' => 'required|integer|exists:provinces,id', 'city_id' => 'required|integer|exists:cities,id', ]; diff --git a/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php index da3ed7ed..f496445b 100644 --- a/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php @@ -7,7 +7,7 @@ use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; /** - * @property mixed $user + * @property mixed $expert */ class UpdateRequest extends FormRequest { @@ -28,16 +28,16 @@ class UpdateRequest extends FormRequest { return [ 'username' => ['string', 'max:255', - Rule::unique('users', 'username')->ignore($this->user->id),], + Rule::unique('experts', 'username')->ignore($this->expert->id),], 'first_name' => 'string|max:255', 'last_name' => 'string|max:255', 'national_id' => ['string', 'max:20', - Rule::unique('users', 'national_id')->ignore($this->user->id),], - 'password' => 'nullable|string|min:8|confirmed', + Rule::unique('experts', 'national_id')->ignore($this->expert->id),], + 'password' => 'string|min:8|confirmed', 'email' => ['email', 'max:255', - Rule::unique('users', 'email')->ignore($this->user->id),], + Rule::unique('experts', 'email')->ignore($this->expert->id),], 'phone_number' => ['string', 'max:20', - Rule::unique('users', 'phone_number')->ignore($this->user->id),], + Rule::unique('experts', 'phone_number')->ignore($this->expert->id),], 'province_id' => 'required|integer|exists:provinces,id', 'city_id' => 'required|integer|exists:cities,id', ]; diff --git a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php index 2c9f363a..99c7af70 100644 --- a/backend/app/Admin/Requests/UserManagement/UpdateRequest.php +++ b/backend/app/Admin/Requests/UserManagement/UpdateRequest.php @@ -34,7 +34,7 @@ class UpdateRequest extends FormRequest 'last_name' => 'string|max:255', 'national_id' => ['string', 'max:20', Rule::unique('users', 'national_id')->ignore($this->user->id),], - 'password' => 'nullable|string|min:8|confirmed', + 'password' => 'string|min:8|confirmed', 'email' => ['email', 'max:255', Rule::unique('users', 'email')->ignore($this->user->id),], 'birth_date' => 'nullable|date', diff --git a/backend/app/Admin/Resources/UserManagementResource.php b/backend/app/Admin/Resources/UserManagementResource.php deleted file mode 100644 index 0cb7d05e..00000000 --- a/backend/app/Admin/Resources/UserManagementResource.php +++ /dev/null @@ -1,43 +0,0 @@ - - */ - public function toArray(Request $request): array - { - return [ - 'id' => $this->id, - 'username' => $this->username, - 'first_name' => $this->first_name, - 'last_name' => $this->last_name, - 'national_id' => $this->national_id, - 'email' => $this->email, - 'phone_number' => $this->phone_number, - 'postal_code' => $this->postal_code, - 'address' => $this->address, - 'province_name' => $this->province_name, - 'city_name' => $this->city_name, - 'roles' => $this->roles() - ->pluck('name') - ->values(), - - 'permissions' => $this->getAllPermissions() - ->pluck('name') - ->values(), - ]; - } -} - -- 2.49.1 From e33aac7eed14c31298ae4a55d8c88f2cea50711c Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 13 May 2026 13:33:58 +0330 Subject: [PATCH 5/6] fix code --- backend/routes/web.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/routes/web.php b/backend/routes/web.php index 439b076a..b092aaac 100755 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -36,9 +36,9 @@ Route::prefix('admin') ->group(function () { Route::get('/', 'index')->name('index'); Route::post('/', 'store')->name('store'); - Route::get('/{id}', 'show')->name('show'); - Route::post('/{id}', 'update')->name('update'); - Route::post('destroy/{id}', 'destroy')->name('destroy'); + Route::get('/{user}', 'show')->name('show'); + Route::post('/{user}', 'update')->name('update'); + Route::post('destroy/{user}', 'destroy')->name('destroy'); }); Route::prefix('roles') ->name('roles.') @@ -46,9 +46,9 @@ Route::prefix('admin') ->group(function () { Route::get('/', 'index')->name('index'); Route::post('/', 'store')->name('store'); - Route::get('/{id}', 'show')->name('show'); - Route::post('/{id}', 'update')->name('update'); - Route::post('destroy/{id}', 'destroy')->name('destroy'); + Route::get('/{role}', 'show')->name('show'); + Route::post('/{role}', 'update')->name('update'); + Route::post('destroy/{role}', 'destroy')->name('destroy'); }); Route::prefix('permissions') ->name('permissions.') @@ -56,9 +56,9 @@ Route::prefix('admin') ->group(function () { Route::get('/', 'index')->name('index'); Route::post('/', 'store')->name('store'); - Route::get('/{id}', 'show')->name('show'); - Route::post('/{id}', 'update')->name('update'); - Route::post('destroy/{id}', 'destroy')->name('destroy'); + Route::get('/{permission}', 'show')->name('show'); + Route::post('/{permission}', 'update')->name('update'); + Route::post('destroy/{permission}', 'destroy')->name('destroy'); }); Route::prefix('expert') ->name('expert.') @@ -66,9 +66,9 @@ Route::prefix('admin') ->group(function () { Route::get('/', 'index')->name('index'); Route::post('/', 'store')->name('store'); - Route::get('/{id}', 'show')->name('show'); - Route::post('/{id}', 'update')->name('update'); - Route::post('destroy/{id}', 'destroy')->name('destroy'); + Route::get('/{expert}', 'show')->name('show'); + Route::post('/{expert}', 'update')->name('update'); + Route::post('destroy/{expert}', 'destroy')->name('destroy'); }); }); -- 2.49.1 From af23df5527528713919d6f710f5ee0fb12ccff51 Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Wed, 13 May 2026 13:45:58 +0330 Subject: [PATCH 6/6] fix routs --- backend/routes/web.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/routes/web.php b/backend/routes/web.php index b092aaac..b81845c1 100755 --- a/backend/routes/web.php +++ b/backend/routes/web.php @@ -38,7 +38,7 @@ Route::prefix('admin') Route::post('/', 'store')->name('store'); Route::get('/{user}', 'show')->name('show'); Route::post('/{user}', 'update')->name('update'); - Route::post('destroy/{user}', 'destroy')->name('destroy'); + Route::delete('/{user}', 'destroy')->name('destroy'); }); Route::prefix('roles') ->name('roles.') @@ -48,7 +48,7 @@ Route::prefix('admin') Route::post('/', 'store')->name('store'); Route::get('/{role}', 'show')->name('show'); Route::post('/{role}', 'update')->name('update'); - Route::post('destroy/{role}', 'destroy')->name('destroy'); + Route::delete('/{role}', 'destroy')->name('destroy'); }); Route::prefix('permissions') ->name('permissions.') @@ -58,7 +58,7 @@ Route::prefix('admin') Route::post('/', 'store')->name('store'); Route::get('/{permission}', 'show')->name('show'); Route::post('/{permission}', 'update')->name('update'); - Route::post('destroy/{permission}', 'destroy')->name('destroy'); + Route::delete('/{permission}', 'destroy')->name('destroy'); }); Route::prefix('expert') ->name('expert.') @@ -68,7 +68,7 @@ Route::prefix('admin') Route::post('/', 'store')->name('store'); Route::get('/{expert}', 'show')->name('show'); Route::post('/{expert}', 'update')->name('update'); - Route::post('destroy/{expert}', 'destroy')->name('destroy'); + Route::delete('/{expert}', 'destroy')->name('destroy'); }); }); -- 2.49.1