From d47e70870a93128866276c6dcf26c531df7ede51 Mon Sep 17 00:00:00 2001
From: Anatole Sot <47571181+ano0002@users.noreply.github.com>
Date: Fri, 16 Feb 2024 01:19:58 +0100
Subject: [PATCH] fix: Some Media where displaying incorectly

---
 .../Discover/DiscoverMusics/index.tsx         |  7 +--
 .../Discover/FilterSlideover/index.tsx        | 47 +++++++++++--------
 src/components/Layout/SearchInput/index.tsx   |  2 +-
 src/components/TitleCard/index.tsx            |  9 +++-
 src/i18n/globalMessages.ts                    |  2 +
 src/i18n/locale/en.json                       |  2 +-
 6 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/components/Discover/DiscoverMusics/index.tsx b/src/components/Discover/DiscoverMusics/index.tsx
index 8e3329b6d..9e89bc896 100644
--- a/src/components/Discover/DiscoverMusics/index.tsx
+++ b/src/components/Discover/DiscoverMusics/index.tsx
@@ -10,7 +10,7 @@ import {
 import FilterSlideover from '@app/components/Discover/FilterSlideover';
 import useDiscover from '@app/hooks/useDiscover';
 import Error from '@app/pages/_error';
-import { BarsArrowDownIcon, FunnelIcon } from '@heroicons/react/24/solid';
+import { FunnelIcon } from '@heroicons/react/24/solid';
 import type { MusicResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
@@ -55,11 +55,6 @@ const DiscoverMusics = () => {
       <div className="mb-4 flex flex-col justify-between lg:flex-row lg:items-end">
         <Header>{title}</Header>
         <div className="mt-2 flex flex-grow flex-col sm:flex-row lg:flex-grow-0">
-          <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 lg:flex-grow-0">
-            <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
-              <BarsArrowDownIcon className="h-6 w-6" />
-            </span>
-          </div>
           <FilterSlideover
             type="music"
             currentFilters={preparedFilters}
diff --git a/src/components/Discover/FilterSlideover/index.tsx b/src/components/Discover/FilterSlideover/index.tsx
index 87c9c11ed..5ab032f21 100644
--- a/src/components/Discover/FilterSlideover/index.tsx
+++ b/src/components/Discover/FilterSlideover/index.tsx
@@ -74,12 +74,13 @@ const FilterSlideover = ({
       onClose={() => onClose()}
     >
       <div className="flex flex-col space-y-4">
-        <div>
-          <div className="mb-2 text-lg font-semibold">
-            {intl.formatMessage(
-              type === 'movie' ? messages.releaseDate : messages.firstAirDate
-            )}
-          </div>
+        { type !== 'music' &&
+        (<div>
+            <div className="mb-2 text-lg font-semibold">
+              {intl.formatMessage(
+                type === 'movie' ? messages.releaseDate : messages.firstAirDate
+              )}
+            </div>
           <div className="relative z-40 flex space-x-2">
             <div className="flex flex-col">
               <div className="mb-2">{intl.formatMessage(messages.from)}</div>
@@ -124,7 +125,8 @@ const FilterSlideover = ({
               />
             </div>
           </div>
-        </div>
+        </div>)
+          }
         {type === 'movie' && (
           <>
             <span className="text-lg font-semibold">
@@ -138,17 +140,20 @@ const FilterSlideover = ({
             />
           </>
         )}
-        <span className="text-lg font-semibold">
-          {intl.formatMessage(messages.genres)}
-        </span>
-        <GenreSelector
-          type={type}
-          defaultValue={currentFilters.genre}
-          isMulti
-          onChange={(value) => {
-            updateQueryParams('genre', value?.map((v) => v.value).join(','));
-          }}
-        />
+        { type !== 'music' && (
+        <>
+          <span className="text-lg font-semibold">
+            {intl.formatMessage(messages.genres)}
+          </span>
+          <GenreSelector
+            type={type}
+            defaultValue={currentFilters.genre}
+            isMulti
+            onChange={(value) => {
+              updateQueryParams('genre', value?.map((v) => v.value).join(','));
+            }}
+          />
+        </>)}
         <span className="text-lg font-semibold">
           {intl.formatMessage(messages.keywords)}
         </span>
@@ -156,9 +161,11 @@ const FilterSlideover = ({
           defaultValue={currentFilters.keywords}
           isMulti
           onChange={(value) => {
-            updateQueryParams('keywords', value?.map((v) => v.value).join(','));
+            updateQueryParams('keywords', type === 'music' ? value?.map((v) => v.label).join(' ') : value?.map((v) => v.value).join(','));
           }}
         />
+        { type !== 'music' && (
+        <>
         <span className="text-lg font-semibold">
           {intl.formatMessage(messages.originalLanguage)}
         </span>
@@ -313,6 +320,8 @@ const FilterSlideover = ({
               }}
             />)
           : null}
+        </>)
+        }
         <div className="pt-4">
           <Button
             className="w-full"
diff --git a/src/components/Layout/SearchInput/index.tsx b/src/components/Layout/SearchInput/index.tsx
index 5c2dc1679..e4575cda7 100644
--- a/src/components/Layout/SearchInput/index.tsx
+++ b/src/components/Layout/SearchInput/index.tsx
@@ -4,7 +4,7 @@ import { MagnifyingGlassIcon } from '@heroicons/react/24/solid';
 import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
-  searchPlaceholder: 'Search Movies & TV',
+  searchPlaceholder: 'Search Musics, Movies & TV',
 });
 
 const SearchInput = () => {
diff --git a/src/components/TitleCard/index.tsx b/src/components/TitleCard/index.tsx
index fa66acb7c..20db190ed 100644
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -135,7 +135,9 @@ const TitleCard = ({
               className={`pointer-events-none z-40 rounded-full border bg-opacity-80 shadow-md ${
                 mediaType === 'movie' || mediaType === 'collection'
                   ? 'border-blue-500 bg-blue-600'
-                  : 'border-purple-600 bg-purple-600'
+                  : mediaType === 'tv'
+                  ? 'border-purple-600 bg-purple-600'
+                  : 'border-green-600 bg-green-600'
               }`}
             >
               <div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
@@ -143,7 +145,10 @@ const TitleCard = ({
                   ? intl.formatMessage(globalMessages.movie)
                   : mediaType === 'collection'
                   ? intl.formatMessage(globalMessages.collection)
-                  : intl.formatMessage(globalMessages.tvshow)}
+                  : mediaType === 'tv'
+                  ? intl.formatMessage(globalMessages.tvshow)
+                  : intl.formatMessage(globalMessages.music)
+                  }
               </div>
             </div>
             {currentStatus && currentStatus !== MediaStatus.UNKNOWN && (
diff --git a/src/i18n/globalMessages.ts b/src/i18n/globalMessages.ts
index ca66a891f..4c4e2e094 100644
--- a/src/i18n/globalMessages.ts
+++ b/src/i18n/globalMessages.ts
@@ -19,6 +19,8 @@ const globalMessages = defineMessages({
   collection: 'Collection',
   tvshow: 'Series',
   tvshows: 'Series',
+  music: 'Music',
+  musics: 'Musics',
   cancel: 'Cancel',
   canceling: 'Canceling…',
   approve: 'Approve',
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
index 10165c9e1..dc94a1fbb 100644
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -198,7 +198,7 @@
   "components.LanguageSelector.languageServerDefault": "Default ({language})",
   "components.LanguageSelector.originalLanguageDefault": "All Languages",
   "components.Layout.LanguagePicker.displaylanguage": "Display Language",
-  "components.Layout.SearchInput.searchPlaceholder": "Search Movies & TV",
+  "components.Layout.SearchInput.searchPlaceholder": "Search Musics, Movies & TV",
   "components.Layout.Sidebar.browsemovies": "Movies",
   "components.Layout.Sidebar.browsetv": "Series",
   "components.Layout.Sidebar.dashboard": "Discover",