Merge branch 'main' into pre-production

gudusol · gudusol · commit a62e1be27ba7 · 2025-04-02T19:42:49.000+09:00
diff --git a/apps/service/src/app/(home)/page.tsx b/apps/service/src/app/(home)/page.tsx
@@ -6,7 +6,7 @@ import { Button } from '@components';
 import { IcCalendar } from '@svg';
 import { useGetHomeFeed } from '@apis';
 import { DailyProgress } from '@types';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import {
   GuideButton,
   HomeHeader,
@@ -17,7 +17,6 @@ import {
 
 const Page = () => {
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
   const { data } = useGetHomeFeed();
   const homeFeedData = data?.data;
 
diff --git a/apps/service/src/app/login/page.tsx b/apps/service/src/app/login/page.tsx
@@ -2,13 +2,11 @@
 import { useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 
-import { useTrackEvent } from '@hooks';
-import { getAccessToken } from '@utils';
+import { getAccessToken, trackEvent } from '@utils';
 import { LogoLogin } from '@/assets/svg/logo';
 import { KakaoButton } from '@/components/login';
 
 const Page = () => {
-  const { trackEvent } = useTrackEvent();
   const router = useRouter();
   const kakaoLoginUrl = `https://kauth.kakao.com/oauth/authorize?client_id=${
     process.env.NEXT_PUBLIC_REST_API_KEY
diff --git a/apps/service/src/app/problem/solve/[publishId]/[problemId]/SolveButtonsClient.tsx b/apps/service/src/app/problem/solve/[publishId]/[problemId]/SolveButtonsClient.tsx
@@ -3,7 +3,8 @@ import { useRouter } from 'next/navigation';
 
 import { SolveButton } from '@components';
 import { useGetChildData, postChildProblemSubmit, postProblemSubmit } from '@apis';
-import { useInvalidate, useTrackEvent } from '@hooks';
+import { useInvalidate } from '@hooks';
+import { trackEvent } from '@utils';
 
 interface SolveButtonsClientProps {
   publishId: string;
@@ -13,7 +14,6 @@ interface SolveButtonsClientProps {
 const SolveButtonsClient = ({ publishId, problemId }: SolveButtonsClientProps) => {
   const router = useRouter();
   const { invalidateAll } = useInvalidate();
-  const { trackEvent } = useTrackEvent();
   const { data } = useGetChildData(publishId, problemId);
   const childProblemId = data?.data?.childProblemIds[0];
 
diff --git a/apps/service/src/app/problem/solve/[publishId]/[problemId]/child-problem/[childProblemId]/page.tsx b/apps/service/src/app/problem/solve/[publishId]/[problemId]/child-problem/[childProblemId]/page.tsx
@@ -19,9 +19,10 @@ import {
   Tag,
   ImageContainer,
 } from '@components';
-import { useInvalidate, useModal, useTrackEvent } from '@hooks';
+import { useInvalidate, useModal } from '@hooks';
 import { components } from '@schema';
 import { useChildProblemContext } from '@/hooks/problem';
+import { trackEvent } from '@utils';
 
 type ChildProblemSubmitUpdateResponse = components['schemas']['ChildProblemSubmitUpdateResponse'];
 
@@ -32,7 +33,6 @@ const Page = () => {
     childProblemId: string;
   }>();
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
   const { childProblemLength, mainProblemImageUrl, onPrev, onNext } = useChildProblemContext();
   const { invalidateAll } = useInvalidate();
 
diff --git a/apps/service/src/app/problem/solve/[publishId]/[problemId]/main-problem/page.tsx b/apps/service/src/app/problem/solve/[publishId]/[problemId]/main-problem/page.tsx
@@ -17,9 +17,10 @@ import {
   TimeTag,
   ImageContainer,
 } from '@components';
-import { useInvalidate, useModal, useTrackEvent } from '@hooks';
+import { useInvalidate, useModal } from '@hooks';
 import { ProblemStatus } from '@types';
 import { useChildProblemContext } from '@/hooks/problem';
+import { trackEvent } from '@utils';
 
 const statusLabel: Record<string, string> = {
   CORRECT: '정답',
@@ -38,7 +39,6 @@ const statusColor: Record<string, 'green' | 'red' | 'gray'> = {
 const Page = () => {
   const { publishId, problemId } = useParams<{ publishId: string; problemId: string }>();
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
   const { childProblemLength } = useChildProblemContext();
   const { invalidateAll } = useInvalidate();
 
diff --git a/apps/service/src/app/report/[publishId]/[problemId]/advanced/page.tsx b/apps/service/src/app/report/[publishId]/[problemId]/advanced/page.tsx
@@ -3,13 +3,12 @@ import { useParams, useRouter } from 'next/navigation';
 import Image from 'next/image';
 
 import { NavigationFooter, SmallButton, ProgressHeader, ImageContainer } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { useReportContext } from '@/hooks/report';
 
 const Page = () => {
   const { publishId, problemId } = useParams();
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
 
   const { problemNumber, seniorTipImageUrl, prescription } = useReportContext();
 
@@ -21,17 +20,13 @@ const Page = () => {
   };
 
   const handleClickPrev = () => {
-    trackEvent('report_advanced_prev_button_click', {
-      buttonLabel: '해설',
-    });
-    router.push(`/report/${publishId}/${problemId}/analysis`);
+    trackEvent('report_advanced_prev_button_click_to_prescription');
+    router.push(`/report/${publishId}/${problemId}/prescription`);
   };
 
   const handleClickNext = () => {
-    trackEvent('report_advanced_next_button_click', {
-      buttonLabel: '포인팅',
-    });
-    router.push(`/report/${publishId}/${problemId}/prescription`);
+    trackEvent('report_advanced_next_button_click_to_list');
+    router.push(`/problem/list/${publishId}`);
   };
 
   if (!seniorTipImageUrl) {
@@ -40,7 +35,7 @@ const Page = () => {
 
   return (
     <>
-      <ProgressHeader progress={66} />
+      <ProgressHeader progress={100} />
       <main className='px-[2rem] py-[8rem]'>
         <div className='flex items-center justify-between'>
           <h1 className='font-bold-18 text-main my-[0.8rem]'>한 걸음 더</h1>
@@ -57,16 +52,16 @@ const Page = () => {
             <Image
               src={seniorTipImageUrl ?? ''}
               alt='advanced'
-              className={`w-full rounded-[1.6rem] object-contain`}
+              className={`w-full object-contain`}
               width={700}
               height={200}
               priority
             />
           </ImageContainer>
         </div>
         <NavigationFooter
-          prevLabel='해설'
-          nextLabel='포인팅'
+          prevLabel='포인팅'
+          nextLabel='리스트로'
           onClickPrev={handleClickPrev}
           onClickNext={handleClickNext}
         />
diff --git a/apps/service/src/app/report/[publishId]/[problemId]/analysis/page.tsx b/apps/service/src/app/report/[publishId]/[problemId]/analysis/page.tsx
@@ -5,14 +5,13 @@ import Image from 'next/image';
 
 import { IcRight, IcThumbtack } from '@svg';
 import { ImageContainer, NavigationFooter, ProgressHeader } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { useReportContext } from '@/hooks/report';
 import { TabMenu } from '@/components/report';
 
 const Page = () => {
   const router = useRouter();
   const { publishId, problemId } = useParams();
-  const { trackEvent } = useTrackEvent();
   const {
     problemNumber,
     answerType,
@@ -35,10 +34,8 @@ const Page = () => {
   };
 
   const handleClickNext = () => {
-    trackEvent('report_analysis_next_button_click', {
-      buttonLabel: '한 걸음 더',
-    });
-    router.push(`/report/${publishId}/${problemId}/advanced`);
+    trackEvent('report_analysis_next_button_click_to_prescription');
+    router.push(`/report/${publishId}/${problemId}/prescription`);
   };
 
   if (!mainAnalysisImageUrl || !mainHandwritingExplanationImageUrl) {
@@ -102,7 +99,7 @@ const Page = () => {
             <IcRight width={24} height={24} />
           </button>
         </div>
-        <NavigationFooter nextLabel='한 걸음 더' onClickNext={handleClickNext} />
+        <NavigationFooter nextLabel='포인팅' onClickNext={handleClickNext} />
       </main>
     </>
   );
diff --git a/apps/service/src/app/report/[publishId]/[problemId]/prescription/detail/page.tsx b/apps/service/src/app/report/[publishId]/[problemId]/prescription/detail/page.tsx
@@ -34,7 +34,7 @@ const Page = () => {
 
   return (
     <>
-      <Header title='진단 및 처방' iconType='back' />
+      <Header title='포인팅' iconType='back' />
       <main className='px-[2rem] py-[8rem]'>
         <h1 className='font-bold-18 text-main my-[0.8rem]'>{title}</h1>
         <div className='mt-[1.6rem] flex flex-col gap-[1.6rem]'>
diff --git a/apps/service/src/app/report/[publishId]/[problemId]/prescription/page.tsx b/apps/service/src/app/report/[publishId]/[problemId]/prescription/page.tsx
@@ -2,14 +2,13 @@
 import { useParams, useRouter } from 'next/navigation';
 
 import { Divider, NavigationFooter, ProgressHeader } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { PrescriptionCard } from '@/components/report';
 import { useReportContext } from '@/hooks/report';
 
 const Page = () => {
   const router = useRouter();
   const { publishId, problemId } = useParams();
-  const { trackEvent } = useTrackEvent();
 
   const { problemNumber, prescription } = useReportContext();
   const childProblems = prescription?.childProblem ?? [];
@@ -32,22 +31,18 @@ const Page = () => {
   };
 
   const handleClickPrev = () => {
-    trackEvent('report_prescription_prev_button_click', {
-      buttonLabel: '한 걸음 더',
-    });
-    router.push(`/report/${publishId}/${problemId}/advanced`);
+    trackEvent('report_prescription_prev_button_click_to_analysis');
+    router.push(`/report/${publishId}/${problemId}/analysis`);
   };
 
   const handleClickNext = () => {
-    trackEvent('report_prescription_next_button_click', {
-      buttonLabel: '리스트로',
-    });
-    router.push(`/problem/list/${publishId}`);
+    trackEvent('report_prescription_next_button_click_to_advanced');
+    router.push(`/report/${publishId}/${problemId}/advanced`);
   };
 
   return (
     <>
-      <ProgressHeader progress={100} />
+      <ProgressHeader progress={66} />
       <main className='px-[2rem] py-[8rem]'>
         <h1 className='font-bold-18 text-main my-[0.8rem]'>포인팅</h1>
 
@@ -71,8 +66,8 @@ const Page = () => {
         </ul>
 
         <NavigationFooter
-          prevLabel='한 걸음 더'
-          nextLabel='리스트로'
+          prevLabel='해설'
+          nextLabel='한 걸음 더'
           onClickPrev={handleClickPrev}
           onClickNext={handleClickNext}
         />
diff --git a/apps/service/src/components/common/Header.tsx b/apps/service/src/components/common/Header.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { useRouter } from 'next/navigation';
 
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { IcHome, IcLeft } from '@svg';
 
 interface HeaderProps {
@@ -11,7 +11,6 @@ interface HeaderProps {
 
 const Header = ({ title, iconType = 'home' }: HeaderProps) => {
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
 
   const handleClickHome = () => {
     trackEvent('header_home_button_click');
diff --git a/apps/service/src/components/common/ProgressHeader.tsx b/apps/service/src/components/common/ProgressHeader.tsx
@@ -3,7 +3,7 @@
 import { useParams, useRouter } from 'next/navigation';
 
 import { ProgressBar } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { IcList } from '@svg';
 
 interface ProgressHeaderProps {
@@ -13,7 +13,6 @@ interface ProgressHeaderProps {
 const ProgressHeader = ({ progress }: ProgressHeaderProps) => {
   const router = useRouter();
   const { publishId } = useParams();
-  const { trackEvent } = useTrackEvent();
 
   const handleClickProblemList = () => {
     trackEvent('progress_header_problem_list_button_click');
diff --git a/apps/service/src/components/home/ProblemCard/ProblemCard.tsx b/apps/service/src/components/home/ProblemCard/ProblemCard.tsx
@@ -2,7 +2,7 @@ import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 
 import { Button } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { IcSolve } from '@svg';
 
 interface Props {
@@ -15,7 +15,6 @@ interface Props {
 
 const ProblemCard = ({ publishId, dateString, title, image, solvedCount }: Props) => {
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
 
   const handleClickProblem = () => {
     trackEvent('home_carousel_problem_card_click', {
diff --git a/apps/service/src/components/my-page/SettingList.tsx b/apps/service/src/components/my-page/SettingList.tsx
@@ -4,10 +4,9 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import React from 'react';
 
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 
 const SettingList = () => {
-  const { trackEvent } = useTrackEvent();
   const router = useRouter();
 
   const handleClickLogout = () => {
diff --git a/apps/service/src/components/problem/ProblemCalandar.tsx b/apps/service/src/components/problem/ProblemCalandar.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react';
 import { IcMinus, IcMinusSmall, IcNextBlack, IcPrevBlack } from '@svg';
 import { components } from '@schema';
 import { useGetProblemAll } from '@apis';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 
 import DayProblemCard from './DayProblemCard';
 
@@ -14,7 +14,6 @@ type AllProblemGetResponse = components['schemas']['AllProblemGetResponse'];
 const ProblemCalandar = () => {
   const [currentDay, setCurrentDay] = useState(dayjs());
   const [selectedDay, setSelectedDay] = useState<number | null>(null);
-  const { trackEvent } = useTrackEvent();
   const year = currentDay.year();
   const month = currentDay.month() + 1;
 
diff --git a/apps/service/src/components/problem/ProblemStatusCard.tsx b/apps/service/src/components/problem/ProblemStatusCard.tsx
@@ -4,7 +4,7 @@ import { useRouter } from 'next/navigation';
 import React, { useState } from 'react';
 
 import { Button, StatusIcon, StatusTag } from '@components';
-import { useTrackEvent } from '@hooks';
+import { trackEvent } from '@utils';
 import { components } from '@schema';
 import { IcDown, IcUp } from '@svg';
 
@@ -23,7 +23,6 @@ const ProblemStatusCard = ({
 }: ProblemStatusCardProps) => {
   const { problemId, status, childProblemStatuses } = problemData;
   const router = useRouter();
-  const { trackEvent } = useTrackEvent();
   const [isOpen, setIsOpen] = useState(
     !childProblemStatuses?.every((childStatus) => childStatus === 'NOT_STARTED')
   );
diff --git a/apps/service/src/components/report/PrescriptionCard.tsx b/apps/service/src/components/report/PrescriptionCard.tsx
@@ -28,7 +28,7 @@ const PrescriptionCard = ({ status = 'NOT_STARTED', title, onClick }: Prescripti
         {statusIcon(status)}
         <p className='font-medium-16 text-black'>{title}</p>
       </div>
-      <SmallButton onClick={onClick}>진단 및 처방</SmallButton>
+      <SmallButton onClick={onClick}>진단 받기</SmallButton>
     </div>
   );
 };
diff --git a/apps/service/src/hooks/common/index.ts b/apps/service/src/hooks/common/index.ts
@@ -1,5 +1,4 @@
 import useModal from './useModal';
 import useInvalidate from './useInvalidate';
-import useTrackEvent from './useTrackEvent';
 
-export { useModal, useInvalidate, useTrackEvent };
+export { useModal, useInvalidate };
diff --git a/apps/service/src/hooks/common/useTrackEvent.ts b/apps/service/src/hooks/common/useTrackEvent.ts
diff --git a/apps/service/src/utils/common/index.ts b/apps/service/src/utils/common/index.ts
@@ -1 +1,2 @@
 export * from './auth';
+export * from './trackEvent';
diff --git a/apps/service/src/utils/common/trackEvent.ts b/apps/service/src/utils/common/trackEvent.ts
