diff --git a/src/app/[name_slug]/page.tsx b/src/app/[name_slug]/page.tsx index 2ffea71..3687827 100644 --- a/src/app/[name_slug]/page.tsx +++ b/src/app/[name_slug]/page.tsx @@ -3,8 +3,7 @@ import { API } from "@services"; export const generateStaticParams = async () => { const discs = await API.getDiscs(); - const paths = discs.map(({ name_slug }) => ({ params: { name_slug } })); - return paths; + return discs.map(({ name_slug }) => ({ params: { name_slug } })); }; export default function DiscDetailPage({ params: { name_slug } }: { params: { name_slug: string } }) { diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 83b5e34..8aaa3d2 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -18,14 +18,14 @@ export default async function RootLayout({ }>) { const discs = await API.getDiscs(); return ( - - - + + + {children} {modal} - - - + + + ); } diff --git a/src/app/page.tsx b/src/app/page.tsx index 86d6d8f..5f4dd87 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,9 +1,19 @@ -import { Home } from "@components"; +"use client"; + +import { ClerkProvider } from "@clerk/nextjs"; +import { DiscCount, DiscGrid, Filters, Header, ScrollToTop } from "@components"; +import { config } from "@services"; export default function HomePage() { return ( -
- -
+ +
+
+ + + + +
+
); } diff --git a/src/components/Home.tsx b/src/components/Home.tsx deleted file mode 100644 index d8ead46..0000000 --- a/src/components/Home.tsx +++ /dev/null @@ -1,17 +0,0 @@ -"use client"; - -import { ClerkProvider } from "@clerk/nextjs"; -import { DiscCount, DiscGrid, Filters, Header, ScrollToTop } from "@components"; -import { config } from "@services"; - -export const Home = () => { - return ( - -
- - - - - - ); -}; diff --git a/src/components/index.ts b/src/components/index.ts index 1d5a602..4fc6e60 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -8,5 +8,4 @@ export * from "./DiscModal"; export * from "./DiscNotFound"; export * from "./Filters"; export * from "./Header"; -export * from "./Home"; export * from "./ScrollToTop"; diff --git a/src/services/api.ts b/src/services/api.ts index b315e0b..add8413 100644 --- a/src/services/api.ts +++ b/src/services/api.ts @@ -3,7 +3,7 @@ import { config } from "@services"; import type { Disc, RequestParams } from "@types"; -const request = async ({ url, method, body, tags }: RequestParams) => { +const requestJson = async ({ url, method, body, tags }: RequestParams) => { const res = await fetch(url, { method, headers: { @@ -17,7 +17,7 @@ const request = async ({ url, method, body, tags }: RequestParams) export const API = { getDiscs: async () => - request({ + requestJson({ url: `${config.API_URL}/disc`, method: RequestMethod.GET, tags: ["disc"]