Moved faker out of dev so we can use the seeders

Signed-off-by: snipe <snipe@snipe.net>

.all-contributorsrc

@@ -4162,24 +4162,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "Tinyblargon",
-      "name": "Okean",
-      "avatar_url": "https://avatars.githubusercontent.com/u/76069640?v=4",
-      "profile": "https://github.com/Tinyblargon",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "amedranogil",
-      "name": "Alejandro Medrano",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6515064?v=4",
-      "profile": "https://www.lst.tfo.upm.es/alejandro-medrano/",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

CONTRIBUTORS.md

@@ -67,7 +67,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/80526133?v=4" width="110px;"/><br /><sub>AlexanderWPapyrus</sub>](https://github.com/AlexanderWPapyrus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AlexanderWPapyrus "Code") | [<img src="https://avatars.githubusercontent.com/u/306231?v=4" width="110px;"/><br /><sub>Alexandr Hacicheant</sub>](https://github.com/disc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=disc "Code") | [<img src="https://avatars.githubusercontent.com/u/3032891?v=4" width="110px;"/><br /><sub>Hex</sub>](https://hex128.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hex128 "Code") | [<img src="https://avatars.githubusercontent.com/u/8697942?v=4" width="110px;"/><br /><sub>Arunas Skirius</sub>](https://github.com/arukompas)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arukompas "Code") | [<img src="https://avatars.githubusercontent.com/u/104396?v=4" width="110px;"/><br /><sub>Ben Periton</sub>](https://github.com/benperiton)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benperiton "Code") | [<img src="https://avatars.githubusercontent.com/u/11906832?v=4" width="110px;"/><br /><sub>Byron Wolfman</sub>](https://wolfman.dev/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=byronwolfman "Code") | [<img src="https://avatars.githubusercontent.com/u/56485508?v=4" width="110px;"/><br /><sub>Calvin</sub>](https://github.com/CalvinSchwartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CalvinSchwartz "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/FixUpAssignedTypeWithoutAssignedTo.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-
-class FixUpAssignedTypeWithoutAssignedTo extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:assigned-type-fixup';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fixes up assets that have an assigned_type but no assigned_to';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        DB::table('assets')->whereNotNull('assigned_type')->whereNull('assigned_to')->update(['assigned_type' => null]);
-        $this->info("Assets with an assigned_type but no assigned_to are fixed");
-    }
-}

app/Console/Commands/SendAcceptanceReminder.php

@@ -99,11 +99,8 @@ class SendAcceptanceReminder extends Command
         foreach ($no_email_list as $user) {
             $rows[] = [$user['id'], $user['name']];
         }
-
-        if (!empty($rows)) {
-            $this->info("The following users do not have an email address:");
-            $this->table($headers, $rows);
-        }
+        $this->info("The following users do not have an email address:");
+        $this->table($headers, $rows);
 
         return 0;
     }

app/Events/CheckoutableCheckedIn.php

@@ -28,7 +28,7 @@ class CheckoutableCheckedIn
         $this->checkedOutTo = $checkedOutTo;
         $this->checkedInBy = $checkedInBy;
         $this->note = $note;
-        $this->action_date = $action_date ?? date('Y-m-d H:i:s');
+        $this->action_date = $action_date ?? date('Y-m-d');
         $this->originalValues = $originalValues;
     }
 }

app/Exceptions/Handler.php

@@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Log;
 use Throwable;
 use JsonException;
 use Carbon\Exceptions\InvalidFormatException;
-use Illuminate\Http\Exceptions\ThrottleRequestsException;
 
 class Handler extends ExceptionHandler
 {
@@ -108,10 +107,11 @@ class Handler extends ExceptionHandler
 
                 $statusCode = $e->getStatusCode();
 
-                // API throttle requests are handled in the RouteServiceProvider configureRateLimiting() method, so we don't need to handle them here
                 switch ($e->getStatusCode()) {
                     case '404':
                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
+                    case '429':
+                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Too many requests'), 429);
                      case '405':
                         return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                     default:
@@ -143,10 +143,6 @@ class Handler extends ExceptionHandler
                 $route = 'maintenances.index';
             } elseif ($route === 'licenseseats.index') {
                 $route = 'licenses.index';
-            } elseif ($route === 'customfields.index') {
-                $route = 'fields.index';
-            } elseif ($route === 'customfieldsets.index') {
-                $route = 'fields.index';
             }
 
             return redirect()
@@ -205,7 +201,6 @@ class Handler extends ExceptionHandler
      */
     public function register()
     {
-
         $this->reportable(function (Throwable $e) {
             //
         });

app/Helpers/Helper.php

@@ -1313,24 +1313,25 @@ class Helper
         switch ($item) {
             case 'asset':
                 return 'fas fa-barcode';
+                break;
             case 'accessory':
                 return 'fas fa-keyboard';
+                break;
             case 'component':
                 return 'fas fa-hdd';
+                break;
             case 'consumable':
                 return 'fas fa-tint';
+                break;
             case 'license':
                 return 'far fa-save';
+                break;
             case 'location':
                 return 'fas fa-map-marker-alt';
+                break;
             case 'user':
                 return 'fas fa-user';
-            case 'supplier':
-                return 'fa-solid fa-store';
-            case 'manufacturer':
-                return 'fa-solid fa-building';
-            case 'category':
-                return 'fa-solid fa-table-columns';
+                break;
         }
 
     }

app/Http/Controllers/Api/AssetModelsController.php

@@ -85,12 +85,6 @@ class AssetModelsController extends Controller
             $assetmodels = $assetmodels->where('models.model_number', '=', $request->input('model_number'));
         }
 
-        if ($request->input('requestable') == 'true') {
-            $assetmodels = $assetmodels->where('models.requestable', '=', '1');
-        } elseif ($request->input('requestable') == 'false') {
-            $assetmodels = $assetmodels->where('models.requestable', '=', '0');
-        }        
-
         if ($request->filled('notes')) {
             $assetmodels = $assetmodels->where('models.notes', '=', $request->input('notes'));
         }

app/Http/Controllers/Api/AssetsController.php

@@ -1146,7 +1146,7 @@ class AssetsController extends Controller
 
             // Validate the rest of the data before we turn off the event dispatcher
             if ($asset->isInvalid()) {
-                return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => $asset->asset_tag],  $asset->getErrors()));
+                return response()->json(Helper::formatStandardApiResponse('error', null,  $asset->getErrors()));
             }
 
 

app/Http/Controllers/Api/ImportController.php

@@ -234,15 +234,6 @@ class ImportController extends Controller
             case 'location':
                 $redirectTo = 'locations.index';
                 break;
-            case 'supplier':
-                $redirectTo = 'suppliers.index';
-                break;
-            case 'manufacturer':
-                $redirectTo = 'manufacturers.index';
-                break;
-            case 'category':
-                $redirectTo = 'categories.index';
-                break;
         }
 
         if ($errors) { //Failure

app/Http/Controllers/Api/LocationsController.php

@@ -87,8 +87,7 @@ class LocationsController extends Controller
             ->withCount('accessories as accessories_count')
             ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('children as children_count')
-            ->withCount('users as users_count')
-            ->with('adminuser');
+            ->withCount('users as users_count');
 
         // Only scope locations if the setting is enabled
         if (Setting::getSettings()->scope_locations_fmcs) {
@@ -219,7 +218,6 @@ class LocationsController extends Controller
                 'locations.updated_at',
                 'locations.image',
                 'locations.currency',
-                'locations.company_id',
                 'locations.notes',
             ])
             ->withCount('assignedAssets as assigned_assets_count')

app/Http/Controllers/Api/SuppliersController.php

@@ -24,15 +24,10 @@ class SuppliersController extends Controller
     public function index(Request $request): array
     {
         $this->authorize('view', Supplier::class);
-        $allowed_columns = [
-            'id',
+        $allowed_columns = ['
+            id',
             'name',
             'address',
-            'address2',
-            'city',
-            'state',
-            'country',
-            'zip',
             'phone',
             'contact',
             'fax',
@@ -44,24 +39,21 @@ class SuppliersController extends Controller
             'components_count',
             'consumables_count',
             'url',
-            'notes',
         ];
         
         $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes', 'url'])
                     ->withCount('assets as assets_count')
                     ->withCount('licenses as licenses_count')
                     ->withCount('accessories as accessories_count')
                     ->withCount('components as components_count')
-                    ->withCount('consumables as consumables_count')
-                    ->with('adminuser');
+                    ->withCount('consumables as consumables_count');
 
 
         if ($request->filled('search')) {
-            $suppliers->TextSearch($request->input('search'));
+            $suppliers = $suppliers->TextSearch($request->input('search'));
         }
 
-
         if ($request->filled('name')) {
             $suppliers->where('name', '=', $request->input('name'));
         }
@@ -108,15 +100,7 @@ class SuppliersController extends Controller
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-
-        switch ($request->input('sort')) {
-            case 'created_by':
-                $suppliers->OrderByCreatedByName($order);
-                break;
-            default:
-                $suppliers->orderBy($sort, $order);
-                break;
-        }
+        $suppliers->orderBy($sort, $order);
 
         $total = $suppliers->count();
         $suppliers = $suppliers->skip($offset)->take($limit)->get();

app/Http/Controllers/Api/UsersController.php

@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
 use App\Http\Transformers\AccessoriesTransformer;
-use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
@@ -81,7 +80,7 @@ class UsersController extends Controller
             'users.autoassign_licenses',
             'users.website',
 
-        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations', 'eulas')
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
             ->withCount([
                 'assets as assets_count' => function(Builder $query) {
                     $query->withoutTrashed();
@@ -207,11 +206,11 @@ class UsersController extends Controller
         }
 
         if ($request->filled('manages_users_count')) {
-            $users->has('managesUsers', '=', $request->input('manages_users_count'));
+            $users->has('manages_users_count', '=', $request->input('manages_users_count'));
         }
 
         if ($request->filled('manages_locations_count')) {
-            $users->has('managedLocations', '=', $request->input('manages_locations_count'));
+            $users->has('manages_locations_count', '=', $request->input('manages_locations_count'));
         }
 
         if ($request->filled('autoassign_licenses')) {
@@ -737,25 +736,6 @@ class UsersController extends Controller
         return (new UsersTransformer)->transformUser($request->user());
     }
 
-    /**
-     * Display the EULAs accepted by the user.
-     *
-     *  @param \App\Models\User $user
-     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
-     *  @return \Illuminate\Http\JsonResponse
-     *@since [v8.1.16]
-     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
-     */
-    public function eulas(User $user, ActionlogsTransformer $transformer)
-    {
-        $this->authorize('view', Asset::class);
-
-        $eulas = $user->eulas;
-        return response()->json(
-            $transformer->transformActionlogs($eulas, $eulas->count())
-        );
-    }
-
     /**
      * Restore a soft-deleted user.
      *

app/Http/Controllers/AssetMaintenancesController.php

@@ -19,6 +19,19 @@ use \Illuminate\Http\RedirectResponse;
  */
 class AssetMaintenancesController extends Controller
 {
+    /**
+    * Checks for permissions for this action.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    */
+    private static function getInsufficientPermissionsRedirect(): RedirectResponse
+    {
+        return redirect()->route('maintenances.index')
+          ->with('error', trans('general.insufficient_permissions'));
+    }
 
     /**
     *  Returns a view that invokes the ajax tables which actually contains
@@ -54,10 +67,16 @@ class AssetMaintenancesController extends Controller
             // We have to set this so that the correct property is set in the select2 ajax dropdown
             $asset->asset_id = $asset->id;
         }
-        
+
+        // Prepare Asset Maintenance Type List
+        $assetMaintenanceType = [
+                                    '' => 'Select an asset maintenance type',
+                                ] + AssetMaintenance::getImprovementOptions();
+        // Mark the selected asset, if it came in
+
         return view('asset_maintenances/edit')
-                   ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
                    ->with('asset', $asset)
+                   ->with('assetMaintenanceType', $assetMaintenanceType)
                    ->with('item', new AssetMaintenance);
     }
 
@@ -72,45 +91,43 @@ class AssetMaintenancesController extends Controller
     public function store(Request $request) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
+        // create a new model instance
+        $assetMaintenance = new AssetMaintenance();
+        $assetMaintenance->supplier_id = $request->input('supplier_id');
+        $assetMaintenance->is_warranty = $request->input('is_warranty');
+        $assetMaintenance->cost = $request->input('cost');
+        $assetMaintenance->notes = $request->input('notes');
+        $asset = Asset::find($request->input('asset_id'));
 
-        $assets = Asset::whereIn('id', $request->input('selected_assets'))->get();
-
-        // Loop through the selected assets
-        foreach ($assets as $asset) {
-
-            $assetMaintenance = new AssetMaintenance();
-            $assetMaintenance->supplier_id = $request->input('supplier_id');
-            $assetMaintenance->is_warranty = $request->input('is_warranty');
-            $assetMaintenance->cost = $request->input('cost');
-            $assetMaintenance->notes = $request->input('notes');
-
-            // Save the asset maintenance data
-            $assetMaintenance->asset_id = $asset->id;
-            $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-            $assetMaintenance->title = $request->input('title');
-            $assetMaintenance->start_date = $request->input('start_date');
-            $assetMaintenance->completion_date = $request->input('completion_date');
-            $assetMaintenance->created_by = auth()->id();
-
-            if (($assetMaintenance->completion_date !== null)
-                && ($assetMaintenance->start_date !== '')
-                && ($assetMaintenance->start_date !== '0000-00-00')
-            ) {
-                $startDate = Carbon::parse($assetMaintenance->start_date);
-                $completionDate = Carbon::parse($assetMaintenance->completion_date);
-                $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
-            }
-
-
-            // Was the asset maintenance created?
-            if (!$assetMaintenance->save()) {
-                return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
-            }
+        if ((! Company::isCurrentUserHasAccess($asset)) && ($asset != null)) {
+            return static::getInsufficientPermissionsRedirect();
         }
 
-        return redirect()->route('maintenances.index')
-            ->with('success', trans('admin/asset_maintenances/message.create.success'));
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title = $request->input('title');
+        $assetMaintenance->start_date = $request->input('start_date');
+        $assetMaintenance->completion_date = $request->input('completion_date');
+        $assetMaintenance->created_by = auth()->id();
 
+        if (($assetMaintenance->completion_date !== null)
+            && ($assetMaintenance->start_date !== '')
+            && ($assetMaintenance->start_date !== '0000-00-00')
+        ) {
+            $startDate = Carbon::parse($assetMaintenance->start_date);
+            $completionDate = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+            // Redirect to the new asset maintenance page
+            return redirect()->route('maintenances.index')
+                           ->with('success', trans('admin/asset_maintenances/message.create.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
     }
 
     /**
@@ -118,19 +135,26 @@ class AssetMaintenancesController extends Controller
     *
     * @see AssetMaintenancesController::postEdit() method that stores the data
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
     */
     public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
+        if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
+            return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Prepare Improvement Type List
+        $assetMaintenanceType = ['' => 'Select an improvement type'] + AssetMaintenance::getImprovementOptions();
 
         return view('asset_maintenances/edit')
-            ->with('selected_assets', $maintenance->asset->pluck('id')->toArray())
-            ->with('asset_ids', request()->input('asset_ids', []))
-            ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
-            ->with('item', $maintenance);
+                   ->with('selectedAsset', null)
+                   ->with('assetMaintenanceType', $assetMaintenanceType)
+                   ->with('item', $maintenance);
     }
 
     /**
@@ -146,21 +170,33 @@ class AssetMaintenancesController extends Controller
     public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
+
+       if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
+                return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
 
         $maintenance->supplier_id = $request->input('supplier_id');
-        $maintenance->is_warranty = $request->input('is_warranty', 0);
+        $maintenance->is_warranty = $request->input('is_warranty');
         $maintenance->cost =  $request->input('cost');
         $maintenance->notes = $request->input('notes');
+
+        $asset = Asset::find(request('asset_id'));
+
+        if (! Company::isCurrentUserHasAccess($asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Save the asset maintenance data
+        $maintenance->asset_id = $request->input('asset_id');
         $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
         $maintenance->title = $request->input('title');
         $maintenance->start_date = $request->input('start_date');
         $maintenance->completion_date = $request->input('completion_date');
 
-
-        // Todo - put this in a getter/setter?
-        if (($maintenance->completion_date == null))
-        {
+        if (($maintenance->completion_date == null)
+        ) {
             if (($maintenance->asset_maintenance_time !== 0)
               || (! is_null($maintenance->asset_maintenance_time))
             ) {
@@ -177,7 +213,10 @@ class AssetMaintenancesController extends Controller
             $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
         }
 
+      // Was the asset maintenance created?
         if ($maintenance->save()) {
+
+            // Redirect to the new asset maintenance page
             return redirect()->route('maintenances.index')
                             ->with('success', trans('admin/asset_maintenances/message.edit.success'));
         }
@@ -193,12 +232,21 @@ class AssetMaintenancesController extends Controller
     * @version v1.0
     * @since [v1.8]
     */
-    public function destroy(AssetMaintenance $maintenance) : RedirectResponse
+    public function destroy($assetMaintenanceId) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
+        // Check if the asset maintenance exists
+        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
+            // Redirect to the asset maintenance management page
+            return redirect()->route('maintenances.index')
+                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
         // Delete the asset maintenance
-        $maintenance->delete();
+        $assetMaintenance->delete();
+
         // Redirect to the asset_maintenance management page
         return redirect()->route('maintenances.index')
                        ->with('success', trans('admin/asset_maintenances/message.delete.success'));
@@ -214,6 +262,11 @@ class AssetMaintenancesController extends Controller
     */
     public function show(AssetMaintenance $maintenance) : View | RedirectResponse
     {
+        $this->authorize('view', Asset::class);
+        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
         return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
     }
 }

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -96,6 +96,7 @@ class AssetCheckinController extends Controller
         });
 
         $asset->expected_checkin = null;
+        $asset->last_checkin = now();
         $asset->assignedTo()->disassociate($asset);
         $asset->accepted = null;
         $asset->name = $request->get('name');
@@ -122,14 +123,11 @@ class AssetCheckinController extends Controller
 
         $originalValues = $asset->getRawOriginal();
 
-        // Handle last checkin date
         $checkin_at = date('Y-m-d H:i:s');
         if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
             $originalValues['action_date'] = $checkin_at;
             $checkin_at = $request->get('checkin_at');
-
         }
-        $asset->last_checkin = $checkin_at;
 
         $asset->licenseseats->each(function (LicenseSeat $seat) {
             $seat->update(['assigned_to' => null]);

app/Http/Controllers/Assets/AssetsController.php

@@ -149,7 +149,7 @@ class AssetsController extends Controller
             $asset->byod                    = request('byod', 0);
 
             if (! empty($settings->audit_interval)) {
-                $asset->next_audit_date = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();
+                $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
             }
 
             // Set location_id to rtd_location_id ONLY if the asset isn't being checked out
@@ -188,31 +188,14 @@ class AssetsController extends Controller
 
             // Validate the asset before saving
             if ($asset->isValid() && $asset->save()) {
-                $target = null;
-                $location = null;
-
-                if ($userId = request('assigned_user')) {
-                    $target = User::find($userId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
-                    }
+                if (request('assigned_user')) {
+                    $target = User::find(request('assigned_user'));
                     $location = $target->location_id;
-
-                } elseif ($assetId = request('assigned_asset')) {
-                    $target = Asset::find($assetId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
-                    }
+                } elseif (request('assigned_asset')) {
+                    $target = Asset::find(request('assigned_asset'));
                     $location = $target->location_id;
-
-                } elseif ($locationId = request('assigned_location')) {
-                    $target = Location::find($locationId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
-                    }
+                } elseif (request('assigned_location')) {
+                    $target = Location::find(request('assigned_location'));
                     $location = $target->id;
                 }
 
@@ -463,7 +446,7 @@ class AssetsController extends Controller
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on delete', $checkin_at, $originalValues));
             DB::table('assets')
                 ->where('id', $asset->id)
-                ->update(['assigned_to' => null, 'assigned_type' => null]);
+                ->update(['assigned_to' => null]);
         }
 
 
@@ -475,7 +458,6 @@ class AssetsController extends Controller
             }
         }
 
-
         $asset->delete();
 
         return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
@@ -908,7 +890,7 @@ class AssetsController extends Controller
             return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
         }
 
-        $dt = Carbon::now()->addMonths( (int) $settings->audit_interval)->toDateString();
+        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         return view('hardware/audit')->with('asset', $asset)->with('item', $asset)->with('next_audit_date', $dt)->with('locations_list');
     }
 

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -52,26 +52,11 @@ class BulkAssetsController extends Controller
         }
 
         $asset_ids = $request->input('ids');
-
         if ($request->input('bulk_actions') === 'checkout') {
-            $status_check =$this->hasUndeployableStatus($asset_ids);
-            if($status_check && $status_check['status'] === true){
-
-                $asset_tags = implode(', ', array_column($status_check['tags'], 'asset_tag'));
-                $asset_ids = $status_check['asset_ids'];
-
-                session()->flash('warning', trans('admin/hardware/message.undeployable', ['asset_tags' => $asset_tags]));
-            }
-
             $request->session()->flashInput(['selected_assets' => $asset_ids]);
             return redirect()->route('hardware.bulkcheckout.show');
         }
 
-        if ($request->input('bulk_actions') === 'maintenance') {
-            $request->session()->flashInput(['selected_assets' => $asset_ids]);
-            return redirect()->route('maintenances.create');
-        }
-
         // Figure out where we need to send the user after the update is complete, and store that in the session
         $bulk_back_url = request()->headers->get('referer');
         session(['bulk_back_url' => $bulk_back_url]);
@@ -229,21 +214,6 @@ class BulkAssetsController extends Controller
 
        $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
 
-        // find custom field input attributes that start with 'null_'
-        $null_custom_fields_inputs = array_filter($request->all(), function ($key) {
-            // filter out all keys that start with 'null_'
-            return (strpos($key, 'null_') === 0);
-        }, ARRAY_FILTER_USE_KEY);;
-        // remove 'null' from the keys
-        $custom_fields_to_null = [];
-        foreach ($null_custom_fields_inputs as $key => $value) {
-            $custom_fields_to_null[str_replace('null', '', $key)] = $value;
-        }
-
-
-
-
-
      
         if (! $request->filled('ids') || count($request->input('ids')) == 0) {
             return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -282,7 +252,6 @@ class BulkAssetsController extends Controller
             || ($request->filled('null_next_audit_date'))
             || ($request->filled('null_asset_eol_date'))
             || ($request->anyFilled($custom_field_columns))
-            || ($request->anyFilled(array_keys($null_custom_fields_inputs)))
 
         ) {
             // Let's loop through those assets and build an update array
@@ -309,9 +278,6 @@ class BulkAssetsController extends Controller
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
-                foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
-                    $this->conditionallyAddItem($key);
-                }
 
                 if (!($asset->eol_explicit)) {
 					if ($request->filled('model_id')) {
@@ -402,12 +368,10 @@ class BulkAssetsController extends Controller
                     // This could probably be added to a form request.
                     // If the asset isn't assigned, we don't care what the status is.
                     // Otherwise we need to make sure the status type is still a deployable one.
-
-                    $unassigned = $asset->assigned_to == '';
-                    $deployable = $updated_status->deployable == '1' && $asset->assetstatus?->deployable == '1';
-                    $pending =  $updated_status->pending === 1;
-
-                    if ($unassigned || $deployable || $pending) {
+                    if (
+                        ($asset->assigned_to == '')
+                        || ($updated_status->deployable == '1') && ($asset->assetstatus?->deployable == '1')
+                    ) {
                         $this->update_array['status_id'] = $updated_status->id;
                     }
 
@@ -459,7 +423,6 @@ class BulkAssetsController extends Controller
                 }
 
                 /**
-                 *
                  * Start all the custom fields shenanigans
                  */
 
@@ -467,15 +430,6 @@ class BulkAssetsController extends Controller
                 if ($asset->model->fieldset) {
                     foreach ($asset->model->fieldset->fields as $field) {
 
-                        // null custom fields
-                        if ($custom_fields_to_null) {
-                            foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
-                                if ($field->db_column == $key) {
-                                    $this->update_array[$field->db_column] = null;
-                                }
-                            }
-                        }
-
                         if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
                             if (Gate::allows('admin')) {
                                 $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
@@ -608,10 +562,7 @@ class BulkAssetsController extends Controller
     public function showCheckout() : View
     {
         $this->authorize('checkout', Asset::class);
-
-        $do_not_change = ['' => trans('general.do_not_change')];
-        $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
-        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
+        return view('hardware/bulk-checkout');
     }
 
     /**
@@ -643,13 +594,13 @@ class BulkAssetsController extends Controller
             }
             $checkout_at = date('Y-m-d H:i:s');
             if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) {
-                $checkout_at = $request->get('checkout_at');
+                $checkout_at = e($request->get('checkout_at'));
             }
 
             $expected_checkin = '';
 
             if ($request->filled('expected_checkin')) {
-                $expected_checkin = $request->get('expected_checkin');
+                $expected_checkin = e($request->get('expected_checkin'));
             }
 
             $errors = [];
@@ -657,11 +608,6 @@ class BulkAssetsController extends Controller
                 foreach ($assets as $asset) {
                     $this->authorize('checkout', $asset);
 
-                    // See if there is a status label passed
-                    if ($request->filled('status_id')) {
-                        $asset->status_id = $request->get('status_id');
-                    }
-
                     $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
 
                     //TODO - I think this logic is duplicated in the checkOut method?
@@ -705,25 +651,4 @@ class BulkAssetsController extends Controller
             return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
         }
     }
-    public function hasUndeployableStatus (array $asset_ids)
-    {
-        $undeployable = Asset::whereIn('id', $asset_ids)
-            ->undeployable()
-            ->get();
-
-        $undeployableTags = $undeployable->map(function ($asset) {
-            return [
-                'id' => $asset->id,
-                'asset_tag' => $asset->asset_tag,
-            ];
-        })->toArray();
-
-        $undeployableIds = array_column($undeployableTags, 'id');
-        $filtered_ids = array_diff($asset_ids, $undeployableIds);
-
-         if($undeployable->isNotEmpty()) {
-             return ['status' => true, 'tags' => $undeployableTags, 'asset_ids' => $filtered_ids];
-         }
-        return false;
-    }
 }

app/Http/Controllers/ReportsController.php

@@ -184,7 +184,7 @@ class ReportsController extends Controller
                 $currency = e(Setting::getSettings()->default_currency);
             }
 
-            $row[] = Helper::getFormattedDateObject($asset->purchase_date, 'date', false);
+            $row[] = $asset->purchase_date;
             $row[] = $currency.Helper::formatCurrencyOutput($asset->purchase_cost);
             $row[] = $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue());
             $row[] = $currency.Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));

app/Http/Controllers/SettingsController.php

@@ -650,7 +650,6 @@ class SettingsController extends Controller
 
         $setting->alert_email = $alert_email;
         $setting->admin_cc_email = $admin_cc_email;
-        $setting->admin_cc_always = $request->validated('admin_cc_always');
         $setting->alerts_enabled = $request->input('alerts_enabled', '0');
         $setting->alert_interval = $request->input('alert_interval');
         $setting->alert_threshold = $request->input('alert_threshold');

app/Http/Kernel.php

@@ -73,7 +73,6 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'api-throttle' => \App\Http\Middleware\SetAPIResponseHeaders::class,
         'health' => null,
     ];
 }

app/Http/Middleware/SetAPIResponseHeaders.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Routing\Middleware\ThrottleRequests;
-use Symfony\Component\HttpFoundation\Response;
-
-class SetAPIResponseHeaders extends ThrottleRequests
-{
-
-    /**
-     * Add the rate limit headers to the response.
-     *
-     * This extends the original ThrottleRequests middleware to add the 'X-RateLimit-Reset' and 'Retry-After' headers, even
-     * if the rate limit is not exceeded.
-     * @param $maxAttempts
-     * @param $remainingAttempts
-     * @param $retryAfter
-     * @param Response|null $response
-     * @return array|int[]
-     */
-    protected function getHeaders($maxAttempts,  $remainingAttempts, $retryAfter = null, ?Response $response = null)
-    {
-        if ($response &&
-            ! is_null($response->headers->get('X-RateLimit-Remaining')) &&
-            (int) $response->headers->get('X-RateLimit-Remaining') <= (int) $remainingAttempts) {
-            $headers = [];
-            $headers['Retry-After'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
-            return $headers;
-        }
-
-        $headers = [
-            'X-RateLimit-Limit' => $maxAttempts,
-            'X-RateLimit-Remaining' => $remainingAttempts,
-        ];
-
-        if (! is_null($retryAfter)) {
-            $headers['Retry-After'] = $retryAfter;
-            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
-        }
-
-        return $headers;
-    }
-
-
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    protected function handleRequest($request, Closure $next, array $limits)
-    {
-        foreach ($limits as $limit) {
-            if ($this->limiter->tooManyAttempts($limit->key, $limit->maxAttempts)) {
-                throw $this->buildException($request, $limit->key, $limit->maxAttempts, $limit->responseCallback);
-            }
-
-            $this->limiter->hit($limit->key, $limit->decaySeconds);
-        }
-
-        $response = $next($request);
-
-        foreach ($limits as $limit) {
-            $response = $this->addHeaders(
-                $response,
-                $limit->maxAttempts,
-                $this->calculateRemainingAttempts($limit->key, $limit->maxAttempts),
-                $this->getTimeUntilNextRetry($limit->key) // this is the only line we changed
-            );
-        }
-
-        return $response;
-    }
-
-}

app/Http/Requests/StoreLabelSettings.php

@@ -37,8 +37,8 @@ class StoreLabelSettings extends FormRequest
 
         return [
             'labels_per_page'                     => 'numeric',
-            'labels_width'                        => 'numeric|min:0.1',
-            'labels_height'                       => 'numeric|min:0.1',
+            'labels_width'                        => 'numeric',
+            'labels_height'                       => 'numeric',
             'labels_pmargin_left'                 => 'numeric|nullable',
             'labels_pmargin_right'                => 'numeric|nullable',
             'labels_pmargin_top'                  => 'numeric|nullable',

app/Http/Requests/StoreNotificationSettings.php

@@ -5,7 +5,6 @@ namespace App\Http\Requests;
 use App\Models\Accessory;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;
-use Illuminate\Validation\Rule;
 
 class StoreNotificationSettings extends FormRequest
 {
@@ -27,9 +26,6 @@ class StoreNotificationSettings extends FormRequest
         return [
             'alert_email'                         => 'email_array|nullable',
             'admin_cc_email'                      => 'email_array|nullable',
-            'admin_cc_always' => [
-                Rule::in('0', '1'),
-            ],
             'alert_threshold'                     => 'numeric|nullable',
             'alert_interval'                      => 'numeric|nullable|gt:0',
             'audit_warning_days'                  => 'numeric|nullable',

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -59,10 +59,7 @@ class AssetMaintenancesTransformer
                 'name'=> e($assetmaintenance->asset->defaultLoc->name),
             ] : null,
             'notes'         => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,
-            'supplier'      => ($assetmaintenance->supplier) ?  [
-                    'id' => $assetmaintenance->supplier->id,
-                    'name'=> e($assetmaintenance->supplier->name)
-                    ] : null,
+            'supplier'      => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null,
             'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
             'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
             'start_date'         => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),

app/Http/Transformers/LocationsTransformer.php

@@ -57,10 +57,6 @@ class LocationsTransformer
                 'ldap_ou' =>  ($location->ldap_ou) ? e($location->ldap_ou) : null,
                 'notes' => Helper::parseEscapedMarkedownInline($location->notes),
                 'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
-                'created_by' => $location->adminuser ? [
-                    'id' => (int) $location->adminuser->id,
-                    'name'=> e($location->adminuser->present()->fullName),
-                ]: null,
                 'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
                 'parent' => ($location->parent) ? [
                     'id' => (int) $location->parent->id,

app/Http/Transformers/SuppliersTransformer.php

@@ -45,10 +45,6 @@ class SuppliersTransformer
                 'components_count' => (int) $supplier->components_count,
                 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
                 'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
-                'created_by' => $supplier->adminuser ? [
-                    'id' => (int) $supplier->adminuser->id,
-                    'name'=> e($supplier->adminuser->present()->fullName),
-                ]: null,
                 'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
 
             ];

app/Http/Transformers/UsersTransformer.php

@@ -50,10 +50,6 @@ class UsersTransformer
                     'id' => (int) $user->department->id,
                     'name'=> e($user->department->name),
                 ] : null,
-                'department_manager' => ($user->department?->manager) ? [
-                    'id' => (int) $user->department->manager->id,
-                    'name'=> e($user->department->manager->full_name),
-                ] : null,
                 'location' => ($user->userloc) ? [
                     'id' => (int) $user->userloc->id,
                     'name'=> e($user->userloc->name),

app/Importer/AssetImporter.php

@@ -80,16 +80,7 @@ class AssetImporter extends ItemImporter
             $asset_tag = Asset::autoincrement_asset();
         }
 
-
-
-        if ($this->findCsvMatch($row, 'id')!='') {
-            // Override asset if an ID was given
-            \Log::debug('Finding asset by ID: '.$this->findCsvMatch($row, 'id'));
-            $asset = Asset::find($this->findCsvMatch($row, 'id'));
-        } else {
-            $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
-        }
-        
+        $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
         if ($asset) {
             if (! $this->updating) {
                 $exists_error = trans('general.import_asset_tag_exists', ['asset_tag' => $asset_tag]);

app/Importer/CategoryImporter.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Importer;
-
-use App\Models\Category;
-use Illuminate\Support\Facades\Log;
-
-/**
- * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
- * Importer\Importer.php. [ALG]
- *
- * Class CategoryImporter
- */
-class CategoryImporter extends ItemImporter
-{
-    protected $categories;
-
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-    }
-
-    protected function handle($row)
-    {
-        parent::handle($row);
-        $this->createCategoryIfNotExists($row);
-    }
-
-    /**
-     * Create a category if a duplicate does not exist.
-     * @todo Investigate how this should interact with Importer::createCategoryIfNotExists
-     *
-     * @author A. Gianotto
-     * @since 6.1.0
-     * @param array $row
-     */
-    public function createCategoryIfNotExists(array $row)
-    {
-
-        $editingCategory = false;
-
-        $category = Category::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
-
-        if ($this->findCsvMatch($row, 'id')!='') {
-            // Override category if an ID was given
-            \Log::debug('Finding category by ID: '.$this->findCsvMatch($row, 'id'));
-            $category = Category::find($this->findCsvMatch($row, 'id'));
-        }
-
-
-        if ($category) {
-            if (! $this->updating) {
-                $this->log('A matching Category '.$this->item['name'].' already exists');
-                return;
-            }
-
-            $this->log('Updating Category');
-            $editingCategory = true;
-        } else {
-            $this->log('No Matching Category, Create a new one');
-            $category = new Category;
-            $category->created_by = auth()->id();
-        }
-
-        // Pull the records from the CSV to determine their values
-        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
-        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
-        $this->item['eula_text'] = trim($this->findCsvMatch($row, 'eula_text'));
-        $this->item['category_type'] = trim(strtolower($this->findCsvMatch($row, 'category_type')));
-        $this->item['use_default_eula'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'use_default_eula'))) == 1) ? 1 : 0;
-        $this->item['require_acceptance'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'require_acceptance'))) == 1) ? 1 : 0;
-        $this->item['checkin_email'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'checkin_email'))) == 1) ? 1 : 0;
-
-
-        Log::debug('Item array is: ');
-        Log::debug(print_r($this->item, true));
-
-
-        if ($editingCategory) {
-            Log::debug('Updating existing category');
-            $category->update($this->sanitizeItemForUpdating($category));
-        } else {
-            Log::debug('Creating category');
-            $category->fill($this->sanitizeItemForStoring($category));
-        }
-
-        if ($category->save()) {
-            $this->log('Category '.$category->name.' created or updated from CSV import');
-            return $category;
-
-        } else {
-            Log::debug($category->getErrors());
-            $this->logError($category, 'Category "'.$this->item['name'].'"');
-            return $category->errors;
-        }
-
-
-    }
-}

app/Importer/ItemImporter.php

@@ -110,7 +110,7 @@ class ItemImporter extends Importer
     protected function determineCheckout($row)
     {
         // Locations don't get checked out to anyone/anything
-        if ((get_class($this) == LocationImporter::class) || (get_class($this) == AssetModelImporter::class) || (get_class($this) == SupplierImporter::class) || (get_class($this) == ManufacturerImporter::class)  || (get_class($this) == CategoryImporter::class)) {
+        if ((get_class($this) == LocationImporter::class) || (get_class($this) == AssetModelImporter::class)) {
             return;
         }
 

app/Importer/ManufacturerImporter.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Importer;
-
-use App\Models\Manufacturer;
-use Illuminate\Support\Facades\Log;
-
-/**
- * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
- * Importer\Importer.php. [ALG]
- *
- * Class ManufacturerImporter
- */
-class ManufacturerImporter extends ItemImporter
-{
-    protected $manufacturers;
-
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-    }
-
-    protected function handle($row)
-    {
-        parent::handle($row);
-        $this->createManufacturerIfNotExists($row);
-    }
-
-    /**
-     * Create a supplier if a duplicate does not exist.
-     * @todo Investigate how this should interact with Importer::createManufacturerIfNotExists
-     *
-     * @author A. Gianotto
-     * @since 6.1.0
-     * @param array $row
-     */
-    public function createManufacturerIfNotExists(array $row)
-    {
-
-        $editingManufacturer = false;
-
-        $supplier = Manufacturer::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
-
-        if ($this->findCsvMatch($row, 'id')!='') {
-            // Override supplier if an ID was given
-            \Log::debug('Finding supplier by ID: '.$this->findCsvMatch($row, 'id'));
-            $supplier = Manufacturer::find($this->findCsvMatch($row, 'id'));
-        }
-
-
-        if ($supplier) {
-            if (! $this->updating) {
-                $this->log('A matching Manufacturer '.$this->item['name'].' already exists');
-                return;
-            }
-
-            $this->log('Updating Manufacturer');
-            $editingManufacturer = true;
-        } else {
-            $this->log('No Matching Manufacturer, Create a new one');
-            $supplier = new Manufacturer;
-            $supplier->created_by = auth()->id();
-        }
-
-        // Pull the records from the CSV to determine their values
-        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
-        $this->item['support_phone'] = trim($this->findCsvMatch($row, 'support_phone'));
-        $this->item['fax'] = trim($this->findCsvMatch($row, 'fax'));
-        $this->item['support_email'] = trim($this->findCsvMatch($row, 'support_email'));
-        $this->item['contact'] = trim($this->findCsvMatch($row, 'contact'));
-        $this->item['url'] = trim($this->findCsvMatch($row, 'url'));
-        $this->item['support_url'] = trim($this->findCsvMatch($row, 'support_url'));
-        $this->item['warranty_lookup_url'] = trim($this->findCsvMatch($row, 'warranty_lookup_url'));
-        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
-
-
-        Log::debug('Item array is: ');
-        Log::debug(print_r($this->item, true));
-
-
-        if ($editingManufacturer) {
-            Log::debug('Updating existing supplier');
-            $supplier->update($this->sanitizeItemForUpdating($supplier));
-        } else {
-            Log::debug('Creating supplier');
-            $supplier->fill($this->sanitizeItemForStoring($supplier));
-        }
-
-        if ($supplier->save()) {
-            $this->log('Manufacturer '.$supplier->name.' created or updated from CSV import');
-            return $supplier;
-
-        } else {
-            Log::debug($supplier->getErrors());
-            $this->logError($supplier, 'Manufacturer "'.$this->item['name'].'"');
-            return $supplier->errors;
-        }
-
-
-    }
-}

app/Importer/SupplierImporter.php

@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Importer;
-
-use App\Models\Supplier;
-use Illuminate\Support\Facades\Log;
-
-/**
- * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
- * Importer\Importer.php. [ALG]
- *
- * Class SupplierImporter
- */
-class SupplierImporter extends ItemImporter
-{
-    protected $suppliers;
-
-    public function __construct($filename)
-    {
-        parent::__construct($filename);
-    }
-
-    protected function handle($row)
-    {
-        parent::handle($row);
-        $this->createSupplierIfNotExists($row);
-    }
-
-    /**
-     * Create a supplier if a duplicate does not exist.
-     * @todo Investigate how this should interact with Importer::createSupplierIfNotExists
-     *
-     * @author A. Gianotto
-     * @since 6.1.0
-     * @param array $row
-     */
-    public function createSupplierIfNotExists(array $row)
-    {
-
-        $editingSupplier = false;
-
-        $supplier = Supplier::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
-
-        if ($this->findCsvMatch($row, 'id')!='') {
-            // Override supplier if an ID was given
-            \Log::debug('Finding supplier by ID: '.$this->findCsvMatch($row, 'id'));
-            $supplier = Supplier::find($this->findCsvMatch($row, 'id'));
-        }
-
-
-        if ($supplier) {
-            if (! $this->updating) {
-                $this->log('A matching Supplier '.$this->item['name'].' already exists');
-                return;
-            }
-
-            $this->log('Updating Supplier');
-            $editingSupplier = true;
-        } else {
-            $this->log('No Matching Supplier, Create a new one');
-            $supplier = new Supplier;
-            $supplier->created_by = auth()->id();
-        }
-
-        // Pull the records from the CSV to determine their values
-        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
-        $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
-        $this->item['address2'] = trim($this->findCsvMatch($row, 'address2'));
-        $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
-        $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
-        $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
-        $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
-        $this->item['phone'] = trim($this->findCsvMatch($row, 'phone'));
-        $this->item['fax'] = trim($this->findCsvMatch($row, 'fax'));
-        $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
-        $this->item['contact'] = trim($this->findCsvMatch($row, 'contact'));
-        $this->item['url'] = trim($this->findCsvMatch($row, 'url'));
-        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
-
-
-        Log::debug('Item array is: ');
-        Log::debug(print_r($this->item, true));
-
-
-        if ($editingSupplier) {
-            Log::debug('Updating existing supplier');
-            $supplier->update($this->sanitizeItemForUpdating($supplier));
-        } else {
-            Log::debug('Creating supplier');
-            $supplier->fill($this->sanitizeItemForStoring($supplier));
-        }
-
-        if ($supplier->save()) {
-            $this->log('Supplier '.$supplier->name.' created or updated from CSV import');
-            return $supplier;
-
-        } else {
-            Log::debug($supplier->getErrors());
-            $this->logError($supplier, 'Supplier "'.$this->item['name'].'"');
-            return $supplier->errors;
-        }
-
-
-    }
-}

app/Listeners/CheckoutableListener.php

@@ -69,16 +69,16 @@ class CheckoutableListener
             return;
         }
 
-        $acceptance = $this->getCheckoutAcceptance($event);
-
         $shouldSendEmailToUser = $this->shouldSendCheckoutEmailToUser($event->checkoutable);
-        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress($acceptance);
+        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress();
         $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();
 
         if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
             return;
         }
 
+        $acceptance = $this->getCheckoutAcceptance($event);
+
         if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
             $mailable = $this->getCheckoutMailType($event, $acceptance);
             $notifiable = $this->getNotifiableUser($event);
@@ -419,19 +419,9 @@ class CheckoutableListener
         return false;
     }
 
-    private function shouldSendEmailToAlertAddress($acceptance = null): bool
+    private function shouldSendEmailToAlertAddress(): bool
     {
-        $setting = Setting::getSettings();
-
-        if (!$setting) {
-            return false;
-        }
-
-        if (is_null($acceptance) && !$setting->admin_cc_always) {
-            return false;
-        }
-
-        return (bool) $setting->admin_cc_email;
+        return Setting::getSettings() && Setting::getSettings()->admin_cc_email;
     }
 
     private function getFormattedAlertAddresses(): array

app/Livewire/Importer.php

@@ -35,14 +35,10 @@ class Importer extends Component
     public $accessories_fields;
     public $assets_fields;
     public $users_fields;
-    public $assetmodels_fields;
-    public $suppliers_fields;
     public $licenses_fields;
     public $locations_fields;
     public $consumables_fields;
     public $components_fields;
-    public $manufacturers_fields;
-    public $categories_fields;
     public $aliases_fields;
 
     protected $rules = [
@@ -89,6 +85,9 @@ class Importer extends Component
             case 'component':
                 $results = $this->components_fields;
                 break;
+            case 'consumable':
+                $results = $this->consumables_fields;
+                break;
             case 'license':
                 $results = $this->licenses_fields;
                 break;
@@ -98,14 +97,8 @@ class Importer extends Component
             case 'location':
                 $results = $this->locations_fields;
                 break;
-            case 'supplier':
-                $results = $this->suppliers_fields;
-                break;
-            case 'manufacturer':
-                $results = $this->manufacturers_fields;
-                break;
-            case 'category':
-                $results = $this->categories_fields;
+            case 'user':
+                $results = $this->users_fields;
                 break;
             default:
                 $results = [];
@@ -135,7 +128,7 @@ class Importer extends Component
                     //yes, this key *is* valid. Continue on to the next field.
                     continue;
                 } else {
-                    //no, this key is *INVALID* for this import type. Better set it to null,
+                    //no, this key is *INVALID* for this import type. Better set it to null
                     // and we'll hope that the $aliases_fields or something else picks it up.
                     $this->field_map[$i] = null; // fingers crossed! But it's not likely, tbh.
                 } // TODO - strictly speaking, this isn't necessary here I don't think.
@@ -156,7 +149,7 @@ class Importer extends Component
                         // in "Accessories"!)
                         if (array_key_exists($key, $this->columnOptions[$type])) {
                             $this->field_map[$i] = $key;
-                            continue 3; // bust out of both of these loops and the surrounding one - e.g. move on to the next header
+                            continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header
                         }
                     }
                 }
@@ -178,9 +171,6 @@ class Importer extends Component
             'license'       =>    trans('general.licenses'),
             'location'      =>   trans('general.locations'),
             'user'          =>       trans('general.users'),
-            'supplier'      =>       trans('general.suppliers'),
-            'manufacturer'  =>       trans('general.manufacturers'),
-            'category'      =>       trans('general.categories'),
         ];
 
         /**
@@ -203,7 +193,6 @@ class Importer extends Component
         ];
 
         $this->assets_fields = [
-            'id' => trans('general.id'),
             'asset_eol_date' => trans('admin/hardware/form.eol_date'),
             'asset_model' => trans('general.model_name'),
             'asset_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/general.asset')]),
@@ -343,7 +332,6 @@ class Importer extends Component
 
         $this->locations_fields = [
             'id' => trans('general.id'),
-            'name' => trans('general.name'),
             'address' => trans('general.address'),
             'address2' => trans('general.importer.address2'),
             'city' => trans('general.city'),
@@ -352,52 +340,13 @@ class Importer extends Component
             'ldap_ou' => trans('admin/locations/table.ldap_ou'),
             'manager' => trans('general.importer.manager_full_name'),
             'manager_username' => trans('general.importer.manager_username'),
+            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
             'notes' => trans('general.notes'),
             'parent_location' => trans('admin/locations/table.parent'),
             'state' => trans('general.state'),
             'zip' => trans('general.zip'),
         ];
 
-        $this->suppliers_fields = [
-            'id' => trans('general.id'),
-            'name' => trans('general.name'),
-            'address' => trans('general.address'),
-            'address2' => trans('general.importer.address2'),
-            'city' => trans('general.city'),
-            'notes' => trans('general.notes'),
-            'state' => trans('general.state'),
-            'zip' => trans('general.zip'),
-            'phone' => trans('general.phone'),
-            'fax' => trans('general.fax'),
-            'url' => trans('general.url'),
-            'contact' => trans('general.contact'),
-            'email' => trans('general.email'),
-        ];
-
-        $this->manufacturers_fields = [
-            'id' => trans('general.id'),
-            'name' => trans('general.name'),
-            'notes' => trans('general.notes'),
-            'support_phone' =>  trans('admin/manufacturers/table.support_phone'),
-            'support_url' =>  trans('admin/manufacturers/table.support_url'),
-            'support_email' =>  trans('admin/manufacturers/table.support_email'),
-            'warranty_lookup_url' =>  trans('admin/manufacturers/table.warranty_lookup_url'),
-            'url' =>  trans('general.url'),
-        ];
-
-        $this->categories_fields = [
-            'id' => trans('general.id'),
-            'name' => trans('general.name'),
-            'notes' => trans('general.notes'),
-            'category_type' => trans('admin/categories/general.import_category_type'),
-            'eula_text' => trans('admin/categories/general.import_eula_text'),
-            'use_default_eula' => trans('admin/categories/general.use_default_eula_column'),
-            'require_acceptance' => trans('admin/categories/general.import_require_acceptance'),
-            'checkin_email' => trans('admin/categories/general.import_checkin_email'),
-        ];
-
-
-
         $this->assetmodels_fields  = [
             'category' => trans('general.category'),
             'eol' => trans('general.eol'),
@@ -422,8 +371,6 @@ class Importer extends Component
                     'consumable name',
                     'component name',
                     'name',
-                    'supplier name',
-                    'location name',
                 ],
             'item_no' => [
                 'item number',

app/Models/Accessory.php

@@ -308,7 +308,7 @@ class Accessory extends SnipeModel
      */
     public function checkin_email()
     {
-        return $this->category?->checkin_email;
+        return $this->category->checkin_email;
     }
 
     /**

app/Models/Actionlog.php

@@ -113,13 +113,7 @@ class Actionlog extends SnipeModel
             } elseif (auth()->user() && auth()->user()->company) {
                 $actionlog->company_id = auth()->user()->company_id;
             }
-
-            if ($actionlog->action_date == '') {
-                $actionlog->action_date = Carbon::now();
-            }
-
         });
-
     }
 
 

app/Models/Asset.php

@@ -122,9 +122,9 @@ class Asset extends Depreciable
         'assigned_to'   => ['nullable', 'integer', 'required_with:assigned_type'],
         'assigned_type' => ['nullable', 'required_with:assigned_to', 'in:'.User::class.",".Location::class.",".Asset::class],
         'requestable'       => ['nullable', 'boolean'],
-        'assigned_user'     => ['integer', 'nullable', 'exists:users,id,deleted_at,NULL'],
-        'assigned_location' => ['integer', 'nullable', 'exists:locations,id,deleted_at,NULL', 'fmcs_location'],
-        'assigned_asset'    => ['integer', 'nullable', 'exists:assets,id,deleted_at,NULL']
+        'assigned_user'     => ['nullable', 'exists:users,id,deleted_at,NULL'],
+        'assigned_location' => ['nullable', 'exists:locations,id,deleted_at,NULL', 'fmcs_location'],
+        'assigned_asset'    => ['nullable', 'exists:assets,id,deleted_at,NULL']
     ];
 
 
@@ -963,7 +963,6 @@ class Asset extends Depreciable
             return $this->model->category->require_acceptance;
         }
 
-        return false;
     }
 
 

app/Models/AssetMaintenance.php

@@ -26,12 +26,12 @@ class AssetMaintenance extends Model implements ICompanyableChild
     protected $table = 'asset_maintenances';
     protected $rules = [
         'asset_id'               => 'required|integer',
-        'supplier_id'            => 'nullable|integer',
+        'supplier_id'            => 'required|integer',
         'asset_maintenance_type' => 'required',
         'title'                  => 'required|max:100',
         'is_warranty'            => 'boolean',
         'start_date'             => 'required|date_format:Y-m-d',
-        'completion_date'        => 'date_format:Y-m-d|nullable|after_or_equal:start_date',
+        'completion_date'        => 'date_format:Y-m-d|nullable',
         'notes'                  => 'string|nullable',
         'cost'                   => 'numeric|nullable',
     ];
@@ -166,7 +166,6 @@ class AssetMaintenance extends Model implements ICompanyableChild
         return $this->belongsTo(\App\Models\Asset::class, 'asset_id')
                     ->withTrashed();
     }
-    
 
     /**
      * Get the admin who created the maintenance

app/Models/Company.php

@@ -160,7 +160,7 @@ final class Company extends SnipeModel
 
 
         if (auth()->user()) {
-            // Log::warning('Companyable is '.$companyable);
+            Log::warning('Companyable is '.$companyable);
             $current_user_company_id = auth()->user()->company_id;
             $companyable_company_id = $companyable->company_id;
             return $current_user_company_id == null || $current_user_company_id == $companyable_company_id || auth()->user()->isSuperUser();

app/Models/Consumable.php

@@ -284,7 +284,7 @@ class Consumable extends SnipeModel
      */
     public function checkin_email()
     {
-        return $this->category?->checkin_email;
+        return $this->category->checkin_email;
     }
 
     /**

app/Models/Labels/DefaultLabel.php

@@ -43,8 +43,8 @@ class DefaultLabel extends RectangleSheet
 
         $this->textSize = Helper::convertUnit($settings->labels_fontsize, 'pt', 'in');
 
-        $this->labelWidth = $this->setLabelWidth($settings);
-        $this->labelHeight = $this->setLabelHeight($settings);
+        $this->labelWidth  = $settings->labels_width;
+        $this->labelHeight = $settings->labels_height;
 
         $this->labelSpacingH = $settings->labels_display_sgutter;
         $this->labelSpacingV = $settings->labels_display_bgutter;
@@ -181,25 +181,6 @@ class DefaultLabel extends RectangleSheet
         }
     }
 
-    private function setLabelWidth(Setting $settings)
-    {
-        $labelWidth = $settings->labels_width;
-
-        if ($labelWidth == 0) {
-            $labelWidth = 0.1;
-        }
-
-        return $labelWidth;
-    }
-
-    private function setLabelHeight(?Setting $settings)
-    {
-        $labelHeight = $settings->labels_height;
-
-        if ($labelHeight == 0) {
-            $labelHeight = 0.1;
-        }
-
-        return $labelHeight;
-    }
 }
+
+?>

app/Models/Location.php

@@ -135,17 +135,6 @@ class Location extends SnipeModel
         return $this->hasMany(\App\Models\User::class, 'location_id');
     }
 
-    /**
-     * Establishes the location -> admin user relationship
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function adminuser()
-    {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
-    }
-
     /**
      * Find assets with this location as their location_id
      *
@@ -385,13 +374,4 @@ class Location extends SnipeModel
     {
         return $query->leftJoin('companies as company_sort', 'locations.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order);
     }
-
-    /**
-     * Query builder scope to order on the user that created it
-     */
-    public function scopeOrderByCreatedByName($query, $order)
-    {
-        return $query->leftJoin('users as admin_sort', 'locations.created_by', '=', 'admin_sort.id')->select('locations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
-    }
-
 }

app/Models/Loggable.php

@@ -89,10 +89,13 @@ trait Loggable
         $log->note = $note;
         $log->action_date = $action_date;
 
+        if (! $log->action_date) {
+            $log->action_date = date('Y-m-d H:i:s');
+        }
 
         $changed = [];
         $array_to_flip = array_keys($fields_array);
-        $array_to_flip = array_merge($array_to_flip, ['name','status_id','location_id','expected_checkin']);
+        $array_to_flip = array_merge($array_to_flip, ['action_date','name','status_id','location_id','expected_checkin']);
         $originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
 
 
@@ -179,7 +182,7 @@ trait Loggable
         $log->note = $note;
         $log->action_date = $action_date;
 
-        if (!$action_date) {
+        if (! $log->action_date) {
             $log->action_date = date('Y-m-d H:i:s');
         }
 
@@ -190,7 +193,7 @@ trait Loggable
         $changed = [];
 
         $array_to_flip = array_keys($fields_array);
-        $array_to_flip = array_merge($array_to_flip, ['name','status_id','location_id','expected_checkin']);
+        $array_to_flip = array_merge($array_to_flip, ['action_date','name','status_id','location_id','expected_checkin']);
 
         $originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
 

app/Models/Supplier.php

@@ -48,7 +48,7 @@ class Supplier extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'notes', 'phone', 'fax', 'url', 'email', 'contact', 'address', 'address2', 'city', 'state', 'country', 'zip'];
+    protected $searchableAttributes = ['name'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -128,18 +128,6 @@ class Supplier extends SnipeModel
         return $this->hasMany(\App\Models\Consumable::class, 'supplier_id');
     }
 
-
-    /**
-     * Establishes the supplier -> admin user relationship
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function adminuser()
-    {
-        return $this->belongsTo(\App\Models\User::class, 'created_by');
-    }
-
     /**
      * Establishes the supplier -> asset maintenances relationship
      *
@@ -209,13 +197,4 @@ class Supplier extends SnipeModel
 
         return $url;
     }
-
-    /**
-     * Query builder scope to order on the user that created it
-     */
-    public function scopeOrderByCreatedByName($query, $order)
-    {
-        return $query->leftJoin('users as admin_sort', 'suppliers.created_by', '=', 'admin_sort.id')->select('suppliers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
-    }
-
 }

app/Models/User.php

@@ -551,25 +551,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
             ->orderBy('created_at', 'desc');
     }
 
-    /**
-     * Establishes the user -> eula relationship
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     * @since [v8.1.16]
-     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
- */
-    public function eulas()
-    {
-        return $this->hasMany(Actionlog::class, 'target_id')
-            ->with('item')
-            ->select(['id', 'target_id', 'target_type', 'action_type', 'filename', 'accept_signature', 'created_at', 'note', 'item_id', 'item_type'])
-            ->where('target_type', self::class)
-            ->where('action_type', 'accepted')
-            ->whereNotNull('filename')
-            ->whereNotNull('accept_signature')
-            ->orderBy('created_at', 'desc');
-    }
-
     /**
      * Establishes the user -> requested assets relationship
      *

app/Observers/AssetObserver.php

@@ -62,7 +62,6 @@ class AssetObserver
             $logAction = new Actionlog();
             $logAction->item_type = Asset::class;
             $logAction->item_id = $asset->id;
-            $logAction->action_date = date('Y-m-d H:i:s');
             $logAction->created_at = date('Y-m-d H:i:s');
             $logAction->created_by = auth()->id();
             $logAction->log_meta = json_encode($changed);
@@ -109,7 +108,6 @@ class AssetObserver
         $logAction = new Actionlog();
         $logAction->item_type = Asset::class; // can we instead say $logAction->item = $asset ?
         $logAction->item_id = $asset->id;
-        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_at = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
         if($asset->imported) {
@@ -130,7 +128,6 @@ class AssetObserver
         $logAction->item_type = Asset::class;
         $logAction->item_id = $asset->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
@@ -146,7 +143,6 @@ class AssetObserver
         $logAction = new Actionlog();
         $logAction->item_type = Asset::class;
         $logAction->item_id = $asset->id;
-        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_at = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
         $logAction->logaction('restore');

app/Presenters/ConsumablePresenter.php

@@ -72,6 +72,14 @@ class ConsumablePresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/consumables/general.item_no'),
+            ],  [
+                'field' => 'min_amt',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.min_amt'),
+                'visible' => true,
+                'formatter' => 'minAmtFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'qty',
                 'searchable' => false,
@@ -88,14 +96,6 @@ class ConsumablePresenter extends Presenter
                 'visible' => true,
                 'class' => 'text-right text-padding-number-cell',
                 'footerFormatter' => 'qtySumFormatter',
-            ], [
-                'field' => 'min_amt',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('general.min_amt'),
-                'visible' => true,
-                'formatter' => 'minAmtFormatter',
-                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'location',
                 'searchable' => true,

app/Presenters/HistoryPresenter.php

@@ -1,172 +0,0 @@
-<?php
-
-namespace App\Presenters;
-
-/**
- * Class AccessoryPresenter
- */
-class HistoryPresenter extends Presenter
-{
-    /**
-     * Json Column Layout for bootstrap table
-     * @return string
-     */
-    public static function dataTableLayout($serial = false)
-    {
-        $extra = [];
-        $layout_start = [
-            [
-                'id' => 'id',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.id'),
-                'visible' => false,
-                'class' => 'hidden-xs',
-            ],
-            [
-                'field' => 'icon',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('admin/hardware/table.icon'),
-                'visible' => true,
-                'class' => 'hidden-xs',
-                'formatter' => 'iconFormatter',
-            ],
-            [
-                'field' => 'created_at',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.created_at'),
-                'visible' => true,
-                'formatter' => 'dateDisplayFormatter',
-            ],
-            [
-                'field' => 'created_by',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('general.created_by'),
-                'visible' => true,
-                'formatter' => 'usersLinkObjFormatter',
-            ],
-            [
-                'field' => 'action_date',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('general.action_date'),
-                'visible' => false,
-                'formatter' => 'dateDisplayFormatter',
-            ],
-            [
-                'field' => 'action_type',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.action'),
-                'visible' => true,
-            ],
-            [
-                'field' => 'item',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.item'),
-                'visible' => true,
-                'formatter' => 'polymorphicItemFormatter',
-            ],
-        ];
-
-
-        if ($serial) {
-            $extra =  [
-                [
-                'field' => 'item.serial',
-                'title' => trans('admin/hardware/table.serial'),
-                'visible' => false,
-            ]
-            ];
-        }
-
-        $layout_end = [
-            [
-                'field' => 'target',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.target'),
-                'visible' => true,
-                'formatter' => 'polymorphicItemFormatter',
-            ],
-            [
-                'field' => 'file',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.file_name'),
-                'visible' => true,
-                'formatter' => 'fileUploadNameFormatter',
-            ],
-            [
-                'field' => 'file_download',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.download'),
-                'visible' => true,
-                'formatter' => 'fileUploadFormatter',
-            ],
-            [
-                'field' => 'note',
-                'searchable' => true,
-                'sortable' => true,
-                'visible' => true,
-                'title' => trans('general.notes'),
-                'formatter' => 'notesFormatter'
-            ],
-            [
-                'field' => 'signature_file',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.signature'),
-                'visible' => false,
-                'formatter' => 'imageFormatter',
-            ],
-            [
-                'field' => 'log_meta',
-                'searchable' => false,
-                'sortable' => false,
-                'visible' => true,
-                'title' => trans('admin/hardware/table.changed'),
-                'formatter' => 'changeLogFormatter',
-            ],
-            [
-                'field' => 'remote_ip',
-                'searchable' => false,
-                'sortable' => false,
-                'visible' => false,
-                'title' => trans('admin/settings/general.login_ip'),
-            ],
-            [
-                'field' => 'user_agent',
-                'searchable' => false,
-                'sortable' => false,
-                'visible' => false,
-                'title' => trans('admin/settings/general.login_user_agent'),
-            ],
-            [
-                'field' => 'action_source',
-                'searchable' => false,
-                'sortable' => false,
-                'visible' => false,
-                'title' => trans('general.action_source'),
-            ],
-        ];
-
-        $merged = array_merge($layout_start, $extra, $layout_end);
-        return json_encode($merged);
-    }
-
-}

app/Presenters/LocationPresenter.php

@@ -208,16 +208,7 @@ class LocationPresenter extends Presenter
                 'title' => trans('general.created_at'),
                 'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
-            ],
-            [
-                'field' => 'created_by',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.created_by'),
-                'visible' => false,
-                'formatter' => 'usersLinkObjFormatter',
-            ],[
+            ], [
                 'field' => 'actions',
                 'searchable' => false,
                 'sortable' => false,

app/Presenters/SupplierPresenter.php

@@ -1,226 +0,0 @@
-<?php
-
-namespace App\Presenters;
-
-/**
- * Class LocationPresenter
- */
-class SupplierPresenter extends Presenter
-{
-    /**
-     * Json Column Layout for bootstrap table
-     */
-    public static function dataTableLayout()
-    {
-        $layout = [
-             [
-                'field' => 'id',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.id'),
-                'visible' => false,
-            ],
-            [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('general.name'),
-                'visible' => true,
-                'formatter' => 'suppliersLinkFormatter',
-            ], [
-                'field' => 'image',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.image'),
-                'visible' => true,
-                'formatter' => 'imageFormatter',
-            ],
-            [
-                'field' => 'assets_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('general.assets'),
-                'titleTooltip' =>  trans('general.assets'),
-                'visible' => true,
-                'class' => 'css-barcode',
-            ],  [
-                'field' => 'accessories_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('general.accessories'),
-                'titleTooltip' =>  trans('general.accessories'),
-                'visible' => true,
-                'class' => 'css-accessory',
-            ],
-            [
-                'field' => 'licenses_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('general.licenses'),
-                'titleTooltip' =>  trans('general.licenses'),
-                'visible' => true,
-                'class' => 'css-license',
-            ], [
-                'field' => 'components_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('general.components'),
-                'titleTooltip' =>  trans('general.components'),
-                'visible' => true,
-                'class' => 'css-component',
-            ], [
-                'field' => 'consumables_count',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('general.consumables'),
-                'titleTooltip' =>  trans('general.consumables'),
-                'visible' => true,
-                'class' => 'css-consumable',
-            ], [
-                'field' => 'url',
-                'searchable' => false,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.url'),
-                'visible' => true,
-                'formatter' => 'externalLinkFormatter',
-            ], [
-                'field' => 'address',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.address'),
-                'visible' => true,
-            ], [
-                'field' => 'address2',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.address2'),
-                'visible' => false,
-            ], [
-                'field' => 'city',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.city'),
-                'visible' => true,
-            ], [
-                'field' => 'state',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.state'),
-                'visible' => true,
-            ], [
-                'field' => 'zip',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.zip'),
-                'visible' => false,
-            ], [
-                'field' => 'country',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' =>  trans('admin/locations/table.country'),
-                'visible' => false,
-            ], [
-                'field' => 'phone',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('admin/users/table.phone'),
-                'visible' => false,
-                'formatter'    => 'phoneFormatter',
-            ], [
-                'field' => 'fax',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('admin/suppliers/table.fax'),
-                'visible' => false,
-                'formatter'    => 'phoneFormatter',
-            ], [
-                'field' => 'notes',
-                'searchable' => true,
-                'sortable' => true,
-                'visible' => false,
-                'title' => trans('general.notes'),
-            ], [
-                'field' => 'created_at',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.created_at'),
-                'visible' => false,
-                'formatter' => 'dateDisplayFormatter',
-            ],  [
-                'field' => 'created_by',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.created_by'),
-                'visible' => false,
-                'formatter' => 'usersLinkObjFormatter',
-            ], [
-                'field' => 'actions',
-                'searchable' => false,
-                'sortable' => false,
-                'switchable' => false,
-                'title' => trans('table.actions'),
-                'visible' => true,
-                'formatter' => 'suppliersActionsFormatter',
-            ],
-        ];
-
-        return json_encode($layout);
-    }
-    
-
-    /**
-     * Link to this supplier name
-     * @return string
-     */
-    public function nameUrl()
-    {
-        return (string) link_to_route('suppliers.show', $this->name, $this->id);
-    }
-
-    /**
-     * Getter for Polymorphism.
-     * @return mixed
-     */
-    public function name()
-    {
-        return $this->model->name;
-    }
-
-    /**
-     * Url to view this item.
-     * @return string
-     */
-    public function viewUrl()
-    {
-        return route('suppliers.show', $this->id);
-    }
-
-    public function glyph()
-    {
-        return '<x-icon type="suppliers" />';
-    }
-
-    public function fullName()
-    {
-        return $this->name;
-    }
-}

app/Presenters/UserPresenter.php

@@ -206,15 +206,6 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'departmentsLinkObjFormatter',
             ],
-            [
-                'field' => 'department_manager',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('admin/users/general.department_manager'),
-                'visible' => true,
-                'formatter' => 'usersLinkObjFormatter',
-            ],
             [
                 'field' => 'location',
                 'searchable' => true,

app/Providers/BreadcrumbsServiceProvider.php

@@ -414,13 +414,13 @@ class BreadcrumbsServiceProvider extends ServiceProvider
         );
 
         Breadcrumbs::for('maintenances.show', fn (Trail $trail, AssetMaintenance $maintenance) =>
-        $trail->parent('maintenances.index', route('maintenances.index'))
+        $trail->parent('maintenances.index', route('locations.index'))
             ->push($maintenance->title, route('maintenances.show', $maintenance))
         );
 
-        Breadcrumbs::for('maintenances.edit', fn (Trail $trail, AssetMaintenance $maintenance) =>
-        $trail->parent('maintenances.index', route('maintenances.index'))
-            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $maintenance->title]), route('maintenances.edit', $maintenance))
+        Breadcrumbs::for('manufacturers.edit', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
         );
 
 

app/Providers/RouteServiceProvider.php

@@ -76,8 +76,6 @@ class RouteServiceProvider extends ServiceProvider
     /**
      * Configure the rate limiters for the application.
      *
-     * This ONLY fires on 429 responses.
-     *
      * https://laravel.com/docs/8.x/routing#rate-limiting
      *
      * @return void
@@ -85,17 +83,9 @@ class RouteServiceProvider extends ServiceProvider
     protected function configureRateLimiting()
     {
 
-        // Rate limiter for API calls - this sends the correct API headers to show the user the remaining time they have to wait and gives them the 429 status code if they are throttled
+        // Rate limiter for API calls
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(config('app.api_throttle_per_minute'))->by(optional($request->user())->id ?: $request->ip())
-                ->response(function ($request, $headers) {
-                    return response()->json([
-                        'status' => 'error',
-                        'messages' => 'Too many requests. Try again in '.$headers['Retry-After'].' seconds.',
-                        'status_code' => 429,
-                        'retryAfter' => $headers['Retry-After'] ?? 60,
-                    ], 429, $headers);
-                });
+            return Limit::perMinute(config('app.api_throttle_per_minute'))->by(optional($request->user())->id ?: $request->ip());
         });
 
         // Rate limiter for forgotten password requests

app/View/Label.php

@@ -25,16 +25,6 @@ class Label implements View
      */
     protected $data;
 
-
-    /**
-     * TCPDF output destination.
-     * "I" - inline by default.
-     * See TCPDF's Output method for details.
-     *
-     * @var string
-     */
-    private string $destination = 'I';
-
     public function __construct() {
         $this->data = new Collection();
     }
@@ -150,9 +140,7 @@ class Label implements View
                                 $barcode2DTarget = $asset->serial; 
                                 break;
                             case 'location':
-                                $barcode2DTarget = $asset->location_id
-                                    ? route('locations.show', $asset->location_id)
-                                    : null;
+                                $barcode2DTarget = route('locations.show', $asset->location_id);
                                 break;
                             case 'hardware_id':
                             default:
@@ -232,7 +220,7 @@ class Label implements View
         $template->writeAll($pdf, $data);
 
         $filename = $assets->count() > 1 ? 'assets.pdf' : $assets->first()->asset_tag.'.pdf';
-        $pdf->Output($filename, $this->destination);
+        $pdf->Output($filename, 'I');
     }
 
     /**

composer.json

@@ -39,7 +39,6 @@
     "eduardokum/laravel-mail-auto-embed": "^2.0",
     "enshrined/svg-sanitize": "^0.15.0",
     "erusev/parsedown": "^1.7",
-    "fakerphp/faker": "^1.24",
     "guzzlehttp/guzzle": "^7.0.1",
     "intervention/image": "^2.5",
     "javiereguiluz/easyslugger": "^1.0",
@@ -75,7 +74,8 @@
     "tecnickcom/tc-lib-barcode": "^1.15",
     "tecnickcom/tcpdf": "^6.5",
     "unicodeveloper/laravel-password": "^1.0",
-    "watson/validating": "^8.1"
+    "watson/validating": "^8.1",
+    "fakerphp/faker": "^1.16"
   },
   "suggest": {
     "ext-ldap": "*",

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.1.16',
-  'full_app_version' => 'v8.1.16 - build 18612-g0f92dee2c',
-  'build_version' => '18612',
+  'app_version' => 'v8.1.4',
+  'full_app_version' => 'v8.1.4 - build 18245-g101b8afb5',
+  'build_version' => '18245',
   'prerelease_version' => '',
-  'hash_version' => 'g0f92dee2c',
-  'full_hash' => 'v8.1.16-220-g0f92dee2c',
-  'branch' => 'master',
+  'hash_version' => 'g101b8afb5',
+  'full_hash' => 'v8.1.4-180-g101b8afb5',
+  'branch' => 'develop',
 );

database/factories/ImportFactory.php

@@ -165,72 +165,4 @@ class ImportFactory extends Factory
         });
     }
 
-    /**
-     * Create a supplier import type.
-     *
-     * @return static
-     */
-    public function suppliers()
-    {
-        return $this->state(function (array $attributes) {
-            $fileBuilder = Importing\SuppliersImportFileBuilder::new();
-            $attributes['name'] = "Supplier {$attributes['name']}";
-            $attributes['import_type'] = 'supplier';
-            $attributes['header_row'] = $fileBuilder->toCsv()[0];
-            $attributes['first_row'] = $fileBuilder->firstRow();
-
-            return $attributes;
-        });
-    }
-
-    /**
-     * Create an supplier import type.
-     *
-     * @return static
-     */
-    public function locations()
-    {
-        return $this->state(function (array $attributes) {
-            $fileBuilder = Importing\SuppliersImportFileBuilder::new();
-            $attributes['name'] = "Location {$attributes['name']}";
-            $attributes['import_type'] = 'location';
-            $attributes['header_row'] = $fileBuilder->toCsv()[0];
-            $attributes['first_row'] = $fileBuilder->firstRow();
-
-            return $attributes;
-        });
-    }
-
-    /**
-     * Create a supplier import type.
-     *
-     * @return static
-     */
-    public function manufacturers()
-    {
-        return $this->state(function (array $attributes) {
-            $fileBuilder = Importing\ManufacturersImportFileBuilder::new();
-            $attributes['name'] = "Manufacturer {$attributes['name']}";
-            $attributes['import_type'] = 'manufacturer';
-            $attributes['header_row'] = $fileBuilder->toCsv()[0];
-            $attributes['first_row'] = $fileBuilder->firstRow();
-
-            return $attributes;
-        });
-    }
-
-    public function categories()
-    {
-        return $this->state(function (array $attributes) {
-            $fileBuilder = Importing\CategoriesImportFileBuilder::new();
-            $attributes['name'] = "Category {$attributes['name']}";
-            $attributes['import_type'] = 'category';
-            $attributes['header_row'] = $fileBuilder->toCsv()[0];
-            $attributes['first_row'] = $fileBuilder->firstRow();
-
-            return $attributes;
-        });
-    }
-
-
 }

database/migrations/2025_03_06_152922_copy_created_at_to_action_date_in_action_logs.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-
-        Schema::table('action_logs', function (Blueprint $table) {
-            $table->index(['action_date']);
-        });
-
-        DB::update('update '.DB::getTablePrefix().'action_logs set action_date = created_at where created_at IS NOT NULL and action_date IS NULL');
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-
-    }
-};

database/migrations/2025_06_02_233556_add_admin_cc_always_to_settings_table.php

@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('settings', function (Blueprint $table) {
-            $table->boolean('admin_cc_always')->after('admin_cc_email')->default(1);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('settings', function (Blueprint $table) {
-            $table->dropColumn('admin_cc_always');
-        });
-    }
-};

database/migrations/2025_06_03_053438_fix_assigned_type_without_assigned_to.php

@@ -1,23 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        DB::table('assets')->whereNotNull('assigned_type')->whereNull('assigned_to')->update(['assigned_type' => null]);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-
-    }
-};

database/migrations/2025_06_04_101736_add_deleted_at_index_to_action_logs.php

@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('action_logs', function (Blueprint $table) {
-            $table->index('deleted_at');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('action_logs', function (Blueprint $table) {
-            $table->dropIndex('deleted_at');
-        });
-    }
-};

database/migrations/2025_06_06_155058_make_supplier_id_nullable.php

@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('asset_maintenances', function (Blueprint $table) {
-            $table->integer('supplier_id')->nullable()->default(null)->change();
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        //
-    }
-};

dev.docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - .env.dev.docker
 
   mariadb:
-    image: mariadb:11.4.7
+    image: mariadb:11.5.2
     volumes:
       - db:/var/lib/mysql
     env_file:
@@ -36,7 +36,7 @@ services:
       retries: 5
 
   redis:
-    image: redis:7.4.3
+    image: redis:7.4.0
 
   mailhog:
     image: mailhog/mailhog:v1.0.1

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - .env
 
   db:
-    image: mariadb:11.4.7
+    image: mariadb:11.5.2
     restart: unless-stopped
     volumes:
       - db_data:/var/lib/mysql

docker/startup.sh

@@ -100,13 +100,9 @@ chown -R docker:root /var/www/html/storage/framework/cache
 # Fix php settings
 if [ -v "PHP_UPLOAD_LIMIT" ]
 then
-    find /etc/php -type f -name php.ini | while IFS= read -r ini; do
-        echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}M in $ini"
-        sed -i \
-            -e "s/^;\? *upload_max_filesize *=.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" \
-            -e "s/^;\? *post_max_size *=.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" \
-            "$ini"
-    done
+    echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}"
+    sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini
+    sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini
 fi
 
 # If the Oauth DB files are not present copy the vendor files over to the db migrations
@@ -124,9 +120,4 @@ php artisan migrate --force
 php artisan config:clear
 php artisan config:cache
 
-# we do this after the artisan commands to ensure that if the laravel
-# log got created by root, we set the permissions back
-touch /var/www/html/storage/logs/laravel.log
-chown -R docker:root /var/www/html/storage/logs/laravel.log
-
 exec supervisord -c /supervisord.conf

docker/startup_alpine.sh

@@ -79,18 +79,13 @@ done
 chown -R apache:root /var/lib/snipeit/data/*
 chown -R apache:root /var/lib/snipeit/dumps
 chown -R apache:root /var/lib/snipeit/keys
-chown -R apache:root /var/www/html/storage/framework/cache
 
 # Fix php settings
 if [ ! -z "${PHP_UPLOAD_LIMIT}" ]
 then
-    find /etc -type f -name php.ini | while IFS= read -r ini; do
-        echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}M in $ini"
-        sed -i \
-            -e "s/^;\? *upload_max_filesize *=.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" \
-            -e "s/^;\? *post_max_size *=.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" \
-            "$ini"
-    done
+    echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}"
+    sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini
+    sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" /etc/php*/php.ini
 fi
 
 # If the Oauth DB files are not present copy the vendor files over to the db migrations

docker/startup_alpine_fpm.sh

@@ -99,7 +99,10 @@ then
   cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
 fi
 
+# Create laravel log file
+touch /var/www/html/storage/logs/laravel.log
 # Add correct permissions for files and directories
+chown www-data:www-data /var/www/html/storage/logs/laravel.log
 chown -R www-data:www-data \
   /var/lib/snipeit/data \
   /var/lib/snipeit/dumps \
@@ -111,11 +114,6 @@ php artisan migrate --force
 php artisan config:clear
 php artisan config:cache
 
-# Create laravel log file
-touch /var/www/html/storage/logs/laravel.log
-# ensure it's owned by www:data in case it was created by root
-chown www-data:www-data /var/www/html/storage/logs/laravel.log
-
 echo [INFO docker entrypoint] End script execution
 
-exec "$@"
+exec "$@" 

public/css/dist/signature-pad.min.css

@@ -1 +1,135 @@
-#signature-pad{padding-top:250px;margin:auto}.m-signature-pad{position:relative;font-size:10px;width:100%;height:300px;border:1px solid #e8e8e8;background-color:#fff;box-shadow:0 1px 4px rgba(0,0,0,.27),0 0 40px rgba(0,0,0,.08) inset;border-radius:4px}.m-signature-pad:after,.m-signature-pad:before{position:absolute;z-index:-1;content:"";width:40%;height:10px;left:20px;bottom:10px;background:0 0;-webkit-transform:skew(-3deg) rotate(-3deg);-moz-transform:skew(-3deg) rotate(-3deg);-ms-transform:skew(-3deg) rotate(-3deg);-o-transform:skew(-3deg) rotate(-3deg);transform:skew(-3deg) rotate(-3deg);box-shadow:0 8px 12px rgba(0,0,0,.4)}.m-signature-pad:after{left:auto;right:20px;-webkit-transform:skew(3deg) rotate(3deg);-moz-transform:skew(3deg) rotate(3deg);-ms-transform:skew(3deg) rotate(3deg);-o-transform:skew(3deg) rotate(3deg);transform:skew(3deg) rotate(3deg)}.m-signature-pad--body{position:absolute;top:20px;bottom:60px;border:1px solid #f4f4f4;background-color:#fff}.m-signature-pad--body canvas{position:absolute;left:0;top:0;width:100%;height:100%;border-radius:4px;box-shadow:0 0 5px rgba(0,0,0,.02) inset}.m-signature-pad--footer{position:absolute;left:20px;right:20px;bottom:20px;height:40px}.m-signature-pad--footer .description{color:#c3c3c3;text-align:center;font-size:1.2em;margin-top:1.8em}.m-signature-pad--footer .button{position:absolute;bottom:0}.m-signature-pad--footer .button.clear{left:0}.m-signature-pad--footer .button.save{right:0}@media screen and (max-width:1024px){.m-signature-pad{top:0;left:0;right:0;bottom:0;width:auto;height:auto;min-width:250px;min-height:140px;margin:5%}}@media screen and (min-device-width:768px) and (max-device-width:1024px){.m-signature-pad{margin:10%}}@media screen and (max-height:320px){.m-signature-pad--body{left:0;right:0;top:0;bottom:32px}.m-signature-pad--footer{left:20px;right:20px;bottom:4px;height:28px}.m-signature-pad--footer .description{font-size:1em;margin-top:1em}}
+
+#signature-pad {
+  padding-top: 250px;
+  margin: auto;
+}
+.m-signature-pad {
+
+  position: relative;
+  font-size: 10px;
+  width: 100%;
+  height: 300px;
+  border: 1px solid #e8e8e8;
+  background-color: #fff;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.08) inset;
+  border-radius: 4px;
+}
+
+.m-signature-pad:before, .m-signature-pad:after {
+	position: absolute;
+  z-index: -1;
+  content: "";
+	width: 40%;
+	height: 10px;
+	left: 20px;
+	bottom: 10px;
+	background: transparent;
+	-webkit-transform: skew(-3deg) rotate(-3deg);
+	-moz-transform: skew(-3deg) rotate(-3deg);
+	-ms-transform: skew(-3deg) rotate(-3deg);
+	-o-transform: skew(-3deg) rotate(-3deg);
+	transform: skew(-3deg) rotate(-3deg);
+	box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4);
+}
+
+.m-signature-pad:after {
+	left: auto;
+	right: 20px;
+	-webkit-transform: skew(3deg) rotate(3deg);
+	-moz-transform: skew(3deg) rotate(3deg);
+	-ms-transform: skew(3deg) rotate(3deg);
+	-o-transform: skew(3deg) rotate(3deg);
+	transform: skew(3deg) rotate(3deg);
+}
+
+.m-signature-pad--body {
+  position: absolute;
+  top: 20px;
+  bottom: 60px;
+  border: 1px solid #f4f4f4;
+  background-color: white;
+}
+
+.m-signature-pad--body
+  canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    border-radius: 4px;
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.02) inset;
+  }
+
+.m-signature-pad--footer {
+  position: absolute;
+  left: 20px;
+  right: 20px;
+  bottom: 20px;
+  height: 40px;
+}
+
+.m-signature-pad--footer
+  .description {
+    color: #C3C3C3;
+    text-align: center;
+    font-size: 1.2em;
+    margin-top: 1.8em;
+  }
+
+.m-signature-pad--footer
+  .button {
+    position: absolute;
+    bottom: 0;
+  }
+
+.m-signature-pad--footer
+  .button.clear {
+    left: 0;
+  }
+
+.m-signature-pad--footer
+  .button.save {
+    right: 0;
+  }
+
+@media screen and (max-width: 1024px) {
+  .m-signature-pad {
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: auto;
+    height: auto;
+    min-width: 250px;
+    min-height: 140px;
+    margin: 5%;
+  }
+
+}
+
+@media screen and (min-device-width: 768px) and (max-device-width: 1024px) {
+  .m-signature-pad {
+    margin: 10%;
+  }
+}
+
+@media screen and (max-height: 320px) {
+  .m-signature-pad--body {
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 32px;
+  }
+  .m-signature-pad--footer {
+    left: 20px;
+    right: 20px;
+    bottom: 4px;
+    height: 28px;
+  }
+  .m-signature-pad--footer
+    .description {
+      font-size: 1em;
+      margin-top: 1em;
+    }
+}

public/css/dist/skins/skin-black.css

@@ -1 +1,219 @@
-.skin-black .main-header .navbar{background-color:#111}.skin-black .main-header .navbar .nav>li>a{color:#fff}.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav>.active>a,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-black .main-header .navbar .sidebar-toggle{color:#fff}.skin-black .main-header .navbar .sidebar-toggle:hover{background-color:#040404}@media (max-width:767px){.skin-black .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-black .main-header .navbar .dropdown-menu li a{color:#333}.skin-black .main-header .navbar .dropdown-menu li a:hover{background:#040404}}.skin-black .main-header li.user-header{background-color:#111}.skin-black .content-header{background:transparent}.skin-black .left-side,.skin-black .main-sidebar,.skin-black .wrapper{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li.active>a,.skin-black .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#111;color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-black .sidebar-form .btn,.skin-black .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-black .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-black .sidebar-form input[type=text]:focus,.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-black.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#000}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#505156;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#111;border-color:#1f1f21;color:#fff}.btn.btn-white:hover,.btn.btn-white:link,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:link,.btn:hover.btn-white:visited{color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#000}:root{--button-default:#000;--button-primary:#000;--button-hover:#000;--header:#111;--text-main:#bbb;--text-sub:#9b9b9b;--link:#black;--visited-link:#111;--hover-link:#999;--nav-link:#fff;--light-link:#fff}.btn-danger.btn-sm.disabled,a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.sidebar-toggle-mobile{color:#fff!important}.skin-black .main-header .navbar .nav>li>a{text-decoration:none}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#111}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-black.min.css

@@ -1 +1,219 @@
-.skin-black .main-header .navbar{background-color:#111}.skin-black .main-header .navbar .nav>li>a{color:#fff}.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav>.active>a,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-black .main-header .navbar .sidebar-toggle{color:#fff}.skin-black .main-header .navbar .sidebar-toggle:hover{background-color:#040404}@media (max-width:767px){.skin-black .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-black .main-header .navbar .dropdown-menu li a{color:#333}.skin-black .main-header .navbar .dropdown-menu li a:hover{background:#040404}}.skin-black .main-header li.user-header{background-color:#111}.skin-black .content-header{background:0 0}.skin-black .left-side,.skin-black .main-sidebar,.skin-black .wrapper{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li.active>a,.skin-black .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#111;color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-black .sidebar-form .btn,.skin-black .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-black .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-black .sidebar-form input[type=text]:focus,.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-black.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{color:#000}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#505156;border-color:#fff;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#111;border-color:#1f1f21;color:#fff}.btn.btn-white:hover,.btn.btn-white:link,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:link,.btn:hover.btn-white:visited{color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#000}:root{--button-default:#000;--button-primary:#000;--button-hover:#000;--header:#111;--text-main:#bbb;--text-sub:#9b9b9b;--link:#black;--visited-link:#111;--hover-link:#999;--nav-link:#fff;--light-link:#fff}.btn-danger.btn-sm.disabled,a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.sidebar-toggle-mobile{color:#fff!important}.skin-black .main-header .navbar .nav>li>a{text-decoration:none}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#111}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-blue.css

@@ -1 +1,251 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav>.active>a,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#333}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .left-side,.skin-blue .main-sidebar,.skin-blue .wrapper{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li.active>a,.skin-blue .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#3c8dbc;color:#fff}.skin-blue .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-blue .sidebar-form .btn,.skin-blue .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-blue .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-blue .sidebar-form input[type=text]:focus,.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-blue.layout-top-nav .main-header>.logo .logo-variant{background-color:unset}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary,btn-sm .btn-primary:link,btn-sm.btn-primary{background-color:#307095;border-color:#23536f;color:#fff!important}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover,btn-sma.btn-primary:hover{background-color:#23536f;border-color:#23536f;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link,btn-sm.btn-white:link{background-color:#307095;color:#fff}.btn.btn-white:hover,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:visited,btn-sm.btn-white:hover,btn-sm.btn-white:visited{background-color:#173648;color:#fff}.btn-danger,.btn-danger:link,.btn-danger:visited,.btn-warning,.btn-warning:link,.btn-warning:visited,a.btn-danger:hover,a.btn-warning:hover{color:#fff}.btn-default:link,.btn-default:visited,a.btn-default:hover{color:#505156}:root{--button-default:#505156;--button-primary:#1d455b;--button-hover:#173648;--header:#3c8dbc;--text-main:#bbb;--text-sub:#9b9b9b;--link:#296282;--visited-link:#5fa4cc;--hover-link:#86bad8;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a:hover{color:var(--hover-link)}.text-primary{color:#23536f}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc}.search-highlight,.search-highlight:hover{background-color:#e9d15b}a.settings_button:hover,a.settings_button:link,a.settings_button:visited{color:#3c8dbc}a.label.label-default:link{color:#307095}a.label.label-default:visited{color:#23536f}a.label.label-default:hover{background-color:#bbb;color:#296282}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
+

public/css/dist/skins/skin-blue.min.css

@@ -1 +1,251 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav>.active>a,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#333}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:0 0}.skin-blue .left-side,.skin-blue .main-sidebar,.skin-blue .wrapper{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li.active>a,.skin-blue .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#3c8dbc;color:#fff}.skin-blue .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-blue .sidebar-form .btn,.skin-blue .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-blue .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-blue .sidebar-form input[type=text]:focus,.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-blue.layout-top-nav .main-header>.logo .logo-variant{background-color:unset}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary,btn-sm .btn-primary:link,btn-sm.btn-primary{background-color:#307095;border-color:#23536f;color:#fff!important}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover,btn-sma.btn-primary:hover{background-color:#23536f;border-color:#23536f;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link,btn-sm.btn-white:link{background-color:#307095;color:#fff}.btn.btn-white:hover,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:visited,btn-sm.btn-white:hover,btn-sm.btn-white:visited{background-color:#173648;color:#fff}.btn-danger,.btn-danger:link,.btn-danger:visited,.btn-warning,.btn-warning:link,.btn-warning:visited,a.btn-danger:hover,a.btn-warning:hover{color:#fff}.btn-default:link,.btn-default:visited,a.btn-default:hover{color:#505156}:root{--button-default:#505156;--button-primary:#1d455b;--button-hover:#173648;--header:#3c8dbc;--text-main:#bbb;--text-sub:#9b9b9b;--link:#296282;--visited-link:#5fa4cc;--hover-link:#86bad8;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a:hover{color:var(--hover-link)}.text-primary{color:#23536f}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#3c8dbc}.search-highlight,.search-highlight:hover{background-color:#e9d15b}a.settings_button:hover,a.settings_button:link,a.settings_button:visited{color:#3c8dbc}a.label.label-default:link{color:#307095}a.label.label-default:visited{color:#23536f}a.label.label-default:hover{background-color:#bbb;color:#296282}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
+

public/css/dist/skins/skin-contrast.css

@@ -1 +1,227 @@
-.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:transparent}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-contrast.min.css

@@ -1 +1,227 @@
-.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:0 0}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-green.css

@@ -1 +1,211 @@
-:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#005a31;--button-primary:#002715;--button-hover:#000d07;--header:#00a65a;--text-main:#bbb;--text-sub:#9b9b9b;--link:#00a65a;--visited-link:#00f383;--hover-link:#0dff90}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav>.active>a,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#333}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .left-side,.skin-green .main-sidebar,.skin-green .wrapper{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li.active>a,.skin-green .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#00a65a;color:#fff}.skin-green .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-green .sidebar-form .btn,.skin-green .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-green .sidebar-form input[type=text]:focus,.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-green.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00733e;border-color:#004023;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#004023;border-color:#004023;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00733e;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000d07;color:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a{color:#00a65a}a:hover{color:#004023}a:visited{color:#00a65a}.text-primary{color:#004023}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#00a65a}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-green.min.css

@@ -1 +1,211 @@
-:root{--background:#222;--back-main:#333;--back-sub:#3d4144;--back-sub-alt:rgba(0,0,0,.36);--button-default:#005a31;--button-primary:#002715;--button-hover:#000d07;--header:#00a65a;--text-main:#bbb;--text-sub:#9b9b9b;--link:#00a65a;--visited-link:#00f383;--hover-link:#0dff90}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav>.active>a,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#333}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:0 0}.skin-green .left-side,.skin-green .main-sidebar,.skin-green .wrapper{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li.active>a,.skin-green .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#00a65a;color:#fff}.skin-green .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-green .sidebar-form .btn,.skin-green .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-green .sidebar-form input[type=text]:focus,.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-green.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00733e;border-color:#004023;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#004023;border-color:#004023;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00733e;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000d07;color:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}a{color:#00a65a}a:hover{color:#004023}a:visited{color:#00a65a}.text-primary{color:#004023}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#00a65a}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-orange.css

@@ -1 +1,206 @@
-.skin-orange .main-header .navbar{background-color:#ff8c00}.skin-orange .main-header .navbar .nav>li>a{color:#fff}.skin-orange .main-header .navbar .nav .open>a,.skin-orange .main-header .navbar .nav .open>a:focus,.skin-orange .main-header .navbar .nav .open>a:hover,.skin-orange .main-header .navbar .nav>.active>a,.skin-orange .main-header .navbar .nav>li>a:active,.skin-orange .main-header .navbar .nav>li>a:focus,.skin-orange .main-header .navbar .nav>li>a:hover,.skin-orange .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-orange .main-header .navbar .sidebar-toggle{color:#fff}.skin-orange .main-header .navbar .sidebar-toggle:hover{background-color:#e67e00}@media (max-width:767px){.skin-orange .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-orange .main-header .navbar .dropdown-menu li a{color:#333}.skin-orange .main-header .navbar .dropdown-menu li a:hover{background:#e67e00}}.skin-orange .main-header li.user-header{background-color:#ff8c00}.skin-orange .content-header{background:transparent}.skin-orange .left-side,.skin-orange .main-sidebar,.skin-orange .wrapper{background-color:#222d32}.skin-orange .user-panel>.info,.skin-orange .user-panel>.info>a{color:#fff}.skin-orange .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-orange .sidebar-menu>li>a{border-left:3px solid transparent}.skin-orange .sidebar-menu>li.active>a,.skin-orange .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#ff8c00;color:#fff}.skin-orange .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-orange .sidebar a{color:#b8c7ce}.skin-orange .sidebar a:hover{text-decoration:none}.skin-orange .treeview-menu>li>a{color:#8aa4af}.skin-orange .treeview-menu>li.active>a,.skin-orange .treeview-menu>li>a:hover{color:#fff}.skin-orange .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-orange .sidebar-form .btn,.skin-orange .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-orange .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-orange .sidebar-form input[type=text]:focus,.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-orange .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-orange.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#cc7000;border-color:#995400;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#995400;border-color:#995400;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#cc7000;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#663800;color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#995400}:root{--button-default:#b36200;--button-primary:#804600;--button-hover:#663800;--header:#ff8c00;--text-main:#bbb;--text-sub:#9b9b9b;--link:#ff8c00;--visited-link:#ffa333;--hover-link:#ffaf4d;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#ff8c00}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Orange
+ * ----------
+ */
+.skin-orange .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .nav > li > a:hover,
+.skin-orange .main-header .navbar .nav > li > a:active,
+.skin-orange .main-header .navbar .nav > li > a:focus,
+.skin-orange .main-header .navbar .nav .open > a,
+.skin-orange .main-header .navbar .nav .open > a:hover,
+.skin-orange .main-header .navbar .nav .open > a:focus,
+.skin-orange .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+  }
+}
+.skin-orange .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange .content-header {
+  background: transparent;
+}
+.skin-orange .wrapper,
+.skin-orange .main-sidebar,
+.skin-orange .left-side {
+  background-color: #222d32;
+}
+.skin-orange .user-panel > .info,
+.skin-orange .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange .sidebar-menu > li:hover > a,
+.skin-orange .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange .treeview-menu > li.active > a,
+.skin-orange .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange .sidebar-form input[type="text"],
+.skin-orange .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange .sidebar-form input[type="text"]:focus,
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #995400;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #995400;
+}
+:root {
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FF8C00;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffa333;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffaf4d;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FF8C00;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-orange.min.css

@@ -1 +1,206 @@
-.skin-orange .main-header .navbar{background-color:#ff8c00}.skin-orange .main-header .navbar .nav>li>a{color:#fff}.skin-orange .main-header .navbar .nav .open>a,.skin-orange .main-header .navbar .nav .open>a:focus,.skin-orange .main-header .navbar .nav .open>a:hover,.skin-orange .main-header .navbar .nav>.active>a,.skin-orange .main-header .navbar .nav>li>a:active,.skin-orange .main-header .navbar .nav>li>a:focus,.skin-orange .main-header .navbar .nav>li>a:hover,.skin-orange .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-orange .main-header .navbar .sidebar-toggle{color:#fff}.skin-orange .main-header .navbar .sidebar-toggle:hover{background-color:#e67e00}@media (max-width:767px){.skin-orange .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-orange .main-header .navbar .dropdown-menu li a{color:#333}.skin-orange .main-header .navbar .dropdown-menu li a:hover{background:#e67e00}}.skin-orange .main-header li.user-header{background-color:#ff8c00}.skin-orange .content-header{background:0 0}.skin-orange .left-side,.skin-orange .main-sidebar,.skin-orange .wrapper{background-color:#222d32}.skin-orange .user-panel>.info,.skin-orange .user-panel>.info>a{color:#fff}.skin-orange .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-orange .sidebar-menu>li>a{border-left:3px solid transparent}.skin-orange .sidebar-menu>li.active>a,.skin-orange .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#ff8c00;color:#fff}.skin-orange .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-orange .sidebar a{color:#b8c7ce}.skin-orange .sidebar a:hover{text-decoration:none}.skin-orange .treeview-menu>li>a{color:#8aa4af}.skin-orange .treeview-menu>li.active>a,.skin-orange .treeview-menu>li>a:hover{color:#fff}.skin-orange .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-orange .sidebar-form .btn,.skin-orange .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-orange .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-orange .sidebar-form input[type=text]:focus,.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-orange .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-orange.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#cc7000;border-color:#995400;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#995400;border-color:#995400;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#cc7000;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#663800;color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#995400}:root{--button-default:#b36200;--button-primary:#804600;--button-hover:#663800;--header:#ff8c00;--text-main:#bbb;--text-sub:#9b9b9b;--link:#ff8c00;--visited-link:#ffa333;--hover-link:#ffaf4d;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.far fa-life-ring{color:var(--link)}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#ff8c00}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Orange
+ * ----------
+ */
+.skin-orange .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .nav > li > a:hover,
+.skin-orange .main-header .navbar .nav > li > a:active,
+.skin-orange .main-header .navbar .nav > li > a:focus,
+.skin-orange .main-header .navbar .nav .open > a,
+.skin-orange .main-header .navbar .nav .open > a:hover,
+.skin-orange .main-header .navbar .nav .open > a:focus,
+.skin-orange .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+  }
+}
+.skin-orange .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange .content-header {
+  background: transparent;
+}
+.skin-orange .wrapper,
+.skin-orange .main-sidebar,
+.skin-orange .left-side {
+  background-color: #222d32;
+}
+.skin-orange .user-panel > .info,
+.skin-orange .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange .sidebar-menu > li:hover > a,
+.skin-orange .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange .treeview-menu > li.active > a,
+.skin-orange .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange .sidebar-form input[type="text"],
+.skin-orange .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange .sidebar-form input[type="text"]:focus,
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #995400;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #995400;
+}
+:root {
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FF8C00;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffa333;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffaf4d;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FF8C00;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-purple.css

@@ -1 +1,206 @@
-.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:focus,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav>.active>a,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#333}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .left-side,.skin-purple .main-sidebar,.skin-purple .wrapper{background-color:#222d32}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent}.skin-purple .sidebar-menu>li.active>a,.skin-purple .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#605ca8;color:#fff}.skin-purple .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-purple .sidebar-form .btn,.skin-purple .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-purple .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-purple .sidebar-form input[type=text]:focus,.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-purple.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#4c4988;border-color:#3a3767;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#3a3767;border-color:#3a3767;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#4c4988;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#272546;color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#3a3767}:root{--button-default:#434078;--button-primary:#302e56;--button-hover:#272546;--header:#605ca8;--text-main:#bbb;--text-sub:#9b9b9b;--link:#605ca8;--visited-link:#918ec3;--hover-link:#c1c0dd;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#605ca8}.far fa-life-ring{color:var(--link)}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Purple
+ * ----------
+ */
+.skin-purple .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .nav > li > a:hover,
+.skin-purple .main-header .navbar .nav > li > a:active,
+.skin-purple .main-header .navbar .nav > li > a:focus,
+.skin-purple .main-header .navbar .nav .open > a,
+.skin-purple .main-header .navbar .nav .open > a:hover,
+.skin-purple .main-header .navbar .nav .open > a:focus,
+.skin-purple .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+  }
+}
+.skin-purple .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple .content-header {
+  background: transparent;
+}
+.skin-purple .wrapper,
+.skin-purple .main-sidebar,
+.skin-purple .left-side {
+  background-color: #222d32;
+}
+.skin-purple .user-panel > .info,
+.skin-purple .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple .sidebar-menu > li:hover > a,
+.skin-purple .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple .treeview-menu > li.active > a,
+.skin-purple .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple .sidebar-form input[type="text"],
+.skin-purple .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple .sidebar-form input[type="text"]:focus,
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #3a3767;
+}
+:root {
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #605ca8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #918ec3;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #605ca8;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+

public/css/dist/skins/skin-purple.min.css

@@ -1 +1,206 @@
-.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:focus,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav>.active>a,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#333}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:0 0}.skin-purple .left-side,.skin-purple .main-sidebar,.skin-purple .wrapper{background-color:#222d32}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent}.skin-purple .sidebar-menu>li.active>a,.skin-purple .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#605ca8;color:#fff}.skin-purple .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-purple .sidebar-form .btn,.skin-purple .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-purple .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.skin-purple .sidebar-form input[type=text]:focus,.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-purple.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#4c4988;border-color:#3a3767;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#3a3767;border-color:#3a3767;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#4c4988;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#272546;color:#fff}a{color:var(--link)}a:hover{color:var(--hover-link)}a:visited{color:var(--visited-link)}.text-primary{color:#3a3767}:root{--button-default:#434078;--button-primary:#302e56;--button-hover:#272546;--header:#605ca8;--text-main:#bbb;--text-sub:#9b9b9b;--link:#605ca8;--visited-link:#918ec3;--hover-link:#c1c0dd;--nav-link:#fff;--light-link:#fff}a.btn-danger:link,a.btn-danger:visited,a.btn-info:link,a.btn-info:visited,a.btn-warning:link,a.btn-warning:visited{color:#fff}.fixed-table-container tbody .selected td{background-color:#fff8af}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#605ca8}.far fa-life-ring{color:var(--link)}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
+/*
+ * Skin: Purple
+ * ----------
+ */
+.skin-purple .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .nav > li > a:hover,
+.skin-purple .main-header .navbar .nav > li > a:active,
+.skin-purple .main-header .navbar .nav > li > a:focus,
+.skin-purple .main-header .navbar .nav .open > a,
+.skin-purple .main-header .navbar .nav .open > a:hover,
+.skin-purple .main-header .navbar .nav .open > a:focus,
+.skin-purple .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+  }
+}
+.skin-purple .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple .content-header {
+  background: transparent;
+}
+.skin-purple .wrapper,
+.skin-purple .main-sidebar,
+.skin-purple .left-side {
+  background-color: #222d32;
+}
+.skin-purple .user-panel > .info,
+.skin-purple .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple .sidebar-menu > li:hover > a,
+.skin-purple .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple .treeview-menu > li.active > a,
+.skin-purple .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple .sidebar-form input[type="text"],
+.skin-purple .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple .sidebar-form input[type="text"]:focus,
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #3a3767;
+}
+:root {
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #605ca8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #918ec3;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #605ca8;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+