diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 2deeb3a..1652e50 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -35,22 +35,24 @@ class RegisteredUserController extends Controller // 1. Walidacja danych z formularza $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'surname' => ['required', 'string', 'max:255'], + 'surname' => ['nullable', 'string', 'max:255'], 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class], 'password' => ['required', 'confirmed', Rules\Password::defaults()], - 'role' => ['required', 'exists:roles,name'], // Walidacja – wybrane pole musi istnieć w tabeli roles + 'role' => ['nullable', 'exists:roles,name'], // Walidacja – jeśli rola została wysłana, musi istnieć w tabeli roles ]); // 2. Utworzenie nowego użytkownika $user = User::create([ 'name' => $request->name, - 'surname' => $request->surname, + 'surname' => $request->surname ?? '', 'email' => $request->email, 'password' => Hash::make($request->password), ]); // 3. Przypisanie wybranej roli ze Spatie - $user->assignRole($request->role); + if ($request->filled('role')) { + $user->assignRole($request->role); + } // 4. Wysłanie zdarzenia rejestracji i zalogowanie event(new Registered($user)); diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php index b1dff1d..85d5396 100644 --- a/app/Http/Requests/ProfileUpdateRequest.php +++ b/app/Http/Requests/ProfileUpdateRequest.php @@ -17,7 +17,7 @@ class ProfileUpdateRequest extends FormRequest { return [ 'name' => ['required', 'string', 'max:255'], - 'surname' => ['required', 'string', 'max:255'], // Jeśli używasz nazwiska + 'surname' => ['nullable', 'string', 'max:255'], 'email' => [ 'required', 'string', @@ -26,7 +26,7 @@ class ProfileUpdateRequest extends FormRequest 'max:255', Rule::unique(User::class)->ignore($this->user()->id), ], - 'role' => ['nullable', 'string', 'exists:roles,name'], // Dopuszczamy role + 'role' => ['nullable', 'string', 'exists:roles,name'], ]; } } \ No newline at end of file diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 3b45722..e78f2e2 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -73,7 +73,7 @@