diff --git a/.env.example b/.env.example index b26ba43..1eb0214 100644 --- a/.env.example +++ b/.env.example @@ -61,8 +61,8 @@ MAIL_FROM_ADDRESS="hello@example.com" MAIL_FROM_NAME="${APP_NAME}" -MEDIA_GALLEY_THUMB=500x500 -MEDIA_POST_THUMB=500x500 +MEDIA_WATERMARK_SIZE=15 +MEDIA_WATERMARK_OPACITY=50 AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= diff --git a/app/Http/Controllers/Admin/CategoryController.php b/app/Http/Controllers/Admin/CategoryController.php index c916f2b..a24d8ca 100644 --- a/app/Http/Controllers/Admin/CategoryController.php +++ b/app/Http/Controllers/Admin/CategoryController.php @@ -69,7 +69,9 @@ class CategoryController extends XController if (getSetting('watermark2')) { $i->watermark(public_path('upload/images/logo.png'), AlignPosition::BottomLeft, 5, 5, Unit::Percent, - 15, Unit::Percent, 15, Unit::Percent, Fit::Contain, 50); + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } $i->save(storage_path() . '/app/public/categories/optimized-'. $category->$key); } @@ -83,7 +85,9 @@ class CategoryController extends XController if (getSetting('watermark2')) { $i->watermark(public_path('upload/images/logo.png'), AlignPosition::BottomLeft, 5, 5, Unit::Percent, - 15, Unit::Percent, 15, Unit::Percent, Fit::Contain, 50); + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } $i->save(storage_path() . '/app/public/categories/optimized-'. $category->$key); } diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 0c95105..609c3c4 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -68,7 +68,9 @@ class GroupController extends XController if (getSetting('watermark2')) { $i->watermark(public_path('upload/images/logo.png'), AlignPosition::BottomLeft, 5, 5, Unit::Percent, - 15, Unit::Percent, 15, Unit::Percent, Fit::Contain, 50); + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } $i->save(storage_path() . '/app/public/groups/optimized-'. $group->$key); } @@ -82,7 +84,9 @@ class GroupController extends XController if (getSetting('watermark2')) { $i->watermark(public_path('upload/images/logo.png'), AlignPosition::BottomLeft, 5, 5, Unit::Percent, - 15, Unit::Percent, 15, Unit::Percent, Fit::Contain, 50); + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } $i->save(storage_path() . '/app/public/groups/optimized-'. $group->$key); } diff --git a/app/Http/Controllers/Admin/SliderController.php b/app/Http/Controllers/Admin/SliderController.php index b520f09..898c2dd 100644 --- a/app/Http/Controllers/Admin/SliderController.php +++ b/app/Http/Controllers/Admin/SliderController.php @@ -70,7 +70,9 @@ class SliderController extends XController if (getSetting('watermark2')) { $i->watermark(public_path('upload/images/logo.png'), AlignPosition::BottomLeft, 5, 5, Unit::Percent, - 15, Unit::Percent, 15, Unit::Percent, Fit::Contain, 50); + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } $i->save(storage_path() . '/app/public/sliders/optimized-'. $slider->image); } diff --git a/app/Models/Gallery.php b/app/Models/Gallery.php index bfb23d3..b834394 100644 --- a/app/Models/Gallery.php +++ b/app/Models/Gallery.php @@ -38,8 +38,10 @@ class Gallery extends Model implements HasMedia ->format(getSetting('optimize')); if (getSetting('watermark')){ $mc->watermark(public_path('upload/images/logo.png'), - AlignPosition::BottomLeft,5,5,Unit::Percent, - 15,Unit::Percent,15,Unit::Percent,Fit::Contain,50); + AlignPosition::BottomLeft, 5, 5, Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } // ->withResponsiveImages(); diff --git a/app/Models/Image.php b/app/Models/Image.php index 9ea14be..354d346 100644 --- a/app/Models/Image.php +++ b/app/Models/Image.php @@ -41,8 +41,10 @@ class Image extends Model implements HasMedia if (getSetting('watermark')){ $mc->watermark(public_path('upload/images/logo.png'), - AlignPosition::BottomLeft,5,5,Unit::Percent, - 15,Unit::Percent,15,Unit::Percent,Fit::Contain,50); + AlignPosition::BottomLeft, 5, 5, Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } // ->watermark(public_path('images/logo.png'))->watermarkOpacity(50); // ->withResponsiveImages(); diff --git a/app/Models/Post.php b/app/Models/Post.php index a96bdf5..9b98207 100644 --- a/app/Models/Post.php +++ b/app/Models/Post.php @@ -54,8 +54,10 @@ class Post extends Model implements HasMedia if (getSetting('watermark')){ $mc->watermark(public_path('upload/images/logo.png'), - AlignPosition::BottomLeft,5,5,Unit::Percent, - 15,Unit::Percent,15,Unit::Percent,Fit::Contain,50); + AlignPosition::BottomLeft, 5, 5, Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } } diff --git a/app/Models/Product.php b/app/Models/Product.php index 829467e..f340833 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -75,12 +75,16 @@ class Product extends Model implements HasMedia if (getSetting('watermark')){ $mc->watermark(public_path('upload/images/logo.png'), - AlignPosition::BottomLeft,5,5,Unit::Percent, - 15,Unit::Percent,15,Unit::Percent,Fit::Contain,50); + AlignPosition::BottomLeft, 5, 5, Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); $mc2->watermark(public_path('upload/images/logo.png'), - AlignPosition::BottomLeft,5,5,Unit::Percent, - 15,Unit::Percent,15,Unit::Percent,Fit::Contain,50); + AlignPosition::BottomLeft, 5, 5, Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, + config('app.media.watermark_size'), Unit::Percent, Fit::Contain, + config('app.media.watermark_opacity')); } } diff --git a/config/app.php b/config/app.php index bb6ec38..5bc4f2b 100644 --- a/config/app.php +++ b/config/app.php @@ -149,6 +149,8 @@ return [ 'post_thumb' => env('MEDIA_POST_THUMB','500x500'), 'product_thumb' => env('MEDIA_PRODUCT_THUMB','500x500'), 'product_image' => env('MEDIA_PRODUCT_IMAGE','1200x1200'), + 'watermark_size' => env('MEDIA_WATERMARK_SIZE',15), + 'watermark_opacity' => env('MEDIA_WATERMARK_OPACITY',50), ],