mirror of
https://github.com/apricote/Listory.git
synced 2026-01-13 21:21:02 +00:00
feat: introduce new report "Top Albums"
This commit is contained in:
parent
09858076bf
commit
9896ea31ff
16 changed files with 246 additions and 9 deletions
|
|
@ -5,9 +5,10 @@ import { LoginSuccess } from "./components/LoginSuccess";
|
|||
import { NavBar } from "./components/NavBar";
|
||||
import { RecentListens } from "./components/RecentListens";
|
||||
import { ReportListens } from "./components/ReportListens";
|
||||
import { ReportTopAlbums } from "./components/ReportTopAlbums";
|
||||
import { ReportTopArtists } from "./components/ReportTopArtists";
|
||||
import { useAuth } from "./hooks/use-auth";
|
||||
import "./tailwind/generated.css";
|
||||
import { ReportTopArtists } from "./components/ReportTopArtists";
|
||||
|
||||
export function App() {
|
||||
const { isLoaded } = useAuth();
|
||||
|
|
@ -28,6 +29,7 @@ export function App() {
|
|||
<Route path="/listens" exact component={RecentListens} />
|
||||
<Route path="/reports/listens" exact component={ReportListens} />
|
||||
<Route path="/reports/top-artists" exact component={ReportTopArtists} />
|
||||
<Route path="/reports/top-albums" exact component={ReportTopAlbums} />
|
||||
</Switch>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import { ListenReportItem } from "./entities/listen-report-item";
|
|||
import { ListenReportOptions } from "./entities/listen-report-options";
|
||||
import { Pagination } from "./entities/pagination";
|
||||
import { PaginationOptions } from "./entities/pagination-options";
|
||||
import { TopAlbumsItem } from "./entities/top-albums-item";
|
||||
import { TopAlbumsOptions } from "./entities/top-albums-options";
|
||||
import { TopArtistsItem } from "./entities/top-artists-item";
|
||||
import { TopArtistsOptions } from "./entities/top-artists-options";
|
||||
|
||||
|
|
@ -110,3 +112,40 @@ export const getTopArtists = async (
|
|||
} = res;
|
||||
return items;
|
||||
};
|
||||
|
||||
export const getTopAlbums = async (
|
||||
options: TopAlbumsOptions,
|
||||
client: AxiosInstance
|
||||
): Promise<TopAlbumsItem[]> => {
|
||||
const {
|
||||
time: { timePreset, customTimeStart, customTimeEnd },
|
||||
} = options;
|
||||
|
||||
const res = await client.get<{ items: TopAlbumsItem[] }>(
|
||||
`/api/v1/reports/top-albums`,
|
||||
{
|
||||
params: {
|
||||
timePreset,
|
||||
customTimeStart: formatISO(customTimeStart),
|
||||
customTimeEnd: formatISO(customTimeEnd),
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
switch (res.status) {
|
||||
case 200: {
|
||||
break;
|
||||
}
|
||||
case 401: {
|
||||
throw new UnauthenticatedError(`No token or token expired`);
|
||||
}
|
||||
default: {
|
||||
throw new Error(`Unable to getTopAlbums: ${res.status}`);
|
||||
}
|
||||
}
|
||||
|
||||
const {
|
||||
data: { items },
|
||||
} = res;
|
||||
return items;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
import { Artist } from "./artist";
|
||||
import { SpotifyInfo } from "./spotify-info";
|
||||
|
||||
export interface Album {
|
||||
id: string;
|
||||
name: string;
|
||||
spotify?: SpotifyInfo;
|
||||
artists?: Artist[];
|
||||
}
|
||||
|
|
|
|||
6
frontend/src/api/entities/top-albums-item.ts
Normal file
6
frontend/src/api/entities/top-albums-item.ts
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
import { Album } from "./album";
|
||||
|
||||
export interface TopAlbumsItem {
|
||||
album: Album;
|
||||
count: number;
|
||||
}
|
||||
5
frontend/src/api/entities/top-albums-options.ts
Normal file
5
frontend/src/api/entities/top-albums-options.ts
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
import { TimeOptions } from "./time-options";
|
||||
|
||||
export interface TopAlbumsOptions {
|
||||
time: TimeOptions;
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
import { TimePreset } from "./time-preset.enum";
|
||||
import { TimeOptions } from "./time-options";
|
||||
|
||||
export interface TopArtistsOptions {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ export const NavBar: React.FC = () => {
|
|||
<Link to="/reports/top-artists">
|
||||
<NavItem>Top Artists</NavItem>
|
||||
</Link>
|
||||
<Link to="/reports/top-albums">
|
||||
<NavItem>Top Albums</NavItem>
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ export const ReportTimeOptions: React.FC<ReportTimeOptionsProps> = ({
|
|||
setTimeOptions,
|
||||
}) => {
|
||||
return (
|
||||
<div className="md:flex">
|
||||
<div className="md:flex mb-4">
|
||||
<div className="text-gray-700">
|
||||
<label className="text-sm">Timeframe</label>
|
||||
<select
|
||||
|
|
|
|||
80
frontend/src/components/ReportTopAlbums.tsx
Normal file
80
frontend/src/components/ReportTopAlbums.tsx
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
import React, { useMemo, useState } from "react";
|
||||
import { Redirect } from "react-router-dom";
|
||||
import { Album } from "../api/entities/album";
|
||||
import { TimeOptions } from "../api/entities/time-options";
|
||||
import { TimePreset } from "../api/entities/time-preset.enum";
|
||||
import { useTopAlbums } from "../hooks/use-api";
|
||||
import { useAuth } from "../hooks/use-auth";
|
||||
import { ReportTimeOptions } from "./ReportTimeOptions";
|
||||
import { TopListItem } from "./TopListItem";
|
||||
|
||||
export const ReportTopAlbums: React.FC = () => {
|
||||
const { user } = useAuth();
|
||||
|
||||
const [timeOptions, setTimeOptions] = useState<TimeOptions>({
|
||||
timePreset: TimePreset.LAST_90_DAYS,
|
||||
customTimeStart: new Date(0),
|
||||
customTimeEnd: new Date(),
|
||||
});
|
||||
|
||||
const options = useMemo(
|
||||
() => ({
|
||||
time: timeOptions,
|
||||
}),
|
||||
[timeOptions]
|
||||
);
|
||||
|
||||
const { topAlbums, isLoading } = useTopAlbums(options);
|
||||
|
||||
const reportHasItems = !isLoading && topAlbums.length !== 0;
|
||||
|
||||
if (!user) {
|
||||
return <Redirect to="/" />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="md:flex md:justify-center p-4">
|
||||
<div className="md:flex-shrink-0 min-w-full xl:min-w-0 xl:w-2/3 max-w-screen-lg">
|
||||
<div className="flex justify-between">
|
||||
<p className="text-2xl font-normal text-gray-700">Top Albums</p>
|
||||
</div>
|
||||
<div className="shadow-xl bg-gray-100 rounded p-5 m-2">
|
||||
<ReportTimeOptions
|
||||
timeOptions={timeOptions}
|
||||
setTimeOptions={setTimeOptions}
|
||||
/>
|
||||
{isLoading && (
|
||||
<div>
|
||||
<div className="loader rounded-full border-8 h-64 w-64"></div>
|
||||
</div>
|
||||
)}
|
||||
{!reportHasItems && (
|
||||
<div>
|
||||
<p>Report is emtpy! :(</p>
|
||||
</div>
|
||||
)}
|
||||
{reportHasItems &&
|
||||
topAlbums.map(({ album, count }) => (
|
||||
<ReportItem album={album} count={count} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const ReportItem: React.FC<{
|
||||
album: Album;
|
||||
count: number;
|
||||
}> = ({ album, count }) => {
|
||||
const artists = album.artists?.map((artist) => artist.name).join(", ") || "";
|
||||
|
||||
return (
|
||||
<TopListItem
|
||||
key={album.id}
|
||||
title={album.name}
|
||||
subTitle={artists}
|
||||
count={count}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
|
@ -1,7 +1,13 @@
|
|||
import { useMemo, useState } from "react";
|
||||
import { getListensReport, getRecentListens, getTopArtists } from "../api/api";
|
||||
import { useMemo } from "react";
|
||||
import {
|
||||
getListensReport,
|
||||
getRecentListens,
|
||||
getTopAlbums,
|
||||
getTopArtists,
|
||||
} from "../api/api";
|
||||
import { ListenReportOptions } from "../api/entities/listen-report-options";
|
||||
import { PaginationOptions } from "../api/entities/pagination-options";
|
||||
import { TopAlbumsOptions } from "../api/entities/top-albums-options";
|
||||
import { TopArtistsOptions } from "../api/entities/top-artists-options";
|
||||
import { useApiClient } from "./use-api-client";
|
||||
import { useAsync } from "./use-async";
|
||||
|
|
@ -59,3 +65,19 @@ export const useTopArtists = (options: TopArtistsOptions) => {
|
|||
|
||||
return { topArtists, isLoading, error };
|
||||
};
|
||||
|
||||
export const useTopAlbums = (options: TopAlbumsOptions) => {
|
||||
const { client } = useApiClient();
|
||||
|
||||
const fetchData = useMemo(() => () => getTopAlbums(options, client), [
|
||||
options,
|
||||
client,
|
||||
]);
|
||||
|
||||
const { value: topAlbums, pending: isLoading, error } = useAsync(
|
||||
fetchData,
|
||||
INITIAL_EMPTY_ARRAY
|
||||
);
|
||||
|
||||
return { topAlbums, isLoading, error };
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue