diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index cd0808b7..c265abb2 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -12,6 +12,9 @@ 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 + [ + 'title' => ['required', 'unique:posts'] + ] ); // Saving the post @@ -19,4 +22,4 @@ public function store(Request $request) return 'Success'; } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index bb6bab39..23b75790 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -13,10 +13,12 @@ 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 ?? []); return 'Success'; } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 404d7471..fd2a50f2 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -11,8 +11,8 @@ 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->safe()->except(['is_admin'])); return 'Success'; } -} +} \ No newline at end of file diff --git a/app/Http/Requests/StoreBuildingRequest.php b/app/Http/Requests/StoreBuildingRequest.php index fbd8c064..09a7f1e4 100644 --- a/app/Http/Requests/StoreBuildingRequest.php +++ b/app/Http/Requests/StoreBuildingRequest.php @@ -27,7 +27,14 @@ public function authorize() public function rules() { return [ - 'name' => 'required' + 'name' => ['required'] ]; } -} + + public function messages(): array + { + return [ + 'name.required' => 'Please enter the name' + ]; + } +} \ No newline at end of file diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php new file mode 100644 index 00000000..101ff708 --- /dev/null +++ b/app/Http/Requests/StoreItemRequest.php @@ -0,0 +1,29 @@ + + */ + public function rules(): array + { + return [ + 'name' => ['required'], + 'description' => ['required'] + ]; + } +} \ No newline at end of file diff --git a/app/Rules/Uppercase.php b/app/Rules/Uppercase.php new file mode 100644 index 00000000..ac5a1999 --- /dev/null +++ b/app/Rules/Uppercase.php @@ -0,0 +1,21 @@ + {{-- TASK: show the validation error for the specific "name" field --}} {{-- using one Blade directive: pseudo-code below --}} - {{-- @directive --}} - {{-- {{ $message }} --}} - {{-- @endDirective --}} + @error('name') + {{ $message }} + @enderror +

diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php index dc19b63b..b3b17e3f 100644 --- a/resources/views/projects/create.blade.php +++ b/resources/views/projects/create.blade.php @@ -14,5 +14,14 @@


+ @if ($errors->any()) +
+ +
+ @endif diff --git a/resources/views/teams/create.blade.php b/resources/views/teams/create.blade.php index 2d003c05..f1afdef2 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 --}} - +