From 1258bb2c0d95d57d4d4dbe9b306712073726110a Mon Sep 17 00:00:00 2001 From: hmdee Date: Sat, 30 Nov 2024 08:26:44 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=D8=A7=D9=84=D8=A7=D8=AE=D8=AA=D8=A8=D8=A7?= =?UTF-8?q?=D8=B1=20=D8=A7=D9=84=D8=AE=D8=A7=D8=B5=20=D8=A8=D9=82=D9=88?= =?UTF-8?q?=D8=A7=D8=B9=D8=AF=20=D8=A7=D9=84=D8=AA=D8=AD=D9=82=D9=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/PostController.php | 7 ++- app/Http/Controllers/ProfileController.php | 3 ++ app/Http/Controllers/UserController.php | 2 +- app/Http/Requests/StoreBuildingRequest.php | 6 +++ app/Http/Requests/StoreItemRequest.php | 55 ++++++++++++++++++++++ app/Rules/Uppercase.php | 40 ++++++++++++++++ resources/views/products/create.blade.php | 5 ++ resources/views/projects/create.blade.php | 11 ++++- resources/views/teams/create.blade.php | 2 +- 9 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 app/Http/Requests/StoreItemRequest.php create mode 100644 app/Rules/Uppercase.php diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index cd0808b7..a9da3302 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -9,10 +9,9 @@ class PostController extends Controller { public function store(Request $request) { - $request->validate( - // ... TASK: write validation here so that "title" field - // would be required and unique in the "posts" DB table - ); + $request->validate([ + 'title' => 'required|unique' + ]); // Saving the post Post::create(['title' => $request->title]); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index bb6bab39..9bf111dc 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -9,6 +9,9 @@ class ProfileController extends Controller public function update(Request $request) { $request->validate([ + 'profile.name' => 'required', + 'profile.email' => 'required' + // TASK: imagine that in the Blade the fields are // // diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 404d7471..0523664a 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -11,7 +11,7 @@ public function update(User $user, UpdateUserRequest $request) { // TASK: change this line to not allow is_admin field to be updated // Update only the fields that are validated in UpdateUserRequest - $user->update($request->all()); + $user->update($request->except('is_admin')); return 'Success'; } diff --git a/app/Http/Requests/StoreBuildingRequest.php b/app/Http/Requests/StoreBuildingRequest.php index fbd8c064..02f32a6c 100644 --- a/app/Http/Requests/StoreBuildingRequest.php +++ b/app/Http/Requests/StoreBuildingRequest.php @@ -30,4 +30,10 @@ public function rules() 'name' => 'required' ]; } + public function messages() + { + return [ + 'name' => 'Please enter the name' + ]; + } } diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php new file mode 100644 index 00000000..9090f96a --- /dev/null +++ b/app/Http/Requests/StoreItemRequest.php @@ -0,0 +1,55 @@ + + */ + public function rules() + { + return [ + + 'name' => [ + 'required', + ], + 'description ' => [ + 'required', + + + + ], + + 'category_id' => [ + 'required', // التأكد من وجود category_id + 'exists:categories,id' // التأكد من أن category_id يشير إلى فئة موجودة في جدول categories + ], + ]; + } + public function messages() + { + return [ + 'title.required' => ' مطلوب حيا او ميتاا.', + 'title.unique' => 'هذا العنوان موجود بالفعل.', + 'text.required' => 'يجب كتابة نص البوست.', + 'text.min' => 'يجب أن يكون النص مكونًا من 10 أحرف على الأقل.', + ]; + } +} diff --git a/app/Rules/Uppercase.php b/app/Rules/Uppercase.php new file mode 100644 index 00000000..a185e60c --- /dev/null +++ b/app/Rules/Uppercase.php @@ -0,0 +1,40 @@ + + {{ $message }} + +@enderror

diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php index dc19b63b..a130c6b6 100644 --- a/resources/views/projects/create.blade.php +++ b/resources/views/projects/create.blade.php @@ -1,9 +1,16 @@ {{-- Form without any design --}} - {{-- TASK: add the validation errors here - with whatever HTML structure you want --}} {{-- in case of title/description empty, visitor should see --}} {{-- "The name field is required." and "The description field is required." --}} - +@if ($errors->any()) +
+ +
+@endif
@csrf Title: diff --git a/resources/views/teams/create.blade.php b/resources/views/teams/create.blade.php index 2d003c05..2bf76203 100644 --- a/resources/views/teams/create.blade.php +++ b/resources/views/teams/create.blade.php @@ -3,7 +3,7 @@ Name:
{{-- TASK: change this field so it would contain old value after validation error --}} - +

From 2f9c96713e241536d1fdc6c1af3f7b2b5972600d Mon Sep 17 00:00:00 2001 From: hmdee Date: Sat, 30 Nov 2024 09:04:53 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=D8=AA=D8=B9=D8=AF=D9=8A=D9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/PostController.php | 2 +- app/Http/Requests/StoreItemRequest.php | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index a9da3302..f10c6794 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -10,7 +10,7 @@ class PostController extends Controller public function store(Request $request) { $request->validate([ - 'title' => 'required|unique' + 'title' => ['required', 'unique:posts,title'] ]); // Saving the post diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index 9090f96a..0f733e76 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -32,24 +32,8 @@ public function rules() ], 'description ' => [ 'required', - - - ], - 'category_id' => [ - 'required', // التأكد من وجود category_id - 'exists:categories,id' // التأكد من أن category_id يشير إلى فئة موجودة في جدول categories - ], - ]; - } - public function messages() - { - return [ - 'title.required' => ' مطلوب حيا او ميتاا.', - 'title.unique' => 'هذا العنوان موجود بالفعل.', - 'text.required' => 'يجب كتابة نص البوست.', - 'text.min' => 'يجب أن يكون النص مكونًا من 10 أحرف على الأقل.', ]; } } From 45d245fbdf3fa3b36fdb3089997d0f3cc9084198 Mon Sep 17 00:00:00 2001 From: hmdee Date: Sat, 30 Nov 2024 09:12:18 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=D8=AA=D8=B9=D8=AF=D9=8A=D9=841?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Requests/StoreItemRequest.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index 0f733e76..323ff91b 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -23,17 +23,12 @@ public function authorize() * * @return array */ + public function rules() { return [ - - 'name' => [ - 'required', - ], - 'description ' => [ - 'required', - ], - + 'name' => 'required', + 'description' => 'required' ]; } }