Merge branch 'dev'

* dev:
  v1.5-beta.3
  v1.5-beta.2
  v1.5-beta.1
  v1.5-alpha.11
  v1.5-alpha.10
  v1.5-alpha.9
  v1.5-alpha.8
  v1.5-alpha.7
  v1.5-alpha.6
  v1.5-alpha.5
  v1.5-alpha.4
  v1.5-alpha.3
  v1.5-alpha.2
  v1.5-alpha.1

app/Http/Controllers/DeployController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Artisan;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\UnauthorizedException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+class DeployController extends Controller
+{
+    /**
+     * Get web hook payload and verify request
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function github(Request $request)   {
+
+        if (($signature = $request->headers->get('X-Hub-Signature')) == null) {
+            throw new BadRequestHttpException('Header not set');
+        }
+
+        $signature_parts = explode('=', $signature);
+
+        if (count($signature_parts) != 2) {
+            throw new BadRequestHttpException('signature has invalid format');
+        }
+
+        $known_signature = hash_hmac('sha1', $request->getContent(), config('app.deploy_secret'));
+
+        if (! hash_equals($known_signature, $signature_parts[1])) {
+            throw new UnauthorizedException('Could not verify request signature ' . $signature_parts[1]);
+        }
+
+        // Run deploying
+        Artisan::call('deploy:production');
+
+        Log::info('The GitHub webhook was accepted');
+
+        return response('The GitHub webhook was accepted', 202);
+    }
+}

app/Http/Controllers/FileBrowser/BrowseController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\FileBrowser;
 
 use App\Http\Requests\FileBrowser\SearchRequest;
+use App\User;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
@@ -27,17 +28,19 @@ class BrowseController extends Controller
 
         // Get folders and files
         $folders_trashed = FileManagerFolder::onlyTrashed()
-            ->with(['trashed_folders'])
+            ->with(['trashed_folders', 'parent'])
             ->where('user_id', $user_id)
             ->get(['parent_id', 'unique_id', 'name']);
 
         $folders = FileManagerFolder::onlyTrashed()
+            ->with(['parent'])
             ->where('user_id', $user_id)
             ->whereIn('unique_id', filter_folders_ids($folders_trashed))
             ->get();
 
         // Get files trashed
         $files_trashed = FileManagerFile::onlyTrashed()
+            ->with(['parent'])
             ->where('user_id', $user_id)
             ->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))
             ->get();
@@ -80,6 +83,35 @@ class BrowseController extends Controller
         return collect([$folders, $files])->collapse();
     }
 
+    /**
+     * Get latest user uploads
+     *
+     * @return mixed
+     */
+    public function latest() {
+
+        // Get User
+        $user = User::with(['latest_uploads'])
+            ->where('id', Auth::id())
+            ->first();
+
+        return $user->latest_uploads->makeHidden(['user_id', 'basename']);
+    }
+
+    /**
+     * Get participant uploads
+     *
+     * @return mixed
+     */
+    public function participant_uploads() {
+
+        // Get User
+        $uploads = FileManagerFile::with(['parent'])->where('user_id', Auth::id())
+            ->whereUserScope('editor')->orderBy('created_at', 'DESC')->get();
+
+        return $uploads;
+    }
+
     /**
      * Get directory with files
      *
@@ -97,14 +129,14 @@ class BrowseController extends Controller
 
             // Get folders and files
             $folders = FileManagerFolder::onlyTrashed()
-                ->where('user_id', $user_id)
                 ->with('parent')
+                ->where('user_id', $user_id)
                 ->where('parent_id', $unique_id)
                 ->get();
 
             $files = FileManagerFile::onlyTrashed()
-                ->where('user_id', $user_id)
                 ->with('parent')
+                ->where('user_id', $user_id)
                 ->where('folder_id', $unique_id)
                 ->get();
 
@@ -121,6 +153,7 @@ class BrowseController extends Controller
         $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected'])
             ->where('user_id', $user_id)
             ->where('folder_id', $unique_id)
+            ->orderBy('created_at', 'DESC')
             ->get();
 
         // Collect folders and files to single array

app/Http/Controllers/Sharing/FileSharingController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Share\AuthenticateShareRequest;
 use App\Http\Resources\ShareResource;
 use App\Http\Tools\Guardian;
+use http\Env\Response;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\DB;
@@ -17,6 +18,7 @@ use App\FileManagerFolder;
 use App\FileManagerFile;
 use App\User;
 use App\Share;
+use Illuminate\Support\Facades\Storage;
 
 class FileSharingController extends Controller
 {
@@ -32,7 +34,7 @@ class FileSharingController extends Controller
         $shared = Share::where(\DB::raw('BINARY `token`'), $token)
             ->first();
 
-        if (!$shared) {
+        if (! $shared) {
             return view("index");
         }
 
@@ -46,10 +48,51 @@ class FileSharingController extends Controller
             Cookie::queue('shared_token', $token, 43200);
         }
 
+        // Check if shared is image file and then show it
+        if ($shared->type === 'file' && ! $shared->protected) {
+
+            $image = FileManagerFile::where('user_id', $shared->user_id)
+                ->where('type', 'image')
+                ->where('unique_id', $shared->item_id)
+                ->first();
+
+            if ($image) {
+                return $this->show_image($image);
+            }
+        }
+
         // Return page index
         return view("index");
     }
 
+    /**
+     * Get image from storage and show it
+     *
+     * @param $file
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse
+     */
+    private function show_image($file)
+    {
+        // Format pretty filename
+        $file_pretty_name = $file->name . '.' . $file->mimetype;
+
+        // Get file path
+        $path = '/file-manager/' . $file->basename;
+
+        // Check if file exist
+        if (!Storage::exists($path)) abort(404);
+
+        $header = [
+            "Content-Type"   => Storage::mimeType($path),
+            "Content-Length" => Storage::size($path),
+            "Accept-Ranges"  => "bytes",
+            "Content-Range"  => "bytes 0-600/" . Storage::size($path),
+        ];
+
+        // Get file
+        return Storage::response($path, $file_pretty_name, $header);
+    }
+
     /**
      * Check Password for protected item
      *

app/Http/Controllers/User/AccountController.php

@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers\User;
 
+use App\FileManagerFile;
+use App\FileManagerFolder;
+use App\Http\Resources\StorageDetailResource;
 use App\Http\Tools\Demo;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Support\Facades\Validator;
@@ -26,11 +29,17 @@ class AccountController extends Controller
             ->where('id', Auth::id())
             ->first();
 
+        // Get folder tree
+        $tree = FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
+            ->where('parent_id', 0)
+            ->where('user_id', $user->id)
+            ->get();
+
         return [
-            'user'           => $user->only(['name', 'email', 'avatar']),
-            'favourites'     => $user->favourites->makeHidden(['pivot']),
-            'latest_uploads' => $user->latest_uploads->makeHidden(['user_id', 'basename']),
-            'storage' => [
+            'user'       => $user->only(['name', 'email', 'avatar']),
+            'favourites' => $user->favourites->makeHidden(['pivot']),
+            'tree'       => $tree,
+            'storage'    => [
                 'used'       => Metric::bytes($user->used_capacity)->format(),
                 'capacity'   => format_gigabytes(config('vuefilemanager.user_storage_capacity')),
                 'percentage' => get_storage_fill_percentage($user->used_capacity, config('vuefilemanager.user_storage_capacity')),
@@ -38,6 +47,89 @@ class AccountController extends Controller
         ];
     }
 
+    /**
+     * Get storage details
+     *
+     * @return array
+     */
+    public function storage()
+    {
+        $document_mimetypes = [
+            'pdf', 'numbers', 'xlsx', 'xls', 'txt', 'md', 'rtf', 'pptx', 'ppt', 'odt', 'ods', 'odp', 'epub', 'docx', 'doc', 'csv', 'pages'
+        ];
+
+        $user = Auth::user();
+        $storage_capacity = config('vuefilemanager.user_storage_capacity');
+
+        $images = FileManagerFile::where('user_id', $user->id)
+            ->where('type', 'image')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        $audios = FileManagerFile::where('user_id', $user->id)
+            ->where('type', 'audio')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        $videos = FileManagerFile::where('user_id', $user->id)
+            ->where('type', 'video')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        $documents = FileManagerFile::where('user_id', $user->id)
+            ->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        $others = FileManagerFile::where('user_id', $user->id)
+            ->whereNotIn('mimetype', $document_mimetypes)
+            ->whereNotIn('type', ['audio', 'video', 'image'])
+            ->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        $usage = collect([
+            'images'    => [
+                'used'       => $images,
+                'percentage' => get_storage_fill_percentage($images, $storage_capacity),
+            ],
+            'audios'    => [
+                'used'       => $audios,
+                'percentage' => get_storage_fill_percentage($audios, $storage_capacity),
+            ],
+            'videos'    => [
+                'used'       => $videos,
+                'percentage' => get_storage_fill_percentage($videos, $storage_capacity),
+            ],
+            'documents' => [
+                'used'       => $documents,
+                'percentage' => get_storage_fill_percentage($documents, $storage_capacity),
+            ],
+            'others'    => [
+                'used'       => $others,
+                'percentage' => get_storage_fill_percentage($others, $storage_capacity),
+            ],
+        ]);
+
+        return [
+            'data' => [
+                'id'            => '1',
+                'type'          => 'disk',
+                'attributes'    => [
+                    'used'       => Metric::bytes($user->used_capacity)->format(),
+                    'capacity'   => format_gigabytes($storage_capacity),
+                    'percentage' => get_storage_fill_percentage($user->used_capacity, $storage_capacity),
+                ],
+                'relationships' => $usage->map(function ($item) {
+                    return [
+                        'used'       => Metric::bytes($item['used'])->format(),
+                        'percentage' => $item['percentage']
+                    ];
+                })
+            ]
+        ];
+    }
+
     /**
      * Update user profile
      *
@@ -48,9 +140,9 @@ class AccountController extends Controller
     {
         // Validate request
         $validator = Validator::make($request->all(), [
-            'avatar'  => 'file',
-            'name'    => 'string',
-            'value'   => 'string',
+            'avatar' => 'file',
+            'name'   => 'string',
+            'value'  => 'string',
         ]);
 
         // Return error

app/Http/Middleware/VerifyCsrfToken.php

@@ -19,6 +19,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        '/deploy',
     ];
 }

app/Http/Tools/Editor.php

@@ -230,7 +230,7 @@ class Editor
             $image = Image::make($file->getRealPath())->orientate();
 
             // Resize image
-            $image->resize(256, null, function ($constraint) {
+            $image->resize(564, null, function ($constraint) {
                 $constraint->aspectRatio();
             })->stream();