From 5e3c12220c43493dd2115445a4e7d22eb8f5ec88 Mon Sep 17 00:00:00 2001
From: sonya <SVFilimonova@1cbit.ru>
Date: Mon, 29 Mar 2021 02:54:02 +0700
Subject: [PATCH] Try #1

---
 resources/views/table.blade.php | 515 +++++++++++++++++---------------
 src/MediaController.php         |   9 +-
 src/MediaManager.php            |  22 +-
 3 files changed, 290 insertions(+), 256 deletions(-)

diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
index d42ce5e..13d521d 100644
--- a/resources/views/table.blade.php
+++ b/resources/views/table.blade.php
@@ -31,239 +31,239 @@
         margin: 7px 0px 0px 10px;
     }
 
-    .file-icon.has-img>img {
-         max-width: 100%;
-         height: auto;
-         max-height: 30px;
-     }
+    .file-icon.has-img > img {
+        max-width: 100%;
+        height: auto;
+        max-height: 30px;
+    }
 
 </style>
 
 <script data-exec-on-popstate>
 
-$(function () {
-    $('.file-delete').click(function () {
-
-        var path = $(this).data('path');
-
-        swal({
-            title: "{{ trans('admin.delete_confirm') }}",
-            type: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "{{ trans('admin.confirm') }}",
-            showLoaderOnConfirm: true,
-            closeOnConfirm: false,
-            cancelButtonText: "{{ trans('admin.cancel') }}",
-            preConfirm: function() {
-                return new Promise(function(resolve) {
-
-                    $.ajax({
-                        method: 'delete',
-                        url: '{{ $url['delete'] }}',
-                        data: {
-                            'files[]':[path],
-                            _token:LA.token
-                        },
-                        success: function (data) {
-                            $.pjax.reload('#pjax-container');
-
-                            resolve(data);
-                        }
-                    });
+    $(function () {
+        $('.file-delete').click(function () {
+
+            var path = $(this).data('path');
+
+            swal({
+                title: "{{ trans('admin.delete_confirm') }}",
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                confirmButtonText: "{{ trans('admin.confirm') }}",
+                showLoaderOnConfirm: true,
+                closeOnConfirm: false,
+                cancelButtonText: "{{ trans('admin.cancel') }}",
+                preConfirm: function () {
+                    return new Promise(function (resolve) {
+
+                        $.ajax({
+                            method: 'delete',
+                            url: '{{ $url['delete'] }}',
+                            data: {
+                                'files[]': [path],
+                                _token: LA.token
+                            },
+                            success: function (data) {
+                                $.pjax.reload('#pjax-container');
+
+                                resolve(data);
+                            }
+                        });
 
-                });
-            }
-        }).then(function(result){
-            var data = result.value;
-            if (typeof data === 'object') {
-                if (data.status) {
-                    swal(data.message, '', 'success');
-                } else {
-                    swal(data.message, '', 'error');
+                    });
                 }
-            }
+            }).then(function (result) {
+                var data = result.value;
+                if (typeof data === 'object') {
+                    if (data.status) {
+                        swal(data.message, '', 'success');
+                    } else {
+                        swal(data.message, '', 'error');
+                    }
+                }
+            });
         });
-    });
 
-    $('#moveModal').on('show.bs.modal', function (event) {
-        var button = $(event.relatedTarget);
-        var name = button.data('name');
+        $('#moveModal').on('show.bs.modal', function (event) {
+            var button = $(event.relatedTarget);
+            var name = button.data('name');
 
-        var modal = $(this);
-        modal.find('[name=path]').val(name)
-        modal.find('[name=new]').val(name)
-    });
+            var modal = $(this);
+            modal.find('[name=path]').val(name)
+            modal.find('[name=new]').val(name)
+        });
 
-    $('#urlModal').on('show.bs.modal', function (event) {
-        var button = $(event.relatedTarget);
-        var url = button.data('url');
+        $('#urlModal').on('show.bs.modal', function (event) {
+            var button = $(event.relatedTarget);
+            var url = button.data('url');
 
-        $(this).find('input').val(url)
-    });
+            $(this).find('input').val(url)
+        });
 
-    $('#file-move').on('submit', function (event) {
+        $('#file-move').on('submit', function (event) {
 
-        event.preventDefault();
+            event.preventDefault();
 
-        var form = $(this);
+            var form = $(this);
 
-        var path = form.find('[name=path]').val();
-        var name = form.find('[name=new]').val();
+            var path = form.find('[name=path]').val();
+            var name = form.find('[name=new]').val();
 
-        $.ajax({
-            method: 'put',
-            url: '{{ $url['move'] }}',
-            data: {
-                path: path,
-                'new': name,
-                _token:LA.token,
-            },
-            success: function (data) {
-                $.pjax.reload('#pjax-container');
+            $.ajax({
+                method: 'put',
+                url: '{{ $url['move'] }}',
+                data: {
+                    path: path,
+                    'new': name,
+                    _token: LA.token,
+                },
+                success: function (data) {
+                    $.pjax.reload('#pjax-container');
 
-                if (typeof data === 'object') {
-                    if (data.status) {
-                        toastr.success(data.message);
-                    } else {
-                        toastr.error(data.message);
+                    if (typeof data === 'object') {
+                        if (data.status) {
+                            toastr.success(data.message);
+                        } else {
+                            toastr.error(data.message);
+                        }
                     }
                 }
-            }
-        });
+            });
 
-        closeModal();
-    });
+            closeModal();
+        });
 
-    $('.file-upload').on('change', function () {
-        $('.file-upload-form').submit();
-    });
+        $('.file-upload').on('change', function () {
+            $('.file-upload-form').submit();
+        });
 
-    $('#new-folder').on('submit', function (event) {
+        $('#new-folder').on('submit', function (event) {
 
-        event.preventDefault();
+            event.preventDefault();
 
-        var formData = new FormData(this);
+            var formData = new FormData(this);
 
-        $.ajax({
-            method: 'POST',
-            url: '{{ $url['new-folder'] }}',
-            data: formData,
-            async: false,
-            success: function (data) {
-                $.pjax.reload('#pjax-container');
+            $.ajax({
+                method: 'POST',
+                url: '{{ $url['new-folder'] }}',
+                data: formData,
+                async: false,
+                success: function (data) {
+                    $.pjax.reload('#pjax-container');
 
-                if (typeof data === 'object') {
-                    if (data.status) {
-                        toastr.success(data.message);
-                    } else {
-                        toastr.error(data.message);
+                    if (typeof data === 'object') {
+                        if (data.status) {
+                            toastr.success(data.message);
+                        } else {
+                            toastr.error(data.message);
+                        }
                     }
-                }
-            },
-            cache: false,
-            contentType: false,
-            processData: false
+                },
+                cache: false,
+                contentType: false,
+                processData: false
+            });
+
+            closeModal();
         });
 
-        closeModal();
-    });
+        function closeModal() {
+            $("#moveModal").modal('toggle');
+            $('body').removeClass('modal-open');
+            $('.modal-backdrop').remove();
+        }
 
-    function closeModal() {
-        $("#moveModal").modal('toggle');
-        $('body').removeClass('modal-open');
-        $('.modal-backdrop').remove();
-    }
+        $('.media-reload').click(function () {
+            $.pjax.reload('#pjax-container');
+        });
 
-    $('.media-reload').click(function () {
-        $.pjax.reload('#pjax-container');
-    });
+        $('.goto-url button').click(function () {
+            var path = $('.goto-url input').val();
+            $.pjax({container: '#pjax-container', url: '{{ $url['index'] }}?path=' + path});
+        });
 
-    $('.goto-url button').click(function () {
-        var path = $('.goto-url input').val();
-        $.pjax({container:'#pjax-container', url: '{{ $url['index'] }}?path=' + path });
-    });
+        $('.files-select-all').on('ifChanged', function (event) {
+            if (this.checked) {
+                $('.grid-row-checkbox').iCheck('check');
+            } else {
+                $('.grid-row-checkbox').iCheck('uncheck');
+            }
+        });
 
-    $('.files-select-all').on('ifChanged', function(event) {
-        if (this.checked) {
-            $('.grid-row-checkbox').iCheck('check');
-        } else {
-            $('.grid-row-checkbox').iCheck('uncheck');
-        }
-    });
+        $('.file-select input').iCheck({checkboxClass: 'icheckbox_minimal-blue'}).on('ifChanged', function () {
+            if (this.checked) {
+                $(this).closest('tr').css('background-color', '#ffffd5');
+            } else {
+                $(this).closest('tr').css('background-color', '');
+            }
+        });
 
-    $('.file-select input').iCheck({checkboxClass:'icheckbox_minimal-blue'}).on('ifChanged', function () {
-        if (this.checked) {
-            $(this).closest('tr').css('background-color', '#ffffd5');
-        } else {
-            $(this).closest('tr').css('background-color', '');
-        }
-    });
+        $('.file-select-all input').iCheck({checkboxClass: 'icheckbox_minimal-blue'}).on('ifChanged', function () {
+            if (this.checked) {
+                $('.file-select input').iCheck('check');
+            } else {
+                $('.file-select input').iCheck('uncheck');
+            }
+        });
 
-    $('.file-select-all input').iCheck({checkboxClass:'icheckbox_minimal-blue'}).on('ifChanged', function () {
-        if (this.checked) {
-            $('.file-select input').iCheck('check');
-        } else {
-            $('.file-select input').iCheck('uncheck');
-        }
-    });
+        $('.file-delete-multiple').click(function () {
+            var files = $(".file-select input:checked").map(function () {
+                return $(this).val();
+            }).toArray();
 
-    $('.file-delete-multiple').click(function () {
-        var files = $(".file-select input:checked").map(function(){
-            return $(this).val();
-        }).toArray();
+            if (!files.length) {
+                return;
+            }
 
-        if (!files.length) {
-            return;
-        }
+            swal({
+                title: "{{ trans('admin.delete_confirm') }}",
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                confirmButtonText: "{{ trans('admin.confirm') }}",
+                showLoaderOnConfirm: true,
+                closeOnConfirm: false,
+                cancelButtonText: "{{ trans('admin.cancel') }}",
+                preConfirm: function () {
+                    return new Promise(function (resolve) {
+
+                        $.ajax({
+                            method: 'delete',
+                            url: '{{ $url['delete'] }}',
+                            data: {
+                                'files[]': files,
+                                _token: LA.token
+                            },
+                            success: function (data) {
+                                $.pjax.reload('#pjax-container');
+
+                                resolve(data);
+                            }
+                        });
 
-        swal({
-            title: "{{ trans('admin.delete_confirm') }}",
-            type: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "{{ trans('admin.confirm') }}",
-            showLoaderOnConfirm: true,
-            closeOnConfirm: false,
-            cancelButtonText: "{{ trans('admin.cancel') }}",
-            preConfirm: function() {
-                return new Promise(function(resolve) {
-
-                    $.ajax({
-                        method: 'delete',
-                        url: '{{ $url['delete'] }}',
-                        data: {
-                            'files[]': files,
-                            _token:LA.token
-                        },
-                        success: function (data) {
-                            $.pjax.reload('#pjax-container');
-
-                            resolve(data);
-                        }
                     });
-
-                });
-            }
-        }).then(function (result) {
-            var data = result.value;
-            if (typeof data === 'object') {
-                if (data.status) {
-                    swal(data.message, '', 'success');
-                } else {
-                    swal(data.message, '', 'error');
                 }
-            }
+            }).then(function (result) {
+                var data = result.value;
+                if (typeof data === 'object') {
+                    if (data.status) {
+                        swal(data.message, '', 'success');
+                    } else {
+                        swal(data.message, '', 'error');
+                    }
+                }
+            });
         });
-    });
 
-    $('table>tbody>tr').mouseover(function () {
-        $(this).find('.btn-group').removeClass('hide');
-    }).mouseout(function () {
-        $(this).find('.btn-group').addClass('hide');
-    });
+        $('table>tbody>tr').mouseover(function () {
+            $(this).find('.btn-group').removeClass('hide');
+        }).mouseout(function () {
+            $(this).find('.btn-group').addClass('hide');
+        });
 
-});
+    });
 
 </script>
 
@@ -286,9 +286,10 @@ function closeModal() {
                     <!-- /.btn-group -->
                     <label class="btn btn-default btn"{{-- data-toggle="modal" data-target="#uploadModal"--}}>
                         <i class="fa fa-upload"></i>&nbsp;&nbsp;{{ trans('admin.upload') }}
-                        <form action="{{ $url['upload'] }}" method="post" class="file-upload-form" enctype="multipart/form-data" pjax-container>
+                        <form action="{{ $url['upload'] }}" method="post" class="file-upload-form"
+                              enctype="multipart/form-data" pjax-container>
                             <input type="file" name="files[]" class="hidden file-upload" multiple>
-                            <input type="hidden" name="dir" value="{{ $url['path'] }}" />
+                            <input type="hidden" name="dir" value="{{ $url['path'] }}"/>
                             {{ csrf_field() }}
                         </form>
                     </label>
@@ -299,13 +300,20 @@ function closeModal() {
                     </a>
 
                     <div class="btn-group">
-                        <a href="{{ route('media-index', ['path' => $url['path'], 'view' => 'table']) }}" class="btn btn-default active"><i class="fa fa-list"></i></a>
-                        <a href="{{ route('media-index', ['path' => $url['path'], 'view' => 'list']) }}" class="btn btn-default"><i class="fa fa-th"></i></a>
+                        @if($currentPage !== 1)
+                            <a href="{{ route('media-index', ['path' => $url['path'], 'page' => $url['page']-1]) }}"
+                               class="btn btn-default active"><i class="fa fa-chevron-left"></i></a>
+                        @endif
+                        @if($currentPage !== $countPage)
+                            <a href="{{ route('media-index', ['path' => $url['path'], 'page' => $url['page']+1]) }}"
+                               class="btn btn-default"><i class="fa fa-chevron-right"></i></a>
+                        @endif
                     </div>
 
                     {{--<form action="{{ $url['index'] }}" method="get" pjax-container>--}}
                     <div class="input-group input-group-sm pull-right goto-url" style="width: 250px;">
-                        <input type="text" name="path" class="form-control pull-right" value="{{ '/'.trim($url['path'], '/') }}">
+                        <input type="text" name="path" class="form-control pull-right"
+                               value="{{ '/'.trim($url['path'], '/') }}">
 
                         <div class="input-group-btn">
                             <button type="submit" class="btn btn-default"><i class="fa fa-arrow-right"></i></button>
@@ -324,56 +332,62 @@ function closeModal() {
                     <li><a href="{{ route('media-index') }}"><i class="fa fa-th-large"></i> </a></li>
 
                     @foreach($nav as $item)
-                    <li><a href="{{ $item['url'] }}"> {{ $item['name'] }}</a></li>
+                        <li><a href="{{ $item['url'] }}"> {{ $item['name'] }}</a></li>
                     @endforeach
                 </ol>
 
                 @if (!empty($list))
-                <table class="table table-hover">
-                    <tbody>
-                    <tr>
-                        <th width="40px;">
+                    <table class="table table-hover">
+                        <tbody>
+                        <tr>
+                            <th width="40px;">
                             <span class="file-select-all">
                             <input type="checkbox" value=""/>
                             </span>
-                        </th>
-                        <th>{{ trans('admin.name') }}</th>
-                        <th></th>
-                        <th width="200px;">{{ trans('admin.time') }}</th>
-                        <th width="100px;">{{ trans('admin.size') }}</th>
-                    </tr>
-                    @foreach($list as $item)
-                    <tr>
-                        <td style="padding-top: 15px;">
+                            </th>
+                            <th>{{ trans('admin.name') }}</th>
+                            <th></th>
+                            <th width="200px;">{{ trans('admin.time') }}</th>
+                            <th width="100px;">{{ trans('admin.size') }}</th>
+                        </tr>
+                        @foreach($list as $item)
+                            <tr>
+                                <td style="padding-top: 15px;">
                             <span class="file-select">
                             <input type="checkbox" value="{{ $item['name'] }}"/>
                             </span>
-                        </td>
-                        <td>
-                            {!! $item['preview'] !!}
-
-                            <a @if(!$item['isDir'])target="_blank"@endif href="{{ $item['link'] }}" class="file-name" title="{{ $item['name'] }}">
-                            {{ $item['icon'] }} {{ basename($item['name']) }}
-                            </a>
-                        </td>
-
-                        <td class="action-row">
-                            <div class="btn-group btn-group-xs hide">
-                                <a class="btn btn-default file-rename" data-toggle="modal" data-target="#moveModal" data-name="{{ $item['name'] }}"><i class="fa fa-edit"></i></a>
-                                <a class="btn btn-default file-delete" data-path="{{ $item['name'] }}"><i class="fa fa-trash"></i></a>
-                                @unless($item['isDir'])
-                                <a target="_blank" href="{{ $item['download'] }}" class="btn btn-default"><i class="fa fa-download"></i></a>
-                                @endunless
-                                <a class="btn btn-default" data-toggle="modal" data-target="#urlModal" data-url="{{ $item['url'] }}"><i class="fa fa-internet-explorer"></i></a>
-                            </div>
-
-                        </td>
-                        <td>{{ $item['time'] }}&nbsp;</td>
-                        <td>{{ $item['size'] }}&nbsp;</td>
-                    </tr>
-                    @endforeach
-                    </tbody>
-                </table>
+                                </td>
+                                <td>
+                                    {!! $item['preview'] !!}
+
+                                    <a @if(!$item['isDir'])target="_blank" @endif href="{{ $item['link'] }}"
+                                       class="file-name" title="{{ $item['name'] }}">
+                                        {{ $item['icon'] }} {{ basename($item['name']) }}
+                                    </a>
+                                </td>
+
+                                <td class="action-row">
+                                    <div class="btn-group btn-group-xs hide">
+                                        <a class="btn btn-default file-rename" data-toggle="modal"
+                                           data-target="#moveModal" data-name="{{ $item['name'] }}"><i
+                                                class="fa fa-edit"></i></a>
+                                        <a class="btn btn-default file-delete" data-path="{{ $item['name'] }}"><i
+                                                class="fa fa-trash"></i></a>
+                                        @unless($item['isDir'])
+                                            <a target="_blank" href="{{ $item['download'] }}" class="btn btn-default"><i
+                                                    class="fa fa-download"></i></a>
+                                        @endunless
+                                        <a class="btn btn-default" data-toggle="modal" data-target="#urlModal"
+                                           data-url="{{ $item['url'] }}"><i class="fa fa-internet-explorer"></i></a>
+                                    </div>
+
+                                </td>
+                                <td>{{ $item['time'] }}&nbsp;</td>
+                                <td>{{ $item['size'] }}&nbsp;</td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
                 @endif
 
             </div>
@@ -389,21 +403,22 @@ function closeModal() {
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
                 <h4 class="modal-title" id="moveModalLabel">Rename & Move</h4>
             </div>
             <form id="file-move">
-            <div class="modal-body">
-                <div class="form-group">
-                    <label for="recipient-name" class="control-label">Path:</label>
-                    <input type="text" class="form-control" name="new" />
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="recipient-name" class="control-label">Path:</label>
+                        <input type="text" class="form-control" name="new"/>
+                    </div>
+                    <input type="hidden" name="path"/>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Close</button>
+                    <button type="submit" class="btn btn-primary btn-sm">Submit</button>
                 </div>
-                <input type="hidden" name="path"/>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Close</button>
-                <button type="submit" class="btn btn-primary btn-sm">Submit</button>
-            </div>
             </form>
         </div>
     </div>
@@ -413,12 +428,13 @@ function closeModal() {
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
                 <h4 class="modal-title" id="urlModalLabel">Url</h4>
             </div>
             <div class="modal-body">
                 <div class="form-group">
-                    <input type="text" class="form-control" />
+                    <input type="text" class="form-control"/>
                 </div>
             </div>
             <div class="modal-footer">
@@ -432,13 +448,14 @@ function closeModal() {
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
                 <h4 class="modal-title" id="newFolderModalLabel">New folder</h4>
             </div>
             <form id="new-folder">
                 <div class="modal-body">
                     <div class="form-group">
-                        <input type="text" class="form-control" name="name" />
+                        <input type="text" class="form-control" name="name"/>
                     </div>
                     <input type="hidden" name="dir" value="{{ $url['path'] }}"/>
                     {{ csrf_field() }}
diff --git a/src/MediaController.php b/src/MediaController.php
index 52eee64..06b3412 100644
--- a/src/MediaController.php
+++ b/src/MediaController.php
@@ -16,11 +16,14 @@ public function index(Request $request)
 
             $path = $request->get('path', '/');
             $view = $request->get('view', 'table');
+            $page = $request->get('page',1);
 
-            $manager = new MediaManager($path);
-
+            $manager = new MediaManager($path,$page);
+            $array = $manager->ls();
             $content->body(view("laravel-admin-media::$view", [
-                'list'   => $manager->ls($request->get('page',1)),
+                'list'   => $array['files'],
+                'countPage' => $array['count-pages'],
+                'currentPage'=> $array['current-page'],
                 'nav'    => $manager->navigation(),
                 'url'    => $manager->urls(),
             ]));
diff --git a/src/MediaManager.php b/src/MediaManager.php
index bdce95f..92fd59c 100644
--- a/src/MediaManager.php
+++ b/src/MediaManager.php
@@ -20,6 +20,7 @@ class MediaManager extends Extension
      * @var string
      */
     protected $path = '/';
+    protected $page = 1;
 
     /**
      * @var \Illuminate\Filesystem\FilesystemAdapter
@@ -45,10 +46,12 @@ class MediaManager extends Extension
      * MediaManager constructor.
      *
      * @param string $path
+     * @param int $page
      */
-    public function __construct($path = '/')
+    public function __construct($path = '/',$page = 1)
     {
         $this->path = $path;
+        $this->page = $page;
 
         $this->initStorage();
     }
@@ -64,7 +67,7 @@ private function initStorage()
         }
     }
 
-    public function ls($page)
+    public function ls()
     {
         if (!$this->exists()) {
             Handler::error('Error', "File or directory [$this->path] not exists");
@@ -76,11 +79,20 @@ public function ls($page)
 
         $directories = $this->storage->directories($this->path);
 
-        return $this->formatDirectories($directories)
+        $count = $this->formatDirectories($directories)
             ->merge($this->formatFiles($files))
             ->sort(function ($item) {
                 return $item['name'];
-            })->forPage($page,20);
+            })->count();
+
+        return [
+            'files' => $this->formatDirectories($directories)
+            ->merge($this->formatFiles($files))
+            ->sort(function ($item) {
+                return $item['name'];
+            })->forPage($this->page,20),
+            'count-pages' => $count/20,
+            'current-page'=> $this->page];
     }
 
     /**
@@ -316,4 +328,6 @@ public function getFileChangeTime($file)
 
         return date('Y-m-d H:i:s', $time);
     }
+
+
 }