diff --git a/src/app/(after-login)/dashboard/[id]/edit/loading.tsx b/src/app/(after-login)/dashboard/[id]/edit/loading.tsx index 52b1b80..d7f24a8 100644 --- a/src/app/(after-login)/dashboard/[id]/edit/loading.tsx +++ b/src/app/(after-login)/dashboard/[id]/edit/loading.tsx @@ -1,7 +1,11 @@ +import { Page, PageInner } from '@/components/layout/Page'; + export default function loading() { return ( -
-
대시보드 정보를 불러오는 중입니다.
-
+ + + 대시보드 정보를 불러오는 중입니다. + + ); } diff --git a/src/app/(after-login)/dashboard/[id]/edit/page.tsx b/src/app/(after-login)/dashboard/[id]/edit/page.tsx index d6d9ac9..08a60aa 100644 --- a/src/app/(after-login)/dashboard/[id]/edit/page.tsx +++ b/src/app/(after-login)/dashboard/[id]/edit/page.tsx @@ -1,3 +1,4 @@ +import { Page, PageInner } from '@/components/layout/Page'; import DetailModify from '@/components/dashboard/DetailModify'; import DetailMembers from '@/components/dashboard/DetailMembers'; import DetailInvited from '@/components/dashboard/DetailInvited'; @@ -18,23 +19,26 @@ export default async function DashboardEditPage({ params }: { params: Promise<{ } return ( -
-
- -
-
- {/* 대시보드 정보 */} - + + +
+ +
- {/* 구성원 리스트 */} - +
+ {/* 대시보드 정보 */} + - {/* 초대내역 */} - + {/* 구성원 리스트 */} + - {/* 대시보드 삭제 */} - -
-
+ {/* 초대내역 */} + + + {/* 대시보드 삭제 */} + +
+ + ); } diff --git a/src/app/(after-login)/mydashboard/page.tsx b/src/app/(after-login)/mydashboard/page.tsx index cf4d0cb..6a011b1 100644 --- a/src/app/(after-login)/mydashboard/page.tsx +++ b/src/app/(after-login)/mydashboard/page.tsx @@ -1,15 +1,16 @@ import MyDashboard from '@/components/dashboard/MyDashboard'; import MyInvitedDashboardList from '@/components/dashboard/MyInvitedDashboardList'; +import { Page, PageInner } from '@/components/layout/Page'; export default function MydashboardPage() { return ( -
-
+ +
-
-
+ + ); } diff --git a/src/app/(after-login)/mypage/loading.tsx b/src/app/(after-login)/mypage/loading.tsx index 85131a7..11472f0 100644 --- a/src/app/(after-login)/mypage/loading.tsx +++ b/src/app/(after-login)/mypage/loading.tsx @@ -1,7 +1,11 @@ +import { Page, PageInner } from '@/components/layout/Page'; + export default function loading() { return ( -
-
내정보를 불러오는 중입니다.
-
+ + + 내정보를 불러오는 중입니다. + + ); } diff --git a/src/app/(after-login)/mypage/page.tsx b/src/app/(after-login)/mypage/page.tsx index 50d79b1..52d1d98 100644 --- a/src/app/(after-login)/mypage/page.tsx +++ b/src/app/(after-login)/mypage/page.tsx @@ -1,5 +1,6 @@ import { redirect } from 'next/navigation'; import { User, userSchema } from '@/apis/users/types'; +import { Page, PageInner } from '@/components/layout/Page'; import PasswordEdit from '@/components/profile/PasswordEdit'; import ProfileEdit from '@/components/profile/ProfileEdit'; import GoBackLink from '@/components/ui/Link/GoBackLink'; @@ -15,17 +16,19 @@ export default async function MyPage() { } return ( -
-
- -
-
- {/* 프로필 수정 */} - + + +
+ +
+
+ {/* 프로필 수정 */} + - {/* 비밀번호 수정 */} - -
-
+ {/* 비밀번호 수정 */} + +
+ + ); } diff --git a/src/components/layout/Page.tsx b/src/components/layout/Page.tsx new file mode 100644 index 0000000..c8fdb41 --- /dev/null +++ b/src/components/layout/Page.tsx @@ -0,0 +1,12 @@ +import { cn } from '@/utils/helper'; +import { HTMLAttributes, PropsWithChildren } from 'react'; + +type PageProps = PropsWithChildren>; + +export function Page({ className, children }: PageProps) { + return
{children}
; +} + +export function PageInner({ className, children }: PageProps) { + return
{children}
; +}