From e8210939deda6656a8c67ab04337c08dc081a4a8 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 28 Feb 2020 20:02:40 +0100
Subject: [PATCH] wip #3439 @1

---
 src/app/Console/Commands/InstallCommand.php                 | 1 +
 .../Http/Controllers/CubistRedirectToAdminController.php    | 6 +++++-
 src/resources/views/fields/select2_from_array.blade.php     | 6 +++---
 src/resources/views/fields/tags.blade.php                   | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/app/Console/Commands/InstallCommand.php b/src/app/Console/Commands/InstallCommand.php
index ae00f84..0aafc97 100644
--- a/src/app/Console/Commands/InstallCommand.php
+++ b/src/app/Console/Commands/InstallCommand.php
@@ -20,6 +20,7 @@ class InstallCommand extends CubistCommand
         $commands = [
             'Update Cubist' => ['php artisan cubist:update'],
             'Install backpack' => ['php artisan backpack:install'],
+            'Publish backpack assets' => ['php artisan vendor:publish --provider="Backpack\CRUD\BackpackServiceProvider" --tag="minimum"'],
             'Install backpack addons' => [
                 // BackupManager
                 'php artisan vendor:publish --provider="Backpack\BackupManager\BackupManagerServiceProvider"',
diff --git a/src/app/Http/Controllers/CubistRedirectToAdminController.php b/src/app/Http/Controllers/CubistRedirectToAdminController.php
index 80c2993..bc7f606 100644
--- a/src/app/Http/Controllers/CubistRedirectToAdminController.php
+++ b/src/app/Http/Controllers/CubistRedirectToAdminController.php
@@ -14,7 +14,11 @@ class CubistRedirectToAdminController extends CubistFrontController
 
     public function catchall(Request $request, $main = '', $subs = '')
     {
-        return $this->_redirectToAdmin();
+        $path = trim($main . '/' . $subs, '/');
+        if (!$path) {
+            return $this->_redirectToAdmin();
+        }
+        return $this->_404();
     }
 
     protected function _redirectToAdmin()
diff --git a/src/resources/views/fields/select2_from_array.blade.php b/src/resources/views/fields/select2_from_array.blade.php
index 54223bf..59af16c 100644
--- a/src/resources/views/fields/select2_from_array.blade.php
+++ b/src/resources/views/fields/select2_from_array.blade.php
@@ -63,17 +63,17 @@
     {{-- FIELD CSS - will be loaded in the after_styles section --}}
     @push('crud_fields_styles')
         <!-- include select2 css-->
-        <link href="{{ asset('vendor/adminlte/bower_components/select2/dist/css/select2.min.css') }}" rel="stylesheet"
+        <link href="{{ asset('packages/select2/dist/css/select2.min.css') }}" rel="stylesheet"
               type="text/css"/>
         <link
-            href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.min.css"
+            href="{{ asset('packages/select2-bootstrap-theme/dist/select2-bootstrap.min.css') }}"
             rel="stylesheet" type="text/css"/>
     @endpush
 
     {{-- FIELD JS - will be loaded in the after_scripts section --}}
     @push('crud_fields_scripts')
         <!-- include select2 js-->
-        <script src="{{ asset('vendor/adminlte/bower_components/select2/dist/js/select2.min.js') }}"></script>
+        <script src="{{ asset('packages/select2/dist/js/select2.min.js') }}"></script>
         <script>
             jQuery(document).ready(function ($) {
                 $(document).on('cubist.bunchmultiple.added', function () {
diff --git a/src/resources/views/fields/tags.blade.php b/src/resources/views/fields/tags.blade.php
index 9c4b1ef..4a96d78 100644
--- a/src/resources/views/fields/tags.blade.php
+++ b/src/resources/views/fields/tags.blade.php
@@ -67,17 +67,17 @@ $values = $normalizedValues;
     {{-- FIELD CSS - will be loaded in the after_styles section --}}
     @push('crud_fields_styles')
         <!-- include select2 css-->
-        <link href="{{ asset('vendor/adminlte/bower_components/select2/dist/css/select2.min.css') }}" rel="stylesheet"
+        <link href="{{ asset('packages/select2/dist/css/select2.min.css') }}" rel="stylesheet"
               type="text/css"/>
         <link
-            href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.min.css"
+            href="{{ asset('packages/select2-bootstrap-theme/dist/select2-bootstrap.min.css') }}"
             rel="stylesheet" type="text/css"/>
     @endpush
 
     {{-- FIELD JS - will be loaded in the after_scripts section --}}
     @push('crud_fields_scripts')
         <!-- include select2 js-->
-        <script src="{{ asset('vendor/adminlte/bower_components/select2/dist/js/select2.min.js') }}"></script>
+        <script src="{{ asset('packages/select2/dist/js/select2.min.js') }}"></script>
         <script>
             jQuery(document).ready(function ($) {
                 // trigger select2 for each untriggered select2_multiple box
-- 
2.39.5