Merge pull request #26 from Laravel-Backpack/v6

tabacitu · web-flow · commit 9cd439c47240 · 2023-07-01T08:53:10.000+03:00
v6
diff --git a/composer.json b/composer.json
@@ -12,14 +12,13 @@
     "homepage": "https://github.com/laravel-backpack/filemanager",
     "keywords": ["Laravel", "FileManager"],
     "require": {
-        "backpack/crud": "^5.0",
-        "barryvdh/laravel-elfinder": "^0.5.0"
+        "backpack/crud": "^6.0",
+        "barryvdh/laravel-elfinder": "^0.5.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0",
-        "mockery/mockery": "^1.1",
-        "orchestra/testbench": "~3|~4",
-        "sempro/phpunit-pretty-print": "^1.0"
+        "phpunit/phpunit": "^10.0",
+        "mockery/mockery": "^1.5",
+        "orchestra/testbench": "^8"
     },
     "autoload": {
         "psr-4": {
diff --git a/resources/assets/css/elfinder.backpack.theme.css b/resources/assets/css/elfinder.backpack.theme.css
@@ -99,7 +99,7 @@ body #elfinder.ui-widget-content {
 
 /* contextmenu */
 .elfinder-contextmenu .ui-state-hover { background: #3875d7; color:#fff; }
-.elfinder-contextmenu .ui-state-hover .elfinder-contextmenu-arrow { background-image:url('../img/arrows-active.png'); }
+/* .elfinder-contextmenu .ui-state-hover .elfinder-contextmenu-arrow { background-image:url('../img/arrows-active.png'); } */
 
 /* jquery-ui overwrites */
 .ui-widget-header {
diff --git a/resources/views/ckeditor4.blade.php b/resources/views/ckeditor4.blade.php
@@ -27,7 +27,7 @@ function getUrlParam(paramName) {
                         _token: '{{ csrf_token() }}'
                     },
                     url: '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}',
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                     getFileCallback : function(file) {
                         window.opener.CKEDITOR.tools.callFunction(funcNum, file.url);
                         window.close();
diff --git a/resources/views/common_scripts.blade.php b/resources/views/common_scripts.blade.php
@@ -1,14 +1,21 @@
-        <!-- jQuery and jQuery UI (REQUIRED) -->
-        <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css" />
+        {{-- jQuery (REQUIRED) --}}
         @if (!isset ($jquery) || (isset($jquery) && $jquery == true))
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+        @basset('https://unpkg.com/jquery@3.6.4/dist/jquery.min.js')
         @endif
-        <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
 
-        <!-- elFinder JS (REQUIRED) -->
-        <script src="{{ asset($dir.'/js/elfinder.min.js') }}"></script>
+        {{-- jQuery UI and Smoothness theme --}}
+        @bassetArchive('https://github.com/jquery/jquery-ui/archive/refs/tags/1.13.2.zip', 'jquery-ui-1.13.2')
+        @basset('jquery-ui-1.13.2/jquery-ui-1.13.2/dist/themes/smoothness/jquery-ui.min.css')
+        @basset('jquery-ui-1.13.2/jquery-ui-1.13.2/dist/jquery-ui.min.js')
 
+        {{-- elFinder JS (REQUIRED) --}}
+        @bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.61.zip', 'elfinder-2.1.61')
+        @basset('elfinder-2.1.61/elFinder-2.1.61/js/elfinder.min.js')
+
+        {{-- elFinder translation (OPTIONAL) --}}
         @if($locale)
-            <!-- elFinder translation (OPTIONAL) -->
-            <script src="{{ asset($dir."/js/i18n/elfinder.$locale.js") }}"></script>
-        @endif
+        @basset('https://cdnjs.cloudflare.com/ajax/libs/elfinder/2.1.61/js/i18n/elfinder.'.$locale.'.min.js')
+        @endif
+
+        {{-- elFinder sounds --}}
+        @basset(base_path('vendor/studio-42/elfinder/sounds/rm.wav'))
diff --git a/resources/views/common_styles.blade.php b/resources/views/common_styles.blade.php
@@ -1,10 +1,9 @@
         <meta charset="utf-8">
         <title>File Manager</title>
 
-        <!-- elFinder CSS (REQUIRED) -->
-        <link rel="stylesheet" type="text/css" href="{{ asset($dir.'/css/elfinder.min.css') }}">
-        {{-- <link rel="stylesheet" type="text/css" href="{{ asset($dir.'/css/theme.css') }}"> --}}
-        <link rel="stylesheet" type="text/css" href="<?= asset('packages/backpack/filemanager/themes/Backpack/elfinder.backpack.theme.css') ?>">
-        {{-- <link rel="stylesheet" type="text/css" href="<?= asset('packages/backpack/filemanager/themes/Material/css/theme.min.css') ?>"> --}}
-        {{-- <link rel="stylesheet" type="text/css" href="<?= asset('packages/backpack/filemanager/themes/Material/css/theme-gray.min.css') ?>"> --}}
-        {{-- <link rel="stylesheet" type="text/css" href="<?= asset('packages/backpack/filemanager/themes/Material/css/theme-light.min.css') ?>"> --}}
+        {{-- elFinder CSS (REQUIRED) --}}
+        @bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.61.zip', 'elfinder-2.1.61')
+        @basset('elfinder-2.1.61/elFinder-2.1.61/css/elfinder.min.css')
+
+        {{-- elFinder Backpack Theme --}}
+        @basset(base_path('vendor/backpack/filemanager/resources/assets/css/elfinder.backpack.theme.css'))
diff --git a/resources/views/elfinder.blade.php b/resources/views/elfinder.blade.php
@@ -1,5 +1,4 @@
-@extends('backpack::layouts.top_left')
-
+@extends(backpack_view('blank'))
 
 @section('after_scripts')
         @include('vendor.elfinder.common_scripts')
@@ -19,7 +18,7 @@
                         _token: '{{ csrf_token() }}'
                     },
                     url : '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}'
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}'
                 });
             });
         </script>
@@ -33,8 +32,8 @@
 @endphp
 
 @section('header')
-    <section class="container-fluid">
-      <h2>{{ trans('backpack::crud.file_manager') }}</h2>
+    <section class="container-fluid" bp-section="page-header">
+      <h1 bp-section="page-heading">{{ trans('backpack::crud.file_manager') }}</h1>
     </section>
 @endsection
 
diff --git a/resources/views/filepicker.blade.php b/resources/views/filepicker.blade.php
@@ -16,7 +16,7 @@
                         _token: '{{ csrf_token() }}'
                     },
                     url: '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}',
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                     resizable: false,
                     ui: ['toolbar', 'path','stat'],
                     onlyMimes: [{{ $mimeTypes }}],
diff --git a/resources/views/standalonepopup.blade.php b/resources/views/standalonepopup.blade.php
@@ -16,7 +16,7 @@
                         _token: '{{ csrf_token() }}'
                     },
                     url: '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}',
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                     dialog: {width: 900, modal: true, title: 'Select a file'},
                     resizable: false,
                     onlyMimes: @json(unserialize(urldecode(request('mimes'))), JSON_UNESCAPED_SLASHES),
diff --git a/resources/views/tinymce.blade.php b/resources/views/tinymce.blade.php
@@ -48,7 +48,7 @@
                         _token: '{{ csrf_token() }}'
                     },
                     url : '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}',
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                     getFileCallback: function(file) { // editor callback
                         FileBrowserDialogue.mySubmit(file.url); // pass selected file path to TinyMCE
                     }
diff --git a/resources/views/tinymce4.blade.php b/resources/views/tinymce4.blade.php
@@ -30,7 +30,7 @@
                         _token: '{{ csrf_token() }}'
                     },
                     url: '{{ route("elfinder.connector") }}',  // connector URL
-                    soundPath: '{{ asset($dir.'/sounds') }}',
+                    soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                     getFileCallback: function(file) { // editor callback
                         FileBrowserDialogue.mySubmit(file.url); // pass selected file path to TinyMCE
                     }
diff --git a/resources/views/tinymce5.blade.php b/resources/views/tinymce5.blade.php
@@ -31,7 +31,7 @@
                     _token: '{{ csrf_token() }}'
                 },
                 url: '{{ route("elfinder.connector") }}',  // connector URL
-                soundPath: '{{ asset($dir.'/sounds') }}',
+                soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',
                 getFileCallback: function(file) { // editor callback
                     FileBrowserDialogue.mySubmit(file); // pass selected file path to TinyMCE
                 }
diff --git a/src/Console/Commands/Install.php b/src/Console/Commands/Install.php
@@ -3,14 +3,15 @@
 namespace Backpack\FileManager\Console\Commands;
 
 use Backpack\CRUD\app\Console\Commands\Traits\PrettyCommandOutput;
+use Backpack\FileManager\FileManagerServiceProvider;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 
 class Install extends Command
 {
     use PrettyCommandOutput;
 
-    protected $progressBar;
-
     /**
      * The name and signature of the console command.
      *
@@ -34,48 +35,32 @@ class Install extends Command
      */
     public function handle()
     {
-        $this->progressBar = $this->output->createProgressBar(4);
-        $this->progressBar->minSecondsBetweenRedraws(0);
-        $this->progressBar->maxSecondsBetweenRedraws(120);
-        $this->progressBar->setRedrawFrequency(1);
-        $this->progressBar->start();
-
-        $this->line(' Creating uploads directory');
-        switch (DIRECTORY_SEPARATOR) {
-            case '/': // unix
-                $createUploadDirectoryCommand = ['mkdir', '-p', 'public/uploads'];
-                break;
-            case '\\': // windows
-                if (! file_exists('public\uploads')) {
-                    $createUploadDirectoryCommand = ['mkdir', 'public\uploads'];
-                }
-                break;
-        }
-        if (isset($createUploadDirectoryCommand)) {
-            $this->executeProcess($createUploadDirectoryCommand);
-        }
+        $this->infoBlock('Installing Backpack FileManager', 'Step 1');
 
-        $this->line(' Publishing elFinder assets');
-        $this->executeProcess(['php', 'artisan', 'elfinder:publish']);
+        // Creating uploads directory
+        $this->progressBlock('Creating uploads directory');
+        File::ensureDirectoryExists('public/uploads');
+        $this->closeProgressBlock();
 
-        $this->line(' Publishing custom elfinder views');
+        // Publishing custom elfinder views
+        $this->progressBlock('Publishing custom elfinder views');
         $this->executeArtisanProcess('vendor:publish', [
-            '--provider' => 'Backpack\FileManager\FileManagerServiceProvider',
+            '--provider' => FileManagerServiceProvider::class,
         ]);
+        $this->closeProgressBlock();
 
-        $this->line(' Adding sidebar menu item');
-        switch (DIRECTORY_SEPARATOR) {
-            case '/': // unix
-                $this->executeArtisanProcess('backpack:add-sidebar-content', [
-                    'code' => '<li class="nav-item"><a class="nav-link" href="{{ backpack_url(\'elfinder\') }}"><i class="nav-icon la la-files-o"></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>', ]);
-                break;
-            case '\\': // windows
-                $this->executeArtisanProcess('backpack:add-sidebar-content', [
-                    'code' => '<li class="nav-item"><a class="nav-link" href="{{ backpack_url(\'elfinder\') }}"><i class="nav-icon la la-files-o"></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>', ]);
-                break;
-        }
+        // Adding sidebar menu item
+        $this->progressBlock('Adding sidebar menu item');
+        $this->executeArtisanProcess('backpack:add-sidebar-content', [
+            'code' => '<li class="nav-item"><a class="nav-link" href="{{ backpack_url(\'elfinder\') }}"><i class="nav-icon la la-files-o"></i> <span>{{ trans(\'backpack::crud.file_manager\') }}</span></a></li>',
+        ]);
+        $this->closeProgressBlock();
 
-        $this->progressBar->finish();
-        $this->info(' Backpack\FileManager installed.');
+        // Done
+        $url = Str::of(config('app.url'))->finish('/')->append('admin/elfinder');
+        $this->infoBlock('Backpack FileManager installation complete.', 'done');
+        $this->note("Go to <fg=blue>$url</> to access your filemanager.");
+        $this->note('You may need to run <fg=blue>php artisan serve</> to serve your Laravel project.');
+        $this->newLine();
     }
 }
diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Backpack\FileManager;
 
+use Backpack\Basset\Facades\Basset;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
@@ -18,9 +19,6 @@ class FileManagerServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'backpack');
-        // $this->loadViewsFrom(__DIR__.'/../resources/views', 'backpack');
-
         // Publishing is only necessary when using the CLI.
         if ($this->app->runningInConsole()) {
             $this->bootForConsole();
@@ -39,20 +37,20 @@ protected function bootForConsole()
             __DIR__.'/../resources/views' => resource_path('views/vendor/elfinder'),
         ], 'views');
 
+        // Publishing config file.
         $this->publishes([
-            __DIR__.'/../config/elfinder.php'      => config_path('elfinder.php'),
+            __DIR__.'/../config/elfinder.php' => config_path('elfinder.php'),
         ], 'config');
 
-        $this->publishes([
-            __DIR__.'/../public/packages/backpack/filemanager/themes/Backpack'      => public_path('packages/backpack/filemanager/themes/Backpack'),
-        ], 'public');
-
         // Registering package commands.
         $this->commands($this->commands);
 
         // Mapping the elfinder prefix, if missing
         if (! Config::get('elfinder.route.prefix')) {
             Config::set('elfinder.route.prefix', Config::get('backpack.base.route_prefix').'/elfinder');
         }
+
+        // Add basset view path
+        Basset::addViewPath(realpath(__DIR__.'/../resources/views'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`_token: '{{ csrf_token() }}'`
`49`	`49`	`},`
`50`	`50`	`url : '{{ route("elfinder.connector") }}', // connector URL`
`51`		`- soundPath: '{{ asset($dir.'/sounds') }}',`
	`51`	`+ soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',`
`52`	`52`	`getFileCallback: function(file) { // editor callback`
`53`	`53`	`FileBrowserDialogue.mySubmit(file.url); // pass selected file path to TinyMCE`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`_token: '{{ csrf_token() }}'`
`31`	`31`	`},`
`32`	`32`	`url: '{{ route("elfinder.connector") }}', // connector URL`
`33`		`- soundPath: '{{ asset($dir.'/sounds') }}',`
	`33`	`+ soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}',`
`34`	`34`	`getFileCallback: function(file) { // editor callback`
`35`	`35`	`FileBrowserDialogue.mySubmit(file.url); // pass selected file path to TinyMCE`
`36`	`36`	`}`