From 2594192ae737a36c4563f71438b5d3efeb2e5bac Mon Sep 17 00:00:00 2001 From: AudricV <74829229+AudricV@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:26:14 +0100 Subject: [PATCH 1/3] fix(search): Add alternative text to images and lazy load them The alternative text used is "SONG by ARTISTS", where SONG and ARTISTS are placeholders for their relevant properties. Lazy loading attribute must be placed currently as the first one of img elements for Firefox, see https://bugzilla.mozilla.org/show_bug.cgi?id=1647077. --- templates/search/search.html.twig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/search/search.html.twig b/templates/search/search.html.twig index dfe8818..b608fa4 100644 --- a/templates/search/search.html.twig +++ b/templates/search/search.html.twig @@ -12,14 +12,16 @@

results for {{ query }}! ✅

{% for result in results %} {% set array = result['title']|split('-') %} + {% set artist = array[0] %} + {% set song = array[1] %}
- artist : {{array[0]}} + artist : {{artist}}
- song : {{array[1]}} + song : {{song}}
- + {{song ~ ' by ' ~ artist}}
{% endfor %} previous page From 534786954e42c21b81487c9483bd733eb105816a Mon Sep 17 00:00:00 2001 From: AudricV <74829229+AudricV@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:34:59 +0100 Subject: [PATCH 2/3] fix(search): Change artist and song HTML elements from div to p --- templates/search/search.html.twig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/search/search.html.twig b/templates/search/search.html.twig index b608fa4..789e330 100644 --- a/templates/search/search.html.twig +++ b/templates/search/search.html.twig @@ -15,12 +15,8 @@ {% set artist = array[0] %} {% set song = array[1] %}
-
- artist : {{artist}} -
-
- song : {{song}} -
+

artist : {{artist}}

+

song : {{song}}

{{song ~ ' by ' ~ artist}}
{% endfor %} From f155fac4fdb6d5dd3c97608139790a4324a3ba69 Mon Sep 17 00:00:00 2001 From: Djalim Simaila Date: Thu, 22 Feb 2024 08:35:51 +0000 Subject: [PATCH 3/3] fruits exists now --- src/Controller/SearchController.php | 43 ++++++++++++++++++++++++++++- templates/base.html.twig | 17 ++++++++++++ templates/search/search.html.twig | 6 ++-- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index e095e06..b70350d 100644 --- a/src/Controller/SearchController.php +++ b/src/Controller/SearchController.php @@ -11,6 +11,43 @@ use GuzzleHttp\Client; class SearchController extends AbstractController { + private static function getEmojiName(string $emoji) : string { + switch ($emoji){ + case "🍎": + return "apple"; + case "🍐": + return "pear"; + case "🍊": + return "orange"; + case "🍋": + return "lemon"; + case "🍌": + return "banana"; + case "🍉": + return "watermelon"; + case "🍇": + return "grape"; + case "🍓": + return "strawberry"; + case "🫐": + return "blueberry"; + case "🍈": + return "melon"; + case "🍒": + return "cherry"; + case "🍑": + return "peach"; + case "🍍": + return "pineapple"; + case "🥝": + return "kiwi"; + case "🥥": + return "coconut"; + } + } + + + private static function makeRequest(string $method, string $endpoint, array $querryParams) { @@ -48,8 +85,10 @@ class SearchController extends AbstractController public function index(Request $request): Response { $page = $request->query->get('page'); + $fruit = $request->query->get('fruit'); + $fruit_querry = $request->query->get('q') . " " . SearchController::getEmojiName($fruit); $result = SearchController::makeRequest("GET", "search", [ - "q" => $request->query->get('q'), + "q" => $fruit_querry, "type" => "release", "page" => strval($page), "per_page" => "15", @@ -58,6 +97,8 @@ class SearchController extends AbstractController return $this->render('search/search.html.twig', [ 'controller_name' => 'SearchController', 'query' => $request->query->get('q'), + 'fruit_emoji' => $request->query->get('fruit'), + 'fruit_name' => SearchController::getEmojiName($fruit), 'page' => $request->query->get('page'), "next_page" => $page < $result["pagination"]["pages"] ? strval($page + 1) : strval($page), "previous_page" => $page > 1 ? strval($page - 1) : strval($page), diff --git a/templates/base.html.twig b/templates/base.html.twig index bf722a5..e1a3786 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -19,6 +19,23 @@ Frutti
+