diff --git a/app/Livewire/Auth/ForgotPassword.php b/app/Livewire/Auth/ForgotPassword.php index 65b2125..4bedf38 100644 --- a/app/Livewire/Auth/ForgotPassword.php +++ b/app/Livewire/Auth/ForgotPassword.php @@ -9,7 +9,7 @@ class ForgotPassword extends Component { public ForgotPasswordForm $form; - public function send() + public function send(): void { $this->form->sendPasswordResetLink(); } diff --git a/app/Livewire/Auth/Register.php b/app/Livewire/Auth/Register.php index ad8d4c1..4cc9474 100644 --- a/app/Livewire/Auth/Register.php +++ b/app/Livewire/Auth/Register.php @@ -9,7 +9,7 @@ class Register extends Component { public RegisterForm $form; - public function send() + public function send(): void { $this->form->register(); diff --git a/app/Livewire/Auth/ResetPassword.php b/app/Livewire/Auth/ResetPassword.php index 852e33b..422cb9b 100644 --- a/app/Livewire/Auth/ResetPassword.php +++ b/app/Livewire/Auth/ResetPassword.php @@ -15,7 +15,6 @@ class ResetPassword extends Component public function mount(string $token): void { $this->form->setToken($token); - $this->form->setEmail(request()->string('email')); } diff --git a/app/Livewire/Forms/ForgotPasswordForm.php b/app/Livewire/Forms/ForgotPasswordForm.php index c3c3d2c..637f1eb 100644 --- a/app/Livewire/Forms/ForgotPasswordForm.php +++ b/app/Livewire/Forms/ForgotPasswordForm.php @@ -3,17 +3,8 @@ namespace App\Livewire\Forms; use Livewire\Form; -use App\Models\User; -use Illuminate\Support\Str; -use Illuminate\Validation\Rules; use Livewire\Attributes\Validate; -use Illuminate\Auth\Events\Lockout; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Hash; -use Illuminate\Auth\Events\Registered; use Illuminate\Support\Facades\Password; -use Illuminate\Support\Facades\RateLimiter; -use Illuminate\Validation\ValidationException; class ForgotPasswordForm extends Form { diff --git a/app/Livewire/Forms/LoginForm.php b/app/Livewire/Forms/LoginForm.php index 2f83d4e..7b47fcf 100644 --- a/app/Livewire/Forms/LoginForm.php +++ b/app/Livewire/Forms/LoginForm.php @@ -69,6 +69,6 @@ class LoginForm extends Form */ protected function throttleKey(): string { - return Str::transliterate(Str::lower($this->email).'|'.request()->ip()); + return Str::transliterate(Str::lower($this->email) . '|' . request()->ip()); } } diff --git a/app/Livewire/Forms/RegisterForm.php b/app/Livewire/Forms/RegisterForm.php index 7ae88ca..7275996 100644 --- a/app/Livewire/Forms/RegisterForm.php +++ b/app/Livewire/Forms/RegisterForm.php @@ -4,24 +4,22 @@ namespace App\Livewire\Forms; use Livewire\Form; use App\Models\User; -use Illuminate\Support\Str; use Illuminate\Validation\Rules; -use Livewire\Attributes\Validate; -use Illuminate\Auth\Events\Lockout; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use Illuminate\Auth\Events\Registered; -use Illuminate\Support\Facades\RateLimiter; -use Illuminate\Validation\ValidationException; class RegisterForm extends Form { public string $name = ''; + public string $email = ''; + public string $password = ''; + public string $password_confirmation = ''; - public function rules() + public function rules(): array { return [ 'name' => ['required', 'string', 'max:255'], @@ -36,12 +34,8 @@ class RegisterForm extends Form public function register(): void { $validated = $this->validate(); - $validated['password'] = Hash::make($validated['password']); - event(new Registered($user = User::create($validated))); - Auth::login($user); } } - diff --git a/app/Livewire/Forms/ResetPasswordForm.php b/app/Livewire/Forms/ResetPasswordForm.php index f3174e8..3de8632 100644 --- a/app/Livewire/Forms/ResetPasswordForm.php +++ b/app/Livewire/Forms/ResetPasswordForm.php @@ -6,7 +6,6 @@ use Livewire\Form; use Illuminate\Support\Str; use Livewire\Attributes\Locked; use Illuminate\Validation\Rules; -use Livewire\Attributes\Validate; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Password; @@ -16,11 +15,14 @@ class ResetPasswordForm extends Form { #[Locked] public string $token = ''; + public string $email = ''; + public string $password = ''; + public string $password_confirmation = ''; - public function rules() + public function rules(): array { return [ 'token' => ['required'], diff --git a/app/Livewire/Vault/Row.php b/app/Livewire/Vault/Row.php index fb4ba77..88b4440 100644 --- a/app/Livewire/Vault/Row.php +++ b/app/Livewire/Vault/Row.php @@ -14,12 +14,12 @@ class Row extends Component public $showEditModal = false; - public function mount() + public function mount(): void { $this->form->setVault($this->vault); } - public function update() + public function update(): void { $this->authorize('update', $this->vault); $this->validate(); diff --git a/resources/views/components/icons/spinner.blade.php b/resources/views/components/icons/spinner.blade.php index d2273e5..c726fce 100644 --- a/resources/views/components/icons/spinner.blade.php +++ b/resources/views/components/icons/spinner.blade.php @@ -1,4 +1,6 @@ - + + diff --git a/resources/views/components/layouts/appHeader.blade.php b/resources/views/components/layouts/appHeader.blade.php index 8faa6b6..6a59a30 100644 --- a/resources/views/components/layouts/appHeader.blade.php +++ b/resources/views/components/layouts/appHeader.blade.php @@ -1,4 +1,5 @@ -
+
{{ $slot }} diff --git a/resources/views/components/layouts/guestMain.blade.php b/resources/views/components/layouts/guestMain.blade.php index b4708a1..939b46d 100644 --- a/resources/views/components/layouts/guestMain.blade.php +++ b/resources/views/components/layouts/guestMain.blade.php @@ -1,10 +1,12 @@ -
+

Many Notes

-
+
{{ $slot }}
diff --git a/resources/views/components/menu/button.blade.php b/resources/views/components/menu/button.blade.php index 2be2eff..f873515 100644 --- a/resources/views/components/menu/button.blade.php +++ b/resources/views/components/menu/button.blade.php @@ -1,8 +1,3 @@ - diff --git a/resources/views/components/menu/itemLink.blade.php b/resources/views/components/menu/itemLink.blade.php index b07eebf..0670f53 100644 --- a/resources/views/components/menu/itemLink.blade.php +++ b/resources/views/components/menu/itemLink.blade.php @@ -1,8 +1,6 @@ diff --git a/resources/views/components/modal/close.blade.php b/resources/views/components/modal/close.blade.php index 62cebea..7ce9699 100644 --- a/resources/views/components/modal/close.blade.php +++ b/resources/views/components/modal/close.blade.php @@ -1,6 +1,3 @@ -
+
{{ $slot }}
diff --git a/resources/views/components/modal/index.blade.php b/resources/views/components/modal/index.blade.php index 6a4b07d..b5b7755 100644 --- a/resources/views/components/modal/index.blade.php +++ b/resources/views/components/modal/index.blade.php @@ -1,8 +1,3 @@ -
+
{{ $slot }}