From ef57aa32b3c69b165333f418222d5373b2934beb Mon Sep 17 00:00:00 2001 From: Zach Garwood Date: Tue, 25 Feb 2025 15:51:09 -0600 Subject: [PATCH] Moved method into helper [WEB-2962] --- app/Helpers/ImageHelpers.php | 11 +++++++++++ app/Models/Vendor/Block.php | 12 ------------ resources/views/site/blocks/gallery_new.blade.php | 2 +- resources/views/site/blocks/image.blade.php | 2 +- resources/views/site/blocks/image_slider.blade.php | 4 ++-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/Helpers/ImageHelpers.php b/app/Helpers/ImageHelpers.php index b6a8173667..6f273803ac 100644 --- a/app/Helpers/ImageHelpers.php +++ b/app/Helpers/ImageHelpers.php @@ -680,6 +680,7 @@ public static function aic_getIconClass($key = 0) return Str::kebab($icons[$key]); } + public static function getSocialIcon($url) { $host = parse_url($url, PHP_URL_HOST); @@ -688,4 +689,14 @@ public static function getSocialIcon($url) // The second-to-last domain item is the host domain return $domains[count($domains) - 2] ?? null; } + + /** + * @link https://github.com/openseadragon/openseadragon/pull/1285/files + */ + public static function getImgixTileSource($model, $role, $crop = 'default') + { + if ($media = $model->imageObject($role, $crop)) { + return 'https://' . config('twill.imgix_source_host') . '/' . $media->uuid . '?fm=json&osd=imgix'; + } + } } diff --git a/app/Models/Vendor/Block.php b/app/Models/Vendor/Block.php index 63790e2592..93585bd8aa 100644 --- a/app/Models/Vendor/Block.php +++ b/app/Models/Vendor/Block.php @@ -43,16 +43,4 @@ public function getAssetLibraryAttribute() return null; } - - /** - * @link https://github.com/openseadragon/openseadragon/pull/1285/files - */ - public function getImgixTileSource($role, $crop = 'default') - { - $media = $this->findMedia($role, $crop); - - if ($media) { - return 'https://' . config('twill.imgix_source_host') . '/' . $media->uuid . '?fm=json&osd=imgix'; - } - } } diff --git a/resources/views/site/blocks/gallery_new.blade.php b/resources/views/site/blocks/gallery_new.blade.php index 92eb03f54b..fd7299c24d 100644 --- a/resources/views/site/blocks/gallery_new.blade.php +++ b/resources/views/site/blocks/gallery_new.blade.php @@ -99,7 +99,7 @@ if (($block->input('is_gallery_zoomable') ?? false) || $item->input('is_zoomable')) { if (isset($mediaItem['media'])) { - $mediaItem['media']['iiifId'] = $item->getImgixTileSource('image', 'desktop'); + $mediaItem['media']['iiifId'] = \App\Helpers\ImageHelpers::getImgixTileSource($item, 'image', 'desktop'); } } diff --git a/resources/views/site/blocks/image.blade.php b/resources/views/site/blocks/image.blade.php index f9b42d6a79..5491a30747 100644 --- a/resources/views/site/blocks/image.blade.php +++ b/resources/views/site/blocks/image.blade.php @@ -34,7 +34,7 @@ 'restrict' => $image['restict'] ?? false, 'fullscreen' => $isZoomable, 'iiifId' => $isZoomable - ? $block->getImgixTileSource('image', 'desktop') + ? \App\Helpers\ImageHelpers::getImgixTileSource($block, 'image', 'desktop') : null, ], 'showUrl' => !empty($block->input('image_link')), diff --git a/resources/views/site/blocks/image_slider.blade.php b/resources/views/site/blocks/image_slider.blade.php index 88f8f49b12..1d59a8e325 100644 --- a/resources/views/site/blocks/image_slider.blade.php +++ b/resources/views/site/blocks/image_slider.blade.php @@ -1,6 +1,6 @@ @php - $leftImage = $block->getImgixTileSource('left_image'); - $rightImage = $block->getImgixTileSource('right_image'); + $leftImage = \App\Helpers\ImageHelpers::getImgixTileSource($block, 'left_image'); + $rightImage = \App\Helpers\ImageHelpers::getImgixTileSource($block, 'right_image'); $referenceImage = $block->imageAsArray('left_image', 'default'); @endphp