Merge pull request #3 from Duhasky/ACL-1-Update

ACL-1: updated

.env.example

@@ -1,9 +1,9 @@
-APP_NAME=Base
+APP_NAME="Project Base"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_TIMEZONE=America/Sao_Paulo
-APP_URL=http://sincap.site
+APP_URL=http://project_base.site
 
 APP_MAINTENANCE_DRIVER=file
 APP_MAINTENANCE_STORE=database
@@ -18,7 +18,7 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=base
+DB_DATABASE=project_base
 DB_USERNAME=root
 DB_PASSWORD=root
 

app/Livewire/Forms/UserForm.php

@@ -25,18 +25,20 @@ class UserForm extends Form
 
     public ?string $password = null;
 
+    public ?string $password_confirmation = null;
+
     /** @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string> */
     public function rules()
     {
         $rules = [
             'name'          => ['required', 'min:3', 'max:255'],
-            'user_name'     => ['required', 'min:3', 'max:30'],
+            'user_name'     => ['required', 'min:3', 'max:30', Rule::unique(User::class)->ignore($this->id)],
             'email'         => ['required', 'string', 'lowercase', 'email', 'max:255', Rule::unique(User::class)->ignore($this->id)],
             'regist_number' => ['required', 'size:8', Rule::unique(User::class)->ignore($this->id)],
         ];
 
         if (!$this->id) {
-            $rules['password'] = ['required', Password::min(4), 'max:12'];
+            $rules['password'] = ['required', Password::min(4), 'max:12', 'confirmed'];
         }
 
         return $rules;

app/Livewire/Profile/UpdatePasswordForm.php

@@ -26,7 +26,7 @@ public function updatePassword(): void
         try {
             $validated = $this->validate([
                 'current_password' => ['required', 'string', 'current_password'],
-                'password'         => ['required', 'string', Password::defaults(), 'confirmed'],
+                'password'         => ['required', Password::min(4), 'max:12', 'confirmed'],
             ]);
         } catch (ValidationException $e) {
             $this->reset('current_password', 'password', 'password_confirmation');

app/Livewire/User/UserRole.php

@@ -26,4 +26,5 @@ public function toggleRole(int $role_id): void
     {
         $this->user->roles()->toggle($role_id);
     }
+
 }

app/Providers/TranslationServiceProvider.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class TranslationServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        $this->loadJsonTranslationsFrom(resource_path('lang'));
+    }
+}

bootstrap/providers.php

@@ -3,5 +3,6 @@
 return [
     App\Providers\AppServiceProvider::class,
     App\Providers\AuthServiceProvider::class,
+    App\Providers\TranslationServiceProvider::class,
     App\Providers\VoltServiceProvider::class,
 ];

composer.json

@@ -25,6 +25,7 @@
         "pestphp/pest": "^2.34",
         "pestphp/pest-plugin-laravel": "^2.0",
         "pestphp/pest-plugin-livewire": "^2.1",
+        "phpstan/phpstan": "^1.11",
         "spatie/laravel-ignition": "^2.4"
     },
     "autoload": {

config/app.php

@@ -78,9 +78,9 @@
     |
     */
 
-    'locale' => 'pt-br',
+    'locale' => 'pt_BR',
 
-    'fallback_locale' => 'pt-br',
+    'fallback_locale' => 'pt_BR',
 
     'faker_locale' => 'pt_BR',