Laravel 12.x Shift

.env.example

@@ -49,6 +49,8 @@ APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=en_US
 APP_MAINTENANCE_DRIVER=file
 APP_MAINTENANCE_STORE=database
+PHP_CLI_SERVER_WORKERS=4
+
 BCRYPT_ROUNDS=12
 
 SESSION_ENCRYPT=false

.gitignore

@@ -13,3 +13,5 @@ Homestead.yaml
 .phpunit.result.cache
 .phpunit.cache
 mysql-connector-java-*
+/storage/pail
+/.nova

README.md

@@ -80,7 +80,7 @@ Jitterbug uses the [devbridge autocomplete plugin](https://github.com/devbridge/
 1. Define a controller method in the SuggestionsController class for the field using plural naming conventions. You only need to copy and paste one of the exsiting methods and change the parameters for the ```getAutocompleteSuggestions()``` method call to correspond to the model you want the suggestions for, and then the field name.
 2. Add a route to routes.php in the 'suggestions' group that references the controller method that was defined in step 1.
 3. Go to the form where you want the suggestions to appear, and give the input element a css id name. e.g. #speed, or #recording-location, etc.
-4. In app.js, add a jQuery selector using the id you created in step 3, then call autocomplete. The serviceUrl should correspond to the route you created in step 2. For example:
+4. In jitterbug.js, add a jQuery selector using the id you created in step 3, then call autocomplete. The serviceUrl should correspond to the route you created in step 2. For example:
 
 ```javascript
 $('#speed').autocomplete({
@@ -91,17 +91,22 @@ $('#speed').autocomplete({
 
 ## Compiling Assets
 
-Jitterbug uses [Laravel Mix](https://laravel.com/docs/8.x/mix) to compile its assets, including Sass for its css.
-Add your css to `resources/assets/sass/app.scss` and then run `npm run dev` in the application terminal to compile the new changes.
+Jitterbug uses [Vite](https://laravel.com/docs/12.x/vite) to compile its assets, including Sass for its css.
+Add your css to `resources/assets/sass/app.scss` and then run `npm run build` in the application terminal to compile the new changes.
+The same goes for any JavaScript changes you make.
+You can also toggle whether the assets are minified in `vite.config.js`. You should minify them for production, but can be 
+useful debug feature to not minifiy them.
 
 For example, in the VM:
 
 ```bash
 vagrant ssh
-cd /vagrant
-npm run dev
+cd /jitterbug
+npm run build
 ```
 
+Note: if running `build` you may need to run `npm install` first so it picks up the correct C compiler.
+
 ## Running [Laravel Dusk](https://laravel.com/docs/8.x/dusk) tests (VM only)
 
 1. Start up the vm and ssh into the VM
@@ -114,7 +119,7 @@ npm run dev
 2. Navigate to the Jitterbug repo folder
 
     ```bash
-    cd /vagrant
+    cd /jitterbug
     ```
 
 3. Run the Laravel Dusk tests

app/Http/Controllers/Admin/AdminController.php

@@ -3,20 +3,18 @@
 namespace Jitterbug\Http\Controllers\Admin;
 
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Models\User;
 
-class AdminController extends Controller
+class AdminController extends Controller implements HasMiddleware
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware(['auth', 'admin']);
+        return [
+            ['auth', 'admin'],
+        ];
     }
 
     public function index()

app/Http/Controllers/Admin/CollectionTypesController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\CollectionTypeRequest;
@@ -14,16 +15,13 @@
 /**
  * Controller for the management of collection types in the Admin area.
  */
-class CollectionTypesController extends Controller
+class CollectionTypesController extends Controller implements HasMiddleware
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware(['auth', 'admin']);
+        return [
+            ['auth', 'admin'],
+        ];
     }
 
     public function index(Request $request)

app/Http/Controllers/Admin/CollectionsController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\CollectionRequest;
@@ -18,7 +19,7 @@
 /**
  * Controller for the management of collections in the Admin area.
  */
-class CollectionsController extends Controller
+class CollectionsController extends Controller implements HasMiddleware
 {
     protected $solrItems;
 
@@ -33,12 +34,19 @@ class CollectionsController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrItems = new SolariumProxy('jitterbug-items');
         $this->solrInstances = new SolariumProxy('jitterbug-instances');
         $this->solrTransfers = new SolariumProxy('jitterbug-transfers');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {

app/Http/Controllers/Admin/DepartmentsController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\DepartmentRequest;
@@ -14,7 +15,7 @@
 /**
  * Controller for the management of departments in the Admin area.
  */
-class DepartmentsController extends Controller
+class DepartmentsController extends Controller implements HasMiddleware
 {
     protected $solrInstances;
 
@@ -25,10 +26,17 @@ class DepartmentsController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrInstances = new SolariumProxy('jitterbug-instances');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {

app/Http/Controllers/Admin/FormatsController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\FormatRequest;
@@ -17,7 +18,7 @@
 /**
  * Controller for the management of formats in the Admin area.
  */
-class FormatsController extends Controller
+class FormatsController extends Controller implements HasMiddleware
 {
     protected $solrItems;
 
@@ -32,12 +33,19 @@ class FormatsController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrItems = new SolariumProxy('jitterbug-items');
         $this->solrInstances = new SolariumProxy('jitterbug-instances');
         $this->solrTransfers = new SolariumProxy('jitterbug-transfers');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {

app/Http/Controllers/Admin/PlaybackMachinesController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\PlaybackMachineRequest;
@@ -14,7 +15,7 @@
 /**
  * Controller for the management of playback machines in the Admin area.
  */
-class PlaybackMachinesController extends Controller
+class PlaybackMachinesController extends Controller implements HasMiddleware
 {
     protected $solrTransfers;
 
@@ -25,10 +26,17 @@ class PlaybackMachinesController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrTransfers = new SolariumProxy('jitterbug-transfers');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {

app/Http/Controllers/Admin/PmSpeedsController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\PmSpeedRequest;
@@ -13,16 +14,13 @@
 /**
  * Controller for the management of PM speeds in the Admin area.
  */
-class PmSpeedsController extends Controller
+class PmSpeedsController extends Controller implements HasMiddleware
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware(['auth', 'admin']);
+        return [
+            ['auth', 'admin'],
+        ];
     }
 
     public function index(Request $request)

app/Http/Controllers/Admin/PrefixesController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\PrefixRequest;
 use Jitterbug\Models\CollectionType;
@@ -12,16 +13,13 @@
 /**
  * Controller for the management of Prefixes in the Admin area.
  */
-class PrefixesController extends Controller
+class PrefixesController extends Controller implements HasMiddleware
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
+    public static function middleware(): array
     {
-        $this->middleware(['auth', 'admin']);
+        return [
+            ['auth', 'admin'],
+        ];
     }
 
     public function index(Request $request)

app/Http/Controllers/Admin/ProjectsController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\ProjectRequest;
@@ -14,7 +15,7 @@
 /**
  * Controller for the management of projects in the Admin area.
  */
-class ProjectsController extends Controller
+class ProjectsController extends Controller implements HasMiddleware
 {
     protected $solrInstances;
 
@@ -25,10 +26,17 @@ class ProjectsController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrInstances = new SolariumProxy('jitterbug-instances');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {

app/Http/Controllers/Admin/ReproductionMachinesController.php

@@ -4,6 +4,7 @@
 
 use DB;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controllers\HasMiddleware;
 use Illuminate\Support\MessageBag;
 use Jitterbug\Http\Controllers\Controller;
 use Jitterbug\Http\Requests\ReproductionMachineRequest;
@@ -14,7 +15,7 @@
 /**
  * Controller for the management of reproduction machines in the Admin area.
  */
-class ReproductionMachinesController extends Controller
+class ReproductionMachinesController extends Controller implements HasMiddleware
 {
     protected $solrInstances;
 
@@ -25,10 +26,17 @@ class ReproductionMachinesController extends Controller
      */
     public function __construct()
     {
-        $this->middleware(['auth', 'admin']);
+
         $this->solrInstances = new SolariumProxy('jitterbug-instances');
     }
 
+    public static function middleware(): array
+    {
+        return [
+            ['auth', 'admin'],
+        ];
+    }
+
     public function index(Request $request)
     {
         if ($request->ajax()) {