🐛 fix kakao share

potenday-project · Dec 16, 2023 · 4f1fa50 · 4f1fa50
1 parent 44009bc
commit 4f1fa50
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 64 deletions.
diff --git a/app/(route)/alarm/page.tsx b/app/(route)/alarm/page.tsx
@@ -1,20 +1,24 @@
+import { UserContextProvider } from '@/app/_components/providers/UserProvider'
+
 import BackButton from './_components/BackButton'
 import RequestAlarm from './_components/requestAlarm'
 
 export default function AlarmPage() {
   return (
-    <main className='flex flex-col gap-3'>
-      <header className='flex items-center justify-between px-3 py-1'>
-        <BackButton />
-        <h1 className='text-2xl'>알림</h1>
-        <div className='w-9' />
-      </header>
+    <UserContextProvider>
+      <main className='flex flex-col gap-3'>
+        <header className='flex items-center justify-between px-3 py-1'>
+          <BackButton />
+          <h1 className='text-2xl'>알림</h1>
+          <div className='w-9' />
+        </header>
 
-      <div className='flex flex-col gap-3 px-4 pb-6'>
-        <RequestAlarm />
-        <RequestAlarm />
-        <RequestAlarm />
-      </div>
-    </main>
+        <div className='flex flex-col gap-3 px-4 pb-6'>
+          <RequestAlarm />
+          <RequestAlarm />
+          <RequestAlarm />
+        </div>
+      </main>
+    </UserContextProvider>
   )
 }
diff --git a/app/(route)/challenge/_components/ChallengeFormDialog.tsx b/app/(route)/challenge/_components/ChallengeFormDialog.tsx
@@ -65,12 +65,11 @@ export default function ChallengeFormDialog() {
       },
       {
         onSuccess: ({ data: { challengeId } }) => {
-          console.log('challengeId', challengeId)
           share.kakao({
             title: `${user.nickname}님이 초대장을 보냈어요!`,
             description: '1:1 목표 매칭 서비스',
             imageUrl: 'https://dodals3.s3.ap-northeast-2.amazonaws.com/asset/dodaldodal_square.png',
-            link: `https://dodaldodal-frontend-vercel.app/challenge/${challengeId}`,
+            sendUrl: `https://dodaldodal-frontend-vercel.app/challenge/${challengeId}`,
           })
         },
       }

diff --git a/app/(route)/challenge/_utils/index.ts b/app/(route)/challenge/_utils/index.ts
@@ -3,12 +3,12 @@ export const share = {
     title,
     description,
     imageUrl,
-    link,
+    sendUrl,
   }: {
     title: string
     description: string
     imageUrl: string
-    link: string
+    sendUrl: string
   }) => {
     const { Kakao } = window
     if (!Kakao.isInitialized()) {
@@ -22,16 +22,16 @@ export const share = {
         description,
         imageUrl,
         link: {
-          mobileWebUrl: link,
-          webUrl: link,
+          mobileWebUrl: sendUrl,
+          webUrl: sendUrl,
         },
       },
       buttons: [
         {
           title: '웹으로 보기',
           link: {
-            mobileWebUrl: link,
-            webUrl: link,
+            mobileWebUrl: sendUrl,
+            webUrl: sendUrl,
           },
         },
       ],

diff --git a/app/(route)/challenge/layout.tsx b/app/(route)/challenge/layout.tsx
@@ -3,30 +3,33 @@
 import { useRouter } from 'next/navigation'
 import Script from 'next/script'
 
+import { UserContextProvider } from '@/app/_components/providers/UserProvider'
 import BottomNavigation from '@/app/_components/shared/bottom-navigation'
 import Header from '@/app/_components/shared/header'
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   const router = useRouter()
 
   return (
-    <main className='h-full bg-challenge-background bg-cover bg-center bg-no-repeat'>
-      <Header>
-        <Header.BackIcon
-          onClick={() => {
-            router.back()
-          }}
-        />
-        <Header.Title>챌린지</Header.Title>
-        <div className='w-9' />
-      </Header>
-      {children}
-      <BottomNavigation selected='challenge' />
-      <Script
-        src='https://t1.kakaocdn.net/kakao_js_sdk/2.5.0/kakao.min.js'
-        integrity='sha384-kYPsUbBPlktXsY6/oNHSUDZoTX6+YI51f63jCPEIPFP09ttByAdxd2mEjKuhdqn4'
-        crossOrigin='anonymous'
-      ></Script>
-    </main>
+    <UserContextProvider>
+      <main className='h-full bg-challenge-background bg-cover bg-center bg-no-repeat'>
+        <Header>
+          <Header.BackIcon
+            onClick={() => {
+              router.back()
+            }}
+          />
+          <Header.Title>챌린지</Header.Title>
+          <div className='w-9' />
+        </Header>
+        {children}
+        <BottomNavigation selected='challenge' />
+        <Script
+          src='https://t1.kakaocdn.net/kakao_js_sdk/2.5.0/kakao.min.js'
+          integrity='sha384-kYPsUbBPlktXsY6/oNHSUDZoTX6+YI51f63jCPEIPFP09ttByAdxd2mEjKuhdqn4'
+          crossOrigin='anonymous'
+        ></Script>
+      </main>
+    </UserContextProvider>
   )
 }
diff --git a/app/(route)/invitation/[id]/layout.tsx b/app/(route)/invitation/[id]/layout.tsx
@@ -1,20 +1,23 @@
 'use client'
 
+import { UserContextProvider } from '@/app/_components/providers/UserProvider'
 import Header from '@/app/_components/shared/header'
 
 export default function layout({ children }: { children: React.ReactNode }) {
   return (
-    <main className='h-full pt-20'>
-      <Header className='bg-dodal-main'>
-        <div className='w-9' />
-        <Header.Title>초대장 도착</Header.Title>
-        <Header.Close
-          onClick={() => {
-            window.close()
-          }}
-        />
-      </Header>
-      {children}
-    </main>
+    <UserContextProvider>
+      <main className='h-full pt-20'>
+        <Header className='bg-dodal-main'>
+          <div className='w-9' />
+          <Header.Title>초대장 도착</Header.Title>
+          <Header.Close
+            onClick={() => {
+              window.close()
+            }}
+          />
+        </Header>
+        {children}
+      </main>
+    </UserContextProvider>
   )
 }
diff --git a/app/(route)/me/layout.tsx b/app/(route)/me/layout.tsx
@@ -1,16 +1,19 @@
+import { UserContextProvider } from '@/app/_components/providers/UserProvider'
 import BottomNavigation from '@/app/_components/shared/bottom-navigation'
 import Header from '@/app/_components/shared/header'
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
-    <main className='h-full'>
-      <Header>
-        <div />
-        <Header.Title>MY</Header.Title>
-        <div />
-      </Header>
-      {children}
-      <BottomNavigation selected='me' />
-    </main>
+    <UserContextProvider>
+      <main className='h-full'>
+        <Header>
+          <div />
+          <Header.Title>MY</Header.Title>
+          <div />
+        </Header>
+        {children}
+        <BottomNavigation selected='me' />
+      </main>
+    </UserContextProvider>
   )
 }
diff --git a/app/_components/providers/CoreProvider.tsx b/app/_components/providers/CoreProvider.tsx
@@ -4,16 +4,13 @@ import { useAxiosInterceptor } from '@/app/_hooks/useAxiosInterceptor'
 
 import AxiosProvider from './AxiosInterceptorProvider'
 import QueryClientProvider from './QueryClientProvider'
-import { UserContextProvider } from './UserProvider'
 
 export default function CoreProvider({ children }: { children: React.ReactNode }) {
   useAxiosInterceptor()
 
   return (
     <AxiosProvider>
-      <QueryClientProvider>
-        <UserContextProvider>{children}</UserContextProvider>
-      </QueryClientProvider>
+      <QueryClientProvider>{children}</QueryClientProvider>
     </AxiosProvider>
   )
 }
diff --git a/app/_service/challenge/challenge.types.ts b/app/_service/challenge/challenge.types.ts
@@ -18,3 +18,31 @@ export interface CreateChallengeParams {
 export interface CreateChallengeResponse {
   challengeId: number
 }
+
+export interface GetUpcomingChallengeParams {
+  challengeId: number
+}
+
+export interface Challenge {
+  id: number
+  name: string
+  category: Category
+  authentication_method: string
+  reward: string
+  is_deleted: 0
+  created_at: '2023-12-16T13:59:18.000Z'
+  updated_at: '2023-12-16T13:59:18.000Z'
+  target_count: 10
+  challenge_status: 'WAITING'
+}
+
+export interface GetUpcomingChallengeResponse {
+  challengeId: number
+  name: string
+  category: Category
+  authenticationMethod: string
+  reward: string
+  champion: Champion
+  explorationCount: number
+  certificatedCount: number
+}
diff --git a/app/_service/challenge/index.ts b/app/_service/challenge/index.ts
@@ -1,6 +1,12 @@
 import api from '../core/api'
 
-import { type CreateChallengeResponse, type CreateChallengeParams, type GetTodayStatus } from './challenge.types'
+import {
+  type CreateChallengeResponse,
+  type CreateChallengeParams,
+  type GetTodayStatus,
+  type GetUpcomingChallengeParams,
+  type GetUpcomingChallengeResponse,
+} from './challenge.types'
 
 export const getTodayStatus = () => {
   return api.get<GetTodayStatus>('/challenges/today')
@@ -14,3 +20,7 @@ export const createChallenge = ({ name, category, authenticationMethod, reward }
     reward,
   })
 }
+
+export const getUpcomingChallenge = ({ challengeId }: GetUpcomingChallengeParams) => {
+  return api.get<GetUpcomingChallengeResponse>(`/challenges/upcoming/${challengeId}`)
+}