From a05e4aa3200ae329c18126a794419547b3262932 Mon Sep 17 00:00:00 2001 From: JoaquinOlivero Date: Sun, 14 Jul 2024 18:01:50 +0000 Subject: [PATCH] style: formatting --- .../RequestModal/CollectionRequestModal.tsx | 112 ++++++++++-------- src/components/TitleCard/index.tsx | 37 +++--- 2 files changed, 80 insertions(+), 69 deletions(-) diff --git a/src/components/RequestModal/CollectionRequestModal.tsx b/src/components/RequestModal/CollectionRequestModal.tsx index b600c97cc..b646f7b1d 100644 --- a/src/components/RequestModal/CollectionRequestModal.tsx +++ b/src/components/RequestModal/CollectionRequestModal.tsx @@ -95,7 +95,7 @@ const CollectionRequestModal = ({ (part.mediaInfo[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE || part.mediaInfo[is4k ? 'status4k' : 'status'] === - MediaStatus.PROCESSING) && + MediaStatus.PROCESSING) && !requestedParts.includes(part.id) ) .map((part) => part.id); @@ -271,8 +271,8 @@ const CollectionRequestModal = ({ isUpdating ? intl.formatMessage(globalMessages.requesting) : selectedParts.length === 0 - ? intl.formatMessage(messages.selectmovies) - : intl.formatMessage( + ? intl.formatMessage(messages.selectmovies) + : intl.formatMessage( is4k ? messages.requestmovies4k : messages.requestmovies, { count: selectedParts.length, @@ -321,21 +321,24 @@ const CollectionRequestModal = ({ toggleAllParts(); } }} - className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${quota?.movie.limit && - (quota.movie.remaining ?? 0) < unrequestedParts.length + className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${ + quota?.movie.limit && + (quota.movie.remaining ?? 0) < unrequestedParts.length ? 'opacity-50' : '' - }`} + }`} > @@ -360,7 +363,7 @@ const CollectionRequestModal = ({ const partRequest = getPartRequest(part.id); const partMedia = part.mediaInfo && - part.mediaInfo[is4k ? 'status4k' : 'status'] !== + part.mediaInfo[is4k ? 'status4k' : 'status'] !== MediaStatus.UNKNOWN ? part.mediaInfo : undefined; @@ -368,9 +371,10 @@ const CollectionRequestModal = ({ return ( togglePart(part.id)} @@ -387,45 +391,49 @@ const CollectionRequestModal = ({ togglePart(part.id); } }} - className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${(!!partMedia && + className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${ + (!!partMedia && partMedia.status !== - MediaStatus.BLACKLISTED) || - partRequest || - (quota?.movie.limit && - currentlyRemaining <= 0 && - !isSelectedPart(part.id)) + MediaStatus.BLACKLISTED) || + partRequest || + (quota?.movie.limit && + currentlyRemaining <= 0 && + !isSelectedPart(part.id)) ? 'opacity-50' : '' - }`} + }`} >
{intl.formatMessage(globalMessages.pending)} )} {((!partMedia && partRequest?.status === - MediaRequestStatus.APPROVED) || + MediaRequestStatus.APPROVED) || partMedia?.[is4k ? 'status4k' : 'status'] === - MediaStatus.PROCESSING) && ( - - {intl.formatMessage(globalMessages.requested)} - - )} + MediaStatus.PROCESSING) && ( + + {intl.formatMessage(globalMessages.requested)} + + )} {partMedia?.[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE && ( - - {intl.formatMessage(globalMessages.available)} - - )} + + {intl.formatMessage(globalMessages.available)} + + )} {partMedia?.status === MediaStatus.BLACKLISTED && ( {intl.formatMessage(globalMessages.blacklisted)} @@ -501,14 +509,14 @@ const CollectionRequestModal = ({
{(hasPermission(Permission.REQUEST_ADVANCED) || hasPermission(Permission.MANAGE_REQUESTS)) && ( - { - setRequestOverrides(overrides); - }} - /> - )} + { + setRequestOverrides(overrides); + }} + /> + )} ); }; diff --git a/src/components/TitleCard/index.tsx b/src/components/TitleCard/index.tsx index 5c894fe61..3005af5fd 100644 --- a/src/components/TitleCard/index.tsx +++ b/src/components/TitleCard/index.tsx @@ -299,8 +299,8 @@ const TitleCard = ({ mediaType === 'movie' ? 'movie' : mediaType === 'collection' - ? 'collection' - : 'tv' + ? 'collection' + : 'tv' } onComplete={requestComplete} onUpdating={requestUpdating} @@ -313,8 +313,8 @@ const TitleCard = ({ mediaType === 'movie' ? 'movie' : mediaType === 'collection' - ? 'collection' - : 'tv' + ? 'collection' + : 'tv' } onCancel={closeBlacklistModal} onComplete={onClickHideItemBtn} @@ -322,10 +322,11 @@ const TitleCard = ({ /> )}
{mediaType === 'movie' ? intl.formatMessage(globalMessages.movie) : mediaType === 'collection' - ? intl.formatMessage(globalMessages.collection) - : intl.formatMessage(globalMessages.tvshow)} + ? intl.formatMessage(globalMessages.collection) + : intl.formatMessage(globalMessages.tvshow)}
{showDetail && currentStatus !== MediaStatus.BLACKLISTED && ( @@ -468,8 +470,8 @@ const TitleCard = ({ mediaType === 'movie' ? `/movie/${id}` : mediaType === 'collection' - ? `/collection/${id}` - : `/tv/${id}` + ? `/collection/${id}` + : `/tv/${id}` } className="absolute inset-0 h-full w-full cursor-pointer overflow-hidden text-left" style={{ @@ -479,11 +481,12 @@ const TitleCard = ({ >
{year &&
{year}
} @@ -505,8 +508,8 @@ const TitleCard = ({ style={{ WebkitLineClamp: !showRequestButton || - (currentStatus && - currentStatus !== MediaStatus.UNKNOWN) + (currentStatus && + currentStatus !== MediaStatus.UNKNOWN) ? 5 : 3, display: '-webkit-box',