From 1e83ee1e145be9838217c54b5d6e1ce0bf2199e0 Mon Sep 17 00:00:00 2001 From: amd123 Date: Wed, 24 Apr 2024 22:25:37 +0700 Subject: [PATCH] feat: master-role detail --- .../admin/e-magazine}/create/page.tsx | 0 .../admin/e-magazine}/detail/page.tsx | 0 .../admin/e-magazine}/page.tsx | 0 .../admin/master-menu}/create/page.tsx | 0 app/(admin)/admin/master-menu/page.tsx | 8 +- .../admin}/master-module/create/page.tsx | 0 .../admin}/master-module/page.tsx | 0 .../admin/master-role/detail/[id]/page.tsx | 10 + .../admin}/master-user-level/create/page.tsx | 0 .../admin}/master-user-level/page.tsx | 0 app/(admin)/dashboard-old/page.tsx | 9 - .../master/master-menu/menu-data/page.tsx | 11 -- app/admin/page.tsx | 10 - components/form/form-article.tsx | 2 +- components/form/form-detail-article.tsx | 20 +- .../form/form-detail-master-user-role.tsx | 184 ++++++++++++++++++ components/form/form-edit-article.tsx | 38 ++-- components/sidebar/sidebar.tsx | 4 +- components/table/master-role-table.tsx | 4 +- service/master-user-role.ts | 7 + 20 files changed, 246 insertions(+), 61 deletions(-) rename app/{admin/magazine => (admin)/admin/e-magazine}/create/page.tsx (100%) rename app/{admin/magazine => (admin)/admin/e-magazine}/detail/page.tsx (100%) rename app/{admin/magazine => (admin)/admin/e-magazine}/page.tsx (100%) rename app/{admin/master/master-menu/menu-data => (admin)/admin/master-menu}/create/page.tsx (100%) rename app/{admin/master => (admin)/admin}/master-module/create/page.tsx (100%) rename app/{admin/master => (admin)/admin}/master-module/page.tsx (100%) create mode 100644 app/(admin)/admin/master-role/detail/[id]/page.tsx rename app/{admin/master => (admin)/admin}/master-user-level/create/page.tsx (100%) rename app/{admin/master => (admin)/admin}/master-user-level/page.tsx (100%) delete mode 100644 app/(admin)/dashboard-old/page.tsx delete mode 100644 app/admin/master/master-menu/menu-data/page.tsx delete mode 100644 app/admin/page.tsx create mode 100644 components/form/form-detail-master-user-role.tsx diff --git a/app/admin/magazine/create/page.tsx b/app/(admin)/admin/e-magazine/create/page.tsx similarity index 100% rename from app/admin/magazine/create/page.tsx rename to app/(admin)/admin/e-magazine/create/page.tsx diff --git a/app/admin/magazine/detail/page.tsx b/app/(admin)/admin/e-magazine/detail/page.tsx similarity index 100% rename from app/admin/magazine/detail/page.tsx rename to app/(admin)/admin/e-magazine/detail/page.tsx diff --git a/app/admin/magazine/page.tsx b/app/(admin)/admin/e-magazine/page.tsx similarity index 100% rename from app/admin/magazine/page.tsx rename to app/(admin)/admin/e-magazine/page.tsx diff --git a/app/admin/master/master-menu/menu-data/create/page.tsx b/app/(admin)/admin/master-menu/create/page.tsx similarity index 100% rename from app/admin/master/master-menu/menu-data/create/page.tsx rename to app/(admin)/admin/master-menu/create/page.tsx diff --git a/app/(admin)/admin/master-menu/page.tsx b/app/(admin)/admin/master-menu/page.tsx index b55c9bd..b780a00 100644 --- a/app/(admin)/admin/master-menu/page.tsx +++ b/app/(admin)/admin/master-menu/page.tsx @@ -1,7 +1,11 @@ +import MagazineTable from '@/components/table/magazine/magazine-table' +import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table' import React from 'react' -export default function MasterMenuPage() { +const AdminMenuData = () => { return ( -
MasterMenuPage
+
) } + +export default AdminMenuData \ No newline at end of file diff --git a/app/admin/master/master-module/create/page.tsx b/app/(admin)/admin/master-module/create/page.tsx similarity index 100% rename from app/admin/master/master-module/create/page.tsx rename to app/(admin)/admin/master-module/create/page.tsx diff --git a/app/admin/master/master-module/page.tsx b/app/(admin)/admin/master-module/page.tsx similarity index 100% rename from app/admin/master/master-module/page.tsx rename to app/(admin)/admin/master-module/page.tsx diff --git a/app/(admin)/admin/master-role/detail/[id]/page.tsx b/app/(admin)/admin/master-role/detail/[id]/page.tsx new file mode 100644 index 0000000..0fec0be --- /dev/null +++ b/app/(admin)/admin/master-role/detail/[id]/page.tsx @@ -0,0 +1,10 @@ +import FormDetailMasterUserRole from '@/components/form/form-detail-master-user-role' +import { Card } from '@nextui-org/react' + +export default function DetailMasterRolePage() { + return ( + + + + ) +} diff --git a/app/admin/master/master-user-level/create/page.tsx b/app/(admin)/admin/master-user-level/create/page.tsx similarity index 100% rename from app/admin/master/master-user-level/create/page.tsx rename to app/(admin)/admin/master-user-level/create/page.tsx diff --git a/app/admin/master/master-user-level/page.tsx b/app/(admin)/admin/master-user-level/page.tsx similarity index 100% rename from app/admin/master/master-user-level/page.tsx rename to app/(admin)/admin/master-user-level/page.tsx diff --git a/app/(admin)/dashboard-old/page.tsx b/app/(admin)/dashboard-old/page.tsx deleted file mode 100644 index f4f0d25..0000000 --- a/app/(admin)/dashboard-old/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react' - -const AdminDasboard = () => { - return ( -
AdminDasboard
- ) -} - -export default AdminDasboard \ No newline at end of file diff --git a/app/admin/master/master-menu/menu-data/page.tsx b/app/admin/master/master-menu/menu-data/page.tsx deleted file mode 100644 index b780a00..0000000 --- a/app/admin/master/master-menu/menu-data/page.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MagazineTable from '@/components/table/magazine/magazine-table' -import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table' -import React from 'react' - -const AdminMenuData = () => { - return ( -
- ) -} - -export default AdminMenuData \ No newline at end of file diff --git a/app/admin/page.tsx b/app/admin/page.tsx deleted file mode 100644 index bda639f..0000000 --- a/app/admin/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react' - -export default function AdminHumasPage() { - return ( -
-
1
-
1
-
- ) -} diff --git a/components/form/form-article.tsx b/components/form/form-article.tsx index b024a95..72ddd67 100644 --- a/components/form/form-article.tsx +++ b/components/form/form-article.tsx @@ -17,7 +17,7 @@ const articleSchema = z.object({ article: z.string().min(1, { message: "Required" }), slug: z.string().min(1, { message: "Required" }), tags: z.string().min(0, { message: "Required" }).optional(), - description: z.string().min(1, { message: "Required" }).optional(), + description: z.string().min(0, { message: "Required" }).optional(), }); diff --git a/components/form/form-detail-article.tsx b/components/form/form-detail-article.tsx index 66e8fbc..065cc3c 100644 --- a/components/form/form-detail-article.tsx +++ b/components/form/form-detail-article.tsx @@ -30,6 +30,7 @@ export default function FormDetailArticle() { const [content, setContent] = useState(''); const MySwal = withReactContent(Swal); const [article, setArticle] = useState(); + const [typeArticle, setTypeArticle] = useState([]); const pathname = usePathname(); const splitPathname = pathname.split('/'); const id = splitPathname[splitPathname.length - 1]; @@ -98,7 +99,11 @@ export default function FormDetailArticle() { const res = await getArticleById(id); setArticle(res.data?.data); setTitle(res.data?.data?.title) - console.log("Data Aritcle", res.data?.data); + setTypeArticle(res.data.data?.type_id) + const tagsArray = res.data.data?.tags ? res.data.data.tags.split(",") : []; + setTags(tagsArray); + + console.log("Data Aritcle", tagsArray); } initState(); @@ -165,11 +170,10 @@ export default function FormDetailArticle() { setCode(e.target.value)} + /> + {errors.code?.message} + +
+ setName(e.target.value)} + /> + {errors.name?.message} +
+
+