Merge remote-tracking branch 'origin/develop'

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

.all-contributorsrc

@@ -3181,42 +3181,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "Glukose1",
-      "name": "Glukose1",
-      "avatar_url": "https://avatars.githubusercontent.com/u/167117705?v=4",
-      "profile": "https://github.com/Glukose1",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Scarzy",
-      "name": "Scarzy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1197791?v=4",
-      "profile": "https://github.com/Scarzy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "setpill",
-      "name": "setpill",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37372069?v=4",
-      "profile": "https://github.com/setpill",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "swift2512",
-      "name": "swift2512",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3755203?v=4",
-      "profile": "https://github.com/swift2512",
-      "contributions": [
-        "bug"
-      ]
     }
   ]
 }

.env.dev.docker

@@ -1,8 +1,6 @@
 # --------------------------------------------
 # REQUIRED: DB SETUP
 # --------------------------------------------
-# https://mariadb.com/kb/en/mariadb-server-docker-official-image-environment-variables/
-
 MYSQL_DATABASE=snipeit
 MYSQL_USER=snipeit
 MYSQL_PASSWORD=changeme1234

.env.example

@@ -32,8 +32,6 @@ DB_PREFIX=null
 DB_DUMP_PATH='/usr/bin'
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
-DB_SANITIZE_BY_DEFAULT=false
-
 
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS

.github/stale.yml

@@ -0,0 +1,43 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - :woman_technologist: ready for dev
+  - :moneybag: bounty
+  - :hand: bug
+  - "🔐 security"
+  - "👩‍💻 ready for dev"
+  - "💰 bounty"
+  - "✋ bug"
+
+exemptMilestones: true
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+only: issues
+
+# Comment to post when removing the stale label.
+unmarkComment: >
+  Okay, it looks like this issue or feature request might still be important. We'll re-open
+  it for now. Thank you for letting us know!
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Is this still relevant? We haven't heard from anyone in a bit. If so,
+  please comment with any updates or additional detail.
+
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Don't
+  take it personally, we just need to keep a handle on things. Thank you
+  for your contributions!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because it has not had
+  recent activity. If you believe this is still an issue, please confirm that
+  this issue is still happening in the most recent version of Snipe-IT and reply
+  to this thread to re-open it.

.github/workflows/stale.yml

@@ -1,39 +0,0 @@
-name: 'Close stale issues'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      #  contents: write # only for delete-branch option
-      issues: write
-      #  pull-requests: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          debug-only: true
-          operations-per-run: 100 # just while we're debugging
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 60
-          days-before-close: 7
-          exempt-all-milestones: true
-          stale-issue-message: >
-            Is this still relevant? We haven't heard from anyone in a bit. If so,
-            please comment with any updates or additional detail.
-            
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Don't
-            take it personally, we just need to keep a handle on things. Thank you
-            for your contributions!
-          close-issue-message: >
-            This issue has been automatically closed because it has not had
-            recent activity. If you believe this is still an issue, please confirm that
-            this issue is still happening in the most recent version of Snipe-IT and reply
-            to this thread to re-open it.
-          # There doesn't seem to be a 'reopen issue message'?
-          # Since there is no 'stale-pr-message' - PR's should not be stale'd
-          stale-issue-label: stale
-          exempt-issue-labels: >
-            pinned,security,:woman_technologist: ready for dev,:moneybag: bounty,:hand: bug,🔐 security,👩‍💻 ready for dev,💰 bounty,✋ bug

CONTRIBUTORS.md

@@ -52,7 +52,6 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") |
 | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

Dockerfile.alpine

@@ -79,12 +79,12 @@ USER root
 
 VOLUME ["/var/lib/snipeit"]
 
-# Startup script
-COPY docker/startup_alpine.sh /startup.sh
-RUN chmod +x /startup.sh
+# Entrypoints
+COPY docker/entrypoint_alpine.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/sbin/tini", "--"]
 
-CMD ["/startup.sh"]
+CMD ["/entrypoint.sh"]
 
 EXPOSE 80

Dockerfile.fpm-alpine

@@ -97,7 +97,7 @@ RUN set -eux; \
 VOLUME [ "/var/lib/snipeit" ]
 
 COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
-COPY --chmod=655 docker/startup_alpine_fpm.sh /startup.sh
+COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
 COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
-ENTRYPOINT [ "/startup.sh" ]
-CMD [ "/startup.sh", "php-fpm" ]
+ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
+CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]

README.md

@@ -72,13 +72,12 @@ Since the release of the JSON REST API, several third-party developers have been
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
-- [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-IT.
-- [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@Karpadiem](https://github.com/Karpadiem) - Python script to synchronize information between Mosyle and Snipe-IT.
+- [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-it.
+- [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@Karpadiem](https://github.com/Karpadiem) - Python script to synchronize information between Mosyle and Snipe-IT
 - [WWW::SnipeIT](https://github.com/SEDC/perl-www-snipeit) by [@SEDC](https://github.com/SEDC) - perl module for accessing the API
 - [UniFi to Snipe-IT](https://github.com/RodneyLeeBrands/UnifiSnipeSync) by [@karpadiem](https://github.com/karpadiem) - Python script that synchronizes UniFi devices with Snipe-IT.
 - [Kandji2Snipe](https://github.com/grokability/kandji2snipe) by [@briangoldstein](https://github.com/briangoldstein) - Python script that synchronizes Kandji with Snipe-IT.
-- [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by [@ReticentRobot](https://github.com/ReticentRobot) - Windows agent for Snipe-IT.
-- [Gate Pass Generator](https://github.com/cha7uraAE/snipe-it-gate-pass-system) by [@cha7uraAE](https://github.com/cha7uraAE) - A Streamlit application for generating gate passes based on hardware data from a Snipe-IT API.
+- [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by @ReticentRobot - Windows agent for Snipe-IT
 
 -----
 

app/Console/Commands/RemoveExplicitEols.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Asset;
-use App\Models\AssetModel;
-use Illuminate\Console\Command;
-
-class RemoveExplicitEols extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:remove-explicit-eols {--model_name= : The name of the asset model to update (use "all" to update all models)}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Removes explicit EOLs on assets with selected model so they may inherit the asset model EOL';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $startTime = microtime(true);
-
-        if ($this->option('model_name') == 'all') {
-            $assets = Asset::all();
-            $this->updateAssets($assets);
-        } else {
-            $assetModel = AssetModel::where('name', '=', $this->option('model_name'))->first();
-
-            if ($assetModel) {
-                $assets = Asset::where('model_id', '=', $assetModel->id)->get();
-                $this->updateAssets($assets);
-            } else {
-                $this->error('Asset model not found');
-            }
-        }
-        $endTime = microtime(true);
-        $executionTime = ($endTime - $startTime);
-        $this->info('Command executed in ' . round($executionTime, 2) . ' seconds.');
-    }
-
-    private function updateAssets($assets)
-    {
-        foreach ($assets as $asset) {
-            $asset->eol_explicit = 0;
-            $asset->asset_eol_date = null;
-            $asset->save();
-        }
-
-        $this->info($assets->count() . ' Assets updated successfully');
-    }
-}

app/Console/Commands/SendAcceptanceReminder.php

@@ -47,10 +47,9 @@ class SendAcceptanceReminder extends Command
     {
         $pending = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')
                                                 ->whereHas('checkoutable', function($query) {
-                                                    $query->where('accepted_at', null)
-                                                          ->where('declined_at', null);
+                                                    $query->where('archived', 0);
                                                 })
-                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.admin'])
+                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.adminuser'])
                                                 ->get();
 
         $count = 0;

app/Helpers/IconHelper.php

@@ -1,179 +0,0 @@
-<?php
-
-namespace App\Helpers;
-
-class IconHelper
-{
-
-    public static function icon($type) {
-        switch ($type) {
-            case 'checkout':
-                return 'fa-solid fa-rotate-left';
-            case 'checkin':
-                return 'fa-solid fa-rotate-right';
-            case 'edit':
-                return 'fas fa-pencil-alt';
-            case 'clone':
-                return 'far fa-clone';
-            case 'delete':
-                return 'fas fa-trash';
-            case 'create':
-                return 'fa-solid fa-plus';
-            case 'audit':
-                return 'fa-solid fa-clipboard-check';
-            case '2fa reset':
-                return 'fa-solid fa-mobile-screen';
-            case 'new-user':
-                return 'fa-solid fa-user-plus';
-            case 'merged-user':
-                return 'fa-solid fa-people-arrows';
-            case 'delete-user':
-                return 'fa-solid fa-user-minus';
-            case 'update-user':
-                return 'fa-solid fa-user-pen';
-            case 'user':
-                return 'fa-solid fa-user';
-            case 'users':
-                return 'fas fa-users';
-            case 'restore':
-                return 'fa-solid fa-trash-arrow-up';
-            case 'external-link':
-                return 'fa fa-external-link';
-            case 'email':
-                return 'fa-regular fa-envelope';
-            case 'phone':
-                return 'fa-solid fa-phone';
-            case 'long-arrow-right':
-                return 'fas fa-long-arrow-alt-right';
-            case 'download':
-                return 'fas fa-download';
-            case 'checkmark':
-                return 'fas fa-check icon-white';
-            case 'x':
-                return 'fas fa-times';
-            case 'logout':
-                return 'fa fa-sign-out';
-            case 'admin-settings':
-                return 'fas fa-cogs';
-            case 'settings':
-                return 'fas fa-cog';
-            case 'angle-left':
-                return 'fas fa-angle-left';
-            case 'warning':
-                return 'fas fa-exclamation-triangle';
-            case 'kits':
-                return 'fas fa-object-group';
-            case 'assets':
-                return 'fas fa-barcode';
-            case 'accessories':
-                return 'far fa-keyboard';
-            case 'components':
-                return 'far fa-hdd';
-            case 'consumables':
-                return 'fas fa-tint';
-            case 'licenses':
-                return 'far fa-save';
-            case 'requestable':
-                return 'fas fa-laptop';
-            case 'reports':
-                return 'fas fa-chart-bar';
-            case 'heart':
-                return 'fas fa-heart';
-            case 'circle':
-                return 'fa-regular fa-circle';
-            case 'circle-solid':
-                return 'fa-solid fa-circle';
-            case 'due':
-                return 'fas fa-history';
-            case 'import':
-                return 'fas fa-cloud-upload-alt';
-            case 'search':
-                return 'fas fa-search';
-            case 'alerts':
-                return 'far fa-flag';
-            case 'password':
-                return 'fa-solid fa-key';
-            case 'api-key':
-                return 'fa-solid fa-user-secret';
-            case 'nav-toggle':
-                return 'fas fa-bars';
-            case 'dashboard':
-                return 'fas fa-tachometer-alt';
-            case 'info-circle':
-                    return 'fas fa-info-circle';
-            case 'caret-right':
-                return 'fa fa-caret-right';
-            case 'caret-up':
-                return 'fa fa-caret-up';
-            case 'caret-down':
-                return 'fa fa-caret-down';
-            case 'arrow-circle-right':
-                return 'fa fa-arrow-circle-right';
-            case 'minus':
-                return 'fas fa-minus';
-            case 'spinner':
-                return 'fas fa-spinner fa-spin';
-            case 'copy-clipboard':
-                return 'fa-regular fa-clipboard';
-            case 'paperclip':
-                return 'fas fa-paperclip';
-            case 'files':
-                return 'fa-regular fa-file';
-            case 'more-info':
-                return 'far fa-life-ring';
-            case 'calendar':
-                return 'fas fa-calendar';
-            case 'plus':
-                return 'fas fa-plus';
-            case 'history':
-                return 'fas fa-history';
-            case 'more-files':
-                return 'fa-solid fa-laptop-file';
-            case 'maintenances':
-                return 'fas fa-wrench';
-            case 'seats':
-                return 'far fa-list-alt';
-            case 'globe-us':
-                return 'fas fa-globe-americas';
-            case 'locked':
-                return 'fas fa-lock';
-            case 'unlocked':
-                return 'fas fa-lock';
-            case 'locations':
-                return 'fas fa-map-marker-alt';
-            case 'superadmin':
-                return 'fas fa-crown';
-            case 'print':
-                return 'fa-solid fa-print';
-            case 'checkin-and-delete':
-                return 'fa-solid fa-user-xmark';
-            case 'branding':
-                return 'fas fa-copyright';
-            case 'general-settings':
-                return 'fa-solid fa-list-check';
-            case 'groups':
-                return 'fa-solid fa-user-group';
-            case 'bell':
-                return 'fa-solid fa-bell';
-            case 'hashtag':
-                return 'fa-solid fa-hashtag';
-            case 'asset-tags':
-                return 'fas fa-list-ol';
-            case 'labels':
-                return 'fas fa-tags';
-            case 'ldap':
-                return 'fas fa-sitemap';
-            case 'google':
-                return 'fa-brands fa-google';
-            case 'saml':
-                return 'fas fa-sign-in-alt';
-            case 'backups':
-                return 'fas fa-file-archive';
-            case 'logins':
-                return 'fas fa-crosshairs';
-            case 'oauth':
-                return 'fas fa-user-secret';
-
-        }
-    }
-}

app/Http/Controllers/Api/AssetModelFilesController.php

@@ -1,200 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\StorageHelper;
-use Illuminate\Support\Facades\Storage;
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Models\AssetModel;
-use App\Models\Actionlog;
-use App\Http\Requests\UploadFileRequest;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
-
-/**
- * This class controls file related actions related
- * to assets for the Snipe-IT Asset Management application.
- *
- * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
- *
- * @version    v1.0
- * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
- */
-class AssetModelFilesController extends Controller
-{
-    /**
-     * Accepts a POST to upload a file to the server.
-     *
-     * @param \App\Http\Requests\UploadFileRequest $request
-     * @param int $assetModelId
-     * @since [v7.0.12]
-     * @author [r-xyz]
-     */
-    public function store(UploadFileRequest $request, $assetModelId = null) : JsonResponse
-    {
-        // Start by checking if the asset being acted upon exists
-        if (! $assetModel = AssetModel::find($assetModelId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
-        }
-
-        // Make sure we are allowed to update this asset
-        $this->authorize('update', $assetModel);
-
-            if ($request->hasFile('file')) {
-            // If the file storage directory doesn't exist; create it
-            if (! Storage::exists('private_uploads/assetmodels')) {
-                Storage::makeDirectory('private_uploads/assetmodels', 775);
-            }
-
-            // Loop over the attached files and add them to the asset
-            foreach ($request->file('file') as $file) {
-                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$assetModel->id, $file);
-                
-                $assetModel->logUpload($file_name, e($request->get('notes')));
-            }
-
-            // All done - report success
-            return response()->json(Helper::formatStandardApiResponse('success', $assetModel, trans('admin/models/message.upload.success')));
-        }
-
-        // We only reach here if no files were included in the POST, so tell the user this
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.upload.nofiles')), 500);
-    }
-
-    /**
-     * List the files for an asset.
-     *
-     * @param  int $assetModelId
-     * @since [v7.0.12]
-     * @author [r-xyz]
-     */
-    public function list($assetModelId = null) : JsonResponse
-    {
-        // Start by checking if the asset being acted upon exists
-        if (! $assetModel = AssetModel::find($assetModelId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
-        }
-        
-        // the asset is valid
-        if (isset($assetModel->id)) {
-            $this->authorize('view', $assetModel);
-
-            // Check that there are some uploads on this asset that can be listed
-            if ($assetModel->uploads->count() > 0) {
-                $files = array();
-                foreach ($assetModel->uploads as $upload) {
-                    array_push($files, $upload);
-                }
-                // Give the list of files back to the user
-                return response()->json(Helper::formatStandardApiResponse('success', $files, trans('admin/models/message.upload.success')));
-            }
-
-            // There are no files.
-            return response()->json(Helper::formatStandardApiResponse('success', array(), trans('admin/models/message.upload.success')));
-        }
-
-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error')), 500);
-    }
-
-    /**
-     * Check for permissions and display the file.
-     *
-     * @param  int $assetModelId
-     * @param  int $fileId
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     * @since [v7.0.12]
-     * @author [r-xyz]
-     */
-    public function show($assetModelId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
-    {
-        // Start by checking if the asset being acted upon exists
-        if (! $assetModel = AssetModel::find($assetModelId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
-        }
-
-        // the asset is valid
-        if (isset($assetModel->id)) {
-            $this->authorize('view', $assetModel);
-
-            // Check that the file being requested exists for the asset
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $assetModel->id)->find($fileId)) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.no_match', ['id' => $fileId])), 404);
-            }
-
-            // Form the full filename with path
-            $file = 'private_uploads/assetmodels/'.$log->filename;
-            Log::debug('Checking for '.$file);
-
-            if ($log->action_type == 'audit') {
-                $file = 'private_uploads/audits/'.$log->filename;
-            }
-
-            // Check the file actually exists on the filesystem
-            if (! Storage::exists($file)) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.does_not_exist', ['id' => $fileId])), 404);
-            }
-
-            if (request('inline') == 'true') {
-
-                $headers = [
-                    'Content-Disposition' => 'inline',
-                ];
-
-                return Storage::download($file, $log->filename, $headers);
-            }
-
-            return StorageHelper::downloader($file);
-        }
-
-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error', ['id' => $fileId])), 500);
-    }
-
-    /**
-     * Delete the associated file
-     *
-     * @param  int $assetModelId
-     * @param  int $fileId
-     * @since [v7.0.12]
-     * @author [r-xyz]
-     */
-    public function destroy($assetModelId = null, $fileId = null) : JsonResponse
-    {
-        // Start by checking if the asset being acted upon exists
-        if (! $assetModel = AssetModel::find($assetModelId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
-        }
-
-        $rel_path = 'private_uploads/assetmodels';
-
-        // the asset is valid
-        if (isset($assetModel->id)) {
-            $this->authorize('update', $assetModel);
-
-            // Check for the file
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                // Check the file actually exists, and delete it
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                // Delete the record of the file
-                $log->delete();
-
-                // All deleting done - notify the user of success
-                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.deletefile.success')), 200);
-            }
-
-            // The file doesn't seem to really exist, so report an error
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
-    }
-}

app/Http/Controllers/Api/AssetModelsController.php

@@ -78,10 +78,6 @@ class AssetModelsController extends Controller
             $assetmodels = $assetmodels->where('models.category_id', '=', $request->input('category_id'));
         }
 
-        if ($request->filled('depreciation_id')) {
-            $assetmodels = $assetmodels->where('models.depreciation_id', '=', $request->input('depreciation_id'));
-        }
-
         if ($request->filled('search')) {
             $assetmodels->TextSearch($request->input('search'));
         }

app/Http/Controllers/Api/AssetsController.php

@@ -602,7 +602,7 @@ class AssetsController extends Controller
                 if ($field->field_encrypted == '1') {
                     Log::debug('This model field is encrypted in this fieldset.');
 
-                    if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                    if (Gate::allows('admin')) {
 
                         // If input value is null, use custom field's default value
                         if (($field_val == null) && ($request->has('model_id') != '')) {
@@ -695,7 +695,7 @@ class AssetsController extends Controller
                             }
                         }
                         if ($field->field_encrypted == '1') {
-                            if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                            if (Gate::allows('admin')) {
                                 $field_val = Crypt::encrypt($field_val);
                             } else {
                                 $problems_updating_encrypted_custom_fields = true;

app/Http/Controllers/Api/DepreciationsController.php

@@ -20,22 +20,9 @@ class DepreciationsController extends Controller
     public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Depreciation::class);
-        $allowed_columns = [
-            'id',
-            'name',
-            'months',
-            'depreciation_min',
-            'depreciation_type',
-            'created_at',
-            'assets_count',
-            'models_count',
-            'licenses_count',
-        ];
+        $allowed_columns = ['id','name','months','depreciation_min', 'depreciation_type','created_at'];
 
-        $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','user_id','created_at','updated_at')
-            ->withCount('assets as assets_count')
-            ->withCount('models as models_count')
-            ->withCount('licenses as licenses_count');
+        $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','user_id','created_at','updated_at');
 
         if ($request->filled('search')) {
             $depreciations = $depreciations->TextSearch($request->input('search'));

app/Http/Controllers/Api/LicensesController.php

@@ -27,7 +27,7 @@ class LicensesController extends Controller
         $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
 
         if ($request->filled('company_id')) {
-            $licenses->where('licenses.company_id', '=', $request->input('company_id'));
+            $licenses->where('company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('name')) {

app/Http/Controllers/Api/PredefinedKitsController.php

@@ -246,7 +246,7 @@ class PredefinedKitsController extends Controller
 
         $relation = $kit->models();
         if ($relation->find($model_id)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => trans('admin/kits/general.model_already_attached')]));
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => 'Model already attached to kit']));
         }
         $relation->attach($model_id, ['quantity' => $quantity]);
 

app/Http/Controllers/Api/UsersController.php

@@ -427,10 +427,13 @@ class UsersController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
      */
-    public function update(SaveUserRequest $request, User $user): JsonResponse
+    public function update(SaveUserRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', User::class);
 
+        if ($user = User::find($id)) {
+
+
             $this->authorize('update', $user);
 
             /**
@@ -440,10 +443,12 @@ class UsersController extends Controller
              *
              */
 
-        if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {
+
+            if ((($id == 1) || ($id == 2)) && (config('app.lock_passwords'))) {
                 return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.'));
             }
 
+
             $user->fill($request->all());
 
             if ($user->id == $request->input('manager_id')) {
@@ -468,13 +473,16 @@ class UsersController extends Controller
                 $user->permissions = $permissions_array;
             }
 
+
             // Update the location of any assets checked out to this user
             Asset::where('assigned_type', User::class)
                 ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
 
+
             app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
 
             if ($user->save()) {
+
                 // Check if the request has groups passed and has a value, AND that the user us a superuser
                 if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
 
@@ -488,10 +496,18 @@ class UsersController extends Controller
 
                     // Sync the groups since the user is a superuser and the groups pass validation
                     $user->groups()->sync($request->input('groups'));
+
+
                 }
+
                 return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
             }
+
             return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));
+
     }
 
     /**

app/Http/Controllers/AssetModelsController.php

@@ -151,17 +151,17 @@ class AssetModelsController extends Controller
         $model->notes = $request->input('notes');
         $model->requestable = $request->input('requestable', '0');
 
+        $this->removeCustomFieldsDefaultValues($model);
+
         $model->fieldset_id = $request->input('fieldset_id');
 
-        if ($model->save()) {
-            $this->removeCustomFieldsDefaultValues($model);
-
-            if ($this->shouldAddDefaultValues($request->input())) {
-                if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))) {
-                    return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
-                }
+        if ($this->shouldAddDefaultValues($request->input())) {
+            if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
+                return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
             }
+        }
 
+        if ($model->save()) {
             if ($model->wasChanged('eol')) {
                     if ($model->eol > 0) {
                         $newEol = $model->eol; 
@@ -202,7 +202,6 @@ class AssetModelsController extends Controller
         if ($model->image) {
             try {
                 Storage::disk('public')->delete('models/'.$model->image);
-                $model->update(['image' => null]);
             } catch (\Exception $e) {
                 Log::info($e);
             }
@@ -234,7 +233,7 @@ class AssetModelsController extends Controller
 
             if ($model->restore()) {
                 $logaction = new Actionlog();
-                $logaction->item_type = AssetModel::class;
+                $logaction->item_type = User::class;
                 $logaction->item_id = $model->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
                 $logaction->user_id = auth()->id();

app/Http/Controllers/Assets/AssetsController.php

@@ -165,7 +165,7 @@ class AssetsController extends Controller
             if (($model) && ($model->fieldset)) {
                 foreach ($model->fieldset->fields as $field) {
                     if ($field->field_encrypted == '1') {
-                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                        if (Gate::allows('admin')) {
                             if (is_array($request->input($field->db_column))) {
                                 $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                             } else {
@@ -388,7 +388,7 @@ class AssetsController extends Controller
             foreach ($model->fieldset->fields as $field) {
 
                 if ($field->field_encrypted == '1') {
-                    if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                    if (Gate::allows('admin')) {
                         if (is_array($request->input($field->db_column))) {
                             $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                         } else {

app/Http/Controllers/Auth/LoginController.php

@@ -508,8 +508,8 @@ class LoginController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'username' => 'required|not_array',
-            'password' => 'required|not_array',
+            'username' => 'required',
+            'password' => 'required',
         ]);
     }
 

app/Http/Controllers/DepreciationsController.php

@@ -193,20 +193,13 @@ class DepreciationsController extends Controller
      */
     public function show($id) : View | RedirectResponse
     {
-        $depreciation = Depreciation::withCount('assets as assets_count')
-            ->withCount('models as models_count')
-            ->withCount('licenses as licenses_count')
-            ->find($id);
+        if (is_null($depreciation = Depreciation::find($id))) {
+            // Redirect to the blogs management page
+            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
+        }
 
         $this->authorize('view', $depreciation);
 
-        if ($depreciation) {
-            return view('depreciations/view', compact('depreciation'));
-
-        }
-
-        return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-
-
+        return view('depreciations/view', compact('depreciation'));
     }
 }

app/Http/Controllers/Kits/CheckoutKitController.php

@@ -62,10 +62,10 @@ class CheckoutKitController extends Controller
 
         $checkout_result = $this->kitService->checkout($request, $kit, $user);
         if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0) {
-            return redirect()->back()->with('error', trans('admin/kits/general.checkout_error'))->with('error_messages', $checkout_result['errors']);
+            return redirect()->back()->with('error', trans('general.checkout_error'))->with('error_messages', $checkout_result['errors']);
         }
 
-        return redirect()->back()->with('success', trans('admin/kits/general.checkout_success'))
+        return redirect()->back()->with('success', trans('general.checkout_success'))
             ->with('assets', Arr::get($checkout_result, 'assets', null))
             ->with('accessories', Arr::get($checkout_result, 'accessories', null))
             ->with('consumables', Arr::get($checkout_result, 'consumables', null));

app/Http/Controllers/LocationsController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Location;
 use App\Models\User;
@@ -194,13 +193,7 @@ class LocationsController extends Controller
      */
     public function show($id = null) : View | RedirectResponse
     {
-        $location = Location::withCount('assignedAssets as assigned_assets_count')
-            ->withCount('assets as assets_count')
-            ->withCount('rtd_assets as rtd_assets_count')
-            ->withCount('children as children_count')
-            ->withCount('users as users_count')
-            ->withTrashed()
-            ->find($id);
+        $location = Location::find($id);
 
         if (isset($location->id)) {
             return view('locations/view', compact('location'));
@@ -256,41 +249,6 @@ class LocationsController extends Controller
     }
 
 
-    /**
-     * Restore a given Asset Model (mark as un-deleted)
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param int $id
-     */
-    public function postRestore($id) : RedirectResponse
-    {
-        $this->authorize('create', Location::class);
-
-        if ($location = Location::withTrashed()->find($id)) {
-
-            if ($location->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.location')]));
-            }
-
-            if ($location->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = Location::class;
-                $logaction->item_id = $location->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = auth()->id();
-                $logaction->logaction('restore');
-
-                return redirect()->route('locations.index')->with('success', trans('admin/locations/message.restore.success'));
-            }
-
-            // Check validation
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.location'), 'error' => $location->getErrors()->first()]));
-        }
-
-        return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
-
-    }
     public function print_all_assigned($id) : View | RedirectResponse
     {
         if ($location = Location::where('id', $id)->first()) {

app/Http/Controllers/ProfileController.php

@@ -50,7 +50,6 @@ class ProfileController extends Controller
         $user->skin = $request->input('skin');
         $user->phone = $request->input('phone');
         $user->enable_sounds = $request->input('enable_sounds', false);
-        $user->enable_confetti = $request->input('enable_confetti', false);
 
         if (! config('app.lock_passwords')) {
             $user->locale = $request->input('locale', 'en-US');

app/Http/Controllers/SettingsController.php

@@ -637,7 +637,6 @@ class SettingsController extends Controller
         $setting->alert_threshold = $request->input('alert_threshold');
         $setting->audit_interval = $request->input('audit_interval');
         $setting->audit_warning_days = $request->input('audit_warning_days');
-        $setting->due_checkin_days = $request->input('due_checkin_days');
         $setting->show_alerts_in_menu = $request->input('show_alerts_in_menu', '0');
 
         if ($setting->save()) {
@@ -1204,7 +1203,7 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.0]
      */
-    public function postRestore(Request $request, $filename = null): RedirectResponse
+    public function postRestore($filename = null) : RedirectResponse
     {
 
         if (! config('app.lock_passwords')) {
@@ -1224,29 +1223,13 @@ class SettingsController extends Controller
 
                 Log::debug('Attempting to restore from: '. storage_path($path).'/'.$filename);
 
-                $restore_params = [
-                    '--force' => true,
-                    '--no-progress' => true,
-                    'filename' => storage_path($path) . '/' . $filename
-                ];
-
-                if ($request->input('clean')) {
-                    Log::debug("Attempting 'clean' - first, guessing prefix...");
-                    Artisan::call('snipeit:restore', [
-                        '--sanitize-guess-prefix' => true,
-                        'filename' => storage_path($path) . '/' . $filename
-                    ]);
-                    $guess_prefix_output = Artisan::output();
-                    Log::debug("Sanitize output is: $guess_prefix_output");
-                    list($prefix, $_output) = explode("\n", $guess_prefix_output);
-                    Log::debug("prefix is: '$prefix'");
-                    $restore_params['--sanitize-with-prefix'] = $prefix;
-                }
-
                 // run the restore command
                 Artisan::call('snipeit:restore',
-                    $restore_params
-                );
+                [
+                    '--force' => true,
+                    '--no-progress' => true,
+                    'filename' => storage_path($path).'/'.$filename
+                ]);
 
                 // If it's greater than 300, it probably worked
                 $output = Artisan::output();

app/Http/Controllers/Users/BulkUsersController.php

@@ -30,7 +30,7 @@ class BulkUsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
      * @param Request $request
-     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function edit(Request $request)
@@ -116,8 +116,6 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('remote')
             ->conditionallyAddItem('ldap_import')
             ->conditionallyAddItem('activated')
-            ->conditionallyAddItem('start_date')
-            ->conditionallyAddItem('end_date')
             ->conditionallyAddItem('autoassign_licenses');
 
 
@@ -148,14 +146,7 @@ class BulkUsersController extends Controller
             $this->update_array['company_id'] = null;
         }
 
-        if ($request->input('null_start_date')=='1') {
-            $this->update_array['start_date'] = null;
-        }
-
-        if ($request->input('null_end_date')=='1') {
-            $this->update_array['end_date'] = null;
-        }
-
+        
         if (! $manager_conflict) {
             $this->conditionallyAddItem('manager_id');
         }

app/Http/Controllers/Users/UsersController.php

@@ -186,7 +186,7 @@ class UsersController extends Controller
     {
 
         $this->authorize('update', User::class);
-        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($id);
+        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
 
         if ($user) {
 
@@ -214,79 +214,83 @@ class UsersController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(SaveUserRequest $request, User $user)
+    public function update(SaveUserRequest $request, $id = null)
     {
         $this->authorize('update', User::class);
 
         // This is a janky hack to prevent people from changing admin demo user data on the public demo.
         // The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
         // Thanks, jerks. You are why we can't have nice things. - snipe
-        if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {
+
+        if ((($id == 1) || ($id == 2)) && (config('app.lock_passwords'))) {
             return redirect()->route('users.index')->with('error', trans('general.permission_denied_superuser_demo'));
         }
 
+
         // We need to reverse the UI specific logic for our
         // permissions here before we update the user.
         $permissions = $request->input('permissions', []);
         app('request')->request->set('permissions', $permissions);
 
-        $user->load(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed();
+        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
 
-        $this->authorize('update', $user);
+        // User is valid - continue...
+        if ($user) {
+            $this->authorize('update', $user);
 
-        // Figure out of this user was an admin before this edit
-        $orig_permissions_array = $user->decodePermissions();
-        $orig_superuser = '0';
-        if (is_array($orig_permissions_array)) {
-            if (array_key_exists('superuser', $orig_permissions_array)) {
-                $orig_superuser = $orig_permissions_array['superuser'];
+            // Figure out of this user was an admin before this edit
+            $orig_permissions_array = $user->decodePermissions();
+            $orig_superuser = '0';
+            if (is_array($orig_permissions_array)) {
+                if (array_key_exists('superuser', $orig_permissions_array)) {
+                    $orig_superuser = $orig_permissions_array['superuser'];
+                }
             }
-        }
 
-        // Only save groups if the user is a superuser
-        if (auth()->user()->isSuperUser()) {
-            $user->groups()->sync($request->input('groups'));
-        }
+            // Only save groups if the user is a superuser
+            if (auth()->user()->isSuperUser()) {
+                $user->groups()->sync($request->input('groups'));
+            }
 
-        // Update the user fields
-        $user->username = trim($request->input('username'));
-        $user->email = trim($request->input('email'));
-        $user->first_name = $request->input('first_name');
-        $user->last_name = $request->input('last_name');
-        $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
-        $user->locale = $request->input('locale');
-        $user->employee_num = $request->input('employee_num');
-        $user->activated = $request->input('activated', 0);
-        $user->jobtitle = $request->input('jobtitle', null);
-        $user->phone = $request->input('phone');
-        $user->location_id = $request->input('location_id', null);
-        $user->company_id = Company::getIdForUser($request->input('company_id', null));
-        $user->manager_id = $request->input('manager_id', null);
-        $user->notes = $request->input('notes');
-        $user->department_id = $request->input('department_id', null);
-        $user->address = $request->input('address', null);
-        $user->city = $request->input('city', null);
-        $user->state = $request->input('state', null);
-        $user->country = $request->input('country', null);
-        // if a user is editing themselves we should always keep activated true
-        $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
-        $user->zip = $request->input('zip', null);
-        $user->remote = $request->input('remote', 0);
-        $user->vip = $request->input('vip', 0);
-        $user->website = $request->input('website', null);
-        $user->start_date = $request->input('start_date', null);
-        $user->end_date = $request->input('end_date', null);
-        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
+            // Update the user fields
+            $user->username = trim($request->input('username'));
+            $user->email = trim($request->input('email'));
+            $user->first_name = $request->input('first_name');
+            $user->last_name = $request->input('last_name');
+            $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
+            $user->locale = $request->input('locale');
+            $user->employee_num = $request->input('employee_num');
+            $user->activated = $request->input('activated', 0);
+            $user->jobtitle = $request->input('jobtitle', null);
+            $user->phone = $request->input('phone');
+            $user->location_id = $request->input('location_id', null);
+            $user->company_id = Company::getIdForUser($request->input('company_id', null));
+            $user->manager_id = $request->input('manager_id', null);
+            $user->notes = $request->input('notes');
+            $user->department_id = $request->input('department_id', null);
+            $user->address = $request->input('address', null);
+            $user->city = $request->input('city', null);
+            $user->state = $request->input('state', null);
+            $user->country = $request->input('country', null);
+            // if a user is editing themselves we should always keep activated true
+            $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
+            $user->zip = $request->input('zip', null);
+            $user->remote = $request->input('remote', 0);
+            $user->vip = $request->input('vip', 0);
+            $user->website = $request->input('website', null);
+            $user->start_date = $request->input('start_date', null);
+            $user->end_date = $request->input('end_date', null);
+            $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
 
-        // Update the location of any assets checked out to this user
-        Asset::where('assigned_type', User::class)
-            ->where('assigned_to', $user->id)
-            ->update(['location_id' => $request->input('location_id', null)]);
+            // Update the location of any assets checked out to this user
+            Asset::where('assigned_type', User::class)
+                ->where('assigned_to', $user->id)
+                ->update(['location_id' => $request->input('location_id', null)]);
 
-        // Do we want to update the user password?
-        if ($request->filled('password')) {
-            $user->password = bcrypt($request->input('password'));
-        }
+            // Do we want to update the user password?
+            if ($request->filled('password')) {
+                $user->password = bcrypt($request->input('password'));
+            }
 
 
         // Update the location of any assets checked out to this user
@@ -314,7 +318,13 @@ class UsersController extends Controller
                 return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
                     ->with('success', trans('admin/users/message.success.update'));
             }
+
             return redirect()->back()->withInput()->withErrors($user->getErrors());
+
+
+        }
+
+        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
     }
 
     /**
@@ -591,29 +601,29 @@ class UsersController extends Controller
     /**
      * Print inventory
      *
-     * @since [v1.8]
      * @author Aladin Alaily
+     * @since [v1.8]
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function printInventory($id)
     {
         $this->authorize('view', User::class);
-        if ($user = User::where('id', $id)->withTrashed()->first()) {
+        $user = User::where('id', $id)->withTrashed()->first();
+      
 
-            $this->authorize('view', $user);
-            $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
-            $accessories = $user->accessories()->get();
-            $consumables = $user->consumables()->get();
+        // Make sure they can view this particular user
+        $this->authorize('view', $user);
 
-            return view('users/print')->with('assets', $assets)
-                ->with('licenses', $user->licenses()->get())
-                ->with('accessories', $accessories)
-                ->with('consumables', $consumables)
-                ->with('show_user', $user)
-                ->with('settings', Setting::getSettings());
-        }
-
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
+        $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
+        $accessories = $user->accessories()->get();
+        $consumables = $user->consumables()->get();
 
+        return view('users/print')->with('assets', $assets)
+            ->with('licenses', $user->licenses()->get())
+            ->with('accessories', $accessories)
+            ->with('consumables', $consumables)
+            ->with('show_user', $user)
+            ->with('settings', Setting::getSettings());
     }
 
     /**

app/Http/Kernel.php

@@ -14,7 +14,6 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\NoSessionStore::class,
         \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Session\Middleware\StartSession::class,
@@ -22,7 +21,6 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\CheckForSetup::class,
         \App\Http\Middleware\CheckForDebug::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrimStrings::class,
         \App\Http\Middleware\SecurityHeaders::class,
         \App\Http\Middleware\PreventBackHistory::class,
         \Illuminate\Http\Middleware\HandleCors::class,
@@ -50,7 +48,6 @@ class Kernel extends HttpKernel
 
         'api' => [
             'auth:api',
-            \App\Http\Middleware\CheckLocale::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];

app/Http/Requests/SaveUserRequest.php

@@ -6,7 +6,6 @@ use App\Models\Setting;
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Exceptions\HttpResponseException;
-use App\Rules\UserCannotSwitchCompaniesIfItemsAssigned;
 
 class SaveUserRequest extends FormRequest
 {
@@ -35,7 +34,6 @@ class SaveUserRequest extends FormRequest
         $rules = [
             'department_id' => 'nullable|exists:departments,id',
             'manager_id' => 'nullable|exists:users,id',
-            'company_id' => ['nullable','exists:companies,id']
         ];
 
         switch ($this->method()) {
@@ -54,13 +52,11 @@ class SaveUserRequest extends FormRequest
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update').'|confirmed';
-                $rules['company_id'] = [new UserCannotSwitchCompaniesIfItemsAssigned()];
                 break;
 
             // Save only what's passed
             case 'PATCH':
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update');
-                $rules['company_id'] = [new UserCannotSwitchCompaniesIfItemsAssigned()];
                 break;
 
             default:

app/Http/Requests/UpdateAssetRequest.php

@@ -4,7 +4,6 @@ namespace App\Http\Requests;
 
 use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
-use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rule;
 
@@ -42,12 +41,6 @@ class UpdateAssetRequest extends ImageUploadRequest
             ],
         );
 
-        // if the purchase cost is passed in as a string **and** the digit_separator is ',' (as is common in the EU)
-        // then we tweak the purchase_cost rule to make it a string
-        if (Setting::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
-            $rules['purchase_cost'] = ['nullable', 'string'];
-        }
-
         return $rules;
     }
 }

app/Http/Traits/TwoColumnUniqueUndeletedTrait.php

@@ -11,17 +11,15 @@ trait TwoColumnUniqueUndeletedTrait
      * @param  string $field
      * @return string
      */
-    protected function prepareTwoColumnUniqueUndeletedRule($parameters)
+    protected function prepareTwoColumnUniqueUndeletedRule($parameters, $field)
     {
         $column = $parameters[0];
         $value = $this->{$parameters[0]};
 
-        // This is an existing model we're updating so ignore the current ID ($this->getKey())
         if ($this->exists) {
             return 'two_column_unique_undeleted:'.$this->table.','.$this->getKey().','.$column.','.$value;
         }
 
-        // This is a new record, so we can ignore the current ID
         return 'two_column_unique_undeleted:'.$this->table.',0,'.$column.','.$value;
     }
 }

app/Http/Transformers/AssetsTransformer.php

@@ -86,7 +86,7 @@ class AssetsTransformer
             'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'),
             'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'),
             'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
-            'age' => $asset->purchase_date ? $asset->purchase_date->locale(app()->getLocale())->diffForHumans() : '',
+            'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '',
             'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
             'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),
             'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),

app/Http/Transformers/DepreciationsTransformer.php

@@ -28,9 +28,6 @@ class DepreciationsTransformer
             'name' => e($depreciation->name),
             'months' => $depreciation->months.' '.trans('general.months'),
             'depreciation_min' => $depreciation->depreciation_type === 'percent' ? $depreciation->depreciation_min.'%' : $depreciation->depreciation_min,
-            'assets_count' => $depreciation->assets_count,
-            'models_count' => $depreciation->models_count,
-            'licenses_count' => $depreciation->licenses_count,
             'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime')
         ];

app/Importer/AssetImporter.php

@@ -71,10 +71,8 @@ class AssetImporter extends ItemImporter
         $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]);
-                $this->log($exists_error);
-                $this->addErrorToBag($asset, 'asset_tag', $exists_error);
-                return $exists_error;
+                $this->log('A matching Asset '.$asset_tag.' already exists');
+                return;
             }
 
             $this->log('Updating Asset');

app/Importer/Importer.php

@@ -281,13 +281,6 @@ abstract class Importer
         }
     }
 
-    protected function addErrorToBag($item, $field,  $error_message)
-    {
-        if ($this->errorCallback) {
-            call_user_func($this->errorCallback, $item, $field, [$field => [$error_message]]);
-        }
-    }
-
     /**
      * Finds the user matching given data, or creates a new one if there is no match.
      * This is NOT used by the User Import, only for Asset/Accessory/etc where

app/Importer/ItemImporter.php

@@ -196,77 +196,64 @@ class ItemImporter extends Importer
     {
         $condition = array();
         $asset_model_name = $this->findCsvMatch($row, 'asset_model');
-        $asset_model_category = $this->findCsvMatch($row, 'category');
         $asset_modelNumber = $this->findCsvMatch($row, 'model_number');
-
         // TODO: At the moment, this means  we can't update the model number if the model name stays the same.
         if (! $this->shouldUpdateField($asset_model_name)) {
             return;
         }
-
         if ((empty($asset_model_name)) && (! empty($asset_modelNumber))) {
             $asset_model_name = $asset_modelNumber;
         } elseif ((empty($asset_model_name)) && (empty($asset_modelNumber))) {
             $asset_model_name = 'Unknown';
         }
 
-        $asset_model = AssetModel::select('id');
-
-        if (!empty($asset_model_name)) {
-            $asset_model = $asset_model->where('name', '=', $asset_model_name);
-
-            if (!empty($asset_modelNumber)) {
-                $asset_model = $asset_model->where('model_number', '=', $asset_modelNumber);
-            }
+        if ((!empty($asset_model_name)) && (empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+        } elseif ((!empty($asset_model_name)) && (!empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+            $condition[] = ['model_number', '=', $asset_modelNumber];
         }
 
         $editingModel = $this->updating;
-        $asset_model = $asset_model->first();
+        $asset_model = AssetModel::where($condition)->first();
 
         if ($asset_model) {
-
             if (! $this->updating) {
                 $this->log('A matching model already exists, returning it.');
+
                 return $asset_model->id;
             }
-
             $this->log('Matching Model found, updating it.');
             $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
             $item['name'] = $asset_model_name;
             $item['notes'] = $this->findCsvMatch($row, 'model_notes');
 
-            if (!empty($asset_modelNumber)){
+            if(!empty($asset_modelNumber)){
                 $item['model_number'] = $asset_modelNumber;
             }
 
             $asset_model->update($item);
             $asset_model->save();
             $this->log('Asset Model Updated');
-            
+
             return $asset_model->id;
-
         }
-
         $this->log('No Matching Model, Creating a new one');
+
         $asset_model = new AssetModel();
         $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
         $item['name'] = $asset_model_name;
         $item['model_number'] = $asset_modelNumber;
         $item['notes'] = $this->findCsvMatch($row, 'model_notes');
-        $item['category_id'] = $this->createOrFetchCategory($asset_model_category);
 
         $asset_model->fill($item);
-        //$asset_model = AssetModel::firstOrNew($item);
         $item = null;
 
-
-
         if ($asset_model->save()) {
             $this->log('Asset Model '.$asset_model_name.' with model number '.$asset_modelNumber.' was created');
 
             return $asset_model->id;
         }
-        $this->log('Asset Model Errors: '.$asset_model->getErrors());
         $this->logError($asset_model, 'Asset Model "'.$asset_model_name.'"');
 
         return null;

app/Livewire/Importer.php

@@ -3,25 +3,30 @@
 namespace App\Livewire;
 
 use App\Models\CustomField;
+use Livewire\Component;
+
 use App\Models\Import;
 use Illuminate\Support\Facades\Storage;
-use Livewire\Attributes\Computed;
-use Livewire\Component;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
 
 class Importer extends Component
 {
-    public $progress = -1; //upload progress - '-1' means don't show
+    use AuthorizesRequests;
+
+    public $files;
+
+    public $progress; //upload progress - '-1' means don't show
     public $progress_message;
-    public $progress_bar_class = 'progress-bar-warning';
+    public $progress_bar_class;
 
     public $message; //status/error message?
     public $message_type; //success/error?
 
     //originally from ImporterFile
     public $import_errors; //
-    public $activeFileId;
-    public $headerRow = [];
-    public $typeOfImport;
+    public ?Import $activeFile = null;
     public $importTypes;
     public $columnOptions;
     public $statusType;
@@ -30,6 +35,7 @@ class Importer extends Component
     public $send_welcome;
     public $run_backup;
     public $field_map; // we need a separate variable for the field-mapping, because the keys in the normal array are too complicated for Livewire to understand
+    public $file_id; // TODO: I can't figure out *why* we need this, but it really seems like we do. I can't seem to pull the id from the activeFile for some reason?
 
     // Make these variables public - we set the properties in the constructor so we can localize them (versus the old static arrays)
     public $accessories_fields;
@@ -45,8 +51,10 @@ class Importer extends Component
         'files.*.file_path' => 'required|string',
         'files.*.created_at' => 'required|string',
         'files.*.filesize' => 'required|integer',
-        'headerRow' => 'array',
-        'typeOfImport' => 'string',
+        'activeFile' => 'Import',
+        'activeFile.import_type' => 'string',
+        'activeFile.field_map' => 'array',
+        'activeFile.header_row' => 'array',
         'field_map' => 'array'
     ];
 
@@ -60,13 +68,15 @@ class Importer extends Component
     {
         $tmp = array();
         if ($this->activeFile) {
-            $tmp = array_combine($this->headerRow, $this->field_map);
+            $tmp = array_combine($this->activeFile->header_row, $this->field_map);
             $tmp = array_filter($tmp);
         }
         return json_encode($tmp);
 
     }
 
+
+
     private function getColumns($type)
     {
         switch ($type) {
@@ -105,66 +115,76 @@ class Importer extends Component
         return $results;
     }
 
-    public function updatingTypeOfImport($type)
+    public function updating($name, $new_import_type)
     {
-        // go through each header, find a matching field to try and map it to.
-        foreach ($this->headerRow as $i => $header) {
-            // do we have something mapped already?
-            if (array_key_exists($i, $this->field_map)) {
-                // yes, we do. Is it valid for this type of import?
-                // (e.g. the import type might have been changed...?)
-                if (array_key_exists($this->field_map[$i], $this->columnOptions[$type])) {
-                    //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
-                    // 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.
-            }
-            // first, check for exact matches
-            foreach ($this->columnOptions[$type] as $v => $text) {
-                if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose!
-                    $this->field_map[$i] = $v;
-                    continue 2; //don't bother with the alias check, go to the next header
+        if ($name == "activeFile.import_type") {
+
+            // go through each header, find a matching field to try and map it to.
+            foreach ($this->activeFile->header_row as $i => $header) {
+                // do we have something mapped already?
+                if (array_key_exists($i, $this->field_map)) {
+                    // yes, we do. Is it valid for this type of import?
+                    // (e.g. the import type might have been changed...?)
+                    if (array_key_exists($this->field_map[$i], $this->columnOptions[$new_import_type])) {
+                        //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
+                        // 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.
                 }
-            }
-            // if you got here, we didn't find a match. Try the $aliases_fields
-            foreach ($this->aliases_fields as $key => $alias_values) {
-                foreach ($alias_values as $alias_value) {
-                    if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE!
-                        // Make *absolutely* sure that this key actually _exists_ in this import type -
-                        // you can trigger this by importing accessories with a 'Warranty' column (which don't exist
-                        // in "Accessories"!)
-                        if (array_key_exists($key, $this->columnOptions[$type])) {
-                            $this->field_map[$i] = $key;
-                            continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header
+                // first, check for exact matches
+                foreach ($this->columnOptions[$new_import_type] as $value => $text) {
+                    if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose!
+                        $this->field_map[$i] = $value;
+                        continue 2; //don't bother with the alias check, go to the next header
+                    }
+                }
+                // if you got here, we didn't find a match. Try the $aliases_fields
+                foreach ($this->aliases_fields as $key => $alias_values) {
+                    foreach ($alias_values as $alias_value) {
+                        if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE!
+                            // Make *absolutely* sure that this key actually _exists_ in this import type -
+                            // you can trigger this by importing accessories with a 'Warranty' column (which don't exist
+                            // in "Accessories"!)
+                            if (array_key_exists($key, $this->columnOptions[$new_import_type])) {
+                                $this->field_map[$i] = $key;
+                                continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header
+                            }
                         }
                     }
                 }
+                // and if you got here, we got nothing. Let's recommend 'null'
+                $this->field_map[$i] = null; // Booooo :(
             }
-            // and if you got here, we got nothing. Let's recommend 'null'
-            $this->field_map[$i] = null; // Booooo :(
         }
     }
 
+    public function boot() { // FIXME - delete or undelete.
+        ///////$this->activeFile = null; // I do *not* understand why I have to do this, but, well, whatever.
+    }
+
+
     public function mount()
     {
         $this->authorize('import');
+        $this->progress = -1; // '-1' means 'don't show the progressbar'
+        $this->progress_bar_class = 'progress-bar-warning';
         $this->importTypes = [
-            'asset' => trans('general.assets'),
-            'accessory' => trans('general.accessories'),
+            'asset' =>      trans('general.assets'),
+            'accessory' =>  trans('general.accessories'),
             'consumable' => trans('general.consumables'),
-            'component' => trans('general.components'),
-            'license' => trans('general.licenses'),
-            'user' => trans('general.users'),
-            'location' => trans('general.locations'),
+            'component' =>  trans('general.components'),
+            'license' =>    trans('general.licenses'),
+            'user' =>       trans('general.users'),
+            'location' =>    trans('general.locations'),
         ];
 
         /**
          * These are the item-type specific columns
          */
-        $this->accessories_fields = [
+        $this->accessories_fields  = [
             'company' => trans('general.company'),
             'location' => trans('general.location'),
             'quantity' => trans('general.qty'),
@@ -287,7 +307,7 @@ class Importer extends Component
             'manufacturer' => trans('general.manufacturer'),
         ];
 
-        $this->users_fields = [
+        $this->users_fields  = [
             'id' => trans('general.id'),
             'company' => trans('general.company'),
             'location' => trans('general.location'),
@@ -312,12 +332,12 @@ class Importer extends Component
             'website' => trans('general.website'),
             'avatar' => trans('general.image'),
             'gravatar' => trans('general.importer.gravatar'),
-            'start_date' => trans('general.start_date'),
-            'end_date' => trans('general.end_date'),
-            'employee_num' => trans('general.employee_number'),
+            'start_date'    => trans('general.start_date'),
+            'end_date'   => trans('general.end_date'),
+            'employee_num'   => trans('general.employee_number'),
         ];
 
-        $this->locations_fields = [
+        $this->locations_fields  = [
             'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
             'address' => trans('general.address'),
             'address2' => trans('general.importer.address2'),
@@ -354,12 +374,6 @@ class Importer extends Component
                     'model name',
                     'model',
                 ],
-            'eol_date' =>
-                [
-                    'eol',
-                    'eol date',
-                    'asset eol date',
-                ],
             'gravatar' =>
                 [
                     'gravatar',
@@ -490,16 +504,19 @@ class Importer extends Component
         ];
 
         $this->columnOptions[''] = $this->getColumns(''); //blank mode? I don't know what this is supposed to mean
-        foreach ($this->importTypes as $type => $name) {
+        foreach($this->importTypes AS $type => $name) {
             $this->columnOptions[$type] = $this->getColumns($type);
         }
+        if ($this->activeFile) {
+            $this->field_map = $this->activeFile->field_map ? array_values($this->activeFile->field_map) : [];
+        }
     }
 
     public function selectFile($id)
     {
         $this->clearMessage();
 
-        $this->activeFileId = $id;
+        $this->activeFile = Import::find($id);
 
         if (!$this->activeFile) {
             $this->message = trans('admin/hardware/message.import.file_missing');
@@ -508,17 +525,15 @@ class Importer extends Component
             return;
         }
 
-        $this->headerRow = $this->activeFile->header_row;
-        $this->typeOfImport = $this->activeFile->import_type;
-
         $this->field_map = null;
-        foreach ($this->headerRow as $element) {
-            if (isset($this->activeFile->field_map[$element])) {
+        foreach($this->activeFile->header_row as $element) {
+            if(isset($this->activeFile->field_map[$element])) {
                 $this->field_map[] = $this->activeFile->field_map[$element];
             } else {
                 $this->field_map[] = null; // re-inject the 'nulls' if a file was imported with some 'Do Not Import' settings
             }
         }
+        $this->file_id = $id;
         $this->import_errors = null;
         $this->statusText = null;
 
@@ -526,33 +541,21 @@ class Importer extends Component
 
     public function destroy($id)
     {
-        $this->authorize('import');
+        // TODO: why don't we just do File::find($id)? This seems dumb.
+        foreach($this->files as $file) {
+            if ($id == $file->id) {
+                if (Storage::delete('private_uploads/imports/'.$file->file_path)) {
+                    $file->delete();
 
-        $import = Import::find($id);
-
-        // Check that the import wasn't deleted after while page was already loaded...
-        // @todo: next up...handle the file being missing for other interactions...
-        // for example having an import open in two tabs, deleting it, and then changing
-        // the import type in the other tab. The error message below wouldn't display in that case.
-        if (!$import) {
-            $this->message = trans('admin/hardware/message.import.file_already_deleted');
-            $this->message_type = 'danger';
-
-            return;
+                    $this->message = trans('admin/hardware/message.import.file_delete_success');
+                    $this->message_type = 'success';
+                    return;
+                } else {
+                    $this->message = trans('admin/hardware/message.import.file_delete_error');
+                    $this->message_type = 'danger';
+                }
+            }
         }
-
-        if (Storage::delete('private_uploads/imports/' . $import->file_path)) {
-            $import->delete();
-            $this->message = trans('admin/hardware/message.import.file_delete_success');
-            $this->message_type = 'success';
-
-            unset($this->files);
-
-            return;
-        }
-
-        $this->message = trans('admin/hardware/message.import.file_delete_error');
-        $this->message_type = 'danger';
     }
 
     public function clearMessage()
@@ -561,22 +564,11 @@ class Importer extends Component
         $this->message_type = null;
     }
 
-    #[Computed]
-    public function files()
-    {
-        return Import::orderBy('id', 'desc')->get();
-    }
-
-    #[Computed]
-    public function activeFile()
-    {
-        return Import::find($this->activeFileId);
-    }
-
     public function render()
     {
+        $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.
         return view('livewire.importer')
-            ->extends('layouts.default')
-            ->section('content');
+                ->extends('layouts.default')
+                ->section('content');
     }
 }

app/Models/Asset.php

@@ -1315,7 +1315,7 @@ class Asset extends Depreciable
 
     public function scopeDueForCheckin($query, $settings)
     {
-        $interval = $settings->due_checkin_days ?? 0;
+        $interval = $settings->audit_warning_days ?? 0;
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');
 
@@ -1561,7 +1561,7 @@ class Asset extends Depreciable
             $leftJoin->on('assets_dept_users.id', '=', 'assets.assigned_to')
                 ->where('assets.assigned_type', '=', User::class);
         })->where(function ($query) use ($search) {
-                    $query->whereIn('assets_dept_users.department_id', $search);
+                    $query->where('assets_dept_users.department_id', '=', $search);
 
         })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug
     }
@@ -1811,9 +1811,7 @@ class Asset extends Depreciable
     public function scopeInCategory($query, $category_id)
     {
         return $query->join('models as category_models', 'assets.model_id', '=', 'category_models.id')
-            ->join('categories', 'category_models.category_id', '=', 'categories.id')
-            ->whereIn('category_models.category_id', (!is_array($category_id) ? explode(',',$category_id): $category_id));
-            //->whereIn('category_models.category_id', $category_id);
+            ->join('categories', 'category_models.category_id', '=', 'categories.id')->where('category_models.category_id', '=', $category_id);
     }
 
     /**
@@ -1827,7 +1825,7 @@ class Asset extends Depreciable
     public function scopeByManufacturer($query, $manufacturer_id)
     {
         return $query->join('models', 'assets.model_id', '=', 'models.id')
-            ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->whereIn('models.manufacturer_id', (!is_array($manufacturer_id) ? explode(',',$manufacturer_id): $manufacturer_id));
+            ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->where('models.manufacturer_id', '=', $manufacturer_id);
     }
 
 

app/Models/AssetModel.php

@@ -10,7 +10,6 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
 use \App\Presenters\AssetModelPresenter;
-use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 
 /**
  * Model for Asset Models. Asset Models contain higher level
@@ -22,8 +21,21 @@ class AssetModel extends SnipeModel
 {
     use HasFactory;
     use SoftDeletes;
+    protected $presenter = AssetModelPresenter::class;
     use Loggable, Requestable, Presentable;
-    use TwoColumnUniqueUndeletedTrait;
+
+    protected $table = 'models';
+    protected $hidden = ['user_id', 'deleted_at'];
+
+    // Declare the rules for the model validation
+    protected $rules = [
+        'name'              => 'required|min:1|max:255',
+        'model_number'      => 'max:255|nullable',
+        'min_amt'           => 'integer|min:0|nullable',
+        'category_id'       => 'required|integer|exists:categories,id',
+        'manufacturer_id'   => 'integer|exists:manufacturers,id|nullable',
+        'eol'               => 'integer:min:0|max:240|nullable',
+    ];
 
     /**
      * Whether the model should inject its identifier to the unique
@@ -32,26 +44,8 @@ class AssetModel extends SnipeModel
      *
      * @var bool
      */
-
     protected $injectUniqueIdentifier = true;
     use ValidatingTrait;
-    protected $table = 'models';
-    protected $hidden = ['user_id', 'deleted_at'];
-    protected $presenter = AssetModelPresenter::class;
-
-    // Declare the rules for the model validation
-
-
-    protected $rules = [
-        'name'              => 'string|required|min:1|max:255|two_column_unique_undeleted:model_number',
-        'model_number'      => 'string|max:255|nullable|two_column_unique_undeleted:name',
-        'min_amt'           => 'integer|min:0|nullable',
-        'category_id'       => 'required|integer|exists:categories,id',
-        'manufacturer_id'   => 'integer|exists:manufacturers,id|nullable',
-        'eol'               => 'integer:min:0|max:240|nullable',
-    ];
-
-
 
     /**
      * The attributes that are mass assignable.
@@ -79,12 +73,7 @@ class AssetModel extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = [
-        'name',
-        'model_number',
-        'notes',
-        'eol'
-    ];
+    protected $searchableAttributes = ['name', 'model_number', 'notes', 'eol'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -97,9 +86,6 @@ class AssetModel extends SnipeModel
         'manufacturer' => ['name'],
     ];
 
-
-
-
     /**
      * Establishes the model -> assets relationship
      *

app/Models/Depreciation.php

@@ -75,17 +75,4 @@ class Depreciation extends SnipeModel
     {
         return $this->hasMany(\App\Models\License::class, 'depreciation_id');
     }
-
-    /**
-     * Establishes the depreciation -> assets relationship
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since [v5.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function assets()
-    {
-        return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'depreciation_id', 'model_id');
-    }
-
 }

app/Models/Location.php

@@ -33,7 +33,7 @@ class Location extends SnipeModel
         'country'       => 'min:2|max:191|nullable',
         'zip'           => 'max:10|nullable',
         'manager_id'    => 'exists:users,id|nullable',
-        'parent_id'     => 'nullable|exists:locations,id|non_circular:locations,id',
+        'parent_id'     => 'non_circular:locations,id',
     ];
 
     protected $casts = [

app/Models/Setting.php

@@ -74,10 +74,7 @@ class Setting extends Model
           'login_remote_user_header_name'       => 'string|nullable',
           'thumbnail_max_h'                     => 'numeric|max:500|min:25',
           'pwd_secure_min'                      => 'numeric|required|min:8',
-          'alert_threshold'                     => 'numeric|nullable',
-          'alert_interval'                      => 'numeric|nullable',
           'audit_warning_days'                  => 'numeric|nullable',
-          'due_checkin_days'                      => 'numeric|nullable',
           'audit_interval'                      => 'numeric|nullable',
           'custom_forgot_pass_url'              => 'url|nullable',
           'privacy_policy_link'                 => 'nullable|url',

app/Models/SnipeModel.php

@@ -21,11 +21,6 @@ class SnipeModel extends Model
      */
     public function setPurchaseCostAttribute($value)
     {
-        if (is_float($value)) {
-            //value is *already* a floating-point number. Just assign it directly
-            $this->attributes['purchase_cost'] = $value;
-            return;
-        }
         $value = Helper::ParseCurrency($value);
 
         if ($value == 0) {

app/Presenters/AssetPresenter.php

@@ -579,6 +579,6 @@ class AssetPresenter extends Presenter
 
     public function glyph()
     {
-        return '<x-icon type="assets" />';
+        return '<i class="fas fa-barcode" aria-hidden="true"></i>';
     }
 }

app/Presenters/CompanyPresenter.php

@@ -65,46 +65,40 @@ class CompanyPresenter extends Presenter
                 'field' => 'users_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.users'),
+                'title' => '<span class="hidden-xs"><i class="fas fa-users"></i></span><span class="hidden-md hidden-lg">'.trans('general.users').'</span></th>',
                 'visible' => true,
-                'class' => 'css-users',
 
             ], [
                 'field' => 'assets_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.assets'),
+                'title' => '<span class="hidden-xs"><i class="fas fa-barcode" aria-hidden="true"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
                 'visible' => true,
-                'class' => 'css-barcode',
 
             ], [
                 'field' => 'licenses_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.licenses'),
                 'visible' => true,
-                'class' => 'css-license',
+                'title' => ' <span class="hidden-xs"><i class="far fa-save"></i></span><span class="hidden-md hidden-lg">'.trans('general.licenses').'</span>',
             ], [
                 'field' => 'accessories_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.accessories'),
                 'visible' => true,
-                'class' => 'css-accessory',
+                'title' => ' <span class="hidden-xs"><i class="far fa-keyboard"></i></span><span class="hidden-md hidden-lg">'.trans('general.accessories').'</span>',
             ], [
                 'field' => 'consumables_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.consumables'),
                 'visible' => true,
-                'class' => 'css-consumable',
+                'title' => ' <span class="hidden-xs"><i class="fas fa-tint"></i></span><span class="hidden-md hidden-lg">'.trans('general.consumables').'</span>',
             ], [
                 'field' => 'components_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.components'),
                 'visible' => true,
-                'class' => 'css-component',
+                'title' => ' <span class="hidden-xs"><i class="far fa-hdd"></i></span><span class="hidden-md hidden-lg">'.trans('general.components').'</span>',
             ], [
                 'field' => 'updated_at',
                 'searchable' => false,

app/Presenters/DepreciationPresenter.php

@@ -46,26 +46,6 @@ class DepreciationPresenter extends Presenter
                 "title" => trans('admin/depreciations/table.depreciation_min'),
                 "visible" => true,
             ],
-            [
-                'field' => 'assets_count',
-                'searchable' => false,
-                'sortable' => true,
-                'title' =>  trans('general.assets'),
-                'visible' => true,
-            ],
-            [
-                'field' => 'models_count',
-                'searchable' => false,
-                'sortable' => true,
-                'title' =>  trans('general.asset_models'),
-                'visible' => true,
-            ], [
-                'field' => 'licenses_count',
-                'searchable' => false,
-                'sortable' => true,
-                'title' =>  trans('general.licenses'),
-                'visible' => true,
-            ],
             [
                 'field' => 'actions',
                 'searchable' => false,

app/Presenters/DepreciationReportPresenter.php

@@ -394,6 +394,6 @@ class DepreciationReportPresenter extends Presenter
 
     public function glyph()
     {
-        return '<x-icon type="reports" class="text-orange" />';
+        return '<i class="fas fa-barcode" aria-hidden="true"></i>';
     }
 }

app/Presenters/LocationPresenter.php

@@ -235,7 +235,7 @@ class LocationPresenter extends Presenter
 
     public function glyph()
     {
-        return '<x-icon type="locations" />';
+        return '<i class="fas fa-map-marker-alt" aria-hidden="true"></i>';
     }
 
     public function fullName()

app/Presenters/ManufacturerPresenter.php

@@ -94,36 +94,36 @@ class ManufacturerPresenter extends Presenter
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => trans('general.assets'),
+                'title' => ' <span class="hidden-md hidden-lg">Assets</span>'
+                    .'<span class="hidden-xs"><i class="fas fa-barcode fa-lg"></i></span>',
                 'visible' => true,
-                'class' => 'css-barcode',
             ],
             [
                 'field' => 'licenses_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => trans('general.licenses'),
+                'title' => ' <span class="hidden-md hidden-lg">Licenses</span>'
+                    .'<span class="hidden-xs"><i class="far fa-save fa-lg"></i></span>',
                 'visible' => true,
-                'class' => 'css-license',
             ],
             [
                 'field' => 'consumables_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => trans('general.consumables'),
+                'title' => ' <span class="hidden-md hidden-lg">Consumables</span>'
+                    .'<span class="hidden-xs"><i class="fas fa-tint fa-lg"></i></span>',
                 'visible' => true,
-                'class' => 'css-consumable',
             ],
             [
                 'field' => 'accessories_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => trans('general.accessories'),
+                'title' => ' <span class="hidden-md hidden-lg">Accessories</span>'
+                    .'<span class="hidden-xs"><i class="far fa-keyboard fa-lg"></i></span>',
                 'visible' => true,
-                'class' => 'css-accessory',
             ],
             [
                 'field' => 'created_at',

app/Presenters/UserPresenter.php

@@ -492,6 +492,6 @@ class UserPresenter extends Presenter
 
     public function glyph()
     {
-        return '<x-icon type="user"/>';
+        return '<i class="fas fa-user" aria-hidden="true"></i>';
     }
 }

app/Providers/ValidationServiceProvider.php

@@ -6,7 +6,10 @@ use App\Models\CustomField;
 use App\Models\Department;
 use App\Models\Setting;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\Validator;
 
 /**
@@ -88,26 +91,18 @@ class ValidationServiceProvider extends ServiceProvider
          *
          * $parameters[0] - the name of the first table we're looking at
          * $parameters[1] - the ID (this will be 0 on new creations)
-         * $parameters[2] - the name of the second field we're looking at
+         * $parameters[2] - the name of the second table we're looking at
          * $parameters[3] - the value that the request is passing for the second table we're
          *                  checking for uniqueness across
          *
          */
         Validator::extend('two_column_unique_undeleted', function ($attribute, $value, $parameters, $validator) {
-
             if (count($parameters)) {
-                
                 $count = DB::table($parameters[0])
-                    ->select('id')
-                    ->where($attribute, '=', $value)
-                    ->where('id', '!=', $parameters[1]);
-
-                if ($parameters[3]!='') {
-                    $count = $count->where($parameters[2], $parameters[3]);
-                }
-
-                $count = $count->whereNull('deleted_at')
-                    ->count();
+                         ->select('id')->where($attribute, '=', $value)
+                         ->whereNull('deleted_at')
+                         ->where('id', '!=', $parameters[1])
+                         ->where($parameters[2], $parameters[3])->count();
 
                 return $count < 1;
             }

app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Rules;
-use App\Models\Setting;
-use App\Models\User;
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class UserCannotSwitchCompaniesIfItemsAssigned implements ValidationRule
-{
-    /**
-     * Run the validation rule.
-     *
-     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
-     */
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        $user = User::find(request()->route('user')->id);
-        if (($value) && ($user->allAssignedCount() > 0) && (Setting::getSettings()->full_multiple_companies_support)) {
-            $fail(trans('admin/users/message.error.multi_company_items_assigned'));
-        }
-    }
-}

config/app.php

@@ -372,9 +372,7 @@ return [
         'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
         'Image'     => Intervention\Image\ImageServiceProvider::class,
         'Carbon' => Carbon\Carbon::class,
-        'Helper' => App\Helpers\Helper::class,
-        // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this)
-        'Icon' => App\Helpers\IconHelper::class,
+        'Helper' => App\Helpers\Helper::class, // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this)
         'Socialite' => Laravel\Socialite\Facades\Socialite::class,
 
 

config/backup.php

@@ -237,6 +237,4 @@ return [
         ],
     ],
 
-    'sanitize_by_default' => env('DB_SANITIZE_BY_DEFAULT', false),
-
 ];

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v7.0.11',
-  'full_app_version' => 'v7.0.11 - build 15044-g46ed07642',
-  'build_version' => '15044',
+  'full_app_version' => 'v7.0.11 - build 14904-g6c0cf9447',
+  'build_version' => '14904',
   'prerelease_version' => '',
-  'hash_version' => 'g46ed07642',
-  'full_hash' => 'v7.0.11-133-g46ed07642',
-  'branch' => 'develop',
+  'hash_version' => 'g6c0cf9447',
+  'full_hash' => 'v7.0.11-218-g6c0cf9447',
+  'branch' => 'master',
 );

database/factories/UserFactory.php

@@ -296,11 +296,6 @@ class UserFactory extends Factory
         return $this->appendPermission(['reports.view' => '1']);
     }
 
-    public function canImport()
-    {
-        return $this->appendPermission(['import' => '1']);
-    }
-
     private function appendPermission(array $permission)
     {
         return $this->state(function ($currentState) use ($permission) {

database/migrations/2024_08_15_111816_add_confetti_to_users.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('users', function (Blueprint $table) {
-            $table->boolean('enable_confetti')->default(false);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('enable_confetti');
-        });
-    }
-};

database/migrations/2024_08_16_104137_add_due_checkin_days_to_settings.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('settings', function (Blueprint $table) {
-            $table->integer('due_checkin_days')->nullable()->default(null);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('settings', function (Blueprint $table) {
-            $table->dropColumn('due_checkin_days');
-        });
-    }
-};

dev.docker-compose.yml

@@ -1,5 +1,3 @@
-# Compose file to spin up a local Snipe-IT for development.
-
 version: '3'
 
 services:
@@ -9,40 +7,44 @@ services:
       dockerfile: Dockerfile.alpine
     container_name: snipeit
     ports:
-      - "8000:80"
+    - "8000:80"
+    volumes:
+    - ./storage/logs:/var/www/html/storage/logs
     depends_on:
-      redis:
-        # The default needs to be stated.
-        condition: service_started
-      mariadb:
-        condition: service_healthy
-        restart: true
+    - mariadb
+    - redis
     env_file:
-      - .env.dev.docker
+    - .env.docker
+    networks:
+    - snipeit-backend
 
   mariadb:
-    image: mariadb:11.5.2
+    image: mariadb:10.6.4-focal
     volumes:
-      - db:/var/lib/mysql
+    - db:/var/lib/mysql
     env_file:
-      - .env.dev.docker
+    - .env.docker
+    networks:
+    - snipeit-backend
     ports:
       - "3306:3306"
-    healthcheck:
-      # https://mariadb.com/kb/en/using-healthcheck-sh/#compose-file-example
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 5s
-      timeout: 2s
-      retries: 5
 
   redis:
-    image: redis:7.4.0
+    image: redis:6.2.5-buster
+    networks:
+    - snipeit-backend
 
   mailhog:
     image: mailhog/mailhog:v1.0.1
     ports:
-      # - 1025:1025
-      - "8025:8025"
+    # - 1025:1025
+    - "8025:8025"
+    networks:
+    - snipeit-backend
+
 
 volumes:
   db: {}
+
+networks:
+  snipeit-backend: {}

docker-compose.yml

@@ -1,13 +1,11 @@
-# Compose file for production.
-
 volumes:
   db_data:
   storage:
 
 services:
   app:
-    image: snipe/snipe-it:${APP_VERSION:-v7.0.11}
-    restart: unless-stopped
+    image: snipe/snipe-it:${APP_VERSION:-v6.4.1}
+    restart: always
     volumes:
       - storage:/var/lib/snipeit
     ports:
@@ -20,8 +18,8 @@ services:
       - .env
 
   db:
-    image: mariadb:11.5.2
-    restart: unless-stopped
+    image: mariadb:10.6.4-focal
+    restart: always
     volumes:
       - db_data:/var/lib/mysql
     environment:
@@ -30,8 +28,7 @@ services:
       MYSQL_PASSWORD: ${DB_PASSWORD}
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     healthcheck:
-      # https://mariadb.com/kb/en/using-healthcheck-sh/#compose-file-example
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
       interval: 5s
       timeout: 1s
       retries: 5

docker/entrypoint_alpine.sh

@@ -1,48 +1,7 @@
 #!/bin/sh
 
-# Cribbed from nextcloud docker official repo
-# https://github.com/nextcloud/docker/blob/master/docker-entrypoint.sh
-# usage: file_env VAR [DEFAULT]
-#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
-    local var="$1"
-    local fileVar="${var}_FILE"
-    local def="${2:-}"
-    local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
-    local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
-    if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
-        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-        exit 1
-    fi
-    if [ -n "${varValue}" ]; then
-        export "$var"="${varValue}"
-    elif [ -n "${fileVarValue}" ]; then
-        export "$var"="$(cat "${fileVarValue}")"
-    elif [ -n "${def}" ]; then
-        export "$var"="$def"
-    fi
-    unset "$fileVar"
-}
-
-# Add docker secrets support for the variables below:
-file_env APP_KEY
-file_env DB_HOST
-file_env DB_PORT
-file_env DB_DATABASE
-file_env DB_USERNAME
-file_env DB_PASSWORD
-file_env REDIS_HOST
-file_env REDIS_PASSWORD
-file_env REDIS_PORT
-file_env MAIL_HOST
-file_env MAIL_PORT
-file_env MAIL_USERNAME
-file_env MAIL_PASSWORD
-
 # fix key if needed
-if [ -z "$APP_KEY" -a -z "$APP_KEY_FILE" ]
+if [ -z "$APP_KEY" ]
 then
   echo "Please re-run this container with an environment variable \$APP_KEY"
   echo "An example APP_KEY you could use is: "

docker/startup.sh

@@ -1,48 +1,7 @@
 #!/bin/bash
 
-# Cribbed from nextcloud docker official repo
-# https://github.com/nextcloud/docker/blob/master/docker-entrypoint.sh
-# usage: file_env VAR [DEFAULT]
-#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
-    local var="$1"
-    local fileVar="${var}_FILE"
-    local def="${2:-}"
-    local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
-    local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
-    if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
-        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-        exit 1
-    fi
-    if [ -n "${varValue}" ]; then
-        export "$var"="${varValue}"
-    elif [ -n "${fileVarValue}" ]; then
-        export "$var"="$(cat "${fileVarValue}")"
-    elif [ -n "${def}" ]; then
-        export "$var"="$def"
-    fi
-    unset "$fileVar"
-}
-
-# Add docker secrets support for the variables below:
-file_env APP_KEY
-file_env DB_HOST
-file_env DB_PORT
-file_env DB_DATABASE
-file_env DB_USERNAME
-file_env DB_PASSWORD
-file_env REDIS_HOST
-file_env REDIS_PASSWORD
-file_env REDIS_PORT
-file_env MAIL_HOST
-file_env MAIL_PORT
-file_env MAIL_USERNAME
-file_env MAIL_PASSWORD
-
 # fix key if needed
-if [ -z "$APP_KEY" -a -z "$APP_KEY_FILE" ]
+if [ -z "$APP_KEY" ]
 then
   echo "Please re-run this container with an environment variable \$APP_KEY"
   echo "An example APP_KEY you could use is: "

package-lock.json

@@ -15,15 +15,14 @@
                 "bootstrap-colorpicker": "^2.5.3",
                 "bootstrap-datepicker": "^1.10.0",
                 "bootstrap-less": "^3.3.8",
-                "bootstrap-table": "1.23.2",
-                "canvas-confetti": "^1.9.3",
+                "bootstrap-table": "1.23.0",
                 "chart.js": "^2.9.4",
                 "clipboard": "^2.0.11",
                 "css-loader": "^5.0.0",
                 "ekko-lightbox": "^5.1.1",
                 "imagemin": "^8.0.1",
                 "jquery-slimscroll": "^1.3.8",
-                "jquery-ui": "^1.14.0",
+                "jquery-ui": "^1.13.3",
                 "jquery-validation": "^1.21.0",
                 "jquery.iframe-transport": "^1.0.0",
                 "jspdf-autotable": "^3.8.2",
@@ -37,7 +36,7 @@
                 "signature_pad": "^4.2.0",
                 "tableexport.jquery.plugin": "1.30.0",
                 "tether": "^1.4.0",
-                "webpack": "^5.94.0"
+                "webpack": "^5.92.0"
             },
             "devDependencies": {
                 "all-contributors-cli": "^6.26.1",
@@ -2105,10 +2104,25 @@
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/eslint": {
+            "version": "8.56.10",
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "node_modules/@types/eslint-scope": {
+            "version": "3.7.7",
+            "license": "MIT",
+            "dependencies": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
         "node_modules/@types/estree": {
             "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+            "license": "MIT"
         },
         "node_modules/@types/express": {
             "version": "4.17.21",
@@ -3678,9 +3692,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap-table": {
-            "version": "1.23.2",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.23.2.tgz",
-            "integrity": "sha512-1IFiWFZzbKlleXgYEHdwHkX6rxlQMEx2N1tA8rJK/j08pI+NjIGnxFeXUL26yQLQ0U135eis/BX3OV1+anY25g==",
+            "version": "1.23.0",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.23.0.tgz",
+            "integrity": "sha512-fAIhu2CAqMsZWkzeFxXyh0yQA2DMBdB0tCdr1iF6bKr3c/Hf79cw5PykNt7NdtqLz/a0p192S8EKyT5lG4yrpw==",
             "peerDependencies": {
                 "jquery": "3"
             }
@@ -4084,15 +4098,6 @@
             ],
             "license": "CC-BY-4.0"
         },
-        "node_modules/canvas-confetti": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.9.3.tgz",
-            "integrity": "sha512-rFfTURMvmVEX1gyXFgn5QMn81bYk70qa0HLzcIOSVEyl57n6o9ItHeBtUSWdvKAPY0xlvBHno4/v3QPrT83q9g==",
-            "funding": {
-                "type": "donate",
-                "url": "https://www.paypal.me/kirilvatev"
-            }
-        },
         "node_modules/canvg": {
             "version": "3.0.10",
             "license": "MIT",
@@ -5295,9 +5300,9 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.17.1",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-            "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+            "version": "5.17.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
+            "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
             "dependencies": {
                 "graceful-fs": "^4.2.4",
                 "tapable": "^2.2.0"
@@ -7052,11 +7057,10 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/jquery-ui": {
-            "version": "1.14.0",
-            "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.14.0.tgz",
-            "integrity": "sha512-mPfYKBoRCf0MzaT2cyW5i3IuZ7PfTITaasO5OFLAQxrHuI+ZxruPa+4/K1OMNT8oElLWGtIxc9aRbyw20BKr8g==",
+            "version": "1.13.3",
+            "license": "MIT",
             "dependencies": {
-                "jquery": ">=1.12.0 <5.0.0"
+                "jquery": ">=1.8.0 <4.0.0"
             }
         },
         "node_modules/jquery-validation": {
@@ -10865,10 +10869,11 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.94.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+            "version": "5.92.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
             "dependencies": {
+                "@types/eslint-scope": "^3.7.3",
                 "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -10877,7 +10882,7 @@
                 "acorn-import-attributes": "^1.9.5",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.1",
+                "enhanced-resolve": "^5.17.0",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",

package.json

@@ -35,15 +35,14 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.23.2",
-        "canvas-confetti": "^1.9.3",
+        "bootstrap-table": "1.23.0",
         "chart.js": "^2.9.4",
         "clipboard": "^2.0.11",
         "css-loader": "^5.0.0",
         "ekko-lightbox": "^5.1.1",
         "imagemin": "^8.0.1",
         "jquery-slimscroll": "^1.3.8",
-        "jquery-ui": "^1.14.0",
+        "jquery-ui": "^1.13.3",
         "jquery-validation": "^1.21.0",
         "jquery.iframe-transport": "^1.0.0",
         "jspdf-autotable": "^3.8.2",
@@ -57,6 +56,6 @@
         "signature_pad": "^4.2.0",
         "tableexport.jquery.plugin": "1.30.0",
         "tether": "^1.4.0",
-        "webpack": "^5.94.0"
+        "webpack": "^5.92.0"
     }
 }

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

@@ -1,135 +1 @@
-
-#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;
-    }
-}
+#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}}

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

@@ -1,219 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,219 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,239 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,239 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,227 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,227 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,211 +1 @@
-/*
- * 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;
-}
-
+: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}

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

@@ -1,211 +1 @@
-/*
- * 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;
-}
-
+: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}

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

@@ -1,206 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,206 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,206 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,206 +1 @@
-/*
- * 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;
-}
-
+.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}

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

@@ -1,213 +1 @@
-/*
- * Skin: Red
- * ----------
- */
-.skin-red .main-header .navbar {
-  background-color: #dd4b39;
-}
-.skin-red .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-red .main-header .navbar .nav > li > a:hover,
-.skin-red .main-header .navbar .nav > li > a:active,
-.skin-red .main-header .navbar .nav > li > a:focus,
-.skin-red .main-header .navbar .nav .open > a,
-.skin-red .main-header .navbar .nav .open > a:hover,
-.skin-red .main-header .navbar .nav .open > a:focus,
-.skin-red .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-red .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-red .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-red .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-red .main-header .navbar .sidebar-toggle:hover {
-  background-color: #d73925;
-}
-@media (max-width: 767px) {
-  .skin-red .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-red .main-header .navbar .dropdown-menu li a {
-    color: #333;
-  }
-  .skin-red .main-header .navbar .dropdown-menu li a:hover {
-    background: #d73925;
-  }
-}
-.skin-red .main-header li.user-header {
-  background-color: #dd4b39;
-}
-.skin-red .content-header {
-  background: transparent;
-}
-.skin-red .wrapper,
-.skin-red .main-sidebar,
-.skin-red .left-side {
-  background-color: #222d32;
-}
-.skin-red .user-panel > .info,
-.skin-red .user-panel > .info > a {
-  color: #fff;
-}
-.skin-red .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-red .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-red .sidebar-menu > li:hover > a,
-.skin-red .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #dd4b39;
-}
-.skin-red .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-red .sidebar a {
-  color: #b8c7ce;
-}
-.skin-red .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-red .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-red .treeview-menu > li.active > a,
-.skin-red .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-red .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-red .sidebar-form input[type="text"],
-.skin-red .sidebar-form .btn {
-  box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  transition: all 0.3s ease-in-out;
-}
-.skin-red .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-red .sidebar-form input[type="text"]:focus,
-.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-red .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-red.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: #c23321;
-  border-color: #96271a;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #96271a;
-  border-color: #96271a;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #c23321;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #6b1c12;
-  color: #fff;
-}
-a {
-  color: #dd4b39;
-}
-a:hover {
-  color: #96271a;
-}
-a:visited {
-  color: #dd4b39;
-}
-.text-primary {
-  color: #96271a;
-}
-:root {
-  --button-default: #ac2d1e;
-  --button-primary: #802216;
-  --button-hover: #6b1c12;
-  --header: #dd4b39;
-  /* Use same as Header picker */
-  --text-main: #BBB;
-  --text-alt: #222;
-  --text-sub: #9b9b9b;
-  --link: #dd4b39;
-  /* Use same as Header picker, lighten by 70% */
-  --visited-link: #e8867a;
-  /* Use same as Header picker, lighten by 70% */
-  --hover-link: #f3c2bc;
-  /* 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:link {
-  color: var(--link);
-}
-a:visited {
-  color: var(--visited-link);
-}
-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: #dd4b39;
-}
-.search-highlight,
-.search-highlight:hover {
-  background-color: #e9d15b;
-}
-.far fa-life-ring {
-  color: var(--link);
-}
-
+.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:focus,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav>.active>a,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#333}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .left-side,.skin-red .main-sidebar,.skin-red .wrapper{background-color:#222d32}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{background:#1a2226;color:#4b646f}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red .sidebar-menu>li.active>a,.skin-red .sidebar-menu>li:hover>a{background:#1e282c;border-left-color:#dd4b39;color:#fff}.skin-red .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border:1px solid #374850;border-radius:3px;margin:10px}.skin-red .sidebar-form .btn,.skin-red .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-red .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-red .sidebar-form input[type=text]:focus,.skin-red .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .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-red.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:#c23321;border-color:#96271a;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}a{color:#dd4b39}a:hover{color:#96271a}a:visited{color:#dd4b39}.text-primary{color:#96271a}:root{--button-default:#ac2d1e;--button-primary:#802216;--button-hover:#6b1c12;--header:#dd4b39;--text-main:#bbb;--text-alt:#222;--text-sub:#9b9b9b;--link:#dd4b39;--visited-link:#e8867a;--hover-link:#f3c2bc;--nav-link:#fff;--light-link:#fff}a:link{color:var(--link)}a:visited{color:var(--visited-link)}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:#dd4b39}.search-highlight,.search-highlight:hover{background-color:#e9d15b}.far fa-life-ring{color:var(--link)}