From 84ac4fa2b9d70b32546c1a7dd239ce0745461564 Mon Sep 17 00:00:00 2001 From: Anang Yusman Date: Mon, 18 Nov 2024 14:01:35 +0700 Subject: [PATCH] feat:pull --- .../admin/(basic-form)/form-costum/page.tsx | 30 ------- .../(basic-form)/form-horizontal/page.tsx | 38 --------- .../admin/(basic-form)/form-layout/page.tsx | 40 --------- .../(basic-form)/form-validation/page.tsx | 37 --------- .../admin/(basic-form)/form-vertical/page.tsx | 32 -------- .../admin/(basic-form)/form-wizard/page.tsx | 44 ---------- app/(admin)/admin/magazine/create/page.tsx | 16 ++++ .../admin/magazine/detail/page.tsx | 0 app/(admin)/admin/magazine/page.tsx | 14 ++++ .../master-menu/menu-data/create/page.tsx | 5 +- .../master/master-menu/menu-data/page.tsx | 17 ++++ .../master/master-module/create/page.tsx | 5 +- .../admin/master/master-module/page.tsx | 6 +- .../master/master-user-level/create/page.tsx | 5 +- .../admin/master/master-user-level/page.tsx | 6 +- app/admin/magazine/create/page.tsx | 11 --- app/admin/magazine/page.tsx | 10 --- .../master/master-menu/menu-data/page.tsx | 11 --- components/form/magazine/magazine-form.tsx | 41 +++++----- .../master-menu/menu-data/menu-data-form.tsx | 58 ++++++------- .../master-module/master-module-form.tsx | 28 +++---- .../master-user-level-form.tsx | 81 +++++++++++-------- components/icons.tsx | 19 +++++ components/sidebar/sidebar.tsx | 8 +- components/table/magazine/magazine-table.tsx | 2 +- .../master-menu/menu-data/menu-data-table.tsx | 2 +- .../master-module/master-module-table.tsx | 2 +- .../master-user-level-table.tsx | 2 +- 28 files changed, 207 insertions(+), 363 deletions(-) delete mode 100644 app/(admin)/admin/(basic-form)/form-costum/page.tsx delete mode 100644 app/(admin)/admin/(basic-form)/form-horizontal/page.tsx delete mode 100644 app/(admin)/admin/(basic-form)/form-layout/page.tsx delete mode 100644 app/(admin)/admin/(basic-form)/form-validation/page.tsx delete mode 100644 app/(admin)/admin/(basic-form)/form-vertical/page.tsx delete mode 100644 app/(admin)/admin/(basic-form)/form-wizard/page.tsx create mode 100644 app/(admin)/admin/magazine/create/page.tsx rename app/{ => (admin)}/admin/magazine/detail/page.tsx (100%) create mode 100644 app/(admin)/admin/magazine/page.tsx rename app/{ => (admin)}/admin/master/master-menu/menu-data/create/page.tsx (61%) create mode 100644 app/(admin)/admin/master/master-menu/menu-data/page.tsx rename app/{ => (admin)}/admin/master/master-module/create/page.tsx (66%) rename app/{ => (admin)}/admin/master/master-module/page.tsx (57%) rename app/{ => (admin)}/admin/master/master-user-level/create/page.tsx (70%) rename app/{ => (admin)}/admin/master/master-user-level/page.tsx (63%) delete mode 100644 app/admin/magazine/create/page.tsx delete mode 100644 app/admin/magazine/page.tsx delete mode 100644 app/admin/master/master-menu/menu-data/page.tsx diff --git a/app/(admin)/admin/(basic-form)/form-costum/page.tsx b/app/(admin)/admin/(basic-form)/form-costum/page.tsx deleted file mode 100644 index 224d54c..0000000 --- a/app/(admin)/admin/(basic-form)/form-costum/page.tsx +++ /dev/null @@ -1,30 +0,0 @@ -"use client" -import { Image } from "@nextui-org/react"; - -export default function CustumPage() { - return ( -
-
-
-
- -
-
-

Custum Form

-

custom designed elemnt

-
-
- NextUI hero Image -
-
-
-
- {/* */} -
-
- ); -} diff --git a/app/(admin)/admin/(basic-form)/form-horizontal/page.tsx b/app/(admin)/admin/(basic-form)/form-horizontal/page.tsx deleted file mode 100644 index 63b5dc8..0000000 --- a/app/(admin)/admin/(basic-form)/form-horizontal/page.tsx +++ /dev/null @@ -1,38 +0,0 @@ -"use client" -import CreateCustomForm from "@/components/form/form-costum/custom-form"; -import CreateHorizontalForm from "@/components/form/form-horizontal/custom-form"; -import CreateWizardForm from "@/components/form/form-wizard/wizard-form"; -import AuthtorsTable from "@/components/table/authors-table"; -import CustomerTable from "@/components/table/customers-table"; -import InvoiceTable from "@/components/table/invoice-table"; -import UserTable from "@/components/table/article-table"; -import UsersTable from "@/components/table/users-table"; -import { Card, Divider, Image } from "@nextui-org/react"; - -export default function HorizontalPage() { - return ( -
-
-
-
- -
-
-

Horizontal Form

-

Home{" > "} Horizontal Form

-
-
- NextUI hero Image -
-
-
-
- -
-
- ); -} diff --git a/app/(admin)/admin/(basic-form)/form-layout/page.tsx b/app/(admin)/admin/(basic-form)/form-layout/page.tsx deleted file mode 100644 index 74c70ca..0000000 --- a/app/(admin)/admin/(basic-form)/form-layout/page.tsx +++ /dev/null @@ -1,40 +0,0 @@ -"use client" - -import CreateLayoutForm from "@/components/form/form-layout/layout-form"; -import CreateValidationForm from "@/components/form/form-validation/validation-form"; -import CreateWizardForm from "@/components/form/form-wizard/wizard-form"; -import AuthtorsTable from "@/components/table/authors-table"; -import CustomerTable from "@/components/table/customers-table"; -import InvoiceTable from "@/components/table/invoice-table"; -import UserTable from "@/components/table/article-table"; -import UsersTable from "@/components/table/users-table"; -import { Card, Divider, Image } from "@nextui-org/react"; -import { useEffect, useState } from "react"; - -export default function FormLayoutPage() { - - return ( -
-
-
-
-
-
-

Form Layout

-

Home{" > "} Form Layout

-
-
- NextUI hero Image -
-
-
-
- -
-
- ); -} diff --git a/app/(admin)/admin/(basic-form)/form-validation/page.tsx b/app/(admin)/admin/(basic-form)/form-validation/page.tsx deleted file mode 100644 index 8480b7e..0000000 --- a/app/(admin)/admin/(basic-form)/form-validation/page.tsx +++ /dev/null @@ -1,37 +0,0 @@ -"use client" -import CreateValidationForm from "@/components/form/form-validation/validation-form"; -import CreateWizardForm from "@/components/form/form-wizard/wizard-form"; -import AuthtorsTable from "@/components/table/authors-table"; -import CustomerTable from "@/components/table/customers-table"; -import InvoiceTable from "@/components/table/invoice-table"; -import UserTable from "@/components/table/article-table"; -import UsersTable from "@/components/table/users-table"; -import { Card, Divider, Image } from "@nextui-org/react"; - -export default function ValidationPage() { - return ( -
-
-
-
- -
-
-

Form Validation

-

Home{" > "} Form Validation

-
-
- NextUI hero Image -
-
-
-
- -
-
- ); -} diff --git a/app/(admin)/admin/(basic-form)/form-vertical/page.tsx b/app/(admin)/admin/(basic-form)/form-vertical/page.tsx deleted file mode 100644 index 1667561..0000000 --- a/app/(admin)/admin/(basic-form)/form-vertical/page.tsx +++ /dev/null @@ -1,32 +0,0 @@ -"use client" -import CreateValidationForm from "@/components/form/form-validation/validation-form"; -import CreateVerticalForm from "@/components/form/form-vertical/vertical-form"; -import { Card, Divider, Image } from "@nextui-org/react"; - -export default function VerticalPage() { - return ( -
-
-
-
- -
-
-

Vertical Form

-

Home{" > "} Verical Form

-
-
- NextUI hero Image -
-
-
-
- -
-
- ); -} diff --git a/app/(admin)/admin/(basic-form)/form-wizard/page.tsx b/app/(admin)/admin/(basic-form)/form-wizard/page.tsx deleted file mode 100644 index b096f16..0000000 --- a/app/(admin)/admin/(basic-form)/form-wizard/page.tsx +++ /dev/null @@ -1,44 +0,0 @@ -"use client" -import CreateWizardForm from "@/components/form/form-wizard/wizard-form"; -import AuthtorsTable from "@/components/table/authors-table"; -import CustomerTable from "@/components/table/customers-table"; -import InvoiceTable from "@/components/table/invoice-table"; -import UserTable from "@/components/table/article-table"; -import UsersTable from "@/components/table/users-table"; -import { Card, Divider, Image } from "@nextui-org/react"; - -export default function WizardPage() { - return ( -
-
-
-
- -
-
-

Form Wizard

-

This is Form WizardPage

-
-
- NextUI hero Image -
-
-
-
- -

Form Wizard

- -
- -
- - - -
-
- ); -} diff --git a/app/(admin)/admin/magazine/create/page.tsx b/app/(admin)/admin/magazine/create/page.tsx new file mode 100644 index 0000000..429ac76 --- /dev/null +++ b/app/(admin)/admin/magazine/create/page.tsx @@ -0,0 +1,16 @@ +import CreateMagazineForm from '@/components/form/magazine/magazine-form' +import MagazineTable from '@/components/table/magazine/magazine-table' +import { Card } from '@nextui-org/react' +import React from 'react' + +const AdminMagazineCreate = () => { + return ( +
+
+ +
+
+ ) +} + +export default AdminMagazineCreate \ No newline at end of file diff --git a/app/admin/magazine/detail/page.tsx b/app/(admin)/admin/magazine/detail/page.tsx similarity index 100% rename from app/admin/magazine/detail/page.tsx rename to app/(admin)/admin/magazine/detail/page.tsx diff --git a/app/(admin)/admin/magazine/page.tsx b/app/(admin)/admin/magazine/page.tsx new file mode 100644 index 0000000..f1b23c5 --- /dev/null +++ b/app/(admin)/admin/magazine/page.tsx @@ -0,0 +1,14 @@ +import MagazineTable from '@/components/table/magazine/magazine-table' +import React from 'react' + +const AdminMagazine = () => { + return ( +
+
+ +
+
+ ) +} + +export default AdminMagazine \ No newline at end of file diff --git a/app/admin/master/master-menu/menu-data/create/page.tsx b/app/(admin)/admin/master/master-menu/menu-data/create/page.tsx similarity index 61% rename from app/admin/master/master-menu/menu-data/create/page.tsx rename to app/(admin)/admin/master/master-menu/menu-data/create/page.tsx index 966e952..637fedf 100644 --- a/app/admin/master/master-menu/menu-data/create/page.tsx +++ b/app/(admin)/admin/master/master-menu/menu-data/create/page.tsx @@ -1,11 +1,14 @@ import CreateMagazineForm from '@/components/form/magazine/magazine-form' import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/menu-data-form' import MagazineTable from '@/components/table/magazine/magazine-table' +import { Card } from '@nextui-org/react' import React from 'react' const AdminMenuDataCreate = () => { return ( -
+ + + ) } diff --git a/app/(admin)/admin/master/master-menu/menu-data/page.tsx b/app/(admin)/admin/master/master-menu/menu-data/page.tsx new file mode 100644 index 0000000..b2f82d0 --- /dev/null +++ b/app/(admin)/admin/master/master-menu/menu-data/page.tsx @@ -0,0 +1,17 @@ +import MagazineTable from '@/components/table/magazine/magazine-table' +import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table' +import { Image } from '@nextui-org/react' +import React from 'react' + +const AdminMenuData = () => { + return ( +
+
+ +
+
+ + ) +} + +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/master-module/create/page.tsx similarity index 66% rename from app/admin/master/master-module/create/page.tsx rename to app/(admin)/admin/master/master-module/create/page.tsx index 8b7a4e2..fd07497 100644 --- a/app/admin/master/master-module/create/page.tsx +++ b/app/(admin)/admin/master/master-module/create/page.tsx @@ -2,11 +2,14 @@ import CreateMagazineForm from '@/components/form/magazine/magazine-form' import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/menu-data-form' import CreateMasterModuleForm from '@/components/form/master/master-module/master-module-form' import MagazineTable from '@/components/table/magazine/magazine-table' +import { Card } from '@nextui-org/react' import React from 'react' const AdminMasterModuleCreate = () => { return ( -
+ + + ) } diff --git a/app/admin/master/master-module/page.tsx b/app/(admin)/admin/master/master-module/page.tsx similarity index 57% rename from app/admin/master/master-module/page.tsx rename to app/(admin)/admin/master/master-module/page.tsx index 75eb767..ec8fe00 100644 --- a/app/admin/master/master-module/page.tsx +++ b/app/(admin)/admin/master/master-module/page.tsx @@ -5,7 +5,11 @@ import React from 'react' const AdminMasterModule = () => { return ( -
+
+
+ +
+
) } diff --git a/app/admin/master/master-user-level/create/page.tsx b/app/(admin)/admin/master/master-user-level/create/page.tsx similarity index 70% rename from app/admin/master/master-user-level/create/page.tsx rename to app/(admin)/admin/master/master-user-level/create/page.tsx index 916eafe..ddc1539 100644 --- a/app/admin/master/master-user-level/create/page.tsx +++ b/app/(admin)/admin/master/master-user-level/create/page.tsx @@ -3,11 +3,14 @@ import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/m import CreateMasterModuleForm from '@/components/form/master/master-module/master-module-form' import CreateMasterUserLevelForm from '@/components/form/master/master-user-level/master-user-level-form' import MagazineTable from '@/components/table/magazine/magazine-table' +import { Card } from '@nextui-org/react' import React from 'react' const AdminMasterUserLevelCreate = () => { return ( -
+ + + ) } diff --git a/app/admin/master/master-user-level/page.tsx b/app/(admin)/admin/master/master-user-level/page.tsx similarity index 63% rename from app/admin/master/master-user-level/page.tsx rename to app/(admin)/admin/master/master-user-level/page.tsx index cb67e53..022921e 100644 --- a/app/admin/master/master-user-level/page.tsx +++ b/app/(admin)/admin/master/master-user-level/page.tsx @@ -6,7 +6,11 @@ import React from 'react' const AdminMasterUserLevel = () => { return ( -
+
+
+ +
+
) } diff --git a/app/admin/magazine/create/page.tsx b/app/admin/magazine/create/page.tsx deleted file mode 100644 index 89d98a2..0000000 --- a/app/admin/magazine/create/page.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import CreateMagazineForm from '@/components/form/magazine/magazine-form' -import MagazineTable from '@/components/table/magazine/magazine-table' -import React from 'react' - -const AdminMagazineCreate = () => { - return ( -
- ) -} - -export default AdminMagazineCreate \ No newline at end of file diff --git a/app/admin/magazine/page.tsx b/app/admin/magazine/page.tsx deleted file mode 100644 index b2250f5..0000000 --- a/app/admin/magazine/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import MagazineTable from '@/components/table/magazine/magazine-table' -import React from 'react' - -const AdminMagazine = () => { - return ( -
- ) -} - -export default AdminMagazine \ 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/components/form/magazine/magazine-form.tsx b/components/form/magazine/magazine-form.tsx index 94f3e13..9b2a85c 100644 --- a/components/form/magazine/magazine-form.tsx +++ b/components/form/magazine/magazine-form.tsx @@ -2,7 +2,6 @@ import { Button } from "@nextui-org/button"; import { Card, Checkbox, CheckboxGroup, Divider, Input, Radio, RadioGroup, Select, SelectItem, Slider, Switch, Tab, Table, Tabs, Textarea, User } from "@nextui-org/react"; import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"; -import { TimesIcon } from "@/components/icons"; import Link from "next/link"; import { useRouter } from "next/navigation"; import { close, error, loading } from "@/config/swal"; @@ -13,6 +12,7 @@ import { useForm } from "react-hook-form"; import * as z from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import parse from 'html-react-parser'; +import { TimesIcon } from "@/components/icons"; export default function CreateMagazineForm() { const router = useRouter(); @@ -122,25 +122,24 @@ export default function CreateMagazineForm() { return (
- +
<>
-
+
@@ -164,9 +163,9 @@ export default function CreateMagazineForm() { labelPlacement="outside" className="w-9/12 font-semibold" classNames={{ - label: "!text-black", - input: "!text-black hover:!text-white focus:!text-white", - inputWrapper: "max-h-[40px] bg-transparant border text-white", + label: "!text-black dark:!text-white", + input: "!text-black dark:!text-white hover:!text-black focus:!text-black", + inputWrapper: "max-h-[40px] bg-transparant border text-black", }} startContent={
@@ -183,7 +182,7 @@ export default function CreateMagazineForm() {
-

Description

+

Description

-

Upload File (Opsional)

+

Upload File (Opsional)

-

Support file format in word, excel, ppt and pdf

+

Support file format in word, excel, ppt and pdf

{files?.length > 0 && files?.map((list: File) => ( diff --git a/components/form/master/master-menu/menu-data/menu-data-form.tsx b/components/form/master/master-menu/menu-data/menu-data-form.tsx index 6859834..aaed42d 100644 --- a/components/form/master/master-menu/menu-data/menu-data-form.tsx +++ b/components/form/master/master-menu/menu-data/menu-data-form.tsx @@ -138,7 +138,7 @@ export default function CreateMenuDataForm() { return (
- +
<> @@ -154,9 +154,9 @@ export default function CreateMenuDataForm() { labelPlacement="outside" className=" font-semibold" classNames={{ - label: "!text-black", - input: "!text-black hover:!text-white focus:!text-white", - inputWrapper: "max-h-[40px] bg-transparant border text-white", + label: "!text-black dark:!text-white", + input: "!text-black dark:!text-white hover:!text-black focus:!text-black", + inputWrapper: "max-h-[40px] bg-transparant border text-black", }} startContent={
@@ -180,9 +180,9 @@ export default function CreateMenuDataForm() { labelPlacement="outside" className=" font-semibold" classNames={{ - label: "!text-black", - input: "!text-black hover:!text-white focus:!text-white", - inputWrapper: "max-h-[40px] bg-transparant border text-white", + label: "!text-black dark:!text-white", + input: "!text-black dark:!text-white hover:!text-black focus:!text-black", + inputWrapper: "max-h-[40px] bg-transparant border text-black", }} startContent={
@@ -197,7 +197,7 @@ export default function CreateMenuDataForm() { )}
-

Main Module

+

Main Module

- + @@ -268,7 +268,7 @@ export default function CreateMenuDataForm() { @@ -278,7 +278,7 @@ export default function CreateMenuDataForm() {
{haveChildren === "yes" && (
-

Sub Module

+

Sub Module

{ + return items.map((item) => ( + + {item.textValue} + + )); + }} > {LevelList.map((list: any) => ( @@ -253,8 +260,8 @@ export default function CreateMasterUserLevelForm() {
- {/*
-

Parent LevelId

+
+

Parent LevelId

-

Provinsi

+

Provinsi

-
-

Status

+
+

Status

@@ -366,14 +379,14 @@ export default function CreateMasterUserLevelForm() { Inactive -
*/} +
diff --git a/components/table/master/master-menu/menu-data/menu-data-table.tsx b/components/table/master/master-menu/menu-data/menu-data-table.tsx index 7f8f43d..2f43ebd 100644 --- a/components/table/master/master-menu/menu-data/menu-data-table.tsx +++ b/components/table/master/master-menu/menu-data/menu-data-table.tsx @@ -193,7 +193,7 @@ export default function MenuDataTable() { return ( <> -
+
diff --git a/components/table/master/master-module/master-module-table.tsx b/components/table/master/master-module/master-module-table.tsx index 3bad23b..7ce8cf7 100644 --- a/components/table/master/master-module/master-module-table.tsx +++ b/components/table/master/master-module/master-module-table.tsx @@ -186,7 +186,7 @@ export default function MasterModuleTable() { return ( <> -
+
diff --git a/components/table/master/master-user-level/master-user-level-table.tsx b/components/table/master/master-user-level/master-user-level-table.tsx index fa5b6f1..b7a7ae8 100644 --- a/components/table/master/master-user-level/master-user-level-table.tsx +++ b/components/table/master/master-user-level/master-user-level-table.tsx @@ -188,7 +188,7 @@ export default function MasterUserLevelTable() { return ( <> -
+