Skip to content
This repository was archived by the owner on Feb 18, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions app/Contracts/ImageRenderServiceContract.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
namespace App\Contracts;

/**
* Class ImageRenderService
*
* @package App\Services
* Class ImageRenderService.
*/
interface ImageRenderServiceContract
{
Expand All @@ -14,4 +12,4 @@ interface ImageRenderServiceContract
* @return mixed
*/
public function render($id);
}
}
5 changes: 1 addition & 4 deletions app/Http/Controllers/Api/Assets/RenderFileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
use App\Contracts\ImageRenderServiceContract;

/**
* Class RenderFileController
*
* @package App\Http\Controllers\Api\Assets
* Class RenderFileController.
*/
class RenderFileController extends Controller
{
Expand All @@ -35,5 +33,4 @@ public function show($id)
{
return $this->service->render($id);
}

}
4 changes: 2 additions & 2 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
use App\Services\RolesService;
use App\Services\UsersService;
use App\Services\AssetsService;
use App\Services\PermissionsService;
use App\Services\ImageRenderService;
use App\Services\PermissionsService;
use App\Contracts\RolesServiceContract;
use App\Contracts\UsersServiceContract;
use Illuminate\Support\ServiceProvider;
Expand All @@ -27,7 +27,7 @@ class AppServiceProvider extends ServiceProvider
RolesServiceContract::class => RolesService::class,
AssetsServiceContract::class => AssetsService::class,
PermissionsServiceContract::class => PermissionsService::class,
ImageRenderServiceContract::class => ImageRenderService::class
ImageRenderServiceContract::class => ImageRenderService::class,
];

/**
Expand Down
16 changes: 8 additions & 8 deletions app/Services/ImageRenderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
use Illuminate\Database\Eloquent\ModelNotFoundException;

/**
* Class ImageRenderService
*
* @package App\Services
* Class ImageRenderService.
*/
class ImageRenderService implements ImageRenderServiceContract
{
Expand All @@ -36,10 +34,11 @@ public function __construct(AssetsServiceContract $assetService)
*/
public function render($id)
{
try{
try {
$file = $this->assetService->find($id);

return $this->renderImage($file);
}catch (ModelNotFoundException $e) {
} catch (ModelNotFoundException $e) {
return $this->renderPlaceholder();
}
}
Expand All @@ -50,9 +49,10 @@ public function render($id)
*/
protected function renderImage($file)
{
$image = Image::cache(function($image) use ($file) {
$image = Image::cache(function ($image) use ($file) {
$image->make(Storage::get($file->path));
}, 10, true);

return $image->response();
}

Expand All @@ -62,7 +62,7 @@ protected function renderImage($file)
protected function renderPlaceholder()
{
$img = Image::canvas(800, 600, '#ff0000');

return $img->response('jpg');
}

}
}
4 changes: 2 additions & 2 deletions app/Transformers/AssetTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public function transform(Asset $model)
'mime' => $model->mime,
'created_at' => $model->created_at->toIso8601String(),
'links' => [
'render' => url('api/assets/'.$model->uuid.'/render')
]
'render' => url('api/assets/'.$model->uuid.'/render'),
],
];
}
}
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Uuid' => Webpatser\Uuid\Uuid::class,
'Image' => Intervention\Image\Facades\Image::class
'Image' => Intervention\Image\Facades\Image::class,
],

];