From 4465777f8c71452650fcb05bc0761ed94d6a2767 Mon Sep 17 00:00:00 2001 From: Ziad Gamal Date: Sat, 27 Jan 2024 20:12:59 +0200 Subject: [PATCH] =?UTF-8?q?Done=20=E2=9C=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/PostController.php | 6 +++-- app/Http/Controllers/ProfileController.php | 2 ++ app/Http/Controllers/UserController.php | 2 +- app/Http/Requests/StoreBuildingRequest.php | 7 ++++++ app/Http/Requests/StoreItemRequest.php | 29 ++++++++++++++++++++++ app/Rules/Uppercase.php | 21 ++++++++++++++++ resources/views/products/create.blade.php | 5 ++++ resources/views/projects/create.blade.php | 9 +++++++ resources/views/teams/create.blade.php | 2 +- 9 files changed, 79 insertions(+), 4 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..a422e331 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -9,10 +9,12 @@ class PostController extends Controller { public function store(Request $request) { - $request->validate( + $request->validate([ // ... TASK: write validation here so that "title" field // would be required and unique in the "posts" DB table - ); + 'title' => 'required|unique:posts,title' + ]); + // Saving the post Post::create(['title' => $request->title]); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index bb6bab39..2b088205 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -13,6 +13,8 @@ public function update(Request $request) // // // Write validation rules, so both name and email are required + 'profile.name' => 'required', + 'profile.email' => 'required', ]); auth()->user()->update($request->profile ?? []); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 404d7471..a6d0f989 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->validated()); return 'Success'; } diff --git a/app/Http/Requests/StoreBuildingRequest.php b/app/Http/Requests/StoreBuildingRequest.php index fbd8c064..bd98a463 100644 --- a/app/Http/Requests/StoreBuildingRequest.php +++ b/app/Http/Requests/StoreBuildingRequest.php @@ -30,4 +30,11 @@ public function rules() 'name' => 'required' ]; } + + public function messages() + { + return [ + 'name.required' => 'Please enter the name', + ]; + } } diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php new file mode 100644 index 00000000..bda893b8 --- /dev/null +++ b/app/Http/Requests/StoreItemRequest.php @@ -0,0 +1,29 @@ + + */ + public function rules(): array + { + return [ + 'name' => 'required', + 'description' => 'required', + ]; + } +} diff --git a/app/Rules/Uppercase.php b/app/Rules/Uppercase.php new file mode 100644 index 00000000..f5e893b5 --- /dev/null +++ b/app/Rules/Uppercase.php @@ -0,0 +1,21 @@ + @csrf + + @error('name') + {{ $message }} + @enderror + Name:
diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php index dc19b63b..ef653f0e 100644 --- a/resources/views/projects/create.blade.php +++ b/resources/views/projects/create.blade.php @@ -6,6 +6,15 @@
@csrf + + @if ($errors->any()) + + @endif + Title:
diff --git a/resources/views/teams/create.blade.php b/resources/views/teams/create.blade.php index 2d003c05..37ae1412 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 --}} - +