Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Header/DashboardHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function DashboardHeader() {
const { id: dashboardId, title, createdByMe } = dashboard;

return (
<header className='flex h-[70px] w-full items-center justify-end border-b border-gray-d9 bg-white px-[24px] text-black-33 md:px-[40px] lg:justify-between'>
<header className='flex h-[60px] w-full items-center justify-end border-b border-gray-d9 bg-white px-[24px] text-black-33 md:h-[70px] md:px-[40px] lg:justify-between'>
<div className='hidden items-center gap-2 lg:flex'>
<h1 className='text-xl font-bold'>{title}</h1>
{createdByMe && <Image src='/icons/crown.svg' alt='왕관 아이콘' width={20} height={16} />}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/DefaultHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface DefaultHeaderProps {

export default function DefaultHeader({ title }: DefaultHeaderProps) {
return (
<header className='flex h-[70px] w-full items-center justify-between border-b border-gray-d9 bg-white px-[24px] text-black-33 md:px-[40px]'>
<header className='flex h-[60px] w-full items-center justify-between border-b border-gray-d9 bg-white px-[24px] text-black-33 md:h-[70px] md:px-[40px]'>
<h1 className='text-lg font-bold md:text-xl'>{title}</h1>
<UserMenuDropdown />
</header>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/LandingHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Link from 'next/link';

export default function LandingHeader() {
return (
<header className='flex h-[70px] w-full items-center justify-between bg-black px-[24px]'>
<header className='flex h-[60px] w-full items-center justify-between bg-black px-[24px] md:h-[70px]'>
<Link href='/'>
<Image className='md:hidden' src='/icons/logo-white-s.svg' alt='로고' width={24} height={27} priority />
<Image className='hidden md:block' src='/icons/logo-white.svg' alt='로고' width={121} height={39} priority />
Expand Down
41 changes: 41 additions & 0 deletions src/containers/dashboard/edit/DashboardEdit.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/router';

import InvitedMembersSection from './InvitedMembersSection';
import MembersSection from './MembersSection';

export default function DashboardEdit() {
const router = useRouter();
const { id } = router.query;

const handleDeleteClick = () => {
alert('대시보드 삭제');
};

return (
<div className='px-3 py-4 text-black-33 md:p-5'>
<Link
href={`/dashboard/${id}`}
className='mb-5 flex items-center gap-1.5 text-sm font-medium md:mb-6 md:text-base'
>
<div className='relative size-[18px] rotate-180 md:size-5'>
<Image src='/icons/arrow-black.svg' alt='뒤로가기 아이콘' fill />
</div>
돌아가기
</Link>
<div className='flex flex-col gap-4'>
{/* 대시보드 수정 */}
<MembersSection />
<InvitedMembersSection />
</div>
<button
type='button'
className='btn-gray gray-border my-8 size-fit rounded-lg px-[84px] py-4 text-base font-medium md:my-12 md:px-[95px] md:py-5 md:text-lg'
onClick={handleDeleteClick}
>
대시보드 삭제하기
</button>
</div>
);
}
2 changes: 1 addition & 1 deletion src/layouts/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function MainLayout({ children }: { children: React.ReactNode })
if (isDisabled) return <div className='min-w-[360px]'>{children}</div>;

return (
<div className='flex min-w-[360px]'>
<div className='flex min-w-[375px]'>
<Sidebar />

<div className='flex grow flex-col'>
Expand Down
13 changes: 2 additions & 11 deletions src/pages/dashboard/[id]/edit.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import InvitedMembersSection from '@/containers/dashboard/edit/InvitedMembersSection';
import MembersSection from '@/containers/dashboard/edit/MembersSection';
import DashboardEdit from '@/containers/dashboard/edit/DashboardEdit';

export default function DashboardEditPage() {
return (
<div className='flex flex-col gap-4 px-3 py-4 text-black-33 md:p-5'>
{/* 돌아가기 */}
{/* 대시보드 수정 */}
<MembersSection />
<InvitedMembersSection />
{/* 대시보드 삭제 버튼 */}
</div>
);
return <DashboardEdit />;
}