QA 반영 (#197)

* feat: 건축기금 배너 추가 * fix: 예약 상세보기에서 관리자도 상세 정보가 안보이는 문제 * fix: 10-10 잘못된 링크 * feat: 모바일 배경 이미지 * fix: QA 반영
wafflestudio · Apr 7, 2024 · 8e83d06 · 8e83d06
1 parent 852f9b1
commit 8e83d06
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 99 deletions.
diff --git 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<Reservation>;
+  return getRequest(`${reservationPath}/${id}`, undefined, {
+    jsessionID: true,
+  }) as Promise<Reservation>;
 };
 
 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
@@ -111,20 +111,24 @@ const htmlContent = `<h2>1. Executive Summary</h2>
   /></a>
 </p>
 <h2>References</h2>
+
 <hr class="__se__solid" />
+<p>
 <a href="/10-10-project/manager" rel="nofollow">professor-soonhoi-ha</a>
+</p>
+
 <p>
   <a
     href="https://docs.google.com/document/d/1WmpKLWIv_xjwFv4VFOItJ4vuhfAPi-67JRCl6pszHoI"
     rel="nofollow"
     >Curricula vitae</a
   >
 </p>
-<p>
-  Team Organization and Participants:&nbsp;<a
-    href="/10-10-project/professors"
+
+<p><a
+    href="/10-10-project/participants"
     rel="nofollow"
-    >professors</a
+    >Team Organization and Participants</a
   >
 </p>
 `;
diff --git a/app/[locale]/10-10-project/proposal/tmp.html b/app/[locale]/10-10-project/proposal/tmp.html
diff --git 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"
       />
-      <body className="sm:min-w-[1000px]">
+      <body className="sm:min-w-fit">
         <ContextProviders locale={params.locale}>
           <Navbar />
           <MobileNav />

diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
@@ -23,7 +23,7 @@ export default async function MainPage() {
   const data = await getMain();
 
   return (
-    <div className="relative sm:min-w-[1024px]">
+    <div className="relative sm:min-w-fit">
       <Header />
       <div className="absolute left-0 right-0 top-0 -z-50 hidden aspect-[1336/800] sm:block">
         {/* 자글자글해져서 unoptimized */}
@@ -41,29 +41,35 @@ export default async function MainPage() {
 const ImportantSection = ({ importantList }: { importantList: MainImportant[] }) => {
   return (
     <div className="mt-10 grid grid-cols-1 gap-8 sm:mx-[7.5rem] sm:mt-[4.0625rem] sm:grid-cols-2 sm:gap-7">
-      {importantList.map((important) => {
-        const href = `community/${important.category}/${important.id}`;
-
-        return (
-          <Link
-            key={important.id}
-            href={href}
-            className="relative flex h-[7.5rem] flex-col gap-[0.62rem] bg-[#E65817] px-[1.75rem] pt-[1.63rem]"
-          >
-            <h3 className="line-clamp-1 text-lg font-semibold text-neutral-950">
-              {important.title}
-            </h3>
-            <p className="line-clamp-1 text-sm font-normal text-neutral-800">
-              {important.description}
-            </p>
-            <ImportantSectionArrow />
-          </Link>
-        );
-      })}
+      {importantList.slice(1).map((important) => (
+        <ImportantBanner key={important.id} important={important} />
+      ))}
+      <div className="relative flex h-[7.5rem] flex-col gap-[0.62rem] bg-[#E65817] px-[1.75rem] pt-[1.63rem]">
+        <h3 className="line-clamp-1 text-lg font-semibold text-neutral-950">
+          SNU Computing Commons 건축기금 모금
+        </h3>
+        <p className="line-clamp-1 text-sm font-normal text-neutral-800">
+          서울대학교 발전재단 X 컴퓨터공학부
+        </p>
+        <ImportantSectionArrow />
+      </div>
     </div>
   );
 };
 
+const ImportantBanner = ({ important }: { important: MainImportant }) => (
+  <Link
+    href={`community/${important.category}/${important.id}`}
+    className="relative flex h-[7.5rem] flex-col gap-[0.62rem] bg-[#E65817] px-[1.75rem] pt-[1.63rem]"
+  >
+    <h3 className="line-clamp-1 text-lg font-semibold text-neutral-950">{important.title}</h3>
+    <p className="mr-[24px] line-clamp-1 text-sm font-normal text-neutral-800">
+      {important.description}
+    </p>
+    <ImportantSectionArrow />
+  </Link>
+);
+
 const ImportantSectionArrow = () => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
@@ -126,24 +132,7 @@ const LinkWithArrow = ({
         <p className="text-base font-medium sm:text-lg sm:font-semibold">{title}</p>
         <p className="text-xs font-medium sm:font-semibold">{subtitle}</p>
       </div>
-      <RightArrow />
+      <Image src="/image/main/right_arrow.png" width={24} height={24} alt="" sizes="24w" />
     </Link>
   );
 };
-
-const RightArrow = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
-    className="duration-300 group-hover:translate-x-[10px] sm:h-[40px] sm:w-[40px]"
-  >
-    <path
-      d="M12.011 4.28529L19.7188 11.9931M19.7188 11.9931L12.011 19.7139M19.7188 11.9931L4.29018 11.9931"
-      stroke="white"
-      strokeWidth="1.5"
-      className="group-hover:fill-main-orange"
-    />
-  </svg>
-);
diff --git a/app/[locale]/people/helper/PeopleCell.tsx b/app/[locale]/people/helper/PeopleCell.tsx
@@ -27,7 +27,7 @@ export default function PeopleCell({
     <article className="group flex w-fit flex-row gap-5 text-md sm:w-36 sm:flex-col sm:gap-3">
       <Link
         href={href}
-        className="relative h-48 w-36 cursor-pointer overflow-hidden"
+        className="relative h-48 w-36 shrink-0 cursor-pointer overflow-hidden "
         style={{ filter: 'drop-shadow(0px 0px 4px rgba(0,0,0,0.15))' }}
       >
         <ImageWithFallback

diff --git a/app/[locale]/people/helper/PeopleGrid.tsx b/app/[locale]/people/helper/PeopleGrid.tsx
@@ -2,7 +2,7 @@ import PeopleCell, { PeopleCellProps } from './PeopleCell';
 
 export default function PeopleGrid({ contentList }: { contentList: PeopleCellProps[] }) {
   return (
-    <div className="grid max-w-[800px] gap-14 sm:grid-cols-[repeat(auto-fit,_144px)]">
+    <div className="grid max-w-[800px] gap-16 sm:grid-cols-[repeat(auto-fit,_144px)]">
       {contentList.map((content, idx) => (
         <PeopleCell key={idx} {...content} />
       ))}

diff --git 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 (
-    <div className="mt-8 flex w-[780px] flex-col text-sm">
-      <div className="flex h-10 w-full flex-row border-y-[1px] border-y-neutral-200">
-        <div className="flex w-12 items-center px-3">연번</div>
-        <div className="flex w-20 items-center px-3">코드</div>
-        <div className="flex w-28 items-center px-3">약칭</div>
-        <div className="flex w-[540px] items-center px-3">학술대회명칭</div>
+    <div className="overflow-x-scroll">
+      <div className="mt-8 flex w-[780px] flex-col text-sm">
+        <div className="flex h-10 w-full flex-row border-y-[1px] border-y-neutral-200">
+          <div className="flex w-12 items-center px-3">연번</div>
+          <div className="flex w-20 items-center px-3">코드</div>
+          <div className="flex w-28 items-center px-3">약칭</div>
+          <div className="flex w-[540px] items-center px-3">학술대회명칭</div>
+        </div>
+        {conferenceList.map((conference, index) => (
+          <ConferenceRow conference={conference} index={index + 1} key={conference.id} />
+        ))}
       </div>
-      {conferenceList.map((conference, index) => (
-        <ConferenceRow conference={conference} index={index + 1} key={conference.id} />
-      ))}
     </div>
   );
 }

diff --git 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 (
     <header
-      className={`flex h-[68px] shrink-0 items-center justify-between px-5 sm:h-auto sm:bg-transparent sm:px-[3.75rem] sm:pb-[2.44rem] sm:pt-12`}
+      className={`flex h-[68px] shrink-0 items-center justify-between bg-[#2D2D30] px-5 sm:h-auto sm:bg-transparent sm:px-[3.75rem] sm:pb-[2.44rem] sm:pt-12`}
     >
       <HeaderLeft />
 

diff --git a/components/main/GraphicSection.tsx b/components/main/GraphicSection.tsx
@@ -7,14 +7,15 @@ export default function GraphicSection() {
   // 헤더 높이 빼기
   return (
     <div className="relative flex w-fit min-w-full flex-col items-center justify-between gap-[50px] pb-[67px] pt-[60px] sm:flex-row-reverse sm:justify-center sm:gap-[75px] sm:pb-[170px] sm:pt-[80px] xl:gap-[125px]">
+      <Image src="/image/main/background.png" alt="" className="object-cover" unoptimized fill />
       <DownArrow className="bottom-[5rem] left-1/2 hidden -translate-x-1/2 animate-arrowBounce sm:absolute" />
       <Image
         src="/image/main/mainGraphic.png"
         width={200}
         height={416}
         alt=""
         sizes="1024px"
-        className="h-[12.5rem] w-[80%] object-contain sm:mr-[26px] sm:w-[26rem] xl:mr-[52px]"
+        className="z-10 h-[12.5rem] w-[80%] object-contain sm:mr-[26px] sm:w-[26rem] xl:mr-[52px]"
       />
       <div className="flex -translate-y-1 flex-col items-center gap-[18px] sm:h-[12.5rem] sm:shrink-0 sm:items-start sm:justify-between">
         <SloganP className="hidden sm:block">서울대학교 컴퓨터공학부는</SloganP>

diff --git a/public/image/main/right_arrow.png b/public/image/main/right_arrow.png