refactor: page layout 공통 적용

This commit is contained in:
2025-04-01 14:25:17 +09:00
parent 26854a8610
commit f2954e6ebd
6 changed files with 98 additions and 111 deletions
+5 -1
View File
@@ -5,6 +5,8 @@ import type { MenuItem } from "@common/components/api";
import { BaseLayout } from "@common/components/ui";
import { MenuWrapper } from "@/entities/menu";
import { useMenuStore } from "@/shared/lib";
import { PageLayout } from "@/shared/ui/page-layout";
export default function WithBaseLayout({
children,
}: {
@@ -21,7 +23,9 @@ export default function WithBaseLayout({
return (
<BaseLayout currentPath={pathname ?? ""} handleMenuClick={handleMenuClick}>
<MenuWrapper>{children}</MenuWrapper>
<MenuWrapper>
<PageLayout>{children}</PageLayout>
</MenuWrapper>
</BaseLayout>
);
}
@@ -2,7 +2,6 @@
import { Upload } from "tus-js-client";
import { FileUploader } from "@common/components/ui";
import { PageLayout } from "@/shared/ui/page-layout";
import { AUTH_USER_ID, CLAIM_NAME, ENDPOINT } from "@/shared/config";
import { getCookie } from "@/shared/lib";
@@ -47,14 +46,12 @@ function ImagePage() {
};
return (
<PageLayout>
<div className="card card-border">
<div className="card-header">
<h3 className="text-2xl font-medium text-label">이미지 목록</h3>
</div>
<FileUploader id="image-uploader" onUpload={handleUpload} />
</div>
</PageLayout>
);
}
-3
View File
@@ -16,7 +16,6 @@ import {
} from "@common/components/ui";
import { SiteApi } from "@/entities/site";
import { ENDPOINT } from "@/shared/config";
import { PageLayout } from "@/shared/ui/page-layout";
import { ConfirmDialog } from "@/shared/ui/confirm-dialog";
import { useAlertStore } from "@/shared/lib/use-alert-store";
import type { TreeMenu } from "../model/menu-interface";
@@ -197,7 +196,6 @@ function MenuPage() {
return (
<>
<PageLayout>
<div className="card !mb-0 flex !min-h-[calc(100vh-16.8rem)] gap-2">
<div className="card card-border w-[24rem]">
<Select value={siteId} onValueChange={handleSiteIdChange}>
@@ -257,7 +255,6 @@ function MenuPage() {
/>
</div>
</div>
</PageLayout>
<ConfirmDialog open={onConfirm} />
</>
);
+1 -6
View File
@@ -6,7 +6,6 @@ import { useMutation } from "@tanstack/react-query";
import { zodResolver } from "@hookform/resolvers/zod";
import { SiteApi, siteFormSchema, type SiteFormData } from "@/entities/site";
import { useAlertStore } from "@/shared/lib/use-alert-store";
import { PageLayout } from "@/shared/ui/page-layout";
import { SiteForm } from "./site-form";
function CreatePage() {
@@ -37,11 +36,7 @@ function CreatePage() {
},
});
return (
<PageLayout>
<SiteForm form={form} handleSave={createSite} />
</PageLayout>
);
return <SiteForm form={form} handleSave={createSite} />;
}
export { CreatePage };
@@ -6,7 +6,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { SiteApi, siteFormSchema, type SiteFormData } from "@/entities/site";
import { ENDPOINT } from "@/shared/config";
import { PageLayout } from "@/shared/ui/page-layout";
import { useAlertStore } from "@/shared/lib/use-alert-store";
import { SiteForm } from "./site-form";
@@ -63,14 +62,12 @@ function ModifyPage({ siteId }: { siteId: string }) {
});
return (
<PageLayout>
<SiteForm
form={form}
siteId={siteId}
handleSave={modifySite}
handleDelete={deleteSite}
/>
</PageLayout>
);
}
-3
View File
@@ -9,7 +9,6 @@ import { getCoreRowModel, useReactTable } from "@tanstack/react-table";
import { Button, DataTable, Input } from "@common/components";
import { SiteApi, type Site, type SiteParams } from "@/entities/site";
import { ENDPOINT } from "@/shared/config";
import { PageLayout } from "@/shared/ui/page-layout";
import { columns } from "../model/table-columns";
function SitePage() {
@@ -44,7 +43,6 @@ function SitePage() {
}, []);
return (
<PageLayout>
<div className="card card-border !mt-6">
<div className="card card-border">
<form onSubmit={handleSubmit} className="flex items-center gap-2 p-2">
@@ -71,7 +69,6 @@ function SitePage() {
</div>
</div>
</div>
</PageLayout>
);
}