refactoring

cdleveille · Jun 1, 2024 · 703db97 · 703db97
1 parent 23c2067
commit 703db97
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 32 deletions.
diff --git 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
@@ -18,14 +18,14 @@ export default async function RootLayout({
 }>) {
 	const discs = await API.getDiscs();
 	return (
-		<html lang="en">
-			<body className={inter.className}>
-				<DiscContextProvider discs={discs}>
+		<DiscContextProvider discs={discs}>
+			<html lang="en">
+				<body className={inter.className}>
 					{children}
 					{modal}
-				</DiscContextProvider>
-			</body>
-		</html>
+				</body>
+			</html>
+		</DiscContextProvider>
 	);
 }
 

diff --git 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 (
-		<main>
-			<Home />
-		</main>
+		<ClerkProvider publishableKey={config.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY}>
+			<main>
+				<Header />
+				<Filters />
+				<DiscCount />
+				<DiscGrid />
+				<ScrollToTop />
+			</main>
+		</ClerkProvider>
 	);
 }
diff --git a/src/components/Home.tsx b/src/components/Home.tsx
diff --git 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
@@ -3,7 +3,7 @@ import { config } from "@services";
 
 import type { Disc, RequestParams } from "@types";
 
-const request = async <T = unknown>({ url, method, body, tags }: RequestParams) => {
+const requestJson = async <T = unknown>({ url, method, body, tags }: RequestParams) => {
 	const res = await fetch(url, {
 		method,
 		headers: {
@@ -17,7 +17,7 @@ const request = async <T = unknown>({ url, method, body, tags }: RequestParams)
 
 export const API = {
 	getDiscs: async () =>
-		request<Disc[]>({
+		requestJson<Disc[]>({
 			url: `${config.API_URL}/disc`,
 			method: RequestMethod.GET,
 			tags: ["disc"]