Skip to content

Commit 41bfa12

Browse files
authored
Design/(#114) : auth 페이지, 대시보드 헤더 반응형 css 수정 (#115)
* design: (auth)레이아웃 수정 * design:헤더 유저이름 모바일사이즈에서 삭제 * design: 대시보드 헤더 css수정 * design: 대시보드 헤더 css수정
1 parent 7b0c5bf commit 41bfa12

9 files changed

Lines changed: 39 additions & 32 deletions

File tree

src/app/(after-login)/dashboard/[id]/page.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ export async function generateMetadata({
4949
}
5050

5151
const DashboardDetailPage = () => {
52-
return <ColumnList />;
52+
return (
53+
<div className="px-2 md:px-4">
54+
<ColumnList />
55+
</div>
56+
);
5357
};
5458

5559
export default DashboardDetailPage;

src/app/(before-login)/(auth)/layout.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ export default function AuthLayout({
77
children: React.ReactNode;
88
}>) {
99
return (
10-
<main>
11-
<section className="min-h-screen w-full flex flex-col items-center justify-center gap-7.5">
12-
<div className="flex flex-col items-center gap-2.5">
13-
<Link href="/">
14-
<Image
15-
src="/logo/logo.svg"
16-
alt="로고 이미지"
17-
width={200}
18-
height={280}
19-
priority
20-
/>
21-
</Link>
22-
<p className="text-xl font-medium text-[var(--black-333236)]">
23-
오늘도 만나서 반가워요!
24-
</p>
25-
</div>
26-
<div className="max-w-[520px] w-full">{children}</div>
27-
</section>
10+
<main className="min-h-screen w-full py-10 flex flex-col items-center justify-center gap-7.5">
11+
<header className="flex flex-col items-center gap-2.5">
12+
<Link href="/">
13+
<Image
14+
src="/logo/logo.svg"
15+
alt="로고 이미지"
16+
width={200}
17+
height={280}
18+
sizes="(max-width: 768px) 160px, 200px"
19+
className="w-40 h-56 md:w-50 md:h-64"
20+
priority
21+
/>
22+
</Link>
23+
<p className="text-xl font-medium text-[var(--black-333236)]">
24+
오늘도 만나서 반가워요!
25+
</p>
26+
</header>
27+
<div className="max-w-[520px] w-full px-4">{children}</div>
2828
</main>
2929
);
3030
}

src/components/columns/Column.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ interface ColumnProps {
1010

1111
const Column = ({ column }: ColumnProps) => {
1212
return (
13-
<div className="flex flex-col gap-6 min-w-88 px-3 md:px-5 py-4 md:py-6 border-b lg:border-b-0 lg:border-r border-gray-300 lg:overflow-y-auto">
13+
<div className="flex flex-col gap-6 min-w-0 md:min-w-88 md:px-5 py-4 md:py-6 border-b lg:border-b-0 lg:border-r border-gray-300 lg:overflow-y-auto">
1414
<ColumnTitle {...column} />
1515
<CreateCard columnId={column.id} />
1616
<Droppable droppableId={column.id.toString()}>
1717
{(provided, snapshot) => (
1818
<div
1919
{...provided.droppableProps}
2020
ref={provided.innerRef}
21-
className={`min-h-[400px] p-4 rounded-lg transition-colors ${
21+
className={`min-h-[400px] rounded-lg transition-colors ${
2222
snapshot.isDraggingOver
2323
? "bg-blue-50 border-2 border-blue-300 border-dashed"
2424
: "bg-gray-50"

src/components/columns/ColumnList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ const ColumnList = () => {
5252

5353
return (
5454
<DragDropContext onDragEnd={handleDragEnd}>
55-
<div className="h-full flex flex-col lg:flex-row overflow-y-auto lg:overflow-x-auto">
55+
<div className="h-full flex flex-col lg:flex-row not-last:overflow-y-auto lg:overflow-x-auto">
5656
{data?.data.map((column) => (
5757
<Column key={column.id} column={column} />
5858
))}
59-
<div className="px-3 pt-4 md:pt-6">
59+
<div className="pt-4 md:pt-6">
6060
<CreateColumn />
6161
</div>
6262
</div>

src/components/dashboard/header/DashBoardInfo.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ const DashBoardInfo = ({ dashboardId }: { dashboardId: number }) => {
2525
초대하기
2626
</HeaderButton>
2727
</div>
28-
<AvatarStack dashboardId={dashboardId} />
28+
<div className="hidden md:block">
29+
<AvatarStack dashboardId={dashboardId} />
30+
</div>
2931
</div>
3032
<Modal ref={modalRef}>
3133
<InviteModal

src/components/dashboard/header/Header.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ const Header = () => {
1818
return dashboardData?.title || "내 대시보드";
1919
};
2020
return (
21-
<div className="w-full flex items-center md:justify-end lg:justify-between px-3 md:px-8 lg:px-10 py-4 border-b border-b-gray-200">
22-
<div className="text-lg md:hidden lg:block truncate text-[#333236] font-bold">
21+
<div className="w-full flex items-center justify-between md:justify-end lg:justify-between px-2 md:px-8 lg:px-10 py-4 border-b border-b-gray-200">
22+
<div className="text-lg hidden md:block truncate text-[#333236] font-bold">
2323
{getPageTitle()}
2424
</div>
25-
<div className="flex items-center justify-end gap-4 md:gap-9 divide-x divide-gray-300">
25+
<div className="flex items-center md:divide-x divide-gray-300">
2626
{dashboardData && (
2727
<div className="flex md:pr-9 items-center">
2828
<DashBoardInfo dashboardId={dashboardData.id} />
2929
</div>
3030
)}
31-
<div className="flex pr-4 md:pr-9 items-center">
31+
<div className="md:flex pl-9 pr-4 md:pr-9 items-center">
3232
<Profile />
3333
</div>
3434
</div>

src/components/dashboard/header/HeaderButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ interface HeaderButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
1111
const HeaderButton = ({ children, href, icon, onClick }: HeaderButtonProps) => {
1212
return (
1313
<Link href={href ?? ""} onClick={onClick}>
14-
<div className="flex items-center gap-2 px-4 py-2 border border-gray-400 rounded-lg hover:bg-gray-200 transition-colors">
14+
<div className="flex items-center gap-1 md:gap-2 px-2 md:px-4 py-2 border border-gray-400 rounded-lg hover:bg-gray-200 transition-colors min-w-0">
1515
<Image
1616
src={icon}
1717
alt={`${icon} 아이콘`}
1818
width={20}
1919
height={20}
20-
className="hidden md:block"
20+
className="hidden md:block flex-shrink-0"
2121
style={{ width: "20px", height: "20px" }}
2222
/>
23-
<div className="font-medium text-[#787486] whitespace-nowrap">
23+
<div className="font-medium text-[#787486] text-sm md:text-base truncate">
2424
{children}
2525
</div>
2626
</div>

src/components/dashboard/header/Profile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const Profile = () => {
5151
},
5252
{ label: "로그아웃", onClick: handleLogout },
5353
]}
54-
className="hover:bg-transparent"
54+
className="md:flex items-center hidden hover:bg-transparent"
5555
optionClassName="px-8 py-3"
5656
/>
5757
</div>

src/components/ui/Dropdown/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const Dropdown = ({
4141
<Menu.Button
4242
className={clsx(
4343
"relative flex items-center w-5 h-5 md:w-7 md:h-7 hover:bg-gray-200 rounded-lg transition-colors cursor-pointer z-[100]",
44+
text ? "pr-2 py-1" : "w-5 h-5 md:w-7 md:h-7",
4445
className
4546
)}
4647
>

0 commit comments

Comments
 (0)