🐛 입학탭 검수 (#303)

apis/v2/admissions/graduate/regular-admission.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getGraduateRegularAdmission = () =>
+  getRequest('/v2/admissions/graduate/regular-admission') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v2/admissions/international/exchange-visiting.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getInternationalExchangeVisiting = () =>
+  getRequest('/v2/admissions/international/exchange-visiting') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v2/admissions/international/graduate.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getInternationalgraduate = () =>
+  getRequest('/v2/admissions/international/graduate') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v2/admissions/international/scholarships.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getInternationalScholarships = () =>
+  getRequest('/v2/admissions/international/scholarships') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v2/admissions/international/undergraduate.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getInternationalUndergraduate = () =>
+  getRequest('/v2/admissions/international/undergraduate') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v1/admissions/search/top.ts → apis/v2/admissions/search/top.ts

@@ -2,4 +2,4 @@ import { getRequest } from '@/apis';
 import { AdmissionsSearchResult, SearchParam } from '@/apis/types/search';
 
 export const searchAdmissions = (params: SearchParam) =>
-  getRequest('/v1/admissions/search/top', params) as Promise<AdmissionsSearchResult>;
+  getRequest('/v2/admissions/search/top', params) as Promise<AdmissionsSearchResult>;

apis/v2/admissions/undergraduate/early-admission.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getUndergraduateEarlyAdmission = () =>
+  getRequest('/v2/admissions/undergraduate/early-admission') as Promise<
+    WithLanguage<{ description: string }>
+  >;

apis/v2/admissions/undergraduate/regular-admission.ts

@@ -0,0 +1,7 @@
+import { getRequest } from '@/apis';
+import { WithLanguage } from '@/types/language';
+
+export const getUndergraduateRegularAdmission = () =>
+  getRequest('/v2/admissions/undergraduate/regular-admission') as Promise<
+    WithLanguage<{ description: string }>
+  >;

app/[locale]/admissions/graduate/regular-admission/page.tsx

@@ -1,27 +1,27 @@
 import { Metadata } from 'next';
 
-import { getGraduateRegularAdmission } from '@/apis/v1/admissions/graduate/regular-admission';
+import { getGraduateRegularAdmission } from '@/apis/v2/admissions/graduate/regular-admission';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { graduateAdmission } from '@/constants/segmentNode';
 import { getMetadata } from '@/utils/metadata';
 
-export async function generateMetadata(props: {
-  params: Promise<{ locale: string }>;
-}): Promise<Metadata> {
+export async function generateMetadata(props: AdmissionPageProps): Promise<Metadata> {
   const params = await props.params;
 
   const { locale } = params;
 
   return await getMetadata({ locale, node: graduateAdmission });
 }
 
-export default async function GraduateRegularAdmission() {
+export default async function GraduateRegularAdmission({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
   const data = await getGraduateRegularAdmission();
 
   return (
     <PageLayout titleType="big">
-      <HTMLViewer htmlContent={data.description} />
+      <HTMLViewer htmlContent={data[locale].description} />
     </PageLayout>
   );
 }

app/[locale]/admissions/international/exchange/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getInternationalExchangeVisiting } from '@/apis/v1/admissions/international/exchange-visiting';
+import { getInternationalExchangeVisiting } from '@/apis/v2/admissions/international/exchange-visiting';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { exchangeVisitingProgram } from '@/constants/segmentNode';
@@ -22,12 +23,13 @@ export async function generateMetadata(props: {
   });
 }
 
-export default async function InternationalExchangePage() {
-  const { description } = await getInternationalExchangeVisiting();
+export default async function InternationalExchangePage({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
+  const data = await getInternationalExchangeVisiting();
 
   return (
     <PageLayout titleType="big" removeBottomPadding>
-      <HTMLViewer htmlContent={description} wrapperClassName="pb-16 sm:pb-[220px]" />
+      <HTMLViewer htmlContent={data[locale].description} wrapperClassName="pb-16 sm:pb-[220px]" />
     </PageLayout>
   );
 }

app/[locale]/admissions/international/graduate/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getInternationalgraduate } from '@/apis/v1/admissions/international/graduate';
+import { getInternationalgraduate } from '@/apis/v2/admissions/international/graduate';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { internationalGraduateAdmission } from '@/constants/segmentNode';
@@ -22,12 +23,13 @@ export async function generateMetadata(props: {
   });
 }
 
-export default async function InternationalGraduateAdmissionPage() {
-  const { description } = await getInternationalgraduate();
+export default async function InternationalGraduateAdmissionPage({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
+  const data = await getInternationalgraduate();
 
   return (
     <PageLayout titleType="big">
-      <HTMLViewer htmlContent={description} />
+      <HTMLViewer htmlContent={data[locale].description} />
     </PageLayout>
   );
 }

app/[locale]/admissions/international/scholarships/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getInternationalScholarships } from '@/apis/v1/admissions/international/scholarships';
+import { getInternationalScholarships } from '@/apis/v2/admissions/international/scholarships';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { internationalScholarships } from '@/constants/segmentNode';
@@ -22,12 +23,13 @@ export async function generateMetadata(props: {
   });
 }
 
-export default async function InternationalScholarshipPage() {
-  const { description } = await getInternationalScholarships();
+export default async function InternationalScholarshipPage({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
+  const data = await getInternationalScholarships();
 
   return (
     <PageLayout titleType="big" removeBottomPadding>
-      <HTMLViewer htmlContent={description} wrapperClassName="pb-16 sm:pb-[220px]" />
+      <HTMLViewer htmlContent={data[locale].description} wrapperClassName="pb-16 sm:pb-[220px]" />
     </PageLayout>
   );
 }

app/[locale]/admissions/international/undergraduate/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getInternationalUndergraduate } from '@/apis/v1/admissions/international/undergraduate';
+import { getInternationalUndergraduate } from '@/apis/v2/admissions/international/undergraduate';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { internationalUndergraduateAdmission } from '@/constants/segmentNode';
@@ -22,12 +23,15 @@ export async function generateMetadata(props: {
   });
 }
 
-export default async function InternationalUndergraduateAdmissionPage() {
-  const { description } = await getInternationalUndergraduate();
+export default async function InternationalUndergraduateAdmissionPage({
+  params,
+}: AdmissionPageProps) {
+  const locale = (await params).locale;
+  const data = await getInternationalUndergraduate();
 
   return (
     <PageLayout titleType="big">
-      <HTMLViewer htmlContent={description} />
+      <HTMLViewer htmlContent={data[locale].description} />
     </PageLayout>
   );
 }

app/[locale]/admissions/type.ts

@@ -0,0 +1,5 @@
+import { Language } from '@/types/language';
+
+export interface AdmissionPageProps {
+  params: Promise<{ locale: Language }>;
+}

app/[locale]/admissions/undergraduate/early-admission/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getUndergraduateEarlyAdmission } from '@/apis/v1/admissions/undergraduate/early-admission';
+import { getUndergraduateEarlyAdmission } from '@/apis/v2/admissions/undergraduate/early-admission';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { undergraduateEarlyAdmission } from '@/constants/segmentNode';
@@ -16,12 +17,13 @@ export async function generateMetadata(props: {
   return await getMetadata({ locale, node: undergraduateEarlyAdmission });
 }
 
-export default async function UndergraduateEarlyAdmission() {
+export default async function UndergraduateEarlyAdmission({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
   const data = await getUndergraduateEarlyAdmission();
 
   return (
     <PageLayout titleType="big">
-      <HTMLViewer htmlContent={data.description} />
+      <HTMLViewer htmlContent={data[locale].description} />
     </PageLayout>
   );
 }

app/[locale]/admissions/undergraduate/regular-admission/page.tsx

@@ -1,6 +1,7 @@
 import { Metadata } from 'next';
 
-import { getUndergraduateRegularAdmission } from '@/apis/v1/admissions/undergraduate/regular-admission';
+import { getUndergraduateRegularAdmission } from '@/apis/v2/admissions/undergraduate/regular-admission';
+import { AdmissionPageProps } from '@/app/[locale]/admissions/type';
 import HTMLViewer from '@/components/form/html/HTMLViewer';
 import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { undergraduateRegularAdmission } from '@/constants/segmentNode';
@@ -16,12 +17,13 @@ export async function generateMetadata(props: {
   return await getMetadata({ locale, node: undergraduateRegularAdmission });
 }
 
-export default async function UndergraduateRegularAdmission() {
+export default async function UndergraduateRegularAdmission({ params }: AdmissionPageProps) {
+  const locale = (await params).locale;
   const data = await getUndergraduateRegularAdmission();
 
   return (
     <PageLayout titleType="big">
-      <HTMLViewer htmlContent={data.description} />
+      <HTMLViewer htmlContent={data[locale].description} />
     </PageLayout>
   );
 }

app/[locale]/search/fetchContent.ts

@@ -10,7 +10,7 @@ import {
 import { SeminarPreviewList } from '@/apis/types/seminar';
 import { searchAbout } from '@/apis/v1/about/search/top';
 import { searchAcademics } from '@/apis/v1/academics/search/top';
-import { searchAdmissions } from '@/apis/v1/admissions/search/top';
+import { searchAdmissions } from '@/apis/v2/admissions/search/top';
 import { searchMember } from '@/apis/v1/member/search/top';
 import { searchNews } from '@/apis/v2/news/totalSearch';
 import { searchNotice } from '@/apis/v2/notice/totalSearch';