feat: add genre/studio/network view to Discover results (#1067)

* feat: add genres view to movie/series Discover results

* feat: add studio/network view to movie/series Discover results

* fix: remove with_release_type filter, since it is removing valid/desired results
This commit is contained in:
TheCatLady
2021-03-03 23:22:35 -05:00
committed by GitHub
parent 436523139e
commit f28112f057
18 changed files with 438 additions and 81 deletions

View File

@@ -1,16 +1,23 @@
import React, { useContext } from 'react';
import { useSWRInfinite } from 'swr';
import useSWR, { useSWRInfinite } from 'swr';
import type { TvResult } from '../../../server/models/Search';
import ListView from '../Common/ListView';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { defineMessages, useIntl } from 'react-intl';
import { LanguageContext } from '../../context/LanguageContext';
import Header from '../Common/Header';
import useSettings from '../../hooks/useSettings';
import { MediaStatus } from '../../../server/constants/media';
import PageTitle from '../Common/PageTitle';
import { useRouter } from 'next/router';
import {
TmdbGenre,
TmdbNetwork,
} from '../../../server/api/themoviedb/interfaces';
const messages = defineMessages({
discovertv: 'Popular Series',
genreSeries: '{genre} Series',
networkSeries: '{network} Series',
});
interface SearchResult {
@@ -21,16 +28,27 @@ interface SearchResult {
}
const DiscoverTv: React.FC = () => {
const router = useRouter();
const intl = useIntl();
const settings = useSettings();
const { locale } = useContext(LanguageContext);
const { data: genres } = useSWR<TmdbGenre[]>('/api/v1/genres/tv');
const genre = genres?.find((g) => g.id === Number(router.query.genreId));
const { data: network } = useSWR<TmdbNetwork>(
`/api/v1/network/${router.query.networkId}`
);
const { data, error, size, setSize } = useSWRInfinite<SearchResult>(
(pageIndex: number, previousPageData: SearchResult | null) => {
if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
return null;
}
return `/api/v1/discover/tv?page=${pageIndex + 1}&language=${locale}`;
return `/api/v1/discover/tv?page=${pageIndex + 1}&language=${locale}${
genre ? `&genre=${genre.id}` : ''
}${network ? `&network=${network.id}` : ''}`;
},
{
initialSize: 3,
@@ -67,13 +85,17 @@ const DiscoverTv: React.FC = () => {
const isReachingEnd =
isEmpty || (data && data[data.length - 1]?.results.length < 20);
const title = genre
? intl.formatMessage(messages.genreSeries, { genre: genre.name })
: network
? intl.formatMessage(messages.networkSeries, { network: network.name })
: intl.formatMessage(messages.discovertv);
return (
<>
<PageTitle title={intl.formatMessage(messages.discovertv)} />
<PageTitle title={title} />
<div className="mt-1 mb-5">
<Header>
<FormattedMessage {...messages.discovertv} />
</Header>
<Header>{title}</Header>
</div>
<ListView
items={titles}