From cc5332eee8fe49a9b54001eae33b4111598eea50 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Wed, 19 Mar 2025 11:23:10 +0700 Subject: [PATCH] fix padding and margin table --- .../account/manage-account/ManageAccount.tsx | 2 +- .../manage-currency/ManageCurrency.tsx | 5 +- .../hooks/ManageCurrencyContext.tsx | 3 - src/pages/groups/ManageGroups.tsx | 122 ++++++++++++------ src/pages/master/aldeias/AldeiasMaster.tsx | 2 +- src/pages/master/sucos/SucosMaster.tsx | 2 +- src/pages/members/kyc/Kyc.tsx | 4 +- .../members/manage-members/ManageMembers.tsx | 4 +- 8 files changed, 89 insertions(+), 55 deletions(-) diff --git a/src/pages/account/manage-account/ManageAccount.tsx b/src/pages/account/manage-account/ManageAccount.tsx index 6fd1190..20dcf35 100644 --- a/src/pages/account/manage-account/ManageAccount.tsx +++ b/src/pages/account/manage-account/ManageAccount.tsx @@ -74,7 +74,7 @@ const ManageAccount = () => { return (
-
+

Manage Account

{ return ( - +
+

Manage Currency

- +
); }; diff --git a/src/pages/account/manage-currency/hooks/ManageCurrencyContext.tsx b/src/pages/account/manage-currency/hooks/ManageCurrencyContext.tsx index c5cd102..5549b4b 100644 --- a/src/pages/account/manage-currency/hooks/ManageCurrencyContext.tsx +++ b/src/pages/account/manage-currency/hooks/ManageCurrencyContext.tsx @@ -220,9 +220,6 @@ const ManageCurrencyContextProvider = ({ children }: { children: React.ReactNode console.log(currencies); return (
-
-

Manage Currency

-
{ const [isDialogOpen, setIsDialogOpen] = useState(false); @@ -31,9 +42,9 @@ const ManageGroups = () => { const [pageSize, setPageSize] = useState(10); const [dialogType, setDialogType] = useState(''); const [dialogOpen, setDialogOpen] = useState(false); - + useEffect(() => { - fetchGroups() + fetchGroups(); }, []); async function fetchGroups() { @@ -47,29 +58,29 @@ const ManageGroups = () => { order_direction: 'ASC' } }); - let temp = 1 + let temp = 1; let resGroups = groups.data.data.list.map((el: any) => { - el.no = temp++ - return el - }) - setDataGroup(resGroups) + el.no = temp++; + return el; + }); + setDataGroup(resGroups); } catch (error: any) { - alert(error.message) + alert(error.message); console.log(error); } } const openDialog = () => setIsDialogOpen(true); const closeDialog = () => { - setIsDialogOpen(false) - setFormData(initGroup) + setIsDialogOpen(false); + setFormData(initGroup); }; const handleChange = (e: React.ChangeEvent) => { setFormData({ ...formData, [e.target.name]: e.target.value - }) + }); }; const handleSubmit = async (e: React.FormEvent) => { @@ -89,9 +100,9 @@ const ManageGroups = () => { groupName: group.name, status: group.status, description: group.description - }) + }); setDialogType('update'); - setIsDialogOpen(true) + setIsDialogOpen(true); }; const handleDelete = (group: any) => { @@ -101,27 +112,27 @@ const ManageGroups = () => { groupName: group.name, status: group.status, description: group.description - }) + }); setDialogType('delete'); - setDialogOpen(true) + setDialogOpen(true); }; const handleYes = async () => { try { if (dialogType === 'create') { await axios.post(`${BASE_URL}/groups/create`, { - "name": formData.groupName, - "status": formData.status, - "created_at": new Date() - }) + name: formData.groupName, + status: formData.status, + created_at: new Date() + }); } else if (dialogType === 'update') { await axios.put(`${BASE_URL}/groups/update/${formData.id}`, { - "name": formData.groupName, - "status": formData.status, - "updated_at": new Date() - }) + name: formData.groupName, + status: formData.status, + updated_at: new Date() + }); } else if (dialogType === 'delete') { - await axios.delete(`${BASE_URL}/groups/delete/${formData.id}/true`) + await axios.delete(`${BASE_URL}/groups/delete/${formData.id}/true`); } await fetchGroups(); closeDialog(); @@ -135,26 +146,41 @@ const ManageGroups = () => { return (
-
- setDialogOpen(false)} - title="Confirm Action" - content={`Are you sure you want to `+( dialogType === 'create' ? "create?" : ( dialogType === 'update' ? "update?" : "delete?"))} - onYes={handleYes} - onNo={() => setDialogOpen(false)} - /> -

Groups

- +
+ setDialogOpen(false)} + title="Confirm Action" + content={ + `Are you sure you want to ` + + (dialogType === 'create' ? 'create?' : dialogType === 'update' ? 'update?' : 'delete?') + } + onYes={handleYes} + onNo={() => setDialogOpen(false)} + /> +

Manage Groups

+
Create New Group - +
- +
@@ -174,9 +200,19 @@ const ManageGroups = () => { *Active Status: - - } label="Yes" /> - } label="No" /> + + } + label="Yes" + /> + } + label="No" + />
diff --git a/src/pages/master/aldeias/AldeiasMaster.tsx b/src/pages/master/aldeias/AldeiasMaster.tsx index 3ebb197..a3d0ad7 100644 --- a/src/pages/master/aldeias/AldeiasMaster.tsx +++ b/src/pages/master/aldeias/AldeiasMaster.tsx @@ -9,7 +9,7 @@ const AldeiasMaster = () => { return ( -

Aldeias

+

Aldeias

Dashboard diff --git a/src/pages/master/sucos/SucosMaster.tsx b/src/pages/master/sucos/SucosMaster.tsx index ac7b7e5..c698cfa 100644 --- a/src/pages/master/sucos/SucosMaster.tsx +++ b/src/pages/master/sucos/SucosMaster.tsx @@ -10,7 +10,7 @@ const SucosMaster = () => { return ( -

Sucos

+

Sucos

Dashboard diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index e346889..a458350 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -140,7 +140,7 @@ const Kyc = () => { return (
-
+
setDialogOpen(false)} @@ -151,7 +151,7 @@ const Kyc = () => { /> -

Manage Member KYC

+

Manage Member KYC

diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index 2258819..7370a19 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -113,7 +113,7 @@ const ManageMembers = () => { return (
-
+
setDialogOpen(false)} @@ -123,7 +123,7 @@ const ManageMembers = () => { onNo={() => setDialogOpen(false)} /> -

Manage Members

+

Manage Members