Skip to content

Commit

Permalink
๐Ÿ“ฑ ๊ตฌ์„ฑ์› ๋ชจ๋ฐ”์ผ ์ถ”๊ฐ€ (#191)
Browse files Browse the repository at this point in the history
* fix: ๊ต์ˆ˜์ง„ ๊ฐœ๋ณ„ ํŽ˜์ด์ง€ ๋ชจ๋ฐ”์ผ ๋ฐ˜์‘ํ˜•

* fix: ํ–‰์ •์ง์› ๊ฐœ๋ณ„ ํŽ˜์ด์ง€ ๋ชจ๋ฐ”์ผ

* fix: ์—ญ๋Œ€ ๊ต์ˆ˜์ง„ ๋ชจ๋ฐ”์ผ

* fix: ์ด๋ฏธ์ง€ ๋ฐ‘ ๋งˆ์ง„ ์กฐ์ •
  • Loading branch information
Limchansol authored Apr 6, 2024
1 parent 52e4eef commit fdb2491
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 37 deletions.
67 changes: 37 additions & 30 deletions app/[locale]/people/emeritus-faculty/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,43 @@ export default async function EmeritusFacultyMemberPage({ params }: { params: {

return (
<PageLayout title={<PageTitle {...faculty} />} titleType="big" titleMargin="mb-9">
<div className="relative mb-10 flow-root">
<ProfileImage imageURL={faculty.imageURL} />
{(faculty.office || faculty.email || faculty.website) && (
<article className="mb-7 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>}
{faculty.email && (
<BulletRow>
์ด๋ฉ”์ผ:
<Link className="ml-1 text-link hover:underline" href={`mailto:${faculty.email}`}>
{faculty.email}
</Link>
</BulletRow>
)}
{faculty.website && (
<BulletRow>
์›น์‚ฌ์ดํŠธ:
<Link className="ml-1 text-link hover:underline" href={`${faculty.website}`}>
{faculty.website}
</Link>
</BulletRow>
)}
</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 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} />
{(faculty.office || faculty.email || faculty.website) && (
<article className="mb-7 mt-2 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>}
{faculty.email && (
<BulletRow>
์ด๋ฉ”์ผ:
<Link
className="ml-1 text-link hover:underline"
href={`mailto:${faculty.email}`}
>
{faculty.email}
</Link>
</BulletRow>
)}
{faculty.website && (
<BulletRow>
์›น์‚ฌ์ดํŠธ:
<Link className="ml-1 text-link hover:underline" href={`${faculty.website}`}>
{faculty.website}
</Link>
</BulletRow>
)}
</ul>
</article>
)}
</div>
</div>
</PageLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/people/faculty/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default async function FacultyMemberPage({ params }: { params: { id: numb

return (
<PageLayout title={<PageTitle {...faculty} />} titleType="big" titleMargin="mb-9">
<div className="relative mb-10 flow-root">
<div className="relative mb-10 sm:flow-root">
<Profile
office={faculty.office}
phone={faculty.phone}
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/people/helper/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface ProfileProps {

export default function Profile({ office, phone, fax, email, website, imageURL }: ProfileProps) {
return (
<div className="relative float-right">
<div className="relative mb-8 sm:float-right">
<ProfileImage imageURL={imageURL} />

<div className="mt-5 flex flex-col gap-[9px] bg-white text-sm font-medium text-neutral-600">
Expand Down
10 changes: 5 additions & 5 deletions app/[locale]/people/staff/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ export default async function StaffMemberPage({ params }: { params: { id: number
titleType="big"
titleMargin="mb-9"
>
<div className="relative mb-32 flow-root">
<ProfileImage imageURL={staff.imageURL} />
<div className="break-all">
<article className="mb-7 flex flex-col text-neutral-700">
<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">
<h3 className=" text-base font-bold leading-8">์—ฐ๋ฝ์ฒ˜ ์ •๋ณด</h3>
<ul className="list-inside list-disc">
<BulletRow>์œ„์น˜: {staff.office}</BulletRow>
Expand All @@ -35,7 +36,6 @@ export default async function StaffMemberPage({ params }: { params: { id: number
</BulletRow>
</ul>
</article>
<HeaderAndList header="์ฃผ์š” ์—…๋ฌด" list={staff.tasks} />
</div>
</div>
</PageLayout>
Expand Down

0 comments on commit fdb2491

Please sign in to comment.