Assorted maintenance (#16)

* Update Composer dependencies

* Update NPM dependencies

* Update app.js

* Tidy up test names (and a little refactoring)

* Refactor AccountController

* Refactor LoginController

* Update User.php

* Update Organisation.php

* Move userCan JS function to Vue mixin

* Move AppButton to global component

* Move Notice to global component

* Tidy up use of Inertia forms

* Update php.yml

Author: SebKay

.github/workflows/php.yml

@@ -23,7 +23,7 @@ jobs:
 
   validate:
     name: Lint
-    needs: dependencies
+    needs: [dependencies]
     runs-on: ubuntu-latest
 
     steps:
@@ -45,7 +45,7 @@ jobs:
 
   test:
     name: Test
-    needs: dependencies
+    needs: [validate, dependencies]
     runs-on: ubuntu-latest
     env:
       APP_ENV: testing

app/Http/Controllers/AccountController.php

@@ -10,23 +10,17 @@ class AccountController extends Controller
 {
     public function edit(Request $request)
     {
-        $user = UserResource::make($request->user());
-
         return \inertia()->render('Account/Edit', [
-            'first_name' => $user->first_name,
-            'last_name'  => $user->last_name,
-            'email'      => $user->email,
+            'user' => UserResource::make($request->user())
         ]);
     }
 
     public function update(AccountUpdate $request)
     {
-        $user = $request->user();
-
-        $user->update($request->only('first_name', 'last_name', 'email'));
-        $user->updatePassword($request->validated('password'));
+        $request->user()->update($request->only('first_name', 'last_name', 'email'));
+        $request->user()->updatePassword($request->validated('password'));
 
-        return redirect()->back()->with('notice', [
+        return \redirect()->back()->with('notice', [
             'type'    => 'success',
             'message' => 'Your account has been updated.',
         ]);

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' => __('auth.failed'),
+                'email' => \__('auth.failed'),
             ])
         );
 

app/Http/Requests/Account/AccountUpdate.php

@@ -10,17 +10,10 @@ class AccountUpdate extends FormRequest
     public function rules()
     {
         return [
-            'first_name'  => ['required', 'sometimes', 'string', 'max:255'],
-            'last_name'   => ['required', 'sometimes', 'string', 'max:255'],
-            'email'       => [
-                'required',
-                'sometimes',
-                'string',
-                'email',
-                'max:255',
-                'unique:users,email,' . \auth()->id(),
-            ],
-            'password'    => [
+            'first_name' => ['required', 'sometimes', 'string', 'max:255'],
+            'last_name'  => ['required', 'sometimes', 'string', 'max:255'],
+            'email'      => ['required', 'sometimes', 'email', 'unique:users,email,' . \auth()->id()],
+            'password'   => [
                 'nullable',
                 Password::min(6)
                     ->mixedCase()

app/Models/Organisation.php

@@ -10,7 +10,6 @@ class Organisation extends Model
     use HasFactory;
 
     protected $fillable = [
-        'user_id',
         'name',
     ];
 

app/Models/User.php

@@ -20,7 +20,6 @@ class User extends Authenticatable
     use HasRoles;
 
     protected $fillable = [
-        'current_organisation_id',
         'first_name',
         'last_name',
         'email',

composer.json

@@ -7,23 +7,23 @@
         "php": "^8.0",
         "guzzlehttp/guzzle": "^7.5",
         "inertiajs/inertia-laravel": "^0.6",
-        "laravel/framework": "^9.48",
+        "laravel/framework": "^9.51",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
-        "spatie/laravel-permission": "^5.8",
+        "spatie/laravel-permission": "^5.9",
         "tightenco/ziggy": "^1.5"
     },
     "require-dev": {
         "fakerphp/faker": "^1.21",
-        "laravel/pint": "^1.4",
-        "laravel/sail": "^1.18",
+        "laravel/pint": "^1.4.1",
+        "laravel/sail": "^1.20",
         "mockery/mockery": "^1.5",
         "nunomaduro/collision": "^6.4",
         "pestphp/pest": "^1.22",
         "pestphp/pest-plugin-faker": "^1.0",
         "pestphp/pest-plugin-laravel": "^1.4",
         "pestphp/pest-plugin-parallel": "^1.2",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "spatie/laravel-ignition": "^1.6",
         "spatie/ray": "^1.36",
         "squizlabs/php_codesniffer": "^3.7"