fix: 행정직원, 역대교수진 레이아웃 수정

wafflestudio · Apr 7, 2024 · 47083e8 · 47083e8
1 parent 56915bc
commit 47083e8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/app/[locale]/people/emeritus-faculty/[id]/page.tsx b/app/[locale]/people/emeritus-faculty/[id]/page.tsx
@@ -15,18 +15,10 @@ export default async function EmeritusFacultyMemberPage({ params }: { params: {
 
   return (
     <PageLayout title={<PageTitle {...faculty} />} titleType="big" titleMargin="mb-9">
-      <div className="relative mb-10 flex flex-col-reverse sm:flex-row sm:gap-10">
-        <div>
-          <HeaderAndList header="학력" list={faculty.educations} />
-          <HeaderAndList header="연구 분야" list={faculty.researchAreas ?? []} />
-          <div className=" mb-7 text-sm font-medium text-neutral-700">
-            재직 기간: {careerTime.startTime} - {careerTime.endTime}
-          </div>
-        </div>
-        <div>
-          <ProfileImage imageURL={faculty.imageURL} />
+      <div className="relative mb-10 flex flex-col-reverse items-start sm:flex-row sm:gap-[3.75rem]">
+        <div className="mt-6 sm:mt-0">
           {(faculty.office || faculty.email || faculty.website) && (
-            <article className="mb-7 mt-2 flex flex-col  text-neutral-700">
+            <article className="mb-6 flex flex-col  text-neutral-700">
               <h3 className=" text-base font-bold leading-8">연락처 정보</h3>
               <ul className="list-inside list-disc">
                 {faculty.office && <BulletRow>교수실: {faculty.office}</BulletRow>}
@@ -52,7 +44,13 @@ export default async function EmeritusFacultyMemberPage({ params }: { params: {
               </ul>
             </article>
           )}
+          <HeaderAndList header="학력" list={faculty.educations} />
+          <HeaderAndList header="연구 분야" list={faculty.researchAreas ?? []} />
+          <div className=" mb-7 text-sm font-medium text-neutral-700">
+            재직 기간: {careerTime.startTime} - {careerTime.endTime}
+          </div>
         </div>
+        <ProfileImage imageURL={faculty.imageURL} />
       </div>
     </PageLayout>
   );

diff --git a/app/[locale]/people/helper/ProfileImage.tsx b/app/[locale]/people/helper/ProfileImage.tsx
@@ -7,11 +7,12 @@ export default function ProfileImage({ imageURL }: { imageURL: string | null })
       src={imageURL}
       width={200}
       height={264}
-      className="object-cover"
+      className="object-contain"
       sizes="186px, 248px"
       style={{
         clipPath: 'polygon(84.375% 0%, 100% 11.71875%, 100% 100%, 0% 100%, 0% 0%)',
         filter: 'drop-shadow(0px 0px 4px rgba(0,0,0,0.15))',
+        marginTop: '8px',
       }}
     />
   );

diff --git a/app/[locale]/people/staff/[id]/page.tsx b/app/[locale]/people/staff/[id]/page.tsx
@@ -19,11 +19,9 @@ export default async function StaffMemberPage({ params }: { params: { id: number
       titleType="big"
       titleMargin="mb-9"
     >
-      <div className="relative mb-32 flex flex-col-reverse sm:flex-row sm:gap-8">
-        <HeaderAndList header="주요 업무" list={staff.tasks} />
-        <div>
-          <ProfileImage imageURL={staff.imageURL} />
-          <article className="mb-7 mt-2 flex flex-col text-neutral-700">
+      <div className="relative mb-32 flex flex-col-reverse items-start sm:flex-row sm:gap-[3.75rem]">
+        <div className="mt-6 sm:mt-0">
+          <article className="mb-6 flex flex-col text-neutral-700">
             <h3 className=" text-base font-bold leading-8">연락처 정보</h3>
             <ul className="list-inside list-disc">
               <BulletRow>위치: {staff.office}</BulletRow>
@@ -36,7 +34,9 @@ export default async function StaffMemberPage({ params }: { params: { id: number
               </BulletRow>
             </ul>
           </article>
+          <HeaderAndList header="주요 업무" list={staff.tasks} />
         </div>
+        <ProfileImage imageURL={staff.imageURL} />
       </div>
     </PageLayout>
   );