From 1e9aad03f8d97bac21781919f40770bbf978bfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Pomyka=C5=82a?=
 <37307597+Akasiek@users.noreply.github.com>
Date: Sun, 31 Jul 2022 21:27:18 +0200
Subject: [PATCH] Fixed occasions when artist, band or album has no image

---
 frontend/views/album/_album_card.php             | 16 ++++++++--------
 frontend/views/album/_view_album_jumbotron.php   |  3 ++-
 frontend/views/components/_default_card.php      |  4 +++-
 frontend/views/components/_default_jumbotron.php |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/frontend/views/album/_album_card.php b/frontend/views/album/_album_card.php
index 7d95c12..691cf83 100644
--- a/frontend/views/album/_album_card.php
+++ b/frontend/views/album/_album_card.php
@@ -13,14 +13,14 @@
 }, $genres));
 
 
-
 ?>
 
 <div class="group">
 
     <a href="<?= Url::to(['/album/view', 'slug' => $model->slug,]) ?>" class="block
     relative shadow-lg group-hover:scale-95 transition-transform ease-in-out">
-        <img src="<?= $model->artwork_url ?>" alt="Album artwork" class=" ">
+        <img src="<?= $model->artwork_url ?: Yii::getAlias('@web/resources/images/no_image.jpg') ?>" alt="Album artwork"
+             class="aspect-square object-cover object-center">
         <?php if ($model->type !== "LP") : ?>
             <p class="absolute bottom-0 right-0 text-xs md:text-sm font-bold bg-secondary-accent pr-1 md:pr-2 pl-2 md:pl-3 py-1 rounded-tl-xl md:rounded-tl-2xl">
                 <?= $model->type ?>
@@ -31,18 +31,18 @@
     <div class="flex flex-col px-1 py-2 xl:p-2 truncate">
         <h3 class="font-bold text-sm lg:text-base xl:text-lg truncate">
             <a href="<?= Url::to([
-                            '/album/view',
-                            'slug' => $model->slug,
-                        ]) ?>" class="hover:underline transition underline-offset-2" title="<?= $model->title ?>">
+                '/album/view',
+                'slug' => $model->slug,
+            ]) ?>" class="hover:underline transition underline-offset-2" title="<?= $model->title ?>">
                 <?= $model->title ?>
             </a>
         </h3>
 
         <p class="text-sm truncate italic">
             <a href="<?= Url::to([
-                            '/' . ($model->artist_id ? 'artist' : 'band') . '/view/',
-                            'slug' => $model->artist->slug ?? $model->band->slug,
-                        ]) ?>" class="hover:underline transition" title="<?= $model->artist->name ?? $model->band->name ?>">
+                '/' . ($model->artist_id ? 'artist' : 'band') . '/view/',
+                'slug' => $model->artist->slug ?? $model->band->slug,
+            ]) ?>" class="hover:underline transition" title="<?= $model->artist->name ?? $model->band->name ?>">
                 <?= $model->artist->name ?? $model->band->name ?>
             </a>
         </p>
diff --git a/frontend/views/album/_view_album_jumbotron.php b/frontend/views/album/_view_album_jumbotron.php
index 4db9ab4..4c119fb 100644
--- a/frontend/views/album/_view_album_jumbotron.php
+++ b/frontend/views/album/_view_album_jumbotron.php
@@ -16,7 +16,8 @@
 
     <div class="flex flex-col md:flex-row justify-center items-center gap-5 xl:gap-10 max-w-screen-xl px-4 md:px-12 lg:px-16">
         <div class="relative group overflow-hidden">
-            <img src="<?= $model->artwork_url ?>" alt="Album artwork" class="w-64 md:w-72 lg:w-96">
+            <img src="<?= $model->artwork_url ?: Yii::getAlias('@web/resources/images/no_image.jpg') ?>"
+                 alt="Album artwork" class="w-64 md:w-72 lg:w-96 aspect-square object-cover object-center">
             <?php if (!Yii::$app->user->isGuest): ?>
                 <a href="<?= Url::to(['edit', 'slug' => $model->slug]) ?>"
                    class="absolute bottom-0 right-0 pl-6 pr-1 pt-6 pb-1 lg:pl-8 lg:pr-2 lg:pt-8 lg:pb-2
diff --git a/frontend/views/components/_default_card.php b/frontend/views/components/_default_card.php
index ec08023..6b5e2af 100644
--- a/frontend/views/components/_default_card.php
+++ b/frontend/views/components/_default_card.php
@@ -15,7 +15,9 @@
     <div class="rounded-3xl w-full h-40 md:h-48 !bg-cover flex flex-col justify-end items-start snap-start scroll-pl-3
                 group overflow-hidden !bg-center relative group bg-secondary-dark">
 
-        <img src="<?= $model->bg_image_url ?>" alt="" class="absolute h-full w-full object-center object-cover z-10
+        <img src="<?= $model->bg_image_url ?: Yii::getAlias('@web/resources/images/no_image.jpg') ?>"
+             alt="artist background image"
+             class="absolute h-full w-full object-center object-cover z-10
                     transition-all xl:group-hover:scale-110 opacity-95 xl:opacity-80 group-hover:opacity-100">
 
         <div class="absolute top-0 bottom-0 left-0 right-0 w-full z-20 group-hover:scale-125 transition-all" style="background: linear-gradient(180deg, rgba(94, 43, 255, 0),
diff --git a/frontend/views/components/_default_jumbotron.php b/frontend/views/components/_default_jumbotron.php
index 2eb552b..f82359c 100644
--- a/frontend/views/components/_default_jumbotron.php
+++ b/frontend/views/components/_default_jumbotron.php
@@ -20,7 +20,7 @@
              linear-gradient(180deg, rgba(94, 43, 255, 0) 30%,
              rgba(94, 43, 255, 0.85) 100%,
              rgba(94, 43, 255, 0.85) 100%),
-             url('<?php echo $model->bg_image_url ?>'); ">
+             url('<?php echo $model->bg_image_url ?: Yii::getAlias('@web/resources/images/no_image.jpg') ?>'); ">
     <div class="px-6 md:px-12 lg:px-14 pb-6 md:pb-8 lg:pb-10 w-full flex flex-col gap-2">