From 69482e1ded2f1878f75de5e6eae4cf38e2bfaaf5 Mon Sep 17 00:00:00 2001 From: Aleksi Lassila Date: Fri, 1 Sep 2023 16:28:18 +0300 Subject: [PATCH] refactor: MoviePage --- .../TitlePageLayout/TitlePageLayout.svelte | 140 ++++++++-------- src/routes/movie/[id]/MoviePage.svelte | 102 ++++++------ src/routes/series/[id]/SeriesPage.svelte | 150 ++++++++---------- 3 files changed, 192 insertions(+), 200 deletions(-) diff --git a/src/lib/components/TitlePageLayout/TitlePageLayout.svelte b/src/lib/components/TitlePageLayout/TitlePageLayout.svelte index 85b5f80..27cb3b3 100644 --- a/src/lib/components/TitlePageLayout/TitlePageLayout.svelte +++ b/src/lib/components/TitlePageLayout/TitlePageLayout.svelte @@ -1,6 +1,6 @@ -{#await tmdbMoviePromise then movie} +{#await data} + +{:then { tmdbMovie, tmdbRecommendationProps, tmdbSimilarProps, castProps }} + {@const movie = tmdbMovie} b.file_path || '') || [], + posterPath: movie?.poster_path || '', + tagline: movie?.tagline || movie?.title || '', + overview: movie?.overview || '' + }} {isModal} - {tmdbId} {handleCloseModal} - type="movie" - title={movie?.title || 'Movie'} - backdropUriCandidates={movie?.images?.backdrops?.map((b) => b.file_path || '') || []} - posterPath={movie?.poster_path || ''} - tagline={movie?.tagline || movie?.title || ''} - overview={movie?.overview || ''} > - {new Date(movie?.release_date || Date.now()).getFullYear()} - - {@const progress = jellyfinItem?.UserData?.PlayedPercentage} + + {new Date(movie?.release_date || Date.now()).getFullYear()} + + {@const progress = $jellyfinItemStore.item?.UserData?.PlayedPercentage} {#if progress} {progress.toFixed()} min left {:else} {movie?.runtime} min {/if} - - + {movie?.vote_average?.toFixed(1)} TMDB - {@const progress = jellyfinItem?.UserData?.PlayedPercentage} + {@const progress = $jellyfinItemStore.item?.UserData?.PlayedPercentage} {#if progress}
{:else} + {@const jellyfinItem = $jellyfinItemStore.item} + {@const radarrMovie = $radarrMovieStore.item} {#if jellyfinItem}