diff --git a/src/auth/pages/jwt/Login.tsx b/src/auth/pages/jwt/Login.tsx index a7824cc..bea522e 100644 --- a/src/auth/pages/jwt/Login.tsx +++ b/src/auth/pages/jwt/Login.tsx @@ -69,6 +69,12 @@ const Login = () => { setShowPassword(!showPassword); }; + const handleKeyPress = (e: { key: string }) => { + if (e.key === 'Enter') { + formik.handleSubmit(); + } + }; + return (
{ className={clsx('form-control', { 'is-invalid': formik.touched.username && formik.errors.username })} + onKeyPress={handleKeyPress} /> {formik.touched.username && formik.errors.username && ( @@ -112,6 +119,7 @@ const Login = () => { className={clsx('form-control', { 'is-invalid': formik.touched.password && formik.errors.password })} + onKeyPress={handleKeyPress} /> +
- +
@@ -174,9 +215,19 @@ const ManageGroups = () => { *Active Status: - - } label="Yes" /> - } label="No" /> + + } + label="Yes" + /> + } + label="No" + />
diff --git a/src/pages/master/municipios/Municipios.tsx b/src/pages/master/municipios/Municipios.tsx index fd0f24c..388b269 100644 --- a/src/pages/master/municipios/Municipios.tsx +++ b/src/pages/master/municipios/Municipios.tsx @@ -10,7 +10,7 @@ const Municipios = () => { return ( -

MUNICIPIOS

+

MUNICIPIOS

Dashboard diff --git a/src/pages/master/postoadms/PostoAdmsMaster.tsx b/src/pages/master/postoadms/PostoAdmsMaster.tsx index 886c856..163b97f 100644 --- a/src/pages/master/postoadms/PostoAdmsMaster.tsx +++ b/src/pages/master/postoadms/PostoAdmsMaster.tsx @@ -10,7 +10,7 @@ const PostoAdmsMaster = () => { return ( -

+

Postu Administrativo

diff --git a/src/pages/master/products/ProductsMaster.tsx b/src/pages/master/products/ProductsMaster.tsx index a75f02c..b0b9792 100644 --- a/src/pages/master/products/ProductsMaster.tsx +++ b/src/pages/master/products/ProductsMaster.tsx @@ -9,7 +9,7 @@ const ProductsMaster = () => { return ( -

Manage Products

+

Manage Products

Dashboard diff --git a/src/pages/master/profession/ProfessionMaster.tsx b/src/pages/master/profession/ProfessionMaster.tsx index 2507d2d..07583f5 100644 --- a/src/pages/master/profession/ProfessionMaster.tsx +++ b/src/pages/master/profession/ProfessionMaster.tsx @@ -9,7 +9,7 @@ const ProfessionMaster = () => { return ( -

Manage Profession

+

Manage Profession

Dashboard diff --git a/src/pages/master/provider/ProviderMaster.tsx b/src/pages/master/provider/ProviderMaster.tsx index 03ed47c..dce73d1 100644 --- a/src/pages/master/provider/ProviderMaster.tsx +++ b/src/pages/master/provider/ProviderMaster.tsx @@ -9,7 +9,7 @@ const ProviderMaster = () => { return ( -

Manage Provider

+

Manage Provider

Dashboard diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index e346889..6ee1148 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -11,6 +11,7 @@ import axios from 'axios'; import { toast } from 'sonner'; const BASE_URL = apiConfig.service_customer; import CustomerDialog from '../manage-members/CustomerDetailModal'; +import { Breadcrumbs, Link } from '@mui/material'; export interface IDataGridContextProps { props: TDataGridProps; @@ -42,7 +43,7 @@ const Kyc = () => { const { getUser } = useAuthContext(); useEffect(() => { - fetchGroups() + fetchGroups(); }, []); async function fetchGroups() { @@ -54,37 +55,37 @@ const Kyc = () => { with_deleted: false, order_field: 'fullname', order_direction: 'ASC', - type: "kyc" + type: 'kyc' } }); - let temp = 1 + let temp = 1; let resMembers = groups.data.data.list.map((el: any) => { - el.no = temp++ - el.name = el.fullname - return el - }) - setMembers(resMembers) + el.no = temp++; + el.name = el.fullname; + return el; + }); + setMembers(resMembers); } catch (error: any) { - alert(error.message) + alert(error.message); console.log(error); } } - + const handleUpdate = (data: any) => { - setMember(data) - setIsDialogOpen(true) - } + setMember(data); + setIsDialogOpen(true); + }; async function handleSubmit(data: any) { - setDialogType('update') - setMember(data) - setDialogOpen(true) + setDialogType('update'); + setMember(data); + setDialogOpen(true); } function handleReject(data: any) { - setDialogType('reject') - setMember(data) - setDialogOpen(true) + setDialogType('reject'); + setMember(data); + setDialogOpen(true); } const handleYes = async () => { @@ -92,7 +93,7 @@ const Kyc = () => { const updateData: any = member; const customerId = member.id; const description = member.description; - updateData.updated_by = userLogin.data ? userLogin.data.id : '' + updateData.updated_by = userLogin.data ? userLogin.data.id : ''; let today = new Date(); updateData.updated_at = today.toString(); delete updateData.id; @@ -117,26 +118,27 @@ const Kyc = () => { delete updateData.group_deleted_at; try { if (dialogType === 'reject') { - await axios.post(`${BASE_URL}/customer/reject`, {customerid: customerId}) + await axios.post(`${BASE_URL}/customer/reject`, { customerid: customerId }); } if (dialogType === 'update') { - await axios.put(`${BASE_URL}/customer/update/${customerId}`, updateData) - if (updateData.isneedapproval == 1) await axios.post(`${BASE_URL}/customer/approve`, { - customerid: customerId, - description: description - }) + await axios.put(`${BASE_URL}/customer/update/${customerId}`, updateData); + if (updateData.isneedapproval == 1) + await axios.post(`${BASE_URL}/customer/approve`, { + customerid: customerId, + description: description + }); } await fetchGroups(); - setDialogOpen(false) - setIsDialogOpen(false) + setDialogOpen(false); + setIsDialogOpen(false); toast.success('Success Update Kyc Member'); } catch (error: any) { - alert(error.message) - setDialogOpen(false) - setIsDialogOpen(false) - toast.error(error.message) + alert(error.message); + setDialogOpen(false); + setIsDialogOpen(false); + toast.error(error.message); } - } + }; return (
@@ -149,10 +151,30 @@ const Kyc = () => { onYes={handleYes} onNo={() => setDialogOpen(false)} /> - -

Manage Member KYC

- + +

Manage Member KYC

+ + + Dashboard + + + + Members + + + + Manage Member KYC + + +
); diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index 2258819..e3ede28 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -8,6 +8,7 @@ import ConfirmDialog from '@/components/confirm'; import { useAuthContext } from '@/auth'; import { ScreenLoader } from '@/components'; import { toast } from 'sonner'; +import { Breadcrumbs, Link } from '@mui/material'; const BASE_URL = apiConfig.service_customer; const ManageMembers = () => { @@ -21,9 +22,9 @@ const ManageMembers = () => { const { getUser } = useAuthContext(); useEffect(() => { - setLoading(true) - fetchGroups() - setLoading(false) + setLoading(true); + fetchGroups(); + setLoading(false); }, []); async function fetchGroups() { @@ -34,27 +35,27 @@ const ManageMembers = () => { page: 1, with_deleted: false, order_field: 'fullname', - order_direction: 'ASC', + order_direction: 'ASC' } }); - let temp = 1 + let temp = 1; let resMembers = groups.data.data.list.map((el: any) => { - el.no = temp++ - el.name = el.fullname - return el - }) - setMembers(resMembers) + el.no = temp++; + el.name = el.fullname; + return el; + }); + setMembers(resMembers); } catch (error: any) { - alert(error.message) + alert(error.message); console.log(error); } } const handleUpdate = (data: any) => { setDialogType('update'); - setMember(data) - setIsDialogOpen(true) - } + setMember(data); + setIsDialogOpen(true); + }; function createMember() { setDialogType('create'); @@ -63,15 +64,15 @@ const ManageMembers = () => { } async function handleSubmit(data: any) { - setMember(data) - setDialogOpen(true) + setMember(data); + setDialogOpen(true); } const handleYes = async () => { const userLogin: any = await getUser(); const updateData: any = member; const customerId = member.id; - updateData.updated_by = userLogin.data ? userLogin.data.id : '' + updateData.updated_by = userLogin.data ? userLogin.data.id : ''; let today = new Date(); updateData.updated_at = today.toString(); delete updateData.id; @@ -95,36 +96,61 @@ const ManageMembers = () => { delete updateData.group_deleted_by; delete updateData.group_deleted_at; try { - if (dialogType === 'update') await axios.put(`${BASE_URL}/customer/update/${customerId}`, updateData) + if (dialogType === 'update') + await axios.put(`${BASE_URL}/customer/update/${customerId}`, updateData); // if (dialogType === 'create') await axios.post(`${BASE_URL}/customers/create`, member) await fetchGroups(); - setDialogOpen(false) - setIsDialogOpen(false) + setDialogOpen(false); + setIsDialogOpen(false); toast.success('Success Update Member'); } catch (error: any) { - alert(error.message) - setDialogOpen(false) - setIsDialogOpen(false) - toast.error(error.message) + alert(error.message); + setDialogOpen(false); + setIsDialogOpen(false); + toast.error(error.message); } - } + }; - if (loading) return () + if (loading) return ; return (
- setDialogOpen(false)} - title="Confirm Action" - content={`Are you sure you want to ${dialogType}?`} - onYes={handleYes} - onNo={() => setDialogOpen(false)} - /> - -

Manage Members

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

Manage Members

+ + + Dashboard + + + + Members + + + + Manage Members + + +
); diff --git a/src/pages/notification/ManageNotification.tsx b/src/pages/notification/ManageNotification.tsx index 3f26388..088627b 100644 --- a/src/pages/notification/ManageNotification.tsx +++ b/src/pages/notification/ManageNotification.tsx @@ -1,11 +1,28 @@ import { Container, DataGridInner } from '@/components'; import { ManageNotifContextProvider } from './hooks/ManageNotificationContext'; import AddDialog from './blocks/AddDialog'; +import { Breadcrumbs, Link } from '@mui/material'; const ManageNotification = () => { return ( +

+ Manage Notifications +

+ + + Dashboard + + + + Notification + + + + Manage Notification + +
diff --git a/src/pages/notification/hooks/ManageNotificationContext.tsx b/src/pages/notification/hooks/ManageNotificationContext.tsx index 238922f..f0ece52 100644 --- a/src/pages/notification/hooks/ManageNotificationContext.tsx +++ b/src/pages/notification/hooks/ManageNotificationContext.tsx @@ -108,9 +108,6 @@ const ManageNotifContextProvider = ({ children }: { children: React.ReactNode }) return (
-
-

Manage Notifications

-
+

Log Activity

+ + + Dashboard + + + + Settings + + + + User Management + + + + Log Activity + +
diff --git a/src/pages/settings/user/manage-position/ManagePositionPage.tsx b/src/pages/settings/user/manage-position/ManagePositionPage.tsx index d151f44..6ddcd6d 100644 --- a/src/pages/settings/user/manage-position/ManagePositionPage.tsx +++ b/src/pages/settings/user/manage-position/ManagePositionPage.tsx @@ -3,11 +3,30 @@ import { EditDialog } from './blocks'; import { ManagePositionContextProvider } from './hooks'; import { AddDialog } from './blocks/AddDialog'; import { DeleteDialog } from './blocks/DeleteDialog'; +import { Breadcrumbs, Link } from '@mui/material'; export default function ManagePositionPage() { return ( +

Manage Positions

+ + + Dashboard + + + + Settings + + + + User Management + + + + Manage Position + +
diff --git a/src/pages/settings/user/manage-user/ManageUserPage.tsx b/src/pages/settings/user/manage-user/ManageUserPage.tsx index 1d9703e..5f318b0 100644 --- a/src/pages/settings/user/manage-user/ManageUserPage.tsx +++ b/src/pages/settings/user/manage-user/ManageUserPage.tsx @@ -3,11 +3,30 @@ import { EditDialog } from './blocks'; import { ManageUserContextProvider } from './hooks'; import { AddDialog } from './blocks/AddDialog'; import { DeleteDialog } from './blocks/DeleteDialog'; +import { Breadcrumbs, Link } from '@mui/material'; export default function ManageUserPage() { return ( +

Manage User

+ + + Dashboard + + + + Settings + + + + User Management + + + + Manage User + +
diff --git a/src/pages/transfer/TransferType.tsx b/src/pages/transfer/TransferType.tsx index 2e5d03e..031c462 100644 --- a/src/pages/transfer/TransferType.tsx +++ b/src/pages/transfer/TransferType.tsx @@ -4,11 +4,26 @@ import { ManageTransferTypeContextProvider } from './hooks/ManageTransferTypeContext'; import AddDialog from './blocks/AddDialog'; +import { Breadcrumbs, Link } from '@mui/material'; const TransferType = () => { return ( +

Manage Access Type

+ + + Dashboard + + + + Transfer Type + + + + Manage Access Type + +
diff --git a/src/pages/transfer/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/hooks/ManageTransferTypeContext.tsx index 5a3d5d3..f41c7fd 100644 --- a/src/pages/transfer/hooks/ManageTransferTypeContext.tsx +++ b/src/pages/transfer/hooks/ManageTransferTypeContext.tsx @@ -145,9 +145,6 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React return (
-
-

Manage Access Type

-