Skip to content

Commit 8959c96

Browse files
한만욱한만욱
authored andcommitted
feat : 성적이 없는경우 성적을 입력하도록 수정했습니다
1 parent 2a2f768 commit 8959c96

2 files changed

Lines changed: 69 additions & 41 deletions

File tree

‎src/app/application/apply/ApplyPageContent.tsx‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import ProgressBar from "@/components/ui/ProgressBar";
88

99
import ConfirmStep from "./ConfirmStep";
1010
import DoneStep from "./DoneStep";
11+
import EmptyGPA from "./EmptyGPA";
1112
import GpaStep from "./GpaStep";
1213
import LanguageStep from "./LanguageStep";
1314
import UniversityStep from "./UniversityStep";
@@ -17,16 +18,13 @@ import { ListUniversity } from "@/types/university";
1718
import usePostSubmitApplication from "@/api/applications/client/usePostSubmitApplication";
1819
import useGetMyGpaScore from "@/api/score/client/useGetMyGpaScore";
1920
import useGetMyLanguageTestScore from "@/api/score/client/useGetMyLanguageTestScore";
20-
import useGetUniversitySearchByFilter from "@/api/university/client/useGetUniversitySearchByFilter";
21+
import useGetUniversitySearchByText from "@/api/university/client/useGetUniversitySearchByText";
2122

2223
const 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
};
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import Link from "next/link";
2+
3+
import { IconSolidConnectionSmallLogo } from "@/public/svgs/my";
4+
5+
const EmptyGPA = () => {
6+
return (
7+
<div className="mt-52 flex flex-col items-center justify-center gap-2 rounded-lg text-center">
8+
<IconSolidConnectionSmallLogo />
9+
<p className="text-k-300">
10+
지원할 수 있는 성적이 없어요.
11+
<br />
12+
성적부터 입력해 볼까요?
13+
</p>
14+
<Link
15+
href="/score"
16+
className="h- mt-2 h-13 w-60 rounded-full bg-gradient-to-l from-primary to-secondary p-4 text-sm font-semibold text-white"
17+
>
18+
성적 등록하러가기
19+
</Link>
20+
</div>
21+
);
22+
};
23+
export default EmptyGPA;

0 commit comments

Comments
 (0)