Merge pull request #2 from Duhasky/ACL-Update

ACL Update and change language add

.env.example

@@ -1,13 +1,9 @@
-APP_NAME="Project Base"
+APP_NAME=Base
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_TIMEZONE=America/Sao_Paulo
-APP_URL=http://localhost
-
-APP_LOCALE=pt-br
-APP_FALLBACK_LOCALE=pt-br
-APP_FAKER_LOCALE=pt_BR
+APP_URL=http://sincap.site
 
 APP_MAINTENANCE_DRIVER=file
 APP_MAINTENANCE_STORE=database
@@ -22,9 +18,9 @@ LOG_LEVEL=debug
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=project-base
+DB_DATABASE=base
 DB_USERNAME=root
-DB_PASSWORD=
+DB_PASSWORD=root
 
 SESSION_DRIVER=database
 SESSION_LIFETIME=120

app/Http/Middleware/Localization.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class Localization
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        app()->setLocale(session('localization', config('app.locale')));
+
+        return $next($request);
+    }
+}

app/Livewire/Dashboard.php

@@ -2,10 +2,7 @@
 
 namespace App\Livewire;
 
-use App\Models\{City, Group, People, Role, User};
 use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Collection;
-use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 class Dashboard extends Component

app/Livewire/Navigation.php

@@ -20,6 +20,12 @@ public function logout(Logout $logout): void
         $this->redirect('/', navigate: true);
     }
 
+    public function setLang(string $lang): void
+    {
+        session(['localization' => $lang]);
+        $this->redirect(url()->previous());
+    }
+
     /** @var array<object> */
     public array $navs;
 
@@ -29,6 +35,9 @@ public function mount(): void
             (object)['route' => 'dashboard', 'label' => 'Dashboard', 'permission' => null, 'isActive' => request()->routeIs('dashboard')],
             (object)['route' => 'users', 'label' => 'Users', 'permission' => 'user_read', 'isActive' => request()->routeIs('users', 'users.create', 'users.edit')],
             (object)['route' => 'roles', 'label' => 'Roles', 'permission' => 'admin', 'isActive' => request()->routeIs('roles', 'ability.role')],
+            (object)['route' => 'city', 'label' => 'Cities', 'permission' => 'city_read', 'isActive' => request()->routeIs('city')],
+            (object)['route' => 'group', 'label' => 'Groups', 'permission' => 'group_read', 'isActive' => request()->routeIs('group')],
+            (object)['route' => 'people', 'label' => 'People', 'permission' => 'people_read', 'isActive' => request()->routeIs('people', 'people.create', 'people.edit', 'people.show')],
         ];
     }
 

config/app.php

@@ -78,11 +78,11 @@
     |
     */
 
-    'locale' => env('APP_LOCALE', 'en'),
+    'locale' => 'pt-br',
 
-    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+    'fallback_locale' => 'pt-br',
 
-    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
+    'faker_locale' => 'pt_BR',
 
     /*
     |--------------------------------------------------------------------------

database/seeders/DatabaseSeeder.php

@@ -37,19 +37,6 @@ public function run(): void
             ['name' => 'user_read'],
             ['name' => 'user_update'],
             ['name' => 'user_delete'],
-            ['name' => 'city_create'],
-            ['name' => 'city_read'],
-            ['name' => 'city_update'],
-            ['name' => 'city_delete'],
-            ['name' => 'group_create'],
-            ['name' => 'group_read'],
-            ['name' => 'group_update'],
-            ['name' => 'group_delete'],
-            ['name' => 'people_create'],
-            ['name' => 'people_read'],
-            ['name' => 'people_update'],
-            ['name' => 'people_delete'],
-            ['name' => 'photo_delete'],
         ]);
 
         $user = User::create([

lang/pt-BR.json

@@ -1,6 +1,7 @@
 {
   "(and :count more error)": "(e mais :count erro)",
   "(and :count more errors)": "(e mais :count erros)",
+  "Search": "Buscar",
   "Actions": "Ações",
   "People": "Pessoas",
   "people": "pessoas",