@@ -8,6 +8,7 @@ import ProgressBar from "@/components/ui/ProgressBar";
88
99import ConfirmStep from "./ConfirmStep" ;
1010import DoneStep from "./DoneStep" ;
11+ import EmptyGPA from "./EmptyGPA" ;
1112import GpaStep from "./GpaStep" ;
1213import LanguageStep from "./LanguageStep" ;
1314import UniversityStep from "./UniversityStep" ;
@@ -17,16 +18,13 @@ import { ListUniversity } from "@/types/university";
1718import usePostSubmitApplication from "@/api/applications/client/usePostSubmitApplication" ;
1819import useGetMyGpaScore from "@/api/score/client/useGetMyGpaScore" ;
1920import useGetMyLanguageTestScore from "@/api/score/client/useGetMyLanguageTestScore" ;
20- import useGetUniversitySearchByFilter from "@/api/university/client/useGetUniversitySearchByFilter " ;
21+ import useGetUniversitySearchByText from "@/api/university/client/useGetUniversitySearchByText " ;
2122
2223const ApplyPageContent = ( ) => {
2324 const router = useRouter ( ) ;
2425 const [ step , setStep ] = useState < number > ( 1 ) ;
2526
26- const { data : universityList = [ ] } = useGetUniversitySearchByFilter ( {
27- languageTestType : undefined ,
28- countryCode : undefined ,
29- } ) ;
27+ const { data : universityList = [ ] } = useGetUniversitySearchByText ( "" ) ;
3028
3129 const { data : gpaScoreList = [ ] } = useGetMyGpaScore ( ) ;
3230 const { data : languageTestScoreList = [ ] } = useGetMyLanguageTestScore ( ) ;
@@ -74,49 +72,56 @@ const ApplyPageContent = () => {
7472 setStep ( 99 ) ;
7573 } ;
7674
75+ const isDataExist = gpaScoreList . length === 0 || languageTestScoreList . length === 0 ;
7776 return (
7877 < >
7978 < TopDetailNavigation title = "지원하기" handleBack = { goPrevStep } />
8079 < div className = "mt-1 px-5" >
8180 { ( step === 1 || step === 2 || step === 3 ) && < ProgressBar currentStep = { step } totalSteps = { 4 } /> }
8281 </ div >
83- { step === 1 && (
84- < LanguageStep
85- languageTestScoreList = { languageTestScoreList }
86- curLanguageTestScore = { curLanguageTestScore }
87- setCurLanguageTestScore = { setCurLanguageTestScore }
88- onNext = { goNextStep }
89- />
82+ { isDataExist ? (
83+ < EmptyGPA />
84+ ) : (
85+ < >
86+ { step === 1 && (
87+ < LanguageStep
88+ languageTestScoreList = { languageTestScoreList }
89+ curLanguageTestScore = { curLanguageTestScore }
90+ setCurLanguageTestScore = { setCurLanguageTestScore }
91+ onNext = { goNextStep }
92+ />
93+ ) }
94+ { step === 2 && (
95+ < GpaStep
96+ gpaScoreList = { gpaScoreList }
97+ curGpaScore = { curGpaScore }
98+ setCurGpaScore = { setCurGpaScore }
99+ onNext = { goNextStep }
100+ />
101+ ) }
102+ { step === 3 && (
103+ < UniversityStep
104+ universityList = { universityList }
105+ curUniversityList = { curUniversityList }
106+ setCurUniversityList = { setCurUniversityList }
107+ onNext = { goNextStep }
108+ />
109+ ) }
110+ { step === 4 && (
111+ < ConfirmStep
112+ languageTestScore = { languageTestScoreList . find ( ( score ) => score . id === curLanguageTestScore ) }
113+ gpaScore = { gpaScoreList . find ( ( score ) => score . id === curGpaScore ) }
114+ universityList = {
115+ curUniversityList
116+ . map ( ( id ) => universityList . find ( ( university ) => university . id === id ) )
117+ . filter ( Boolean ) as ListUniversity [ ]
118+ }
119+ onNext = { handleSubmit }
120+ />
121+ ) }
122+ { step === 99 && < DoneStep /> }
123+ </ >
90124 ) }
91- { step === 2 && (
92- < GpaStep
93- gpaScoreList = { gpaScoreList }
94- curGpaScore = { curGpaScore }
95- setCurGpaScore = { setCurGpaScore }
96- onNext = { goNextStep }
97- />
98- ) }
99- { step === 3 && (
100- < UniversityStep
101- universityList = { universityList }
102- curUniversityList = { curUniversityList }
103- setCurUniversityList = { setCurUniversityList }
104- onNext = { goNextStep }
105- />
106- ) }
107- { step === 4 && (
108- < ConfirmStep
109- languageTestScore = { languageTestScoreList . find ( ( score ) => score . id === curLanguageTestScore ) }
110- gpaScore = { gpaScoreList . find ( ( score ) => score . id === curGpaScore ) }
111- universityList = {
112- curUniversityList
113- . map ( ( id ) => universityList . find ( ( university ) => university . id === id ) )
114- . filter ( Boolean ) as ListUniversity [ ]
115- }
116- onNext = { handleSubmit }
117- />
118- ) }
119- { step === 99 && < DoneStep /> }
120125 </ >
121126 ) ;
122127} ;
0 commit comments