✨ fetch class 사용 변경

team-nabi · Nov 1, 2023 · 9ff4b43 · 9ff4b43
1 parent 8dc20d4
commit 9ff4b43
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 47 deletions.
diff --git a/src/app/(root)/(routes)/(home)/components/TestBlock.tsx b/src/app/(root)/(routes)/(home)/components/TestBlock.tsx
@@ -1,7 +1,6 @@
 'use client'
 
 import React, { useEffect } from 'react'
-// import { useApiClient } from '@/contexts/FetchContext'
 import { getTest } from '@/services/test/test'
 
 // async function getTestValue() {

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,7 +1,6 @@
 import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import Header from '@/components/domain/Header'
-import { FetchProvider } from '@/contexts/FetchContext'
 import MSWWrapper from '@/contexts/MSWWrapper'
 import TanstackQueryContext from '@/contexts/TanstackQueryContext'
 import ThemeProviderContext from '@/contexts/ThemeProviderContext'
@@ -24,19 +23,17 @@ export default function RootLayout({
     <html lang="ko">
       <body>
         <MSWWrapper>
-          <FetchProvider>
-            <TanstackQueryContext>
-              <ThemeProviderContext>
-                <Suspense fallback={<div>loading...</div>}>
-                  <div className="centered-content">
-                    <Header isLogin={false} />
-                    {children}
-                    {authModal}
-                  </div>
-                </Suspense>
-              </ThemeProviderContext>
-            </TanstackQueryContext>
-          </FetchProvider>
+          <TanstackQueryContext>
+            <ThemeProviderContext>
+              <Suspense fallback={<div>loading...</div>}>
+                <div className="centered-content">
+                  <Header isLogin={false} />
+                  {children}
+                  {authModal}
+                </div>
+              </Suspense>
+            </ThemeProviderContext>
+          </TanstackQueryContext>
         </MSWWrapper>
       </body>
     </html>

diff --git a/src/contexts/FetchContext.tsx b/src/contexts/FetchContext.tsx
diff --git a/src/lib/fetchAPI.tsx b/src/lib/fetchAPI.tsx
@@ -1,13 +1,11 @@
-import { Environment } from '@/config/environment'
-
 class FetchAPI {
   private baseURL: string
   private headers: { [key: string]: string }
 
   private static instance: FetchAPI
 
   private constructor() {
-    this.baseURL = Environment.apiAddress() ?? ''
+    this.baseURL = ''
     this.headers = {
       'Content-Type': 'application/json',
     }

diff --git a/src/services/apiClient.ts b/src/services/apiClient.ts
@@ -0,0 +1,8 @@
+import { Environment } from '@/config/environment'
+import FetchAPI from '@/lib/fetchAPI'
+
+const apiClient = FetchAPI.getInstance()
+apiClient.setDefaultHeader('Content-Type', 'application/json')
+apiClient.setBaseURL(Environment.apiAddress() ?? '')
+
+export default apiClient
diff --git a/src/services/test/test.ts b/src/services/test/test.ts
@@ -1,9 +1,8 @@
 import ApiEndPoint from '@/config/apiEndPoint'
-import FetchAPI from '@/lib/fetchAPI'
+import apiClient from '../apiClient'
 
 const getTest = async () => {
-  const api = FetchAPI.getInstance()
-  const response = await api.get(
+  const response = await apiClient.get(
     ApiEndPoint.test(),
     { next: { revalidate: 10 } },
     {