diff --git a/actions/reservation.ts b/actions/reservation.ts index 138fdf6c..57bc20c2 100644 --- a/actions/reservation.ts +++ b/actions/reservation.ts @@ -32,7 +32,9 @@ export const getWeeklyReservation = async (params: { }; export const getReservation = async (id: number) => { - return getRequest(`${reservationPath}/${id}`) as Promise; + return getRequest(`${reservationPath}/${id}`, undefined, { + jsessionID: true, + }) as Promise; }; export const deleteSingleReservation = async (id: number) => { diff --git a/app/[locale]/10-10-project/proposal/page.tsx b/app/[locale]/10-10-project/proposal/page.tsx index 9d7fb7d5..15eac761 100644 --- a/app/[locale]/10-10-project/proposal/page.tsx +++ b/app/[locale]/10-10-project/proposal/page.tsx @@ -111,8 +111,12 @@ const htmlContent = `

1. Executive Summary

/>

References

+
+

professor-soonhoi-ha +

+

1. Executive Summary >Curricula vitae

-

- Team Organization and Participants: professorsTeam Organization and Participants

`; diff --git a/app/[locale]/10-10-project/proposal/tmp.html b/app/[locale]/10-10-project/proposal/tmp.html deleted file mode 100644 index 448ef691..00000000 --- a/app/[locale]/10-10-project/proposal/tmp.html +++ /dev/null @@ -1,42 +0,0 @@ -

Academic Excellence Team

-

Team Leader: Prof. U Kang

-

Prof. Choong Gil Hur'

-

Prof. Tae Hyun Kim

-

Prof. Myung-Soo Kim

-

-Prof. Tae Kyoung Kwon

-

-Prof. Heon Young Yeom

-


-

Industry Collaboration Team

-

Team Leader: -Prof. Jin Soo Kim:

-

Prof. Hyeon Sang Eom:

-

Prof. Chong Kwon Kim

-

Prof. Hyoung Joo Kim

-

Prof. Ji Hong Kim

-

Prof. Chang Gun Lee

-

Prof. Jae Jin Lee

-

Prof. Yeong Kil Shin

-


-

AI Team

-

Team Leader: Prof. Gun Hee Kim

-

Prof. Yang Hee Choi

-

Prof. Byung Gon Chun

-

Prof. Sun Kim

-

Prof. Sang Goo Lee

-

Prof. Byung-Ro Moon

-

Prof. Hyun Oh Song

-

Prof. Byung Tak Zhang

-

Prof. Sung Joo Yoo

-


-

Human Resources Team

-

Team Leader: Prof. Jin Wook Seo

-

Prof. Bernhard Egger

-

Prof. Wha Sook Jeon

-

Prof. Jae Wook Lee

-

Prof. Je Hee Lee

-

Prof. Young Ki Lee

-

Prof. Bong Ki Moon

-

Prof. Kun Soo Park

-

Prof. Kwang Keun Yi

-

- click here for detailed info of participants -

diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index 1955d1d1..e87f6afc 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -45,7 +45,7 @@ export default async function RootLayout({ type="module" src="https://8fl3k30sy0.execute-api.ap-northeast-2.amazonaws.com/v1/api/fontstream/djs/?sid=gAAAAABmERKxhfDey2qfPcjgFRkqpXwpei80obWPEPGgtzmc1srWnLLM7CwF6IB-jSHY8hwosajn3Gf6fF78x40vCqY73IHI7gAfsQB5_s3rFFOXAIfEzDO8pPh1kuI-MOAQIB06VNZirmAuXXAk8G0AkXFglUB3D2qkZZBWIBYEoezeYy5qE-kChjhuabFzkXxUNpfRrIdlFm4DhZTLr1SjdGNKgJx15nlvFpAX6PqeRNKoS6uL4Ye8346heclwa_f8pdXV9-0G" /> - + diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx index 7824bba5..50e0bf89 100644 --- a/app/[locale]/page.tsx +++ b/app/[locale]/page.tsx @@ -23,7 +23,7 @@ export default async function MainPage() { const data = await getMain(); return ( -
+
{/* 자글자글해져서 unoptimized */} @@ -41,29 +41,35 @@ export default async function MainPage() { const ImportantSection = ({ importantList }: { importantList: MainImportant[] }) => { return (
- {importantList.map((important) => { - const href = `community/${important.category}/${important.id}`; - - return ( - -

- {important.title} -

-

- {important.description} -

- - - ); - })} + {importantList.slice(1).map((important) => ( + + ))} +
+

+ SNU Computing Commons 건축기금 모금 +

+

+ 서울대학교 발전재단 X 컴퓨터공학부 +

+ +
); }; +const ImportantBanner = ({ important }: { important: MainImportant }) => ( + +

{important.title}

+

+ {important.description} +

+ + +); + const ImportantSectionArrow = () => ( {title}

{subtitle}

- + ); }; - -const RightArrow = () => ( - - - -); diff --git a/app/[locale]/people/helper/PeopleCell.tsx b/app/[locale]/people/helper/PeopleCell.tsx index b87e4b22..2bf78744 100644 --- a/app/[locale]/people/helper/PeopleCell.tsx +++ b/app/[locale]/people/helper/PeopleCell.tsx @@ -27,7 +27,7 @@ export default function PeopleCell({
+
{contentList.map((content, idx) => ( ))} diff --git a/app/[locale]/research/top-conference-list/ConferenceListTable.tsx b/app/[locale]/research/top-conference-list/ConferenceListTable.tsx index 545b98eb..ad34ed2a 100644 --- a/app/[locale]/research/top-conference-list/ConferenceListTable.tsx +++ b/app/[locale]/research/top-conference-list/ConferenceListTable.tsx @@ -16,16 +16,18 @@ export default function ConferenceListTable({ conferenceList: ConferenceListTableProps[]; }) { return ( -
-
-
연번
-
코드
-
약칭
-
학술대회명칭
+
+
+
+
연번
+
코드
+
약칭
+
학술대회명칭
+
+ {conferenceList.map((conference, index) => ( + + ))}
- {conferenceList.map((conference, index) => ( - - ))}
); } diff --git a/components/layout/header/Header.tsx b/components/layout/header/Header.tsx index 4b8c3d58..6f9f666f 100644 --- a/components/layout/header/Header.tsx +++ b/components/layout/header/Header.tsx @@ -12,7 +12,7 @@ import MobileNavButton from './MobileNavButton'; export default function Header() { return (
diff --git a/components/main/GraphicSection.tsx b/components/main/GraphicSection.tsx index 50c23497..bb6bd47d 100644 --- a/components/main/GraphicSection.tsx +++ b/components/main/GraphicSection.tsx @@ -7,6 +7,7 @@ export default function GraphicSection() { // 헤더 높이 빼기 return (
+
서울대학교 컴퓨터공학부는 diff --git a/public/image/main/right_arrow.png b/public/image/main/right_arrow.png new file mode 100644 index 00000000..09c81398 Binary files /dev/null and b/public/image/main/right_arrow.png differ