From 1a7dc1acf57888d3d0285b58c1c97a824a232216 Mon Sep 17 00:00:00 2001 From: Brandon Cohen Date: Mon, 8 Mar 2021 11:00:51 -0500 Subject: [PATCH] fix(frontend): status, requested by, and modified alignment fix (#1109) --- src/components/RequestCard/index.tsx | 48 +++++++++---------- .../RequestList/RequestItem/index.tsx | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx index 5f537cdd5..7edaa5934 100644 --- a/src/components/RequestCard/index.tsx +++ b/src/components/RequestCard/index.tsx @@ -129,8 +129,30 @@ const RequestCard: React.FC = ({ request, onTitleData }) => { -
- + {request.seasons.length > 0 && ( +
+ + {intl.formatMessage(messages.seasons)} + + {!isMovie(title) && + title.seasons.filter((season) => season.seasonNumber !== 0) + .length === request.seasons.length ? ( + + {intl.formatMessage(messages.all)} + + ) : ( +
+ {request.seasons.map((season) => ( + + {season.seasonNumber} + + ))} +
+ )} +
+ )} +
+ {intl.formatMessage(messages.status)} {requestData.media[requestData.is4k ? 'status4k' : 'status'] === @@ -157,28 +179,6 @@ const RequestCard: React.FC = ({ request, onTitleData }) => { /> )}
- {request.seasons.length > 0 && ( -
- - {intl.formatMessage(messages.seasons)} - - {!isMovie(title) && - title.seasons.filter((season) => season.seasonNumber !== 0) - .length === request.seasons.length ? ( - - {intl.formatMessage(messages.all)} - - ) : ( -
- {request.seasons.map((season) => ( - - {season.seasonNumber} - - ))} -
- )} -
- )} {requestData.status === MediaRequestStatus.PENDING && hasPermission(Permission.MANAGE_REQUESTS) && (
diff --git a/src/components/RequestList/RequestItem/index.tsx b/src/components/RequestList/RequestItem/index.tsx index fb2b888d6..442a44322 100644 --- a/src/components/RequestList/RequestItem/index.tsx +++ b/src/components/RequestList/RequestItem/index.tsx @@ -214,7 +214,7 @@ const RequestItem: React.FC = ({ )}
-
+
{intl.formatMessage(messages.status)}