From 89003e5dd464d94638268b94728eda02525c9e89 Mon Sep 17 00:00:00 2001 From: Anatolij Vasilev Date: Mon, 19 Jun 2023 20:01:44 +0200 Subject: [PATCH 1/5] fixed id from the new api --- src/pages/song/[id].tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/song/[id].tsx b/src/pages/song/[id].tsx index 780cb63..bb0aec1 100644 --- a/src/pages/song/[id].tsx +++ b/src/pages/song/[id].tsx @@ -7,9 +7,9 @@ const lyricsApi = process.env.LYRICS_API_HOST; export async function getStaticPaths() { const songs = (await axios.get(lyricsApi + '/songs')).data; - const paths = songs.map((song: any) => ({ + const paths = songs.map((id: any) => ({ params: { - id: song.id.toString(), + id: id.toString(), }, })); return { From acbe1143f736ae4e4c928951e8176303d02d9e6d Mon Sep 17 00:00:00 2001 From: Anatolij Vasilev Date: Mon, 19 Jun 2023 20:07:39 +0200 Subject: [PATCH 2/5] show all songs from api --- src/pages/index.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 03d9703..46aa798 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -9,9 +9,18 @@ const khyay = localFont({ src: '../../styles/Khyay-Regular.ttf' }) export async function getStaticProps() { - const { data: songData1 } = await axios.get(lyricsApi + '/song/50000001'); - const { data: songData2 } = await axios.get(lyricsApi + '/song/50000002'); - const songData = [songData1, songData2]; + //the API gives an Array back looking like this [50000001,50000002,50000003] + const { data: songList } = await axios.get(lyricsApi + '/songs'); + + //we need to get the data for each song from /song/[id] and put it into an songData array + const songData = await Promise.all( + songList.map(async (songId: any) => { + const { data: song } = await axios.get(lyricsApi + `/song/${songId}`); + return song; + } + ) + ); + return { props: { songData, @@ -36,6 +45,7 @@ const HomePage: React.FC = ({songData}: any) => { { /*placeholder searchresults*/ songData.map((song: any) => { + console.log(song); return (
From 0ee0aa9bade37cd8d2cd44a88d0a9b0a27fc10a7 Mon Sep 17 00:00:00 2001 From: Anatolij Vasilev Date: Mon, 19 Jun 2023 20:21:09 +0200 Subject: [PATCH 3/5] fallback true --- src/pages/song/[id].tsx | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pages/song/[id].tsx b/src/pages/song/[id].tsx index bb0aec1..d9a1272 100644 --- a/src/pages/song/[id].tsx +++ b/src/pages/song/[id].tsx @@ -6,17 +6,18 @@ const lyricsApi = process.env.LYRICS_API_HOST; export async function getStaticPaths() { - const songs = (await axios.get(lyricsApi + '/songs')).data; - const paths = songs.map((id: any) => ({ - params: { - id: id.toString(), - }, - })); - return { - paths, - fallback: "blocking", // generate a new page if the user visits a page that doesn't exist - }; - } + const songs = (await axios.get(lyricsApi + '/songs')).data; + const paths = songs.map((id: any) => ({ + params: { + id: id.toString(), + }, + })); + return { + paths, + // generate a new page if the user visits a page that doesn't exist + fallback: true, + }; +} export async function getStaticProps({ params }: any) { const { data: songData } = await axios.get(lyricsApi + '/song/' + params.id); From 6981c3deaf7d82fc03c0f3e5c17c5fea93f621c6 Mon Sep 17 00:00:00 2001 From: Anatolij Vasilev Date: Mon, 19 Jun 2023 20:26:21 +0200 Subject: [PATCH 4/5] removed console log --- src/pages/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 46aa798..2fb9d41 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -45,7 +45,6 @@ const HomePage: React.FC = ({songData}: any) => { { /*placeholder searchresults*/ songData.map((song: any) => { - console.log(song); return (
From 843cd3d093a3b993608a85c8baee7bda58705801 Mon Sep 17 00:00:00 2001 From: Anatolij Vasilev Date: Mon, 19 Jun 2023 20:29:13 +0200 Subject: [PATCH 5/5] removed fallback --- src/pages/song/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/song/[id].tsx b/src/pages/song/[id].tsx index d9a1272..d8f063e 100644 --- a/src/pages/song/[id].tsx +++ b/src/pages/song/[id].tsx @@ -15,7 +15,7 @@ export async function getStaticPaths() { return { paths, // generate a new page if the user visits a page that doesn't exist - fallback: true, + fallback: "blocking", }; }