From f3a2758bcc0dc63d76893c05b7b204cf35dd66e2 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Tue, 25 Aug 2020 12:04:13 +0200 Subject: [PATCH] reading metadata in shared link v0.1 --- app/Http/Controllers/AppFunctionsController.php | 8 +++++++- resources/lang/en/vuefilemanager.php | 4 ++++ resources/views/og-view.blade.php | 1 + routes/web.php | 13 +++++++------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AppFunctionsController.php b/app/Http/Controllers/AppFunctionsController.php index d0eabfa1..772b3023 100644 --- a/app/Http/Controllers/AppFunctionsController.php +++ b/app/Http/Controllers/AppFunctionsController.php @@ -123,9 +123,13 @@ class AppFunctionsController extends Controller ->where('unique_id', $shared->item_id) ->first(); + if ($file->thumbnail) { + $file->setPublicUrl($token); + } + $metadata = [ 'is_protected' => $shared->protected, - 'url' => url('/shared', ['token' => $token]), + 'url' => $file->thumbnail ? $file->thumbnail : null, 'user' => $user->name, 'name' => $file->name, 'size' => $file->filesize, @@ -133,6 +137,8 @@ class AppFunctionsController extends Controller ]; } + return $metadata; + // Handle single file if ($shared->type === 'folder') { diff --git a/resources/lang/en/vuefilemanager.php b/resources/lang/en/vuefilemanager.php index f6dde049..9d70f3f3 100644 --- a/resources/lang/en/vuefilemanager.php +++ b/resources/lang/en/vuefilemanager.php @@ -52,4 +52,8 @@ return [ 'col_amount' => 'Amount', 'total' => 'Total', + + // OG Page + 'user_sending' => '', + 'protected_file' => '', ]; \ No newline at end of file diff --git a/resources/views/og-view.blade.php b/resources/views/og-view.blade.php index 9a6da207..b904b9a2 100644 --- a/resources/views/og-view.blade.php +++ b/resources/views/og-view.blade.php @@ -23,6 +23,7 @@ @if(! $metadata['is_protected']) @if($metadata['thumbnail']) + @endif diff --git a/routes/web.php b/routes/web.php index 375e13ff..5a4be095 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,10 +11,6 @@ | */ -// Get og site for web crawlers -if( Crawler::isCrawler()) { - Route::get('/shared/{token}', 'AppFunctionsController@og_site'); -} // Stripe WebHook Route::post('/stripe/webhook', 'WebhookController@handleWebhook'); @@ -40,6 +36,11 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], func Route::get('/invoice/{customer}/{token}', 'Admin\InvoiceController@show'); }); -// Pages -Route::get('/shared/{token}', 'Sharing\FileSharingController@index'); +// Get og site for web crawlers +if( Crawler::isCrawler()) { + Route::get('/shared/{token}', 'AppFunctionsController@og_site'); +} else { + Route::get('/shared/{token}', 'Sharing\FileSharingController@index'); +} + Route::get('/{any?}', 'AppFunctionsController@index')->where('any', '.*');