From 99a83e86d7a9d50c07c2f117a6b0d68abc3b346f Mon Sep 17 00:00:00 2001 From: Jenny Porada Date: Wed, 31 Jan 2024 14:17:00 -0500 Subject: [PATCH] Using filename url temporarily --- factories/HeroImage.php | 2 ++ factories/HeroImageRotate.php | 2 ++ factories/Icon.php | 1 + .../views/components/hero/banner-large.blade.php | 4 ++-- .../views/components/hero/banner-small.blade.php | 4 ++-- resources/views/components/hero/half.blade.php | 4 ++-- .../views/components/hero/logo-overlay.blade.php | 6 +++--- .../views/components/hero/svg-overlay.blade.php | 6 +++--- .../views/components/hero/text-overlay.blade.php | 4 ++-- resources/views/components/icons-column.blade.php | 2 +- resources/views/components/icons-row.blade.php | 2 +- resources/views/components/icons-top-row.blade.php | 2 +- .../views/components/promo/grid-item.blade.php | 12 ++++++------ .../views/components/promo/list-item.blade.php | 14 +++++++------- 14 files changed, 35 insertions(+), 30 deletions(-) diff --git a/factories/HeroImage.php b/factories/HeroImage.php index 988de866..d698f75b 100644 --- a/factories/HeroImage.php +++ b/factories/HeroImage.php @@ -26,7 +26,9 @@ public function create($limit = 1, $flatten = false, $options = []) 'description' => '

' . $this->faker->text(100) . ' '. $this->faker->sentence(3) .'

', 'link' => 'https://wayne.edu', 'relative_url' => '/styleguide/image/1600x580?text=1600x580%20('.$i.')', + 'filename_url' => '/styleguide/image/1600x580?text=1600x580%20('.$i.')', 'filename_alt_text' => 'Example background image', + 'secondary_filename_url' => '/styleguide/image/1600x580?text=Secondary%201600x580%20('.$i.')', 'secondary_relative_url' => '/styleguide/image/1600x580?text=Secondary%201600x580%20('.$i.')', 'secondary_alt_text' => 'Example secondary image', ]; diff --git a/factories/HeroImageRotate.php b/factories/HeroImageRotate.php index 1cc84d2a..be8256e6 100644 --- a/factories/HeroImageRotate.php +++ b/factories/HeroImageRotate.php @@ -26,7 +26,9 @@ public function create($limit = 1, $flatten = false, $options = []) 'description' => '

' . $this->faker->text(100) . ' '. $this->faker->sentence(3) .'

', 'link' => 'https://wayne.edu', 'relative_url' => '/styleguide/image/1600x580?text=Primary%20image%20('.$i.')', + 'filename_url' => '/styleguide/image/1600x580?text=Primary%20image%20('.$i.')', 'filename_alt_text' => 'Example background image', + 'secondary_filename_url' => '/styleguide/image/400x250?text=Secondary%20image%20('.$i.')', 'secondary_relative_url' => '/styleguide/image/400x250?text=Secondary%20image%20('.$i.')', 'secondary_alt_text' => 'Example secondary image', 'option' => $this->faker->randomElement(['Text Overlay', 'Half', 'Logo Overlay', 'Banner large']), diff --git a/factories/Icon.php b/factories/Icon.php index 090dfbe2..b57a54c5 100644 --- a/factories/Icon.php +++ b/factories/Icon.php @@ -31,6 +31,7 @@ public function create($limit = 1, $flatten = false, $options = []) 'description' => '

'.ucfirst(implode(' ', $this->faker->words(10))).' '.implode(' ', $this->faker->words(2)).'.

', //'description' => '

' . $this->faker->text(20) . ' '. $this->faker->sentence(3) .'

', 'promo_item_id' => $i, + 'filename_url' => $icon_green, 'relative_url' => $icon_green, 'filename_alt_text' => 'Placeholder icon '.$i, 'option' => '', diff --git a/resources/views/components/hero/banner-large.blade.php b/resources/views/components/hero/banner-large.blade.php index 5bf3d9f1..b213b7e1 100644 --- a/resources/views/components/hero/banner-large.blade.php +++ b/resources/views/components/hero/banner-large.blade.php @@ -1,6 +1,6 @@ {{-- - $hero => array // ['relative_url', 'title'] + $hero => array // ['filename_url', 'title'] --}}
-
first === true) style="background-image: url('{{ $hero['relative_url'] }}')" @else data-src="{{ $hero['relative_url'] }}"@endif>
+
first === true) style="background-image: url('{{ $hero['filename_url'] }}')" @else data-src="{{ $hero['filename_url'] }}"@endif>
diff --git a/resources/views/components/hero/banner-small.blade.php b/resources/views/components/hero/banner-small.blade.php index 774cc229..eab4ae6b 100644 --- a/resources/views/components/hero/banner-small.blade.php +++ b/resources/views/components/hero/banner-small.blade.php @@ -1,7 +1,7 @@ {{-- - $hero => array // ['relative_url', 'title'] + $hero => array // ['filename_url', 'title'] --}}
-
+
diff --git a/resources/views/components/hero/half.blade.php b/resources/views/components/hero/half.blade.php index e39083b6..aa7863a0 100644 --- a/resources/views/components/hero/half.blade.php +++ b/resources/views/components/hero/half.blade.php @@ -1,10 +1,10 @@ {{-- - $hero => array // ['relative_url', 'title', 'description', 'link'] + $hero => array // ['filename_url', 'title', 'description', 'link'] --}}
-
first === true) style="background-image: url('{{ $hero['relative_url'] }}')" @else data-src="{{ $hero['relative_url'] }}"@endif> +
first === true) style="background-image: url('{{ $hero['filename_url'] }}')" @else data-src="{{ $hero['filename_url'] }}"@endif>
diff --git a/resources/views/components/hero/logo-overlay.blade.php b/resources/views/components/hero/logo-overlay.blade.php index 1385511b..2ff4df1e 100644 --- a/resources/views/components/hero/logo-overlay.blade.php +++ b/resources/views/components/hero/logo-overlay.blade.php @@ -1,13 +1,13 @@ {{-- - $hero => array // ['relative_url', 'title', 'description', 'link', 'secondary_relative_url'] + $hero => array // ['filename_url', 'title', 'description', 'link', 'secondary_filename_url'] --}}
-
first === true) style="background-image: url('{{ $hero['relative_url'] }}')" @else data-src="{{ $hero['relative_url'] }}"@endif>
+
first === true) style="background-image: url('{{ $hero['filename_url'] }}')" @else data-src="{{ $hero['filename_url'] }}"@endif>
- @if(!empty($hero['secondary_relative_url'])){{ $hero['secondary_alt_text'] }}@endif + @if(!empty($hero['secondary_filename_url'])){{ $hero['secondary_alt_text'] }}@endif
{{ $hero['title'] }}
diff --git a/resources/views/components/hero/svg-overlay.blade.php b/resources/views/components/hero/svg-overlay.blade.php index 50496a44..41e87042 100644 --- a/resources/views/components/hero/svg-overlay.blade.php +++ b/resources/views/components/hero/svg-overlay.blade.php @@ -1,12 +1,12 @@ {{-- - $hero => array // ['relative_url', 'title', 'link', 'secondary_relative_url'] + $hero => array // ['filename_url', 'title', 'link', 'secondary_filename_url'] --}}
@if(!empty($hero['link']))@endif -
first === true) style="background-image: url('{{ $hero['relative_url'] }}')" @else data-src="{{ $hero['relative_url'] }}"@endif>
+
first === true) style="background-image: url('{{ $hero['filename_url'] }}')" @else data-src="{{ $hero['filename_url'] }}"@endif>
- {{ $hero['secondary_alt_text'] }} + {{ $hero['secondary_alt_text'] }}
@if(!empty($hero['link']))@endif
diff --git a/resources/views/components/hero/text-overlay.blade.php b/resources/views/components/hero/text-overlay.blade.php index c1c525be..efc5ab85 100644 --- a/resources/views/components/hero/text-overlay.blade.php +++ b/resources/views/components/hero/text-overlay.blade.php @@ -1,9 +1,9 @@ {{-- - $hero => array // ['relative_url', 'title', 'description'] + $hero => array // ['filename_url', 'title', 'description'] --}}
-
first === true) style="background-image: url('{{ $hero['relative_url'] }}')" @else data-src="{{ $hero['relative_url'] }}"@endif>
+
first === true) style="background-image: url('{{ $hero['filename_url'] }}')" @else data-src="{{ $hero['filename_url'] }}"@endif>
diff --git a/resources/views/components/icons-column.blade.php b/resources/views/components/icons-column.blade.php index 467abe30..e3977bcf 100644 --- a/resources/views/components/icons-column.blade.php +++ b/resources/views/components/icons-column.blade.php @@ -5,7 +5,7 @@ @foreach($data as $item)
  • <{{ !empty($item['link']) ? 'a href='.$item['link'] : 'div' }} class="flex items-start gap-x-4 {{ !empty($item['link']) ? 'group' : '' }}"> - @image($item['relative_url'], $item['filename_alt_text'], 'grow-0 shrink-0 w-16') + @image($item['filename_url'], $item['filename_alt_text'], 'grow-0 shrink-0 w-16')
    {{ $item['title'] }}
    @if(!empty($item['excerpt']))
    {{ $item['excerpt'] }}
    @endif diff --git a/resources/views/components/icons-row.blade.php b/resources/views/components/icons-row.blade.php index 26436648..291a6f6a 100644 --- a/resources/views/components/icons-row.blade.php +++ b/resources/views/components/icons-row.blade.php @@ -5,7 +5,7 @@ @foreach($data as $item)
  • <{{ !empty($item['link']) ? 'a href='.$item['link'] : 'div' }} class="flex items-start gap-x-4 {{ !empty($item['link']) ? 'group' : '' }}"> - @image($item['relative_url'], $item['filename_alt_text'], 'grow-0 shrink-0 w-16 '.(!empty($component['columns']) && $component['columns'] >= 3 ? ' xl:w-16' : ' xl:w-20')) + @image($item['filename_url'], $item['filename_alt_text'], 'grow-0 shrink-0 w-16 '.(!empty($component['columns']) && $component['columns'] >= 3 ? ' xl:w-16' : ' xl:w-20'))
    {{ $item['title'] }}
    @if(!empty($item['excerpt']))
    {{ $item['excerpt'] }}
    @endif diff --git a/resources/views/components/icons-top-row.blade.php b/resources/views/components/icons-top-row.blade.php index dce1c20f..fca30936 100644 --- a/resources/views/components/icons-top-row.blade.php +++ b/resources/views/components/icons-top-row.blade.php @@ -5,7 +5,7 @@ @foreach($data as $item)
  • <{{ !empty($item['link']) ? 'a href='.$item['link'] : 'div' }} class="text-center {{ !empty($item['link']) ? ' group' : '' }}"> - @image($item['relative_url'], $item['filename_alt_text'], 'block mx-auto grow-0 shrink-0 mb-2 w-16'.(!empty($component['columns']) && $component['columns'] >= 5 ? ' xl:w-16' : ' xl:w-20')) + @image($item['filename_url'], $item['filename_alt_text'], 'block mx-auto grow-0 shrink-0 mb-2 w-16'.(!empty($component['columns']) && $component['columns'] >= 5 ? ' xl:w-16' : ' xl:w-20'))
    {{ $item['title'] }}
    @if(!empty($item['excerpt']))
    {{ $item['excerpt'] }}
    @endif diff --git a/resources/views/components/promo/grid-item.blade.php b/resources/views/components/promo/grid-item.blade.php index 0a34676e..231a147b 100644 --- a/resources/views/components/promo/grid-item.blade.php +++ b/resources/views/components/promo/grid-item.blade.php @@ -1,26 +1,26 @@ {{-- This component's image is 1/4 width on small views - $item => array // ['title', 'link', 'description', 'excerpt', 'relative_url', 'option'] + $item => array // ['title', 'link', 'description', 'excerpt', 'filename_url', 'option'] --}} <{{ !empty($item['link']) ? 'a href='.$item['link'] : 'div' }} class="block {{ !empty($component['gradientOverlay']) && $component['gradientOverlay'] === true ? 'bg-green-800 relative overflow-hidden' : '' }} {{ !empty($item['link']) ? 'group' : '' }} {{ $loop->last != true && !empty($component['filename']) && $component['filename'] != 'catalog' ? 'mt-6 mb-8' : '' }}">
    @if(!empty($item['youtube_id']))
    - @if(!empty($item['relative_url'])) - @image($item['relative_url'], $item['filename_alt_text'], "lazy block w-full") + @if(!empty($item['filename_url'])) + @image($item['filename_url'], $item['filename_alt_text'], "lazy block w-full") @else @image('//i.wayne.edu/youtube/'.$item['youtube_id'].'/max', $item['title'], "lazy block w-full") @endif
    - @elseif(!empty($item['relative_url'])) - @image($item['relative_url'], $item['filename_alt_text'], "lazy block w-full") + @elseif(!empty($item['filename_url'])) + @image($item['filename_url'], $item['filename_alt_text'], "lazy block w-full") @endif
    - @if(!empty($item['youtube_id']) || !empty($item['relative_url'])) + @if(!empty($item['youtube_id']) || !empty($item['filename_url']))
    {{ $item['title'] }}
    diff --git a/resources/views/components/promo/list-item.blade.php b/resources/views/components/promo/list-item.blade.php index 09141d3a..06586767 100644 --- a/resources/views/components/promo/list-item.blade.php +++ b/resources/views/components/promo/list-item.blade.php @@ -1,28 +1,28 @@ {{-- This component's image is full width on small views - $item => array // ['title', 'link', 'description', 'excerpt', 'relative_url', 'option'] + $item => array // ['title', 'link', 'description', 'excerpt', 'filename_url', 'option'] --}} <{{ !empty($item['link']) ? 'a href='.$item['link'] : 'div' }} class="block {{ !empty($component['imageSize']) && $component['imageSize'] === 'small' ? 'flex items-start' : 'md:flex xl:items-center' }} gap-x-3 lg:gap-x-6 {{ !empty($item['link']) ? 'group' : '' }} {{ $loop->iteration > 1 && !empty($component['filename']) && $component['filename'] != 'catalog' ? 'mt-6' : '' }}"> - @if(!empty($item['youtube_id']) || !empty($item['relative_url'])) + @if(!empty($item['youtube_id']) || !empty($item['filename_url']))
    @if(!empty($item['youtube_id']))
    - @if(!empty($item['relative_url'])) - @image($item['relative_url'], $item['filename_alt_text'], "w-full lazy") + @if(!empty($item['filename_url'])) + @image($item['filename_url'], $item['filename_alt_text'], "w-full lazy") @else @image('//i.wayne.edu/youtube/'.$item['youtube_id'].'/max', $item['title'], "w-full lazy") @endif
    - @elseif(!empty($item['relative_url'])) - @image($item['relative_url'], $item['filename_alt_text'], "lazy w-full") + @elseif(!empty($item['filename_url'])) + @image($item['filename_url'], $item['filename_alt_text'], "lazy w-full") @endif
    @endif
    - @if(!empty($item['youtube_id']) || !empty($item['relative_url'])) + @if(!empty($item['youtube_id']) || !empty($item['filename_url']))
    {{ $item['title'] }}
    @elseif (!empty($component['heading']))

    {{ $item['title'] }}