Merge branch 'master' into s3_support

Author: slimani-dev

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,22 @@
-Please check the following instructions before submitting a bug :
- * Make sure you are using the latest version.
- * Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
-
-And provide the followings :
- * Operating system :
- * Laravel version :
- * Package version :
- * Steps to reproduce your issue :
- * Screenshots of browser console :
+## Delete this section after you read them:
+* Make sure you are using the latest version.
+* Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  * Operating system :
+  * Laravel version :
+  * Package version :
+  * Screenshots of browser console :

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,13 +4,25 @@ about: Create a report to help us improve
 
 ---
 
-Please check the following instructions before submitting a bug :
- * Make sure you are using the latest version.
- * Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
-
-And provide the followings :
- * Operating system :
- * Laravel version :
- * Package version :
- * Steps to reproduce your issue :
- * Screenshots of browser console :
+## Delete this section after you read them:
+* Make sure you are using the latest version.
+* Make sure you read [installation](http://unisharp.github.io/laravel-filemanager/installation), [integration](http://unisharp.github.io/laravel-filemanager/integration), and [upgrade](http://unisharp.github.io/laravel-filemanager/upgrade) document.
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  * Operating system :
+  * Laravel version :
+  * Package version :
+  * Screenshots of browser console :

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,14 +4,14 @@ about: Suggest an idea for this project
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
 Add any other context or screenshots about the feature request here.

README.md

@@ -1,9 +1,10 @@
 <p align="center"><img src="https://unisharp.github.io/laravel-filemanager/images/logo_vertical_colored.png"></p>
 
 <p align="center">
+  <a href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/packagist/v/unisharp/laravel-filemanager" alt="Latest Stable Version"></a>
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://poser.pugx.org/unisharp/laravel-filemanager/downloads"></a>
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/packagist/dm/unisharp/laravel-filemanager.svg"></a>
-  <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/badge/stable-2.4.1-blue.svg"></a>
+  <!-- <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://img.shields.io/badge/stable-2.6.4-blue.svg"></a> -->
   <a target="_blank" href="https://packagist.org/packages/unisharp/laravel-filemanager"><img src="https://poser.pugx.org/unisharp/laravel-filemanager/license"></a>
   <br>
   <a href="https://github.styleci.io/repos/39873788?branch=master"><img src="https://github.styleci.io/repos/39873788/shield?branch=master" alt="StyleCI"></a>
@@ -12,6 +13,8 @@
   <a target="_blank" href="https://codeclimate.com/github/UniSharp/laravel-filemanager/maintainability"><img src="https://api.codeclimate.com/v1/badges/e51f2ef8f4d9f97268db/maintainability" /></a>
 </p>
 
+![RWD demo](https://unisharp.github.io/laravel-filemanager/images/screenshots-v2.png)
+
 <p align="center">
   <a href="http://unisharp.github.io/laravel-filemanager/">Documents</a>
 ・
@@ -50,17 +53,6 @@
  * Supports two categories: files and images. Each type works in different directory.
  * Supported locales : ar, az, bg, cs, de, el, en, es, eu, fa, fr, he, hu, id, it, ka, nl, pl, pt, pt-BR, ro, rs, ru, sk, sv, tr, uk, vi, zh-CN, zh-TW
 
-## v2.0 backlogs
-
-There are still some thing we need to do make this package better:
-* [x] Documents for v2.0.0
-* [x] Add more events for files and folders manipulation
-* [ ] Events should pass object instead of only file path
-
-We are also going to gain more integration like vue.js and Laravel Nova. Any PR is welcome!
-
-![RWD demo](https://unisharp.github.io/laravel-filemanager/images/screenshots-v2.png)
-
 ## Maintainers
 
  * [Stream](https://github.com/streamtw)

composer.json

@@ -26,16 +26,17 @@
     "php": ">=7.2.0",
     "ext-exif": "*",
     "ext-fileinfo": "*",
-    "intervention/image": "2.*",
-    "illuminate/config": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-    "illuminate/filesystem": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-    "illuminate/support": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-    "illuminate/http": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
-    "illuminate/container": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
+    "intervention/image": ">=2.0.0",
+    "illuminate/config": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+    "illuminate/filesystem": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+    "illuminate/support": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+    "illuminate/http": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+    "illuminate/container": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+    "league/flysystem": ">=2.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.2",
-    "mockery/mockery": "^0.9.9",
+    "phpunit/phpunit": "~8.0",
+    "mockery/mockery": "~1.3.0",
     "squizlabs/php_codesniffer": "^3.1"
   },
   "suggest": {

docs/_config.yml

@@ -3,7 +3,7 @@ theme: jekyll-theme-cayman
 # Setup
 title: Laravel File Manager
 description: It's like Dropbox for your Laravel app.
-google_analytics: UA-92410814-4
+google_analytics: G-X9XY279785
 
 # About/contact
 author:

docs/_layouts/default.html

@@ -1,6 +1,16 @@
 <!DOCTYPE html>
 <html lang="en-us">
   <head>
+    {% if site.google_analytics %}
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+      <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ site.google_analytics }}');
+      </script>
+    {% endif %}
     <meta charset="UTF-8">
     <title>{{ page.title | default: site.title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -125,17 +135,5 @@ <h2 class="project-tagline">{{ site.description | default: site.github.project_t
         <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</span>
       </footer>
     </section>
-
-    {% if site.google_analytics %}
-      <script type="text/javascript">
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-        ga('create', '{{ site.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-      </script>
-    {% endif %}
   </body>
 </html>

docs/installation.md

@@ -25,25 +25,16 @@
     composer require unisharp/laravel-filemanager
     ```
 
-1. (optional) Edit `config/app.php` :
+1. (optional) Install required dependency with `v3.*` of `intervention/image`:
 
-    \* *For Laravel 5.5 and up, skip to step 3. All service providers and facades are automatically discovered.*
+    This package use `intervention/image` to perform image cropping/resizing and generating thumbnails. Since `v3.*` of `intervention/image` does not support Laravel by default, the service provider need to be installed with the following scripts. Details can be found here: https://github.com/Intervention/image-laravel
 
-    Add service providers
-
-    ```php
-    UniSharp\LaravelFilemanager\LaravelFilemanagerServiceProvider::class,
-    Intervention\Image\ImageServiceProvider::class,
-    ```
-
-    And add class aliases
-
-    ```php
-    'Image' => Intervention\Image\Facades\Image::class,
+    ```bash
+    composer require intervention/image-laravel
+    php artisan vendor:publish --provider="Intervention\Image\Laravel\ServiceProvider"
     ```
 
-    Code above is for Laravel 5.1.
-    In Laravel 5.0 should leave only quoted class names.
+    \* *Do not run these scripts if you use `v2.*` of `intervention/image`.*
 
 1. Publish the package's config and assets :
 

docs/integration.md

@@ -197,7 +197,7 @@ If you are going to use filemanager independently, meaning set the value of an i
       </span>
       <input id="thumbnail" class="form-control" type="text" name="filepath">
     </div>
-    <img id="holder" style="margin-top:15px;max-height:100px;">
+    <div id="holder" style="margin-top:15px;max-height:100px;"></div>
     ```
 1. Import lfm.js(run `php artisan vendor:publish` if you need).
 

public/js/script.js

@@ -284,7 +284,11 @@ function performLfmRequest(url, parameter, type) {
 }
 
 function displayErrorResponse(jqXHR) {
-  notify('<div style="max-height:50vh;overflow: scroll;">' + jqXHR.responseText + '</div>');
+  var message = JSON.parse(jqXHR.responseText)
+  if (Array.isArray(message)) {
+    message = message.join('<br>')
+  }
+  notify('<div style="max-height:50vh;overflow: auto;">' + message + '</div>');
 }
 
 var refreshFoldersAndItems = function (data) {
@@ -540,7 +544,7 @@ function rename(item) {
 }
 
 function trash(items) {
-  notify(lang['message-delete'], function () {
+  confirm(lang['message-delete'], function () {
     performLfmRequest('delete', {
       items: items.map(function (item) { return item.name; })
     }).done(refreshFoldersAndItems)
@@ -597,7 +601,7 @@ function preview(items) {
     }
 
     carouselItem.find('.carousel-label').attr('target', '_blank').attr('href', item.url)
-      .append(item.name)
+      .text(item.name)
       .append($('<i class="fas fa-external-link-alt ml-2"></i>'));
 
     carousel.children('.carousel-inner').append(carouselItem);
@@ -794,12 +798,16 @@ function notImp() {
   notify('Not yet implemented!');
 }
 
-function notify(body, callback) {
-  $('#notify').find('.btn-primary').toggle(callback !== undefined);
-  $('#notify').find('.btn-primary').unbind().click(callback);
+function notify(body) {
   $('#notify').modal('show').find('.modal-body').html(body);
 }
 
+function confirm(body, callback) {
+  $('#confirm').find('.btn-primary').toggle(callback !== undefined);
+  $('#confirm').find('.btn-primary').click(callback);
+  $('#confirm').modal('show').find('.modal-body').html(body);
+}
+
 function dialog(title, value, callback) {
   $('#dialog').find('input').val(value);
   $('#dialog').on('shown.bs.modal', function () {