Fix : 신청폼 issue 수정

LikelionUniv · Jul 4, 2024 · cd025c7 · cd025c7
1 parent 237fd74
commit cd025c7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/components/application/ApplicationForm.tsx b/src/components/application/ApplicationForm.tsx
@@ -246,7 +246,7 @@ const ApplicationForm = () => {
                                     <A.StyledCheckedIcon />
                                 )}
                             </A.Ndiv>
-                            <A.Nform {...register('email')} />
+                            <A.Nform {...register('email')} disabled />
                             <A.Ndiv>
                                 학교
                                 {!userinfo?.universityName ? (

diff --git a/src/components/application/ApplicationModify.tsx b/src/components/application/ApplicationModify.tsx
@@ -178,7 +178,9 @@ const ApplicationForm = () => {
             );
             setValue(
                 'reasonForNotOffline',
-                hackathonData.reasonForNotOffline === '기본값' ? '기본값' : '',
+                hackathonData.reasonForNotOffline === null
+                    ? '기본값'
+                    : hackathonData.reasonForNotOffline,
             );
         }
     }, [hackathonData]);
@@ -255,7 +257,7 @@ const ApplicationForm = () => {
                                 <A.StyledCheckedIcon />
                             )}
                         </A.Ndiv>
-                        <A.Nform {...register('email')} />
+                        <A.Nform {...register('email')} disabled />
                         <A.Ndiv>
                             학교
                             {!userinfo?.universityName ? (
@@ -300,7 +302,8 @@ const ApplicationForm = () => {
                         />
                         <A.Ndiv>
                             파트 선택
-                            {errors.hackathonParts ? (
+                            {errors.hackathonParts ||
+                            selectedParts.length < 1 ? (
                                 <A.StyledNotCheckedIcon />
                             ) : (
                                 <A.StyledCheckedIcon />
@@ -452,7 +455,10 @@ const ApplicationForm = () => {
                                 <A.Ntxt>*최대 100자까지 입력가능해요.</A.Ntxt>
                             </>
                         )}
-                        <A.Button type="submit" disabled={false}>
+                        <A.Button
+                            type="submit"
+                            disabled={false || selectedParts.length === 0}
+                        >
                             신청하기
                         </A.Button>
                         {isModalOpen && (

diff --git a/src/pages/donate/components/DonateComponentInner.tsx b/src/pages/donate/components/DonateComponentInner.tsx
@@ -24,7 +24,7 @@ function DonateComponentInner({
 }: DonateComponentInnerProps) {
     const { curPageItem: posts, renderPaginationBtn } =
         useServerSidePagination<IPost>({
-            uri: '/api/v1/donation_history',
+            uri: '/api/v1/donation-history',
             size: 10,
             sort: order,
             search: searchQuery,

diff --git a/src/query/get/useGetDonateDetail.ts b/src/query/get/useGetDonateDetail.ts
@@ -31,7 +31,7 @@ interface DonateDetailParam {
 function useGetDonateDetail({ donationHistoryId }: useGetDonateDetailProps) {
     const fetchDonateDetail = async () => {
         const response = await request<null, IDonateDetail, DonateDetailParam>({
-            uri: `/api/v1/donation_history/${donationHistoryId}`,
+            uri: `/api/v1/donation-history/${donationHistoryId}`,
             method: 'get',
             params: {
                 donationHistoryId,