mirror of
https://github.com/apricote/Listory.git
synced 2026-01-13 13:11:02 +00:00
feat(frontend): show recent listens
This commit is contained in:
parent
32dcd84964
commit
49bff95ea5
12 changed files with 217 additions and 16 deletions
5
frontend/package-lock.json
generated
5
frontend/package-lock.json
generated
|
|
@ -4328,6 +4328,11 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"date-fns": {
|
||||
"version": "2.12.0",
|
||||
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.12.0.tgz",
|
||||
"integrity": "sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw=="
|
||||
},
|
||||
"debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
"@types/react-dom": "^16.9.7",
|
||||
"@types/react-router-dom": "^5.1.5",
|
||||
"autoprefixer": "^9.7.6",
|
||||
"date-fns": "^2.12.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"postcss-cli": "^7.1.1",
|
||||
"prettier": "^2.0.5",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import { LoginFailure } from "./components/LoginFailure";
|
|||
import { NavBar } from "./components/NavBar";
|
||||
import { useAuth } from "./hooks/use-auth";
|
||||
import "./tailwind/generated.css";
|
||||
import { RecentListens } from "./components/RecentListens";
|
||||
|
||||
export function App() {
|
||||
const { isLoaded } = useAuth();
|
||||
|
|
@ -20,6 +21,7 @@ export function App() {
|
|||
<Switch>
|
||||
<Route path="/" exact />
|
||||
<Route path="/login/failure" exact component={LoginFailure} />
|
||||
<Route path="/listens" exact component={RecentListens} />
|
||||
</Switch>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
import { User } from "./user";
|
||||
import { Listen } from "./entities/listen";
|
||||
import { Pagination } from "./entities/pagination";
|
||||
import { PaginationOptions } from "./entities/pagination-options";
|
||||
import { User } from "./entities/user";
|
||||
|
||||
export class UnauthenticatedError extends Error {}
|
||||
|
||||
|
|
@ -38,3 +41,29 @@ export const getUsersMe = async (): Promise<User> => {
|
|||
const user: User = await res.json();
|
||||
return user;
|
||||
};
|
||||
|
||||
export const getRecentListens = async (
|
||||
options: PaginationOptions = { page: 1, limit: 10 }
|
||||
): Promise<Pagination<Listen>> => {
|
||||
const { page, limit } = options;
|
||||
|
||||
const res = await fetch(`/api/v1/listens?page=${page}&limit=${limit}`, {
|
||||
headers: getDefaultHeaders(),
|
||||
});
|
||||
|
||||
switch (res.status) {
|
||||
case 200: {
|
||||
break;
|
||||
}
|
||||
case 401: {
|
||||
throw new UnauthenticatedError(`No token or token expired`);
|
||||
}
|
||||
default: {
|
||||
throw new Error(`Unable to getRecentListens: ${res.status}`);
|
||||
}
|
||||
}
|
||||
|
||||
const listens: Pagination<Listen> = await res.json();
|
||||
console.log("getRecentListens", { listens });
|
||||
return listens;
|
||||
};
|
||||
|
|
|
|||
32
frontend/src/api/entities/listen.ts
Normal file
32
frontend/src/api/entities/listen.ts
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
export interface Listen {
|
||||
id: string;
|
||||
playedAt: string;
|
||||
track: Track;
|
||||
}
|
||||
|
||||
interface Track {
|
||||
id: string;
|
||||
name: string;
|
||||
album: Album;
|
||||
artists: Artist[];
|
||||
spotify?: SpotifyInfo;
|
||||
}
|
||||
|
||||
interface Album {
|
||||
id: string;
|
||||
name: string;
|
||||
spotify?: SpotifyInfo;
|
||||
}
|
||||
|
||||
interface Artist {
|
||||
id: string;
|
||||
name: string;
|
||||
spotify?: SpotifyInfo;
|
||||
}
|
||||
|
||||
interface SpotifyInfo {
|
||||
id: string;
|
||||
uri: string;
|
||||
type: string;
|
||||
href: string;
|
||||
}
|
||||
4
frontend/src/api/entities/pagination-options.ts
Normal file
4
frontend/src/api/entities/pagination-options.ts
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
export interface PaginationOptions {
|
||||
limit: number;
|
||||
page: number;
|
||||
}
|
||||
33
frontend/src/api/entities/pagination.ts
Normal file
33
frontend/src/api/entities/pagination.ts
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
export interface Pagination<PaginationObject> {
|
||||
/**
|
||||
* a list of items to be returned
|
||||
*/
|
||||
items: PaginationObject[];
|
||||
/**
|
||||
* associated meta information (e.g., counts)
|
||||
*/
|
||||
meta: PaginationMeta;
|
||||
}
|
||||
|
||||
export interface PaginationMeta {
|
||||
/**
|
||||
* the amount of items on this specific page
|
||||
*/
|
||||
itemCount: number;
|
||||
/**
|
||||
* the total amount of items
|
||||
*/
|
||||
totalItems: number;
|
||||
/**
|
||||
* the amount of items that were requested per page
|
||||
*/
|
||||
itemsPerPage: number;
|
||||
/**
|
||||
* the total amount of pages in this paginator
|
||||
*/
|
||||
totalPages: number;
|
||||
/**
|
||||
* the current page this paginator "points" to
|
||||
*/
|
||||
currentPage: number;
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import { User } from "../api/user";
|
||||
import { User } from "../api/entities/user";
|
||||
import { useAuth } from "../hooks/use-auth";
|
||||
import { SpotifyLogo } from "../icons/Spotify";
|
||||
|
||||
|
|
@ -12,12 +12,17 @@ export const NavBar: React.FC = () => {
|
|||
<div className="flex items-center flex-shrink-0 text-white mr-6">
|
||||
<span className="font-semibold text-xl tracking-tight">Listory</span>
|
||||
</div>
|
||||
<div className="w-full block flex-grow lg:flex lg:items-center lg:w-auto">
|
||||
<div className="w-full block flex-grow lg:flex lg:items-center lg:w-auto ">
|
||||
<div className="text-sm lg:flex-grow">
|
||||
{user && (
|
||||
<Link to="/">
|
||||
<NavItem>Home</NavItem>
|
||||
</Link>
|
||||
<>
|
||||
<Link to="/">
|
||||
<NavItem>Home</NavItem>
|
||||
</Link>
|
||||
<Link to="/listens">
|
||||
<NavItem>Your Listens</NavItem>
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -38,10 +43,14 @@ export const NavBar: React.FC = () => {
|
|||
|
||||
const NavUserInfo: React.FC<{ user: User }> = ({ user }) => {
|
||||
return (
|
||||
<div className="flex items-center mr-4">
|
||||
<div className="flex items-center mr-4 mt-4 lg:mt-0">
|
||||
<span className="text-green-200 text-sm">{user.displayName}</span>
|
||||
{user.photo && (
|
||||
<img className="w-6 h-6 rounded-full ml-4" src={user.photo}></img>
|
||||
<img
|
||||
className="w-6 h-6 rounded-full ml-4"
|
||||
src={user.photo}
|
||||
alt="Profile picture of logged in user"
|
||||
></img>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
93
frontend/src/components/RecentListens.tsx
Normal file
93
frontend/src/components/RecentListens.tsx
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
import React, { useState, useEffect } from "react";
|
||||
import { useAuth } from "../hooks/use-auth";
|
||||
import { Listen } from "../api/entities/listen";
|
||||
import { getRecentListens } from "../api/api";
|
||||
import { Redirect } from "react-router-dom";
|
||||
import { formatDistanceToNow } from "date-fns";
|
||||
|
||||
const LISTENS_PER_PAGE = 15;
|
||||
|
||||
export const RecentListens: React.FC = () => {
|
||||
const { user } = useAuth();
|
||||
|
||||
const [page, setPage] = useState(1);
|
||||
const [totalPages, setTotalPages] = useState(1);
|
||||
const [listens, setListens] = useState<Listen[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
const listensFromApi = await getRecentListens({
|
||||
page,
|
||||
limit: LISTENS_PER_PAGE,
|
||||
});
|
||||
|
||||
if (totalPages !== listensFromApi.meta.totalPages) {
|
||||
setTotalPages(listensFromApi.meta.totalPages);
|
||||
}
|
||||
setListens(listensFromApi.items);
|
||||
} catch (err) {
|
||||
console.error("Error while fetching recent listens:", err);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
})();
|
||||
}, [user, page, totalPages]);
|
||||
|
||||
if (!user) {
|
||||
return <Redirect to="/" />;
|
||||
}
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div>
|
||||
<span>Loading Listens</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<p>Recent listens</p>
|
||||
<div>
|
||||
{listens.length === 0 && (
|
||||
<div>
|
||||
<p>Could not find any listens!</p>
|
||||
</div>
|
||||
)}
|
||||
{listens.map((listen) => (
|
||||
<ListenItem listen={listen} />
|
||||
))}
|
||||
</div>
|
||||
<div>
|
||||
<p>Page: {page}</p>
|
||||
{page !== 1 && (
|
||||
<p>
|
||||
<button onClick={() => setPage(page - 1)}>Previous Page</button>
|
||||
</p>
|
||||
)}
|
||||
{page !== totalPages && (
|
||||
<p>
|
||||
<button onClick={() => setPage(page + 1)}>Next Page</button>
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const ListenItem: React.FC<{ listen: Listen }> = ({ listen }) => {
|
||||
const trackName = listen.track.name;
|
||||
const artists = listen.track.artists.map((artist) => artist.name).join(", ");
|
||||
const timeAgo = formatDistanceToNow(new Date(listen.playedAt), {
|
||||
addSuffix: true,
|
||||
});
|
||||
return (
|
||||
<div>
|
||||
{trackName} - {artists} - {timeAgo}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React, { createContext, useContext, useEffect, useState } from "react";
|
||||
import { getUsersMe, UnauthenticatedError } from "../api/api";
|
||||
import { User } from "../api/user";
|
||||
import { User } from "../api/entities/user";
|
||||
|
||||
const authContext = createContext<AuthContext>(
|
||||
(undefined as any) as AuthContext
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
|
||||
<g fill="#61DAFB">
|
||||
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
|
||||
<circle cx="420.9" cy="296.5" r="45.7"/>
|
||||
<path d="M520.5 78.1z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB |
Loading…
Add table
Add a link
Reference in a new issue