Assorted maintenance (#14)

* Move WithoutModelEvents to individual seeders, not the main ones

* Tidy up Inertia request handler

* Tidy up web routes file

* Use translation functions where applicable

* Move home Index components to Home/Index

* Update composer.json

* Fix failing test for HomeController

Author: SebKay

app/Http/Controllers/HomeController.php

@@ -6,6 +6,6 @@ class HomeController extends Controller
 {
     public function index()
     {
-        return \inertia()->render('Index');
+        return \inertia()->render('Home/Index');
     }
 }

app/Http/Controllers/LoginController.php

@@ -25,7 +25,7 @@ public function store(LoginStore $request)
         \throw_if(
             !\auth()->attempt($request->only('email', 'password'), $request->validated('remember')),
             ValidationException::withMessages([
-                'email' => ['Your account is not active.'],
+                'email' => __('auth.failed'),
             ])
         );
 

app/Http/Middleware/HandleInertiaRequests.php

@@ -3,22 +3,16 @@
 namespace App\Http\Middleware;
 
 use App\Http\Resources\UserResource;
-use App\Models\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Inertia\Middleware;
 
 class HandleInertiaRequests extends Middleware
 {
     public function share(Request $request): array
     {
-        $isLoggedIn = Auth::check();
-        $user       = $isLoggedIn ? UserResource::make(User::find(Auth::id())) : [];
-
         return array_merge(parent::share($request), [
             'auth' => [
-                'isLoggedIn' => $isLoggedIn,
-                'user'       => $user,
+                'user' => $request->user() ? UserResource::make($request->user()) : [],
             ],
             'notice' => $request->session()->get('notice') ?: [
                 'type'    => '',

app/Http/Resources/UserResource.php

@@ -10,10 +10,10 @@ public function toArray($request)
     {
         return [
             'id'         => $this->id,
-            'email'      => $this->email,
-            'first_name' => $this->first_name,
-            'last_name'  => $this->last_name,
-            'can'        => $this->allPermissions,
+            'email'      => $this->whenHas('email'),
+            'first_name' => $this->whenHas('first_name'),
+            'last_name'  => $this->whenHas('last_name'),
+            'can'        => $this->all_permissions,
         ];
     }
 }

composer.json

@@ -53,15 +53,21 @@
             "npm install",
             "npm run build"
         ],
-        "build:test": "composer install --no-interaction",
+        "build:test": [
+            "composer install --no-interaction"
+        ],
         "lint": [
             "./vendor/bin/phpcs ./ --extensions=php --standard=PSR12 --ignore=vendor/,tests/,storage/,cache/,database/migrations/,*.blade.php,public/index.php"
         ],
         "fix": [
             "./vendor/bin/phpcbf ./ --extensions=php --standard=PSR12 --ignore=vendor/,tests/,storage/,cache/,database/migrations/,*.blade.php,public/index.php"
         ],
-        "test": "php artisan test --parallel --stop-on-failure",
-        "test:coverage": "XDEBUG_MODE=coverage php artisan test --parallel --coverage --min=85",
+        "test": [
+            "php artisan test --parallel --stop-on-failure"
+        ],
+        "test:coverage": [
+            "XDEBUG_MODE=coverage php artisan test --parallel --coverage --min=85"
+        ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
             "@php artisan package:discover --ansi"

database/factories/OrganisationFactory.php

@@ -13,7 +13,7 @@ class OrganisationFactory extends Factory
     public function definition()
     {
         return [
-            'name'    => $this->faker->company,
+            'name'    => \fake()->company,
             'user_id' => User::factory(),
         ];
     }

database/factories/UserFactory.php

@@ -13,10 +13,10 @@ class UserFactory extends Factory
     public function definition()
     {
         return [
-            'first_name'        => fake()->firstName(),
-            'last_name'         => fake()->lastName(),
-            'email'             => fake()->unique()->safeEmail(),
-            'email_verified_at' => now(),
+            'first_name'        => \fake()->firstName(),
+            'last_name'         => \fake()->lastName(),
+            'email'             => \fake()->unique()->safeEmail(),
+            'email_verified_at' => \now(),
             'password'          => '12345',
             'remember_token'    => Str::random(10),
         ];

database/seeders/DatabaseSeeder.php

@@ -2,13 +2,10 @@
 
 namespace Database\Seeders;
 
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
 {
-    use WithoutModelEvents;
-
     public function run()
     {
         $this->call([

database/seeders/OrganisationsSeeder.php

@@ -4,10 +4,13 @@
 
 use App\Models\Organisation;
 use App\Models\User;
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
 class OrganisationsSeeder extends Seeder
 {
+    use WithoutModelEvents;
+
     public function run()
     {
         $adminUser = User::whereEmail(\env('SEED_ADMIN_EMAIL'))->firstOrFail();

database/seeders/RolesAndPermissionsSeeder.php

@@ -2,13 +2,16 @@
 
 namespace Database\Seeders;
 
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Collection;
 use Spatie\Permission\Models\Permission;
 use Spatie\Permission\Models\Role;
 
 class RolesAndPermissionsSeeder extends Seeder
 {
+    use WithoutModelEvents;
+
     protected Collection $roles;
     protected Collection $postPermissions;